From f7888c2f0cb6537388345517434988a887f6e81c Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 22 十一月 2022 13:11:29 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/service/CommonService.java |   29 +++++++++++++++++++----------
 1 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 11f066a..7c14d77 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -50,7 +50,7 @@
 
     /**
      * 鐢熸垚宸ヤ綔鍙�
-     * @param wrkMk 0:鍏ュ簱 1 - 3000 ; 1:鎷f枡/骞舵澘/鐩樼偣 3001 - 6000 ; 2: 鍑哄簱 6001 -9000 ; 3:鍏朵粬 9001 -9999
+     * @param wrkMk
      * @return workNo(宸ヤ綔鍙�)
      */
     public int getWorkNo(Integer wrkMk) {
@@ -98,17 +98,26 @@
     @Transactional
     public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto, int times) {
 //        whsType = getWhsType(sourceStaNo, times);
+        switch (sourceStaNo){
+            case 101:
+            case 109:
+            case 117:
+                whsType=1;
+                break;
+            case 201:
+                whsType=2;
+                break;
+            case 207:
+                whsType=3;
+                break;
+            case 213:
+                whsType=4;
+                break;
+        }
+
         StartupDto startupDto = new StartupDto();
 
-        if (sourceStaNo < 200){
-            whsType = 1;
-        } else if (sourceStaNo > 199 && sourceStaNo < 300){
-            whsType = 2;
-        } else if (sourceStaNo > 299 && sourceStaNo < 400){
-            whsType = 3;
-        } else if (sourceStaNo > 399){
-            whsType = 4;
-        }
+
 
         RowLastno rowLastno = rowLastnoService.selectById(whsType);
         if (Cools.isEmpty(rowLastno)) {

--
Gitblit v1.9.1