wms / wms_wuhangelinmei · Commits

Commit 48b17ea71217259f1ad6468630287c0b5a96edd0

Authored by pengcheng
1 parent e0ad9d1e

组盘页面组盘按钮移到下面，入库打印页面加字段,登录页面logo

Inline Side-by-side
Showing 13 changed files with 175 additions and 37 deletions
src/main/java/com/huaheng/pc/barcode/barcodeDetail/controller/BarCodeDetailController.java
  View file @48b17ea
... ... @@ -187,6 +187,17 @@ public class BarCodeDetailController extends BaseController {
187 187 return barCodeDetailService.createRegenerationCode(status);
188 188 }
189 189  
  190 + /**
  191 + * 批量修改白班、再生批号
  192 + */
  193 + @ApiOperation(value="批量修改白班、再生批号 ", notes="批量修改白班、再生批号 ", httpMethod = "POST")
  194 + @Log(title = "入库-入库单-获取再生编号 ",operating = "批量修改白班、再生批号 ", action = BusinessType.INSERT)
  195 + @PostMapping("/batchEdit")
  196 + @ResponseBody
  197 + public AjaxResult batchEdit(BarCodeDetail barCodeDetail) {
  198 + return barCodeDetailService.batchEdit(barCodeDetail);
  199 + }
  200 +
190 201  
191 202  
192 203 }
... ...
src/main/java/com/huaheng/pc/barcode/barcodeDetail/service/BarCodeDetailService.java
  View file @48b17ea
... ... @@ -173,4 +173,30 @@ public class BarCodeDetailService extends ServiceImpl<BarCodeDetailMapper, BarCo
173 173 return AjaxResult.success("操作成功",result);
174 174 }
175 175  
  176 + /**
  177 + * 批量修改白班、再生批号
  178 + * @return
  179 + */
  180 + public AjaxResult batchEdit(BarCodeDetail barCodeDetail){
  181 + if(barCodeDetail==null){
  182 + return AjaxResult.error("请填写值");
  183 + }
  184 + if(barCodeDetail.getReceiptId()==null){
  185 + return AjaxResult.error("请填写主表id");
  186 + }
  187 + LambdaQueryWrapper<BarCodeDetail> receiptDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
  188 + receiptDetailLambdaQueryWrapper.eq(BarCodeDetail::getReceiptId,barCodeDetail.getReceiptId());
  189 + List<BarCodeDetail> receiptDetailList = list(receiptDetailLambdaQueryWrapper);
  190 + for(BarCodeDetail bcd : receiptDetailList) {
  191 + if(StringUtils.isNotEmpty(barCodeDetail.getDayShift())){
  192 + bcd.setDayShift(barCodeDetail.getDayShift());
  193 + }
  194 + if(StringUtils.isNotEmpty(barCodeDetail.getRegenerationCode())){
  195 + bcd.setRegenerationCode(barCodeDetail.getRegenerationCode());
  196 + }
  197 + }
  198 + this.updateBatchById(receiptDetailList);
  199 + return AjaxResult.success("操作成功");
  200 + }
  201 +
176 202 }
... ...
src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/domain/ReceiptContainerDetail.java
  View file @48b17ea
... ... @@ -196,6 +196,7 @@ public class ReceiptContainerDetail implements Serializable {
196 196 @ApiModelProperty(value="供应商编码")
197 197 private String supplierCode;
198 198  
  199 +
199 200 /**
200 201 * 批次
201 202 */
... ... @@ -533,5 +534,20 @@ public class ReceiptContainerDetail implements Serializable {
533 534 @ApiModelProperty(value="过磅单号")
534 535 private String poundCode;
535 536  
  537 + /**
  538 + * 电池类型名称
  539 + * @return
  540 + */
  541 + @TableField(exist = false)
  542 + @ApiModelProperty(value="电池类型名称")
  543 + private String batteryTypesName;
  544 + /**
  545 + * 电池种类名称
  546 + * @return
  547 + */
  548 + @TableField(exist = false)
  549 + @ApiModelProperty(value="电池种类名称")
  550 + private String batteryPackTypeName;
  551 +
536 552 private static final long serialVersionUID = 1L;
537 553 }
538 554 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java
  View file @48b17ea
... ... @@ -262,7 +262,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
262 262 receiptDetailService.remove(receiptdelambda);
263 263 //添加成品入库详情到入库详情表
264 264 LambdaQueryWrapper<BarCodeHeader> barCodeHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
265   - barCodeHeaderLambdaQueryWrapper.eq(BarCodeHeader::getBarCodeHeaderCode,barCodeHeaderCode);
  265 + barCodeHeaderLambdaQueryWrapper.eq(BarCodeHeader::getId,barCodeHeaderId);
266 266 BarCodeHeader barCodeHeader = barCodeHeaderService.getOne(barCodeHeaderLambdaQueryWrapper);
267 267 if(barCodeHeader == null){
268 268 return AjaxResult.error("找不到主条码");
... ... @@ -276,8 +276,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
276 276 receiptContainerDetailAdd(receiptContainerHeaders.get(0), receiptDetail, qty, batteryPackageWeight,
277 277 containerCode, locationCode,barCodeHeaderCode,barCodeDetails,batteryBean);
278 278 //更新入库header表状态，保存主条码
279   - receiptDetailService.updateReceiptHeaderLastStatusByReceiptHeaderId(receiptDetail.getReceiptId(),
280   - barCodeHeaderCode,barCodeHeader.getProType());
  279 + receiptDetailService.updateReceiptHeaderLastStatusByReceiptHeaderId(receiptDetail.getReceiptId(),barCodeHeader);
281 280 //锁定成品入库信息
282 281 barCodeHeader.setLocked(QuantityConstant.BARCODEHEADER_LOCKED);
283 282 barCodeHeader.setLastUpdated(new Date());
... ... @@ -1177,6 +1176,8 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
1177 1176 receiptHeader.setId(null);
1178 1177 String receiptCode = receiptHeaderService.createCode(barCodeHeader.getReceiptType());
1179 1178 receiptHeader.setCode(receiptCode);
  1179 + receiptHeader.setBarCodeHeaderId(barCodeHeader.getId());
  1180 + receiptHeader.setBarCodeHeaderCode(barCodeHeader.getBarCodeHeaderCode());
1180 1181 receiptHeader.setFirstStatus(QuantityConstant.RECEIPT_HEADER_BUILD);
1181 1182 receiptHeader.setLastStatus(QuantityConstant.RECEIPT_HEADER_BUILD);
1182 1183  
... ...
src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailService.java
  View file @48b17ea
... ... @@ -2,6 +2,7 @@ package com.huaheng.pc.receipt.receiptDetail.service;
2 2  
3 3 import com.huaheng.framework.web.domain.AjaxResult;
4 4 import com.huaheng.mobile.receipt.ReceiptBill;
  5 +import com.huaheng.pc.barcode.barcodeHeader.domain.BarCodeHeader;
5 6 import com.huaheng.pc.config.statusFlow.domain.StatusFlowDetail;
6 7 import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
7 8 import com.baomidou.mybatisplus.extension.service.IService;
... ... @@ -35,7 +36,7 @@ public interface ReceiptDetailService extends IService&lt;ReceiptDetail&gt;{
35 36 */
36 37 int updateReceiptHeaderLastStatus(Integer id);
37 38  
38   - int updateReceiptHeaderLastStatusByReceiptHeaderId(Integer id,String barCodeHeaderCode,String proType);
  39 + int updateReceiptHeaderLastStatusByReceiptHeaderId(Integer id, BarCodeHeader barCodeHeader);
39 40  
40 41 AjaxResult approval(String ids, Integer approval);
41 42  
... ...
src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java
  View file @48b17ea
... ... @@ -14,6 +14,7 @@ import com.huaheng.common.utils.security.ShiroUtils;
14 14 import com.huaheng.framework.config.HuaHengConfig;
15 15 import com.huaheng.framework.web.domain.AjaxResult;
16 16 import com.huaheng.mobile.receipt.ReceiptBill;
  17 +import com.huaheng.pc.barcode.barcodeHeader.domain.BarCodeHeader;
17 18 import com.huaheng.pc.check.checkHeader.domain.CheckHeader;
18 19 import com.huaheng.pc.check.checkHeader.service.CheckHeaderService;
19 20 import com.huaheng.pc.config.company.domain.Company;
... ... @@ -580,14 +581,16 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
580 581 }
581 582  
582 583 @Override
583   - public int updateReceiptHeaderLastStatusByReceiptHeaderId(Integer id,String barCodeHeaderCode,String proType){
  584 + public int updateReceiptHeaderLastStatusByReceiptHeaderId(Integer id, BarCodeHeader barCodeHeader){
584 585 LambdaQueryWrapper<ReceiptDetail> lambdaDetails = Wrappers.lambdaQuery();
585 586 lambdaDetails.eq(ReceiptDetail::getReceiptId, id);
586 587 List<ReceiptDetail> receiptDetails = this.list(lambdaDetails);
587 588 //查询出头表信息
588 589 ReceiptHeader receiptHeader = receiptHeaderService.getById(id);
589   - if(StringUtils.isNotEmpty(barCodeHeaderCode)){
590   - receiptHeader.setBarCodeHeaderCode(barCodeHeaderCode);
  590 + if(StringUtils.isNotEmpty(barCodeHeader.getBarCodeHeaderCode())){
  591 + receiptHeader.setBarCodeHeaderCode(barCodeHeader.getBarCodeHeaderCode());
  592 + receiptHeader.setBarCodeHeaderId(barCodeHeader.getId());
  593 + receiptHeader.setProType(barCodeHeader.getProType());
591 594 }
592 595 BigDecimal totalqty=new BigDecimal(0);
593 596 int minStatus;
... ... @@ -630,7 +633,7 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
630 633 break;
631 634 }
632 635 }
633   - receiptHeader.setProType(proType);
  636 +
634 637 receiptHeader.setTotalQty(totalqty);
635 638 receiptHeader.setTotalLines(receiptDetails.size());
636 639 receiptHeader.setLastStatus(minStatus);
... ...
src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java
  View file @48b17ea
... ... @@ -18,13 +18,18 @@ import com.huaheng.framework.web.page.PageDomain;
18 18 import com.huaheng.framework.web.page.TableDataInfo;
19 19 import com.huaheng.framework.web.page.TableSupport;
20 20 import com.huaheng.pc.config.company.service.CompanyService;
  21 +import com.huaheng.pc.config.supplier.domain.Supplier;
  22 +import com.huaheng.pc.config.supplier.service.SupplierService;
21 23 import com.huaheng.pc.monitor.job.domain.datas;
  24 +import com.huaheng.pc.receipt.receiptContainerDetail.domain.ReceiptContainerDetail;
  25 +import com.huaheng.pc.receipt.receiptContainerDetail.service.ReceiptContainerDetailService;
22 26 import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
23 27 import com.huaheng.pc.receipt.receiptDetail.service.ReceiptDetailService;
24 28 import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
25 29 import com.huaheng.pc.receipt.receiptHeader.service.ReceiptHeaderService;
26 30 import com.huaheng.pc.receipt.receiptHeaderHistory.domain.ReceiptHeaderHistory;
27 31 import com.huaheng.pc.receipt.receiptHeaderHistory.service.ReceiptHeaderHistoryService;
  32 +import com.huaheng.pc.system.dict.service.IDictDataService;
28 33 import com.huaheng.pc.system.role.service.IRoleService;
29 34 import io.swagger.annotations.Api;
30 35 import io.swagger.annotations.ApiOperation;
... ... @@ -56,9 +61,15 @@ public class ReceiptHeaderController extends BaseController {
56 61 @Resource
57 62 private ReceiptDetailService receiptDetailService;
58 63 @Resource
  64 + private ReceiptContainerDetailService receiptContainerDetailService;
  65 + @Resource
59 66 private TaskReturnService taskReturnService;
60 67 @Resource
61 68 private IRoleService iRoleService;
  69 + @Resource
  70 + private SupplierService supplierService;
  71 + @Resource
  72 + private IDictDataService dictDataService;
62 73  
63 74  
64 75 @RequiresPermissions("receipt:receiptHeader:view")
... ... @@ -279,12 +290,32 @@ public class ReceiptHeaderController extends BaseController {
279 290 public String report(@ApiParam(name = "id", value = "入库头表id")
280 291 @PathVariable("id") Integer id, ModelMap mmap) {
281 292 ReceiptHeader receiptHeader = receiptHeaderService.getById(id);
282   - mmap.put("receiptHeader", receiptHeader);
  293 +
283 294  
284 295 //查询对应入库明细
285   - LambdaQueryWrapper<ReceiptDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
286   - lambdaQueryWrapper.eq(ReceiptDetail::getReceiptId, id);
287   - List<ReceiptDetail> details = receiptDetailService.list(lambdaQueryWrapper);
  296 + LambdaQueryWrapper<ReceiptContainerDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
  297 + lambdaQueryWrapper.eq(ReceiptContainerDetail::getReceiptId, id);
  298 + List<ReceiptContainerDetail> details = receiptContainerDetailService.list(lambdaQueryWrapper);
  299 + for (ReceiptContainerDetail receiptContainerDetail:details){
  300 + LambdaQueryWrapper<Supplier> companyLambda = Wrappers.lambdaQuery();
  301 + companyLambda.eq(Supplier::getCode, receiptContainerDetail.getSupplierCode());
  302 + Supplier supplier = supplierService.getOne(companyLambda);
  303 + String name=null;
  304 + if (supplier != null) {
  305 + name=supplier.getName();
  306 + }
  307 + receiptContainerDetail.setCompanyName(name);
  308 + if(StringUtils.isNotEmpty(receiptContainerDetail.getBatteryTypes())){
  309 + String batteryTypes=dictDataService.selectDictLabel("batteryTypes",receiptContainerDetail.getBatteryTypes());
  310 + receiptContainerDetail.setBatteryTypesName(batteryTypes);
  311 + }
  312 + if(StringUtils.isNotEmpty(receiptContainerDetail.getBatteryPackType())){
  313 + String batteryPackType=dictDataService.selectDictLabel("batteryPackType",receiptContainerDetail.getBatteryPackType());
  314 + receiptContainerDetail.setBatteryPackTypeName(batteryPackType);
  315 + }
  316 + }
  317 + receiptHeader.setTotalLines(details.size());
  318 + mmap.put("receiptHeader", receiptHeader);
288 319 mmap.put("details", details);
289 320  
290 321 return prefix + "/report";
... ...
src/main/java/com/huaheng/pc/receipt/receiptHeader/domain/ReceiptHeader.java
  View file @48b17ea
... ... @@ -369,6 +369,13 @@ public class ReceiptHeader implements Serializable {
369 369 @TableField(value = "pushSuccessStatus")
370 370 @ApiModelProperty(value="回传状态，0默认，1成功，2失败")
371 371 public Integer pushSuccessStatus;
  372 + /**
  373 + * 成品入库主表id
  374 + * @return
  375 + */
  376 + @TableField(value = "barCodeHeaderId")
  377 + @ApiModelProperty(value="成品入库主表id")
  378 + private Integer barCodeHeaderId;
372 379  
373 380 /**
374 381 * 主条码
... ...
src/main/java/com/huaheng/pc/vehicle/vehicleReceipt/controller/VehicelReceiptController.java
  View file @48b17ea
... ... @@ -13,6 +13,7 @@ import com.huaheng.framework.web.domain.AjaxResult;
13 13 import com.huaheng.framework.web.page.PageDomain;
14 14 import com.huaheng.framework.web.page.TableDataInfo;
15 15 import com.huaheng.framework.web.page.TableSupport;
  16 +import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
16 17 import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
17 18 import com.huaheng.pc.vehicle.vehicleReceipt.domain.VehicleReceipt;
18 19 import com.huaheng.pc.vehicle.vehicleReceipt.service.VehicleReceiptService;
... ... @@ -159,6 +160,17 @@ public class VehicelReceiptController extends BaseController {
159 160 }
160 161 }
161 162  
162   -
  163 + /**
  164 + * 车辆入库打印
  165 + */
  166 + @ApiOperation(value = "车辆入库打印", notes = "车辆入库打印", httpMethod = "POST")
  167 + @Log(title = "车辆入库-入库单", operating = "车辆入库打印", action = BusinessType.OTHER)
  168 + @GetMapping("/report/{id}")
  169 + public String report(@ApiParam(name = "id", value = "id")
  170 + @PathVariable("id") Integer id, ModelMap mmap) {
  171 + VehicleReceipt vehicleReceipt= vehicleReceiptService.getById(id);
  172 + mmap.put("vehicleReceipt", vehicleReceipt);
  173 + return prefix + "/report";
  174 + }
163 175  
164 176 }
... ...
src/main/java/com/huaheng/pc/vehicle/vehicleShipment/controller/VehicelShipmentController.java
  View file @48b17ea
... ... @@ -13,6 +13,8 @@ import com.huaheng.framework.web.domain.AjaxResult;
13 13 import com.huaheng.framework.web.page.PageDomain;
14 14 import com.huaheng.framework.web.page.TableDataInfo;
15 15 import com.huaheng.framework.web.page.TableSupport;
  16 +import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
  17 +import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
16 18 import com.huaheng.pc.vehicle.vehicleReceipt.domain.VehicleReceipt;
17 19 import com.huaheng.pc.vehicle.vehicleShipment.domain.VehicleShipment;
18 20 import com.huaheng.pc.vehicle.vehicleShipment.service.VehicleShipmentService;
... ... @@ -134,6 +136,17 @@ public class VehicelShipmentController extends BaseController {
134 136 return prefix + "/gemVehicleShipment";
135 137 }
136 138  
137   -
  139 + /**
  140 + * 车辆出库打印
  141 + */
  142 + @ApiOperation(value = "车辆出库打印", notes = "车辆出库打印", httpMethod = "POST")
  143 + @Log(title = "入库-入库单", operating = "车辆出库打印", action = BusinessType.OTHER)
  144 + @GetMapping("/report/{id}")
  145 + public String report(@ApiParam(name = "id", value = "id")
  146 + @PathVariable("id") Integer id, ModelMap mmap) {
  147 + VehicleShipment vehicleShipment = vehicleShipmentService.getById(id);
  148 + mmap.put("vehicleShipment", vehicleShipment);
  149 + return prefix + "/report";
  150 + }
138 151  
139 152 }
... ...
src/main/resources/templates/login.html
  View file @48b17ea
... ... @@ -35,7 +35,7 @@
35 35 <div class="col-sm-6">
36 36 <div class="signin-info">
37 37 <div class="logopanel m-b">
38   - <h1><img alt="[ 华恒 ]" src="../static/huaheng.png" th:src="@{/huaheng.png}"></h1>
  38 + <h1><img alt="[ 华恒 ]" src="../static/huaheng.png" th:src="@{/img/huaheng.png}"></h1>
39 39 </div>
40 40 <div class="m-b"></div>
41 41 <h4>欢迎使用 <strong>华恒仓库管理系统v2.1</strong></h4>
... ...
src/main/resources/templates/receipt/receiptHeader/report.html
  View file @48b17ea
... ... @@ -8,14 +8,14 @@
8 8 <table id="reportTable" width="100%" border="0" cellspacing="0" cellpadding="0" class="dy-report">
9 9 <thead style="display:table-header-group;">
10 10 <tr>
11   - <td colspan="7">
  11 + <td colspan="10">
12 12 <span style="padding-top:40px;width: 40%; float:left;" th:text="${#dates.format(receiptHeader.created,'yyyy-MM-dd HH:mm:ss')}"></span>
13 13 <h2 style="width:20%;text-align:center;float:left;padding-top:10px;">入库单</h2>
14 14 <span style="padding-top:20px;width:38%;float:right; text-align: right"><img id="receiptCode" th:src="@{'/image/'+${receiptHeader.code}}"></span>
15 15 </td>
16 16 </tr>
17 17 <tr style="padding:15px 0 5px 0;border-bottom:1px solid #606060">
18   - <td colspan="7">
  18 + <td colspan="10">
19 19 <div style="width:50%; float:right; text-align:right">
20 20 <span>明细条数：<span th:text="${receiptHeader['totalLines']}"></span></span>
21 21 <span style="padding-left:20px;">明细总数：<span th:text="${receiptHeader['totalQty']}"></span></span>
... ... @@ -24,24 +24,40 @@
24 24 </td>
25 25 </tr>
26 26 <tr>
27   - <th width="18%">物料编码</th>
28   - <th width="22%">物料名称</th>
29   - <th width="10%">批次</th>
30   - <th width="9%">批号</th>
31   - <th width="11%">工程号</th>
32   - <th width="9%">数量</th>
33   - <th width="21%">条码</th>
  27 + <th width="">物料编码</th>
  28 + <th width="">物料名称</th>
  29 + <!--<th width="10%">批次</th>
  30 + <th width="9%">批号</th>-->
  31 + <!--<th width="">工程号</th>-->
  32 + <th width="">数量</th>
  33 + <th width="">磅单编号</th>
  34 + <th width="">电池类型</th>
  35 + <th width="">电池种类</th>
  36 + <th width="">批号</th>
  37 + <th width="">供应商</th>
  38 + <th width="">国家编码</th>
  39 + <th width="">回收人</th>
  40 + <th width="">电池二维码</th>
  41 + <!--<th width="21%">条码</th>-->
34 42 </tr>
35 43 </thead>
36 44 <tbody>
37 45 <tr th:each="row,rowStat : ${details}">
38 46 <td th:text="${row.materialCode}"></td>
39 47 <td th:text="${row.materialName}"></td>
40   - <td th:text="${row.batch}"></td>
  48 + <!--<td th:text="${row.batch}"></td>
41 49 <td th:text="${row.lot}"></td>
42   - <td th:text="${row.projectNo}"></td>
43   - <td th:text="${row.totalQty}"></td>
44   - <td><img th:src="@{'/image/'+${row.materialCode}}"></td>
  50 + <td th:text="${row.projectNo}"></td>-->
  51 + <td th:text="${row.qty}"></td>
  52 + <td th:text="${row.poundCode}"></td>
  53 + <td th:text="${row.batteryTypesName}"></td>
  54 + <td th:text="${row.batteryPackTypeName}"></td>
  55 + <td th:text="${row.lot}"></td>
  56 + <td th:text="${row.companyName}"></td>
  57 + <td th:text="${row.countryCode}"></td>
  58 + <td th:text="${row.recycler}"></td>
  59 + <td><img th:src="@{'/image/'+${row.batteryPackTwoCode}}"></td>
  60 + <!--<td><img th:src="@{'/image/'+${row.materialCode}}"></td>-->
45 61 </tr>
46 62 </tbody>
47 63 </table>
... ... @@ -51,7 +67,6 @@
51 67 <script type="text/javascript" src="../../../js/barcode/JsBarcode.all.js"></script>
52 68 <script type="text/javascript" src="//static.runoob.com/assets/qrcode/qrcode.min.js"></script>
53 69 <script th:inline="javascript">
54   -
55 70 var barcodeStyle = {
56 71 format: "CODE128",//选择要使用的条形码类型
57 72 width:1,//设置条之间的宽度
... ...
src/main/resources/templates/receipt/receiving/receiving.html
  View file @48b17ea
... ... @@ -46,7 +46,7 @@
46 46 margin-bottom: 0px;
47 47 line-height: 34px;
48 48 }
49   - .table-striped-right .select-list li{
  49 + .table-striped-left .select-list li{
50 50 width:47%;
51 51 float:left;
52 52 }
... ... @@ -107,9 +107,7 @@
107 107  
108 108 <div class="col-sm-12 select-info table-striped-left" style="padding-top: 20px;">
109 109 <!--组盘输入区 -->
110   - <div>
111   - <button class="btn btn-danger" onclick="receipt()">组&nbsp&nbsp&nbsp盘</button>
112   - </div>
  110 +
113 111 <ul class="select-list">
114 112 <input type="text" id="materialCode" hidden/>
115 113 <li style="display: none">id：<input type="text" id="detailId"/></li>
... ... @@ -170,11 +168,12 @@
170 168 <!--<li>回收人：<input type="text" id="recycler"/></li>-->
171 169 <li>国家编码：<input type="text" id="countryCode" placeholder="请用pda扫码获取"/></li>
172 170 <li>备注：<input type="text" id="remark" placeholder="备注"/></li>
173   - <li>
  171 + <!--<li>
  172 +
  173 + </li>-->
  174 + <li><div class="form-group" style="width:80%;white-space: nowrap">
  175 + <img id="camera" name="camera" src="" width="250px" height="200px"/>
174 176 <button id="plc" name="plc" class="btn btn-danger btn-sm" type="button">电池拍照</button>
175   - </li>
176   - <li><div class="form-group" style="width:300px;white-space: nowrap">
177   - <img id="camera" name="camera" src="" width="300px" height="200px"/>
178 177 </div></li>
179 178  
180 179 <!--<div class="form-group" style="width:300px;white-space: nowrap">
... ... @@ -193,6 +192,9 @@
193 192 </li>-->
194 193 </div>
195 194 </ul>
  195 + <div style="padding-left:37%;">
  196 + <button class="btn btn-danger" style="width:150px;" onclick="receipt()">组&nbsp&nbsp&nbsp盘</button>
  197 + </div>
196 198 </div>
197 199 <div class="col-sm-12 table-striped-right" style="padding-top: 13px;">
198 200 <!--需要组盘入库明细 -->
... ...