From 4e46937e6311840fd3a146e77bca36908f2d914e Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期一, 12 一月 2026 15:39:10 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/controller/MatController.java | 39 +--------------------------------------
1 files changed, 1 insertions(+), 38 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index 06d4717..ac6984f 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -11,10 +11,7 @@
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.entity.result.KeyValueVo;
-import com.zy.asrs.service.InOutService;
-import com.zy.asrs.service.MatBarcodeService;
import com.zy.asrs.service.MatService;
import com.zy.asrs.utils.MatExcelListener;
import com.zy.common.CodeRes;
@@ -42,10 +39,7 @@
private MatService matService;
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
- @Autowired
- private InOutService inOutService;
- @Autowired
- private MatBarcodeService matBarcodeService;
+
@RequestMapping(value = "/mat/auto/matnr/auth")
public R autoMatnr(){
@@ -127,22 +121,13 @@
return R.error("缂栧彿宸插瓨鍦�");
}
Date now = new Date();
- InOut inOut=new InOut();
mat.setCreateBy(getUserId());
mat.setCreateTime(now);
mat.setUpdateBy(getUserId());
mat.setUpdateTime(now);
mat.setStatus(1);
- inOut.setMatnr(mat.getMatnr());
- inOut.setMaktx(mat.getMaktx());
- inOut.setColor(mat.getColor());
- inOut.setSpecs(mat.getSpecs());
- inOut.setTemp1("");
if (!matService.insert(mat)) {
throw new CoolException("鍟嗗搧妗ｆ娣诲姞澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
- if (!inOutService.insert(inOut)){
- throw new CoolException("鍟嗗搧淇℃伅娣诲姞澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
return R.ok();
}
@@ -153,31 +138,9 @@
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();
}
--
Gitblit v1.9.1