From 8163e62236bdf7b648e6f330e268aee789eabc6d Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期四, 27 六月 2024 20:55:50 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/WrkMastExecuteServiceImpl.java |    5 +
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java           |  151 +++++++++++++++++++++++++------------------------
 src/main/java/com/zy/asrs/mapper/WrkMastExecuteMapper.java            |    2 
 src/main/java/com/zy/asrs/service/WrkMastExecuteService.java          |    2 
 src/main/java/com/zy/asrs/entity/BasJarMast.java                      |    2 
 src/main/resources/mapper/WrkMastExecuteMapper.xml                    |    6 ++
 6 files changed, 93 insertions(+), 75 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/BasJarMast.java b/src/main/java/com/zy/asrs/entity/BasJarMast.java
index 9689a51..47fa406 100644
--- a/src/main/java/com/zy/asrs/entity/BasJarMast.java
+++ b/src/main/java/com/zy/asrs/entity/BasJarMast.java
@@ -29,13 +29,13 @@
      * ID
      */
     @ApiModelProperty(value= "ID")
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /**
      * 宸ヤ綔鍙�
      */
     @ApiModelProperty(value= "宸ヤ綔鍙�")
-    @TableId(value = "wrk_no", type = IdType.INPUT)
     @TableField("wrk_no")
     private Long wrkNo;
 
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastExecuteMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastExecuteMapper.java
index 9546e56..84ffe4d 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastExecuteMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastExecuteMapper.java
@@ -14,6 +14,8 @@
 
     WrkMastExecute getWrkMastExecuteByWrkNo(@Param("wrkNo") Long wrkNo);
 
+    List<WrkMastExecute> getWrkMastExecuteByWrkNoList(@Param("wrkNo") Long wrkNo);
+
     List<WrkMastExecute> getWrkMastExecuteByJarNo(@Param("jarId") Integer jarId);
 
     List<WrkMastExecute> selectWrkMastExecuteByType(@Param("type") Integer type);
diff --git a/src/main/java/com/zy/asrs/service/WrkMastExecuteService.java b/src/main/java/com/zy/asrs/service/WrkMastExecuteService.java
index ddfbf00..ea675cd 100644
--- a/src/main/java/com/zy/asrs/service/WrkMastExecuteService.java
+++ b/src/main/java/com/zy/asrs/service/WrkMastExecuteService.java
@@ -9,6 +9,8 @@
 
     WrkMastExecute getWrkMastExecuteByWrkNo(Long wrkNo);
 
+    List<WrkMastExecute> getWrkMastExecuteByWrkNoList(Long wrkNo);
+
     List<WrkMastExecute> getWrkMastExecuteByJarNo(Integer jarId);
 
     List<WrkMastExecute> selectWrkMastExecuteByType(Integer type);
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 f9550bc..93c9189 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -6219,7 +6219,7 @@
                         if (wrkMastExecute.getIoType()==7){  //7  B=>C
                             if (!jarWrkMastExecuteGenerateSteStatus(basJar.getEnterSteNo(),2,SteStatusType.IDLE)){
                                 //璋冭溅  == > 绉诲姩
-                                if (jarSteTake(wrkMastExecute,SteLocaType.POINT23.id,SteLocaType.POINT26.id,SteTaskModeType.STE_WFQH_12,false)){
+                                if (jarSteTake(wrkMastExecute,SteLocaType.POINT23.id,SteLocaType.POINT26.id,SteTaskModeType.STE_MOVE_14,false)){
                                     log.error("绌挎鏉縎te鍛戒护涓嬪彂澶辫触锛宻te鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
                                             wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
                                 }
@@ -6240,7 +6240,7 @@
                         } else { //8 C=>B
                             if (jarWrkMastExecuteGenerateSteStatus(basJar.getEnterSteNo(),3,SteStatusType.IDLE)){
                                 //璋冭溅  == > 绉诲姩
-                                if (!jarSteTake(wrkMastExecute,SteLocaType.POINT26.id,SteLocaType.POINT23.id,SteTaskModeType.STE_WFQH_12,false)){
+                                if (!jarSteTake(wrkMastExecute,SteLocaType.POINT26.id,SteLocaType.POINT23.id,SteTaskModeType.STE_MOVE_14,false)){
                                     log.error("绌挎鏉縎te鍛戒护涓嬪彂澶辫触锛宻te鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
                                             wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
                                 }
@@ -6522,7 +6522,7 @@
                         if (wrkMastExecute.getIoType()==10){//10锛欰=>B
                             if (jarWrkMastExecuteGenerateSteStatus(basJar.getEnterSteNo(),1,SteStatusType.IDLE)){
                                 //璋冭溅  == > 绉诲姩
-                                if (!jarSteTake(wrkMastExecute,SteLocaType.POINT20.id,SteLocaType.POINT23.id,SteTaskModeType.STE_WFQH_12,false)){
+                                if (!jarSteTake(wrkMastExecute,SteLocaType.POINT20.id,SteLocaType.POINT23.id,SteTaskModeType.STE_MOVE_14,false)){
                                     log.error("绌挎鏉縎te鍛戒护涓嬪彂澶辫触锛宻te鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
                                             wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
                                 }
@@ -6543,7 +6543,7 @@
                         } else {//11:B=>A
                             if (jarWrkMastExecuteGenerateSteStatus(basJar.getEnterSteNo(),2,SteStatusType.IDLE)){
                                 //璋冭溅  == > 绉诲姩
-                                if (!jarSteTake(wrkMastExecute,SteLocaType.POINT23.id,SteLocaType.POINT20.id,SteTaskModeType.STE_WFQH_12,false)){
+                                if (!jarSteTake(wrkMastExecute,SteLocaType.POINT23.id,SteLocaType.POINT20.id,SteTaskModeType.STE_MOVE_14,false)){
                                     log.error("绌挎鏉縎te鍛戒护涓嬪彂澶辫触锛宻te鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
                                             wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
                                 }
@@ -6752,92 +6752,95 @@
 //                    if (steProtocol.statusType.equals(SteStatusType.WAITING)){
 //
 //                    }
-                    WrkMastExecute wrkMastExecute = wrkMastExecuteService.getWrkMastExecuteByWrkNo(steProtocol.getTaskNo().longValue());
-                    if (!Cools.isEmpty(wrkMastExecute)){
-                        switch (wrkMastExecute.getIoType()){
-                            case 6:
-                                if (wrkMastExecute.getWrkSts()==3){//==>4
-                                    //1锛歊GV灏忚溅绉诲姩銆�2锛歊GV灏忚溅鍒颁綅銆�3锛歋te绌挎鐗堝彇璐с��4锛氬彇璐у畬鎴愮瓑寰呬笅涓�姝ャ��5锛歋te绌挎鐗堟斁璐ц嚦鍐峰嵈姹犮��6锛氭斁璐у畬鎴愩��7锛氭洿鏂板畬鎴�   //io_type = 6
-                                    //ste浠诲姟绛夊緟瀹屾垚
-                                    if (steProtocol.statusType.equals(SteStatusType.WAITING2)){
-                                        //ste浠诲姟瀹屾垚
-                                        if (jarSteTake(wrkMastExecute,null,null,null,true)){
-                                            wrkMastExecute.setWrkSts(4);
-                                            if (!wrkMastExecuteService.updateById(wrkMastExecute)){
-                                                log.error("绌挎杞te鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},绌挎杞︽暟鎹�={},sign={}",
-                                                        wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(steProtocol),sign);
+                    List<WrkMastExecute> wrkMastExecuteByWrkNoList = wrkMastExecuteService.getWrkMastExecuteByWrkNoList(steProtocol.getTaskNo().longValue());
+                    for (WrkMastExecute wrkMastExecute : wrkMastExecuteByWrkNoList){
+                        if (!Cools.isEmpty(wrkMastExecute)){
+                            switch (wrkMastExecute.getIoType()){
+                                case 6:
+                                    if (wrkMastExecute.getWrkSts()==3){//==>4
+                                        //1锛歊GV灏忚溅绉诲姩銆�2锛歊GV灏忚溅鍒颁綅銆�3锛歋te绌挎鐗堝彇璐с��4锛氬彇璐у畬鎴愮瓑寰呬笅涓�姝ャ��5锛歋te绌挎鐗堟斁璐ц嚦鍐峰嵈姹犮��6锛氭斁璐у畬鎴愩��7锛氭洿鏂板畬鎴�   //io_type = 6
+                                        //ste浠诲姟绛夊緟瀹屾垚
+                                        if (steProtocol.statusType.equals(SteStatusType.WAITING2)){
+                                            //ste浠诲姟瀹屾垚
+                                            if (jarSteTake(wrkMastExecute,null,null,null,true)){
+                                                wrkMastExecute.setWrkSts(4);
+                                                if (!wrkMastExecuteService.updateById(wrkMastExecute)){
+                                                    log.error("绌挎杞te鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},绌挎杞︽暟鎹�={},sign={}",
+                                                            wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(steProtocol),sign);
+                                                }
+                                                return true;
                                             }
-                                            return true;
                                         }
+                                        log.error("绌挎杞te鍛戒护涓嬪彂澶辫触===>涓嬪彂寮傚父锛宩ar鍙�={},浠诲姟鏁版嵁={},绌挎杞︽暟鎹�={},sign={}",
+                                                wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(steProtocol),sign);
+                                        return true;
                                     }
-                                    log.error("绌挎杞te鍛戒护涓嬪彂澶辫触===>涓嬪彂寮傚父锛宩ar鍙�={},浠诲姟鏁版嵁={},绌挎杞︽暟鎹�={},sign={}",
-                                            wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(steProtocol),sign);
-                                    return true;
-                                }
-                            case 5:
-                                if (wrkMastExecute.getWrkSts()==5){
-                                    //1锛歊GV灏忚溅绉诲姩銆�2锛歊GV灏忚溅鍒颁綅銆�3锛歳gv鍙栬揣銆�4锛歳gv鍙栬揣瀹屾垚銆�5锛歋te绌挎鐗堝叆纭寲缃愩��6锛氬叆缃愬畬鎴愩��7锛氭洿鏂板畬鎴�   //io_type = 5
-                                    //ste浠诲姟瀹屾垚
-                                    if (steProtocol.statusType.equals(SteStatusType.WAITING)){
+                                case 5:
+                                    if (wrkMastExecute.getWrkSts()==5){
+                                        //1锛歊GV灏忚溅绉诲姩銆�2锛歊GV灏忚溅鍒颁綅銆�3锛歳gv鍙栬揣銆�4锛歳gv鍙栬揣瀹屾垚銆�5锛歋te绌挎鐗堝叆纭寲缃愩��6锛氬叆缃愬畬鎴愩��7锛氭洿鏂板畬鎴�   //io_type = 5
                                         //ste浠诲姟瀹屾垚
-                                        if (jarSteTake(wrkMastExecute,null,null,null,true)){
-                                            wrkMastExecute.setWrkSts(6);
-                                            if (!wrkMastExecuteService.updateById(wrkMastExecute)){
-                                                log.error("绌挎杞te鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},绌挎杞︽暟鎹�={},sign={}",
-                                                        wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(steProtocol),sign);
+                                        if (steProtocol.statusType.equals(SteStatusType.WAITING)){
+                                            //ste浠诲姟瀹屾垚
+                                            if (jarSteTake(wrkMastExecute,null,null,null,true)){
+                                                wrkMastExecute.setWrkSts(6);
+                                                if (!wrkMastExecuteService.updateById(wrkMastExecute)){
+                                                    log.error("绌挎杞te鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},绌挎杞︽暟鎹�={},sign={}",
+                                                            wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(steProtocol),sign);
+                                                }
+                                                return true;
                                             }
-                                            return true;
                                         }
+                                        log.error("绌挎杞te鍛戒护涓嬪彂澶辫触===>涓嬪彂寮傚父锛宩ar鍙�={},浠诲姟鏁版嵁={},绌挎杞︽暟鎹�={},sign={}",
+                                                wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(steProtocol),sign);
+                                        return true;
                                     }
-                                    log.error("绌挎杞te鍛戒护涓嬪彂澶辫触===>涓嬪彂寮傚父锛宩ar鍙�={},浠诲姟鏁版嵁={},绌挎杞︽暟鎹�={},sign={}",
-                                            wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(steProtocol),sign);
-                                    return true;
-                                }
-                                return false;
-                            case 7:
-                            case 8:
-                            case 10:
-                            case 11:
-                                //1锛歊GV灏忚溅绉诲姩銆�2锛歊GV灏忚溅鍒颁綅銆�3锛歋te绌挎鐗堢Щ鍔ㄤ腑銆�4锛氱Щ鍔ㄥ畬鎴愩��5锛氭洿鏂板畬鎴�
-                                if (wrkMastExecute.getWrkSts()==3){
-                                    //ste浠诲姟瀹屾垚
-                                    if (steProtocol.statusType.equals(SteStatusType.WAITING)){
+                                    continue;
+                                case 7:
+                                case 8:
+                                case 10:
+                                case 11:
+                                    //1锛歊GV灏忚溅绉诲姩銆�2锛歊GV灏忚溅鍒颁綅銆�3锛歋te绌挎鐗堢Щ鍔ㄤ腑銆�4锛氱Щ鍔ㄥ畬鎴愩��5锛氭洿鏂板畬鎴�
+                                    if (wrkMastExecute.getWrkSts()==3){
                                         //ste浠诲姟瀹屾垚
-                                        if (jarSteTake(wrkMastExecute,null,null,null,true)){
-                                            wrkMastExecute.setWrkSts(4);
-                                            if (!wrkMastExecuteService.updateById(wrkMastExecute)){
-                                                log.error("绌挎杞te鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},绌挎杞︽暟鎹�={},sign={}",
-                                                        wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(steProtocol),sign);
+                                        if (steProtocol.statusType.equals(SteStatusType.WAITING)){
+                                            //ste浠诲姟瀹屾垚
+                                            if (jarSteTake(wrkMastExecute,null,null,null,true)){
+                                                wrkMastExecute.setWrkSts(4);
+                                                if (!wrkMastExecuteService.updateById(wrkMastExecute)){
+                                                    log.error("绌挎杞te鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},绌挎杞︽暟鎹�={},sign={}",
+                                                            wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(steProtocol),sign);
+                                                }
+                                                return true;
                                             }
-                                            return true;
                                         }
+                                        log.error("绌挎杞te鍛戒护涓嬪彂澶辫触===>涓嬪彂寮傚父锛宩ar鍙�={},浠诲姟鏁版嵁={},绌挎杞︽暟鎹�={},sign={}",
+                                                wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(steProtocol),sign);
+                                        return true;
                                     }
-                                    log.error("绌挎杞te鍛戒护涓嬪彂澶辫触===>涓嬪彂寮傚父锛宩ar鍙�={},浠诲姟鏁版嵁={},绌挎杞︽暟鎹�={},sign={}",
-                                            wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(steProtocol),sign);
-                                    return true;
-                                }
-                                return false;
-                            case 9:
-                                if (wrkMastExecute.getWrkSts()==1){
-                                    //1锛歋te绌挎鐗堝彇鏀捐揣涓��2锛氭斁璐у畬鎴愮瓑寰呬笅涓�姝ャ��3锛氳緭閫佺嚎浠诲姟涓嬪彂瀹屾垚銆�4锛氭洿鏂板畬鎴�   //io_type = 9
-                                    //ste浠诲姟瀹屾垚
-                                    if (steProtocol.statusType.equals(SteStatusType.WAITING)){
+                                    continue;
+                                case 9:
+                                    if (wrkMastExecute.getWrkSts()==1){
+                                        //1锛歋te绌挎鐗堝彇鏀捐揣涓��2锛氭斁璐у畬鎴愮瓑寰呬笅涓�姝ャ��3锛氳緭閫佺嚎浠诲姟涓嬪彂瀹屾垚銆�4锛氭洿鏂板畬鎴�   //io_type = 9
                                         //ste浠诲姟瀹屾垚
-                                        if (jarSteTake(wrkMastExecute,null,null,null,true)){
-                                            wrkMastExecute.setWrkSts(2);
-                                            if (!wrkMastExecuteService.updateById(wrkMastExecute)){
-                                                log.error("绌挎杞te鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},绌挎杞︽暟鎹�={},sign={}",
-                                                        wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(steProtocol),sign);
+                                        if (steProtocol.statusType.equals(SteStatusType.WAITING)){
+                                            //ste浠诲姟瀹屾垚
+                                            if (jarSteTake(wrkMastExecute,null,null,null,true)){
+                                                wrkMastExecute.setWrkSts(2);
+                                                if (!wrkMastExecuteService.updateById(wrkMastExecute)){
+                                                    log.error("绌挎杞te鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},绌挎杞︽暟鎹�={},sign={}",
+                                                            wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(steProtocol),sign);
+                                                }
+                                                return true;
                                             }
-                                            return true;
                                         }
+                                        log.error("绌挎杞te鍛戒护涓嬪彂澶辫触===>涓嬪彂寮傚父锛宩ar鍙�={},浠诲姟鏁版嵁={},绌挎杞︽暟鎹�={},sign={}",
+                                                wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(steProtocol),sign);
+                                        continue;
                                     }
-                                    log.error("绌挎杞te鍛戒护涓嬪彂澶辫触===>涓嬪彂寮傚父锛宩ar鍙�={},浠诲姟鏁版嵁={},绌挎杞︽暟鎹�={},sign={}",
-                                            wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(steProtocol),sign);
-                                    return true;
-                                }
-                            default: return false;
+                                default: continue;
+                            }
                         }
+
                     }
                 }
             }
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastExecuteServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastExecuteServiceImpl.java
index 0c34bb4..811bbd5 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastExecuteServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastExecuteServiceImpl.java
@@ -17,6 +17,11 @@
     }
 
     @Override
+    public List<WrkMastExecute> getWrkMastExecuteByWrkNoList(Long wrkNo) {
+        return this.baseMapper.getWrkMastExecuteByWrkNoList(wrkNo);
+    }
+
+    @Override
     public List<WrkMastExecute> getWrkMastExecuteByJarNo(Integer jarId) {
         return this.baseMapper.getWrkMastExecuteByJarNo(jarId);
     }
diff --git a/src/main/resources/mapper/WrkMastExecuteMapper.xml b/src/main/resources/mapper/WrkMastExecuteMapper.xml
index 22f7bf1..a194a43 100644
--- a/src/main/resources/mapper/WrkMastExecuteMapper.xml
+++ b/src/main/resources/mapper/WrkMastExecuteMapper.xml
@@ -62,6 +62,12 @@
         and wrk_no = #{wrkNo}
     </select>
 
+    <select id="getWrkMastExecuteByWrkNoList" resultMap="BaseResultMap">
+        select * from jar_wrk_mast_execute
+        where 1=1
+        and wrk_no = #{wrkNo}
+    </select>
+
     <select id="getWrkMastExecuteByJarNo" resultMap="BaseResultMap">
         select * from jar_wrk_mast_execute
         where 1=1

--
Gitblit v1.9.1