From cda0084628ddf50ae59687dd3f0e23e1fa658b06 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 12 十一月 2025 14:06:16 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/task/handler/GroupOrderFormHandler.java | 108 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 83 insertions(+), 25 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..2ccb9d9 100644
--- a/src/main/java/com/zy/asrs/task/handler/GroupOrderFormHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/GroupOrderFormHandler.java
@@ -6,20 +6,22 @@
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.LocMast;
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.*;
+import com.zy.asrs.service.impl.LocMastServiceImpl;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.utils.CodeDetectionUtil;
import com.zy.asrs.utils.OrderOutBatchUtil;
-import com.zy.common.constant.MesConstant;
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -29,7 +31,7 @@
/**
* Created by Monkey D. Luffy on 2025.11.10
- * 寰愬伐姹変簯..............浠ヤ笅.............涓婇ザ姹熼摐.............鎷嗗灈瀹屾垚淇℃伅澶勭悊
+ * 寰愬伐姹変簯..............浠ヤ笅.............涓婇ザ姹熼摐.............缁勮揣鍗曠浉鍏�
*/
@Slf4j
@Service
@@ -42,6 +44,15 @@
private ApiLogService apiLogService;
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
+ @Autowired
+ private LocDetlService locDetlService;
+ @Autowired
+ private LocMastServiceImpl locMastService;
+
+ @Value("${srXghyMes.qualityFinishedCheckoutUrl}")
+ private String qualityFinishedCheckoutUrl;
+ @Value("${srXghyMes.qualityFinishedCheckout}")
+ private String qualityFinishedCheckout;
@Transactional
public ReturnT<String> abandoned(OrderPakout orderPakout) {
@@ -75,24 +86,71 @@
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)){
+ LocMast locMast = locMastService.selectById(locDetl.getLocNo());
+ if (Cools.isEmpty(locMast) || !locMast.getLocSts().equals("F")){
+ if (Cools.isEmpty(memo)){
+ memo = "鍗峰彿"+ orderDetl.getModel()+"鎵�鍦ㄥ簱浣�"+locDetl.getLocNo()+"涓嶆槸鍦ㄥ簱鐘舵��";
+ }else {
+ memo = memo+";鍗峰彿"+ orderDetl.getModel()+"鎵�鍦ㄥ簱浣�"+locDetl.getLocNo()+"涓嶆槸鍦ㄥ簱鐘舵��";
+ }
+ continue;
+ }
+ 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 = "鍗峰彿"+ orderDetl.getModel()+"鏃犲簱瀛�";
+ }else {
+ memo = memo+";鍗峰彿"+ orderDetl.getModel()+"鏃犲簱瀛�";
+ }
+ continue;
}
- continue;
}
- if (Cools.isEmpty(orderDetl.getDanger$()) || orderDetl.getDanger()==1){//鍚堟牸涓嶉渶瑕佹楠�
- continue;
+ if (signD){
+ LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("model", orderDetl.getModel()));
+ if (!Cools.isEmpty(locDetl)){
+ LocMast locMast = locMastService.selectById(locDetl.getLocNo());
+ if (Cools.isEmpty(locMast) || !locMast.getLocSts().equals("F")){
+ if (Cools.isEmpty(memo)){
+ memo = "鍗峰彿"+ orderDetl.getModel()+"鎵�鍦ㄥ簱浣�"+locDetl.getLocNo()+"涓嶆槸鍦ㄥ簱鐘舵��";
+ }else {
+ memo = memo+";鍗峰彿"+ orderDetl.getModel()+"鎵�鍦ㄥ簱浣�"+locDetl.getLocNo()+"涓嶆槸鍦ㄥ簱鐘舵��";
+ }
+ continue;
+ }
+ }
+ if (!Cools.isEmpty(orderDetl.getDanger$()) && orderDetl.getDanger()==1){//鍚堟牸涓嶉渶瑕佹楠�
+ continue;
+ } else {
+ if (!Cools.isEmpty(locDetl.getDanger$()) && locDetl.getDanger()==1){
+ orderDetl.setDanger(1);
+ orderDetlPakoutService.updateById(orderDetl);
+ continue;
+ }
+
+ }
}
OrderInspectionRollParam orderInspectionRollParam = new OrderInspectionRollParam(orderDetl.getModel());
String response = "";
boolean success = false;
try {
response = new HttpHandler.Builder()
- .setUri(MesConstant.URL)
- .setPath(MesConstant.PAKIN_URL)
+ .setUri(qualityFinishedCheckoutUrl)
+ .setPath(qualityFinishedCheckout)
.setJson(JSON.toJSONString(orderInspectionRollParam))
.build()
.doPost();
@@ -103,18 +161,18 @@
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");
+ memo = "鍗峰彿"+ orderDetl.getModel()+"鏌ヨ缁撴灉锛�"+jsonObject.getString("message");
}else {
- memo = memo+";鏌ヨ鍗峰彿缁撴灉锛�"+jsonObject.getString("message");
+ memo = memo+";鍗峰彿"+ orderDetl.getModel()+"鏌ヨ缁撴灉锛�"+jsonObject.getString("message");
}
continue;
} else {
if (Cools.isEmpty(memo)){
- memo = "鏌ヨ鍗峰彿缁撴灉锛�"+jsonObject.getString("message");
+ memo = "鍗峰彿"+ orderDetl.getModel()+"鏌ヨ缁撴灉锛�"+jsonObject.getString("message");
}else {
- memo = memo+";鏌ヨ鍗峰彿缁撴灉锛�"+jsonObject.getString("message");
+ memo = memo+";鍗峰彿"+ orderDetl.getModel()+"鏌ヨ缁撴灉锛�"+jsonObject.getString("message");
}
if (value.equals("涓嶅悎鏍�")){
orderDetl.setDanger(2);
@@ -124,26 +182,26 @@
}
} else {
if (Cools.isEmpty(memo)){
- memo = "鏌ヨ鍗峰彿缁撴灉锛�"+jsonObject.getString("message");
+ memo = "鍗峰彿"+ orderDetl.getModel()+"鏌ヨ缁撴灉锛�"+jsonObject.getString("message");
}else {
- memo = memo+";鏌ヨ鍗峰彿缁撴灉锛�"+jsonObject.getString("message");
+ memo = memo+";鍗峰彿"+ orderDetl.getModel()+"鏌ヨ缁撴灉锛�"+jsonObject.getString("message");
}
}
success = true;
} else {
if (Cools.isEmpty(memo)){
- memo = "鏌ヨ鍗峰彿缁撴灉锛�"+jsonObject.getString("message");
+ memo = "鍗峰彿"+ orderDetl.getModel()+"鏌ヨ缁撴灉锛�"+jsonObject.getString("message");
}else {
- memo = memo+";鏌ヨ鍗峰彿缁撴灉锛�"+jsonObject.getString("message");
+ memo = memo+";鍗峰彿"+ orderDetl.getModel()+"鏌ヨ缁撴灉锛�"+jsonObject.getString("message");
}
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKIN_URL, JSON.toJSONString(orderInspectionRollParam), response);
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", qualityFinishedCheckoutUrl+"/"+qualityFinishedCheckout, JSON.toJSONString(orderInspectionRollParam), response);
// throw new CoolException("鏌ヨ鍗峰彿鏄惁鍚堟牸澶辫触");
}
} catch (Exception e) {
if (Cools.isEmpty(memo)){
- memo = "鏌ヨ鍗峰彿缁撴灉锛�"+"寮傚父"+e.getMessage();
+ memo = "鍗峰彿"+ orderDetl.getModel()+"鏌ヨ缁撴灉锛�"+"寮傚父"+e.getMessage();
}else {
- memo = memo+";鏌ヨ鍗峰彿缁撴灉锛�"+"寮傚父"+e.getMessage();
+ memo = memo+"鍗峰彿"+ orderDetl.getModel()+"鏌ヨ缁撴灉锛�"+"寮傚父"+e.getMessage();
}
log.error("fail", e);
// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -153,7 +211,7 @@
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
"鏌ヨ鍗峰彿鏄惁鍚堟牸",
- MesConstant.URL + MesConstant.PAKIN_URL,
+ qualityFinishedCheckoutUrl+"/"+qualityFinishedCheckout,
null,
"127.0.0.1",
JSON.toJSONString(orderInspectionRollParam),
--
Gitblit v1.9.1