From 6bee8dcc47a879a14ee9c8e931d65592b11c04f2 Mon Sep 17 00:00:00 2001 From: yewj Date: Thu, 12 Sep 2024 16:04:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=8D=95=E6=8D=AE=E6=97=B6?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=B7=A5=E4=BD=8D=E5=AD=98=E9=87=8F=E5=92=8C?= =?UTF-8?q?=E6=8B=86=E9=9B=B6=E5=AD=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collect/IoCollectOrderController.java | 6 +++--- .../glxp/api/entity/collect/IoCollectOrderBiz.java | 13 +++++++++++++ .../api/res/collect/CollectOrderBizResponse.java | 11 +++++++++++ .../glxp/api/service/inout/IoSplitCodeService.java | 5 +++-- src/main/resources/schemas/schema_v2.4.sql | 11 +++++++++++ 5 files changed, 41 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java index 0509ed45d..b6d679b8b 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java @@ -255,9 +255,9 @@ public class IoCollectOrderController extends BaseController { collectOrder.setUpdateUser(getUserId()); collectOrderService.updateById(collectOrder); - if (collectOrder.getTagStatus() == 2){ - collectOrderOriginService.update( new LambdaUpdateWrapper().eq(IoCollectOrderOrigin::getBillNo,collectOrder.getBillNo()) - .set(IoCollectOrderOrigin::getTagStatus,2)); + if (collectOrder.getTagStatus() == 2) { + collectOrderOriginService.update(new LambdaUpdateWrapper().eq(IoCollectOrderOrigin::getBillNo, collectOrder.getBillNo()) + .set(IoCollectOrderOrigin::getTagStatus, 2)); } return ResultVOUtils.success(); } diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBiz.java b/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBiz.java index 83c93c197..b1f45ee6f 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBiz.java +++ b/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBiz.java @@ -213,6 +213,19 @@ public class IoCollectOrderBiz implements Serializable { @ApiModelProperty(value = "autoTagStatus") private Integer autoTagStatus; + /** + * 临时工位存量 + */ + @TableField(value = "tempWorkPlaceCount") + @ApiModelProperty(value = "tempWorkPlaceCount") + private Integer tempWorkPlaceCount; + /** + * 临时拆零存量 + */ + @TableField(value = "tempSplitCount") + @ApiModelProperty(value = "tempSplitCount") + private Integer tempSplitCount; + @TableField(value = "searchRemark1") @ApiModelProperty(value = "searchRemark1") private String searchRemark1; diff --git a/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java b/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java index 4805437fa..eb7d32e8d 100644 --- a/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java +++ b/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java @@ -1,5 +1,7 @@ package com.glxp.api.res.collect; +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @@ -132,4 +134,13 @@ public class CollectOrderBizResponse { * 自动赋码状态：1：无法自动赋码；2：可以自动赋码；3:可以自动赋码，但是数量不足 */ private Integer autoTagStatus; + /** + * 临时工位存量 + */ + private Integer tempWorkPlaceCount; + /** + * 临时拆零存量 + */ + private Integer tempSplitCount; + } 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 c0261cb04..fb038b3dd 100644 --- a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java +++ b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java @@ -492,7 +492,7 @@ public class IoSplitCodeService extends ServiceImpl ioCollectOrderBizBackups = new ArrayList<>(); - for (IoCollectOrderBiz ioCollectOrderBiz : collectOrderBizs){ + for (IoCollectOrderBiz ioCollectOrderBiz : collectOrderBizs) { IoCollectOrderBizBackup ioCollectOrderBizBackup = new IoCollectOrderBizBackup(); BeanUtils.copyProperties(ioCollectOrderBiz, ioCollectOrderBizBackup); ioCollectOrderBizBackups.add(ioCollectOrderBizBackup); @@ -515,12 +515,13 @@ public class IoSplitCodeService extends ServiceImpl splitCodeEntities = splitCodeService.findSplitCodes(collectOrderBiz.getRelId() , collectOrderBiz.getBatchNo(), collectOrder.getWorkPlaceCode()); int splitTotal = splitCodeEntities.stream() .mapToInt(IoSplitCodeEntity::getRemainCount) .sum(); + collectOrderBiz.setTempSplitCount(splitTotal); total = total + splitTotal; if (total >= IntUtil.value(collectOrderBiz.getCount())) { collectOrderBiz.setAutoTagStatus(2); diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 112226600..442b465b5 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -4371,3 +4371,14 @@ CALL Pro_Temp_ColumnWork('sys_workplace_document', 'isPopular', CALL Pro_Temp_ColumnWork('sys_workplace_document', 'number', 'int NULL DEFAULT NULL COMMENT ''顺序号''', 1); + + + +CALL Pro_Temp_ColumnWork('io_collect_order_biz', 'tempWorkPlaceCount', + 'int NULL DEFAULT NULL COMMENT ''临时工位存量''', + 1); + +CALL Pro_Temp_ColumnWork('io_collect_order_biz', 'tempSplitCount', + 'int NULL DEFAULT NULL COMMENT ''临时拆零存量''', + 1); +