From 28e6395846e2aaa1903b421ee544cd38c27c0a6d Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 21 十月 2025 16:08:05 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 8 +++++---
1 files changed, 5 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 0075a9d..3522907 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -217,7 +217,7 @@
throw new CoolException(wrkMast.getWrkNo() + "宸ヤ綔鍙凤紝浠诲姟宸茬粡鎷ｉ�夌洏鐐�");
}
- if (wrkMast.getIoType() != 103 || wrkMast.getIoType() != 107) {
+ if (wrkMast.getIoType() != 103 && wrkMast.getIoType() != 107) {
throw new CoolException(wrkMast.getWrkNo() + "宸ヤ綔鍙凤紝浠诲姟涓嶅睘浜庢嫞閫夌洏鐐�");
}
@@ -230,7 +230,9 @@
FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();
findLocNoAttributeVo.setMatnr(wrkDetl.getMatnr());
- StartupDto dto = commonService.getLocNo(1, param.getSourceStaNo(), findLocNoAttributeVo, locTypeDto, param.getBarcode());
+ int ioType = wrkMast.getIoType() - 50; // 鍏ュ嚭搴撶被鍨�: 103->53,104->54,107->57
+
+ StartupDto dto = commonService.getLocNo(ioType, param.getSourceStaNo(), findLocNoAttributeVo, locTypeDto, param.getBarcode());
if (dto == null) {
throw new CoolException("鎵句笉鍒扮┖搴撲綅");
}
@@ -247,7 +249,7 @@
Date now = new Date();
// 鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬�
- wrkMast.setIoType(wrkMast.getIoType() - 50); // 鍏ュ嚭搴撶被鍨�: 103->53,104->54,107->57
+ wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶被鍨�: 103->53,104->54,107->57
wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵��: 2.璁惧涓婅蛋
wrkMast.setCrnNo(dto.getCrnNo());
wrkMast.setSourceStaNo(dto.getSourceStaNo());
--
Gitblit v1.9.1