From 3f41101ae170f2508910ff8539c09f1940482574 Mon Sep 17 00:00:00 2001
From: IZCD4L12RTSW0VZ\Administrator <skyouc>
Date: 星期四, 15 一月 2026 16:05:16 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 88 +++++++++++++++++++++++++++++---------------
1 files changed, 58 insertions(+), 30 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 b5b631c..a0e4ed2 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -19,8 +19,6 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.enums.OrderTypeEnum;
import com.zy.asrs.service.*;
-import com.zy.asrs.service.impl.CheckOrderDetlServiceImpl;
-import com.zy.asrs.service.impl.LocDetlServiceImpl;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.utils.OrderInAndOutUtil;
@@ -49,8 +47,6 @@
@Service
public class OrderSyncHandler extends AbstractHandler<String> {
- private final CheckOrderDetlServiceImpl checkOrderDetlService;
-
@Autowired
private JdbcTemplate jdbcTemplate;
@Autowired
@@ -69,11 +65,11 @@
private KopenApiService kopenApiService;
@Autowired
private MatService matService;
- private LocDetlServiceImpl locDetlService;
+ @Autowired
+ private LocDetlService locDetlService;
+ @Autowired
+ CheckOrderDetlService checkOrderDetlService;
- OrderSyncHandler(CheckOrderDetlServiceImpl checkOrderDetlService) {
- this.checkOrderDetlService = checkOrderDetlService;
- }
@Transactional
public ReturnT<String> startOrderIssuedOnceMore(Order order) {
@@ -296,8 +292,6 @@
.setLocation_type(MatLocType.getMatTag(material.getTagId() + ""))
// 涓婃姤鏃讹紝榛樿涓婃姤鏃堕棿鏄洿鏂版椂闂�
.setSj_date(Utils.dateToStr(order.getUpdateTime(), "yyyy-MM-dd HH:mm:ss") )
- // 涓婃姤鏃讹紝榛樿涓婃姤浜烘槸鏇存柊浜�
- .setSj_emp(order.getUpdateBy$())
// 涓婃姤鏃讹紝榛樿涓婃姤鏁伴噺鏄鍗曟暟閲�
.setPick_qty(detl.getQty().intValue())
// 涓婃姤鏃讹紝榛樿鎹熷潖鏁伴噺鏄�0
@@ -315,8 +309,11 @@
try {
List<ReportOrderParam> orderParams = new ArrayList<>();
orderParams.add(orderParam);
- response = kopenApiService.getInDispatchResult(orderParams);
-
+ if (order.getReportOnce() < 4) {
+ response = kopenApiService.getInDispatchResult(orderParams, order);
+ } else {
+ return FAIL;
+ }
// if (true) {
// success = true;
// // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
@@ -379,7 +376,7 @@
// 涓婃姤鏃讹紝榛樿鐩爣浣嶇疆鏄痭ull
.setLocation_type(null)
// 涓婃姤鏃讹紝榛樿涓婃姤鏃堕棿鏄洿鏂版椂闂�
- .setSj_date(order.getUpdateBy().toString())
+ .setSj_date(order.getUpdateTime$())
// 涓婃姤鏃讹紝榛樿涓婃姤浜烘槸鏇存柊浜�
.setSj_emp(order.getUpdateBy$())
// 涓婃姤鏃讹紝榛樿涓婃姤鏁伴噺鏄鍗曟暟閲�
@@ -397,15 +394,14 @@
XSR response = null;
boolean success = false;
try {
- // response = new HttpHandler.Builder()
- // .setUri(MesConstant.URL)
- // .setPath(MesConstant.PAKOUT_URL)
- // .setJson(JSON.toJSONString(pakoutParam))
- // .build()
- // .doPost();
- // JSONObject jsonObject = JSON.parseObject(response);
- // if (jsonObject.getInteger("code").equals(200)) {
- if (true) {
+ List<ReportOrderParam> orderParams = new ArrayList<>();
+ orderParams.add(orderParam);
+ if (order.getReportOnce() < 4) {
+ response = kopenApiService.reportOutDetailsResult(orderParams, order);
+ } else {
+ return FAIL;
+ }
+ if (response.getSuccess()) {
success = true;
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
if (!orderService.updateSettle(order.getId(), settle, null)) {
@@ -413,10 +409,22 @@
}
} else {
log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}",
- MesConstant.URL + MesConstant.OUT_DISPATCH_RESULT,
- JSON.toJSONString(orderParam), JSON.toJSONString(response));
+ MesConstant.URL + MesConstant.OUT_DETAILS_RESULT,
+ JSON.toJSONString(orderParams), JSON.toJSONString(response));
throw new CoolException("涓婃姤KOPEN绯荤粺澶辫触");
}
+// if (true) {
+// success = true;
+// // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
+// if (!orderService.updateSettle(order.getId(), settle, null)) {
+// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+// }
+// } else {
+// log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}",
+// MesConstant.URL + MesConstant.OUT_DISPATCH_RESULT,
+// JSON.toJSONString(orderParam), JSON.toJSONString(response));
+// throw new CoolException("涓婃姤KOPEN绯荤粺澶辫触");
+// }
} catch (Exception e) {
log.error("fail", e);
return FAIL.setMsg(e.getMessage());
@@ -461,7 +469,8 @@
itemParam.setPro_komcode(material.getMatnr());
// 涓婃姤鏃讹紝榛樿浜у搧id鏄緵搴斿晢缂栫爜
itemParam.setPro_id(detl.getSuppCode());
-
+ //todo 鍙拌溅缂栫爜
+ itemParam.setTruck_no("TC310080014");
// 涓婃姤鏃讹紝榛樿涓婃姤鏃堕棿鏄洿鏂版椂闂�
itemParam.setPick_qty(detl.getQty().intValue());
reportOrderParams.add(itemParam);
@@ -472,7 +481,7 @@
pubOrderParamsList.add(pubOrderParams);
// 璁剧疆娲惧伐鍗曟槑缁�
stockUpOrderParams.setDetails(pubOrderParamsList);
- stockUpOrderParams.setUpdate_time(order.getUpdateBy$());
+ stockUpOrderParams.setUpdate_time(order.getUpdateTime$());
XSR response = null;
boolean success = false;
@@ -485,7 +494,16 @@
// .doPost();
// JSONObject jsonObject = JSON.parseObject(response);
// if (jsonObject.getInteger("code").equals(200)) {
- if (true) {
+
+ List<StockUpOrderParams> orderParams = new ArrayList<>();
+ orderParams.add(stockUpOrderParams);
+ if (order.getReportOnce() < 4) {
+ response = kopenApiService.getOutDetailsResult(orderParams, order);
+ } else {
+ return FAIL;
+ }
+
+ if (response.getSuccess()) {
success = true;
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
if (!orderService.updateSettle(order.getId(), settle, null)) {
@@ -535,10 +553,11 @@
adjustParam.setCompany_id(order.getCstmrName())
.setWms_id(order.getId() + "")
.setType(0 + "")
- .setCompany_id(order.getCstmrName());
+ .setUpdate_time(order.getUpdateTime$());
+// .setKopen_id(order.getDefNumber());
- adjustParam.setBsby_no(order.getNumber())
- .setResason("")
+ adjustParam.setBsby_no(order.getOrderNo())
+ .setReason("")
.setReason_name("");
List<CheckOrderDetl> detls = checkOrderDetlService
.selectList(new EntityWrapper<CheckOrderDetl>().eq("order_id", order.getId()));
@@ -562,6 +581,15 @@
adjustParams.add(adjustParam);
+ if (order.getReportOnce() < 3) {
+ XSR response = kopenApiService.reportCheckOrder(adjustParams, order);
+ if (response.getSuccess()) {
+ return SUCCESS;
+ } else {
+ return FAIL;
+ }
+ }
+
return SUCCESS;
// TODO Auto-generated method stub
--
Gitblit v1.9.1