From 2acfc2d2a0e956910c51bd996f443b3cb9bd3dc9 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期日, 22 三月 2026 14:27:21 +0800
Subject: [PATCH] 优化找库位规则

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

diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index a458757..560c2b4 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -81,10 +81,10 @@
 //            dto1.setTaskPri((int) Math.round(wrkMast1.getIoPri()));
             return R.ok(dto1);
         }
-        List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("io_type", 1));
-        if (!Cools.isEmpty(wrkMasts) && wrkMasts.size() > 10) {
-            return R.error("闄愯");
-        }
+//        List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("io_type", 1));
+//        if (!Cools.isEmpty(wrkMasts) && wrkMasts.size() > 10) {
+//            return R.error("闄愯");
+//        }
         waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
         if (Cools.isEmpty(waitPakins)) {
             return R.error("璇峰厛娣诲姞鍏ュ簱閫氱煡妗�");
@@ -126,6 +126,9 @@
         BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true);
         sourceStaNo.setLocType1(param.getLocType1());
         LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
+        if (waitPakins.get(0).getMatnr().equals("emptyPallet")) {
+            locTypeDto.setLocType2((short) 1);
+        }
 
         StartupDto dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, waitPakins);
         log.info("WCS鍏ュ簱鎺ュ彛杩斿弬:{},鎵樼洏鐮�:{}", dto, param.getBarcode());

--
Gitblit v1.9.1