From 701da4f8ae58c720f7e61eb46dae4f1e803c0568 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 25 八月 2025 13:46:02 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 179 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 164 insertions(+), 15 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 4daad98..d22d9a5 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -1,5 +1,7 @@
package com.zy.asrs.task.handler;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.exception.CoolException;
@@ -11,14 +13,16 @@
import com.zy.asrs.utils.MathUtils;
import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.common.model.DetlDto;
+import com.zy.nc.entity.NccSaleDbddWms;
+import com.zy.nc.entity.NccSaleXsfhmxWms;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.List;
+import java.math.BigDecimal;
+import java.util.*;
/**
* Created by vincent on 2020/7/7
@@ -205,6 +209,36 @@
if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_no", order.getOrderNo()))) {
throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
}
+
+ HashMap<String, List<NccSaleXsfhmxWms>> matnrMap = new HashMap<>();
+ for (OrderDetl orderDetl : old) {
+ String remark = orderDetl.getRemark();
+ if(Cools.isEmpty(remark)) {
+ continue;
+ }
+
+ NccSaleXsfhmxWms currentData = JSONObject.parseObject(orderDetl.getRemark(), NccSaleXsfhmxWms.class);
+ if (currentData == null) {
+ continue;
+ }
+
+ List<NccSaleXsfhmxWms> list = new ArrayList<>();
+ if (matnrMap.containsKey(orderDetl.getMatnr())) {
+ list = matnrMap.get(orderDetl.getMatnr());
+ list.add(currentData);
+ }else {
+ list.add(currentData);
+ }
+ matnrMap.put(orderDetl.getMatnr(), list);
+ }
+
+ for (Map.Entry<String, List<NccSaleXsfhmxWms>> entry : matnrMap.entrySet()) {
+ String matnr = entry.getKey();
+ List<NccSaleXsfhmxWms> list = entry.getValue();
+ list.sort(Comparator.comparing(NccSaleXsfhmxWms::getNastnum).reversed());
+ matnrMap.put(matnr, list);
+ }
+
List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNo(order.getOrderNo());
for (WrkDetl wrkDetl : wrkDetls) {
OrderDetl orderDetl = new OrderDetl();
@@ -218,23 +252,98 @@
orderDetl.setUpdateTime(orderSou.getUpdateTime());
orderDetl.setUpdateBy(orderSou.getUpdateBy());
orderDetl.setId(null);
- //鍏堟寜鐓ф壒娆″尮閰嶏紝鍐嶆寜鐓ф棤鎵规鍙锋壒娆★紝鍥犱负閿�鍞彂璐э紝鎵规鍙峰彲鑳藉甫锛屾湁鍙兘涓嶆惡甯︼紝鎵�浠ュ氨浼氭湁闂锛涜�屼笖鑰冭檻鍒颁竴鏉¤鍗曢噷濡傛灉鐩稿悓鐗╂枡锛屼竴鏉″甫鎵规锛屼竴鏉′笉甯︽壒娆★紝鎯呭喌
- for (OrderDetl xxx : old) {
- if (xxx.beSimilar(wrkDetl)) {
- orderDetl.setRemark(xxx.getRemark());
+
+ List<NccSaleXsfhmxWms> list = matnrMap.get(wrkDetl.getMatnr());
+ if (!list.isEmpty()) {
+ NccSaleXsfhmxWms nccSaleXsfhmxWms = list.get(0);
+ BigDecimal nastnum = nccSaleXsfhmxWms.getNastnum();
+ BigDecimal subtract = nastnum.subtract(BigDecimal.valueOf(wrkDetl.getWeight()));
+ if (subtract.doubleValue() <= 0) {
+ list.remove(0);
+ }else {
+ nccSaleXsfhmxWms.setNastnum(subtract);
+ list.set(0, nccSaleXsfhmxWms);
}
+
+ orderDetl.setRemark(JSON.toJSONString(nccSaleXsfhmxWms));
+ }else {
+ throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐ワ紝ERP鍘熷鏁版嵁涓虹┖");
}
- 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() + "銆戞槑缁嗗け璐�");
}
}
+
+// 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)) {
+// if(Cools.isEmpty(orderDetl.getRemark())) {
+// orderDetl.setRemark(xxx.getRemark());
+// }else {
+// NccSaleXsfhmxWms currentData = JSONObject.parseObject(orderDetl.getRemark(), NccSaleXsfhmxWms.class);
+// if (currentData == null) {
+// continue;
+// }
+//
+// NccSaleXsfhmxWms nextData = JSONObject.parseObject(xxx.getRemark(), NccSaleXsfhmxWms.class);
+// if (nextData == null) {
+// continue;
+// }
+//
+// BigDecimal currentFslDecimal = currentData.getNastnum();
+// BigDecimal nextFslDecimal = nextData.getNastnum();
+// if(currentFslDecimal.doubleValue() < nextFslDecimal.doubleValue()) {
+// orderDetl.setRemark(xxx.getRemark());
+// }
+// }
+// }
+// }
+// if (Cools.isEmpty(orderDetl.getRemark())) {
+// for (OrderDetl xxx : old) {
+// if (xxx.beSimilarByWrkDetl(wrkDetl)) {
+// if(Cools.isEmpty(orderDetl.getRemark())) {
+// orderDetl.setRemark(xxx.getRemark());
+// }else {
+// NccSaleXsfhmxWms currentData = JSONObject.parseObject(orderDetl.getRemark(), NccSaleXsfhmxWms.class);
+// if (currentData == null) {
+// continue;
+// }
+//
+// NccSaleXsfhmxWms nextData = JSONObject.parseObject(xxx.getRemark(), NccSaleXsfhmxWms.class);
+// if (nextData == null) {
+// continue;
+// }
+//
+// BigDecimal currentFslDecimal = currentData.getNastnum();
+// BigDecimal nextFslDecimal = nextData.getNastnum();
+// if(currentFslDecimal.doubleValue() < nextFslDecimal.doubleValue()) {
+// orderDetl.setRemark(xxx.getRemark());
+// }
+// }
+// }
+// }
+//
+// if (Cools.isEmpty(orderDetl.getRemark())) {
+// throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐ワ紝ERP鍘熷鏁版嵁涓虹┖");
+// }
+// }
+// if (!orderDetlService.insert(orderDetl)) {
+// throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
+// }
+// }
// 淇敼璁㈠崟鐘舵�� 2.浣滀笟涓� ===>> 4.寰呬笂鎶�
if (!orderService.updateSettle(orderSou.getId(), 4L, null)) {
@@ -292,15 +401,55 @@
//鍏堟寜鐓ф壒娆″尮閰嶏紝鍐嶆寜鐓ф棤鎵规鍙锋壒娆★紝鍥犱负閿�鍞彂璐э紝鎵规鍙峰彲鑳藉甫锛屾湁鍙兘涓嶆惡甯︼紝鎵�浠ュ氨浼氭湁闂锛涜�屼笖鑰冭檻鍒颁竴鏉¤鍗曢噷濡傛灉鐩稿悓鐗╂枡锛屼竴鏉″甫鎵规锛屼竴鏉′笉甯︽壒娆★紝鎯呭喌
for (OrderDetl xxx : old) {
if (xxx.beSimilar(wrkDetl)) {
- orderDetl.setRemark(xxx.getRemark());
+ if(Cools.isEmpty(orderDetl.getRemark())) {
+ orderDetl.setRemark(xxx.getRemark());
+ }else {
+ NccSaleDbddWms currentData = JSONObject.parseObject(orderDetl.getRemark(), NccSaleDbddWms.class);
+ if (currentData == null) {
+ continue;
+ }
+
+ NccSaleDbddWms nextData = JSONObject.parseObject(xxx.getRemark(), NccSaleDbddWms.class);
+ if (nextData == null) {
+ continue;
+ }
+
+ BigDecimal currentFslDecimal = currentData.getFsl();
+ BigDecimal nextFslDecimal = nextData.getFsl();
+ if(currentFslDecimal.doubleValue() < nextFslDecimal.doubleValue()) {
+ orderDetl.setRemark(xxx.getRemark());
+ }
+ }
}
}
if (Cools.isEmpty(orderDetl.getRemark())) {
for (OrderDetl xxx : old) {
if (xxx.beSimilarByWrkDetl(wrkDetl)) {
- orderDetl.setRemark(xxx.getRemark());
+ if(Cools.isEmpty(orderDetl.getRemark())) {
+ orderDetl.setRemark(xxx.getRemark());
+ }else {
+ NccSaleDbddWms currentData = JSONObject.parseObject(orderDetl.getRemark(), NccSaleDbddWms.class);
+ if (currentData == null) {
+ continue;
+ }
+
+ NccSaleDbddWms nextData = JSONObject.parseObject(xxx.getRemark(), NccSaleDbddWms.class);
+ if (nextData == null) {
+ continue;
+ }
+
+ BigDecimal currentFslDecimal = currentData.getFsl();
+ BigDecimal nextFslDecimal = nextData.getFsl();
+ if(currentFslDecimal.doubleValue() < nextFslDecimal.doubleValue()) {
+ orderDetl.setRemark(xxx.getRemark());
+ }
+ }
}
}
+
+ if (Cools.isEmpty(orderDetl.getRemark())) {
+ throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐ワ紝ERP鍘熷鏁版嵁涓虹┖");
+ }
}
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
--
Gitblit v1.9.1