From 8d702fa2c62b3617f71c5e91293e338d1ccd1549 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期六, 08 十一月 2025 13:15:23 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/OutController.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 53435bd..7e6cea3 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -140,7 +140,23 @@
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,6 +172,8 @@
locDetl.setModel(locDto.getModel());
locDetl.setSpecs(locDto.getSpecs());
locDetl.setZpallet(locDto.getZpallet());
+ locDetl.setMemo(orderDetl.getMemo());
+ locDetl.setColor(order.getCstmrName());
param.setOrderNo(locDto.getOrderNo());
@@ -163,8 +181,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