diff --git a/src/main/java/com/glxp/api/constant/ConstantType.java b/src/main/java/com/glxp/api/constant/ConstantType.java index 2387fa948..cc53b64c8 100644 --- a/src/main/java/com/glxp/api/constant/ConstantType.java +++ b/src/main/java/com/glxp/api/constant/ConstantType.java @@ -5,4 +5,9 @@ public interface ConstantType { String TYPE_STOCK_CHECK = "StockCheck"; //盘点 String TYPE_PUT = "WareHouseIn"; //入库 String TYPE_OUT = "WareHouseOut"; //出库 + + + String SPLIT_RETURN = "SC72249388338364"; //拆零退货 + String SPLIT_OUT = "SC72197936495755"; //拆零出库 + } diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index 80a581ef9..af3166b7f 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -868,6 +868,12 @@ public class IoCodeTempController extends BaseController { } + //预出库退货校验队列库存 + if (bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_RETURN)) { + //TODO + } + + //是否边扫边校验 if (bussinessTypeEntity.getCheckWebNew() == 1 && bussinessTypeEntity.isCheckEnable()) { String errMsg = ioCheckInoutService.checkCode(codeEnttity); @@ -1393,6 +1399,7 @@ public class IoCodeTempController extends BaseController { /** * 检验药品ID唯一性 + * * @param codeEnttity * @param unitFk * @return diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java index 98b722de7..e2d884285 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java @@ -876,7 +876,7 @@ public class IoCheckInoutService { ioOrderCheckResultResponse.setCount(0); ioOrderCheckResultResponse.setScanCount(codeEntity.getReCount()); UdiProductEntity drug = udiProductDao.findByNameCode(codeEntity.getNameCode()); - if (drug.getProductsType() == 2){ + if (drug.getProductsType() == 2) { //药品添加药品数据 ioOrderCheckResultResponse.setBzgg(drug.getBzgg()); ioOrderCheckResultResponse.setPrepnUnit(drug.getPrepnUnit()); @@ -1234,7 +1234,7 @@ public class IoCheckInoutService { genInvService.genNorInv(orderEntity.getBillNo()); orderService.updateOrderInventory(orderEntity.getBillNo(), orderEntity.getStatus()); //若未拆零预出库单据则进入到拆零队列 - if (orderEntity.getAction().equals("SC72197936495755")) { + if (orderEntity.getAction().equals(ConstantType.SPLIT_OUT)) { List codeList = codeService.findByOrderId(orderEntity.getBillNo()); List splitCodeEntities = new ArrayList<>(); if (CollUtil.isNotEmpty(codeList)) { @@ -1263,7 +1263,7 @@ public class IoCheckInoutService { } } splitFifoCodeService.saveBatch(splitCodeEntities); - } else if (orderEntity.getAction().equals("SC72249388338364")) { + } else if (orderEntity.getAction().equals(ConstantType.SPLIT_RETURN)) { //拆零预出库退回 List codeList = codeService.findByOrderId(orderEntity.getBillNo()); List splitCodeEntities = new ArrayList<>();