From 1cd0d2f8fa67ee17fc28909e086ba7b0fb2ac7be Mon Sep 17 00:00:00 2001 From: yewj Date: Sat, 18 Jan 2025 14:34:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E4=BD=8D=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E6=89=AB=E7=A0=81=E6=95=B0=E9=87=8F=EF=BC=8C=E5=87=BA?= =?UTF-8?q?=E5=85=A5=E4=BD=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/entity/inout/IoSplitFifoInv.java | 21 ++++++++++++++++--- .../api/service/inout/IoSplitCodeService.java | 10 +++++++++ .../service/inout/IoSplitFifoInvService.java | 8 +++++++ .../api/service/inout/IoSplitQxService.java | 15 +++++++++---- src/main/resources/schemas/schema_v2.4.sql | 15 +++++++++++++ 5 files changed, 62 insertions(+), 7 deletions(-) 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 c7708781c..5b8d3d542 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoSplitFifoInv.java +++ b/src/main/java/com/glxp/api/entity/inout/IoSplitFifoInv.java @@ -110,6 +110,24 @@ public class IoSplitFifoInv implements Serializable { @ApiModelProperty(value = "入库数量") private Integer inCount; + /** + * 入库码数量 + */ + @TableField(value = "inCodeCount") + private Integer inCodeCount; + + /** + * 出库码数量 + */ + @TableField(value = "outCodeCount") + private Integer outCodeCount; + + /** + * 剩余码数量 + */ + @TableField(value = "reCodeCount") + private Integer reCodeCount; + /** * 出库数量 */ @@ -132,7 +150,6 @@ public class IoSplitFifoInv implements Serializable { private Integer availableCount; - /** * 锁定数量 */ @@ -178,7 +195,5 @@ public class IoSplitFifoInv implements Serializable { private String workPlaceQueueCode; - - private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java index 60526847c..a6499ec6a 100644 --- a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java +++ b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java @@ -247,9 +247,11 @@ public class IoSplitCodeService extends ServiceImpl 0 ? lockCount : 0); splitFifoInv.setReCount(IntUtil.value(splitFifoInv.getInCount()) - IntUtil.value(splitFifoInv.getOutCount())); + splitFifoInv.setReCodeCount(IntUtil.value(splitFifoInv.getInCodeCount()) - IntUtil.value(splitFifoInv.getOutCodeCount())); splitFifoInv.setAvailableCount(IntUtil.value(splitFifoInv.getInCount()) - IntUtil.value(splitFifoInv.getLockCount()) - IntUtil.value(splitFifoInv.getOutCount())); splitFifoInvService.updateById(splitFifoInv); } @@ -271,9 +273,11 @@ public class IoSplitCodeService extends ServiceImpl 0 ? lockCount : 0); splitFifoInv.setReCount(IntUtil.value(splitFifoInv.getInCount()) - IntUtil.value(splitFifoInv.getOutCount())); + splitFifoInv.setReCodeCount(IntUtil.value(splitFifoInv.getInCodeCount()) - IntUtil.value(splitFifoInv.getOutCodeCount())); splitFifoInv.setAvailableCount(IntUtil.value(splitFifoInv.getInCount()) - IntUtil.value(splitFifoInv.getLockCount()) - IntUtil.value(splitFifoInv.getOutCount())); splitFifoInvService.updateById(splitFifoInv); } @@ -379,9 +383,11 @@ public class IoSplitCodeService extends ServiceImpl 0 ? lockCount : 0); splitFifoInv.setReCount(IntUtil.value(splitFifoInv.getInCount()) - IntUtil.value(splitFifoInv.getOutCount())); + splitFifoInv.setReCodeCount(IntUtil.value(splitFifoInv.getInCodeCount()) - IntUtil.value(splitFifoInv.getOutCodeCount())); splitFifoInv.setAvailableCount(IntUtil.value(splitFifoInv.getInCount()) - IntUtil.value(splitFifoInv.getLockCount()) - IntUtil.value(splitFifoInv.getOutCount())); splitFifoInvService.updateById(splitFifoInv); } @@ -518,9 +524,11 @@ public class IoSplitCodeService extends ServiceImpl 0 ? lockCount : 0); splitFifoInv.setReCount(IntUtil.value(splitFifoInv.getInCount()) - IntUtil.value(splitFifoInv.getOutCount())); + splitFifoInv.setReCodeCount(IntUtil.value(splitFifoInv.getInCodeCount()) - IntUtil.value(splitFifoInv.getOutCodeCount())); splitFifoInv.setAvailableCount(IntUtil.value(splitFifoInv.getInCount()) - IntUtil.value(splitFifoInv.getLockCount()) - IntUtil.value(splitFifoInv.getOutCount())); splitFifoInvService.updateById(splitFifoInv); } @@ -711,9 +719,11 @@ public class IoSplitCodeService extends ServiceImpl 0 ? lockCount : 0); splitFifoInv.setReCount(IntUtil.value(splitFifoInv.getInCount()) - IntUtil.value(splitFifoInv.getOutCount())); + splitFifoInv.setReCodeCount(IntUtil.value(splitFifoInv.getInCodeCount()) - IntUtil.value(splitFifoInv.getOutCodeCount())); splitFifoInv.setAvailableCount(IntUtil.value(splitFifoInv.getInCount()) - IntUtil.value(splitFifoInv.getLockCount()) - IntUtil.value(splitFifoInv.getOutCount())); splitFifoInvService.updateById(splitFifoInv); } diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java b/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java index cb03e635a..06e17e9cd 100644 --- a/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java +++ b/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java @@ -78,8 +78,10 @@ public class IoSplitFifoInvService extends ServiceImpl 0 ? lockCount : 0); splitFifoInv.setReCount(IntUtil.value(splitFifoInv.getInCount()) - IntUtil.value(splitFifoInv.getOutCount())); + splitFifoInv.setReCodeCount(IntUtil.value(splitFifoInv.getInCodeCount()) - IntUtil.value(splitFifoInv.getOutCodeCount())); splitFifoInv.setAvailableCount(IntUtil.value(splitFifoInv.getInCount()) - IntUtil.value(splitFifoInv.getLockCount()) - IntUtil.value(splitFifoInv.getOutCount())); splitFifoInvService.updateById(splitFifoInv); } @@ -101,9 +103,11 @@ public class IoSplitQxService { IoSplitFifoInv splitFifoInv = splitFifoInvService.findByFifoCode(splitFifoCodeEntity); if (splitFifoInv != null) { splitFifoInv.setOutCount(IntUtil.value(splitFifoInv.getOutCount()) + removeCount); + splitFifoInv.setOutCodeCount(IntUtil.value(splitFifoInv.getOutCodeCount()) + IntUtil.value(collectOrderCodeMan.getScanCount())); int lockCount = IntUtil.value(splitFifoInv.getLockCount()) - removeCount; splitFifoInv.setLockCount(lockCount > 0 ? lockCount : 0); splitFifoInv.setReCount(IntUtil.value(splitFifoInv.getInCount()) - IntUtil.value(splitFifoInv.getOutCount())); + splitFifoInv.setReCodeCount(IntUtil.value(splitFifoInv.getInCodeCount()) - IntUtil.value(splitFifoInv.getOutCodeCount())); splitFifoInv.setAvailableCount(IntUtil.value(splitFifoInv.getInCount()) - IntUtil.value(splitFifoInv.getLockCount()) - IntUtil.value(splitFifoInv.getOutCount())); splitFifoInvService.updateById(splitFifoInv); } @@ -353,14 +357,14 @@ public class IoSplitQxService { splitCode.setStatus(1); splitCode.setFifoSplit(newFifoCode.getFifoSplit()); splitCode.setId(null); - + this.decorateUnpackExpireTime(splitCode); splitCodesToAdd.add(splitCode); // Update inventory IoSplitFifoInv inventory = splitFifoInvService.findByFifoCode(newFifoCode); if (inventory != null) { - updateInventory(inventory, newFifoCode.getTotalCount()); + updateInventory(inventory, newFifoCode.getTotalCount(), newFifoCode.getScanCount()); splitFifoInvService.updateById(inventory); } @@ -397,11 +401,14 @@ public class IoSplitQxService { return totalProcessedCount; } - private void updateInventory(IoSplitFifoInv inventory, Integer processedCount) { + private void updateInventory(IoSplitFifoInv inventory, Integer processedCount, Integer scanCount) { inventory.setOutCount(IntUtil.value(inventory.getOutCount()) + IntUtil.value(processedCount)); + + inventory.setOutCodeCount(IntUtil.value(inventory.getOutCodeCount()) + IntUtil.value(scanCount)); int lockCount = IntUtil.value(inventory.getLockCount()) - IntUtil.value(processedCount); inventory.setLockCount(lockCount > 0 ? lockCount : 0); inventory.setReCount(IntUtil.value(inventory.getInCount()) - IntUtil.value(inventory.getOutCount())); + inventory.setReCodeCount(IntUtil.value(inventory.getInCodeCount()) - IntUtil.value(inventory.getOutCodeCount())); inventory.setAvailableCount(IntUtil.value(inventory.getInCount()) - IntUtil.value(inventory.getLockCount()) - IntUtil.value(inventory.getOutCount())); } @@ -459,7 +466,7 @@ public class IoSplitQxService { collectOrderCode.setRemainCount(collectOrderCode.getScanActCount()); } newList.add(collectOrderCode); - } else { + } else { count = count + collectOrderCode.getScanActCount(); if (!IntUtil.value(collectOrderCode.getRemoveFlag())) { if (count > collectOrderBiz.getCount()) { diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 23222f754..cfda30262 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -5152,3 +5152,18 @@ CALL Pro_Temp_ColumnWork('io_order', 'warehouseId', 'int(10)', 1); CALL Pro_Temp_ColumnWork('sys_workplace_freight', 'freightRow', ' int NULL DEFAULT ''1''COMMENT ''区域编码''', 1); + + + +CALL Pro_Temp_ColumnWork('io_split_fifo_inv', 'inCodeCount', + 'int NULL DEFAULT NULL COMMENT ''入库码数量''', + 1); + + +CALL Pro_Temp_ColumnWork('io_split_fifo_inv', 'outCodeCount', + 'int NULL DEFAULT NULL COMMENT ''出库码数量''', + 1); + +CALL Pro_Temp_ColumnWork('io_split_fifo_inv', 'reCodeCount', + 'int NULL DEFAULT NULL COMMENT ''剩余码数量''', + 1);