From db11805d2209fd37b24037fce159c7d5a39d8177 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期六, 20 十二月 2025 14:40:41 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 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..36905b9 100644
--- a/src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java
+++ b/src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java
@@ -11,12 +11,10 @@
import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.MatBarcode;
import com.zy.asrs.entity.WaitPakin;
+import com.zy.asrs.entity.WrkMast;
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 +39,8 @@
private MatService matService;
@Autowired
private WaitPakinService waitPakinService;
+ @Autowired
+ private WrkMastService wrkMastService;
/*
* 鐗╂枡鎵樼洏缁戝畾鍒嗛〉鏌ヨ
@@ -173,7 +173,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 +185,16 @@
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("鎵樼洏瀵瑰簲宸ヤ綔妗ｆ湭瀹屾垚");
+ }
MobileAdjustParam combParam = new MobileAdjustParam();
ArrayList<CombParam.CombMat> combMats = new ArrayList<>();
CombParam.CombMat combMat = new CombParam.CombMat();
@@ -194,7 +204,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