From 7ab1bf4c111cbfa3a35685aa9aa0ed3599b6b6c7 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期日, 18 二月 2024 20:58:05 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   10 ++++++++--
 src/main/java/com/zy/asrs/entity/WrkMast.java               |    7 +++++++
 src/main/resources/mapper/WrkMastMapper.xml                 |    1 +
 src/main/java/com/zy/asrs/mapper/WrkMastCrnMapper.java      |    3 +++
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index a053554..aaef397 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -332,6 +332,13 @@
     @TableField("full_plt")
     private String fullPlt;
 
+    /**
+     * 浼寸敓宸ヤ綔鍙�
+     */
+    @ApiModelProperty(value= "浼寸敓宸ヤ綔鍙�")
+    @TableField("work_no_other")
+    private Integer workNoOther;
+
     public String getWrkSts$(){
         BasWrkStatusMapper mapper = SpringUtils.getBean(BasWrkStatusMapper.class);
         BasWrkStatus entity = mapper.selectById(this.wrkSts);
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastCrnMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastCrnMapper.java
index 27b8304..4d40319 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastCrnMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastCrnMapper.java
@@ -12,4 +12,7 @@
 public interface WrkMastCrnMapper extends BaseMapper<WrkMastCrn> {
 
     WrkMastCrn selectWrkNoOneAndTwo(@Param("wrkNo")Integer wrkNo);
+
+    WrkMastCrn selectWrkNoCrnAndWrkSts(@Param("crnNo")Integer crnNo,@Param("wrkSts")Integer wrkSts);
+
 }
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 5819380..cc1bbba 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1085,6 +1085,12 @@
                         // 绉诲姩涓�
                         continue;
                     }
+                    if (crnProtocol.getCrnNo()<=2){
+                        WrkMastCrn wrkMastCrn = wrkMastCrnMapper.selectWrkNoOneAndTwo(crnProtocol.getTaskNo().intValue());
+                        if (!Cools.isEmpty(wrkMastCrn) && wrkMastCrn.getWrkSts().equals(12L)){
+                            wrkMast = wrkMastMapper.selectPakInStep3(wrkMastCrn.getWrkNo().intValue());
+                        }
+                    }
                     //  鍒ゆ柇鍫嗗灈鏈虹姸鎬佺瓑寰呯‘璁�
                     if (crnProtocol.modeType == CrnModeType.AUTO && crnProtocol.getTaskNo().equals(wrkMast.getWrkNo().shortValue())
                             && crnProtocol.statusType == CrnStatusType.WAITING
@@ -1118,14 +1124,14 @@
                                 }
 
                                 // 涓嬪彂绔欑偣淇℃伅
-                                staProtocolOther.setWorkNo(wrkMast1.getWrkNo());
+                                staProtocolOther.setWorkNo(Cools.isEmpty(wrkMast1.getWorkNoOther())? wrkMast1.getWrkNo():wrkMast1.getWorkNoOther());
                                 staProtocolOther.setStaNo(wrkMast1.getStaNo());
                                 if (!MessageQueue.offer(SlaveType.Devp, crnStn.getDevpPlcId(), new Task(2, staProtocolOther))) {
                                     continue;
                                 }
 
                                 // 涓嬪彂绔欑偣淇℃伅
-                                staProtocol.setWorkNo(wrkMast2.getWrkNo());
+                                staProtocol.setWorkNo(Cools.isEmpty(wrkMast2.getWorkNoOther())? wrkMast2.getWrkNo():wrkMast2.getWorkNoOther());
 //                                    staProtocol.setStaNo(RouteUtils.CrnStaEnd(wrkMast.getStaNo(),wrkMast.getSourceStaNo()));
                                 staProtocol.setStaNo(wrkMast2.getStaNo());
                                 if (!MessageQueue.offer(SlaveType.Devp, crnStn.getDevpPlcId(), new Task(2, staProtocol))) {
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index dbe1332..e356371 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -62,6 +62,7 @@
 <!--        <result column="Pdc_type" property="PdcType" />-->
         <result column="ctn_no" property="ctnNo" />
         <result column="full_plt" property="fullPlt" />
+        <result column="work_no_other" property="workNoOther" />
 
     </resultMap>
 

--
Gitblit v1.9.1