From 975823f4d07c91a67162f553be9ff4ac25f3d47d Mon Sep 17 00:00:00 2001
From: czkh <czkh@163.com>
Date: 星期四, 06 十一月 2025 13:41:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/czkhasrs' into czkhasrs
---
src/main/java/com/zy/asrs/controller/MatController.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 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..b62d89b 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -171,15 +171,21 @@
}
/*鐗╂枡鎵樼洏缁戝畾*/
-// @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);
+ }
+ if (!mat.getUnit().startsWith("6")&&!mat.getUnit().startsWith("7")&&!mat.getUnit().startsWith("8")){
+ throw new CoolException("鎵樼洏鐮侀浣嶄笉绗﹀悎瑙勮寖");
+ }
+ if (mat.getUnit().length()!= 8){
+ throw new CoolException("鎵樼洏鐮佷笉鏄叓浣嶏紝璇锋鏌�");
+ }
+ matBarcodeService.addBarcodeMatnrTwo(mat);
+ return R.ok();
+ }
@RequestMapping(value = "/mat/delete/auth")
@ManagerAuth
--
Gitblit v1.9.1