1.虚拟仓操作优化

src/main/java/com/neotel/smfcore/core/virtual/controller/VirtualOperateController.java

@@ -160,7 +160,7 @@ public class VirtualOperateController {
             log.info("条码" + subBarcode.getBarcode() + "[" + subBarcode.getPartNumber() + "]入库到料盒[" + barcode.getBarcode() + "]数量:" + barcode.getAmount());
         } else if ("ri".equals(putInType)) {
             //解析条码
-            Barcode subCode = codeResolve.resolveOneValideBarcode(operageStr);
+            Barcode subCode = codeResolve.resolveOneValideBarcode("=1x1="+operageStr);
             if (subCode == null) {
                 throw new ValidateException("smfcore.error.barcode.invalid", "{0}不是有效的条码", new String[]{operageStr});
             }
@@ -194,7 +194,7 @@ public class VirtualOperateController {
         }
         int opQty = Integer.valueOf(amountStr);
         int opType = OP.NON_OP;
-        if (opQty < 0) {
+        if (opQty > 0) {
             opType = OP.CHECKOUT;
         } else {
             //请输入正确的数量
@@ -218,7 +218,7 @@ public class VirtualOperateController {
             barcode = finishTask(barcode, opType, subBarcode, opQty);
             log.info(subBarcode.getPartNumber() + "从料盒[" + barcode.getPosName() + "]出库,物料数量:" + oldAmount + " - " + opQty + " = " + newAmount);
         } else if ("ri".equals(checkOutType)) {
-            CodeBean codeBean = codeResolve.resolveSingleCode(operageStr);
+            CodeBean codeBean = codeResolve.resolveSingleCode("=1x1="+operageStr);
             if (!codeBean.isValid()) {
                 throw new ValidateException("smfcore.error.barcode.invalid", "{0}不是有效的条码", new String[]{operageStr});
             }
@@ -255,7 +255,7 @@ public class VirtualOperateController {
         String describe = paramMap.get("describe");
 
         //判断料箱是否存在
-        Barcode barcode = codeResolve.resolveOneValideBarcode(boxStr);
+        Barcode barcode = codeResolve.resolveOneValideBarcode("=1x1="+boxStr);
         if (barcode == null) {
             throw new ValidateException("smfcore.error.barcode.invalid", "{0}不是有效的条码", new String[]{boxStr});
         }
@@ -289,7 +289,7 @@ public class VirtualOperateController {
     public ResultBean boxOutFromPosName(@RequestBody Map<String, String> paramMap) {
         String boxStr = paramMap.get("boxStr");
         //判断料箱是否存在
-        Barcode barcode = codeResolve.resolveOneValideBarcode(boxStr);
+        Barcode barcode = codeResolve.resolveOneValideBarcode("=1x1="+boxStr);
         if (barcode == null) {
             throw new ValidateException("smfcore.error.barcode.invalid", "{0}不是有效的条码", new String[]{boxStr});
         }