From 1cc361ec5fca7550ba01f0a6ecf058e84a5a20ad Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期六, 18 十月 2025 16:25:18 +0800
Subject: [PATCH] 联调
---
src/main/java/com/zy/asrs/controller/MatController.java | 43 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 39 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index 11edc8d..35c113e 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -10,11 +10,11 @@
import com.core.annotations.ManagerAuth;
import com.core.common.*;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.Mat;
-import com.zy.asrs.entity.MatPrint;
-import com.zy.asrs.entity.OrderDetl;
+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,6 +42,10 @@
private MatService matService;
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
+ @Autowired
+ private InOutService inOutService;
+ @Autowired
+ private MatBarcodeService matBarcodeService;
@RequestMapping(value = "/mat/auto/matnr/auth")
public R autoMatnr(){
@@ -123,13 +127,22 @@
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("娣诲姞澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ throw new CoolException("鍟嗗搧妗ｆ娣诲姞澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+ if (!inOutService.insert(inOut)){
+ throw new CoolException("鍟嗗搧淇℃伅娣诲姞澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
return R.ok();
}
@@ -140,12 +153,34 @@
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/delete/auth")
@ManagerAuth
public R delete(@RequestParam String param){
--
Gitblit v1.9.1