From b1cbb59d39cea44d35110d95e54fbd86d4a12e13 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 01 八月 2025 12:55:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghjtasrs' into ghjtasrs
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 36d2382..b5d4fad 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1360,7 +1360,7 @@
if (wrkMast == null) {
throw new CoolException("涓嶅瓨鍦ㄨ宸ヤ綔鍙凤細" + param.getWorkNo());
}
- if (wrkMast.getWrkSts() == 3) {
+ if (wrkMast.getWrkSts() == 3||wrkMast.getWrkSts() == 4) {
throw new CoolException("宸ヤ綔妗ｇ姸鎬佷笉瀵癸細" + param.getWorkNo());
}
wrkMast.setWrkSts(2L);
@@ -1514,6 +1514,7 @@
private void ckjgsbPushMes(WrkMast wrkMast, List<WrkDetl> wrkDetls) {
GwmsGenerateInventoryDto gwmsGenerateInventoryDto = new GwmsGenerateInventoryDto();
+ gwmsGenerateInventoryDto.setWarehouseType(4);
gwmsGenerateInventoryDto.setBarcode(wrkMast.getBarcode());
gwmsGenerateInventoryDto.setPalletizingNo(wrkMast.getStaNo());
List<GwmsGenerateInventoryDto.MatList> matLists = new ArrayList<>();
--
Gitblit v1.9.1