处理单据时显示工位存量和拆零存量

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<IoCollectOrderOrigin>().eq(IoCollectOrderOrigin::getBillNo,collectOrder.getBillNo())
-            .set(IoCollectOrderOrigin::getTagStatus,2));
+        if (collectOrder.getTagStatus() == 2) {
+            collectOrderOriginService.update(new LambdaUpdateWrapper<IoCollectOrderOrigin>().eq(IoCollectOrderOrigin::getBillNo, collectOrder.getBillNo())
+                    .set(IoCollectOrderOrigin::getTagStatus, 2));
         }
         return ResultVOUtils.success();
     }

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;

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;
+
 }

src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java

@@ -492,7 +492,7 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
             }
         }
         ArrayList<IoCollectOrderBizBackup> 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<IoSplitCodeMapper, IoSplitCo
             int total = splitFifoCodeEntities.stream()
                     .mapToInt(IoSplitFifoCodeEntity::getTotalCount)
                     .sum();
-
+            collectOrderBiz.setTempWorkPlaceCount(total);
             List<IoSplitCodeEntity> 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);

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);
+