From be9fe9de0944f038a374096d407e028bcd4030b3 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 13 十一月 2025 17:15:42 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/task/handler/GroupOrderFormHandler.java | 114 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 70 insertions(+), 44 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 235c4ec..4dcca90 100644
--- a/src/main/java/com/zy/asrs/task/handler/GroupOrderFormHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/GroupOrderFormHandler.java
@@ -7,25 +7,25 @@
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.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;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
/**
* Created by Monkey D. Luffy on 2025.11.10
@@ -44,6 +44,13 @@
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) {
@@ -81,6 +88,15 @@
if (!CodeDetectionUtil.barcodeDetection(orderDetl.getManu(),7)){
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());
@@ -92,85 +108,95 @@
orderDetlPakoutService.updateById(orderDetl);
continue;
}
+
} else {
if (Cools.isEmpty(memo)){
- memo = "鏃犲簱瀛�";
+ memo = "鍗峰彿"+ orderDetl.getModel()+"鏃犲簱瀛�";
}else {
- memo = memo+";鏃犲簱瀛�";
+ memo = memo+";鍗峰彿"+ orderDetl.getModel()+"鏃犲簱瀛�";
}
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 {
- 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());
+// OrderInspectionRollParam orderInspectionRollParam = new OrderInspectionRollParam(orderDetl.getModel());
String response = "";
boolean success = false;
+// Map<String, Object> params = JSON.parseObject(JSON.toJSONString(orderInspectionRollParam), Map.class);
+
+ Map<String, Object> params = new HashMap<>();
+ params.put("batchNo", orderDetl.getModel());
try {
response = new HttpHandler.Builder()
- .setUri(MesConstant.URL)
- .setPath(MesConstant.PAKIN_URL)
- .setJson(JSON.toJSONString(orderInspectionRollParam))
+ .setUri(qualityFinishedCheckoutUrl)
+ .setPath(qualityFinishedCheckout)
+ .setParams(params)
+ .setUseFormUrlEncoded(true)
.build()
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code").equals(200)) {
- if (jsonObject.getBoolean("state")) {
- String value = jsonObject.getString("value");
- if (value.equals("鍚堟牸")){
- orderDetl.setDanger(1);
- orderDetlPakoutService.updateById(orderDetl);
- } else if (!Cools.isEmpty(orderDetl.getDanger$()) && value.equals(orderDetl.getDanger$())){
- if (Cools.isEmpty(memo)){
- memo = "鏌ヨ鍗峰彿缁撴灉锛�"+jsonObject.getString("message");
- }else {
- memo = memo+";鏌ヨ鍗峰彿缁撴灉锛�"+jsonObject.getString("message");
- }
- continue;
- } else {
- if (Cools.isEmpty(memo)){
- memo = "鏌ヨ鍗峰彿缁撴灉锛�"+jsonObject.getString("message");
- }else {
- memo = memo+";鏌ヨ鍗峰彿缁撴灉锛�"+jsonObject.getString("message");
- }
- if (value.equals("涓嶅悎鏍�")){
- orderDetl.setDanger(2);
- orderDetlPakoutService.updateById(orderDetl);
- }
- continue;
+ if (jsonObject.getBoolean("state")) {
+ String value = jsonObject.getString("value");
+ if (value.equals("鍚堟牸")){
+ orderDetl.setDanger(1);
+ orderDetlPakoutService.updateById(orderDetl);
+ } else if (!Cools.isEmpty(orderDetl.getDanger$()) && value.equals(orderDetl.getDanger$())){
+ if (Cools.isEmpty(memo)){
+ memo = "鍗峰彿"+ orderDetl.getModel()+"鏌ヨ缁撴灉锛�"+jsonObject.getString("message");
+ }else {
+ 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);
+ orderDetlPakoutService.updateById(orderDetl);
+ }
+ continue;
}
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(params), 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();
@@ -180,10 +206,10 @@
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
"鏌ヨ鍗峰彿鏄惁鍚堟牸",
- MesConstant.URL + MesConstant.PAKIN_URL,
+ qualityFinishedCheckoutUrl+"/"+qualityFinishedCheckout,
null,
"127.0.0.1",
- JSON.toJSONString(orderInspectionRollParam),
+ JSON.toJSONString(params),
response,
success
);
--
Gitblit v1.9.1