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 | 84 ++++++++++++++++++++++--------------------
1 files changed, 44 insertions(+), 40 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 9f5a695..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,64 +344,52 @@
}
}
} 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;
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) {
+ List<ReportOrderParam> orderParams = new ArrayList<>();
+ orderParams.add(orderParam);
+ if (order.getReportOnce() < 4) {
+ response = kopenApiService.reportOutDetailsResult(orderParams, order);
+ } else {
+ return FAIL;
+ }
+ 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) {
@@ -458,7 +445,8 @@
itemParam.setPro_komcode(material.getMatnr());
// 涓婃姤鏃讹紝榛樿浜у搧id鏄緵搴斿晢缂栫爜
itemParam.setPro_id(detl.getSuppCode());
-
+ //todo 鍙拌溅缂栫爜
+ itemParam.setTruck_no("TC310080014");
// 涓婃姤鏃讹紝榛樿涓婃姤鏃堕棿鏄洿鏂版椂闂�
itemParam.setPick_qty(detl.getQty().intValue());
reportOrderParams.add(itemParam);
@@ -469,7 +457,7 @@
pubOrderParamsList.add(pubOrderParams);
// 璁剧疆娲惧伐鍗曟槑缁�
stockUpOrderParams.setDetails(pubOrderParamsList);
- stockUpOrderParams.setUpdate_time(order.getUpdateBy$());
+ stockUpOrderParams.setUpdate_time(order.getUpdateTime$());
XSR response = null;
boolean success = false;
@@ -482,7 +470,16 @@
// .doPost();
// JSONObject jsonObject = JSON.parseObject(response);
// if (jsonObject.getInteger("code").equals(200)) {
- if (true) {
+
+ List<StockUpOrderParams> orderParams = new ArrayList<>();
+ orderParams.add(stockUpOrderParams);
+ if (order.getReportOnce() < 4) {
+ response = kopenApiService.getOutDetailsResult(orderParams, order);
+ } else {
+ return FAIL;
+ }
+
+ if (response.getSuccess()) {
success = true;
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
if (!orderService.updateSettle(order.getId(), settle, null)) {
@@ -532,8 +529,8 @@
adjustParam.setCompany_id(order.getCstmrName())
.setWms_id(order.getId() + "")
.setType(0 + "")
- .setUpdate_time(order.getUpdateBy$())
- .setKopen_id(order.getDefNumber());
+ .setUpdate_time(order.getUpdateTime$());
+// .setKopen_id(order.getDefNumber());
adjustParam.setBsby_no(order.getOrderNo())
.setReason("")
@@ -560,7 +557,14 @@
adjustParams.add(adjustParam);
- XSR response = kopenApiService.reportCheckOrder(adjustParams, order);
+ if (order.getReportOnce() < 3) {
+ XSR response = kopenApiService.reportCheckOrder(adjustParams, order);
+ if (response.getSuccess()) {
+ return SUCCESS;
+ } else {
+ return FAIL;
+ }
+ }
return SUCCESS;
// TODO Auto-generated method stub
--
Gitblit v1.9.1