From 46f8920cdcbff803b8b51a927ad40f33ce060b32 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 22 四月 2026 20:43:49 +0800
Subject: [PATCH] 出库下发流程按照进仓编号的前后顺序下发;配置一个出库进仓编号出库数量阀值; 当运行中的进仓编号任务WrkSts=25、14、15并且小于该阀值时下发下一个进仓编号的出库任务

---
 src/main/java/com/zy/common/model/LocTypeDto.java |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/common/model/LocTypeDto.java b/src/main/java/com/zy/common/model/LocTypeDto.java
index 08c9f1b..2834429 100644
--- a/src/main/java/com/zy/common/model/LocTypeDto.java
+++ b/src/main/java/com/zy/common/model/LocTypeDto.java
@@ -13,7 +13,7 @@
 @Data
 public class LocTypeDto {
 
-    // 楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿
+    // 楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣�,3:绌烘墭鐩樺厹搴曞簱浣峿
     private Short locType1;
 
     // 瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿
@@ -22,17 +22,20 @@
     // 杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿
     private Short locType3;
 
+    private Integer siteId;
+
     public LocTypeDto() {
     }
 
     public LocTypeDto(BasDevp basDevp) {
-        if (basDevp.getLocType1() == null || basDevp.getLocType1() == 0) {
+        if (basDevp.getLocType1() == null) {
             throw new CoolException("plc楂樹綆妫�娴嬪紓甯�");
         }
+        // PLC 鍘熷淇″彿 0=浣庝綅锛屽叾瀹冩寜楂樹綅澶勭悊锛岃繖閲屼繚鐣欐槧灏勭粨鏋滅粰鍚庣画鎵句綅/鍏煎閲嶈瘯浣跨敤銆�
         if (basDevp.getLocType1() == 1) {
-            this.locType1 = 1; // 灏忓簱浣�
+            this.locType1 = 1; // 浣庡簱浣�
         } else {
-            this.locType1 = 2; // 澶у簱浣�
+            this.locType1 = 2; // 楂樺簱浣�
         }
         log.info(JSON.toJSONString(this));
     }

--
Gitblit v1.9.1