From 7896e6e42007b3d23f97b0d260dd68a18f49ba3b Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 18 七月 2025 15:25:18 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 114 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 98 insertions(+), 16 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 c5ed98c..17045e3 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,6 @@
package com.zy.asrs.task.handler;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.exception.CoolException;
@@ -11,12 +12,15 @@
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.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
@@ -185,18 +189,21 @@
return SUCCESS;
}
Order orderSou = orderService.selectByNo(order.getOrderNo());
+ if (orderSou == null) {
+ return FAIL.setMsg("璁㈠崟涓嶅瓨鍦紝璇疯仈绯荤鐞嗗憳");
+ }
if (!orderSou.getSettle().equals(2L)) {
return FAIL.setMsg("璁㈠崟鐘舵�佷笉姝ｇ‘锛岃鑱旂郴绠＄悊鍛�");
}
List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
boolean complete = true;
- for (OrderDetl orderDetl : orderDetls) {
- if (orderDetl.getAnfme() > orderDetl.getQty()) {
- complete = false;
- break;
- }
- }
+// for (OrderDetl orderDetl : orderDetls) {
+// if (orderDetl.getAnfme() > orderDetl.getQty()) {
+// complete = false;
+// break;
+// }
+// }
if (complete) {
List<OrderDetl> old = orderDetlService.selectByOrderId(orderSou.getId());
if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_no", order.getOrderNo()))) {
@@ -218,13 +225,49 @@
//鍏堟寜鐓ф壒娆″尮閰嶏紝鍐嶆寜鐓ф棤鎵规鍙锋壒娆★紝鍥犱负閿�鍞彂璐э紝鎵规鍙峰彲鑳藉甫锛屾湁鍙兘涓嶆惡甯︼紝鎵�浠ュ氨浼氭湁闂锛涜�屼笖鑰冭檻鍒颁竴鏉¤鍗曢噷濡傛灉鐩稿悓鐗╂枡锛屼竴鏉″甫鎵规锛屼竴鏉′笉甯︽壒娆★紝鎯呭喌
for (OrderDetl xxx : old) {
if (xxx.beSimilar(wrkDetl)) {
- orderDetl.setRemark(xxx.getRemark());
+ 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)) {
- orderDetl.setRemark(xxx.getRemark());
+ 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());
+ }
+ }
}
}
}
@@ -253,18 +296,21 @@
return SUCCESS;
}
Order orderSou = orderService.selectByNo(order.getOrderNo());
+ if (orderSou == null) {
+ return FAIL.setMsg("璁㈠崟涓嶅瓨鍦紝璇疯仈绯荤鐞嗗憳");
+ }
if (!orderSou.getSettle().equals(2L)) {
return FAIL.setMsg("璁㈠崟鐘舵�佷笉姝ｇ‘锛岃鑱旂郴绠＄悊鍛�");
}
List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
boolean complete = true;
- for (OrderDetl orderDetl : orderDetls) {
- if (orderDetl.getAnfme() > orderDetl.getQty()) {
- complete = false;
- break;
- }
- }
+// for (OrderDetl orderDetl : orderDetls) {
+// if (orderDetl.getAnfme() > orderDetl.getQty()) {
+// complete = false;
+// break;
+// }
+// }
if (complete) {
List<OrderDetl> old = orderDetlService.selectByOrderId(orderSou.getId());
if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_no", order.getOrderNo()))) {
@@ -286,13 +332,49 @@
//鍏堟寜鐓ф壒娆″尮閰嶏紝鍐嶆寜鐓ф棤鎵规鍙锋壒娆★紝鍥犱负閿�鍞彂璐э紝鎵规鍙峰彲鑳藉甫锛屾湁鍙兘涓嶆惡甯︼紝鎵�浠ュ氨浼氭湁闂锛涜�屼笖鑰冭檻鍒颁竴鏉¤鍗曢噷濡傛灉鐩稿悓鐗╂枡锛屼竴鏉″甫鎵规锛屼竴鏉′笉甯︽壒娆★紝鎯呭喌
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());
+ }
+ }
}
}
}
--
Gitblit v1.9.1