From 07c572bea979dbd3ee46ec24083cb1bdcc014e3a Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 05 七月 2024 13:56:50 +0800
Subject: [PATCH] 一期找库位方法修改

---
 src/main/java/com/zy/common/web/WcsController.java |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 4946169..c99bb49 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -127,7 +127,8 @@
         if (devpNo == 304) {
             dto = commonService.getLocNoBy304(str5.get(0));
         } else {
-            dto = commonService.getLocNo(1, 1, devpNo, false, matNos, locTypeDto,0);
+//            dto = commonService.getLocNo(1, 1, devpNo, false, matNos, locTypeDto,0);
+            dto = commonService.getLocNoNew(1, devpNo,barcode);
         }
         int workNo = dto.getWorkNo();
 
@@ -197,11 +198,11 @@
         BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
         // 妫�绱㈠簱浣�
         StartupDto dto;
-        if (devpNo >= 300) {
+//        if (devpNo >= 300) {
             dto = commonService.emptyIngetLocNo(devpNo);
-        } else {
-            dto = commonService.getLocNo(1, 10, devpNo, true, null, locTypeDto, 0);
-        }
+//        } else {
+//            dto = commonService.getLocNo(1, 10, devpNo, true, null, locTypeDto, 0);
+//        }
         int workNo = dto.getWorkNo();
         // 鐢熸垚宸ヤ綔妗�
         WrkMast wrkMast = new WrkMast();

--
Gitblit v1.9.1