From ddeec92f9601b22b78c14ce733df72b9588e7bee Mon Sep 17 00:00:00 2001
From: yiwenpeng <ywp303@163.com>
Date: Mon, 29 Aug 2022 11:11:18 +0800
Subject: [PATCH] 库存明细新增电池包二维码、成品物料码、原料批号搜索，成品入库将成品物料码传入库存明细中
---
src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java | 3 +++
src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java | 4 ++++
src/main/java/com/huaheng/pc/task/taskHeader/service/ReceiptTaskService.java | 1 +
src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html | 49 +++++++++++++++++++++++++++++++------------------
src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html | 1 +
5 files changed, 40 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java b/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java
index a2ff95f..7daf87b 100644
--- a/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java
+++ b/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java
@@ -76,6 +76,9 @@ public class InventoryDetailController extends BaseController
.eq(InventoryDetail::getWarehouseCode, ShiroUtils.getWarehouseCode())//仓库
.eq(inventoryDetail.getInventoryHeaderId() != null,InventoryDetail::getInventoryHeaderId,inventoryDetail.getInventoryHeaderId()) //ID
.eq(StringUtils.isNotEmpty(inventoryDetail.getLocationCode()),InventoryDetail::getLocationCode,inventoryDetail.getLocationCode()) //库位
+ .eq(StringUtils.isNotEmpty(inventoryDetail.getBatteryPackTwoCode()),InventoryDetail::getBatteryPackTwoCode,inventoryDetail.getBatteryPackTwoCode()) //电池包二维码
+ .eq(StringUtils.isNotEmpty(inventoryDetail.getMaterialBatch()),InventoryDetail::getMaterialBatch,inventoryDetail.getMaterialBatch()) //原料批号
+ .eq(StringUtils.isNotEmpty(inventoryDetail.getBarMaterialCode()),InventoryDetail::getBarMaterialCode,inventoryDetail.getBarMaterialCode()) //成品物料码
.eq(StringUtils.isNotEmpty(inventoryDetail.getContainerCode()),InventoryDetail::getContainerCode,inventoryDetail.getContainerCode())//容器
.eq(StringUtils.isNotEmpty(inventoryDetail.getSupplierCode()),InventoryDetail::getSupplierCode,inventoryDetail.getSupplierCode())//供应商
.eq(StringUtils.isNotEmpty(inventoryDetail.getMaterialCode()),InventoryDetail::getMaterialCode,inventoryDetail.getMaterialCode())//物料编码
diff --git a/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java b/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java
index 70d7dc7..b413912 100644
--- a/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java
+++ b/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java
@@ -477,6 +477,10 @@ public class InventoryDetail implements Serializable {
@ApiModelProperty(value="同步标识")
private Integer syncErp;
+ @TableField(value = "barMaterialCode")
+ @ApiModelProperty(value="成品物料码")
+ private String barMaterialCode;
+
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
diff --git a/src/main/java/com/huaheng/pc/task/taskHeader/service/ReceiptTaskService.java b/src/main/java/com/huaheng/pc/task/taskHeader/service/ReceiptTaskService.java
index d885a4b..00a0835 100644
--- a/src/main/java/com/huaheng/pc/task/taskHeader/service/ReceiptTaskService.java
+++ b/src/main/java/com/huaheng/pc/task/taskHeader/service/ReceiptTaskService.java
@@ -746,6 +746,7 @@ public class ReceiptTaskService {
barCodeHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
barCodeHeaderService.updateById(barCodeHeader);
inventoryDetail.setDayShift(barCodeDetail.getDayShift());
+ inventoryDetail.setBarMaterialCode(barCodeDetail.getCode());
inventoryDetail.setRegenerationCode(barCodeDetail.getRegenerationCode());
inventoryDetail.setReceiptCode(barCodeHeader.getCode());
inventoryDetail.setMaterialBatch(barCodeHeader.getMaterialBatch());
diff --git a/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html b/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html
index da07225..1bba5fe 100644
--- a/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html
+++ b/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html
@@ -25,6 +25,15 @@
物料名称：<input type="text" name="materialName"/>
</li>
<li>
+ 电池包二维码：<input type="text" name="batteryPackTwoCode"/>
+ </li>
+ <li>
+ 原料批号：<input type="text" name="materialBatch"/>
+ </li>
+ <li>
+ 成品物料码：<input type="text" name="barMaterialCode"/>
+ </li>
+ <li>
物料规格：<input type="text" name="materialSpec"/>
</li>
<li>
@@ -36,9 +45,9 @@
</option>
</select>
</li>
- <li>
- 供应商编码：<input type="text" name="supplierCode"/>
- </li>
+<!-- <li>-->
+<!-- 供应商编码：<input type="text" name="supplierCode"/>-->
+<!-- </li>-->
<li>
货主：
<select id="companyCode" name="companyCode" th:with="list=${@companyService.getCode()}">
@@ -46,12 +55,12 @@
<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="referCode"/>
- </li>
- <li>
- 上游行号：<input type="text" name="referDetailId"/>
- </li>
+<!-- <li>-->
+<!-- 上游单号：<input type="text" name="referCode"/>-->
+<!-- </li>-->
+<!-- <li>-->
+<!-- 上游行号：<input type="text" name="referDetailId"/>-->
+<!-- </li>-->
<li>
入库编码：<input type="text" name="receiptCode"/>
</li>
@@ -59,15 +68,15 @@
入库明细ID：<input type="text" name="receiptDetailId"/>
</li>
- <li>
- 项 目 号：<input type="text" name="projectNo"/>
- </li>
- <li>
- 批 次：<input type="text" name="batch"/>
- </li>
- <li>
- 批 号：<input type="text" name="lot"/>
- </li>
+<!-- <li>-->
+<!-- 项 目 号：<input type="text" name="projectNo"/>-->
+<!-- </li>-->
+<!-- <li>-->
+<!-- 批 次：<input type="text" name="batch"/>-->
+<!-- </li>-->
+<!-- <li>-->
+<!-- 批 号：<input type="text" name="lot"/>-->
+<!-- </li>-->
<li class="time2" style="height:30px">
<label>创建时间： </label>
@@ -229,6 +238,10 @@
align: 'center',
},
{
+ field : 'barMaterialCode',
+ title : '成品物料码',
+ },
+ {
field : 'materialBatch',
title : '原料批号',
},
diff --git a/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html b/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html
index 99cf85a..00e9a41 100644
--- a/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html
+++ b/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html
@@ -43,6 +43,7 @@
<li>
更新用户：<input type="text" name="lastUpdatedBy"/>
</li>
+
<li class="time2">
<label>创建时间： </label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间"
--
libgit2 0.22.2