From db1d84cb97522db17430c28a45da8dd0d8177eb8 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期五, 27 十月 2023 14:33:38 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   18 +++++++++++++++---
 src/main/resources/mapper/WrkMastMapper.xml                 |    2 +-
 src/main/resources/application.yml                          |    1 +
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index b0a857e..26cae4d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2378,7 +2378,9 @@
                                 locMast.setPackStatus(2);
                                 testMast.setModiTime(new Date());
                                 //NG杞琌K闇�瑕佽繕鍘熸簮搴撲綅鍜岀洰鏍囧簱浣嶇姸鎬侊紝OK杞琋G 鍒犻櫎浠诲姟妗�
-                                WrkMast wrkMast=wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("source_loc_no",locMast.getLocNo()));
+                                WrkMast wrkMast=wrkMastService.selectOne(new EntityWrapper<WrkMast>()
+                                        .eq("source_loc_no",locMast.getLocNo())
+                                        .eq("wrk_sts",11));
                                 if(!Cools.isEmpty(wrkMast)){
                                     if(wrkMast.getWrkSts()==11){
                                     if(wrkMast.getIoType()==11){
@@ -2386,9 +2388,11 @@
                                         locMast1.setLocSts("O");
                                         locMastService.update(locMast1,new EntityWrapper<LocMast>().eq("loc_no",wrkMast.getLocNo()));
                                     }
-                                    wrkMastMapper.delete(new EntityWrapper<WrkMast>().eq("source_loc_no",locMast.getLocNo()));
+                                    wrkMastMapper.delete(new EntityWrapper<WrkMast>()
+                                                .eq("wrk_sts",11)
+                                                .eq("source_loc_no",locMast.getLocNo()));
                                     locMast.setLocSts("F");
-                                    wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("zpallet",locMast.getBarcode()));
+                                    wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("zpallet",wrkMast.getBarcode()));
                                     if(!locMastService.update(locMast,new EntityWrapper<LocMast>()
                                             .eq("channel",i+1))){
                                         log.error("淇敼娴嬭瘯搴撲綅鐘舵�佸け璐�"+locMast.getLocNo(),locMast);
@@ -2416,6 +2420,14 @@
                             //閫氶亾鍚姩鎸夐挳鐘舵�侊紝1:鍙互鍚姩鍑哄簱鎴栬�呯Щ搴擄紝0:涓嶈兘鍚姩鍑哄簱鎴栬�呯Щ搴�
                             locMast.setCtnKind(devpThread.startSignal[i][2]);
                             if(devpThread.startSignal[i][2]==1){
+                                WrkMast wrkMast=wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("source_loc_no",locMast.getLocNo()));
+                                if(!Cools.isEmpty(wrkMast)){
+                                    wrkMast.setMk("Y");
+                                    if(!wrkMastService.update(wrkMast,new EntityWrapper<WrkMast>()
+                                            .eq("source_loc_no",locMast.getLocNo()))){
+                                        log.error("淇敼浠诲姟妗e惎鍔ㄦ寜閽姸鎬侊紝浠诲姟妗g姸鎬佸け璐�"+wrkMast.getSourceLocNo(),wrkMast);
+                                    }
+                                }
                                 if(!locMastService.update(locMast,new EntityWrapper<LocMast>()
                                         .eq("loc_sts","R")
                                         .eq("channel",i+1))){
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 5305bc2..1a18a41 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -9,6 +9,7 @@
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
     url: jdbc:sqlserver://10.12.55.200:1433;databasename=zjfnasrs
+    #url: jdbc:sqlserver://127.0.0.1:1433;databasename=zjfnasrs
     username: sa
     password: sa@123
   mvc:
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 88e61c0..89a3b35 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -108,7 +108,7 @@
     </select>
 
     <select id="selectLocMove" resultMap="BaseResultMap">
-        select top 1 * from dbo.asr_wrk_mast where wrk_sts=11 and io_type=11 and crn_no=#{crnNo} order by io_pri desc,io_time ASC,wrk_no ASC
+        select top 1 * from dbo.asr_wrk_mast where wrk_sts=11 and io_type=11 and crn_no=#{crnNo} and mk = 'Y' order by io_pri desc,io_time ASC,wrk_no ASC
     </select>
 
     <select id="selectLocMoving" resultMap="BaseResultMap">

--
Gitblit v1.9.1