From 1fdb053b64a033280a8ffe0ea10ad54b604e58cd Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期六, 28 二月 2026 16:31:37 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 161 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 99 insertions(+), 62 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..70074d6 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -19,6 +19,8 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.enums.OrderTypeEnum;
import com.zy.asrs.service.*;
+import com.zy.asrs.service.impl.TaskDetlLogServiceImpl;
+import com.zy.asrs.service.impl.TaskDetlServiceImpl;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.utils.OrderInAndOutUtil;
@@ -69,6 +71,8 @@
private LocDetlService locDetlService;
@Autowired
CheckOrderDetlService checkOrderDetlService;
+ @Autowired
+ private TaskDetlLogService taskDetlLogService;
@Transactional
@@ -140,6 +144,7 @@
orderDetlList.add(detail);
}
}
+
for (OrderDetl orderDetl : orderDetlList) {
orderDetl.setWorkQty(0D);
OrderInAndOutUtil.insertOrderDetl(order.getPakinPakoutStatus$(), order, orderDetl);
@@ -161,21 +166,24 @@
@Transactional(rollbackFor = Exception.class)
public void ifTransfetInsertStockIn(Order order, OrderDetl orderDetl) {
- OrderPakin orderPakin = new OrderPakin();
- BeanUtils.copyProperties(order, orderPakin);
- orderPakin.setDocType(OrderTypeEnum.STOCK_IN.type.longValue());
-
- if (!orderPakinService.insert(orderPakin)) {
- throw new CoolException("鎻掑叆澶囪揣鍏ュ簱鍗曞け璐�");
+ OrderPakin pakin = orderPakinService.selectOne(new EntityWrapper<OrderPakin>()
+ .eq("order_no", order.getOrderNo())
+ .eq("doc_type", OrderTypeEnum.STOCK_IN.type.longValue()));
+ if (Objects.isNull(pakin)) {
+ OrderPakin orderPakin = new OrderPakin();
+ BeanUtils.copyProperties(order, orderPakin);
+ orderPakin.setDocType(OrderTypeEnum.STOCK_IN.type.longValue());
+ if (!orderPakinService.insert(orderPakin)) {
+ throw new CoolException("鎻掑叆澶囪揣鍏ュ簱鍗曞け璐�");
+ }
}
+
OrderDetlPakin orderDetlPakin = new OrderDetlPakin();
BeanUtils.copyProperties(orderDetl, orderDetlPakin);
- orderDetlPakin.setOrderId(orderPakin.getId());
-
+ orderDetlPakin.setOrderId(pakin.getId());
if (!orderDetlPakinService.insert(orderDetlPakin)) {
throw new CoolException("鎻掑叆澶囪揣鍏ュ簱鍗曞け璐�");
}
-
}
@Transactional
@@ -255,7 +263,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())
@@ -276,29 +283,46 @@
.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
+ .setPro_type(material.getProType())
+ // 涓婃姤鏃讹紝榛樿浜у搧缂栫爜
+ .setPro_komcode(detl.getMatnr())
+ // 涓婃姤鏃讹紝榛樿浜у搧id鏄緵搴斿晢缂栫爜
+ .setPro_id(detl.getSuppCode())
+ .setLocation_no("LX000000000")
+ .setSj_emp("9527")
+ .setLocation_type(MatLocType.getMatTag(material.getTagId() + ""))
+ // 涓婃姤鏃讹紝榛樿涓婃姤鏃堕棿鏄洿鏂版椂闂�
+ .setSj_date(Utils.dateToStr(order.getUpdateTime(), "yyyy-MM-dd HH:mm:ss"))
+ // 涓婃姤鏃讹紝濡傛灉涓虹┖榛樿涓婃姤 0
+ .setPick_qty(0)
+ // 涓婃姤鏃讹紝榛樿鎹熷潖鏁伴噺鏄�0
+ .setDamage_qty(0)
+ // 涓婃姤鏃讹紝榛樿宸紓鏁伴噺鏄�0
+ .setDiff_qty(0);
+ } else {
+ // BS Code
+ itemParam.setTotal_serial(detl.getThreeCode())
+ // 涓婃姤鏃讹紝榛樿浜у搧绫诲瀷鏄痭ull
+ .setPro_type(material.getProType())
+ // 涓婃姤鏃讹紝榛樿浜у搧缂栫爜
+ .setPro_komcode(detl.getMatnr())
+ // 涓婃姤鏃讹紝榛樿浜у搧id鏄緵搴斿晢缂栫爜
+ .setPro_id(detl.getSuppCode())
+ .setLocation_no(locDetl.getZpallet())
+ .setSj_emp(locDetl.getModiUser$())
+ .setLocation_type(MatLocType.getMatTag(material.getTagId() + ""))
+ // 涓婃姤鏃讹紝榛樿涓婃姤鏃堕棿鏄洿鏂版椂闂�
+ .setSj_date(Utils.dateToStr(order.getUpdateTime(), "yyyy-MM-dd HH:mm:ss"))
+ // 涓婃姤鏃讹紝榛樿涓婃姤鏁伴噺鏄鍗曟暟閲�
+ .setPick_qty(locDetl.getAnfme().intValue())
+ // 涓婃姤鏃讹紝榛樿鎹熷潖鏁伴噺鏄�0
+ .setDamage_qty(0)
+ // 涓婃姤鏃讹紝榛樿宸紓鏁伴噺鏄�0
+ .setDiff_qty(0);
}
-
- // BS Code
- itemParam.setTotal_serial(detl.getThreeCode())
- // 涓婃姤鏃讹紝榛樿浜у搧绫诲瀷鏄痭ull
- .setPro_type(material.getProType())
- // 涓婃姤鏃讹紝榛樿浜у搧缂栫爜
- .setPro_komcode(detl.getMatnr())
- // 涓婃姤鏃讹紝榛樿浜у搧id鏄緵搴斿晢缂栫爜
- .setPro_id(detl.getSuppCode())
- .setLocation_no(locDetl.getZpallet())
- .setSj_emp(locDetl.getModiUser$())
- .setLocation_type(MatLocType.getMatTag(material.getTagId() + ""))
- // 涓婃姤鏃讹紝榛樿涓婃姤鏃堕棿鏄洿鏂版椂闂�
- .setSj_date(Utils.dateToStr(order.getUpdateTime(), "yyyy-MM-dd HH:mm:ss") )
- // 涓婃姤鏃讹紝榛樿涓婃姤鏁伴噺鏄鍗曟暟閲�
- .setPick_qty(detl.getQty().intValue())
- // 涓婃姤鏃讹紝榛樿鎹熷潖鏁伴噺鏄�0
- .setDamage_qty(0)
- // 涓婃姤鏃讹紝榛樿宸紓鏁伴噺鏄�0
- .setDiff_qty(0);
-
reportOrderParams.add(itemParam);
});
@@ -345,51 +369,56 @@
}
}
} 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("")
+ .setSource_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();
+ TaskDetlLog detlLog = taskDetlLogService.selectOne(new EntityWrapper<TaskDetlLog>()
+ .eq("matnr", detl.getMatnr())
+ .eq("supp_code", detl.getStandby1())
+ .eq("order_no", detl.getOrderNo()));
+ if (Objects.isNull(detlLog)) {
+ throw new CoolException("鏁版嵁閿欒 锛岃妫�鏌GV浠诲姟妗ｆ槸鍚﹀凡瀹屾垚锛侊紒");
+ }
+ //鐩爣搴撳尯
+ orderParam.setTarget_location(detlLog.getAreaType());
+ 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
- .setLocation_no(null)
- // 涓婃姤鏃讹紝榛樿鐩爣浣嶇疆鏄痭ull
- .setLocation_type(null)
- // 涓婃姤鏃讹紝榛樿涓婃姤鏃堕棿鏄洿鏂版椂闂�
- .setSj_date(order.getUpdateBy().toString())
- // 涓婃姤鏃讹紝榛樿涓婃姤浜烘槸鏇存柊浜�
- .setSj_emp(order.getUpdateBy$())
+// // 涓婃姤鏃讹紝榛樿鏉ユ簮浣嶇疆鏄痭ull
+ .setLocation_no(detlLog.getZpallet())
// 涓婃姤鏃讹紝榛樿涓婃姤鏁伴噺鏄鍗曟暟閲�
- .setPick_qty(detl.getQty().intValue())
- // 涓婃姤鏃讹紝榛樿鎹熷潖鏁伴噺鏄�0
- .setDamage_qty(0)
- // 涓婃姤鏃讹紝榛樿宸紓鏁伴噺鏄�0
- .setDiff_qty(0);
-
+ .setPick_qty(detl.getQty().intValue());
reportOrderParams.add(itemParam);
});
- orderParam.setDetails(reportOrderParams);
+ if (orderParam.getTarget_location().equals("2")) {
+ orderParam.setType("11");
+ } else if (orderParam.getTarget_location().equals("3")) {
+ orderParam.setType("12");
+ } else {
+ orderParam.setType("13");
+ }
+ orderParam.setPartList(reportOrderParams);
XSR response = null;
boolean success = false;
@@ -401,8 +430,7 @@
} else {
return FAIL;
}
-
- if (true) {
+ if (response.getSuccess()) {
success = true;
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
if (!orderService.updateSettle(order.getId(), settle, null)) {
@@ -410,8 +438,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) {
@@ -451,6 +479,14 @@
if (Objects.isNull(material)) {
throw new CoolException("鐗╂枡涓嶅瓨鍦�");
}
+
+ TaskDetlLog detlLog = taskDetlLogService.selectOne(new EntityWrapper<TaskDetlLog>()
+ .eq("matnr", detl.getMatnr())
+ .eq("supp_code", detl.getStandby1())
+ .eq("order_no", detl.getOrderNo()));
+ if (Objects.isNull(detlLog)) {
+ throw new CoolException("鏁版嵁閿欒 锛岃妫�鏌GV浠诲姟妗ｆ槸鍚﹀凡瀹屾垚锛侊紒");
+ }
OrderItemsParam itemParam = new OrderItemsParam();
// 涓婃姤鏃讹紝榛樿浜у搧绫诲瀷鏄痭ull
itemParam.setPro_type(material.getProType());
@@ -459,9 +495,10 @@
// 涓婃姤鏃讹紝榛樿浜у搧id鏄緵搴斿晢缂栫爜
itemParam.setPro_id(detl.getSuppCode());
//todo 鍙拌溅缂栫爜
- itemParam.setTruck_no("TC310080014");
+ itemParam.setTruck_no(detlLog.getZpallet());
// 涓婃姤鏃讹紝榛樿涓婃姤鏃堕棿鏄洿鏂版椂闂�
itemParam.setPick_qty(detl.getQty().intValue());
+
reportOrderParams.add(itemParam);
});
pubOrderParams.setPartList(reportOrderParams);
@@ -529,7 +566,7 @@
/**
* 鎹熸孩鍗曞畬缁撲笂鎶�
- *
+ *
* @param order
* @return
*/
@@ -575,7 +612,7 @@
if (response.getSuccess()) {
return SUCCESS;
} else {
- return FAIL;
+ return FAIL;
}
}
--
Gitblit v1.9.1