修改物料编码规则
This commit is contained in:
parent
21e612533e
commit
960de47fb1
|
@ -69,7 +69,7 @@
|
||||||
'1314047672872420014', -- field0040
|
'1314047672872420014', -- field0040
|
||||||
'6435913155541223805', -- field0042
|
'6435913155541223805', -- field0042
|
||||||
'7788441092115810835', -- field0047
|
'7788441092115810835', -- field0047
|
||||||
'-7568576445236623045' -- field0048
|
'-7568576445236623045', -- field0048
|
||||||
'-6211401909916515167' -- field0049
|
'-6211401909916515167' -- field0049
|
||||||
)
|
)
|
||||||
</select>
|
</select>
|
||||||
|
|
|
@ -551,7 +551,7 @@ public class ZjMaterielSynchronizationEventServiceImpl extends BaseService<ZjMat
|
||||||
**/
|
**/
|
||||||
private JsonResultEntity checkData(List<ZjMaterielSynchronizationEventEntity> list, boolean flag,List<InventoryEntity> inventoryEntities) {
|
private JsonResultEntity checkData(List<ZjMaterielSynchronizationEventEntity> list, boolean flag,List<InventoryEntity> inventoryEntities) {
|
||||||
// 定义正则表达式,匹配全角符号
|
// 定义正则表达式,匹配全角符号
|
||||||
String regex = "[\uFF00-\uFFEF]";
|
String regex = "[\uFF00-\uFFEF&&[^~Φφμ/±%^Ω≥≤#]]";
|
||||||
// 编译正则表达式
|
// 编译正则表达式
|
||||||
Pattern pattern = Pattern.compile(regex);
|
Pattern pattern = Pattern.compile(regex);
|
||||||
Integer num = 0;
|
Integer num = 0;
|
||||||
|
|
|
@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON;
|
||||||
import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSONObject;
|
||||||
import com.hzya.frame.plugin.zjmaterielsynchronizationevent.service.IZjMaterielSynchronizationEventService;
|
import com.hzya.frame.plugin.zjmaterielsynchronizationevent.service.IZjMaterielSynchronizationEventService;
|
||||||
import com.hzya.frame.util.AESUtil;
|
import com.hzya.frame.util.AESUtil;
|
||||||
|
import com.hzya.frame.web.entity.BaseResult;
|
||||||
import org.apache.http.HttpEntity;
|
import org.apache.http.HttpEntity;
|
||||||
import org.apache.http.client.config.RequestConfig;
|
import org.apache.http.client.config.RequestConfig;
|
||||||
import org.apache.http.client.methods.CloseableHttpResponse;
|
import org.apache.http.client.methods.CloseableHttpResponse;
|
||||||
|
@ -27,6 +28,7 @@ import java.util.ArrayList;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @ClassName dsasas
|
* @ClassName dsasas
|
||||||
|
@ -40,6 +42,13 @@ public class temButtom {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void test01() {
|
public void test01() {
|
||||||
|
String regex = "[\uFF00-\uFF5D\uFF5F-\uFFEF]";
|
||||||
|
// 编译正则表达式
|
||||||
|
Pattern pattern = Pattern.compile(regex);
|
||||||
|
if(pattern.matcher("测试-32位,RL78,128KB,12KB,1.6-5.5V,-40 ~85°C,民用,LQFP-80;R5F100MGAFA(瑞萨)").find()){
|
||||||
|
System.out.println("1231231");
|
||||||
|
|
||||||
|
}
|
||||||
String a = AESUtil.encrypt("hzya1314");
|
String a = AESUtil.encrypt("hzya1314");
|
||||||
System.out.println(a);
|
System.out.println(a);
|
||||||
String b = AESUtil.decrypt("62e4295b615a30dbf3b8ee96f41c820b");
|
String b = AESUtil.decrypt("62e4295b615a30dbf3b8ee96f41c820b");
|
||||||
|
|
Loading…
Reference in New Issue