From 33bb76ef6f6f3262624fe84e9b99b08a06c94d08 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期五, 26 一月 2024 10:08:07 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/WrkMastMapper.xml | 4 +++-
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 2 --
src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java | 8 ++++++--
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index cfe070e..3df51be 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -467,8 +467,6 @@
throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細姣涢噸 roughWeight涓虹┖");
}else if (Cools.isEmpty(matList.getRollExtent()) || matList.getRollExtent().equals(0D)){
throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細鍗烽暱搴� rollExtent涓虹┖");
- }else if (Cools.isEmpty(matList.getJoint()) || matList.getJoint()==0){
- throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細鎺ュご joint涓虹┖");
}
if (matList.getPosition().equals("1")){//1銆佸乏 2銆佸彸
diff --git a/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java b/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
index d78fcbe..fa007b5 100644
--- a/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
+++ b/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
@@ -90,11 +90,16 @@
List<String[]> outLocBoxCList = new ArrayList<>();
List<String> outLocBoxCNew = new ArrayList<>();
for (String[] outLocBoxC:OutLocBoxCs){
+ total--;
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]+" 鏈煡璇㈠埌鏁版嵁锛侊紒锛�");
+ }
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();
locDetlNow[1] = outLocBoxC[1];
@@ -143,8 +148,7 @@
}
-
- log.info("瀵煎叆{}鏉＄鍙凤紒", total);
+ log.info("鍑哄簱{}鏉＄鍙凤紒", total);
}
public int getTotal() {
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 8eaef99..124b3c6 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -69,7 +69,9 @@
<select id="selectToBeHistoryData" resultMap="BaseResultMap">
select * from asr_wrk_mast
where wrk_sts=5
- or wrk_sts=44 or wrk_sts=57 or wrk_sts=64
+ or wrk_sts=44
+ or wrk_sts=64
+ or (wrk_sts=57 and wrk_no not in (select wrk_no from asr_bas_devp))
or (wrk_sts=15 and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp))
or (wrk_sts=15 and dateadd(mi,15,crn_end_time) <= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
or (wrk_sts=15 and crn_end_time is null and wrk_no not in (select wrk_no from asr_bas_devp))
--
Gitblit v1.9.1