Merge remote-tracking branch 'origin/master'

src/main/java/com/neotel/smfcore/core/device/handler/impl/NLMShelfHandler.java

@@ -9,6 +9,7 @@ import com.neotel.smfcore.common.utils.SecurityUtils;
 import com.neotel.smfcore.common.utils.StringUtils;
 import com.neotel.smfcore.core.barcode.bean.CodeBean;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
+import com.neotel.smfcore.core.barcode.service.po.Component;
 import com.neotel.smfcore.core.device.bean.StatusBean;
 import com.neotel.smfcore.core.device.enums.OP_STATUS;
 import com.neotel.smfcore.core.inList.util.InListCache;
@@ -244,6 +245,31 @@ public class NLMShelfHandler extends BaseDeviceHandler  {
         if (!Strings.isNullOrEmpty(code)) {
             code = code.replace("。", ".");
         }
+
+        String w = mapValues.get("w");
+        String h = mapValues.get("h");
+        if (StringUtils.isEmpty(w) || StringUtils.isEmpty(h)) {
+            w = "1";
+            h = "1";
+            Barcode noSizeBarcode = codeResolve.resolveCode(code);
+            if (noSizeBarcode == null){
+               noSizeBarcode = barcodeManager.findByBarcode(code);
+            }
+            if (noSizeBarcode != null) {
+                Component component = componentManager.findByPartNumberAndProvider(noSizeBarcode.getPartNumber(), noSizeBarcode.getProvider());
+                if (component != null) {
+                    w = component.getPlateSize() + "";
+                    h = component.getHeight() + "";
+                }
+            }
+        }
+
+        if (w.equals("1") || h.equals("1")){
+            return ResultBean.newErrorResult(101,"smfcore.error.barcode.errorSize","条码未设置尺寸");
+        }
+
+        code = "="+w+"x"+h+"="+code;
+
         CodeBean codeBean = codeResolve.resolveSingleCode(code);
         if (!codeBean.isValid()) {
             throw new ValidateException("smfcore.error.barcode.invalid", "未找到有效的条码");
@@ -254,10 +280,10 @@ public class NLMShelfHandler extends BaseDeviceHandler  {
         if (expireDate != null && System.currentTimeMillis() > expireDate.getTime()) {
             throw new ValidateException("smfcore.error.barcode.expired", "物料已过期,无法入库.");
         }
-        if (barcode.getPlateSize() <= 1) {
+       /* if (barcode.getPlateSize() <= 1) {
             //长宽为1的需要弹框设置尺寸
             return ResultBean.newErrorResult(101,"smfcore.error.barcode.errorSize","条码未设置尺寸");
-        }
+        }*/
         try {
             StoragePos inPos = storagePosManager.getByBarcodeId(barcode.getId());
             if (inPos != null) {