From 1f7f8e0b0708036dc3b8266ac4d1b48da31df816 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期五, 10 三月 2023 10:02:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 21 ++++++++++++---------
src/main/java/com/zy/common/web/WcsController.java | 2 +-
2 files changed, 13 insertions(+), 10 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 a1edd89..ff87a2b 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,11 @@
if (Cools.isEmpty(param.getCombMats()) && Cools.isEmpty(param.getProductCode())) {
throw new CoolException(BaseRes.PARAM);
}
- int count = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
+ int waitPakinCount = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
eq("zpallet", param.getBarcode()).eq("io_status", "N"));
- if (count > 0) {
+ 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())) {
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 8330c69..a105620 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -72,7 +72,7 @@
//鍒ゆ柇鏄惁鏈夊叆搴撳姩浣� "N"娌℃湁 鈥淵鈥濇湁
// interData.getFQty().compareTo(waitPakin.getAnfme())
Double userQty = waitPakin.getNqty() - waitPakin.getAnfme(); //閫氱煡鍏ュ簱閲� - 绛夊緟鍏ュ簱閲� = 宸插畬鎴愬叆搴撴暟閲�; 淇敼鏁伴噺涓嶈兘灏忎簬宸插畬鎴愭暟閲�
- if (waitPakin.getIoStatus().equals("N") && userQty < interData.getFQty().doubleValue() ) {
+ if (waitPakin.getIoStatus().equals("N") && userQty <= interData.getFQty().doubleValue() ) {
//鍒ゆ柇浼犲叆鐨勬暟閲忔槸鍚︿负0鏉ユ墽琛屽垹闄ゆ垨鑰呬慨鏀�
if (interData.getFQty().compareTo(BigDecimal.ZERO) == 0) {
waitPakinService.delete(wrapper);
--
Gitblit v1.9.1