Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 678f0467 由 LN
选项

条码增加P20Item

1 个父辈 5ffd4959
内嵌 并排
正在显示 3 个修改的文件 包含 19 行增加 和 2 行删除
src/main/java/com/neotel/smfcore/core/barcode/bean/BarcodeRule.java
...@@ -211,6 +211,10 @@ public class BarcodeRule { ...@@ -211,6 +211,10 @@ public class BarcodeRule {
if(newRule.q_item.matchRule(fieldValue, i)){ if(newRule.q_item.matchRule(fieldValue, i)){
log.info("q: 为" + newRule.q_item.toString()); log.info("q: 为" + newRule.q_item.toString());
} }
}if(!newRule.p20_item.hasThisField()){
if(newRule.p20_item.matchRule(fieldValue, i)){
log.info("p20: 为" + newRule.p20_item.toString());
}
} }
} }
boolean validRule = false; boolean validRule = false;
...@@ -260,6 +264,7 @@ public class BarcodeRule { ...@@ -260,6 +264,7 @@ public class BarcodeRule {
private RuleItem mpn_item = new RuleItem("MPN"); private RuleItem mpn_item = new RuleItem("MPN");
private RuleItem q_item = new RuleItem("QITEM"); private RuleItem q_item = new RuleItem("QITEM");
private RuleItem q1_item = new RuleItem("Q1ITEM"); private RuleItem q1_item = new RuleItem("Q1ITEM");
private RuleItem p20_item = new RuleItem("P20ITEM");
private class RuleItem{ private class RuleItem{
private RuleItem(String ruleName) { private RuleItem(String ruleName) {
...@@ -692,7 +697,11 @@ public class BarcodeRule { ...@@ -692,7 +697,11 @@ public class BarcodeRule {
b.setQItem(q); b.setQItem(q);
} }
if(p20_item.hasThisField()){
String q = p20_item.getStrValue(codeArr);
b.setP20Item(q);
}
b.setBarcode(reelId); b.setBarcode(reelId);
codeBean.setCodeStr(reelId); codeBean.setCodeStr(reelId);
b.setPartNumber(partNumber); b.setPartNumber(partNumber);
...@@ -876,8 +885,9 @@ public class BarcodeRule { ...@@ -876,8 +885,9 @@ public class BarcodeRule {
codeStr="P594730|1PMT40A8G4BAF-062E:B|1TDRBRDRL.41|7Q897+EA|SDRBRDRL.41|21PMICRON|2D06-28-2025|||||7E2"; codeStr="P594730|1PMT40A8G4BAF-062E:B|1TDRBRDRL.41|7Q897+EA|SDRBRDRL.41|21PMICRON|2D06-28-2025|||||7E2";
codeStr="P594730|1PMT40A8G4BAF-062E:B|1TDRBRDRL.41|7Q897+EA|SDRBRDRL.41|21PMICRON||||||7E2"; codeStr="P594730|1PMT40A8G4BAF-062E:B|1TDRBRDRL.41|7Q897+EA|SDRBRDRL.41|21PMICRON||||||7E2";
codeStr="P721823|1PMT29FB16T08EALAAD6-QC:C|1TBY8GH95.41|7Q282|SBY8GH95.41||2D07-04-2025|||||"; codeStr="P721823|1PMT29FB16T08EALAAD6-QC:C|1TBY8GH95.41|7Q282|SBY8GH95.41||2D07-04-2025|||||";
rule="PN[1:0:-1]|MPN[2:0:-1]|BATCH[2:0:-1]|QTY[2_7Q:0:-1]|RI[1:0:-1]|SP[3:0:-1]|EXPDATEMM-dd-yyyy[2:0:-1]|PRODATEyyyyMMdd[2:0:-1]|QITEM[1:0:-1]|Q1ITEM[2:0:-1]|xxx|MSL[1:0:-1]"; rule="PN[1:0:-1]|MPN[2:0:-1]|BATCH[2:0:-1]|QTY[2_7Q:0:-1]|RI[1:0:-1]|SP[3:0:-1]|EXPDATEMM-dd-yyyy[2:0:-1]|PRODATEyyyyMMdd[2:0:-1]|QITEM[1:0:-1]|Q1ITEM[2:0:-1]|xxx|MSL[1:0:-1]P20ITEM[1:0:-1]";
codeStr="P550-502922C|1P3217-10-01-C|1TD116223H|7Q1000+EA|SP2SITPCB001|21PSIMMTECH|2D12-31-2025||Q10|1Q10||7E1"; codeStr="P550-502922C|1P3217-10-01-C|1TD116223H|7Q1000+EA|SP2SITPCB001|21PSIMMTECH|2D12-31-2025||Q10|1Q10||7E1";
codeStr="P550-502922C|1P3217-10-01-C|1TD116223H|7Q1000+EA|SP2SITPCB001|||||||";
BarcodeRule br = BarcodeRule.newRule(rule); BarcodeRule br = BarcodeRule.newRule(rule);
Barcode b = br.toCodeBean(codeStr).getBarcode(); Barcode b = br.toCodeBean(codeStr).getBarcode();
...@@ -895,6 +905,7 @@ public class BarcodeRule { ...@@ -895,6 +905,7 @@ public class BarcodeRule {
System.out.println("MPN:"+b.getMpn()); System.out.println("MPN:"+b.getMpn());
System.out.println("Q:"+b.getQItem()); System.out.println("Q:"+b.getQItem());
System.out.println("Q1:"+b.getQ1Item()); System.out.println("Q1:"+b.getQ1Item());
System.out.println("P20:"+b.getP20Item());
System.out.println("SP:"+b.getProvider()); System.out.println("SP:"+b.getProvider());
}else{ }else{
System.out.println("解析失败"); System.out.println("解析失败");
......
src/main/java/com/neotel/smfcore/core/barcode/service/po/Barcode.java
...@@ -258,6 +258,8 @@ public class Barcode extends BasePo implements Serializable { ...@@ -258,6 +258,8 @@ public class Barcode extends BasePo implements Serializable {
private String q1Item; private String q1Item;
private String p20Item;
/** /**
* 是否需要去点料机点料 * 是否需要去点料机点料
*/ */
......
src/main/java/com/neotel/smfcore/custom/micron1053/api/AMaterialBean.java
package com.neotel.smfcore.custom.micron1053.api; package com.neotel.smfcore.custom.micron1053.api;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.ObjectUtil;
import com.neotel.smfcore.core.barcode.service.po.Barcode; import com.neotel.smfcore.core.barcode.service.po.Barcode;
import com.neotel.smfcore.custom.micron1053.util.MicronDataCache; import com.neotel.smfcore.custom.micron1053.util.MicronDataCache;
import lombok.Data; import lombok.Data;
...@@ -36,7 +37,10 @@ public class AMaterialBean { ...@@ -36,7 +37,10 @@ public class AMaterialBean {
bean.serialNum = barcode.getBarcode(); bean.serialNum = barcode.getBarcode();
bean.partNumber = barcode.getPartNumber(); bean.partNumber = barcode.getPartNumber();
bean.sapItem = true; bean.sapItem = false;
if(ObjectUtil.isNotEmpty(barcode.getP20Item())){
bean.sapItem=true;
}
bean.mfgPartNum = barcode.getMpn(); bean.mfgPartNum = barcode.getMpn();
bean.mfgLotNum = barcode.getMbatch(); bean.mfgLotNum = barcode.getMbatch();
bean.mfgName = barcode.getProvider(); bean.mfgName = barcode.getProvider();
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!