From fe8d6e225812fee9723a3a942481fdaf171a9dbc Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期一, 29 十二月 2025 15:56:33 +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 | 97 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 83 insertions(+), 14 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 3fb456e..41eb20a 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -2,6 +2,7 @@
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;
@@ -10,8 +11,10 @@
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.enums.MatLocType;
import com.zy.api.service.KopenApiService;
import com.zy.asrs.entity.*;
import com.zy.asrs.enums.OrderTypeEnum;
@@ -62,6 +65,11 @@
private KopenApiService kopenApiService;
@Autowired
private MatService matService;
+ @Autowired
+ private LocDetlService locDetlService;
+ @Autowired
+ CheckOrderDetlService checkOrderDetlService;
+
@Transactional
public ReturnT<String> startOrderIssuedOnceMore(Order order) {
@@ -247,12 +255,13 @@
ReportOrderParam orderParam = new ReportOrderParam();
orderParam.setCompany_id(order.getCstmrName())
.setWms_id(order.getId() + "")
- .setOrder_no(order.getOrderNo())
+// .setOrder_no(order.getOrderNo())
+ .setDispatch_no(order.getOrderNo())
.setType(order.getDocType() + "")
.setInv_no(order.getNumber())
.setPm_tktid(order.getItemName())
.setUpdate_time(Utils.dateToStr(new Date(), "yyyy-MM-dd HH:mm:ss"))
- .setTarget_location("");
+ .setTarget_location("1");
List<ReportOrderParams> reportOrderParams = new ArrayList<>();
orderDetls.forEach(detl -> {
@@ -261,6 +270,15 @@
throw new CoolException("鐗╂枡涓嶅瓨鍦�");
}
ReportOrderParams itemParam = new ReportOrderParams();
+
+ LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>()
+ .eq("matnr", detl.getMatnr())
+ .eq("supp_code", detl.getSuppCode())
+ .eq("order_no", detl.getOrderNo()));
+ if (Objects.isNull(locDetl)) {
+ throw new CoolException("搴撳瓨鏄庣粏涓嶅瓨鍦� 锛岃妫�鏌ュ崟鎹槸鍚﹀畬鎴愶紒锛�");
+ }
+
// BS Code
itemParam.setTotal_serial(detl.getThreeCode())
// 涓婃姤鏃讹紝榛樿浜у搧绫诲瀷鏄痭ull
@@ -269,12 +287,11 @@
.setPro_komcode(detl.getMatnr())
// 涓婃姤鏃讹紝榛樿浜у搧id鏄緵搴斿晢缂栫爜
.setPro_id(detl.getSuppCode())
- // 涓婃姤鏃讹紝榛樿鏉ユ簮浣嶇疆鏄痭ull
- .setLocation_no(null)
- // 涓婃姤鏃讹紝榛樿鐩爣浣嶇疆鏄痭ull
- .setLocation_type(null)
+ .setLocation_no(locDetl.getZpallet())
+ .setSj_emp(locDetl.getModiUser$())
+ .setLocation_type(MatLocType.getMatTag(material.getTagId() + ""))
// 涓婃姤鏃讹紝榛樿涓婃姤鏃堕棿鏄洿鏂版椂闂�
- .setSj_date(order.getUpdateBy().toString())
+ .setSj_date(Utils.dateToStr(order.getUpdateTime(), "yyyy-MM-dd HH:mm:ss") )
// 涓婃姤鏃讹紝榛樿涓婃姤浜烘槸鏇存柊浜�
.setSj_emp(order.getUpdateBy$())
// 涓婃姤鏃讹紝榛樿涓婃姤鏁伴噺鏄鍗曟暟閲�
@@ -292,8 +309,13 @@
XSR response = null;
boolean success = false;
try {
- response = kopenApiService.getInDispatchResult(orderParam);
-
+ List<ReportOrderParam> orderParams = new ArrayList<>();
+ orderParams.add(orderParam);
+ if (order.getReportOnce() < 4) {
+ response = kopenApiService.getInDispatchResult(orderParams, order);
+ } else {
+ return FAIL;
+ }
// if (true) {
// success = true;
// // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
@@ -389,7 +411,8 @@
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
}
} else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL + MesConstant.OUT_DISPATCH_RESULT,
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}",
+ MesConstant.URL + MesConstant.OUT_DISPATCH_RESULT,
JSON.toJSONString(orderParam), JSON.toJSONString(response));
throw new CoolException("涓婃姤KOPEN绯荤粺澶辫触");
}
@@ -424,7 +447,6 @@
.setCus_id(order.getCstmrName())
.setCus_address(order.getTel());
-
List<OrderItemsParam> reportOrderParams = new ArrayList<>();
orderDetls.forEach(detl -> {
Mat material = matService.selectByMatnr(detl.getMatnr());
@@ -447,11 +469,10 @@
List<OutOrderParams> pubOrderParamsList = new ArrayList<>();
pubOrderParamsList.add(pubOrderParams);
- //璁剧疆娲惧伐鍗曟槑缁�
+ // 璁剧疆娲惧伐鍗曟槑缁�
stockUpOrderParams.setDetails(pubOrderParamsList);
stockUpOrderParams.setUpdate_time(order.getUpdateBy$());
-
XSR response = null;
boolean success = false;
try {
@@ -470,7 +491,8 @@
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
}
} else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL + MesConstant.OUT_DETAILS_RESULT,
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}",
+ MesConstant.URL + MesConstant.OUT_DETAILS_RESULT,
JSON.toJSONString(stockUpOrderParams), JSON.toJSONString(response));
throw new CoolException("涓婃姤KOPEN绯荤粺澶辫触");
}
@@ -497,4 +519,51 @@
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