diff --git a/src/main/java/com/glxp/api/constant/ConstantStatus.java b/src/main/java/com/glxp/api/constant/ConstantStatus.java index 5317d181..0f6e3d53 100644 --- a/src/main/java/com/glxp/api/constant/ConstantStatus.java +++ b/src/main/java/com/glxp/api/constant/ConstantStatus.java @@ -65,7 +65,13 @@ public class ConstantStatus { */ public static final Integer BUS_TYPE_NORMAL = 1; //正常出入库单据（入账） public static final Integer BUS_TYPE_DELIVERY = 2; //送货出入库单据 - public static final Integer BUS_TYPE__ARRIVAL = 3; //到货出库单据类型 + public static final Integer BUS_TYPE_ARRIVAL = 3; //到货出库单据类型 + public static final Integer BUS_TYPE_RETURNED = 4; //退货单单据类型 + + + public static final Integer ACTION_TYPE_NORMAL = 1; //带票 + public static final Integer ACTION_TYPE_PREIN = 2; //预验收 + public static final Integer ACTION_TYPE_ADVANCE = 3; //寄售 public static final Integer ORDER_STATUS_ADDITIONAL = 5; //补录单据 diff --git a/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java b/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java index d6344445..821d0a10 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java @@ -56,14 +56,14 @@ public class BasicBusTypePreController { if (CollUtil.isEmpty(basicBusTypePreEntities)) { //创建对应单据流转 if (filterBusTypePreRequest.getType() != null && "changEnable".equals(filterBusTypePreRequest.getType())) { - if (ConstantType.TYPE_OUT.equals(basicBussinessType.getMainAction()) && !basicBussinessType.isAdvanceType()) { + if (ConstantType.TYPE_OUT.equals(basicBussinessType.getMainAction()) && basicBussinessType.getActionType() != ConstantStatus.ACTION_TYPE_ADVANCE) { BasicBusTypePreEntity basicBusTypePreEntity = new BasicBusTypePreEntity(); basicBusTypePreEntity.setChangeType(ConstantStatus.ORDER_CHANGE_INNOR_NORMAL_IN); basicBusTypePreEntity.setIndex(1); basicBusTypePreEntity.setAction(filterBusTypePreRequest.getAction()); basicBusTypePreEntity.setBeforeTime(1); basicBusTypePreService.insertBusChangeType(basicBusTypePreEntity); - } else if (ConstantType.TYPE_OUT.equals(basicBussinessType.getMainAction()) && basicBussinessType.isAdvanceType()) { + } else if (ConstantType.TYPE_OUT.equals(basicBussinessType.getMainAction()) && basicBussinessType.getActionType() != ConstantStatus.ACTION_TYPE_ADVANCE) { BasicBusTypePreEntity basicBusTypePreEntity = new BasicBusTypePreEntity(); basicBusTypePreEntity.setChangeType(ConstantStatus.ORDER_CHANGE_ADVANCE_IN); basicBusTypePreEntity.setIndex(1); 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 2c0a52a4..de39dc1b 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -446,7 +446,7 @@ public class IoCodeTempController extends BaseController { } //校验预验收是否已存在 - if (bussinessTypeEntity.isPreIn()) { + if (bussinessTypeEntity.getActionType() == ConstantStatus.ACTION_TYPE_PREIN) { if (StrUtil.isNotEmpty(udiEntity.getSerialNo())) { List invProductDetailEntities = invPreinDetailService.findByCode(code); if (CollUtil.isNotEmpty(invProductDetailEntities)) { @@ -821,7 +821,7 @@ public class IoCodeTempController extends BaseController { public BaseResponse checkInv(BasicBussinessTypeEntity bussinessTypeEntity, IoCodeTempEntity codeTempEntity) { if (bussinessTypeEntity.isVailInv()) { - if (bussinessTypeEntity.isAdvanceType()) { + if (bussinessTypeEntity.getActionType() == ConstantStatus.ACTION_TYPE_ADVANCE) { // int count = invPreProductDetailService.vailStockCount(code); //todo 寄售 // if (count < 0) { // return ResultVOUtils.error(500, "当前库存不足，不允许0库存出库"); diff --git a/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java index 17077813..789b8662 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java @@ -294,8 +294,8 @@ public class BasicBussinessTypeEntity { /** * 是否预入库 */ - @TableField(value = "advanceType") - private boolean advanceType; +// @TableField(value = "advanceType") +// private boolean advanceType; /** * 是否流转 @@ -312,8 +312,8 @@ public class BasicBussinessTypeEntity { /** * 是否预验收单据类型 */ - @TableField(value = "preIn") - private boolean preIn; +// @TableField(value = "preIn") +// private boolean preIn; @TableField(value = "preInBack") @@ -356,10 +356,14 @@ public class BasicBussinessTypeEntity { @TableField(value = "busType") - private Integer busType; //1:正常；2：送货；3.到货 + private Integer busType; //1:正常；2：送货；3.到货,4:退货 @TableField(value = "inStock") private boolean inStock; + @TableField(value = "actionType") + private Integer actionType; //1：带票（正常）；2.预验收。3：寄售 + + } diff --git a/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java b/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java index 47225276..3f6048c7 100644 --- a/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java @@ -275,7 +275,7 @@ public class BussinessTypeSaveRequest { private boolean vailDispatch; //校验是否可配送 private int vailGroupBuy; //校验是否集采产品 0:全部，1：只采集集采产品，2：只采集非集采产品 private Integer busType; //1:正常；2：送货；3.到货 - + private Integer actionType; private boolean inStock; } diff --git a/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java b/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java index 1b20d919..4b400205 100644 --- a/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java +++ b/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java @@ -127,7 +127,7 @@ public class BasicBussinessTypeResponse { private int vailGroupBuy; //校验是否集采产品 0:全部，1：只采集集采产品，2：只采集非集采产品 private Integer busType; //1:正常；2：送货；3.到货 - + private Integer actionType; private boolean inStock; 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 468cf2b2..35f72cdb 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java @@ -670,9 +670,9 @@ public class IoCheckInoutService { if (bussinessTypeEntity.isInStock()) { // if (bussinessTypeEntity.getBusType() == ConstantStatus.BUS_TYPE_NORMAL) { //生成库存 - if (bussinessTypeEntity.isPreIn()) { + if (bussinessTypeEntity.getActionType() == ConstantStatus.ACTION_TYPE_PREIN) { genInvService.genPreInInv(orderEntity.getBillNo()); - } else if (bussinessTypeEntity.isAdvanceType()) { + } else if (bussinessTypeEntity.getActionType() == ConstantStatus.ACTION_TYPE_ADVANCE) { genInvService.genPreInv(orderEntity.getBillNo()); } else { genInvService.genNorInv(orderEntity.getBillNo()); diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index 0cc2b865..5660f1ea 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -184,10 +184,10 @@ public class IoOrderServiceImpl implements IoOrderService { if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_AUDITED) { BasicBussinessTypeEntity basicBussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction()); //判断单据是否是预验收单据，如果是预验收单据，则删除预验收库库存 - if (basicBussinessTypeEntity.isPreIn()) { + if (basicBussinessTypeEntity.getActionType() == ConstantStatus.ACTION_TYPE_PREIN) { preinOrderService.deleteByOrderId(billNo); preinDetailService.deleteByOrderId(billNo); - } else if (basicBussinessTypeEntity.isAdvanceType()) { + } else if (basicBussinessTypeEntity.getActionType() == ConstantStatus.ACTION_TYPE_ADVANCE) { //是否寄售，删除寄售库存 List invProductDetailEntities = invPreProductDetailService.selectByOrderIdFk(billNo); if (CollUtil.isNotEmpty(invProductDetailEntities)) { @@ -279,7 +279,7 @@ public class IoOrderServiceImpl implements IoOrderService { BasicBussinessTypeEntity basicBussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction()); //预验收库存 - if (basicBussinessTypeEntity.isPreIn()) { + if (basicBussinessTypeEntity.getActionType() == ConstantStatus.ACTION_TYPE_PREIN) { InvPreinDetailEntity invPreinDetailEntity = preinDetailService.findByCode(billNo, code); int count = invPreinDetailEntity.getCount() - 1; @@ -292,7 +292,7 @@ public class IoOrderServiceImpl implements IoOrderService { preinDetailService.update(invPreinDetailEntity); } - } else if (basicBussinessTypeEntity.isAdvanceType()) { //寄售库存 + } else if (basicBussinessTypeEntity.getActionType() == ConstantStatus.ACTION_TYPE_ADVANCE) { //寄售库存 InvPreProductDetailEntity invProductDetailEntity = invPreProductDetailService.selectByCode(billNo, code); int count = invProductDetailEntity.getCount() - 1; if (count == 0) { @@ -378,7 +378,7 @@ public class IoOrderServiceImpl implements IoOrderService { BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction()); //预验收撤回---直接删除预验收库存 - if (bussinessTypeEntity.isPreIn()) { + if (bussinessTypeEntity.getActionType() == ConstantStatus.ACTION_TYPE_PREIN) { invPreinOrderService.deleteByOrderId(billNo); invPreinDetailService.deleteByOrderId(billNo); } else { diff --git a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml index 44854b00..10843214 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml @@ -68,7 +68,7 @@ entrutSpms, codeFillCheck, defaultSubInv, defaultInv, orderVisibleType, checkCopy, secCheckCopy, originAction, advanceType, changeEnable, spUse, preIn, supplementAll, createUser, createTime, preInBack, vailDispatch, - vailGroupBuy, busType, inStock) + vailGroupBuy, busType, inStock,actionType) values (#{mainAction}, #{action}, #{name}, @@ -120,7 +120,7 @@ #{preIn}, #{supplementAll}, #{createUser}, - #{createTime}, #{preInBack}, #{vailDispatch}, #{vailGroupBuy}，#{busType}, #{inStock}) + #{createTime}, #{preInBack}, #{vailDispatch}, #{vailGroupBuy}，#{busType}, #{inStock}，#{actionType})