From 8e165602182c5f94b30c955f7a2cecd87c1d2628 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 03 七月 2025 15:53:16 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 114 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 92 insertions(+), 22 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 a94b4bd..5f7cece 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -2,28 +2,28 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
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.Order;
import com.zy.asrs.entity.OrderDetl;
-import com.zy.asrs.service.ApiLogService;
-import com.zy.asrs.service.DocTypeService;
-import com.zy.asrs.service.OrderDetlService;
-import com.zy.asrs.service.OrderService;
+import com.zy.asrs.entity.OrderDetlReport;
+import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
-import com.zy.common.constant.MesConstant;
+import com.zy.asrs.third.TokenUtils;
import com.zy.common.model.MesPakinParam;
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
+import java.util.Map;
/**
* Created by vincent on 2020/7/7
@@ -39,9 +39,17 @@
@Autowired
private OrderDetlService orderDetlService;
@Autowired
+ private OrderDetlReportService orderDetlReportService;
+ @Autowired
private ApiLogService apiLogService;
@Autowired
private DocTypeService docTypeService;
+
+ @Value("${mes.url}")
+ private String url;
+
+ @Value("${mes.pakin}")
+ private String pakin;
@Transactional
public ReturnT<String> start(Order order) {
@@ -49,23 +57,33 @@
if (null == docType) {
return SUCCESS;
}
- List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+ //List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+ List<OrderDetlReport> orderDetls = orderDetlReportService.selectList(new EntityWrapper<OrderDetlReport>().eq("order_no", order.getOrderNo()));
// 鍏ュ簱瀹屾垚涓婃姤
- if (docType.getPakin() == 1) {
+ if (docType.getPakin() == 1 && !Cools.isEmpty(orderDetls)) {
MesPakinParam pakinParam = new MesPakinParam();
- pakinParam.setPakinTime(DateUtils.convert(order.getUpdateTime()));
- pakinParam.setLgortFrom("5008");
- pakinParam.setLgortTo("5006");
- 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()));
+ pakinParam.setReceiptNumber(order.getOrderNo());
+ pakinParam.setReceiptType(order.getDocType$());
+ pakinParam.setCompleteInd("1");
+ for (OrderDetlReport orderDetl : orderDetls) {
+ MesPakinParam.Detl detl = new MesPakinParam.Detl();
+ detl.setQty(orderDetl.getAnfme());
+ detl.setBarcode(orderDetl.getThreeCode());
+ detl.setPalletBarcode(orderDetl.getZpallet());
+ detl.setProductionCode(orderDetl.getMatnr());
+ pakinParam.getBarcodeList().add(detl);
+ }
+ Map<String, Object> token = TokenUtils.getToken(url);
+ if (Cools.isEmpty(token)) {
+ return FAIL.setMsg("鑾峰彇token澶辫触");
}
String response = "";
boolean success = false;
try {
response = new HttpHandler.Builder()
- .setUri(MesConstant.URL)
- .setPath(MesConstant.PAKIN_URL)
+ .setHeaders(token)
+ .setUri(url)
+ .setPath(pakin)
.setJson(JSON.toJSONString(pakinParam))
.build()
.doPost();
@@ -77,7 +95,7 @@
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
}
} else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKIN_URL, JSON.toJSONString(pakinParam), response);
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", url + pakin, JSON.toJSONString(pakinParam), response);
throw new CoolException("涓婃姤mes绯荤粺澶辫触");
}
} catch (Exception e) {
@@ -89,20 +107,72 @@
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
"鎴愬搧搴撳叆搴撲笂鎶�",
- MesConstant.URL + MesConstant.PAKIN_URL,
+ url + pakin,
null,
"127.0.0.1",
JSON.toJSONString(pakinParam),
response,
success
);
- } catch (Exception e) { log.error("", e); }
+ } catch (Exception e) {
+ log.error("", e);
+ }
}
}
// 鍑哄簱瀹屾垚涓婃姤
- if (docType.getPakout() == 1) {
- // todo
- }
+// if (docType.getPakout() == 1) {
+// MesPakoutParam pakoutParam = new MesPakoutParam();
+// pakoutParam.setTag(!order.getDocType$().equalsIgnoreCase("鎵嬪姩鍑哄簱鍗�"));
+// pakoutParam.setPakoutTime(DateUtils.convert(order.getUpdateTime()));
+// pakoutParam.setLgortFrom("5006");
+// pakoutParam.setLgortTo("1111");
+// if (!pakoutParam.isTag()) {
+// pakoutParam.setKunnr("C1000");
+// }
+// pakoutParam.setOrderNo(order.getOrderNo());
+// for (OrderDetl orderDetl : orderDetls) {
+// String serial = Cools.isEmpty(orderDetl.getBatch()) ? "" : orderDetl.getBatch();
+// pakoutParam.getList().add(new MesPakoutParam.Detl(orderDetl.getMatnr() + (Cools.isEmpty(serial) ? "" : "-" + serial), orderDetl.getAnfme()));
+// }
+// String response = "";
+// 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)) {
+// success = true;
+// // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
+// if (!orderService.updateSettle(order.getId(), 6L, null)) {
+// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+// }
+// } else {
+// log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKOUT_URL, JSON.toJSONString(pakoutParam), response);
+// throw new CoolException("涓婃姤mes绯荤粺澶辫触");
+// }
+// } catch (Exception e) {
+// log.error("fail", e);
+//// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+// return FAIL.setMsg(e.getMessage());
+// } finally {
+// try {
+// // 淇濆瓨鎺ュ彛鏃ュ織
+// apiLogService.save(
+// "鎴愬搧搴撳嚭搴撲笂鎶�",
+// MesConstant.URL + MesConstant.PAKOUT_URL,
+// null,
+// "127.0.0.1",
+// JSON.toJSONString(pakoutParam),
+// response,
+// success
+// );
+// } catch (Exception e) { log.error("", e); }
+// }
+// }
return SUCCESS;
}
--
Gitblit v1.9.1