From ca0d779626a6caccefefda2c6b47704533e26c7b Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期四, 08 六月 2023 17:05:34 +0800
Subject: [PATCH] 正则更新

---
 src/main/java/com/whyc/constant/MaterialNamingStandard.java |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/whyc/constant/MaterialNamingStandard.java b/src/main/java/com/whyc/constant/MaterialNamingStandard.java
index 7f949c8..5066888 100644
--- a/src/main/java/com/whyc/constant/MaterialNamingStandard.java
+++ b/src/main/java/com/whyc/constant/MaterialNamingStandard.java
@@ -15,7 +15,7 @@
     DIODE_TP_0321("璐寸墖-鍙戝厜浜屾瀬绠�","灏佽褰㈠紡-浜屾瀬绠$被鍨�,渚嬪:璐寸墖-鍙戝厜浜屾瀬绠�","璐寸墖-鍙戝厜浜屾瀬绠�","LED_鏉愯川_棰滆壊_灏佽,渚嬪:LED_Gap_NG_0603","LED_"+letters()+"_"+lettersUpCase()+"_"+allWithZhCN()),
     DIODE_CJ_0322("鎻掍欢-鍙戝厜浜屾瀬绠�","灏佽褰㈠紡-浜屾瀬绠$被鍨�,渚嬪:鎻掍欢-鍙戝厜浜屾瀬绠�","鎻掍欢-鍙戝厜浜屾瀬绠�","LED_鏉愯川_棰滆壊_灏哄_褰㈢姸 (鍏朵粬璇存槑),渚嬪:LED_Gap_NG_03D_鍦嗗舰  榛樿鏅�氫寒搴�","LED_"+letters()+"_"+lettersUpCase()+"_"+all()+"_"+zhCN()+"[\\s]*"+allWithZhCN()),
     TRIODE_0331_0332("涓夋瀬绠鏅朵綋绠℃ā鍧�","灏佽褰㈠紡-鍣ㄤ欢绫诲瀷,渚嬪:鎻掍欢涓夋瀬绠�-Mosfet","([\\u4E00-\\u9FA5]+)-"+allWithZhCN1(),"鍨嬪彿缂栫爜-鐢垫祦鐢靛帇-灏佽褰㈠紡,渚嬪:S8550LT1_0.5A40V_TO-92",all()+"_"+num()+lettersLowCase0()+"A"+num()+lettersLowCase0()+"V_"+allWithSymbol1()),
-    IC_CHIP_0341_0342("闆嗘垚鐢佃矾 IC鑺墖","闆嗘垚鐢佃矾-鍣ㄤ欢绫诲瀷,渚嬪:闆嗘垚鐢佃矾-MCU",zhCN0()+"闆嗘垚鐢佃矾-"+allWithZhCN1(),"鍙傜収鍝佺墝鍟嗗畾涔塤灏佽,渚嬪:SST26VF064B-104I/SM_SOIJ5.08",allWithSymbol1()+"_"+allWithSymbol1()),
+    IC_CHIP_0341_0342("闆嗘垚鐢佃矾 IC鑺墖","闆嗘垚鐢佃矾-鍣ㄤ欢绫诲瀷,渚嬪:闆嗘垚鐢佃矾-MCU",zhCN0()+"闆嗘垚鐢佃矾-"+allWithZhCN1(),"鍙傜収鍝佺墝鍟嗗畾涔塤灏佽,渚嬪:SST26VF064B-104I/SM_SOIJ5.08",allWithZhCN1()+"_"+allWithZhCN1()),
     DCDC_0217("DCDC妯″潡","灏佽褰㈠紡-鍣ㄤ欢绫诲瀷,渚嬪:鎻掍欢-鐢垫簮妯″潡",zhCN()+"-鐢垫簮妯″潡","鍙傜収鍝佺墝鍟嗗畾涔塤灏佽,渚嬪:B0505S-2WR2_SIP7",allWithSymbol1()+"_"+allWithSymbol1()),
     INDUCTANCE_CJ_0351("鎻掍欢鐢垫劅","灏佽褰㈠紡-澶栧舰鎻忚堪,渚嬪:鎻掍欢鐢垫劅-妫掑瀷","鎻掍欢鐢垫劅-"+zhCN(),"鎰熷�悸辫宸�/鐢垫祦_鐩村緞*楂樺害/鑴氳窛,渚嬪:10uH卤5%/2.3A_D5*20/6.5",num()+lettersLowCase0()+"H卤"+num()+"%/"+num()+lettersLowCase0()+"A_"+lettersUpCaseLimit1()+num()+"\\*"+num()+"/"+num()),
     INDUCTANCE_TP_DG_0351("璐寸墖-鐢垫劅","灏佽褰㈠紡-澶栧舰鎻忚堪,渚嬪:璐寸墖-鐢垫劅","璐寸墖-"+zhCN(),"鎰熷�悸辫宸�/鐢垫祦_灏佽,渚嬪:10uH卤5%/0.5A_L0805",num()+lettersLowCase0()+"H卤"+num()+"%/"+num()+lettersLowCase0()+"A_"+allWithSymbol1()),
@@ -26,11 +26,11 @@
     FUSE_0381("淇濋櫓","灏佽褰㈠紡-绫诲瀷,渚嬪:鎻掍欢淇濋櫓-鐜荤拑涓�",zhCN()+"-"+allWithZhCN1(),"澶栧舰-鐢垫祦鐢靛帇,渚嬪:鍦嗗舰3.6*10-T0.5A250V",allWithZhCN1()+"-[TFV]"+num()+lettersLowCase0()+"A"+num()+lettersLowCase0()+"V"),
     OPTOCOUPLER_0363("鍏夎��","灏佽褰㈠紡-绫诲瀷,渚嬪:鎻掍欢鍏夎��-绾挎��",zhCN()+"-"+zhCN(),"鍘傚鍨嬪彿_灏佽,渚嬪:HCNR201_DIP-8",allWithSymbol1()+"_"+allWithSymbol1()),
     RELAY_0362("缁х數鍣�","灏佽褰㈠紡-缁х數鍣ㄧ被鍨�,渚嬪:鎻掍欢-缁х數鍣�",allWithZhCN1()+"-"+zhCN0()+"(缁х數鍣▅鎺ヨЕ鍣�)","鍘傚鍨嬪彿-绾垮寘鐢靛帇_瑙︾偣鐢垫祦鐢靛帇_澶栧舰鎻忚堪,HF7FF/012-1HTSF_12V_10A28V_22*16*16",allWithSymbol1()+"_"+num()+lettersLowCase0()+"V_"+num()+lettersLowCase0()+"A"+num()+lettersLowCase0()+"V_"+num()+"\\*"+num()+"\\*"+num()),
-    KEY_SWITCH_0382("鎸夐敭寮�鍏�","灏佽褰㈠紡-寮�鍏冲悕绉�,渚嬪:鎻掍欢-杞昏Е鎸夐敭",allWithZhCN1()+"-"+zhCN(),"鍙傜収渚涘簲鍟嗗瀷鍙穇鐢靛帇鐢垫祦(闈炶创鐗�)_澶栧舰鎻忚堪(璐寸墖濉啓)_寮剼(鎻掍欢濉啓),鐢靛帇鐢垫祦銆佸褰€�佷緷鎹疄闄呯敤閫旈�夋嫨鎬у~鍐�",allWithSymbol1()+"_"+allWithZhCN1()),
+    KEY_SWITCH_0382("鎸夐敭寮�鍏�","灏佽褰㈠紡-寮�鍏冲悕绉�,渚嬪:鎻掍欢-杞昏Е鎸夐敭",allWithZhCN1()+"-"+allWithZhCN1(),"鍙傜収渚涘簲鍟嗗瀷鍙穇鐢靛帇鐢垫祦(闈炶创鐗�)_澶栧舰鎻忚堪(璐寸墖濉啓)_寮剼(鎻掍欢濉啓),鐢靛帇鐢垫祦銆佸褰€�佷緷鎹疄闄呯敤閫旈�夋嫨鎬у~鍐�",allWithSymbol1()+"_"+allWithZhCN1()),
     RADIATOR_0103("鏁g儹鍣�","鏁g儹鍣�-鏈哄瀷,渚嬪:鏁g儹鍣�-60010","鏁g儹鍣�-"+allWithSymbol1(),"褰㈢姸浠g爜-闀垮楂�,渚嬪:FBO60010CT-301_180*420*83",allWithSymbol1()+"_"+num()+"\\*"+num()+"\\*"+num()),
     RADIATOR_TY_0103("PCB鐢ㄦ爣鍑嗘暎鐑墖","鏁g儹鐗�-閫氱敤","鏁g儹鐗�-閫氱敤","鍨嬫潗澶栧舰_灏哄_閽堣剼鏁�,渚嬪:H鍨嬫暎鐑櫒_23.5*26*25_2",allWithZhCN1()+"_"+num()+"\\*"+num()+"\\*"+num()+"_"+num()),
-    CONNECTOR_PCB_0372("杩炴帴鍣�-PCB鐢�","澶栧舰鎻忚堪-閽堣剼绫诲瀷,渚嬪:璐寸墖绔瓙-寮拡",zhCN()+"-"+zhCN(),"鍘傚鍨嬪彿_鑴氳窛_杞芥祦閲�,渚嬪:XHB-4AWB_2.5_3A",allWithSymbol1()+"_"+num()+"_"+num()+lettersLowCase0()+"A"),
-    CONNECTOR_ASSEMBLED_0372("杩炴帴鍣�-瑁呴厤鐢�","绔瓙-杩炴帴鍣ㄥ悕绉�,渚嬪:绔瓙-鐢电紗鎺ュご","绔瓙-"+zhCN(),"鍘傚鍨嬪彿_杞芥祦閲�,渚嬪:XHB-4AWB_3A",allWithSymbol1()+"_"+num()+lettersLowCase0()+"A"),
+    CONNECTOR_PCB_0372("杩炴帴鍣�-PCB鐢�","澶栧舰鎻忚堪-閽堣剼绫诲瀷,渚嬪:璐寸墖绔瓙-寮拡",allWithZhCN1()+"-"+allWithZhCN1(),"鍘傚鍨嬪彿_鑴氳窛_杞芥祦閲�,渚嬪:XHB-4AWB_2.5_3A",allWithSymbol1()+"_"+num()+"_"+num()+lettersLowCase0()+"A"),
+    CONNECTOR_ASSEMBLED_0372("杩炴帴鍣�-瑁呴厤鐢�","绔瓙-杩炴帴鍣ㄥ悕绉�,渚嬪:绔瓙-鐢电紗鎺ュご","绔瓙-"+allWithZhCN1(),"鍘傚鍨嬪彿_杞芥祦閲�,渚嬪:XHB-4AWB_3A",allWithSymbol1()+"_"+num()+lettersLowCase0()+"A"),
     CRYSTAL_OSCILLATOR_0361("鏅舵尟","[灏佽褰㈠紡]鏅舵尟",zhCN()+"鏅舵尟","棰戠巼_娓╁害绯绘暟_璐熻浇鐢靛_灏佽,渚嬪:8MHz_15ppm_22pF_5032-5*3.2*0.7",num()+letters0()+"Hz_"+num()+letters()+"_"+num()+letters()+"_"+allWithSymbol1()),
     SENSOR_0214("浼犳劅鍣�","浼犳劅鍣�-绫诲瀷,渚嬪:浼犳劅鍣�-鐢垫祦闇嶅皵","浼犳劅鍣�-"+zhCN(),"瑙勬牸鍨嬪彿_杈撳叆-杈撳嚭,渚嬪:TBC100E-D12V-4V",allWithSymbol1()+"-"+allWithSymbol1()+"-"+allWithSymbol1()),
     DISPLAYER("鏄剧ず鍣�","鏄剧ず灞�-绫诲瀷,渚嬪:鏄剧ず灞�-鍗曡壊鎬荤嚎娑叉櫠灞�","鏄剧ず鍣�-"+allWithZhCN1(),"瑙勬牸鍨嬪彿_鍒嗚鲸鐜嘷宸ヤ綔鐢靛帇_鏄剧ず鎺ュ彛,渚嬪:DMG12864F-9_128*64_3V_骞跺彛",allWithSymbol1()+"_"+num()+"\\*"+num()+"_"+num()+lettersLowCase0()+"V_"+zhCN()),
@@ -90,19 +90,19 @@
     }
 
     public static String allWithZhCN(){
-        return "[a-zA-Z0-9_()/.\\s\\*\\-\\u4E00-\\u9FA5]*";
+        return "[a-zA-Z0-9_()/.\\s\\*\\-\\+\\u4E00-\\u9FA5]*";
     }
 
     public static String allWithZhCN1(){
-        return "[a-zA-Z0-9_()/.\\s\\*\\-\\u4E00-\\u9FA5]+";
+        return "[a-zA-Z0-9_()/.\\s\\*\\-\\+\\u4E00-\\u9FA5]+";
     }
 
     public static String allWithSymbol0(){
-        return "[a-zA-Z0-9_()/.\\s\\*\\-]*";
+        return "[a-zA-Z0-9_()/.\\s\\*\\-\\+]*";
     }
 
     public static String allWithSymbol1(){
-        return "[a-zA-Z0-9_()/.\\s\\*\\-]+";
+        return "[a-zA-Z0-9_()/.\\s\\*\\-\\+]+";
     }
 
     public static String num(){

--
Gitblit v1.9.1