From 035eb4ea58c56ae748b10e4121fc907aa9de62ea Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期一, 30 九月 2024 08:17:23 +0800
Subject: [PATCH] *
---
src/main/resources/mapper/LocDetlMapper.xml | 2 +-
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 11 +++++++++++
2 files changed, 12 insertions(+), 1 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 b8c8370..5e1263d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -655,6 +655,10 @@
if (wrkMast.getWrkSts() != 14L) {
throw new CoolException("褰撳墠鎵樼洏鍑哄簱鏈畬鎴愶紒");
}
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("barcode", param.getBarcode()));
+ if (locMast.getFullPlt().equals("Y")) {
+ throw new CoolException("褰撳墠鎵樼洏宸叉弧锛�");
+ }
//璁剧疆闈瀗ull鎵瑰彿锛�
for (CombParam.CombMat combMat : param.getCombMats()) {
@@ -662,6 +666,13 @@
combMat.setBatch("");
}
}
+ if (param.getIsFull().equals("1")) {
+ wrkMast.setFullPlt("Y");
+ wrkMastService.updateById(wrkMast);
+ locMast.setFullPlt("Y");
+ locMastService.updateById(locMast);
+ }
+
Date now = new Date();
for (CombParam.CombMat combMat : param.getCombMats()) {
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index e7c7395..6760b7c 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -301,7 +301,7 @@
<!-- and (a.batch IS NULL OR a.batch = '')-->
<!-- </otherwise>-->
<!-- </choose>-->
- <if test="batch != null">
+ <if test="batch != null and batch != ''">
and a.batch = #{batch}
</if>
<if test="orderNo != null and orderNo != ''">
--
Gitblit v1.9.1