From a5de20d0041431b7f5e92a49315082ff2140d447 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期日, 13 七月 2025 10:48:18 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OrderController.java | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 8a9ffd2..1bac075 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -11,6 +11,7 @@
import com.zy.asrs.entity.param.OrderDomainParam;
import com.zy.asrs.entity.result.WrkTraceVo;
import com.zy.asrs.service.*;
+import com.zy.asrs.utils.MathUtils;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import org.springframework.beans.BeanUtils;
@@ -125,15 +126,15 @@
param.getOrderNo(), // 璁㈠崟缂栧彿
DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
param.getDocType(), // 鍗曟嵁绫诲瀷
- null, // 椤圭洰缂栧彿
- null, //
+ param.getItemId(), // 椤圭洰缂栧彿
+ param.getItemName(), //
null, // 璋冩嫧椤圭洰缂栧彿
- null, // 鍒濆绁ㄦ嵁鍙�
- null, // 绁ㄦ嵁鍙�
+ param.getDefNumber(), // 鍒濆绁ㄦ嵁鍙�
+ param.getCstmr(), // 绁ㄦ嵁鍙�
null, // 瀹㈡埛缂栧彿
null, // 瀹㈡埛
null, // 鑱旂郴鏂瑰紡
- null, // 鎿嶄綔浜哄憳
+ getUser().getUsername(), // 鎿嶄綔浜哄憳
null, // 鍚堣閲戦
null, // 浼樻儬鐜�
null, // 浼樻儬閲戦
@@ -168,7 +169,8 @@
if (DetlDto.has(list, dto)) {
OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand(), orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(),
orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3());
- item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
+ item.setAnfme(MathUtils.add(item.getAnfme(), orderDetl.getAnfme()));
+ item.setStandby1(param.getDefNumber());
if (!orderDetlService.updateById(item)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
}
@@ -182,6 +184,7 @@
orderDetl.setUpdateTime(now);
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
+ orderDetl.setStandby1(param.getDefNumber());
orderDetl.setPakinPakoutStatus(status);
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
@@ -202,10 +205,14 @@
Date now = new Date();
Long userId = getUserId();
// 淇敼涓绘。
- if (!param.getDocType().equals(order.getDocType())) {
+ if (!param.getDocType().equals(order.getDocType()) || param.getItemId() != order.getItemId() || param.getDefNumber() != order.getDefNumber()) {
order.setDocType(param.getDocType());
order.setUpdateBy(userId);
order.setUpdateTime(now);
+ order.setItemId(param.getItemId());
+ order.setItemName(param.getItemName());
+ order.setDefNumber(param.getDefNumber());
+ order.setNumber(param.getCstmr());
if (!orderService.updateById(order)) {
throw new CoolException("淇敼璁㈠崟绫诲瀷澶辫触");
}
@@ -220,13 +227,13 @@
List<DetlDto> list = new ArrayList<>();
for (OrderDetl orderDetl : param.getOrderDetlList()) {
DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand(),
- orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(),
+ param.getItemId(), orderDetl.getStandby2(), orderDetl.getStandby3(),
orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3());
if (DetlDto.has(list, dto)) {
OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand(),
- orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(),
+ param.getItemId(), orderDetl.getStandby2(), orderDetl.getStandby3(),
orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3());
- item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
+ item.setAnfme(MathUtils.add(item.getAnfme() , orderDetl.getAnfme()));
if (!orderDetlService.updateById(item)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
}
@@ -240,6 +247,7 @@
orderDetl.setUpdateTime(now);
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
+ orderDetl.setStandby1(param.getDefNumber());
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
}
@@ -265,7 +273,7 @@
totalQty = totalQty + orderDetl.getAnfme();
wrkQty = wrkQty + orderDetl.getWorkQty();
endQty = endQty + orderDetl.getQty();
- double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
+ double issued = Optional.of(MathUtils.subtract(orderDetl.getAnfme(), orderDetl.getWorkQty())).orElse(0.0D);
if (issued > 0.0) {
List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOrigin(), null);
for (LocDetl locDetl : locDetls) {
@@ -416,7 +424,7 @@
public R query(String condition) {
EntityWrapper<Order> wrapper = new EntityWrapper<>();
wrapper.like("id", condition);
- Page<Order> page = orderService.selectPage(new Page<>(0, 10), wrapper);
+ Page<Order> page = orderService.selectPage(new Page<>(0, 10000), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (Order order : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
--
Gitblit v1.9.1