From 3db6c2d4a320891666b55780595b6793667342fd Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 08 三月 2024 14:48:54 +0800
Subject: [PATCH] 添加牌号作为唯一物料的筛选条件
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 10 +++++-----
1 files changed, 5 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 2c01801..a86628f 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -1207,13 +1207,13 @@
}
@Override
- public void plaPakin(String locNo, String batch, Integer packageNo,User user) {
- Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo);
+ public void plaPakin(String brand, String locNo, String batch, Integer packageNo, User user) {
+ Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo,brand);
if(Cools.isEmpty(pla)){
throw new CoolException("绯荤粺鏈娴嬪埌璇ュ寘鐗╂枡淇℃伅锛岃閲嶆柊褰曞叆");
}
- if(!pla.getStatus().equals(GlobleParameter.PLA_STATUS_0)){
+ if(!pla.getStatus().equals(GlobleParameter.PLA_STATUS_0) && !pla.getStatus().equals(GlobleParameter.PLA_STATUS_00)){
throw new CoolException("璇ョ墿鏂欑姸鎬佷笉涓哄緟鍏ュ簱锛屾棤娉曞叆搴�");
}
@@ -1236,8 +1236,8 @@
@Override
@Transactional
- public void plaPakout(String locNo, String batch, Integer packageNo, String orderNo, String orderDetlId, String wrkNo, Double anfme) {
- Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo);
+ public void plaPakout(String brand, String locNo, String batch, Integer packageNo, String orderNo, String orderDetlId, String wrkNo, Double anfme) {
+ Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo,brand);
ManPakOut manPakOut = manPakOutService.selectById(wrkNo);
--
Gitblit v1.9.1