From 1667372f02fb00dc76e172b5348c8e75ffb79bb9 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期一, 10 五月 2021 16:58:45 +0800
Subject: [PATCH] 1.盘点出库状态工作任务不进行删除 2.托盘码为空不允许进行盘点出库
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 5 +++++
src/main/resources/mapper/WrkMastMapper.xml | 2 +-
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 7c42b94..445c41a 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -419,6 +419,11 @@
if (null != one) locDetlDtos.add(new LocDetlDto(one, one.getAnfme()));
}
}
+ for (LocDetlDto e: locDetlDtos) {
+ if (Cools.isEmpty(e.getLocDetl().getZpallet())) {
+ throw new CoolException("鎵樼洏鐮佷负绌轰笉鍏佽鐩樼偣,搴撲綅鍙�" + e.getLocDetl().getLocNo());
+ }
+ }
if (!locDetlDtos.isEmpty()) {
// 鍚姩鍑哄簱寮�濮� 107.鐩樼偣鍑哄簱
stockOut(staNo, locDetlDtos, 107, userId);
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index ee48a59..28089c4 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -68,7 +68,7 @@
<select id="selectToBeHistoryData" resultMap="BaseResultMap">
select * from asr_wrk_mast
- where wrk_sts=5
+ where wrk_sts=5 and io_type != 107
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