From c5c87aa1ab21cfcca762c93f61d03026372b63c8 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 04 十一月 2025 15:39:53 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/utils/CodeDetectionUtil.java | 46 ++++++++++++++++++++++++++++++++++++++++++++++
src/main/java/com/zy/asrs/controller/BasCrnpController.java | 8 ++++++++
2 files changed, 54 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasCrnpController.java b/src/main/java/com/zy/asrs/controller/BasCrnpController.java
index 5d7a53b..8be3d09 100644
--- a/src/main/java/com/zy/asrs/controller/BasCrnpController.java
+++ b/src/main/java/com/zy/asrs/controller/BasCrnpController.java
@@ -13,6 +13,8 @@
import com.zy.asrs.entity.BasCrnp;
import com.zy.asrs.entity.param.BasCrnpParam;
import com.zy.asrs.service.BasCrnpService;
+import com.zy.asrs.service.impl.LocMastServiceImpl;
+import com.zy.asrs.utils.CodeDetectionUtil;
import com.zy.common.web.BaseController;
import com.zy.core.CrnThread;
import com.zy.core.cache.CrnErrCache;
@@ -129,6 +131,12 @@
return R.error("杈撳叆娴嬭瘯搴撲綅鍒楄〃鏁伴噺涓嶅尮閰�").add("杈撳叆娴嬭瘯搴撲綅鍒楄〃鏁伴噺涓嶅尮閰�");
}
basCrnpParam.setLocMastDemoList(new ArrayList<>(Arrays.asList(split)));
+ for (String locNo : basCrnpParam.getLocMastDemoList()){
+ boolean locNoDetection = CodeDetectionUtil.locNoDetection(locNo);
+ if (!locNoDetection){
+ return R.error("杈撳叆娴嬭瘯搴撲綅寮傚父").add("杈撳叆娴嬭瘯搴撲綅寮傚父");
+ }
+ }
}
if (Cools.isEmpty(basCrnpParam.getStaOutDemo())){
diff --git a/src/main/java/com/zy/asrs/utils/CodeDetectionUtil.java b/src/main/java/com/zy/asrs/utils/CodeDetectionUtil.java
new file mode 100644
index 0000000..96a5f4b
--- /dev/null
+++ b/src/main/java/com/zy/asrs/utils/CodeDetectionUtil.java
@@ -0,0 +1,46 @@
+package com.zy.asrs.utils;
+
+import java.util.regex.Pattern;
+
+public class CodeDetectionUtil {
+
+ /**
+ * 妫�娴嬭揣鏋剁爜
+ */
+ public static boolean barcodeDetection(String barcode){
+ Pattern pattern = Pattern.compile("\\d{8}");//8浣嶆暟瀛�
+ return pattern.matcher(barcode).matches();
+ }
+
+ /**
+ * 妫�娴嬭揣鏋剁爜
+ */
+ public static boolean locNoDetection(String locNo){
+ Pattern pattern = Pattern.compile("\\d{7}");//8浣嶆暟瀛�
+ return pattern.matcher(locNo).matches();
+ }
+
+ /**
+ * 妫�娴嬪皬杞﹀湴鐮�
+ */
+ public static boolean carCodeDetection(String carCode){
+ return carCode.contains("_");
+ }
+
+ public static void main(String[] args) {
+ System.out.println("barcodeDetection:"+"22222222===>"+barcodeDetection("22222222"));
+ System.out.println("barcodeDetection:"+"222222===>"+barcodeDetection("222222"));
+ System.out.println("barcodeDetection:"+"111===>"+barcodeDetection("111"));
+ System.out.println("barcodeDetection:"+"DB_123ss===>"+barcodeDetection("DB_123ss"));
+ System.out.println("barcodeDetection:"+"12_1231===>"+barcodeDetection("12_1231"));
+ System.out.println("barcodeDetection:"+"DB_123456===>"+barcodeDetection("DB_123456"));
+
+ System.out.println("carCodeDetection:"+"22222222===>"+carCodeDetection("22222222"));
+ System.out.println("carCodeDetection:"+"222222===>"+carCodeDetection("222222"));
+ System.out.println("carCodeDetection:"+"111===>"+carCodeDetection("111"));
+ System.out.println("carCodeDetection:"+"DB_123ss===>"+carCodeDetection("DB_123ss"));
+ System.out.println("carCodeDetection:"+"12_1231===>"+carCodeDetection("12_1231"));
+ System.out.println("carCodeDetection:"+"DB_123456===>"+carCodeDetection("DB_123456"));
+ }
+
+}
--
Gitblit v1.9.1