From 6cb4e6647b0e2e8c0cafa38a07666e07709bcf54 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期一, 19 一月 2026 13:06:05 +0800
Subject: [PATCH] 物料新增，修改功能 优化
---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 41 ++++++++++++++---------------------------
1 files changed, 14 insertions(+), 27 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 37bb04e..23276e6 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -255,7 +255,6 @@
ReportOrderParam orderParam = new ReportOrderParam();
orderParam.setCompany_id(order.getCstmrName())
.setWms_id(order.getId() + "")
-// .setOrder_no(order.getOrderNo())
.setDispatch_no(order.getOrderNo())
.setType(order.getDocType() + "")
.setInv_no(order.getNumber())
@@ -345,51 +344,40 @@
}
}
} else if (Integer.valueOf(docType.getDocId() + "").equals(OrderTypeEnum.TRANSFER.type)) {
- // 澶囪揣娲惧伐鍗曪紙鍑哄簱锛�
+ // 澶囪揣鎸囩ず娲惧伐鍗曪紙鍑哄簱锛�
ReportOrderParam orderParam = new ReportOrderParam();
orderParam.setCompany_id(order.getCstmrName())
.setWms_id(order.getId() + "")
- .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("")
+ .setTarget_location("1");
- List<ReportOrderParams> reportOrderParams = new ArrayList<>();
+ List<OrderItemsParam> reportOrderParams = new ArrayList<>();
orderDetls.forEach(detl -> {
Mat material = matService.selectByMatnr(detl.getMatnr());
if (Objects.isNull(material)) {
throw new CoolException("鐗╂枡涓嶅瓨鍦�");
}
- ReportOrderParams itemParam = new ReportOrderParams();
+ OrderItemsParam itemParam = new OrderItemsParam();
// BS Code
- itemParam.setTotal_serial(detl.getThreeCode())
+ itemParam
// 涓婃姤鏃讹紝榛樿浜у搧绫诲瀷鏄痭ull
.setPro_type(material.getProType())
// 涓婃姤鏃讹紝榛樿浜у搧缂栫爜
.setPro_komcode(detl.getMatnr())
// 涓婃姤鏃讹紝榛樿浜у搧id鏄緵搴斿晢缂栫爜
.setPro_id(detl.getSuppCode())
- // 涓婃姤鏃讹紝榛樿鏉ユ簮浣嶇疆鏄痭ull
+// // 涓婃姤鏃讹紝榛樿鏉ユ簮浣嶇疆鏄痭ull
.setLocation_no(null)
- // 涓婃姤鏃讹紝榛樿鐩爣浣嶇疆鏄痭ull
- .setLocation_type(null)
- // 涓婃姤鏃讹紝榛樿涓婃姤鏃堕棿鏄洿鏂版椂闂�
- .setSj_date(order.getUpdateBy().toString())
- // 涓婃姤鏃讹紝榛樿涓婃姤浜烘槸鏇存柊浜�
- .setSj_emp(order.getUpdateBy$())
// 涓婃姤鏃讹紝榛樿涓婃姤鏁伴噺鏄鍗曟暟閲�
- .setPick_qty(detl.getQty().intValue())
- // 涓婃姤鏃讹紝榛樿鎹熷潖鏁伴噺鏄�0
- .setDamage_qty(0)
- // 涓婃姤鏃讹紝榛樿宸紓鏁伴噺鏄�0
- .setDiff_qty(0);
-
+ .setPick_qty(detl.getQty().intValue());
reportOrderParams.add(itemParam);
});
- orderParam.setDetails(reportOrderParams);
+ orderParam.setPartList(reportOrderParams);
XSR response = null;
boolean success = false;
@@ -401,8 +389,7 @@
} else {
return FAIL;
}
-
- if (true) {
+ if (response.getSuccess()) {
success = true;
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
if (!orderService.updateSettle(order.getId(), settle, null)) {
@@ -410,8 +397,8 @@
}
} 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绯荤粺澶辫触");
}
} catch (Exception e) {
--
Gitblit v1.9.1