From 2bbb655dcb98b9d54083286825f14bf8aff7143b Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期二, 20 一月 2026 17:22:36 +0800
Subject: [PATCH] 1. 查询库存接口调整优化
---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 155 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 102 insertions(+), 53 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 d94b998..5b28ddd 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,13 @@
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.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;
@@ -47,8 +49,6 @@
@Service
public class OrderSyncHandler extends AbstractHandler<String> {
- private final CheckOrderDetlServiceImpl checkOrderDetlService;
-
@Autowired
private JdbcTemplate jdbcTemplate;
@Autowired
@@ -67,10 +67,13 @@
private KopenApiService kopenApiService;
@Autowired
private MatService matService;
+ @Autowired
+ private LocDetlService locDetlService;
+ @Autowired
+ CheckOrderDetlService checkOrderDetlService;
+ @Autowired
+ private TaskDetlLogService taskDetlLogService;
- OrderSyncHandler(CheckOrderDetlServiceImpl checkOrderDetlService) {
- this.checkOrderDetlService = checkOrderDetlService;
- }
@Transactional
public ReturnT<String> startOrderIssuedOnceMore(Order order) {
@@ -256,7 +259,7 @@
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())
@@ -270,6 +273,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,10 +290,11 @@
.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") )
- // 涓婃姤鏃讹紝榛樿涓婃姤浜烘槸鏇存柊浜�
- .setSj_emp(order.getUpdateBy$())
+ .setSj_date(Utils.dateToStr(order.getUpdateTime(), "yyyy-MM-dd HH:mm:ss"))
// 涓婃姤鏃讹紝榛樿涓婃姤鏁伴噺鏄鍗曟暟閲�
.setPick_qty(detl.getQty().intValue())
// 涓婃姤鏃讹紝榛樿鎹熷潖鏁伴噺鏄�0
@@ -299,8 +312,11 @@
try {
List<ReportOrderParam> orderParams = new ArrayList<>();
orderParams.add(orderParam);
- response = kopenApiService.getInDispatchResult(orderParams);
-
+ if (order.getReportOnce() < 4) {
+ response = kopenApiService.getInDispatchResult(orderParams, order);
+ } else {
+ return FAIL;
+ }
// if (true) {
// success = true;
// // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
@@ -332,64 +348,68 @@
}
}
} 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;
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)) {
@@ -397,8 +417,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) {
@@ -438,6 +458,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());
@@ -445,9 +473,11 @@
itemParam.setPro_komcode(material.getMatnr());
// 涓婃姤鏃讹紝榛樿浜у搧id鏄緵搴斿晢缂栫爜
itemParam.setPro_id(detl.getSuppCode());
-
+ //todo 鍙拌溅缂栫爜
+ itemParam.setTruck_no(detlLog.getZpallet());
// 涓婃姤鏃讹紝榛樿涓婃姤鏃堕棿鏄洿鏂版椂闂�
itemParam.setPick_qty(detl.getQty().intValue());
+
reportOrderParams.add(itemParam);
});
pubOrderParams.setPartList(reportOrderParams);
@@ -456,7 +486,7 @@
pubOrderParamsList.add(pubOrderParams);
// 璁剧疆娲惧伐鍗曟槑缁�
stockUpOrderParams.setDetails(pubOrderParamsList);
- stockUpOrderParams.setUpdate_time(order.getUpdateBy$());
+ stockUpOrderParams.setUpdate_time(order.getUpdateTime$());
XSR response = null;
boolean success = false;
@@ -469,7 +499,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)) {
@@ -506,7 +545,7 @@
/**
* 鎹熸孩鍗曞畬缁撲笂鎶�
- *
+ *
* @param order
* @return
*/
@@ -519,10 +558,11 @@
adjustParam.setCompany_id(order.getCstmrName())
.setWms_id(order.getId() + "")
.setType(0 + "")
- .setCompany_id(order.getCstmrName());
+ .setUpdate_time(order.getUpdateTime$());
+// .setKopen_id(order.getDefNumber());
- adjustParam.setBsby_no(order.getNumber())
- .setResason("")
+ adjustParam.setBsby_no(order.getOrderNo())
+ .setReason("")
.setReason_name("");
List<CheckOrderDetl> detls = checkOrderDetlService
.selectList(new EntityWrapper<CheckOrderDetl>().eq("order_id", order.getId()));
@@ -546,6 +586,15 @@
adjustParams.add(adjustParam);
+ 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