From c48e244fdc73ca83db1d8ea0c418b70125d4cab1 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 09 十一月 2024 18:09:01 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/entity/param/CombParam.java         |    2 ++
 src/main/resources/mapper/LocDetlMapper.xml                   |    2 +-
 src/main/resources/mapper/WrkMastMapper.xml                   |    1 +
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |    3 +++
 src/main/java/com/zy/common/model/DetlDto.java                |    1 +
 src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java    |    3 +++
 6 files changed, 11 insertions(+), 1 deletions(-)

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 62ad3d5..da2dacb 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -41,6 +41,8 @@
 
         private Double weight;
 
+        private String memo;
+
     }
 
 }
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 afb1de2..e5ddb86 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -134,6 +134,7 @@
             List<DetlDto> detlDtos = new ArrayList<>();
             param.getCombMats().forEach(elem -> {
                 DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),elem.getWeight());
+                detlDto.setMemo(elem.getMemo());
                 if (DetlDto.has(detlDtos, detlDto)) {
                     DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
                     assert one != null;
@@ -165,6 +166,7 @@
                 waitPakin.setOwner(detlDto.getOwner());
                 waitPakin.setUuid(uuid);
                 waitPakin.setWeight(detlDto.getWeight());
+                waitPakin.setMemo(detlDto.getMemo());
                 if (!waitPakinService.insert(waitPakin)) {
                     throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
                 }
@@ -245,6 +247,7 @@
                 waitPakin.setPayment(detlDto.getPayment());
                 waitPakin.setUuid(uuid);
                 waitPakin.setWeight(detlDto.getWeight());
+                waitPakin.setMemo(detlDto.getMemo());
                 if (!waitPakinService.insert(waitPakin)) {
                     throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
                 }
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
index d71d3e4..572840b 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -102,6 +102,9 @@
             if (!wrkMastService.deleteById(wrkMast)) {
                 exceptionHandle("鍒犻櫎宸ヤ綔涓绘。[workNo={0}]澶辫触", wrkMast.getWrkNo());
             }
+            if (wrkMast.getIoType()==199){
+                return SUCCESS;
+            }
             // 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
             if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
 //                exceptionHandle("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index 3250b8f..bec1738 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -28,6 +28,7 @@
     private int payment;
 
     private Double weight;
+    private String memo;
 
     private String sourceLocName;//婧愪粨搴�
     private String targetLocName;//鐩爣浠撳簱
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 12043c2..f20e07e 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -110,7 +110,7 @@
             and a.owner =  #{owner}
         </if>
         <if test="batch !=null and batch!='' ">
-            and a.batch like  #{batch}
+            and a.batch like  '%' + #{batch} + '%'
         </if>
     </sql>
 
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 53f424b..cba6ab8 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -72,6 +72,7 @@
         or (wrk_sts=15 and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp))
         or (wrk_sts=15 and dateadd(mi,15,crn_end_time) &lt;= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
         or (wrk_sts=15 and crn_end_time is null and wrk_no not in (select wrk_no from asr_bas_devp))
+        or wrk_sts=105
         order by io_time,wrk_no asc
     </select>
     <select id="checkFinishByOrder" resultType="java.lang.Integer">

--
Gitblit v1.9.1