From 1138d68ff11124f87b8d9e5e0bba1c6d600902ab Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期四, 23 十月 2025 12:40:14 +0800
Subject: [PATCH] 组托调整
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 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 fbc865f..e842505 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -4,10 +4,7 @@
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.LocDetl;
-import com.zy.asrs.entity.MatCode;
-import com.zy.asrs.entity.PltBarcode;
-import com.zy.asrs.entity.WrkDetl;
+import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.service.*;
import com.zy.ints.entity.WaitMatin;
@@ -39,6 +36,8 @@
private WrkDetlService wrkDetlService;
@Autowired
private PltBarcodeService pltBarcodeService;
+ @Autowired
+ private WrkMastService wrkMastService;
@Override
@Transactional
@@ -51,7 +50,8 @@
int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
int countPlt = pltBarcodeService.selectCount(new EntityWrapper<PltBarcode>().eq("barcode",param.getBarcode()));
- if (countPlt > 0 || countLoc > 0 || countWrk > 0) {
+ WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
+ if (countPlt > 0 || countLoc > 0 || (countWrk > 0 && wrkMast.getWrkSts() != 15)) {
throw new CoolException("鏉＄爜鏁版嵁宸插瓨鍦�");
}
@@ -106,7 +106,9 @@
pltBarcode.setVendor(combMat.getVendor());
pltBarcode.setSource(combMat.getSource());
pltBarcode.setQtyBox(matCode.getStr6());
- pltBarcode.setMemo(combMat.getMemo());
+ pltBarcode.setStr3(matCode.getStr3());
+ pltBarcode.setStr4(matCode.getStr4());
+ pltBarcode.setStr5(matCode.getStr5());
if (!pltBarcodeService.insert(pltBarcode)) {
throw new CoolException("淇濆瓨鏁版嵁澶辫触");
}
--
Gitblit v1.9.1