From 4cbff49b5ccc21ce82a61c617da57cac0bcae573 Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期六, 28 六月 2025 09:15:28 +0800
Subject: [PATCH] wcs功能完善

---
 src/main/java/com/zy/service/impl/MainServiceImpl.java |   54 +++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/zy/service/impl/MainServiceImpl.java b/src/main/java/com/zy/service/impl/MainServiceImpl.java
index a300dec..2050fc1 100644
--- a/src/main/java/com/zy/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/service/impl/MainServiceImpl.java
@@ -206,7 +206,7 @@
 //                    back = true;
 //                }
                 // 閫�鍥�
-                if (back && staProtocol.isInEnable()) {
+                if (back && staProtocol.isInEnable() && staProtocol.isLoading() && staProtocol.getWorkNo() == 0) {
                     MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errMsg));
 
                     if (!staProtocol.isLoading()){
@@ -960,7 +960,7 @@
                         // 淇敼绌烘《搴撳搴斿簱浣嶄换鍔$姸鎬�
                         if(slave.getId() == 4 && crnStn.getStaNo() == 1056) {
                             String locNo2 = (wrkMast.getSourceLocNo().startsWith("09") ? "10" : "12") + wrkMast.getSourceLocNo().substring(2);
-                            WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("source_loc_no", locNo2));
+                            WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("source_loc_no", locNo2).eq("wrk_sts",11));
                             if (wrkMast1 != null) {
                                 wrkMast1.setWrkSts(12L);
                                 wrkMast1.setCrnStrTime(now);
@@ -1670,14 +1670,50 @@
                     log.error("鍛煎彨rgv,浠诲姟鍙蜂笉瀛樺湪:{}",staProtocol.getWorkNo());
                     continue;
                 }
+                // 1083,1086,1089 澶栧舰妫�娴嬪け璐ワ紝涓嶆槸鍘诲紓甯稿彛鐨� 鍋滃湪鍘熷
+//                if (staProtocol.getSiteId() == 1083 || staProtocol.getSiteId() == 1086 || staProtocol.getSiteId() == 1089 && wrkMast.getStaNo() != 1090) {
+//                    boolean back = false;
+//                    String errMsg = "";
+//                    if (staProtocol.isFrontErr()) {
+//                        errMsg = "鍓嶈秴闄�";
+//                        back = true;
+//                    }
+//                    if (!back && staProtocol.isBackErr()) {
+//                        errMsg = "鍚庤秴闄�";
+//                        back = true;
+//                    }
+//                    if (!back && staProtocol.isHighErr()) {
+//                        errMsg = "楂樿秴闄�";
+//                        back = true;
+//                    }
+//                    if (!back && staProtocol.isLeftErr()) {
+//                        errMsg = "宸﹁秴闄�";
+//                        back = true;
+//                    }
+//                    if (!back && staProtocol.isRightErr()) {
+//                        errMsg = "鍙宠秴闄�";
+//                        back = true;
+//                    }
+//                    if (back) {
+//                        log.error("{}绔欑偣锛屽褰㈡娴嬪け璐ワ細{}",site,errMsg);
+//                        return;
+//                    }
+//                }
                 if (staProtocol.getSiteId() == 1090 && wrkMast.getStaNo() == 1090) {
                     continue;
                 }
                 if ((wrkMast.getWrkSts() == 2 || wrkMast.getWrkSts() == 15) && (wrkMast.getRgvNo() == null || wrkMast.getRgvDstaNo() == 1090)) {
                     // 鏈�1090鐨勪换鍔¤烦杩噐gv鍒嗛厤
                     if(wrkMast.getStaNo() == 1090) {
-                        int count = wrkMastService.selectCount(new EntityWrapper<WrkMast>().where("sta_no = 1090 or source_sta_no = 1090 "));
-                        if (count > 1) {
+                        DevpThread devpThread2 = (DevpThread) SlaveConnection.get(SlaveType.Devp, 2);
+                        StaProtocol staProtocol2 = devpThread2.getStation().get(1090);
+                        if(!staProtocol2.isAutoing() || staProtocol2.isLoading() || staProtocol2.getWorkNo() != 0) {
+                            log.info("鍘诲紓甯稿彛鐩爣绔欑偣锛岄潪鑷姩锛屾湁鐗╋紝宸ヤ綔鍙蜂负锛歿}",staProtocol2.getWorkNo());
+                            continue;
+                        }
+                        int count = wrkMastService.selectCount(new EntityWrapper<WrkMast>().where("sta_no = 1090 and wrk_sts in (9,10)"));
+                        if (count > 0) {
+                            log.info("鍘诲紓甯稿彛锛屼絾鏄墠闈㈡湁鍘诲紓甯稿彛浠诲姟鏁帮細{}",count);
                             continue;
                         }
                     }
@@ -1715,7 +1751,7 @@
                     continue;
                 }
 
-                if(wrkMast.getIoType() == 3 && (wrkMast.getStaNo() == 1024 || wrkMast.getStaNo() == 1016 || wrkMast.getStaNo() == 1043)) { // 鍒�1024鍑哄簱鍙o紝鏀惧埌杈撻�佺嚎鍚庝换鍔″畬鎴�
+                if(wrkMast.getIoType() == 3 && (wrkMast.getStaNo() == 1024 || wrkMast.getStaNo() == 1031 || wrkMast.getStaNo() == 1016 || wrkMast.getStaNo() == 1043)) {  // 鍒�1024鍑哄簱鍙o紝鏀惧埌杈撻�佺嚎鍚庝换鍔″畬鎴�
                     if(wrkMast.getWrkSts() != 2 ){
                         log.warn("rgv鏀捐揣瀹屾垚3锛宺gv鏈浣�:rgv鍙穥}锛屼换鍔″彿锛歿}锛屼换鍔$姸鎬亄}",wrkMast.getRgvNo(),wrkMast.getWrkNo(),wrkMast.getWrkSts());
                         continue;
@@ -2060,14 +2096,6 @@
                     param.setSourceStaNo(site + 2);
                     param.setTbFlag(staProtocol2.isBarcodeErr());
                     param.setCannedVolume(Math.round(staProtocol.getCannedVolume() * 100.0) / 100.0);
-//                    param.setWrkNo(57);
-//                    param.setMatnr("101");
-//                    param.setBatch("tt1");
-//                    param.setManuDate("2025-06-05");
-//                    param.setWeight(100.0);
-//                    param.setGrossWeight(100.0);
-//                    param.setSourceStaNo(site);
-//                    param.setTbFlag(true);
 
                     String response = new HttpHandler.Builder()
                             .setUri(wmsUrl)

--
Gitblit v1.9.1