From 4448779d76ff424e666d65f2f168a5890642c857 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 12 十一月 2025 14:04:22 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/OrderPakoutController.java | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderPakoutController.java b/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
index 5903a8b..e226183 100644
--- a/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
@@ -9,19 +9,17 @@
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.OrderDomainParam;
import com.zy.asrs.entity.param.QualityGroupListParam;
import com.zy.asrs.entity.result.OrderPakoutDetailVo;
import com.zy.asrs.entity.result.OrderPakoutMainVo;
import com.zy.asrs.entity.result.WrkTraceVo;
import com.zy.asrs.service.*;
-import com.zy.common.constant.MesConstant;
-import com.zy.common.model.DetlDto;
import com.zy.common.utils.HttpHandler;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -52,6 +50,11 @@
private WrkMastLogService wrkMastLogService;
@Autowired
private ApiLogService apiLogService;
+
+ @Value("${srXghyMes.actualShipmentMesUrl}")
+ private String actualShipmentMesUrl;
+ @Value("${srXghyMes.actualShipmentMes}")
+ private String actualShipmentMes;
@RequestMapping(value = "/order/nav/list/auth")
@ManagerAuth
@@ -401,8 +404,8 @@
boolean success = false;
try {
response = new HttpHandler.Builder()
- .setUri(MesConstant.URL)
- .setPath(MesConstant.PAKIN_URL)
+ .setUri(actualShipmentMesUrl)
+ .setPath(actualShipmentMes)
.setJson(JSON.toJSONString(qualityGroupListParam))
.build()
.doPost();
@@ -411,20 +414,24 @@
success = true;
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 16.宸蹭笂鎶�
if (!orderService.updateItemName(itemName, 16L, userId)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ log.error("缁勮揣鍗曟洿鏂扮姸鎬佸け璐�!!!缁勮揣鍗曞彿"+itemName+".updateItemName");
+ } else {
+ return R.ok();
}
} else {
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 17.宸蹭笂鎶�
if (!orderService.updateItemName(itemName, 17L, userId)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ log.error("缁勮揣鍗曟洿鏂扮姸鎬佸け璐�!!!缁勮揣鍗曞彿"+itemName+".updateItemName");
}
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKIN_URL, JSON.toJSONString(qualityGroupListParam), response);
- throw new CoolException("涓婃姤mes绯荤粺澶辫触");
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", actualShipmentMesUrl+"/"+actualShipmentMes, JSON.toJSONString(qualityGroupListParam), response);
}
+ return R.error("涓婃姤mes绯荤粺澶辫触").add("涓婃姤mes绯荤粺澶辫触");
} catch (Exception e) {
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 17.宸蹭笂鎶�
if (!orderService.updateItemName(itemName, 17L, userId)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ log.error("缁勮揣鍗曟洿鏂扮姸鎬佸け璐�!!!缁勮揣鍗曞彿"+itemName+".updateItemName");
}
log.error("fail", e);
} finally {
@@ -432,7 +439,7 @@
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
"涓婃姤MES瀹為檯缁勮揣鍗�",
- MesConstant.URL + MesConstant.PAKIN_URL,
+ actualShipmentMesUrl+"/"+actualShipmentMes,
null,
"127.0.0.1",
JSON.toJSONString(qualityGroupListParam),
@@ -441,9 +448,6 @@
);
} catch (Exception e) { log.error("", e); }
}
-
-
-
- return R.ok();
+ return R.error("涓婃姤澶辫触").add("涓婃姤澶辫触");
}
}
--
Gitblit v1.9.1