From 1d3fdb2bf289396fb5d20aa48783c02b55f2d95d Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期日, 13 七月 2025 16:55:28 +0800
Subject: [PATCH] 增加空托出库条件(堆垛机自动+无报警码)
---
src/main/java/com/zy/common/web/WcsController.java | 9 +++++----
1 files changed, 5 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 a8cba24..0f37693 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("鍏ュ簱閫氱煡妗ｄ负绌�");
} 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"); // 鎷ｆ枡
@@ -450,7 +450,7 @@
WrkMast wrkMast = wrkMastService.selectById(wrkNo);
if (wrkMast == null) {
throw new CoolException("寮傚父鍙ｅ叆搴撲换鍔″彿鏃犱换鍔★細" + wrkNo);
- } else if (wrkMast.getLocNo() != null) {
+ } else if (wrkMast.getLocNo() != null && wrkMast.getLocNo().length() == 7) {
throw new CoolException("寮傚父鍙ｅ叆搴撳簱浣嶅凡鍒嗛厤锛�" + wrkMast.getLocNo());
}
@@ -685,6 +685,7 @@
@PostMapping("/autoOutEmptyBucket")
@ResponseBody
public R autoOutEmptyBucket(@RequestBody StockOutParam param){
+ log.info("鏀跺埌WCS鑷姩鍑虹┖妗舵帴鍙ｈ姹�====>>鍏ュ弬:{}", param);
workService.startupFullTakeStore(param, 29L);
return R.ok("鍑哄簱鍚姩鎴愬姛");
}
@@ -708,7 +709,7 @@
}
if (locMast == null) {
- return R.error("搴撳瓨娌℃湁"+type+"绫诲瀷绌烘墭鐩�");
+ return R.error("搴撳瓨娌℃湁"+type+"绫诲瀷绌烘墭鐩樻垨鏃犲彲鐢ㄥ爢鍨涙満");
}
String locNo = locMast.getLocNo();
--
Gitblit v1.9.1