楚江ERP：补货单增加是否已完成标识和是否为当前创建人判断

@@ -267,6 +267,7 @@ create table `tbl_replenishment_order`
     `total_shipped_quantity`       decimal(15, 4) COMMENT '总实发',
     `total_shipped_quantity`       decimal(15, 4) COMMENT '总实发',
     `total_supplementary_quantity` decimal(15, 4) COMMENT '总补发',
     `total_supplementary_quantity` decimal(15, 4) COMMENT '总补发',
     `status`                       varchar(20) comment '状态',
     `status`                       varchar(20) comment '状态',
+    `completed`                    TINYINT(1) comment '补货单是否已完成',
     `create_by_id`                 varchar(32) not null comment '创建人ID',
     `create_by_id`                 varchar(32) not null comment '创建人ID',
     `create_by`                    varchar(20) not null comment '创建人',
     `create_by`                    varchar(20) not null comment '创建人',
     `update_by_id`                 varchar(32) not null comment '更新人ID',
     `update_by_id`                 varchar(32) not null comment '更新人ID',

 package com.lframework.xingyun.sc.bo.purchase;
 package com.lframework.xingyun.sc.bo.purchase;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.lframework.starter.common.constants.StringPool;
 import com.lframework.starter.common.constants.StringPool;
 import com.lframework.starter.web.core.bo.BaseBo;
 import com.lframework.starter.web.core.bo.BaseBo;
@@ -104,6 +105,12 @@ public class QueryReplenishmentOrderBo extends BaseBo<ReplenishmentOrder> {
     private String statusName;
     private String statusName;
 
 
     /**
     /**
+     * 补货单是否已完成
+     */
+    @ApiModelProperty("补货单是否已完成")
+    private Boolean completed;
+
+    /**
      * 申请日期
      * 申请日期
      */
      */
     @ApiModelProperty("申请日期")
     @ApiModelProperty("申请日期")
@@ -116,6 +123,12 @@ public class QueryReplenishmentOrderBo extends BaseBo<ReplenishmentOrder> {
     @ApiModelProperty("是否展示审核按钮(非持久化字段)")
     @ApiModelProperty("是否展示审核按钮(非持久化字段)")
     private Boolean showExamine;
     private Boolean showExamine;
 
 
+    /**
+     * 是否为拥有人(非持久化字段)
+     */
+    @ApiModelProperty("是否为拥有人(非持久化字段)")
+    private Boolean isOwner;
+
     public QueryReplenishmentOrderBo() {
     public QueryReplenishmentOrderBo() {
 
 
     }
     }

@@ -256,7 +256,7 @@ public class ReplenishmentOrderController extends DefaultBaseController {
         return InvokeResultBuilder.success();
         return InvokeResultBuilder.success();
     }
     }
 
 
-    @ApiOperation("回去补回单编号")
+    @ApiOperation("获取补回单编号")
     @GetMapping("/getCode")
     @GetMapping("/getCode")
     public InvokeResult<String> getCode(@NotBlank(message = "订货单ID不可为空！") String purchaseOrderId) {
     public InvokeResult<String> getCode(@NotBlank(message = "订货单ID不可为空！") String purchaseOrderId) {
         PurchaseOrderInfo purchaseOrderInfo = purchaseOrderInfoService.findById(purchaseOrderId);
         PurchaseOrderInfo purchaseOrderInfo = purchaseOrderInfoService.findById(purchaseOrderId);

@@ -80,6 +80,11 @@ public class ReplenishmentOrder extends BaseEntity implements BaseDto {
     private String status;
     private String status;
 
 
     /**
     /**
+     * 补货单是否已完成
+     */
+    private Boolean completed;
+
+    /**
      * 创建人ID
      * 创建人ID
      */
      */
     @TableField(fill = FieldFill.INSERT)
     @TableField(fill = FieldFill.INSERT)
@@ -126,4 +131,10 @@ public class ReplenishmentOrder extends BaseEntity implements BaseDto {
      */
      */
     @TableField(exist = false)
     @TableField(exist = false)
     private Boolean showExamine;
     private Boolean showExamine;
+
+    /**
+     * 是否为拥有人(非持久化字段)
+     */
+    @TableField(exist = false)
+    private Boolean isOwner;
 }
 }

@@ -74,6 +74,7 @@ public class ReplenishmentOrderServiceImpl extends BaseMpServiceImpl<Replenishme
             datas.forEach(replenishmentOrder -> {
             datas.forEach(replenishmentOrder -> {
                 replenishmentOrder.setShowExamine(businessIds.contains(replenishmentOrder.getId()));
                 replenishmentOrder.setShowExamine(businessIds.contains(replenishmentOrder.getId()));
                 replenishmentOrder.setApplicationDate(replenishmentOrder.getCreateTime().toLocalDate());
                 replenishmentOrder.setApplicationDate(replenishmentOrder.getCreateTime().toLocalDate());
+                replenishmentOrder.setIsOwner(replenishmentOrder.getCreateById().equals(SecurityUtil.getCurrentUser().getId()));
             });
             });
         }
         }
 
 
@@ -265,6 +266,11 @@ public class ReplenishmentOrderServiceImpl extends BaseMpServiceImpl<Replenishme
             replenishmentOrderLineService.update(updateWrapper);
             replenishmentOrderLineService.update(updateWrapper);
         });
         });
 
 
+        Wrapper<ReplenishmentOrder> wrapper = Wrappers.lambdaUpdate(ReplenishmentOrder.class)
+                .set(ReplenishmentOrder::getCompleted, true)
+                .eq(ReplenishmentOrder::getId, vo.getId());
+        getBaseMapper().update(wrapper);
+
         OpLogUtil.setVariable("id", vo.getId());
         OpLogUtil.setVariable("id", vo.getId());
         OpLogUtil.setExtra(data);
         OpLogUtil.setExtra(data);
 
 

@@ -14,6 +14,7 @@
         <result column="total_shipped_quantity" property="totalShippedQuantity"/>
         <result column="total_shipped_quantity" property="totalShippedQuantity"/>
         <result column="total_supplementary_quantity" property="totalSupplementaryQuantity"/>
         <result column="total_supplementary_quantity" property="totalSupplementaryQuantity"/>
         <result column="status" property="status"/>
         <result column="status" property="status"/>
+        <result column="completed" property="completed"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by" property="createBy"/>
         <result column="create_by" property="createBy"/>
         <result column="update_by_id" property="updateById"/>
         <result column="update_by_id" property="updateById"/>
@@ -34,6 +35,7 @@
                tb.total_shipped_quantity,
                tb.total_shipped_quantity,
                tb.total_supplementary_quantity,
                tb.total_supplementary_quantity,
                tb.status,
                tb.status,
+               tb.completed,
                tb.create_by_id,
                tb.create_by_id,
                tb.create_by,
                tb.create_by,
                tb.update_by_id,
                tb.update_by_id,