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 | 49 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 40 insertions(+), 9 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 5a35d84..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
@@ -1,7 +1,15 @@
package com.zy.asrs.wms.task.handler;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zy.asrs.common.sys.entity.OperateLog;
+import com.zy.asrs.common.sys.service.OperateLogService;
+import com.zy.asrs.common.utils.HttpHandler;
+import com.zy.asrs.common.utils.Utils;
+import com.zy.asrs.common.wms.entity.Order;
import com.zy.asrs.common.wms.entity.WaitPakin;
import com.zy.asrs.common.wms.entity.WrkDetl;
import com.zy.asrs.common.wms.entity.WrkMast;
@@ -11,13 +19,13 @@
import com.zy.asrs.wms.task.core.ReturnT;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
+import java.text.SimpleDateFormat;
+import java.util.*;
/**
* Created by vincent on 2020/7/6
@@ -40,6 +48,17 @@
private WaitPakinLogService waitPakinLogService;
@Autowired
private OrderService orderService;
+ @Autowired
+ private OperateLogService operateLogService;
+
+ @Value("${erp.url}")
+ private String ERP_URL;
+
+ @Value("${erp.report}")
+ private String ERP_REPORT;
+
+ @Value("${erp.login}")
+ private String ERP_LOGIN;
// update asr_wrk_mast set inv_wh = 'Y', ove_mk = 'Y' where wrk_no =
@Transactional
@@ -54,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();
}
}
@@ -109,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