From 62ba3824387832e3ef1d43e91d0d079b6f8b11d9 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 06 六月 2024 16:21:31 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/entity/WrkMastSplitTwin.java      |   10 ++++++++++
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   48 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/WrkMastSplitTwin.java b/src/main/java/com/zy/asrs/entity/WrkMastSplitTwin.java
index ec0a4d7..1ad6061 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastSplitTwin.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastSplitTwin.java
@@ -159,6 +159,16 @@
 
     public WrkMastSplitTwin() {}
 
+    public WrkMastSplitTwin(WrkMast wrkMast,Integer crnStation,Date now) {
+        this.wrkNo = wrkMast.getWrkNo().longValue();
+        this.createTime = now;
+        this.updateTime = now;
+        this.type = crnStation; //宸ヤ綅
+        this.lineNumber = wrkMast.getIoPri().intValue();
+        this.bignTime = wrkMast.getIoTime();
+        this.crnNo = wrkMast.getCrnNo();
+    }
+
     public WrkMastSplitTwin(Long wrkNo,Date createTime,Date updateTime,Integer type,Integer wrkSts,Integer lineNumber,Integer wrkType,Date bignTime,Integer crnNo,String wrkStart,String wrkEnd,Integer startRow,Integer startBay,Integer startLev,Integer endRow,Integer endBay,Integer endLev,Integer ioType) {
         this.wrkNo = wrkNo;
         this.createTime = createTime;
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 b0eacd4..e77aeab 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -104,6 +104,8 @@
     private RgvOneSignMapper rgvOneSignMapper;
     @Autowired
     private WrkMastCrnMapper wrkMastCrnMapper;
+    @Autowired
+    private WrkMastSplitTwinMapper wrkMastSplitTwinMapper;
 
     @Value("${wms.url}")
     private String wmsUrl;
@@ -1971,6 +1973,12 @@
                 continue;
             }
 
+            // 宸茬粡瀛樺湪鍚婅溅鎵ц浠诲姟鏃讹紝鍒欒繃婊�
+            if (wrkMastSplitTwinMapper.selectCount(new EntityWrapper<WrkMastSplitTwin>().eq("wrk_no", wrkMast.getWrkNo().longValue())) != 0) {
+                break;
+//                        return;
+            }
+
             // 鍙屾繁搴撲綅涓旀祬搴撲綅鏈夎揣锛屽垯闇�鍏堝娴呭簱浣嶈繘琛屽簱浣嶇Щ杞�
             if (Utils.isDeepLoc(slaveProperties, wrkMast.getLocNo())) {
                 String shallowLocNo = Utils.getShallowLoc(slaveProperties, wrkMast.getLocNo());
@@ -2029,9 +2037,27 @@
                 wrkMast.setWrkSts(3L);
                 wrkMast.setCrnStrTime(now);
                 wrkMast.setModiTime(now);
+                WrkMastSplitTwin wrkMastSplitTwin = new WrkMastSplitTwin(wrkMast,crnStation,now);
+                wrkMastSplitTwin.setWrkSts(1);
+                wrkMastSplitTwin.setWrkStart(wrkMast.getStaNo().toString());
+                wrkMastSplitTwin.setWrkEnd(wrkMast.getLocNo());
+                wrkMastSplitTwin.setStartRow(crnStn.getRow());
+                wrkMastSplitTwin.setStartBay(crnStn.getBay());
+                wrkMastSplitTwin.setStartLev(crnStn.getLev());
+                wrkMastSplitTwin.setEndRow(locMast.getRow1());
+                wrkMastSplitTwin.setEndBay(locMast.getBay1());
+                wrkMastSplitTwin.setEndLev(locMast.getLev1());
+                wrkMastSplitTwin.setWrkType(1);
+                wrkMastSplitTwin.setIoType(1);
+
                 if (wrkMastMapper.updateById(wrkMast) == 0) {
                     log.error("淇敼宸ヤ綔妗g姸鎬� 2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast.getWrkNo());
                 }
+
+                if (wrkMastSplitTwinMapper.insert(wrkMastSplitTwin)==0){
+                    log.error("鍒涘缓 鍫嗗灈鏈烘墽琛屼换鍔� 澶辫触锛侊紒锛屽伐浣滃彿={}锛屽爢鍨涙満鍙�={}", wrkMast.getWrkNo(),wrkMast.getCrnNo());
+                }
+                break;
             }
         }
     }
@@ -2897,6 +2923,12 @@
 //                        return;
                 }
 
+                // 宸茬粡瀛樺湪鍚婅溅鎵ц浠诲姟鏃讹紝鍒欒繃婊�
+                if (wrkMastSplitTwinMapper.selectCount(new EntityWrapper<WrkMastSplitTwin>().eq("wrk_no", wrkMast.getWrkNo().longValue())) != 0) {
+                    break;
+//                        return;
+                }
+
                 // 1.鍫嗗灈鏈哄紑濮嬬Щ鍔�
                 CrnCommand crnCommand = new CrnCommand();
                 crnCommand.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
@@ -2917,9 +2949,25 @@
                     wrkMast.setWrkSts(12L);
                     wrkMast.setCrnStrTime(now);
                     wrkMast.setModiTime(now);
+                    WrkMastSplitTwin wrkMastSplitTwin = new WrkMastSplitTwin(wrkMast,crnStation,now);
+                    wrkMastSplitTwin.setWrkSts(1);
+                    wrkMastSplitTwin.setWrkStart(wrkMast.getSourceLocNo());
+                    wrkMastSplitTwin.setWrkEnd(wrkMast.getSourceStaNo().toString());
+                    wrkMastSplitTwin.setStartRow(sourceSta.getRow1());
+                    wrkMastSplitTwin.setStartBay(sourceSta.getBay1());
+                    wrkMastSplitTwin.setStartLev(sourceSta.getLev1());
+                    wrkMastSplitTwin.setEndRow(crnStn.getRow());
+                    wrkMastSplitTwin.setEndBay(crnStn.getBay());
+                    wrkMastSplitTwin.setEndLev(crnStn.getLev());
+                    wrkMastSplitTwin.setWrkType(1);
+                    wrkMastSplitTwin.setIoType(2);
                     if (wrkMastMapper.updateById(wrkMast) == 0) {
                         log.error("淇敼宸ヤ綔妗g姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast.getWrkNo());
                     }
+
+                    if (wrkMastSplitTwinMapper.insert(wrkMastSplitTwin)==0){
+                        log.error("鍒涘缓 鍫嗗灈鏈烘墽琛屼换鍔� 澶辫触锛侊紒锛屽伐浣滃彿={}锛屽爢鍨涙満鍙�={}", wrkMast.getWrkNo(),wrkMast.getCrnNo());
+                    }
                     break;
                 }
             }

--
Gitblit v1.9.1