From d72d46b4cf88d38d5dd3acd02b80a819e8b4a073 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 15 七月 2025 13:42:12 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 47 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 36 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index ef443d8..c2692bd 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -7,6 +7,8 @@
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
+import com.zy.asrs.utils.MatUtils;
+import com.zy.asrs.utils.MathUtils;
import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.common.model.DetlDto;
import lombok.extern.slf4j.Slf4j;
@@ -36,6 +38,8 @@
private OrderDetlPakoutService orderDetlPakoutService;
@Autowired
private WrkDetlService wrkDetlService;
+ @Autowired
+ private WrkMastService wrkMastService;
@Autowired
private InventoryCheckOrderDetlService inventoryCheckOrderDetlService;
@@ -67,7 +71,7 @@
continue;
}
orderDetl.setWorkQty(orderDetl.getQty());
- orderDetl.setAnfme(orderDetl.getAnfme() - orderDetl.getQty());
+ orderDetl.setAnfme(MathUtils.subtract(orderDetl.getAnfme(), orderDetl.getQty()));
orderDetl.setQty(0D);
orderDetlService.updateById(orderDetl);
}
@@ -94,14 +98,17 @@
for (OrderDetl detail : orderDetls) {
DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getBrand(), detail.getStandby1(), detail.getStandby2(), detail.getStandby3(), detail.getBoxType1(), detail.getBoxType2(), detail.getBoxType3(), detail.getAnfme());
+ dto.setOrderNo(detail.getOrderNo());
if (DetlDto.has(list, dto)) {
DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch(), dto.getBrand(), dto.getStandby1(), dto.getStandby2(), dto.getStandby3(), dto.getBoxType1(), dto.getBoxType2(), dto.getBoxType3());
assert detlDto != null;
- detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
+ detlDto.setAnfme(MathUtils.add(detlDto.getAnfme(), detail.getAnfme()));
OrderDetl orderDetl = OrderDetl.find(orderDetlList, dto.getMatnr(), dto.getBatch(), dto.getBrand(), dto.getStandby1(), dto.getStandby2(), dto.getStandby3(), dto.getBoxType1(), dto.getBoxType2(), dto.getBoxType3());
assert orderDetl != null;
- orderDetl.setAnfme(orderDetl.getAnfme() + detail.getAnfme());
+ orderDetl.setAnfme(MathUtils.add(orderDetl.getAnfme(), detail.getAnfme()));
+ Double weight = MatUtils.calcWeight(orderDetl.getMatnr(), orderDetl.getAnfme());
+ orderDetl.setWeight(weight);
} else {
list.add(dto);
orderDetlList.add(detail);
@@ -128,6 +135,9 @@
return SUCCESS;
}
Order orderSou = orderService.selectByNo(order.getOrderNo());
+ if (orderSou == null) {
+ return FAIL.setMsg(order.getOrderNo() + "璁㈠崟涓嶅瓨鍦紝璇疯仈绯荤鐞嗗憳");
+ }
if (!orderSou.getSettle().equals(2L)) {
return FAIL.setMsg("璁㈠崟鐘舵�佷笉姝ｇ‘锛岃鑱旂郴绠＄悊鍛�");
}
@@ -141,7 +151,7 @@
continue;
}
if (orderDetlSou.beSimilar(orderDetl)) {
- double v = orderDetlSou.getAnfme() - orderDetlSou.getQty();
+ double v = MathUtils.subtract(orderDetlSou.getAnfme(), orderDetlSou.getQty());
if (v < orderDetl.getQty() || orderDetl.getQty().equals(v)) {
orderDetlSou.setQty(orderDetlSou.getAnfme());
orderDetl.setQty(orderDetl.getQty() - v);
@@ -188,7 +198,8 @@
}
}
if (complete) {
- if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()))) {
+ List<OrderDetl> old = orderDetlService.selectByOrderId(orderSou.getId());
+ if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_no", order.getOrderNo()))) {
throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
}
List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNo(order.getOrderNo());
@@ -196,13 +207,27 @@
OrderDetl orderDetl = new OrderDetl();
orderDetl.sync(wrkDetl);
orderDetl.setQty(wrkDetl.getAnfme());
- orderDetl.setOrderId(order.getId());
- orderDetl.setOrderNo(order.getOrderNo());
+ orderDetl.setOrderId(orderSou.getId());
+ orderDetl.setOrderNo(orderSou.getOrderNo());
orderDetl.setStatus(1);
- orderDetl.setCreateTime(order.getCreateTime());
- orderDetl.setCreateBy(order.getCreateBy());
- orderDetl.setUpdateTime(order.getUpdateTime());
- orderDetl.setUpdateBy(order.getUpdateBy());
+ orderDetl.setCreateTime(orderSou.getCreateTime());
+ orderDetl.setCreateBy(orderSou.getCreateBy());
+ orderDetl.setUpdateTime(orderSou.getUpdateTime());
+ orderDetl.setUpdateBy(orderSou.getUpdateBy());
+ orderDetl.setId(null);
+ //鍏堟寜鐓ф壒娆″尮閰嶏紝鍐嶆寜鐓ф棤鎵规鍙锋壒娆★紝鍥犱负閿�鍞彂璐э紝鎵规鍙峰彲鑳藉甫锛屾湁鍙兘涓嶆惡甯︼紝鎵�浠ュ氨浼氭湁闂锛涜�屼笖鑰冭檻鍒颁竴鏉¤鍗曢噷濡傛灉鐩稿悓鐗╂枡锛屼竴鏉″甫鎵规锛屼竴鏉′笉甯︽壒娆★紝鎯呭喌
+ for (OrderDetl xxx : old) {
+ if (xxx.beSimilar(wrkDetl)) {
+ orderDetl.setRemark(xxx.getRemark());
+ }
+ }
+ if (Cools.isEmpty(orderDetl.getRemark())) {
+ for (OrderDetl xxx : old) {
+ if (xxx.beSimilarByWrkDetl(wrkDetl)) {
+ orderDetl.setRemark(xxx.getRemark());
+ }
+ }
+ }
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
}
--
Gitblit v1.9.1