From aa360de4381100150d34a469ecc087a78cf1720e Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期三, 03 十二月 2025 16:44:10 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/controller/MatController.java | 34 +++++++++-------------------------
1 files changed, 9 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index 35c113e..021d4f3 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -43,8 +43,6 @@
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
@Autowired
- private InOutService inOutService;
- @Autowired
private MatBarcodeService matBarcodeService;
@RequestMapping(value = "/mat/auto/matnr/auth")
@@ -141,9 +139,6 @@
if (!matService.insert(mat)) {
throw new CoolException("鍟嗗搧妗ｆ娣诲姞澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
- if (!inOutService.insert(inOut)){
- throw new CoolException("鍟嗗搧淇℃伅娣诲姞澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
return R.ok();
}
@@ -153,33 +148,22 @@
if (Cools.isEmpty(mat) || null==mat.getId()){
return R.error();
}
- if (mat.getColor().equals("姝ｅ父")){
- mat.setColor("鎶ュ簾");
- }else if (mat.getColor().equals("鎶ュ簾")){
- mat.setColor("姝ｅ父");
- }
- InOut inOut = inOutService.selectByMatnr(mat.getMatnr());
- inOut.setMatnr(mat.getMatnr());
- inOut.setMaktx(mat.getMaktx());
- inOut.setColor(mat.getColor());
- inOut.setSpecs(mat.getSpecs());
mat.setUpdateBy(getUserId());
mat.setUpdateTime(new Date());
matService.updateById(mat);
- inOutService.updateById(inOut);
return R.ok();
}
/*鐗╂枡鎵樼洏缁戝畾*/
-// @RequestMapping(value = "/mat/barcode/auth")
-// @ManagerAuth
-// public R addBarcodeMatnr(Mat mat) {
-// if (Cools.isEmpty(mat.getUnit())){
-// return R.error(BaseRes.PARAM);
-// }
-// matBarcodeService.addBarcodeMatnrTwo(mat);
-// return R.ok();
-// }
+ @RequestMapping(value = "/mat/barcode/auth")
+ @ManagerAuth
+ public R addBarcodeMatnr(Mat mat) {
+ if (Cools.isEmpty(mat.getUnit())){
+ return R.error(BaseRes.PARAM);
+ }
+ matBarcodeService.addBarcodeMatnrTwo(mat);
+ return R.ok();
+ }
@RequestMapping(value = "/mat/delete/auth")
@ManagerAuth
--
Gitblit v1.9.1