From e128bbc4a9df1491257320884169ba813d461f63 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期六, 20 十二月 2025 10:33:20 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/controller/OutController.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 057837a..98fb66b 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -75,6 +75,16 @@
}
LocDto locDto = new LocDto(orderDetl.getManu(), orderDetl.getMatnr(), orderDetl.getMaktx(),orderDetl.getModel(),orderDetl.getSpecs(),
orderDetl.getBatch(),orderDetl.getBrand(),orderDetl.getBarcode(), orderDetl.getOrderNo(),orderDetl.getAnfme());
+ LocDetl one = locDetlService.selectItem(locDto.getLocNo(), locDto.getMatnr(), locDto.getBatch());
+ if (one == null) {
+ LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("batch", locDto.getBatch()));
+ if (locDetl == null) {
+ locDto.setLocNo(null);
+ } else {
+ locDto.setLocNo(locDetl.getLocNo());
+ }
+ }
+
locDto.setOrderDetlId(orderDetl.getId());
locDto.setTkType(orderDetl.getTkType());
locDtos.add(locDto);
@@ -140,7 +150,24 @@
public synchronized R pakout(@RequestBody List<LocDto> locDtos) throws InterruptedException {
StockOutParam param = new StockOutParam();
ArrayList<StockOutParam.LocDetl> locDetls = new ArrayList<>();
+ int staNoOrder = 0;
for (LocDto locDto:locDtos){
+ Order order = orderService.selectByNo(locDto.getOrderNo());
+
+ DocType docType = docTypeService.selectById(order.getDocType());
+
+ if (docType.getDocName().equals("涓嶅悎鏍煎搧鍑哄簱")){
+ staNoOrder = 212;
+ }
+ if (docType.getDocName().equals("鎷嗗寘瑁呮鍑哄簱")){
+ staNoOrder = 212;
+ }
+ if (docType.getDocName().equals("閫�璐ц嚦浜屾ゼ")){
+ staNoOrder = 212;
+ }
+
+ OrderDetl orderDetl = orderDetlService.selectById(locDto.getOrderDetlId());
+
StockOutParam.LocDetl locDetl = new StockOutParam.LocDetl();
locDetl.setBrand(locDto.getBrand());
try{
@@ -156,7 +183,8 @@
locDetl.setModel(locDto.getModel());
locDetl.setSpecs(locDto.getSpecs());
locDetl.setZpallet(locDto.getZpallet());
- locDetl.setMemo(locDto.getMemo());
+ locDetl.setMemo(orderDetl.getMemo());
+ locDetl.setColor(order.getCstmrName());
param.setOrderNo(locDto.getOrderNo());
@@ -164,8 +192,10 @@
}
param.setLocDetls(locDetls);
- List<StockOutParam> stockOutParams = OutboundAllocationUtil.OutboundClassification(param);
+ List<StockOutParam> stockOutParams = OutboundAllocationUtil.OutboundClassificationOrder(param,staNoOrder);
+ Date now = new Date();
for (StockOutParam stockOutParam : stockOutParams){
+ stockOutParam.setNowTime(now);
workService.startupFullTakeStore(stockOutParam, getUserId());
}
--
Gitblit v1.9.1