From 6bb1edad565c1f1b191c5aaba0ca8fc8f142c92a Mon Sep 17 00:00:00 2001 From: yewj Date: Fri, 30 Aug 2024 16:21:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=B7=BB=E5=8A=A0=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/inout/IoCodeTempController.java | 1 + .../com/glxp/api/entity/inout/IoOrderEntity.java | 6 ++++++ .../api/entity/inout/IoSplitFifoCodeEntity.java | 8 ++++++++ .../com/glxp/api/req/inout/AddOrderRequest.java | 4 ++++ .../glxp/api/service/inout/IoCheckInoutService.java | 2 +- .../api/service/inout/IoSplitFifoCodeService.java | 1 - .../api/service/inout/IoSplitFifoInvService.java | 13 +++++++------ 7 files changed, 27 insertions(+), 8 deletions(-) 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 eb838fa11..11826cf29 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -829,6 +829,7 @@ public class IoCodeTempController extends BaseController { orderEntity.setWorkPlaceCode(addOrderRequest.getWorkPlaceCode()); orderEntity.setProductType(1); orderEntity.setFifoSplit(addOrderRequest.getFifoSplit()); + orderEntity.setSplitBusType(addOrderRequest.getSplitBusType()); orderService.insertOrder(orderEntity); } diff --git a/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java b/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java index fe1f4d681..cb877f19a 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java @@ -334,5 +334,11 @@ public class IoOrderEntity { */ @TableField(value = "fifoSplit") private Integer fifoSplit; + /** + * 上货方式:1:拆零上货;2:整取上货 + */ + @TableField(value = "splitBusType") + private String splitBusType; + } diff --git a/src/main/java/com/glxp/api/entity/inout/IoSplitFifoCodeEntity.java b/src/main/java/com/glxp/api/entity/inout/IoSplitFifoCodeEntity.java index 4b69f5a01..1e0fda7aa 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoSplitFifoCodeEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoSplitFifoCodeEntity.java @@ -203,5 +203,13 @@ public class IoSplitFifoCodeEntity implements Serializable { @TableField(value = "fifoSplit") private Integer fifoSplit; + + /** + * 业务类型 + */ + @TableField(value = "busType") + @ApiModelProperty(value = "业务类型") + private String busType; + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/glxp/api/req/inout/AddOrderRequest.java b/src/main/java/com/glxp/api/req/inout/AddOrderRequest.java index fac1ad7f8..f84df6eab 100644 --- a/src/main/java/com/glxp/api/req/inout/AddOrderRequest.java +++ b/src/main/java/com/glxp/api/req/inout/AddOrderRequest.java @@ -51,4 +51,8 @@ public class AddOrderRequest { * 上货方式:1:拆零上货;2:整取上货 */ private Integer fifoSplit; + /** + * 工位上下货业务类型 + */ + private String splitBusType; } 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 933e0e7b0..ba77bb17d 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java @@ -1242,7 +1242,7 @@ public class IoCheckInoutService { //若未拆零预出库单据则进入到拆零队列 if (orderEntity.getAction().equals(ConstantType.SPLIT_OUT)) { List codeList = codeService.findByOrderId(orderEntity.getBillNo()); - fifoInvService.insertInv(codeList, orderEntity.getWorkPlaceCode()); + fifoInvService.insertInv(codeList, orderEntity.getWorkPlaceCode(), orderEntity.getSplitBusType()); //更新待处理库存不足单据 splitFifoCodeService.updateAllInvAlert(orderEntity.getWorkPlaceCode()); } else if (orderEntity.getAction().equals(ConstantType.SPLIT_RETURN)) { diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java b/src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java index dff928515..00cb56db8 100644 --- a/src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java +++ b/src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java @@ -393,7 +393,6 @@ public class IoSplitFifoCodeService extends ServiceImpl codeList, Long workPlaceCode) { + public void insertInv(List codeList, Long workPlaceCode, String busType) { List splitCodeEntities = new ArrayList<>(); if (CollUtil.isNotEmpty(codeList)) { @@ -45,6 +45,7 @@ public class IoSplitFifoInvService extends ServiceImpl() - .eq(IoSplitFifoInv::getRelId, ioSplitFifoCodeEntity.getRelId()) - .eq(IoSplitFifoInv::getWorkPlaceCode, ioSplitFifoCodeEntity.getWorkPlaceCode()) - .eq(StrUtil.isNotEmpty(ioSplitFifoCodeEntity.getBatchNo()), IoSplitFifoInv::getBatchNo, ioSplitFifoCodeEntity.getBatchNo()) - .eq(ioSplitFifoCodeEntity.getSupId() != null, IoSplitFifoInv::getSupId, ioSplitFifoCodeEntity.getSupId()).last("limit 1")); + + IoSplitFifoInv splitFifoInv = findByFifoCode(ioSplitFifoCodeEntity); if (splitFifoInv != null) { splitFifoInv.setInCount(IntUtil.value(splitFifoInv.getInCount()) + IntUtil.value(ioSplitFifoCodeEntity.getTotalCount())); splitFifoInv.setReCount(IntUtil.value(splitFifoInv.getInCount() - IntUtil.value(splitFifoInv.getOutCount()))); @@ -77,6 +76,7 @@ public class IoSplitFifoInvService extends ServiceImpl