From 59faff8bcfda7d9b33e133f88b3f3e97f3d84db3 Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期四, 10 七月 2025 09:23:44 +0800
Subject: [PATCH] 库存调整(未完成)

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

diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 6fb03a4..43c26de 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -103,7 +103,7 @@
         if(param.getIoType() == 1) {
             List<SearchLocParam.WantBucket> wantBucketFlag = param.getWantBucketFlag();
             for(SearchLocParam.WantBucket wantBucket: wantBucketFlag) {
-                if(wantBucket.getBucketType() != 0 && wantBucket.getBucketType() == param.getBucketType()) { // 缃愯绾挎湁瑕佹《淇″彿骞朵笖褰撳墠妗舵槸缃愯绾胯鐨勬《
+                if(wantBucket.getBucketType() != 0 && wantBucket.getBucketType() == param.getBucketType() && wantBucket.getWantBucketCount() >= 1) { // 缃愯绾挎湁瑕佹《淇″彿骞朵笖褰撳墠妗舵槸缃愯绾胯鐨勬《
                     if(waitPakin == null) {
                         return R.error("鍏ュ簱閫氱煡妗d负绌�");
                     } else {
@@ -260,7 +260,7 @@
 //            wrkMast.setCrnNo(dto.getCrnNo());
             wrkMast.setSourceStaNo(param.getSourceStaNo());
             wrkMast.setStaNo(1090);
-//            wrkMast.setLocNo(dto.getLocNo());
+            wrkMast.setLocNo(!param.isTbFlag() ? "璐存爣澶辫触" : "澶嶆閲嶉噺寮傚父");
             wrkMast.setBarcode(wrkMast1.getBarcode()); // 鎵樼洏鐮�
             wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
 //            wrkMast.setPicking("N"); // 鎷f枡
@@ -455,10 +455,10 @@
         }
 
         if(!param.isTbFlag()) { //涓嬬嚎鍑哄簱
+            Config config = configService.selectConfigByCode("gzxfh" + wrkMast.getSourceStaNo());
             wrkMast.setSourceStaNo(1090);
             wrkMast.setStaNo(1024); // 寮傚父涓嬬嚎榛樿鍏ュ簱绔欑偣涓�1024
             // 鑾峰彇绯荤粺閰嶇疆锛岀湅鎴愬搧缃愯瀹屾垚鏄惁鐩存帴鍑哄埌鍙戣揣鍙�
-            Config config = configService.selectConfigByCode("gzxfh" + param.getSourceStaNo());
             if (config != null && config.getStatus() == 1 && !Cools.isEmpty(config.getValue())) {
                 wrkMast.setStaNo(Integer.parseInt(config.getValue()));
             }
@@ -685,6 +685,7 @@
     @PostMapping("/autoOutEmptyBucket")
     @ResponseBody
     public R autoOutEmptyBucket(@RequestBody StockOutParam param){
+        log.info("鏀跺埌WCS鑷姩鍑虹┖妗舵帴鍙h姹�====>>鍏ュ弬:{}", param);
         workService.startupFullTakeStore(param, 29L);
         return R.ok("鍑哄簱鍚姩鎴愬姛");
     }

--
Gitblit v1.9.1