From bd2eb4480540d2bf6ee1c12fd72d7f778b036a4a Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期三, 18 六月 2025 12:54:43 +0800
Subject: [PATCH] #导入订单时分批导入
---
src/main/java/com/zy/asrs/controller/OutController.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 7f72384..2e57917 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -90,11 +90,11 @@
staNos.add(3077);
staNos.add(3106);
} else if(order.getDocType() == 22) {
+ staNos.add(2041);
+ } else if(order.getDocType() == 23) {
staNos.add(3092);
staNos.add(3102);
staNos.add(3095);
- } else if(order.getDocType() == 23) {
- staNos.add(3041);
}
LocDto locDto = new LocDto();
locDto.setLocNo(locDetls.get(0).getLocNo());
@@ -251,7 +251,12 @@
for (StockOutParam.LocDetl paramLocDetl : stockOutParam.getLocDetls()) {
LocDetl one = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no",paramLocDetl.getLocNo())
.eq("brand",paramLocDetl.getBrand()).eq("model",paramLocDetl.getModel()));
- if (null != one) locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount(), stockOutParam.getOrderNo()));
+ if (null != one) {
+ if(!"鍚堟牸".equals(one.getThreeCode())) {
+ throw new CoolException(one.getModel() + "鍗蜂笉鍚堟牸:" + one.getThreeCode() );
+ }
+ locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount(), stockOutParam.getOrderNo()));
+ }
}
if (!locDetlDtos.isEmpty()) {
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetlDtos.get(0).getLocDetl().getLocNo()));
@@ -260,7 +265,7 @@
Order order = orderService.selectByNo(stockOutParam.getOrderNo());
// 鍚姩鍑哄簱寮�濮�
- workService.stockOut(staNo, locDetlDtos, order.getDocType() == 22 ? IoWorkType.CHECK_OUT : null, getUserId());
+ workService.stockOut(staNo, locDetlDtos, order.getDocType() == 23 ? IoWorkType.CHECK_OUT : null, getUserId());
}else {
throw new CoolException("鎵�閫夊簱浣嶅瓨鍦ㄧ姸鎬佷笉涓篎銆丏鐨勫簱浣嶏紝搴撲綅鍙凤細"+locMast.getLocNo()+" 銆佸綋鍓嶇姸鎬侊細"+locMast.getLocSts()+"-"+locMast.getLocSts$());
}
--
Gitblit v1.9.1