From 1c99199ceac9596a30cf0cd4e57d684ac7da7a94 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 25 四月 2025 12:55:15 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/OutpandianBoxExeclListener.java | 89 ++++++++++++++++++++++++++++++++++----------
1 files changed, 68 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/OutpandianBoxExeclListener.java b/src/main/java/com/zy/asrs/utils/OutpandianBoxExeclListener.java
index 790b05d..360a2ac 100644
--- a/src/main/java/com/zy/asrs/utils/OutpandianBoxExeclListener.java
+++ b/src/main/java/com/zy/asrs/utils/OutpandianBoxExeclListener.java
@@ -15,6 +15,8 @@
import com.zy.asrs.service.WorkService;
import com.zy.common.entity.pandianExcel;
import com.zy.common.model.LocDto;
+import com.zy.system.entity.OperateLog;
+import com.zy.system.service.OperateLogService;
import lombok.extern.slf4j.Slf4j;
import java.util.ArrayList;
@@ -26,13 +28,21 @@
private int total = 0;
+ private String errorMsgOrderLoc = "";
private Long userId;
+ private String remoteAddr;
+ private boolean sign = true;
List<String[]> OutLocBoxCs = new ArrayList<>();
public OutpandianBoxExeclListener() {
}
public OutpandianBoxExeclListener(Long userId) {
+ this.userId = userId;
+ }
+
+ public OutpandianBoxExeclListener(String remoteAddr,Long userId) {
+ this.remoteAddr = remoteAddr;
this.userId = userId;
}
@@ -88,23 +98,34 @@
if (!outLocBoxCNew.contains(outLocBoxC[0])){
LocDetl locDetlSou = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("batch", outLocBoxC[0]));
if (Cools.isEmpty(locDetlSou)){
- throw new CoolException("绠卞彿锛�"+outLocBoxC[0]+" 鏈煡璇㈠埌鏁版嵁锛侊紒锛�");
+ sign = false;
+ errorMsgOrderLoc = errorMsgOrderLoc + "[===銆�" +"绠卞彿锛�"+outLocBoxC[0]+" 鏈煡璇㈠埌鏁版嵁锛侊紒锛�"+"銆�===]";
+ continue;
+// throw new CoolException("绠卞彿锛�"+outLocBoxC[0]+" 鏈煡璇㈠埌鏁版嵁锛侊紒锛�");
}
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetlSou.getLocNo()));
if (Cools.isEmpty(locMast)){
- throw new CoolException("绠卞彿锛�"+outLocBoxC[0]+" 鎵�鍦ㄥ簱浣嶄笉婊¤冻鍑哄簱鏉′欢锛侊紒锛佹湭鏌ヨ鍒版绠卞彿鎵�鍦ㄥ簱浣�");
+ sign = false;
+ errorMsgOrderLoc = errorMsgOrderLoc + "[===銆�" +"绠卞彿锛�"+outLocBoxC[0]+" 鎵�鍦ㄥ簱浣嶄笉婊¤冻鍑哄簱鏉′欢锛侊紒锛佹湭鏌ヨ鍒版绠卞彿鎵�鍦ㄥ簱浣�"+"銆�===]";
+ continue;
+// throw new CoolException("绠卞彿锛�"+outLocBoxC[0]+" 鎵�鍦ㄥ簱浣嶄笉婊¤冻鍑哄簱鏉′欢锛侊紒锛佹湭鏌ヨ鍒版绠卞彿鎵�鍦ㄥ簱浣�");
}
if (!locMast.getLocSts().equals("F")){
- throw new CoolException("绠卞彿锛�"+outLocBoxC[0]+" 鎵�鍦ㄥ簱浣嶄笉婊¤冻鍑哄簱鏉′欢锛侊紒锛佸簱浣嶇姸鎬佷笉涓篎锛侊紒锛佸簱浣嶇姸鎬侊細"+locMast.getLocSts$());
+ sign = false;
+ errorMsgOrderLoc = errorMsgOrderLoc + "[===銆�" +"绠卞彿锛�"+outLocBoxC[0]+" 鎵�鍦ㄥ簱浣嶄笉婊¤冻鍑哄簱鏉′欢锛侊紒锛佸簱浣嶇姸鎬佷笉涓篎锛侊紒锛佸簱浣嶇姸鎬侊細"+locMast.getLocSts$()+"銆�===]";
+ continue;
+// throw new CoolException("绠卞彿锛�"+outLocBoxC[0]+" 鎵�鍦ㄥ簱浣嶄笉婊¤冻鍑哄簱鏉′欢锛侊紒锛佸簱浣嶇姸鎬佷笉涓篎锛侊紒锛佸簱浣嶇姸鎬侊細"+locMast.getLocSts$());
}
- List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
- .eq("loc_no", locDetlSou.getLocNo()).eq("origin", locDetlSou.getOrigin()));
- for (LocDetl locDetl:locDetls){
- total++;
- String[] locDetlNow=new String[2];
- locDetlNow[0] = locDetl.getBatch();
- outLocBoxCList.add(locDetlNow);
- outLocBoxCNew.add(outLocBoxC[0]);
+ if (sign){
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
+ .eq("loc_no", locDetlSou.getLocNo()).eq("origin", locDetlSou.getOrigin()));
+ for (LocDetl locDetl:locDetls){
+ total++;
+ String[] locDetlNow=new String[2];
+ locDetlNow[0] = locDetl.getBatch();
+ outLocBoxCList.add(locDetlNow);
+ outLocBoxCNew.add(outLocBoxC[0]);
+ }
}
}
}
@@ -151,17 +172,35 @@
locDetls122.add(locDetl);
}
}
- StockOutParam param122 = new StockOutParam();
- param122.setOutSite(122);
- param122.setLocDetls(locDetls122);
- if (total>0 && locDetls122.size()>0){
- workService.locCheckOut(param122,9999L);
+ if (sign){
+ StockOutParam param122 = new StockOutParam();
+ param122.setOutSite(122);
+ param122.setLocDetls(locDetls122);
+
+ if (total>0 && locDetls122.size()>0){
+ workService.locCheckOut(param122,9999L);
+ }
+
+ StockOutParam param171 = new StockOutParam();
+ param171.setOutSite(171);
+ param171.setLocDetls(locDetls171);
+ if (total>0 && locDetls171.size()>0){
+ workService.locCheckOut(param171,9999L);
+ }
}
- StockOutParam param171 = new StockOutParam();
- param171.setOutSite(171);
- param171.setLocDetls(locDetls171);
- if (total>0 && locDetls171.size()>0){
- workService.locCheckOut(param171,9999L);
+
+ try {
+ OperateLogService operateLogService = SpringUtils.getBean(OperateLogService.class);
+ // 璁板綍鎿嶄綔鏃ュ織
+ OperateLog operateLog = new OperateLog();
+ operateLog.setAction("瀵煎叆绠卞彿鎵归噺鐩樼偣鍑哄簱");
+ operateLog.setIp(remoteAddr);
+ operateLog.setUserId(userId);
+ operateLog.setRequest("");
+ operateLog.setResponse(errorMsgOrderLoc.equals("")? "姝ｅ父" : (sign && total>0)? "鎴愬姛:"+errorMsgOrderLoc : "澶辫触:"+errorMsgOrderLoc);
+ operateLogService.insert(operateLog);
+ } catch (Exception e){
+ log.error("璁板綍鎿嶄綔鏃ュ織澶辫触锛�"+e.getMessage());
}
}
@@ -172,4 +211,12 @@
return total;
}
+ public boolean getSign() {
+ return sign;
+ }
+
+ public String getErrorMsgOrderLoc() {
+ return errorMsgOrderLoc;
+ }
+
}
--
Gitblit v1.9.1