diff --git a/src/main/java/com/huaheng/api/erp/domain/FBatteryBill.java b/src/main/java/com/huaheng/api/erp/domain/FBatteryBill.java
index 989bf9f..8df53f3 100644
--- a/src/main/java/com/huaheng/api/erp/domain/FBatteryBill.java
+++ b/src/main/java/com/huaheng/api/erp/domain/FBatteryBill.java
@@ -12,12 +12,10 @@ public class FBatteryBill {
private String F_JY_DCBH;
//电量
private String F_JY_SL;
-
//总电量
private String F_JY_ZDL;
//总数量
private String F_JY_ZSL;
-
-
-
+ //总重量
+ private String F_JY_ZZL;
}
diff --git a/src/main/java/com/huaheng/api/erp/service/TaskReturnServiceImpl.java b/src/main/java/com/huaheng/api/erp/service/TaskReturnServiceImpl.java
index 6a194f4..33b93af 100644
--- a/src/main/java/com/huaheng/api/erp/service/TaskReturnServiceImpl.java
+++ b/src/main/java/com/huaheng/api/erp/service/TaskReturnServiceImpl.java
@@ -545,28 +545,30 @@ public class TaskReturnServiceImpl implements TaskReturnService {
//fDetail.setF_DETAIL_ID(inventoryDetail.getReceiptDetailId().toString());
fDetails.add(fDetail);
} else {
-
+ //电池包回传
FBatteryBill fBatteryBill = new FBatteryBill();
- fBatteryBill.setF_JY_MXID(receiptDetail.getFentity());
- fBatteryBill.setF_JY_SL(inventoryDetail.getElectricQuantity().toString());
- fBatteryBill.setF_JY_DCBH(inventoryDetail.getBatteryPackTwoCode());
- fBatteryBill.setF_JY_WLBM(inventoryDetail.getMaterialCode());
- //模组和电芯需要回传单据数量
- if ("模组".equals(inventoryDetail.getMaterialName()) || "电芯".equals(inventoryDetail.getMaterialName())){
- fBatteryBill.setF_JY_ZSL(receiptDetail.getTotalQty().toString());//总数量
- }else {
- fBatteryBill.setF_JY_ZSL("0");//总数量
- }
-
- List<InventoryDetail> list1 = inventoryDetailService.list(new LambdaQueryWrapper<InventoryDetail>()
+ fBatteryBill.setF_JY_MXID(receiptDetail.getFentity());//单据体制码
+ fBatteryBill.setF_JY_SL(inventoryDetail.getElectricQuantity().toString());//电量
+ fBatteryBill.setF_JY_DCBH(inventoryDetail.getBatteryPackTwoCode());//电池包号
+ fBatteryBill.setF_JY_WLBM(inventoryDetail.getMaterialCode());//物料编码
+ fBatteryBill.setF_JY_ZSL(receiptDetail.getTotalQty().toString());//总数量
+
+ //如果单位是pcs,回传电量和重量
+ //if ("Pcs".equals(inventoryDetail.getMaterialUnit())){
+ //}
+ List<InventoryDetail> inventoryDetails = inventoryDetailService.list(new LambdaQueryWrapper<InventoryDetail>()
.eq(InventoryDetail::getReceiptDetailId, receiptDetail.getId()));
- BigDecimal bigDecimal = new BigDecimal(0);
- for (InventoryDetail detail : list1) {
- bigDecimal=bigDecimal.add(detail.getElectricQuantity());
+ BigDecimal ZDL = new BigDecimal(0);
+ BigDecimal ZZL = new BigDecimal(0);
+ for (InventoryDetail detail : inventoryDetails) {
+ ZDL=ZDL.add(detail.getElectricQuantity());
+ ZZL=ZZL.add(detail.getMaterialGrossWeight());//物料毛重
}
- fBatteryBill.setF_JY_ZDL(bigDecimal.toString());//总电量
+ fBatteryBill.setF_JY_ZDL(ZDL.toString());//总电量
+ fBatteryBill.setF_JY_ZZL(ZZL.toString());//总重量
fBatteryBills.add(fBatteryBill);
+
//计算一条入库明细的电池包总数量
/*LambdaQueryWrapper<InventoryDetail> inventorylambdaQueryWrapper = Wrappers.lambdaQuery();
inventorylambdaQueryWrapper.eq(InventoryDetail::getReceiptDetailId,inventoryDetail.getReceiptDetailId());
diff --git a/src/main/resources/templates/barcode/barCodeHeader/barCodeHeader.html b/src/main/resources/templates/barcode/barCodeHeader/barCodeHeader.html
index 8975915..8d5a55c 100644
--- a/src/main/resources/templates/barcode/barCodeHeader/barCodeHeader.html
+++ b/src/main/resources/templates/barcode/barCodeHeader/barCodeHeader.html
@@ -345,6 +345,7 @@
{
field : 'receiptNote',
title : '-1回传重量',
+ visible: false
},
{
field: 'erpErrorMsg',
@@ -491,7 +492,8 @@
},
{
field : 'weight',
- title : '单个平均重量'
+ title : '单个平均重量',
+ visible: false
},
{
field : 'regenerationCode',
diff --git a/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html b/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html
index ef60c1f..37b16dd 100644
--- a/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html
+++ b/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html
@@ -33,14 +33,14 @@
物料名称：<input type="text" name="materialName"/>
</li>
<li>
- 电池包二维码：<input type="text" name="batteryPackTwoCode"/>
+ 电池包号：<input type="text" name="batteryPackTwoCode"/>
</li>
<li>
原料批号：<input type="text" name="materialBatch"/>
</li>
<li>
- 成品电池信息码：<input type="text" name="barMaterialCode"/>
+ 成品内码：<input type="text" name="barMaterialCode"/>
</li>
<li>
物料规格：<input type="text" name="materialSpec"/>
@@ -58,7 +58,7 @@
<!-- 供应商编码：<input type="text" name="supplierCode"/>-->
<!-- </li>-->
<li>
- 货主：
+ 货主信息：
<select id="companyCode" name="companyCode" th:with="list=${@companyService.getCode()}">
<option value="">所有</option>
<option th:each="item : ${list}" th:text="${item['name']}" th:value="${item['code']}" th:attr = " code = ${item['code']}"></option>
@@ -71,12 +71,13 @@
<!-- 上游行号：<input type="text" name="referDetailId"/>-->
<!-- </li>-->
<li>
- WMS入库单号：<input type="text" name="receiptCode"/>
+ 入库单子ID：<input type="text" name="receiptDetailId"/>
</li>
<li>
- 入库单明细ID：<input type="text" name="receiptDetailId"/>
+ WMS入库单号：<input type="text" name="receiptCode"/>
</li>
+
<!-- <li>-->
<!-- 项 目 号：<input type="text" name="projectNo"/>-->
<!-- </li>-->
diff --git a/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html b/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html
index 9536d96..1e3eb33 100644
--- a/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html
+++ b/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html
@@ -24,8 +24,9 @@
<form id="inventoryHeader-form">
<div class="select-list">
<ul>
+
<li>
- 库区：
+ 仓库库区：
<select id="zoneCode" name="zoneCode" th:with="list=${@zone.getCode()}">
<option value="">所有</option>
<option th:each="item : ${list}" th:text="${item['name']}" th:value="${item['code']}" th:attr = " code = ${item['code']}"></option>
@@ -41,16 +42,16 @@
创建用户：<input type="text" name="createdBy"/>
</li>
<li>
- 行：<input type="text" name="iRow"/>
+ 库位行数：<input type="text" name="iRow"/>
</li>
<li>
- 列：<input type="text" name="iColumn"/>
+ 库位列数：<input type="text" name="iColumn"/>
</li>
<li>
- 层：<input type="text" name="iLayer"/>
+ 库位层数：<input type="text" name="iLayer"/>
</li>
<li>
- 格：<input type="text" name="iGrid"/>
+ 库位格数：<input type="text" name="iGrid"/>
</li>
<li>
@@ -70,6 +71,7 @@
class="fa fa-search"></i> 搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('inventoryHeader-form')"><i class="fa fa-refresh"></i> 重置</a>
</li>
+
</ul>
</div>
</form>
@@ -464,4 +466,4 @@
</form>
</script>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html b/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
index c96d1e4..7a0fea1 100644
--- a/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
+++ b/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
@@ -60,34 +60,34 @@
<option th:each="item : ${list}" th:text="${item['name']}" th:value="${item['code']}" th:attr = " code = ${item['code']}"></option>
</select>
</li>
+
<li>
- <!--入库类型：<input type="text" name="sourceCode"/>-->
- 入库类型：<select name="receiptType" th:with="type=${@receiptTypeService.getType()}" id="receiptType">
- <option value="">所有</option>
- <option th:each="e : ${type}" th:text="${e['name']}" th:value="${e['code']}"></option></select>
+ 供应商：<input type="text" name="userDef1"/>
</li>
+
+ <li>
+ ERP回传状态：<select id="pushSuccessStatus" name="pushSuccessStatus">
+ <option value="">所有</option>
+ <option value="0">未回传</option>
+ <option value="1">回传成功</option>
+ <option value="2">回传失败</option>
+ </select>
<li>
- 供 应 商：<input type="text" name="userDef1"/>
+ 单据入库类型：<select name="receiptType" th:with="type=${@receiptTypeService.getType()}" id="receiptType">
+ <option value="">所有</option>
+ <option th:each="e : ${type}" th:text="${e['name']}" th:value="${e['code']}"></option></select>
</li>
<li>
- <!--头 状 态：<input type="text" name="firstStatus"/>-->
- 头 状 态：<select name="firstStatus" th:with="firstStatus=${@dict.getType('receiptHeaderStatus')}">
+ 头状态：<select name="firstStatus" th:with="firstStatus=${@dict.getType('receiptHeaderStatus')}">
<option value="">所有</option>
<option th:each="e : ${firstStatus}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option></select>
</li>
<li>
- <!--尾 状 态：<input type="text" name="lastStatus"/>-->
- 尾 状 态：<select name="lastStatus" th:with="lastStatus=${@dict.getType('receiptHeaderStatus')}">
+ 尾状态：<select name="lastStatus" th:with="lastStatus=${@dict.getType('receiptHeaderStatus')}">
<option value="">所有</option>
<option th:each="e : ${lastStatus}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option></select>
</li>
- <li>
- ERP回传状态：<select id="pushSuccessStatus" name="pushSuccessStatus">
- <option value="">所有</option>
- <option value="0">未回传</option>
- <option value="1">回传成功</option>
- <option value="2">回传失败</option>
- </select>
+
</li>
<li>
物料编码：<input type="text" name="materialCode"/>
diff --git a/src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html b/src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html
index 0480599..94d7db0 100644
--- a/src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html
+++ b/src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html
@@ -37,12 +37,9 @@
ERP出库单号：<input type="text" name="referCode"/>
</li>
<li>
- 出库类型：<select name="shipmentType"
- th:with="shipmentType=${@ShipmentTypeService.getType()}">
- <option value="">所有</option>
- <option th:each="e : ${shipmentType}" th:text="${e['name']}"
- th:value="${e['code']}"></option>
- </select>
+ 客户：<input type="text" name="customerName"/>
+ </li>
+
</li>
<li>
货主：<select id="companyCode" name="companyCode"
@@ -52,13 +49,22 @@
th:value="${item['code']}" th:attr=" code = ${item['code']}"></option>
</select>
</li>
-
<li>
- 客户：<input type="text" name="customerName"/>
- </li>
+ ERP回传状态：<select id="pushSuccessStatus" name="pushSuccessStatus">
+ <option value="">所有</option>
+ <option value="0">未回传</option>
+ <option value="1">回传成功</option>
+ <option value="2">回传失败</option>
+ </select>
+ <li>
+ 单据出库类型：<select name="shipmentType"
+ th:with="shipmentType=${@ShipmentTypeService.getType()}">
+ <option value="">所有</option>
+ <option th:each="e : ${shipmentType}" th:text="${e['name']}"
+ th:value="${e['code']}"></option>
+ </select>
<li>
- <!--头 状 态：<input type="text" name="firstStatus"/>-->
- 头 状 态：<select name="firstStatus"
+ 头状态：<select name="firstStatus"
th:with="firstStatus=${@dict.getType('shipmentHeaderStatus')}">
<option value="">所有</option>
<option th:each="e : ${firstStatus}" th:text="${e['dictLabel']}"
@@ -66,21 +72,14 @@
</select>
</li>
<li>
- <!--尾 状 态：<input type="text" name="lastStatus"/>-->
- 尾 状 态：<select name="lastStatus"
+ 尾状态：<select name="lastStatus"
th:with="lastStatus=${@dict.getType('shipmentHeaderStatus')}">
<option value="">所有</option>
<option th:each="e : ${lastStatus}" th:text="${e['dictLabel']}"
th:value="${e['dictValue']}"></option>
</select>
</li>
- <li>
- ERP回传状态：<select id="pushSuccessStatus" name="pushSuccessStatus">
- <option value="">所有</option>
- <option value="0">未回传</option>
- <option value="1">回传成功</option>
- <option value="2">回传失败</option>
- </select>
+
</li>
<li class="time">
<label>创建时间： </label>