From a1dd6ff24f7cae0b529ad313ba07351c07965605 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 03 十一月 2025 13:04:09 +0800
Subject: [PATCH] 管控线边仓库存
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 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 8a0ad47..a8eee4d 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -95,10 +95,10 @@
null, // 鐗╂祦鍗曞彿
1L, // 璁㈠崟鐘舵��
1, // 鐘舵��
- 9527L, // 娣诲姞浜哄憳
+ null, // 娣诲姞浜哄憳
now, // 娣诲姞鏃堕棿
- 9527L, // 淇敼浜哄憳
- now, // 淇敼鏃堕棿
+ null, // 淇敼浜哄憳
+ null, // 淇敼鏃堕棿
null // 澶囨敞
);
@@ -110,7 +110,7 @@
List<DetlDto> list = new ArrayList<>();
List<DetlDto> orderDetails = param.getOrderDetails();
for (DetlDto detail : orderDetails) {
- DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme());
+ DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme(),detail.getSourceLoc(), detail.getStaLoc(),detail.getSku());
if (DetlDto.has(list, dto)) {
DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
assert detlDto != null;
@@ -133,10 +133,12 @@
orderDetl.setOrderId(order.getId());
orderDetl.setOrderNo(order.getOrderNo());
orderDetl.setSku(detlDto.getSku()); // 鍗曡鍙凤紝u8鏄庣粏id,涓婃姤闇�瑕�
- orderDetl.setCreateBy(9527L);
+ orderDetl.setSupp(detlDto.getSourceLoc());
+ orderDetl.setSuppCode(detlDto.getStaLoc());
+// orderDetl.setCreateBy(9527L);
orderDetl.setCreateTime(now);
- orderDetl.setUpdateBy(9527L);
- orderDetl.setUpdateTime(now);
+// orderDetl.setUpdateBy(9527L);
+// orderDetl.setUpdateTime(now);
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
if (!orderDetlService.insert(orderDetl)) {
@@ -219,6 +221,9 @@
Order order = orderService.selectByNo(orderNo);
if (optType.equals("add")) {
+ if (!Cools.isEmpty(order)) {
+ throw new CoolException(orderNo + "鍗曟嵁宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
+ }
DocType docType = docTypeService.selectOrAdd(orderType, Boolean.FALSE);
Date now = new Date();
// 鍗曟嵁涓绘。
@@ -252,10 +257,10 @@
null, // 鐗╂祦鍗曞彿
1L, // 璁㈠崟鐘舵��
1, // 鐘舵��
- 9527L, // 娣诲姞浜哄憳
+ null, // 娣诲姞浜哄憳
now, // 娣诲姞鏃堕棿
- 9527L, // 淇敼浜哄憳
- now, // 淇敼鏃堕棿
+ null, // 淇敼浜哄憳
+ null, // 淇敼鏃堕棿
null // 澶囨敞
);
if (!orderService.insert(order)) {
@@ -265,7 +270,7 @@
List<DetlDto> list = new ArrayList<>();
List<DetlDto> orderDetails = param.getOrderDetails();
for (DetlDto detail : orderDetails) {
- DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme());
+ DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme(),detail.getSourceLoc(),detail.getStaLoc(),detail.getSku());
if (DetlDto.has(list, dto)) {
DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
assert detlDto != null;
@@ -286,10 +291,12 @@
orderDetl.setOrderId(order.getId());
orderDetl.setOrderNo(order.getOrderNo());
orderDetl.setSku(detlDto.getSku()); // 鍗曡鍙凤紝u8鏄庣粏id,涓婃姤闇�瑕�
- orderDetl.setCreateBy(9527L);
+ orderDetl.setSupp(detlDto.getSourceLoc());
+ orderDetl.setSuppCode(detlDto.getStaLoc());
+// orderDetl.setCreateBy(9527L);
orderDetl.setCreateTime(now);
- orderDetl.setUpdateBy(9527L);
- orderDetl.setUpdateTime(now);
+// orderDetl.setUpdateBy(9527L);
+// orderDetl.setUpdateTime(now);
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
if (!orderDetlService.insert(orderDetl)) {
--
Gitblit v1.9.1