From 7729a2d6f38542f665567dba021aa5385ce1da5d Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期四, 12 十二月 2024 14:23:58 +0800
Subject: [PATCH] 添加`@ManagerAuth`注解memo并优化sellout逻辑
---
src/main/java/com/zy/asrs/task/handler/OrderSendHandler.java | 38 ++++++++++++++++++++------------------
1 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSendHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSendHandler.java
index de32211..d6a5165 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSendHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSendHandler.java
@@ -12,6 +12,7 @@
import com.zy.asrs.service.OrderDetlService;
import com.zy.asrs.service.OrderService;
import com.zy.asrs.task.AbstractHandler;
+import com.zy.asrs.utils.Utils;
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +21,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
@Slf4j
@@ -46,23 +48,24 @@
List<OpenOrderPakoutParam> paramList = new ArrayList<>();
OpenOrderPakoutParam param = new OpenOrderPakoutParam();
- paramList.add(param);
+// paramList.add(param);
List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());
param.setcCode(order.getOrderNo());
param.setcMaker(order.getOperMemb());
- param.setcAccount(order.getCstmrName());
+ param.setcCusName(order.getCstmrName());
+ param.setcAccount(order.getNumber());
param.setcMemo(order.getMemo());
- param.setType(order.getDocType$());
- param.setdDate$(order.getCreateTime());
+ param.setType(Cools.isEmpty(order.getDocType$()) ? "" : order.getDocType$());
+ param.setdDate(Utils.getDateStr(new Date()));
param.setAllocation(order.getItemName());
List<OpenOrderPakoutParam.Body> bodyList = new ArrayList<>();
param.setaDDBody(bodyList);
- for(OrderDetl orderDetl : orderDetlList){
+ for (OrderDetl orderDetl : orderDetlList) {
OpenOrderPakoutParam.Body body = new OpenOrderPakoutParam.Body();
body.setiQuantity(orderDetl.getQty());
body.setcInvCode(orderDetl.getMatnr());
@@ -70,18 +73,17 @@
bodyList.add(body);
}
- doHttpRequest(paramList, "涓婃姤ERP鍑哄簱鍗曟嵁", url, orderReportPath, null, "127.0.0.1");
+ doHttpRequest(param, "涓婃姤ERP鍑哄簱鍗曟嵁", url, orderReportPath, null, "127.0.0.1");
- orderService.updateSettle(order.getId(),6L,0L);
-
+ orderService.updateSettle(order.getId(), 6L, 0L);
}
- private int doHttpRequest(Object requestParam, String namespace, String url, String path, String appkey, String ip){
+ private int doHttpRequest(Object requestParam, String namespace, String url, String path, String appkey, String ip) {
String response = "";
boolean success = false;
-
+ log.info(JSONObject.toJSONString(requestParam));
try {
response = new HttpHandler.Builder()
.setUri(url)
@@ -89,22 +91,22 @@
.setJson(JSONObject.toJSONString(requestParam))
.build()
.doPost();
+ log.info("涓婃姤ERP鍑哄簱鍗曟嵁璇锋眰杩斿洖鎶ユ枃锛歿}", response);
JSONObject jsonObject = JSON.parseObject(response);
-
- if(Cools.isEmpty(jsonObject.get("errCode"))){
- throw new CoolException(jsonObject.get("Message").toString());
+ if (Cools.isEmpty(jsonObject.get("ErrorCode"))) {
+ throw new CoolException(jsonObject.get("ErrorMsg").toString());
}
- int code = (int) jsonObject.get("errCode");
- if(code != 0){
- throw new CoolException(jsonObject.get("errMsg").toString());
+ int code = Integer.parseInt(jsonObject.get("ErrorCode").toString());
+ if (code == 0) {
+ throw new CoolException(jsonObject.get("ErrorMsg").toString());
}
success = true;
return code;
- }catch (Exception e){
+ } catch (Exception e) {
log.error(e.getMessage());
throw new CoolException("璋冪敤鎺ュ彛鍝嶅簲閿欒");
- }finally {
+ } finally {
apiLogService.save(
namespace,
url + path,
--
Gitblit v1.9.1