From 02d6a768149f3428583c30fa7caa1ce446d53291 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 18 七月 2023 13:35:37 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 39 ++++++++++++++++++++++++---------------
1 files changed, 24 insertions(+), 15 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 e4c2b59..05e9f89 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -6,16 +6,11 @@
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.BasAgv;
-import com.zy.asrs.entity.MatCode;
-import com.zy.asrs.entity.WaitPakin;
+import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.entity.param.ERPselectParam;
import com.zy.asrs.entity.param.FullStoreParam;
-import com.zy.asrs.service.BasAgvService;
-import com.zy.asrs.service.MatCodeService;
-import com.zy.asrs.service.MobileService;
-import com.zy.asrs.service.WaitPakinService;
+import com.zy.asrs.service.*;
import com.zy.asrs.utils.VersionUtils;
import com.zy.common.model.agv.AgvCommand;
import com.zy.common.model.agv.AgvResult;
@@ -50,6 +45,12 @@
private BasAgvService basAgvService;
@Autowired
private ErpSqlServer erpSqlServer;
+ @Autowired
+ private WrkMastService wrkMastService;
+ @Autowired
+ private LocMastService locMastService;
+ @Autowired
+ private LocDetlService locDetlService;
@Override
@Transactional
@@ -60,9 +61,13 @@
if (Cools.isEmpty(param.getCombMats()) && Cools.isEmpty(param.getProductCode())) {
throw new CoolException(BaseRes.PARAM);
}
- int count = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
- eq("zpallet", param.getBarcode()).eq("io_status", "N"));
- if (count > 0) {
+ int waitPakinCount = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
+ eq("zpallet", param.getBarcode())
+ //.eq("io_status", "N")
+ );
+ int wrkMastCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("barcode", param.getBarcode()));
+ int locDetlCount = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
+ if (waitPakinCount > 0 || wrkMastCount > 0 || locDetlCount > 0) {
throw new CoolException("鏉＄爜鏁版嵁宸插瓨鍦�");
}
if (Cools.isEmpty(param.getBillNo())) {
@@ -82,8 +87,8 @@
waitPakin.setModiUser(userId);
waitPakin.setModiTime(new Date());
VersionUtils.setWaitPakIn(waitPakin, matCode);
- waitPakin.setMatnr(matCode.getMatNo()+"|"+combMat.getMnemonic()); //浜у搧缂栫爜|鐢熶骇鍗曞彿
- waitPakin.setBname(matCode.getMatNo());
+// waitPakin.setMatnr(matCode.getMatNo()+"|"+combMat.getMnemonic()); //浜у搧缂栫爜|鐢熶骇鍗曞彿
+// waitPakin.setBname(matCode.getMatNo());
// 濡傛灉鐢熸垚鍗曞彿涓嶄负绌烘彃鍏ョ敓浜у崟鍙�
if (!Cools.isEmpty(combMat.getMnemonic())) {
waitPakin.setMnemonic(combMat.getMnemonic());
@@ -279,9 +284,13 @@
if (Cools.isEmpty(param.getCombMats()) && Cools.isEmpty(param.getProductCode())) {
throw new CoolException(BaseRes.PARAM);
}
- int count = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
- eq("zpallet", param.getBarcode()).eq("io_status", "N"));
- if (count > 0) {
+ int waitPakinCount = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
+ eq("zpallet", param.getBarcode())
+ //.eq("io_status", "N")
+ );
+ int wrkMastCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("barcode", param.getBarcode()));
+ int locDetlCount = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
+ if (waitPakinCount > 0 || wrkMastCount > 0 || locDetlCount > 0) {
throw new CoolException("鏉＄爜鏁版嵁宸插瓨鍦�");
}
// 鍏宠仈閫氱煡鍗曠粍鎵�
--
Gitblit v1.9.1