From 8979eee8a95661a351e0b0ba3a48741ecf495da4 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期一, 16 六月 2025 13:13:13 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 89 +++++++++++++++++++++++++++++---------------
1 files changed, 58 insertions(+), 31 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 86490b6..d750f3e 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,7 @@
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
+import com.zy.asrs.utils.MathUtils;
import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.common.model.DetlDto;
import lombok.extern.slf4j.Slf4j;
@@ -32,6 +33,12 @@
@Autowired
private OrderDetlService orderDetlService;
+ @Autowired
+ private OrderDetlPakoutService orderDetlPakoutService;
+ @Autowired
+ private WrkDetlService wrkDetlService;
+ @Autowired
+ private WrkMastService wrkMastService;
@Autowired
private InventoryCheckOrderDetlService inventoryCheckOrderDetlService;
@@ -63,7 +70,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);
}
@@ -89,16 +96,15 @@
List<OrderDetl> orderDetlList = new ArrayList<>();
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());
+ DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getBrand(), detail.getStandby1(), detail.getStandby2(), detail.getStandby3(), detail.getBoxType1(), detail.getBoxType2(), detail.getBoxType3(), detail.getAnfme());
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()));
} else {
list.add(dto);
orderDetlList.add(detail);
@@ -121,9 +127,9 @@
if (null == docType) {
return SUCCESS;
}
-// if (docType.getDocName().equals("閿�鍞彂璐�")) {
-// return SUCCESS;
-// }
+ if (docType.getDocName().equals("閿�鍞彂璐�")) {
+ return SUCCESS;
+ }
Order orderSou = orderService.selectByNo(order.getOrderNo());
if (!orderSou.getSettle().equals(2L)) {
return FAIL.setMsg("璁㈠崟鐘舵�佷笉姝ｇ‘锛岃鑱旂郴绠＄悊鍛�");
@@ -137,29 +143,15 @@
if (orderDetl.getQty().equals(0D)) {
continue;
}
- if (!Cools.isEmpty(orderDetlSou.getBatch())){
- if (orderDetlSou.beSimilar(orderDetl)) {
- double v = orderDetlSou.getAnfme() - orderDetlSou.getQty();
- if (v < orderDetl.getQty() || orderDetl.getQty().equals(v)) {
- orderDetlSou.setQty(orderDetlSou.getAnfme());
- orderDetl.setQty(orderDetl.getQty() - v);
- break;
- } else {
- orderDetlSou.setQty(orderDetlSou.getQty() + orderDetl.getQty());
- orderDetl.setQty(0D);
- }
- }
- }else {
- if (orderDetlSou.beSimilar2(orderDetl)) {
- double v = orderDetlSou.getAnfme() - orderDetlSou.getQty();
- if (v < orderDetl.getQty() || orderDetl.getQty().equals(v)) {
- orderDetlSou.setQty(orderDetlSou.getAnfme());
- orderDetl.setQty(orderDetl.getQty() - v);
- break;
- } else {
- orderDetlSou.setQty(orderDetlSou.getQty() + orderDetl.getQty());
- orderDetl.setQty(0D);
- }
+ if (orderDetlSou.beSimilar(orderDetl)) {
+ 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);
+ break;
+ } else {
+ orderDetlSou.setQty(orderDetlSou.getQty() + orderDetl.getQty());
+ orderDetl.setQty(0D);
}
}
}
@@ -199,6 +191,41 @@
}
}
if (complete) {
+ 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());
+ for (WrkDetl wrkDetl : wrkDetls) {
+ OrderDetl orderDetl = new OrderDetl();
+ orderDetl.sync(wrkDetl);
+ orderDetl.setQty(wrkDetl.getAnfme());
+ orderDetl.setOrderId(orderSou.getId());
+ orderDetl.setOrderNo(orderSou.getOrderNo());
+ orderDetl.setStatus(1);
+ 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() + "銆戞槑缁嗗け璐�");
+ }
+ }
+
// 淇敼璁㈠崟鐘舵�� 2.浣滀笟涓� ===>> 4.寰呬笂鎶�
if (!orderService.updateSettle(orderSou.getId(), 4L, null)) {
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
--
Gitblit v1.9.1