From 2983f5990702d55d025fee37d80fa43f2cc73e72 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期日, 14 四月 2024 12:19:44 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/model/protocol/StaProtocol.java   |    1 +
 src/main/java/com/zy/asrs/entity/BasDevp.java               |    7 +++++++
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   15 +++++++++++++++
 src/main/resources/mapper/BasDevpMapper.xml                 |    1 +
 4 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/BasDevp.java b/src/main/java/com/zy/asrs/entity/BasDevp.java
index c969456..10d0845 100644
--- a/src/main/java/com/zy/asrs/entity/BasDevp.java
+++ b/src/main/java/com/zy/asrs/entity/BasDevp.java
@@ -70,6 +70,13 @@
     private String loading;
 
     /**
+     * 鏈夌墿
+     */
+    @ApiModelProperty(value= "瓒呯骇鏈夌墿")
+    @TableField("loading_super")
+    private String loadingSuper;
+
+    /**
      * 绌烘澘
      */
     @ApiModelProperty(value= "绌烘澘")
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 a853100..11d11fb 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -3696,6 +3696,11 @@
                         if (!basDevp.getAutoing().equals("Y") || basDevp.getLoading().equals("Y") || basDevp.getWrkNo()!=0){
                             continue;
                         }
+                        if (basDevp.getDevNo()>117 && basDevp.getDevNo()<124){
+                            if (basDevp.getLoadingSuper().equals("Y")){
+                                continue;
+                            }
+                        }
                         if (basDevp.getDevNo()>=118 && basDevp.getDevNo()<=123){
                             if (!basDevp.getEmptyMk().equals("Y")){
                                 continue;
@@ -3773,6 +3778,11 @@
                             BasDevp basDevp = basDevpService.selectById(wrkMastSta.getStaEnd());
                             if (!basDevp.getAutoing().equals("Y") || basDevp.getLoading().equals("Y") || basDevp.getWrkNo()!=0){
                                 continue;
+                            }
+                            if (basDevp.getDevNo()>117 && basDevp.getDevNo()<124){
+                                if (basDevp.getLoadingSuper().equals("Y")){
+                                    continue;
+                                }
                             }
                             if (basDevp.getDevNo()>=118 && basDevp.getDevNo()<=123){
                                 if (!basDevp.getEmptyMk().equals("Y")){
@@ -3856,6 +3866,11 @@
                             if (!basDevp.getAutoing().equals("Y") || basDevp.getLoading().equals("Y") || basDevp.getWrkNo()!=0){
                                 continue;
                             }
+                            if (basDevp.getDevNo()>117 && basDevp.getDevNo()<124){
+                                if (basDevp.getLoadingSuper().equals("Y")){
+                                    continue;
+                                }
+                            }
                             if (basDevp.getDevNo()>=118 && basDevp.getDevNo()<=123){
                                 if (!basDevp.getEmptyMk().equals("Y")){
                                     continue;
diff --git a/src/main/java/com/zy/core/model/protocol/StaProtocol.java b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
index 69f2bef..63460ac 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -87,6 +87,7 @@
         basDevp.setWrkNo(workNo);
         basDevp.setAutoing(autoing?"Y":"N");
         basDevp.setLoading(loading?"Y":"N");
+        basDevp.setLoadingSuper(loadingSuper?"Y":"N");
         basDevp.setEmptyMk(emptyMk?"Y":"N");
         if (autoing && !loadingSuper && !loading){
             basDevp.setReportSign(0);
diff --git a/src/main/resources/mapper/BasDevpMapper.xml b/src/main/resources/mapper/BasDevpMapper.xml
index b6b9829..de15af9 100644
--- a/src/main/resources/mapper/BasDevpMapper.xml
+++ b/src/main/resources/mapper/BasDevpMapper.xml
@@ -43,6 +43,7 @@
         <result column="cart_pos" property="cartPos" />
         <result column="report_sign" property="reportSign" />
         <result column="empty_mk" property="emptyMk" />
+        <result column="loading_super" property="loadingSuper" />
 
     </resultMap>
 

--
Gitblit v1.9.1