wms / wms_tianjinggelinmei · Commits

Commit 6392d0d8579ea8b47eff879d55b4249434065320

Authored by 周鸿
2 parents 8328f1ee 2f17a9ff

Merge remote-tracking branch 'origin/develop' into develop

Inline Side-by-side
Showing 7 changed files with 73 additions and 69 deletions
src/main/java/com/huaheng/api/erp/domain/FBatteryBill.java
  View file @6392d0d
... ... @@ -12,12 +12,10 @@ public class FBatteryBill {
12 12 private String F_JY_DCBH;
13 13 //电量
14 14 private String F_JY_SL;
15   -
16 15 //总电量
17 16 private String F_JY_ZDL;
18 17 //总数量
19 18 private String F_JY_ZSL;
20   -
21   -
22   -
  19 + //总重量
  20 + private String F_JY_ZZL;
23 21 }
... ...
src/main/java/com/huaheng/api/erp/service/TaskReturnServiceImpl.java
  View file @6392d0d
... ... @@ -545,28 +545,30 @@ public class TaskReturnServiceImpl implements TaskReturnService {
545 545 //fDetail.setF_DETAIL_ID(inventoryDetail.getReceiptDetailId().toString());
546 546 fDetails.add(fDetail);
547 547 } else {
548   -
  548 + //电池包回传
549 549 FBatteryBill fBatteryBill = new FBatteryBill();
550   - fBatteryBill.setF_JY_MXID(receiptDetail.getFentity());
551   - fBatteryBill.setF_JY_SL(inventoryDetail.getElectricQuantity().toString());
552   - fBatteryBill.setF_JY_DCBH(inventoryDetail.getBatteryPackTwoCode());
553   - fBatteryBill.setF_JY_WLBM(inventoryDetail.getMaterialCode());
554   - //模组和电芯需要回传单据数量
555   - if ("模组".equals(inventoryDetail.getMaterialName()) || "电芯".equals(inventoryDetail.getMaterialName())){
556   - fBatteryBill.setF_JY_ZSL(receiptDetail.getTotalQty().toString());//总数量
557   - }else {
558   - fBatteryBill.setF_JY_ZSL("0");//总数量
559   - }
560   -
561   - List<InventoryDetail> list1 = inventoryDetailService.list(new LambdaQueryWrapper<InventoryDetail>()
  550 + fBatteryBill.setF_JY_MXID(receiptDetail.getFentity());//单据体制码
  551 + fBatteryBill.setF_JY_SL(inventoryDetail.getElectricQuantity().toString());//电量
  552 + fBatteryBill.setF_JY_DCBH(inventoryDetail.getBatteryPackTwoCode());//电池包号
  553 + fBatteryBill.setF_JY_WLBM(inventoryDetail.getMaterialCode());//物料编码
  554 + fBatteryBill.setF_JY_ZSL(receiptDetail.getTotalQty().toString());//总数量
  555 +
  556 + //如果单位是pcs,回传电量和重量
  557 + //if ("Pcs".equals(inventoryDetail.getMaterialUnit())){
  558 + //}
  559 + List<InventoryDetail> inventoryDetails = inventoryDetailService.list(new LambdaQueryWrapper<InventoryDetail>()
562 560 .eq(InventoryDetail::getReceiptDetailId, receiptDetail.getId()));
563 561  
564   - BigDecimal bigDecimal = new BigDecimal(0);
565   - for (InventoryDetail detail : list1) {
566   - bigDecimal=bigDecimal.add(detail.getElectricQuantity());
  562 + BigDecimal ZDL = new BigDecimal(0);
  563 + BigDecimal ZZL = new BigDecimal(0);
  564 + for (InventoryDetail detail : inventoryDetails) {
  565 + ZDL=ZDL.add(detail.getElectricQuantity());
  566 + ZZL=ZZL.add(detail.getMaterialGrossWeight());//物料毛重
567 567 }
568   - fBatteryBill.setF_JY_ZDL(bigDecimal.toString());//总电量
  568 + fBatteryBill.setF_JY_ZDL(ZDL.toString());//总电量
  569 + fBatteryBill.setF_JY_ZZL(ZZL.toString());//总重量
569 570 fBatteryBills.add(fBatteryBill);
  571 +
570 572 //计算一条入库明细的电池包总数量
571 573 /*LambdaQueryWrapper<InventoryDetail> inventorylambdaQueryWrapper = Wrappers.lambdaQuery();
572 574 inventorylambdaQueryWrapper.eq(InventoryDetail::getReceiptDetailId,inventoryDetail.getReceiptDetailId());
... ...
src/main/resources/templates/barcode/barCodeHeader/barCodeHeader.html
  View file @6392d0d
... ... @@ -345,6 +345,7 @@
345 345 {
346 346 field : 'receiptNote',
347 347 title : '-1回传重量',
  348 + visible: false
348 349 },
349 350 {
350 351 field: 'erpErrorMsg',
... ... @@ -491,7 +492,8 @@
491 492 },
492 493 {
493 494 field : 'weight',
494   - title : '单个平均重量'
  495 + title : '单个平均重量',
  496 + visible: false
495 497 },
496 498 {
497 499 field : 'regenerationCode',
... ...
src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html
  View file @6392d0d
... ... @@ -33,14 +33,14 @@
33 33 物料名称：<input type="text" name="materialName"/>
34 34 </li>
35 35 <li>
36   - 电池包二维码：<input type="text" name="batteryPackTwoCode"/>
  36 + 电池包号：<input type="text" name="batteryPackTwoCode"/>
37 37 </li>
38 38  
39 39 <li>
40 40 原料批号：<input type="text" name="materialBatch"/>
41 41 </li>
42 42 <li>
43   - 成品电池信息码：<input type="text" name="barMaterialCode"/>
  43 + 成品内码：<input type="text" name="barMaterialCode"/>
44 44 </li>
45 45 <li>
46 46 物料规格：<input type="text" name="materialSpec"/>
... ... @@ -58,7 +58,7 @@
58 58 <!-- 供应商编码：<input type="text" name="supplierCode"/>-->
59 59 <!-- </li>-->
60 60 <li>
61   - 货主：
  61 + 货主信息：
62 62 <select id="companyCode" name="companyCode" th:with="list=${@companyService.getCode()}">
63 63 <option value="">所有</option>
64 64 <option th:each="item : ${list}" th:text="${item['name']}" th:value="${item['code']}" th:attr = " code = ${item['code']}"></option>
... ... @@ -71,12 +71,13 @@
71 71 <!-- 上游行号：<input type="text" name="referDetailId"/>-->
72 72 <!-- </li>-->
73 73 <li>
74   - WMS入库单号：<input type="text" name="receiptCode"/>
  74 + 入库单子ID：<input type="text" name="receiptDetailId"/>
75 75 </li>
76 76 <li>
77   - 入库单明细ID：<input type="text" name="receiptDetailId"/>
  77 + WMS入库单号：<input type="text" name="receiptCode"/>
78 78 </li>
79 79  
  80 +
80 81 <!-- <li>-->
81 82 <!-- 项 目 号：<input type="text" name="projectNo"/>-->
82 83 <!-- </li>-->
... ...
src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html
  View file @6392d0d
... ... @@ -24,8 +24,9 @@
24 24 <form id="inventoryHeader-form">
25 25 <div class="select-list">
26 26 <ul>
  27 +
27 28 <li>
28   - 库区：
  29 + 仓库库区：
29 30 <select id="zoneCode" name="zoneCode" th:with="list=${@zone.getCode()}">
30 31 <option value="">所有</option>
31 32 <option th:each="item : ${list}" th:text="${item['name']}" th:value="${item['code']}" th:attr = " code = ${item['code']}"></option>
... ... @@ -41,16 +42,16 @@
41 42 创建用户：<input type="text" name="createdBy"/>
42 43 </li>
43 44 <li>
44   - 行：<input type="text" name="iRow"/>
  45 + 库位行数：<input type="text" name="iRow"/>
45 46 </li>
46 47 <li>
47   - 列：<input type="text" name="iColumn"/>
  48 + 库位列数：<input type="text" name="iColumn"/>
48 49 </li>
49 50 <li>
50   - 层：<input type="text" name="iLayer"/>
  51 + 库位层数：<input type="text" name="iLayer"/>
51 52 </li>
52 53 <li>
53   - 格：<input type="text" name="iGrid"/>
  54 + 库位格数：<input type="text" name="iGrid"/>
54 55 </li>
55 56  
56 57 <li>
... ... @@ -70,6 +71,7 @@
70 71 class="fa fa-search"></i>&nbsp;搜索</a>
71 72 <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('inventoryHeader-form')"><i class="fa fa-refresh"></i>&nbsp;重置</a>
72 73 </li>
  74 +
73 75 </ul>
74 76 </div>
75 77 </form>
... ... @@ -464,4 +466,4 @@
464 466 </form>
465 467 </script>
466 468 </body>
467   -</html>
468 469 \ No newline at end of file
  470 +</html>
... ...
src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
  View file @6392d0d
... ... @@ -60,34 +60,34 @@
60 60 <option th:each="item : ${list}" th:text="${item['name']}" th:value="${item['code']}" th:attr = " code = ${item['code']}"></option>
61 61 </select>
62 62 </li>
  63 +
63 64 <li>
64   - <!--入库类型：<input type="text" name="sourceCode"/>-->
65   - 入库类型：<select name="receiptType" th:with="type=${@receiptTypeService.getType()}" id="receiptType">
66   - <option value="">所有</option>
67   - <option th:each="e : ${type}" th:text="${e['name']}" th:value="${e['code']}"></option></select>
  65 + 供应商：<input type="text" name="userDef1"/>
68 66 </li>
  67 +
  68 + <li>
  69 + ERP回传状态：<select id="pushSuccessStatus" name="pushSuccessStatus">
  70 + <option value="">所有</option>
  71 + <option value="0">未回传</option>
  72 + <option value="1">回传成功</option>
  73 + <option value="2">回传失败</option>
  74 + </select>
69 75 <li>
70   - 供 应 商：<input type="text" name="userDef1"/>
  76 + 单据入库类型：<select name="receiptType" th:with="type=${@receiptTypeService.getType()}" id="receiptType">
  77 + <option value="">所有</option>
  78 + <option th:each="e : ${type}" th:text="${e['name']}" th:value="${e['code']}"></option></select>
71 79 </li>
72 80 <li>
73   - <!--头 状 态：<input type="text" name="firstStatus"/>-->
74   - 头 状 态：<select name="firstStatus" th:with="firstStatus=${@dict.getType('receiptHeaderStatus')}">
  81 + 头状态：<select name="firstStatus" th:with="firstStatus=${@dict.getType('receiptHeaderStatus')}">
75 82 <option value="">所有</option>
76 83 <option th:each="e : ${firstStatus}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option></select>
77 84 </li>
78 85 <li>
79   - <!--尾 状 态：<input type="text" name="lastStatus"/>-->
80   - 尾 状 态：<select name="lastStatus" th:with="lastStatus=${@dict.getType('receiptHeaderStatus')}">
  86 + 尾状态：<select name="lastStatus" th:with="lastStatus=${@dict.getType('receiptHeaderStatus')}">
81 87 <option value="">所有</option>
82 88 <option th:each="e : ${lastStatus}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option></select>
83 89 </li>
84   - <li>
85   - ERP回传状态：<select id="pushSuccessStatus" name="pushSuccessStatus">
86   - <option value="">所有</option>
87   - <option value="0">未回传</option>
88   - <option value="1">回传成功</option>
89   - <option value="2">回传失败</option>
90   - </select>
  90 +
91 91 </li>
92 92 <li>
93 93 物料编码：<input type="text" name="materialCode"/>
... ...
src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html
  View file @6392d0d
... ... @@ -37,12 +37,9 @@
37 37 ERP出库单号：<input type="text" name="referCode"/>
38 38 </li>
39 39 <li>
40   - 出库类型：<select name="shipmentType"
41   - th:with="shipmentType=${@ShipmentTypeService.getType()}">
42   - <option value="">所有</option>
43   - <option th:each="e : ${shipmentType}" th:text="${e['name']}"
44   - th:value="${e['code']}"></option>
45   - </select>
  40 + 客户：<input type="text" name="customerName"/>
  41 + </li>
  42 +
46 43 </li>
47 44 <li>
48 45 货主：<select id="companyCode" name="companyCode"
... ... @@ -52,13 +49,22 @@
52 49 th:value="${item['code']}" th:attr=" code = ${item['code']}"></option>
53 50 </select>
54 51 </li>
55   -
56 52 <li>
57   - 客户：<input type="text" name="customerName"/>
58   - </li>
  53 + ERP回传状态：<select id="pushSuccessStatus" name="pushSuccessStatus">
  54 + <option value="">所有</option>
  55 + <option value="0">未回传</option>
  56 + <option value="1">回传成功</option>
  57 + <option value="2">回传失败</option>
  58 + </select>
  59 + <li>
  60 + 单据出库类型：<select name="shipmentType"
  61 + th:with="shipmentType=${@ShipmentTypeService.getType()}">
  62 + <option value="">所有</option>
  63 + <option th:each="e : ${shipmentType}" th:text="${e['name']}"
  64 + th:value="${e['code']}"></option>
  65 + </select>
59 66 <li>
60   - <!--头 状 态：<input type="text" name="firstStatus"/>-->
61   - 头 状 态：<select name="firstStatus"
  67 + 头状态：<select name="firstStatus"
62 68 th:with="firstStatus=${@dict.getType('shipmentHeaderStatus')}">
63 69 <option value="">所有</option>
64 70 <option th:each="e : ${firstStatus}" th:text="${e['dictLabel']}"
... ... @@ -66,21 +72,14 @@
66 72 </select>
67 73 </li>
68 74 <li>
69   - <!--尾 状 态：<input type="text" name="lastStatus"/>-->
70   - 尾 状 态：<select name="lastStatus"
  75 + 尾状态：<select name="lastStatus"
71 76 th:with="lastStatus=${@dict.getType('shipmentHeaderStatus')}">
72 77 <option value="">所有</option>
73 78 <option th:each="e : ${lastStatus}" th:text="${e['dictLabel']}"
74 79 th:value="${e['dictValue']}"></option>
75 80 </select>
76 81 </li>
77   - <li>
78   - ERP回传状态：<select id="pushSuccessStatus" name="pushSuccessStatus">
79   - <option value="">所有</option>
80   - <option value="0">未回传</option>
81   - <option value="1">回传成功</option>
82   - <option value="2">回传失败</option>
83   - </select>
  82 +
84 83 </li>
85 84 <li class="time">
86 85 <label>创建时间： </label>
... ...