原材料仓取最新的条码上的数量

src/main/java/com/neotel/smfcore/core/barcode/utils/CodeResolve.java

@@ -195,6 +195,7 @@ public class CodeResolve {
                     //设置label数量
                     //设置label数量
                     if (barcodeFromRule.getLabelAmount() != barcode.getLabelAmount()) {
                     if (barcodeFromRule.getLabelAmount() != barcode.getLabelAmount()) {
                         barcode.setLabelAmount(barcodeFromRule.getLabelAmount());
                         barcode.setLabelAmount(barcodeFromRule.getLabelAmount());
+                        barcode.setAmount(barcodeFromRule.getLabelAmount());
                         needUpdate = true;
                         needUpdate = true;
                     }
                     }
                     if(needUpdate){
                     if(needUpdate){

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/CDeviceController.java

@@ -135,6 +135,8 @@ public class CDeviceController {
         String codeStr = paramMap.get("codeStr");  //物料条码
         String codeStr = paramMap.get("codeStr");  //物料条码
         String materialStr = paramMap.get("materialStr"); //料串信息
         String materialStr = paramMap.get("materialStr"); //料串信息
 
 
+        log.info("物料放入料格,料格为:"+binCodeStr+",物料条码为:"+codeStr+",料串信息为:"+materialStr);
+
         //判断入参是否为空
         //判断入参是否为空
         if (StringUtils.isEmpty(binCodeStr)) {
         if (StringUtils.isEmpty(binCodeStr)) {
             return ResultBean.newErrorResult(-1, "smfcore.valueCanotNull", "{0}不能为空", new String[]{"料格信息"});
             return ResultBean.newErrorResult(-1, "smfcore.valueCanotNull", "{0}不能为空", new String[]{"料格信息"});

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/third/util/MaterialLocUtil.java

 package com.neotel.smfcore.custom.luxsan.factory_c.third.util;
 package com.neotel.smfcore.custom.luxsan.factory_c.third.util;
 
 
+import com.neotel.smfcore.common.utils.StringUtils;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.device.util.DataCache;
 import com.neotel.smfcore.core.device.util.DataCache;
 import com.neotel.smfcore.custom.luxsan.factory_c.third.bean.MaterialLoc;
 import com.neotel.smfcore.custom.luxsan.factory_c.third.bean.MaterialLoc;
@@ -31,8 +32,10 @@ public class MaterialLocUtil {
             materialLoc = new MaterialLoc();
             materialLoc = new MaterialLoc();
         }
         }
 
 
-        String name = MaterialLocEnum.findNameById(loc);
-        materialLoc.setLoc(name);
+        if (StringUtils.isNotEmpty(loc)) {
+            String name = MaterialLocEnum.findNameById(loc);
+            materialLoc.setLoc(name);
+        }
         materialLoc.setMaterial(materialStr);
         materialLoc.setMaterial(materialStr);
         materialLoc.setUpdateDate(new Date());
         materialLoc.setUpdateDate(new Date());