From ba7819193551a1ec22d863a375868c89c18b6e5d Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期一, 16 六月 2025 10:08:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/WrkDetlLog.java | 7 +++++++
src/main/resources/mapper/asrs/WrkDetlMapper.xml | 1 +
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 14 ++++++++++++++
src/main/java/com/zy/asrs/entity/WrkDetl.java | 7 +++++++
src/main/resources/mapper/asrs/WrkDetlLogMapper.xml | 1 +
5 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index 7bb2f74..ca41b48 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -310,6 +310,13 @@
@TableField("box_type3")
private String boxType3 = "";
+ /**
+ * 搴撳瓨
+ */
+ @ApiModelProperty(value = "搴撳瓨")
+ @TableField("stock_num")
+ private Double stockNum;
+
public String getIoTime$() {
if (Cools.isEmpty(this.ioTime)) {
return "";
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
index 58e883c..a67aecf 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -310,6 +310,13 @@
@TableField("box_type3")
private String boxType3 = "";
+ /**
+ * 搴撳瓨
+ */
+ @ApiModelProperty(value = "搴撳瓨")
+ @TableField("stock_num")
+ private Double stockNum;
+
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
return "";
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 8704e8f..c2cd099 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -482,6 +482,19 @@
, locDto.getStandby1(), locDto.getStandby2(), locDto.getStandby3(), locDto.getBoxType1(), locDto.getBoxType2(), locDto.getBoxType3());
}
+
+ Wrapper<LocDetl> wrapper = new EntityWrapper<LocDetl>()
+ .eq("loc_no", wrkMast.getLocNo())
+ .eq("matnr", orderDetlPakout.getMatnr());
+ if (!Cools.isEmpty(locDto.getBatch())) {
+ wrapper.eq("batch", locDto.getBatch());
+ }
+ if (!Cools.isEmpty(orderDetlPakout.getSpecs())) {
+ wrapper.eq("specs", orderDetlPakout.getSpecs());
+ }
+
+ LocDetl locDetl = locDetlService.selectOne(wrapper);
+
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.sync(orderDetlPakout);
wrkDetl.setZpallet(wrkMast.getBarcode());
@@ -496,6 +509,7 @@
wrkDetl.setModiUser(userId);
wrkDetl.setThreeCode(orderDetlPakout.getId() + "");
wrkDetl.setSupp(orderPakout.getCstmrName());
+ wrkDetl.setStockNum(locDetl.getAnfme());//搴撳瓨
//璁＄畻杈呮暟閲�
Double weight = MatUtils.calcWeight(wrkDetl.getMatnr(), wrkDetl.getAnfme());
diff --git a/src/main/resources/mapper/asrs/WrkDetlLogMapper.xml b/src/main/resources/mapper/asrs/WrkDetlLogMapper.xml
index aed5134..814c2b6 100644
--- a/src/main/resources/mapper/asrs/WrkDetlLogMapper.xml
+++ b/src/main/resources/mapper/asrs/WrkDetlLogMapper.xml
@@ -51,6 +51,7 @@
<result column="box_type1" property="boxType1" />
<result column="box_type2" property="boxType2" />
<result column="box_type3" property="boxType3" />
+ <result column="stock_num" property="stockNum" />
</resultMap>
<sql id="batchSeq">
diff --git a/src/main/resources/mapper/asrs/WrkDetlMapper.xml b/src/main/resources/mapper/asrs/WrkDetlMapper.xml
index 34e41c4..3920447 100644
--- a/src/main/resources/mapper/asrs/WrkDetlMapper.xml
+++ b/src/main/resources/mapper/asrs/WrkDetlMapper.xml
@@ -51,6 +51,7 @@
<result column="box_type1" property="boxType1" />
<result column="box_type2" property="boxType2" />
<result column="box_type3" property="boxType3" />
+ <result column="stock_num" property="stockNum" />
</resultMap>
<sql id="batchSeq">
--
Gitblit v1.9.1