From 072e9fbd7854ce30cf4bcfadad10cc817c8441d9 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期六, 17 八月 2024 13:06:55 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 3b58ed6..edfa3be 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -40,7 +40,9 @@
 @Service
 public class MobileServiceImpl implements MobileService {
 
-
+    public static final List<Integer> OVER_TORN_STA_NO_LIST = new ArrayList<Integer>() {{
+        add(126);add(131);add(310);add(312);
+    }};
 
     @Autowired
     private MatService matService;
@@ -301,7 +303,7 @@
             waitPakin.setVolume(orderDetl.getVolume());  //姣涢噸
             waitPakin.setPrice(orderDetl.getPrice());   //闀垮害
             waitPakin.setSpecs(String.valueOf(orderDetl.getSpecs()));   //鎺ュご
-            waitPakin.setOrigin("2"); //鏈ㄧ鍦ㄦ墭鐩樹笂鐨勪綅缃�
+            waitPakin.setOrigin("1"); //鏈ㄧ鍦ㄦ墭鐩樹笂鐨勪綅缃�
             waitPakin.setIoStatus("Y");     // 鍏ュ嚭鐘舵��
             waitPakin.setAnfme(orderDetl.getAnfme());  // 鏈ㄧ涓摐绠旀暟閲�
             waitPakin.setWeight(orderDetl.getWeight());  // 鏈ㄧ涓摐绠斿噣閲�
@@ -1126,8 +1128,8 @@
         wrkMast.setLinkMis("N");
         wrkMast.setAppeUser(userId); // 鎿嶄綔浜哄憳鏁版嵁
         wrkMast.setSheetNo("0");  //寰愬伐姹変簯鎷嗗灈鏍囪锛�0: 鍒濆  1: 鏈媶  2:宸叉媶 3锛氬凡澶勭悊鍙笅涓�姝ワ紙杞巻鍙叉。锛�
-        if (wrkMast.getStaNo()<118 || wrkMast.getStaNo()>121){
-            wrkMast.setSheetNo("3");
+        if (!OVER_TORN_STA_NO_LIST.contains(staDesc.getStnNo())){
+            wrkMast.setSheetNo("2");
         }
         wrkMast.setAppeTime(now);
         wrkMast.setModiUser(userId);

--
Gitblit v1.9.1