From c14d32bf571a4ded061ead851038ac3b14a82b2d Mon Sep 17 00:00:00 2001 From: yewj Date: Tue, 27 Aug 2024 11:50:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=97=E6=9D=90=E5=AD=97=E5=85=B8=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E5=8D=95=E5=85=83=EF=BC=8C=E6=B5=81=E9=80=9A=E5=8D=95?= =?UTF-8?q?=E5=85=83=E7=AD=89=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/UdiRelevanceController.java | 10 +++ .../glxp/api/entity/inout/IoSplitFifoInv.java | 10 +++ .../req/basic/UdiRelevanceSaveRequest.java | 3 +- .../api/res/basic/UdiRelevanceResponse.java | 4 +- .../service/inout/IoCheckInoutService.java | 19 ++-- .../mybatis/mapper/basic/UdiRelevanceDao.xml | 6 ++ .../mapper/collect/IoCollectOrderMapper.xml | 86 +++++++++++-------- 7 files changed, 90 insertions(+), 48 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java index a96e10157..6ec52d766 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java @@ -351,6 +351,16 @@ public class UdiRelevanceController extends BaseController { udiRelevanceEntity.setModifyTime(new Date()); udiRelevanceEntity.setUpdateUser(customerService.getUserId() + ""); udiRelevanceEntity.setUseMuti(udiRelevanceEntity.getUseMuti()); + udiRelevanceEntity.setUseLeverCount(udiRelevanceSaveRequest.getUseLeverCount()); + udiRelevanceEntity.setSplitEnable(udiRelevanceSaveRequest.getSplitEnable()); + udiRelevanceEntity.setUseLevelDi(udiRelevanceSaveRequest.getUseLevelDi()); + udiRelevanceEntity.setUseLevelUnit(udiRelevanceSaveRequest.getUseLevelUnit()); + udiRelevanceEntity.setUseLevel(udiRelevanceSaveRequest.getUseLevel()); + udiRelevanceEntity.setDistributeLevelDi(udiRelevanceSaveRequest.getDistributeLevelDi()); + udiRelevanceEntity.setDistributeLevelUnit(udiRelevanceSaveRequest.getDistributeLevelUnit()); + udiRelevanceEntity.setDistributeLevelCount(udiRelevanceSaveRequest.getDistributeLevelCount()); + udiRelevanceEntity.setDistributeLevel(udiRelevanceSaveRequest.getDistributeLevel()); + udiRelevanceEntity.setPayFeeCode(udiRelevanceSaveRequest.getPayFeeCode()); udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); //关联更新 diff --git a/src/main/java/com/glxp/api/entity/inout/IoSplitFifoInv.java b/src/main/java/com/glxp/api/entity/inout/IoSplitFifoInv.java index 1cad101e6..9c2c5ab84 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoSplitFifoInv.java +++ b/src/main/java/com/glxp/api/entity/inout/IoSplitFifoInv.java @@ -6,8 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; + import java.io.Serializable; import java.util.Date; + import lombok.Data; @ApiModel(value = "io_split_fifo_inv") @@ -102,6 +104,14 @@ public class IoSplitFifoInv implements Serializable { @ApiModelProperty(value = "出库数量") private String outCount; + /** + * 锁定数量 + */ + @TableField(value = "lockCount") + @ApiModelProperty(value = "锁定数量") + private String lockCount; + + /** * 创建时间 */ diff --git a/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java b/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java index cfb440710..4211b4cfa 100644 --- a/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java +++ b/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java @@ -166,7 +166,8 @@ public class UdiRelevanceSaveRequest { private String useLevelDi; private String useLevelUnit; private Integer useLeverCount; - + private Integer useLevel; + private Integer distributeLevel; //工位预警数 private Integer workPlaceCount; } diff --git a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java index cb7be92a2..a9b5d817b 100644 --- a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java @@ -257,6 +257,7 @@ public class UdiRelevanceResponse { * 工位预警数量 */ private Integer workPlaceCount; + public int getBhzxxsbzsl() { if (bhzxxsbzsl == null || bhzxxsbzsl == 0) { return 1; @@ -296,5 +297,6 @@ public class UdiRelevanceResponse { return isUseDy; } - + private Integer distributeLevel; + private Integer useLevel; } 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 d8ebfd7a9..8e0a5a9ef 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java @@ -1234,19 +1234,20 @@ public class IoCheckInoutService { } else { genInvService.genNorInv(orderEntity.getBillNo()); orderService.updateOrderInventory(orderEntity.getBillNo(), orderEntity.getStatus()); - //若未拆零预出库单据则进入到拆零队列 - if (orderEntity.getAction().equals(ConstantType.SPLIT_OUT)) { - List codeList = codeService.findByOrderId(orderEntity.getBillNo()); - fifoInvService.insertInv(codeList, orderEntity.getWorkPlaceCode()); - } else if (orderEntity.getAction().equals(ConstantType.SPLIT_RETURN)) { - //拆零预出库退回 - List codeList = codeService.findByOrderId(orderEntity.getBillNo()); - fifoInvService.removeInv(codeList, orderEntity.getWorkPlaceCode()); - } } } else { //不入库存，直接进行单据流转 changeInoutService.changeOrder(orderEntity); + + //若未拆零预出库单据则进入到拆零队列 + if (orderEntity.getAction().equals(ConstantType.SPLIT_OUT)) { + List codeList = codeService.findByOrderId(orderEntity.getBillNo()); + fifoInvService.insertInv(codeList, orderEntity.getWorkPlaceCode()); + } else if (orderEntity.getAction().equals(ConstantType.SPLIT_RETURN)) { + //拆零预出库退回 + List codeList = codeService.findByOrderId(orderEntity.getBillNo()); + fifoInvService.removeInv(codeList, orderEntity.getWorkPlaceCode()); + } } } diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index b0c7bf0bf..d0efd854d 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -1526,6 +1526,12 @@ useLeverCount=#{useLeverCount}, + + useLevel=#{useLevel}, + + + distributeLevel=#{distributeLevel}, + WHERE id = #{id} diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml index acdc2d1f3..1e2817403 100644 --- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml @@ -3,19 +3,35 @@ -- 清除拆零队列 - TRUNCATE io_split_code; - TRUNCATE io_split_code_detail; - TRUNCATE io_split_fifo_code; + TRUNCATE io_split_code; + TRUNCATE io_split_code_detail; + TRUNCATE io_split_fifo_code; -- 清除拆零，原始单据等 - TRUNCATE io_collect_order; - TRUNCATE io_collect_order_biz; - TRUNCATE io_collect_order_code_auto; - TRUNCATE io_collect_order_code_man + TRUNCATE io_collect_code; + TRUNCATE io_collect_order; + TRUNCATE io_collect_order_biz; + TRUNCATE io_collect_order_code_auto; + TRUNCATE io_collect_order_code_man @@ -92,5 +105,4 @@ SET invAlert = #{invAlert} WHERE id = #{id} -