From 418a73bcee019e078307a1c2c255235de33d20ca Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 25 十二月 2025 16:29:38 +0800
Subject: [PATCH] #agv任务
---
src/main/java/com/zy/asrs/task/handler/OrderPakinSyncHandler.java | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderPakinSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderPakinSyncHandler.java
index b40c44d..12e5fdd 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderPakinSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderPakinSyncHandler.java
@@ -5,16 +5,14 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.DocType;
-import com.zy.asrs.entity.OrderDetl;
-import com.zy.asrs.entity.OrderDetlPakin;
-import com.zy.asrs.entity.OrderPakin;
+import com.zy.asrs.entity.*;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.DocTypeService;
import com.zy.asrs.service.OrderDetlPakinService;
import com.zy.asrs.service.OrderPakinService;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
+import com.zy.common.constant.ApiInterfaceConstant;
import com.zy.common.constant.MesConstant;
import com.zy.common.model.MesPakinParam;
import com.zy.common.utils.HttpHandler;
@@ -23,6 +21,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -51,20 +50,22 @@
return FAIL.setMsg("鏈壘鍒板搴旂殑鍗曟嵁绫诲瀷锛�" + order.getOrderNo());
}
- MesPakinParam pakinParam = new MesPakinParam();
+ ErpReportDto param = new ErpReportDto();
+ param.setOrderDetails(new ArrayList<>());
List<OrderDetlPakin> orderDetls = orderDetlPakinService.selectByOrderId(order.getId());
for (OrderDetlPakin orderDetl : orderDetls) {
- String serial = Cools.isEmpty(orderDetl.getBatch()) ? "" : orderDetl.getBatch();
- pakinParam.getList().add(new MesPakinParam.Detl(orderDetl.getMatnr() + (Cools.isEmpty(serial) ? "" : "-" + serial), orderDetl.getAnfme()));
+ param.getOrderDetails().add(new ErpReportDto.DetlDto(orderDetl.getMatnr(),orderDetl.getQty()));
}
+ param.setOrderNo(order.getOrderNo());
+
String response = "";
boolean success = false;
ReturnT<String> result = SUCCESS;
try {
response = new HttpHandler.Builder()
- .setUri(MesConstant.URI)
- .setPath(MesConstant.PAKIN_PATH)
- .setJson(JSON.toJSONString(pakinParam))
+ .setUri(ApiInterfaceConstant.ERP_IP)
+ .setPath(ApiInterfaceConstant.PAKIN_PATH)
+ .setJson(JSON.toJSONString(param))
.build()
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
@@ -73,7 +74,7 @@
orderPakinService.updateSettle(order.getId(), 6L, null);
success = true;
} else {
- log.error("鍏ュ簱瀹屾垚涓婃姤erp澶辫触锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URI + MesConstant.PAKIN_PATH, JSON.toJSONString(pakinParam), response);
+ log.error("鍏ュ簱瀹屾垚涓婃姤erp澶辫触锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", ApiInterfaceConstant.ERP_IP + ApiInterfaceConstant.PAKIN_PATH, JSON.toJSONString(param), response);
throw new CoolException("鍏ュ簱瀹屾垚涓婃姤erp澶辫触");
}
} catch (Exception e) {
@@ -84,10 +85,10 @@
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
"鍏ュ簱瀹屾垚涓婃姤",
- MesConstant.URI + MesConstant.PAKIN_PATH,
+ ApiInterfaceConstant.ERP_IP + ApiInterfaceConstant.PAKIN_PATH,
null,
"127.0.0.1",
- JSON.toJSONString(pakinParam),
+ JSON.toJSONString(param),
response,
success
);
--
Gitblit v1.9.1