From 9d2d7c23cea8d50716b4bf1272557001ee7874f5 Mon Sep 17 00:00:00 2001
From: czkh <czkh@163.com>
Date: 星期一, 03 十一月 2025 18:02:58 +0800
Subject: [PATCH] 调试
---
src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java b/src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java
index f2d345f..005327a 100644
--- a/src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java
+++ b/src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java
@@ -16,7 +16,9 @@
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.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;
@@ -27,6 +29,7 @@
import java.util.List;
import java.util.Map;
+@Slf4j
@RequestMapping
@RestController
public class BarcodeMatnrController extends BaseController {
@@ -36,6 +39,8 @@
private MobileService mobileService;
@Autowired
private MatService matService;
+ @Autowired
+ private WaitPakinService waitPakinService;
/*
* 鐗╂枡鎵樼洏缁戝畾鍒嗛〉鏌ヨ
* */
@@ -77,6 +82,27 @@
public R matnrLostBarcode(@RequestBody List<MatBarcode> list) {
matBarcodeService.deleteMatBarcode(list);
return R.ok();
+ }
+
+ /*
+ * 鎵归噺缁勬墭
+ * */
+ @RequestMapping("/barcodeMatnr/matnrAndBarcode")
+ @ManagerAuth(memo = "鐗╂枡鎵樼洏鎵归噺缁勬墭")
+ public R matnrAndBarcode(@RequestBody List<MatBarcode> list) {
+ if (Cools.isEmpty(list)){
+ return R.error(BaseRes.PARAM);
+ }
+ 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("璇烽�夋嫨鐩稿悓鎵樼洏鐮佺殑鏁版嵁");
+ }
+ }
+ waitPakinService.comb(list);
+ return R.ok("缁勬墭鎴愬姛");
+
}
/*鐗╂枡鎵樼洏缁戝畾
@@ -123,7 +149,7 @@
@RequestMapping(value = "/barcodeMatnr/add2/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());
@@ -140,7 +166,8 @@
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);
--
Gitblit v1.9.1