From e50a83fc5878d44ea0f5c43037002cc1b3d1c6f2 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 19 九月 2024 16:41:28 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkLogHandler.java | 93 +++++++++-------------------------------------
1 files changed, 18 insertions(+), 75 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkLogHandler.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkLogHandler.java
index 5ef3ebb..83ef5d0 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkLogHandler.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkLogHandler.java
@@ -73,7 +73,7 @@
while (iterator.hasNext()) {
WrkDetl wrkDetl = iterator.next();
if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
- wrkDetlsKeyOrder.add(wrkDetl);
+ orderService.checkComplete(wrkDetl.getOrderNo(),hostId);
iterator.remove();
}
}
@@ -118,75 +118,6 @@
}
}
- if (wrkMast.getIoType() == 1 || wrkMast.getIoType() == 53 || wrkMast.getWrkSts() == 200) {
- //涓婃姤蹇靛垵ERP 銆� 涓婃姤涓夋柟骞冲彴 銆�
- SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
- String nowFormat = dateFormat.format(new Date());
-
- ArrayList<LinkedHashMap<String, Object>> mats = new ArrayList<>();
- String orderNo = "";
- for (WrkDetl wrkDetl : wrkDetls) {
- orderNo = wrkDetl.getOrderNo();
- LinkedHashMap<String, Object> mat = new LinkedHashMap<>();
- mat.put("GoodsCode", wrkDetl.getMatnr());
- mat.put("Num", wrkDetl.getAnfme());
- if (!Cools.isEmpty(wrkDetl.getBatch())) {
- mat.put("BatchNo", wrkDetl.getBatch());
- }
- if (!Cools.isEmpty(wrkDetl.getThreeCode())) {
- mat.put("DepotName", wrkDetl.getThreeCode());
- }
- if (!Cools.isEmpty(wrkDetl.getSupp())) {
- mat.put("FromDanCode", wrkDetl.getSupp());
- }
- if (!Cools.isEmpty(wrkDetl.getSuppCode())) {
- mat.put("FromNo", wrkDetl.getSuppCode());
- }
- mats.add(mat);
- }
- Order order = orderService.selectByNo(orderNo, hostId);
- if (order != null) {
- LinkedHashMap<String, Object> param = new LinkedHashMap<>();
- param.put("Login", ERP_LOGIN);
- param.put("DanType", order.getDocType$());
- param.put("Date", nowFormat);
- param.put("FromDanCode", orderNo);
- param.put("Data", mats);
-
- String response = null;
- try {
- response = new HttpHandler.Builder()
- .setUri(ERP_URL)
- .setPath(ERP_REPORT + Utils.ncErpDataEncode(param))
- .build()
- .doGet();
- JSONObject jsonObject = JSON.parseObject(response);
- JSONArray result = jsonObject.getJSONArray("result");
- Object object = result.get(0);
- JSONObject data = JSON.parseObject(object.toString());
- if (data.getBoolean("State")) {
- //涓婃姤鎴愬姛
- } else {
- //涓婃姤澶辫触
- exceptionHandle("涓婃姤ERP澶辫触[workNo={0}]澶辫触", wrkMast.getWrkNo());
- }
- } catch (Exception e) {
- e.printStackTrace();
- //寮傚父涓婃姤澶辫触
- exceptionHandle("涓婃姤ERP寮傚父澶辫触[workNo={0}]澶辫触", wrkMast.getWrkNo());
- } finally {
- //璁板綍涓婃姤鏁版嵁
- OperateLog operateLog = new OperateLog();
- operateLog.setAction("涓婃姤ERP," + ERP_URL + ERP_REPORT);
- operateLog.setRequest(Utils.ncErpDataEncode(param));
- operateLog.setResponse(response);
- operateLog.setCreateTime(new Date());
- operateLog.setSystem("WMS");
- operateLogService.save(operateLog);
- }
- }
- }
-
// 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
if (!wrkMastLogService.saveToHistory(wrkMast.getId())) {
exceptionHandle("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
@@ -197,16 +128,28 @@
}
// 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
if (!wrkDetlLogService.saveToHistory(wrkMast.getWrkNo(), hostId)) {
-// exceptionHandle("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+ exceptionHandle("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
}
// 鍒犻櫎宸ヤ綔鏄庣粏妗�
if (!wrkDetlService.remove(new LambdaQueryWrapper<WrkDetl>().eq(WrkDetl::getWrkNo, wrkMast.getWrkNo()).eq(WrkDetl::getHostId, hostId))) {
-// exceptionHandle("鍒犻櫎宸ヤ綔鏄庣粏妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+ exceptionHandle("鍒犻櫎宸ヤ綔鏄庣粏妗workNo={0}]澶辫触", wrkMast.getWrkNo());
}
- // 淇敼璁㈠崟鐘舵�� 浣滀笟涓� ===>> 宸插畬鎴�
- for (WrkDetl wrkDetl : wrkDetlsKeyOrder) {
- orderService.checkComplete(wrkDetl.getOrderNo(), hostId);
+ List<WrkDetl> wrkDetls2 = wrkDetlService.list(new LambdaQueryWrapper<WrkDetl>().eq(WrkDetl::getWrkNo, wrkMast.getWrkNo()).eq(WrkDetl::getHostId, hostId));
+ // 鍖哄垎璁㈠崟浠诲姟
+ if (!Cools.isEmpty(wrkDetls2)) {
+ Iterator<WrkDetl> iterator = wrkDetls2.iterator();
+ while (iterator.hasNext()) {
+ WrkDetl wrkDetl = iterator.next();
+ if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
+ orderService.checkComplete(wrkDetl.getOrderNo(),hostId);
+ iterator.remove();
+ }
+ }
}
+// // 淇敼璁㈠崟鐘舵�� 浣滀笟涓� ===>> 宸插畬鎴�
+// for (WrkDetl wrkDetl : wrkDetlsKeyOrder) {
+// orderService.checkComplete(wrkDetl.getOrderNo(), hostId);
+// }
} catch (Exception e) {
log.error("fail", e);
e.printStackTrace();
--
Gitblit v1.9.1