Skip to content

孙克 / SmdBox

转到一个项目
切换导航栏
切换导航栏固定状态
Commit db2bf971 由 sunke
选项

多个供应商的物料尺寸设置问题 

供应商PN转换API支持模糊搜索,只返回10条数据
1 个父辈 6d155610
内嵌 并排
正在显示 4 个修改的文件 包含 10 行增加 和 8 行删除
myproject/src/main/java/com/myproject/manager/impl/ComponentManagerImpl.java
...@@ -47,9 +47,9 @@ public class ComponentManagerImpl implements IComponentManager { ...@@ -47,9 +47,9 @@ public class ComponentManagerImpl implements IComponentManager {
Component component = componentDao.findOneByCondition(new String[] {"partNumber","provider"}, new String[] {partNumber,provider}); Component component = componentDao.findOneByCondition(new String[] {"partNumber","provider"}, new String[] {partNumber,provider});
if(component == null){ if(component == null){
component = componentDao.findOneByCondition(new String[] {"partNumber","provider"}, new String[] {partNumber,null}); component = componentDao.findOneByCondition(new String[] {"partNumber","provider"}, new String[] {partNumber,null});
if(provider == null && component == null){ if(component != null){
//再查一下空字符串的 component.setProvider(provider);
component = componentDao.findOneByCondition(new String[] {"partNumber","provider"}, new String[] {partNumber, ""}); component = componentDao.save(component);
} }
} }
return component; return component;
...@@ -65,8 +65,9 @@ public class ComponentManagerImpl implements IComponentManager { ...@@ -65,8 +65,9 @@ public class ComponentManagerImpl implements IComponentManager {
@Override @Override
public List<Component> listPnBySupplierPn(String supplierPn){ public List<Component> listPnBySupplierPn(String supplierPn){
Criteria c = Criteria.where("supplierPn").is(supplierPn); Criteria c = Criteria.where("supplierPn").regex(supplierPn);
Query query = Query.query(c); Query query = Query.query(c);
query.limit(10);
return componentDao.findByQuery(query); return componentDao.findByQuery(query);
} }
......
myproject/src/main/java/com/myproject/util/BarcodeRule.java
...@@ -657,8 +657,8 @@ public class BarcodeRule { ...@@ -657,8 +657,8 @@ public class BarcodeRule {
rule = "SP;PN;PRODATEyyw[0:4:0];BATCH;QTY;RI;"; rule = "SP;PN;PRODATEyyw[0:4:0];BATCH;QTY;RI;";
//rule = "SP;PN;PRODATEyyyyMMdd[0:8:0];BATCH;QTY;RI;"; //rule = "SP;PN;PRODATEyyyyMMdd[0:8:0];BATCH;QTY;RI;";
codeStr = "=7x8=[)>@SIIX20@2060GBUW00@1347-01358@5000.000 @@ABCD"; codeStr = "IAC;6014A0489701;HI1206T161R-10;2047;AC20NKA0448KA;2000;VBG204768056";
rule = "1@RI@BATCH@PN@QTY@@MEMO"; rule = "SP;PN;3;PRODATEyyw;BATCH;QTY;RI";
BarcodeRule br = BarcodeRule.newRule(rule); BarcodeRule br = BarcodeRule.newRule(rule);
Barcode b = br.toCodeBean(codeStr).getBarcode(); Barcode b = br.toCodeBean(codeStr).getBarcode();
......
myproject/src/main/java/com/myproject/webapp/controller/webService/DataCache.java
...@@ -311,13 +311,14 @@ public class DataCache{ ...@@ -311,13 +311,14 @@ public class DataCache{
Component component = componentManager.findByPartNumberAndProvider(barcodeFromRule.getPartNumber(),barcodeFromRule.getProvider()); Component component = componentManager.findByPartNumberAndProvider(barcodeFromRule.getPartNumber(),barcodeFromRule.getProvider());
if(component == null){ if(component == null){
log.info("自动添加["+barcodeFromRule.getPartNumber()+"]的档案信息["+codeBeanFromRule.getReelWidth()+"x"+codeBeanFromRule.getReelHeight()+"]"); log.info("自动添加["+barcodeFromRule.getPartNumber()+"]["+barcodeFromRule.getProvider()+"]的档案信息["+codeBeanFromRule.getReelWidth()+"x"+codeBeanFromRule.getReelHeight()+"]");
component = new Component(); component = new Component();
component.setPartNumber(barcodeFromRule.getPartNumber()); component.setPartNumber(barcodeFromRule.getPartNumber());
component.setAmount(barcodeFromRule.getAmount()); component.setAmount(barcodeFromRule.getAmount());
component.setPlateSize(barcodeFromRule.getPlateSize()); component.setPlateSize(barcodeFromRule.getPlateSize());
component.setHeight(barcodeFromRule.getHeight()); component.setHeight(barcodeFromRule.getHeight());
component.setName(barcodeFromRule.getPartNumber()); component.setName(barcodeFromRule.getPartNumber());
component.setProvider(barcodeFromRule.getProvider());
componentManager.save(component); componentManager.save(component);
}else{ }else{
//如果 barcode 里的料盘信息比 Component 中的大,使用比较大的,防止放不进去撞击 //如果 barcode 里的料盘信息比 Component 中的大,使用比较大的,防止放不进去撞击
......
myproject/src/main/webapp/WEB-INF/pages/component/componentSearch.jsp
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
<display:column titleKey="component.partNumber"> <display:column titleKey="component.partNumber">
<a href="${ctx}/component/componentUpdate.html?type=${component.type}&id=${component.id}">${component.partNumber}</a> <a href="${ctx}/component/componentUpdate.html?type=${component.type}&id=${component.id}">${component.partNumber}</a>
</display:column> </display:column>
<display:column property="providerNumber" titleKey="component.providerNumber"/> <display:column property="provider" titleKey="component.provider"/>
<display:column titleKey="component.plate.size"> <display:column titleKey="component.plate.size">
${component.plateSize} x ${component.height} ${component.plateSize} x ${component.height}
</display:column> </display:column>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!