From 6e24a8fe9a57687842413933ce891bebb5693649 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 17 十一月 2023 16:52:52 +0800
Subject: [PATCH] Merge branch 'tzskasrs' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 insertions(+), 0 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 9ddf167..801d692 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -86,6 +86,45 @@
throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
}
+ //鍒ゆ柇鎵樼洏鏄惁宸茬粡鍦ㄥ簱
+ if (locDetlService.selectCount(new EntityWrapper<LocDetl>()
+ .eq("zpallet", param.getBarcode())) > 0) {
+ throw new CoolException(param.getBarcode() + "鏁版嵁宸茬粡鍦ㄥ簱");
+ }
+
+ //鍒ゆ柇鏄惁瀛樺湪鏂欑鐮� => 瀛樺湪鏂欑鐮佸垯瑕佹眰鎻愪氦涓婃潵鐨勭墿鏂檒ist蹇呴』鍏ㄩ儴閮芥湁鏂欑鐮�
+ boolean hasContainerCode = false;
+ int containerCodeCount = 0;//鏂欑鐮佹暟閲�
+ for (CombParam.CombMat combMat : param.getCombMats()) {
+ if (combMat.getContainerCode() != null) {
+ hasContainerCode = true;
+ containerCodeCount++;
+ continue;
+ }
+ }
+
+ //鍒ゆ柇鏂欑鏄惁宸茬粡鍑虹幇鍦ㄥ叆搴撻�氱煡妗ｃ�佸簱瀛樹腑
+ if (hasContainerCode) {
+ if (containerCodeCount != param.getCombMats().size()) {
+ throw new CoolException(param.getBarcode() + "鎵樼洏鏈�" + (param.getCombMats().size()-containerCodeCount) + "涓湭鎵弿鐨勬枡绠�");
+ }
+
+ for (CombParam.CombMat combMat : param.getCombMats()) {
+ //鍒ゆ柇鏂欑鏄惁姝ｅ湪鍏ュ簱
+ if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
+ eq("supp_code", combMat.getContainerCode()).eq("io_status", "N")) > 0) {
+ throw new CoolException(combMat.getContainerCode() + "鏂欑姝ｅ湪杩涜鍏ュ簱");
+ }
+
+ //鍒ゆ柇鏂欑鏄惁宸茬粡鍦ㄥ簱
+ if (locDetlService.selectCount(new EntityWrapper<LocDetl>()
+ .eq("supp_code", combMat.getContainerCode())) > 0) {
+ throw new CoolException(combMat.getContainerCode() + "鏂欑宸茬粡鍦ㄥ簱");
+ }
+ }
+ }
+
+
// todo: 涓嶄笅绾块噸鏂板叆搴�
WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
if (wrkMast != null && wrkMast.getWrkSts() == 18) {
--
Gitblit v1.9.1