From b67bafd95dc17136ac0eab068ba51cd55e1669f3 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期五, 13 六月 2025 20:08:12 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/param/CombParam.java | 3 +++
src/main/java/com/zy/asrs/entity/WaitPakinLog.java | 7 +++++++
src/main/java/com/zy/asrs/entity/WaitPakin.java | 7 +++++++
src/main/resources/mapper/asrs/WaitPakinMapper.xml | 1 +
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 3 +++
src/main/java/com/zy/common/model/DetlDto.java | 2 ++
src/main/resources/mapper/asrs/WaitPakinLogMapper.xml | 1 +
7 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index 757e55b..16a8879 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -196,6 +196,13 @@
@TableField("box_type3")
private String boxType3 = "";
+ /**
+ * 閫�搴撴爣璁�
+ */
+ @ApiModelProperty(value= "閫�搴撴爣璁�")
+ @TableField("tk_flag")
+ private String tkFlag = "";
+
public String getBeBatch$(){
if (null == this.beBatch){ return null; }
switch (this.beBatch){
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
index b319f2b..6561f30 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
@@ -195,6 +195,13 @@
@TableField("box_type3")
private String boxType3 = "";
+ /**
+ * 閫�搴撴爣璁�
+ */
+ @ApiModelProperty(value= "閫�搴撴爣璁�")
+ @TableField("tk_flag")
+ private String tkFlag = "";
+
public String getBeBatch$(){
if (null == this.beBatch){ return null; }
switch (this.beBatch){
diff --git a/src/main/java/com/zy/asrs/entity/param/CombParam.java b/src/main/java/com/zy/asrs/entity/param/CombParam.java
index c414407..a39f7d2 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -19,6 +19,9 @@
// 搴撲綅缂栧彿
private String locNo;
+ //閫�搴撶粍鎵�
+ private String tkFlag;
+
private List<CombMat> combMats;
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index b579f76..596b72d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -629,6 +629,9 @@
waitPakin.setStandby1(detlDto.getStandby1());
waitPakin.setStandby2(detlDto.getStandby2());
waitPakin.setStandby3(detlDto.getStandby3());
+ if ("Y".equals(param.getTkFlag())) {
+ waitPakin.setTkFlag(detlDto.getTkFlag());
+ }
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index 79a8ff5..5e5093e 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -38,6 +38,8 @@
private Double weight;
+ //閫�搴撶粍鎵�
+ private String tkFlag;
public DetlDto() {
diff --git a/src/main/resources/mapper/asrs/WaitPakinLogMapper.xml b/src/main/resources/mapper/asrs/WaitPakinLogMapper.xml
index 72b2ba4..35c9dcd 100644
--- a/src/main/resources/mapper/asrs/WaitPakinLogMapper.xml
+++ b/src/main/resources/mapper/asrs/WaitPakinLogMapper.xml
@@ -53,6 +53,7 @@
<result column="box_type1" property="boxType1" />
<result column="box_type2" property="boxType2" />
<result column="box_type3" property="boxType3" />
+ <result column="tk_flag" property="tkFlag" />
</resultMap>
</mapper>
diff --git a/src/main/resources/mapper/asrs/WaitPakinMapper.xml b/src/main/resources/mapper/asrs/WaitPakinMapper.xml
index f5bd7e0..e74dfcc 100644
--- a/src/main/resources/mapper/asrs/WaitPakinMapper.xml
+++ b/src/main/resources/mapper/asrs/WaitPakinMapper.xml
@@ -53,6 +53,7 @@
<result column="box_type1" property="boxType1" />
<result column="box_type2" property="boxType2" />
<result column="box_type3" property="boxType3" />
+ <result column="tk_flag" property="tkFlag" />
</resultMap>
</mapper>
--
Gitblit v1.9.1