From 975823f4d07c91a67162f553be9ff4ac25f3d47d Mon Sep 17 00:00:00 2001
From: czkh <czkh@163.com>
Date: 星期四, 06 十一月 2025 13:41:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/czkhasrs' into czkhasrs
---
src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java b/src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java
index 3763c6e..97217ac 100644
--- a/src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java
+++ b/src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java
@@ -18,6 +18,7 @@
import com.zy.asrs.service.MobileService;
import com.zy.asrs.service.WaitPakinService;
import com.zy.common.web.BaseController;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -28,6 +29,7 @@
import java.util.List;
import java.util.Map;
+@Slf4j
@RequestMapping
@RestController
public class BarcodeMatnrController extends BaseController {
@@ -93,6 +95,8 @@
}
for (MatBarcode matBarcode : list) {
if (!matBarcode.getZpallet().equals(list.get(0).getZpallet())){
+ log.info(matBarcode.getZpallet());
+ log.info(list.get(0).getZpallet());
throw new CoolException("璇烽�夋嫨鐩稿悓鎵樼洏鐮佺殑鏁版嵁");
}
}
@@ -117,7 +121,7 @@
/*缁勬墭
*
* */
- @RequestMapping(value = "/barcodeMatnr/add1/auth")
+ @RequestMapping(value = "/barcodeMatnr/comb/auth")
@ManagerAuth
public R comb(WaitPakin waitPakin) {
Mat mat = matService.selectById(waitPakin.getModiUser());
@@ -142,10 +146,10 @@
/*骞舵澘
*
* */
- @RequestMapping(value = "/barcodeMatnr/add2/auth")
+// @RequestMapping(value = "/barcodeMatnr/clamp/auth")
@ManagerAuth
public R clamp(WaitPakin waitPakin) {
- if (Cools.isEmpty(waitPakin.getBarcode())||Cools.isEmpty(waitPakin.getModiUser())||Cools.isEmpty(waitPakin.getAnfme())){
+ if (Cools.isEmpty(waitPakin.getBarcode())||Cools.isEmpty(waitPakin.getModiUser())){
return R.error(BaseRes.PARAM);
}
Mat mat = matService.selectById(waitPakin.getModiUser());
@@ -162,11 +166,34 @@
CombParam.CombMat combMat=new CombParam.CombMat();
combMat.setMatnr(mat.getMatnr());
combMat.setMaktx(mat.getMaktx());
- combMat.setAnfme(waitPakin.getAnfme());
+// combMat.setAnfme(waitPakin.getAnfme());
+ combMat.setAnfme(1.0);
combMats.add(combMat);
combParam.setBarcode(waitPakin.getBarcode());
combParam.setCombMats(combMats);
mobileService.adjustNew(combParam, Boolean.TRUE, getUserId());
return R.ok("骞舵澘鎴愬姛");
}
+
+ /*鎵归噺骞舵澘*/
+ @RequestMapping(value = "/barcodeMatnr/clamp/auth")
+ @ManagerAuth
+ public R clamp2(@RequestBody List<MatBarcode> list){
+ if (Cools.isEmpty(list)){
+ return R.error(BaseRes.PARAM);
+ }
+ for (MatBarcode matBarcode : list) {
+ MobileAdjustParam combParam=new MobileAdjustParam();
+ ArrayList<CombParam.CombMat> combMats=new ArrayList<>();
+ CombParam.CombMat combMat=new CombParam.CombMat();
+ combMat.setMatnr(matBarcode.getMatnr());
+ combMat.setMaktx(matBarcode.getMaktx());
+ combMat.setAnfme(1.0);
+ combMats.add(combMat);
+ combParam.setBarcode(matBarcode.getZpallet());
+ combParam.setCombMats(combMats);
+ mobileService.adjustNew(combParam, Boolean.TRUE, getUserId());
+ }
+ return R.ok("骞舵澘鎴愬姛");
+ }
}
--
Gitblit v1.9.1