1.物料日志 表头字段修改

2.解析条码问题修改

myproject/src/main/java/com/myproject/manager/impl/ComponentManagerImpl.java

@@ -46,7 +46,7 @@ public class ComponentManagerImpl implements IComponentManager {
         else {
             Component component = componentDao.findOneByCondition(new String[] {"partNumber","provider"}, new String[] {partNumber,provider});
             if(component == null){
-                component = componentDao.findOneByCondition(new String[] {"partNumber","provider"}, new String[] {partNumber,null});
+                component = componentDao.findOneByCondition(new String[] {"partNumber"}, new String[] {partNumber});
                 if(component != null){
                     component.setProvider(provider);
                     component = componentDao.save(component);

myproject/src/main/java/com/myproject/util/BarcodeRule.java

@@ -463,7 +463,10 @@ public class BarcodeRule {
         //先xml进行解析,如果没有解析出来,则按条码规则进行解析
         Barcode xmlBarcode = getXmlBarcode(codeStr);
         if (xmlBarcode != null){
+            xmlBarcode.setPlateSize(reelWidth);
+            xmlBarcode.setHeight(reelHeight);
             codeBean.setBarcode(xmlBarcode);
+            codeBean.setCodeStr(xmlBarcode.getBarcode());
             return codeBean;
         }
 

myproject/src/main/java/com/myproject/webapp/controller/webService/TaskService.java

@@ -297,6 +297,7 @@ public class TaskService implements ITaskService {
             int plateW = barcodeSave.getPlateSize();
             int plateH = barcodeSave.getHeight();
             statusBean.addPosInfo(barcode, posId, plateW, plateH, false);
+            statusBean.setMsg("");
 
             log.info(barcode + "[" + plateW + "x" + plateH + "]开始入库到" + storage.getCid() + "[" + posId + "]");
             //清空展示的消息

myproject/src/main/resources/StorageResources_zh_CN.properties

@@ -76,7 +76,7 @@ barcode.error.noRi=\u7F16\u7801\u89C4\u5219\u4E2D\u5FC5\u987B\u5305\u542B RI \u5
 menu.boxManager=\u6599\u4ED3\u7BA1\u7406
 user.cabinetAssign=\u6599\u67DC\u5206\u914D
 component.height.empty=\u6599\u76D8\u9AD8\u5EA6\u4E0D\u80FD\u4E3A\u7A7A
-barcode.partNumber=\u6599\u4EF6\u7F16\u53F7
+barcode.partNumber=\u7269\u8D44\u7F16\u7801
 settings.remind.title=\u63D0\u9192\u8BBE\u7F6E
 order.out.set=\u5957\u6599\u51FA\u5E93
 error.storage.noPosFind=\u672A\u627E\u5230\u53EF\u7528\u7684\u4ED3\u4F4D
@@ -89,7 +89,7 @@ component.plate.size=\u6599\u76D8\u5C3A\u5BF8
 storage.saveSuccess=\u6599\u4ED3\u4FE1\u606F\u4FDD\u5B58\u6210\u529F
 barcode.height=\u6599\u76D8\u9AD8\u5EA6
 chart.showType.DAY=\u5929
-dataLog.partNumber=\u6599\u4EF6\u7F16\u7801
+dataLog.partNumber=\u7269\u8D44\u7F16\u7801
 order.close.notExist=\u672A\u627E\u5230\u5DE5\u5355[{0}]
 component.generateBarcode=\u751F\u6210\u6761\u7801
 storage.match.fullyCompatible=\u5B8C\u5168\u517C\u5BB9
@@ -121,7 +121,7 @@ storage.name.empty=\u6599\u4ED3\u540D\u79F0\u4E0D\u80FD\u4E3A\u7A7A
 role.update.description=\u63CF\u8FF0
 workOrder.checkoutSuccess=\u5DE5\u5355\u51FA\u5E93\u6210\u529F
 cabinet.error.noCard=\u975E\u6CD5\u64CD\u4F5C\uFF1A\u672A\u5237\u5361\uFF0C\u65E0\u6CD5\u5F00\u95E8
-barcode.batch=\u6279\u6B21
+barcode.batch=\u51FA\u8D27\u5230\u8D27\u7F16\u53F7
 option.none=----\u8BF7\u9009\u62E9----
 msg.line.putIn=[{0}]\u51C6\u5907\u5165\u5E93\u5230[{1}]
 shelf.btn.posCheck=\u5E93\u4F4D\u68C0\u67E5
@@ -146,7 +146,7 @@ authority.valuable.out=\u8D35\u91CD\u7269\u6599\u51FA\u5E93
 user.writeCard=\u5199\u5165\u5361\u7247
 menu.workOrder.new=\u65B0\u5EFA\u5DE5\u5355
 shelf.msg.outConfirm=\u5E93\u4F4D[{0}]\u51FA\u5E93\u5B8C\u6210\u3002
-barcode.barcode=\u6761\u7801\u7F16\u53F7
+barcode.barcode=\u62C6\u5305ID
 storage.chart.humidity=\u6E7F\u5EA6
 barcode.print=\u6253\u5370
 error.save=\u4FDD\u5B58\u51FA\u9519\uFF0C\u8BF7\u68C0\u67E5