From 57e7846403cd3c72cc70e17e205c4e0d8b3aa404 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期二, 04 十一月 2025 10:10:53 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java | 15 ++-------------
1 files changed, 2 insertions(+), 13 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..436216e 100644
--- a/src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java
+++ b/src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java
@@ -120,18 +120,6 @@
@RequestMapping(value = "/barcodeMatnr/add1/auth")
@ManagerAuth
public R comb(WaitPakin waitPakin) {
- Mat mat = matService.selectById(waitPakin.getModiUser());
- MatBarcode matBarcode = matBarcodeService.selectbyMatnr(mat.getMatnr());
- if (matBarcode == null){
- throw new CoolException("璇ョ墿鏂欐湭涓庢墭鐩樼粦瀹�");
- }else {
- if (!matBarcode.getZpallet().equals(waitPakin.getBarcode())){
- throw new CoolException("璇ョ墿鏂欎笌鍏朵粬鎵樼洏缁戝畾锛屼笉鑳戒笌褰撳墠鎵樼洏"+waitPakin.getBarcode()+"缁戝畾锛屼笌璇ョ墿鏂欑粦瀹氱殑鎵樼洏鏄�"+matBarcode.getZpallet());
- }
- }
- if (mat.getColor().equals("鎶ュ簾")){
- throw new CoolException("璇ョ墿鏂欏凡鎶ュ簾锛岃鍕跨粦瀹�");
- }
if (Cools.isEmpty(waitPakin.getBarcode())||Cools.isEmpty(waitPakin.getModiUser())||Cools.isEmpty(waitPakin.getAnfme())){
return R.error(BaseRes.PARAM);
}
@@ -162,7 +150,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