From 290e5fd2e74efe19326f56e38c3391aaae23ffc5 Mon Sep 17 00:00:00 2001
From: IZCD4L12RTSW0VZ\Administrator <skyouc>
Date: 星期三, 24 十二月 2025 17:14:09 +0800
Subject: [PATCH] Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms
---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 154 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 149 insertions(+), 5 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 35cd074..3ebadce 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -2,16 +2,23 @@
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.api.entity.OrderItemsParam;
+import com.zy.api.entity.OutOrderParams;
+import com.zy.api.entity.PubOrderParams;
import com.zy.api.entity.ReportOrderParam;
import com.zy.api.entity.ReportOrderParams;
+import com.zy.api.entity.StockAdjustParams;
+import com.zy.api.entity.StockUpOrderParams;
import com.zy.api.entity.dto.XSR;
import com.zy.api.service.KopenApiService;
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.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.utils.OrderInAndOutUtil;
@@ -40,6 +47,8 @@
@Service
public class OrderSyncHandler extends AbstractHandler<String> {
+ private final CheckOrderDetlServiceImpl checkOrderDetlService;
+
@Autowired
private JdbcTemplate jdbcTemplate;
@Autowired
@@ -58,6 +67,10 @@
private KopenApiService kopenApiService;
@Autowired
private MatService matService;
+
+ OrderSyncHandler(CheckOrderDetlServiceImpl checkOrderDetlService) {
+ this.checkOrderDetlService = checkOrderDetlService;
+ }
@Transactional
public ReturnT<String> startOrderIssuedOnceMore(Order order) {
@@ -288,7 +301,9 @@
XSR response = null;
boolean success = false;
try {
- response = kopenApiService.getInDispatchResult(orderParam);
+ List<ReportOrderParam> orderParams = new ArrayList<>();
+ orderParams.add(orderParam);
+ response = kopenApiService.getInDispatchResult(orderParams);
// if (true) {
// success = true;
@@ -310,7 +325,7 @@
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
"涓婃灦娲惧伐鍗曞畬鎴愪笂鎶�",
- MesConstant.URL + MesConstant.PAKIN_URL,
+ MesConstant.URL + MesConstant.IN_DISPATCH_RESULT,
null,
"127.0.0.1",
JSON.toJSONString(orderParam),
@@ -385,9 +400,10 @@
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
}
} else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL + MesConstant.PAKOUT_URL,
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}",
+ MesConstant.URL + MesConstant.OUT_DISPATCH_RESULT,
JSON.toJSONString(orderParam), JSON.toJSONString(response));
- throw new CoolException("涓婃姤mes绯荤粺澶辫触");
+ throw new CoolException("涓婃姤KOPEN绯荤粺澶辫触");
}
} catch (Exception e) {
log.error("fail", e);
@@ -397,7 +413,7 @@
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
"澶囪揣娲惧伐鍗曞畬鎴愪笂鎶�",
- MesConstant.URL + MesConstant.PAKOUT_URL,
+ MesConstant.URL + MesConstant.OUT_DISPATCH_RESULT,
null,
"127.0.0.1",
JSON.toJSONString(orderParam),
@@ -407,8 +423,136 @@
log.error("", e);
}
}
+ } else if (Integer.valueOf(docType.getDocId() + "").equals(OrderTypeEnum.STOCK.type)) {
+ // 澶囪揣鍗曞弽棣�
+ StockUpOrderParams stockUpOrderParams = new StockUpOrderParams();
+ stockUpOrderParams.setCompany_id(order.getCstmrName())
+ .setWms_id(order.getId() + "")
+ .setDispatch_no(order.getNumber());
+
+ OutOrderParams pubOrderParams = new OutOrderParams();
+ pubOrderParams.setPick_no(order.getOrderNo())
+ .setOrder_no(order.getShipCode())
+ .setCus_id(order.getCstmrName())
+ .setCus_address(order.getTel());
+
+ List<OrderItemsParam> reportOrderParams = new ArrayList<>();
+ orderDetls.forEach(detl -> {
+ Mat material = matService.selectByMatnr(detl.getMatnr());
+ if (Objects.isNull(material)) {
+ throw new CoolException("鐗╂枡涓嶅瓨鍦�");
+ }
+ OrderItemsParam itemParam = new OrderItemsParam();
+ // 涓婃姤鏃讹紝榛樿浜у搧绫诲瀷鏄痭ull
+ itemParam.setPro_type(material.getProType());
+ // 涓婃姤鏃讹紝榛樿浜у搧缂栫爜
+ itemParam.setPro_komcode(material.getMatnr());
+ // 涓婃姤鏃讹紝榛樿浜у搧id鏄緵搴斿晢缂栫爜
+ itemParam.setPro_id(detl.getSuppCode());
+
+ // 涓婃姤鏃讹紝榛樿涓婃姤鏃堕棿鏄洿鏂版椂闂�
+ itemParam.setPick_qty(detl.getQty().intValue());
+ reportOrderParams.add(itemParam);
+ });
+ pubOrderParams.setPartList(reportOrderParams);
+
+ List<OutOrderParams> pubOrderParamsList = new ArrayList<>();
+ pubOrderParamsList.add(pubOrderParams);
+ // 璁剧疆娲惧伐鍗曟槑缁�
+ stockUpOrderParams.setDetails(pubOrderParamsList);
+ stockUpOrderParams.setUpdate_time(order.getUpdateBy$());
+
+ 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) {
+ success = true;
+ // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
+ if (!orderService.updateSettle(order.getId(), settle, null)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+ } else {
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}",
+ MesConstant.URL + MesConstant.OUT_DETAILS_RESULT,
+ JSON.toJSONString(stockUpOrderParams), JSON.toJSONString(response));
+ throw new CoolException("涓婃姤KOPEN绯荤粺澶辫触");
+ }
+ } catch (Exception e) {
+ log.error("fail", e);
+ return FAIL.setMsg(e.getMessage());
+ } finally {
+ try {
+ // 淇濆瓨鎺ュ彛鏃ュ織
+ apiLogService.save(
+ "澶囪揣鍗曞畬鎴愪笂鎶�",
+ MesConstant.URL + MesConstant.OUT_DETAILS_RESULT,
+ null,
+ "127.0.0.1",
+ JSON.toJSONString(stockUpOrderParams),
+ JSON.toJSONString(response),
+ success);
+ } catch (Exception e) {
+ log.error("", e);
+ }
+ }
+
}
return SUCCESS;
}
+ /**
+ * 鎹熸孩鍗曞畬缁撲笂鎶�
+ *
+ * @param order
+ * @return
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public ReturnT<String> startCheckOrderReport(CheckOrder order) {
+ List<StockAdjustParams> adjustParams = new ArrayList<>();
+
+ StockAdjustParams adjustParam = new StockAdjustParams();
+
+ adjustParam.setCompany_id(order.getCstmrName())
+ .setWms_id(order.getId() + "")
+ .setType(0 + "")
+ .setCompany_id(order.getCstmrName());
+
+ adjustParam.setBsby_no(order.getNumber())
+ .setResason("")
+ .setReason_name("");
+ List<CheckOrderDetl> detls = checkOrderDetlService
+ .selectList(new EntityWrapper<CheckOrderDetl>().eq("order_id", order.getId()));
+ if (Objects.isNull(detls) || detls.isEmpty()) {
+ throw new CoolException("鎹熸孩鍗曡鎯呬笉瀛樺湪");
+ }
+ List<OrderItemsParam> items = new ArrayList<>();
+ detls.forEach(detl -> {
+ Mat material = matService.selectByMatnr(detl.getMatnr());
+ if (Objects.isNull(material)) {
+ throw new CoolException("鐗╂枡涓嶅瓨鍦�");
+ }
+ OrderItemsParam itemParam = new OrderItemsParam();
+ itemParam.setLocation_no(detl.getZpallet())
+ .setPro_komcode(material.getMatnr())
+ .setPro_id(detl.getSuppCode())
+ .setBsby_qty(detl.getDiffQty().intValue());
+ items.add(itemParam);
+ });
+ adjustParam.setDetails(items);
+
+ adjustParams.add(adjustParam);
+
+ return SUCCESS;
+ // TODO Auto-generated method stub
+
+ }
+
}
--
Gitblit v1.9.1