From da13bea76b64183790ab17775f04d43d8c7f6607 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期五, 26 十二月 2025 14:36:44 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java | 46 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 36 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java b/src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java
index 6998cf0..f3aa230 100644
--- a/src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java
+++ b/src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java
@@ -8,15 +8,10 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.Mat;
-import com.zy.asrs.entity.MatBarcode;
-import com.zy.asrs.entity.WaitPakin;
+import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.entity.param.MobileAdjustParam;
-import com.zy.asrs.service.MatBarcodeService;
-import com.zy.asrs.service.MatService;
-import com.zy.asrs.service.MobileService;
-import com.zy.asrs.service.WaitPakinService;
+import com.zy.asrs.service.*;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -41,6 +36,12 @@
private MatService matService;
@Autowired
private WaitPakinService waitPakinService;
+ @Autowired
+ private WrkMastService wrkMastService;
+ @Autowired
+ private WrkDetlService wrkDetlService;
+ @Autowired
+ private LocDetlService locDetlService;
/*
* 鐗╂枡鎵樼洏缁戝畾鍒嗛〉鏌ヨ
@@ -123,7 +124,7 @@
/*缁勬墭
*
* */
- @RequestMapping(value = "/barcodeMatnr/comb/auth")
+// @RequestMapping(value = "/barcodeMatnr/comb/auth")
@ManagerAuth
public R comb(WaitPakin waitPakin) {
Mat mat = matService.selectById(waitPakin.getModiUser());
@@ -173,7 +174,7 @@
combMats.add(combMat);
combParam.setBarcode(waitPakin.getBarcode());
combParam.setCombMats(combMats);
- mobileService.adjustNew(combParam, Boolean.TRUE, getUserId());
+// mobileService.adjustNew(combParam, Boolean.TRUE, getUserId());
return R.ok("骞舵澘鎴愬姛");
}
@@ -185,6 +186,31 @@
return R.error(BaseRes.PARAM);
}
for (MatBarcode matBarcode : list) {
+ WrkMast wrkMast = wrkMastService.selectByBarcode(matBarcode.getZpallet());
+ if (wrkMast == null){
+ return R.error("鎵樼洏娌℃湁瀵瑰簲宸ヤ綔妗�");
+ }
+ if (wrkMast.getIoType() != 104){
+ return R.error("鎵樼洏瀵瑰簲宸ヤ綔妗ｄ笉鏄苟鏉垮嚭搴�");
+ }
+ if (wrkMast.getWrkSts() != 14){
+ return R.error("鎵樼洏瀵瑰簲宸ヤ綔妗ｆ湭瀹屾垚");
+ }
+ //瀵逛簬宸茬粡缁勬墭杩囩殑 妯″叿 涓嶅厑璁稿啀娆″苟鏉�
+ Integer waitPakinCount = waitPakinService.selectByBarcodeAndMatnr(matBarcode.getMatnr());
+ if (waitPakinCount >= 1){
+ throw new CoolException("璇ユā鍏峰凡缁忕粍鎵�,鍟嗗搧妯″叿鍚嶇О:" + matBarcode.getMatnr());
+ }
+ //瀵逛簬宸茬粡鏈夊簱瀛樼殑妯″叿 涓嶅厑璁稿啀娆″苟鏉�
+ List<LocDetl> locDetlList = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("matnr", matBarcode.getMatnr()));
+ if (!Cools.isEmpty(locDetlList)) {
+ throw new CoolException("璇ユā鍏峰凡缁忓叆搴�,鍟嗗搧妯″叿鍚嶇О:" + matBarcode.getMatnr());
+ }
+ //瀵逛簬宸茬粡鏈夊伐浣滄。鐨勬ā鍏� 涓嶅厑璁稿啀娆″苟鏉�
+ List<WrkDetl> wrkDetlList = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("matnr", matBarcode.getMatnr()));
+ if (!Cools.isEmpty(wrkDetlList)) {
+ throw new CoolException("璇ユā鍏峰凡缁忓瓨鍦ㄥ伐浣滄。,鍟嗗搧妯″叿鍚嶇О:" + matBarcode.getMatnr());
+ }
MobileAdjustParam combParam = new MobileAdjustParam();
ArrayList<CombParam.CombMat> combMats = new ArrayList<>();
CombParam.CombMat combMat = new CombParam.CombMat();
@@ -194,7 +220,7 @@
combMats.add(combMat);
combParam.setBarcode(matBarcode.getZpallet());
combParam.setCombMats(combMats);
- mobileService.adjustNew(combParam, Boolean.TRUE, getUserId());
+ mobileService.adjustNew(combParam, Boolean.TRUE, getUserId(),matBarcode);
}
return R.ok("骞舵澘鎴愬姛");
}
--
Gitblit v1.9.1