From bf45b4a613f0c1fa723e1d03b16cd7d1c79f1f04 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 12 八月 2025 08:34:58 +0800
Subject: [PATCH] #

---
 src/main/resources/mapper/asrs/WrkDetlMapper.xml               |    8 ++++++++
 src/main/java/com/zy/asrs/mapper/LocDetlMapper.java            |    2 ++
 src/main/resources/mapper/asrs/LocDetlMapper.xml               |    8 ++++++++
 src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java            |    2 ++
 src/main/java/com/zy/asrs/service/LocDetlService.java          |    2 ++
 src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java |    5 +++++
 src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java |    5 +++++
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java  |   12 ++----------
 src/main/java/com/zy/asrs/service/WrkDetlService.java          |    2 ++
 9 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index 13c7568..8dbd409 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -51,6 +51,8 @@
     @Update("update asr_loc_detl set loc_no = #{newLocNo}, modi_time=getDate() where loc_no = #{oldLocNo}")
     int updateLocNo(String newLocNo, String oldLocNo);
 
+    int updateBarcode(String locNo, String barcode);
+
     @Select("SELECT ld.loc_no FROM asr_loc_detl ld LEFT JOIN asr_loc_mast lm ON ld.loc_no = lm.loc_no WHERE (1 = 1 AND ld.matnr = #{matnr} AND (lm.row1 >= #{start} AND lm.row1 <= #{end})  AND lm.loc_sts = 'F' AND DateDiff(dd, ld.appe_time, getdate()) = 0) ORDER BY ld.appe_time ASC")
     List<String> selectSameDetlToday(@Param("matnr") String matnr, @Param("start") Integer start, @Param("end") Integer end);
 
diff --git a/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java b/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
index 6199670..2cc928d 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
@@ -27,4 +27,6 @@
     List<WrkDetl> selectPakoutQuery(@Param("staNo")Integer staNo, @Param("matnr")String matnr);
 
     List<WrkDetl> selectAndLogByOrderNoGroupByMatnrOfSum(String orderNo);
+
+    int updateBarcode(Integer wrkNo, String barcode);
 }
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index a706a36..6d94975 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -38,6 +38,8 @@
 
     boolean updateLocNo(String newLocNo, String oldLocNo);
 
+    boolean updateBarcode(String locNo, String barcode);
+
     /**
      * 鑾峰彇褰撳ぉ鐩稿悓瑙勬牸璐х墿鐨勬繁搴撲綅鍙�
      * @param matnr 鍟嗗搧缂栧彿
diff --git a/src/main/java/com/zy/asrs/service/WrkDetlService.java b/src/main/java/com/zy/asrs/service/WrkDetlService.java
index a40f47a..18c156b 100644
--- a/src/main/java/com/zy/asrs/service/WrkDetlService.java
+++ b/src/main/java/com/zy/asrs/service/WrkDetlService.java
@@ -23,4 +23,6 @@
 
     List<WrkDetl> selectAndLogByOrderNoGroupByMatnrOfSum(String orderNo);
 
+    boolean updateBarcode(Integer wrkNo, String barcode);
+
 }
diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index abfeaef..eaba688 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -83,6 +83,11 @@
     }
 
     @Override
+    public boolean updateBarcode(String locNo, String barcode) {
+        return this.baseMapper.updateBarcode(locNo, barcode) > 0;
+    }
+
+    @Override
     public List<String> getSameDetlToday(String matnr, Integer start, Integer end) {
         return this.baseMapper.selectSameDetlToday(matnr, start, end);
     }
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 192a737..12d570d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -1330,20 +1330,12 @@
         wrkMast.setModiUser(userId);
         wrkMastService.updateById(wrkMast);
 
-        WrkDetl wrkDetl = new WrkDetl();
-        wrkDetl.setZpallet(param.getNewBarcode());
-        wrkDetl.setModiTime(new Date());
-        wrkDetl.setModiUser(userId);
-        wrkDetlService.update(wrkDetl, new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
+        wrkDetlService.updateBarcode(wrkMast.getWrkNo(), param.getNewBarcode());
 
         locMast.setBarcode(param.getNewBarcode());
         locMast.setModiTime(new Date());
         locMastService.updateById(locMast);
 
-        LocDetl locDetl = new LocDetl();
-        locDetl.setZpallet(param.getNewBarcode());
-        locDetl.setModiTime(new Date());
-        locDetl.setModiUser(userId);
-        locDetlService.update(locDetl, new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
+        locDetlService.updateBarcode(locMast.getLocNo(), param.getNewBarcode());
     }
 }
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
index fc49272..16cdac0 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -92,4 +92,9 @@
     public List<WrkDetl> selectAndLogByOrderNoGroupByMatnrOfSum(String orderNo) {
         return this.baseMapper.selectAndLogByOrderNoGroupByMatnrOfSum(orderNo);
     }
+
+    @Override
+    public boolean updateBarcode(Integer wrkNo, String barcode) {
+        return this.baseMapper.updateBarcode(wrkNo, barcode) > 0;
+    }
 }
diff --git a/src/main/resources/mapper/asrs/LocDetlMapper.xml b/src/main/resources/mapper/asrs/LocDetlMapper.xml
index daacffb..e25f55e 100644
--- a/src/main/resources/mapper/asrs/LocDetlMapper.xml
+++ b/src/main/resources/mapper/asrs/LocDetlMapper.xml
@@ -329,6 +329,14 @@
         <include refid="batchSeqNew"></include>
     </update>
 
+    <update id="updateBarcode">
+        update asr_loc_detl
+        set zpallet = #{barcode}
+        , modi_time = getdate()
+        where 1=1
+        and loc_no = #{locNo}
+    </update>
+
     <sql id="stockOutCondition">
         <if test="loc_no!=null and loc_no!='' ">
             and a.loc_no like '%' + #{loc_no} + '%'
diff --git a/src/main/resources/mapper/asrs/WrkDetlMapper.xml b/src/main/resources/mapper/asrs/WrkDetlMapper.xml
index 7ab66dc..05991d2 100644
--- a/src/main/resources/mapper/asrs/WrkDetlMapper.xml
+++ b/src/main/resources/mapper/asrs/WrkDetlMapper.xml
@@ -101,6 +101,14 @@
         <include refid="batchSeq"></include>
     </update>
 
+    <update id="updateBarcode">
+        update asr_wrk_detl
+        set zpallet = #{barcode}
+        , modi_time = getdate()
+        where 1=1
+        and wrk_no = #{wrkNo}
+    </update>
+
     <select id="selectAndLogByOrderNo" resultMap="BaseResultMap">
         select awd.*
         from asr_wrk_detl awd

--
Gitblit v1.9.1