Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 3f07527a 由 zshaohui
选项

1.虚拟仓操作优化

1 个父辈 7de555d2
内嵌 并排
正在显示 1 个修改的文件 包含 5 行增加 和 5 行删除
src/main/java/com/neotel/smfcore/core/virtual/controller/VirtualOperateController.java
...@@ -160,7 +160,7 @@ public class VirtualOperateController { ...@@ -160,7 +160,7 @@ public class VirtualOperateController {
log.info("条码" + subBarcode.getBarcode() + "[" + subBarcode.getPartNumber() + "]入库到料盒[" + barcode.getBarcode() + "]数量:" + barcode.getAmount()); log.info("条码" + subBarcode.getBarcode() + "[" + subBarcode.getPartNumber() + "]入库到料盒[" + barcode.getBarcode() + "]数量:" + barcode.getAmount());
} else if ("ri".equals(putInType)) { } else if ("ri".equals(putInType)) {
//解析条码 //解析条码
Barcode subCode = codeResolve.resolveOneValideBarcode(operageStr); Barcode subCode = codeResolve.resolveOneValideBarcode("=1x1="+operageStr);
if (subCode == null) { if (subCode == null) {
throw new ValidateException("smfcore.error.barcode.invalid", "{0}不是有效的条码", new String[]{operageStr}); throw new ValidateException("smfcore.error.barcode.invalid", "{0}不是有效的条码", new String[]{operageStr});
} }
...@@ -194,7 +194,7 @@ public class VirtualOperateController { ...@@ -194,7 +194,7 @@ public class VirtualOperateController {
} }
int opQty = Integer.valueOf(amountStr); int opQty = Integer.valueOf(amountStr);
int opType = OP.NON_OP; int opType = OP.NON_OP;
if (opQty < 0) { if (opQty > 0) {
opType = OP.CHECKOUT; opType = OP.CHECKOUT;
} else { } else {
//请输入正确的数量 //请输入正确的数量
...@@ -218,7 +218,7 @@ public class VirtualOperateController { ...@@ -218,7 +218,7 @@ public class VirtualOperateController {
barcode = finishTask(barcode, opType, subBarcode, opQty); barcode = finishTask(barcode, opType, subBarcode, opQty);
log.info(subBarcode.getPartNumber() + "从料盒[" + barcode.getPosName() + "]出库,物料数量:" + oldAmount + " - " + opQty + " = " + newAmount); log.info(subBarcode.getPartNumber() + "从料盒[" + barcode.getPosName() + "]出库,物料数量:" + oldAmount + " - " + opQty + " = " + newAmount);
} else if ("ri".equals(checkOutType)) { } else if ("ri".equals(checkOutType)) {
CodeBean codeBean = codeResolve.resolveSingleCode(operageStr); CodeBean codeBean = codeResolve.resolveSingleCode("=1x1="+operageStr);
if (!codeBean.isValid()) { if (!codeBean.isValid()) {
throw new ValidateException("smfcore.error.barcode.invalid", "{0}不是有效的条码", new String[]{operageStr}); throw new ValidateException("smfcore.error.barcode.invalid", "{0}不是有效的条码", new String[]{operageStr});
} }
...@@ -255,7 +255,7 @@ public class VirtualOperateController { ...@@ -255,7 +255,7 @@ public class VirtualOperateController {
String describe = paramMap.get("describe"); String describe = paramMap.get("describe");
//判断料箱是否存在 //判断料箱是否存在
Barcode barcode = codeResolve.resolveOneValideBarcode(boxStr); Barcode barcode = codeResolve.resolveOneValideBarcode("=1x1="+boxStr);
if (barcode == null) { if (barcode == null) {
throw new ValidateException("smfcore.error.barcode.invalid", "{0}不是有效的条码", new String[]{boxStr}); throw new ValidateException("smfcore.error.barcode.invalid", "{0}不是有效的条码", new String[]{boxStr});
} }
...@@ -289,7 +289,7 @@ public class VirtualOperateController { ...@@ -289,7 +289,7 @@ public class VirtualOperateController {
public ResultBean boxOutFromPosName(@RequestBody Map<String, String> paramMap) { public ResultBean boxOutFromPosName(@RequestBody Map<String, String> paramMap) {
String boxStr = paramMap.get("boxStr"); String boxStr = paramMap.get("boxStr");
//判断料箱是否存在 //判断料箱是否存在
Barcode barcode = codeResolve.resolveOneValideBarcode(boxStr); Barcode barcode = codeResolve.resolveOneValideBarcode("=1x1="+boxStr);
if (barcode == null) { if (barcode == null) {
throw new ValidateException("smfcore.error.barcode.invalid", "{0}不是有效的条码", new String[]{boxStr}); throw new ValidateException("smfcore.error.barcode.invalid", "{0}不是有效的条码", new String[]{boxStr});
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!