From 43f9cf624b83c9d3d0e2280a1404dcc52695a18d Mon Sep 17 00:00:00 2001
From: IZCD4L12RTSW0VZ\Administrator <skyouc>
Date: 星期一, 29 十二月 2025 16:01:08 +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 | 45 ++++++++++++++++++++++++++++-----------------
1 files changed, 28 insertions(+), 17 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 157b547..e951ac0 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -14,11 +14,11 @@
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;
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;
@@ -47,8 +47,6 @@
@Service
public class OrderSyncHandler extends AbstractHandler<String> {
- private final CheckOrderDetlServiceImpl checkOrderDetlService;
-
@Autowired
private JdbcTemplate jdbcTemplate;
@Autowired
@@ -67,10 +65,11 @@
private KopenApiService kopenApiService;
@Autowired
private MatService matService;
+ @Autowired
+ private LocDetlService locDetlService;
+ @Autowired
+ CheckOrderDetlService checkOrderDetlService;
- OrderSyncHandler(CheckOrderDetlServiceImpl checkOrderDetlService) {
- this.checkOrderDetlService = checkOrderDetlService;
- }
@Transactional
public ReturnT<String> startOrderIssuedOnceMore(Order order) {
@@ -256,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 -> {
@@ -270,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
@@ -278,14 +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_emp(order.getUpdateBy$())
+ .setSj_date(Utils.dateToStr(order.getUpdateTime(), "yyyy-MM-dd HH:mm:ss") )
// 涓婃姤鏃讹紝榛樿涓婃姤鏁伴噺鏄鍗曟暟閲�
.setPick_qty(detl.getQty().intValue())
// 涓婃姤鏃讹紝榛樿鎹熷潖鏁伴噺鏄�0
@@ -301,8 +307,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.宸蹭笂鎶�
--
Gitblit v1.9.1