From 64781aac1c41bb8c4dda2deb4dc7ae98cace8315 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 07 十一月 2025 09:08:57 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java b/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
index 4ad604c..5051f60 100644
--- a/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
+++ b/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
@@ -4,10 +4,7 @@
import com.alibaba.excel.event.AnalysisEventListener;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.core.common.BaseRes;
-import com.core.common.Cools;
-import com.core.common.R;
-import com.core.common.SpringUtils;
+import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocMast;
@@ -136,7 +133,7 @@
continue;
// throw new CoolException("绠卞彿锛�"+outLocBoxC[0]+" 鏈煡璇㈠埌鏁版嵁锛侊紒锛�");
}
- if (locDetlSou.getDanger$().equals(outLocBoxC[4])){
+ if (!locDetlSou.getDanger$().equals(outLocBoxC[4])){
sign = false;
errorMsgOrderLoc = errorMsgOrderLoc + "[===銆�" +"绠卞彿锛�"+outLocBoxC[0]+" ==銆嬪嚭搴撹緭鍏ュ緟鍒ょ姸鎬侊細"+outLocBoxC[4]+"銆佸簱瀛樼姸鎬侊細"+locDetlSou.getDanger$()+"銆傜姸鎬佷笉鍖归厤銆�===]";
continue;
@@ -194,7 +191,13 @@
// locDetl.getBatch(),locDetl.getBrand(),locDetl.getBarcode(), outLocBoxC[1],locDetl.getAnfme());
// locDto.setOrigin(locDetl.getOrigin());
// locDto.setWeight(locDetl.getWeight());
- locDetl.setMemo(outLocBoxC[3]);
+
+ if (!Cools.isEmpty(outLocBoxC[3])){
+ String memo = Cools.isEmpty(locDetl.getMemo())? "" : locDetl.getMemo()+"锛�";
+ locDetl.setMemo(memo + DateUtils.convert(new Date(), DateUtils.yyyyMMdd_C)+"鎵嬪姩杈撳叆澶囨敞锛�" + outLocBoxC[3]);
+ } else if (Cools.isEmpty(locDetl.getMemo())){
+ locDetl.setMemo(outLocBoxC[3]);
+ }
LocDto locDto = new LocDto(locDetl);
locDtos.add(locDto);
}
@@ -222,12 +225,14 @@
locDetl.setOrigin(locDto.getOrigin());
locDetl.setWeight(locDto.getWeight());
locDetl.setMemo(locDto.getMemo());
+ locDetl.setDanger(locDto.getDanger());
locDetls.add(locDetl);
}
param.setLocDetls(locDetls);
param.setOrderNo(orderOneNo);
param.setCstmrName(cstmrName);
+ param.setOrderName("鎵嬪姩鍑哄簱鍗�");
if (sign && total>0){
workService.startupFullTakeStoreOrder(param,9999L);
--
Gitblit v1.9.1