From f0a7fa09eeef7fd9dc97173b5ef8e319d17c7f28 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 10 十一月 2025 17:44:14 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/task/handler/GroupOrderFormHandler.java | 47 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 37 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/GroupOrderFormHandler.java b/src/main/java/com/zy/asrs/task/handler/GroupOrderFormHandler.java
index 4ededa4..235c4ec 100644
--- a/src/main/java/com/zy/asrs/task/handler/GroupOrderFormHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/GroupOrderFormHandler.java
@@ -6,9 +6,9 @@
import com.core.common.Cools;
import com.core.common.R;
import com.core.common.SnowflakeIdWorker;
+import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.OrderDetlPakout;
import com.zy.asrs.entity.OrderPakout;
-import com.zy.asrs.entity.param.OrderCargoBookingNoteParam;
import com.zy.asrs.entity.param.OrderInspectionRollParam;
import com.zy.asrs.entity.param.OrderOutLocBoxCsUtilParam;
import com.zy.asrs.service.*;
@@ -29,7 +29,7 @@
/**
* Created by Monkey D. Luffy on 2025.11.10
- * 寰愬伐姹変簯..............浠ヤ笅.............涓婇ザ姹熼摐.............鎷嗗灈瀹屾垚淇℃伅澶勭悊
+ * 寰愬伐姹変簯..............浠ヤ笅.............涓婇ザ姹熼摐.............缁勮揣鍗曠浉鍏�
*/
@Slf4j
@Service
@@ -42,6 +42,8 @@
private ApiLogService apiLogService;
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
+ @Autowired
+ private LocDetlService locDetlService;
@Transactional
public ReturnT<String> abandoned(OrderPakout orderPakout) {
@@ -75,16 +77,41 @@
List<OrderDetlPakout> orderDetls = orderDetlPakoutService.selectByOrderId(orderPakout.getId());
String memo = "";
for (OrderDetlPakout orderDetl : orderDetls) {
+ boolean signD = true;
if (!CodeDetectionUtil.barcodeDetection(orderDetl.getManu(),7)){
- if (Cools.isEmpty(memo)){
- memo = "鏃犲簱瀛�";
- }else {
- memo = memo+";鏃犲簱瀛�";
+ LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("model", orderDetl.getModel()));
+ if (!Cools.isEmpty(locDetl)){
+ signD = false;
+ orderDetl.sync(locDetl);
+ orderDetl.setManu(locDetl.getLocNo());
+ orderDetl.setBarcode(locDetl.getBarcode());
+ orderDetl.setDanger(locDetl.getDanger());
+ orderDetl.setMemo(locDetl.getMemo());
+ if (!Cools.isEmpty(locDetl.getDanger$()) && locDetl.getDanger()==1){
+ orderDetl.setDanger(1);
+ orderDetlPakoutService.updateById(orderDetl);
+ continue;
+ }
+ } else {
+ if (Cools.isEmpty(memo)){
+ memo = "鏃犲簱瀛�";
+ }else {
+ memo = memo+";鏃犲簱瀛�";
+ }
+ continue;
}
- continue;
}
- if (Cools.isEmpty(orderDetl.getDanger$()) || orderDetl.getDanger()==1){//鍚堟牸涓嶉渶瑕佹楠�
- continue;
+ if (signD){
+ if (!Cools.isEmpty(orderDetl.getDanger$()) && orderDetl.getDanger()==1){//鍚堟牸涓嶉渶瑕佹楠�
+ continue;
+ } else {
+ LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("model", orderDetl.getModel()));
+ if (!Cools.isEmpty(locDetl.getDanger$()) && locDetl.getDanger()==1){
+ orderDetl.setDanger(1);
+ orderDetlPakoutService.updateById(orderDetl);
+ continue;
+ }
+ }
}
OrderInspectionRollParam orderInspectionRollParam = new OrderInspectionRollParam(orderDetl.getModel());
String response = "";
@@ -103,7 +130,7 @@
if (value.equals("鍚堟牸")){
orderDetl.setDanger(1);
orderDetlPakoutService.updateById(orderDetl);
- } else if (value.equals(orderDetl.getDanger$())){
+ } else if (!Cools.isEmpty(orderDetl.getDanger$()) && value.equals(orderDetl.getDanger$())){
if (Cools.isEmpty(memo)){
memo = "鏌ヨ鍗峰彿缁撴灉锛�"+jsonObject.getString("message");
}else {
--
Gitblit v1.9.1