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 | 173 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 165 insertions(+), 8 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 d750f3e..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;
@@ -7,15 +8,19 @@
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 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;
@@ -97,6 +102,7 @@
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;
@@ -105,6 +111,8 @@
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(MathUtils.add(orderDetl.getAnfme(), detail.getAnfme()));
+ Double weight = MatUtils.calcWeight(orderDetl.getMatnr(), orderDetl.getAnfme());
+ orderDetl.setWeight(weight);
} else {
list.add(dto);
orderDetlList.add(detail);
@@ -127,10 +135,13 @@
if (null == docType) {
return SUCCESS;
}
- if (docType.getDocName().equals("閿�鍞彂璐�")) {
+ if (docType.getDocName().equals("閿�鍞彂璐�") || docType.getDocName().equals("闆嗗洟鍐呴儴璋冩嫧")) {
return SUCCESS;
}
Order orderSou = orderService.selectByNo(order.getOrderNo());
+ if (orderSou == null) {
+ return FAIL.setMsg(order.getOrderNo() + "璁㈠崟涓嶅瓨鍦紝璇疯仈绯荤鐞嗗憳");
+ }
if (!orderSou.getSettle().equals(2L)) {
return FAIL.setMsg("璁㈠崟鐘舵�佷笉姝ｇ‘锛岃鑱旂郴绠＄悊鍛�");
}
@@ -178,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()))) {
@@ -211,13 +225,156 @@
//鍏堟寜鐓ф壒娆″尮閰嶏紝鍐嶆寜鐓ф棤鎵规鍙锋壒娆★紝鍥犱负閿�鍞彂璐э紝鎵规鍙峰彲鑳藉甫锛屾湁鍙兘涓嶆惡甯︼紝鎵�浠ュ氨浼氭湁闂锛涜�屼笖鑰冭檻鍒颁竴鏉¤鍗曢噷濡傛灉鐩稿悓鐗╂枡锛屼竴鏉″甫鎵规锛屼竴鏉′笉甯︽壒娆★紝鎯呭喌
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)) {
+ 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 (!orderDetlService.insert(orderDetl)) {
+ throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
+ }
+ }
+
+ // 淇敼璁㈠崟鐘舵�� 2.浣滀笟涓� ===>> 4.寰呬笂鎶�
+ if (!orderService.updateSettle(orderSou.getId(), 4L, null)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+ // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.缁撴潫
+ OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(), order.getId(), 6L, null);
+ }
+ return SUCCESS;
+ }
+
+ @Transactional
+ public ReturnT<String> checkDBDD(Order order) {
+ DocType docType = docTypeService.selectById(order.getDocType());
+ if (null == docType) {
+ return SUCCESS;
+ }
+ if (!docType.getDocName().equals("闆嗗洟鍐呴儴璋冩嫧")) {
+ 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;
+// }
+// }
+ 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)) {
+ 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)) {
+ 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