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/MatController.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index 85aceaf..021d4f3 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -10,13 +10,11 @@
import com.core.annotations.ManagerAuth;
import com.core.common.*;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.InOut;
-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;
@@ -45,7 +43,7 @@
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
@Autowired
- private InOutService inOutService;
+ private MatBarcodeService matBarcodeService;
@RequestMapping(value = "/mat/auto/matnr/auth")
public R autoMatnr(){
@@ -141,9 +139,6 @@
if (!matService.insert(mat)) {
throw new CoolException("鍟嗗搧妗ｆ娣诲姞澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
- if (!inOutService.insert(inOut)){
- throw new CoolException("鍟嗗搧淇℃伅娣诲姞澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
return R.ok();
}
@@ -159,6 +154,17 @@
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