From c643491fffa78a9210abfa7cbdd9e0851648a3d7 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期一, 15 十二月 2025 13:40:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index 7e7c635..173e340 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -17,6 +17,7 @@
import com.zy.common.constant.MesConstant;
import com.zy.common.model.MesPakinParam;
import com.zy.common.model.MesPakoutParam;
+import com.zy.common.model.YXErpPakinParam;
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -54,32 +55,31 @@
List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
// 鍏ュ簱瀹屾垚涓婃姤
if (docType.getPakin() == 1) {
- MesPakinParam pakinParam = new MesPakinParam();
- pakinParam.setPakinTime(DateUtils.convert(order.getUpdateTime()));
- pakinParam.setLgortFrom("5008");
- pakinParam.setLgortTo("5006");
+ YXErpPakinParam pakinParam = new YXErpPakinParam(order.getOrderNo(),order.getMemo());
+
for (OrderDetl orderDetl : orderDetls) {
- String serial = Cools.isEmpty(orderDetl.getBatch()) ? "" : orderDetl.getBatch();
- pakinParam.getList().add(new MesPakinParam.Detl(orderDetl.getMatnr() + (Cools.isEmpty(serial) ? "" : "-" + serial), orderDetl.getAnfme()));
+// String serial = Cools.isEmpty(orderDetl.getBatch()) ? "" : orderDetl.getBatch();
+ pakinParam.getDetail().add(new YXErpPakinParam.Detl(orderDetl,true));
+ pakinParam.getDetail().add(new YXErpPakinParam.Detl(orderDetl,false));
}
String response = "";
boolean success = false;
try {
response = new HttpHandler.Builder()
- .setUri(MesConstant.URL)
- .setPath(MesConstant.PAKIN_URL)
+ .setUri(MesConstant.ERP_URL)
+ .setPath(MesConstant.ERP_BIG_URL)
.setJson(JSON.toJSONString(pakinParam))
.build()
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code").equals(200)) {
+ if (jsonObject.getInteger("code").equals(0)) {
success = true;
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
if (!orderService.updateSettle(order.getId(), 6L, null)) {
throw new CoolException("涓婃姤瀹屾垚鏇存柊璁㈠崟鐘舵�佸紓甯革紝璇疯仈绯荤鐞嗗憳");
}
} else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKIN_URL, JSON.toJSONString(pakinParam), response);
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.ERP_URL+MesConstant.ERP_BIG_URL, JSON.toJSONString(pakinParam), response);
order.setUpdateTime(new Date());
orderService.updateById(order);
throw new CoolException("涓婃姤mes绯荤粺澶辫触");
@@ -95,7 +95,7 @@
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
"鑳舵枡鍏ュ簱涓婃姤鑷矱RP",
- MesConstant.URL + MesConstant.PAKIN_URL,
+ MesConstant.ERP_URL + MesConstant.ERP_BIG_URL,
null,
"127.0.0.1",
JSON.toJSONString(pakinParam),
@@ -105,6 +105,7 @@
} catch (Exception e) { log.error("", e); }
}
}
+ /*
// 鍑哄簱瀹屾垚涓婃姤
if (docType.getPakout() == 1) {
MesPakoutParam pakoutParam = new MesPakoutParam();
@@ -159,6 +160,7 @@
} catch (Exception e) { log.error("", e); }
}
}
+ */
return SUCCESS;
}
--
Gitblit v1.9.1