楚江ERP：补货单

@@ -249,4 +249,51 @@ create table `tbl_holidays`
     `update_by`    varchar(20) not null comment '更新人',
     `create_time`  datetime default now() comment '创建时间',
     `update_time`  datetime default now() comment '更新时间'
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '节假日' ROW_FORMAT = DYNAMIC;
\ No newline at end of file
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '节假日' ROW_FORMAT = DYNAMIC;
+
+-- 补货单
+DROP TABLE IF EXISTS `tbl_replenishment_order`;
+create table `tbl_replenishment_order`
+(
+    `id`                    varchar(32) primary key comment 'ID',
+    `code`                  varchar(50) NOT NULL COMMENT '编号',
+    `workshop_id`           varchar(32) comment '分厂',
+    `dept_id`               varchar(32) comment '办事处',
+    `customer_id`           varchar(32) comment '购货单位',
+    `origin_plan_ship_date` DATE COMMENT '原计划发货日期',
+    `purchase_order_id`     varchar(32) COMMENT '订货单',
+    `status`                varchar(20) comment '状态',
+    `create_by_id`          varchar(32) not null comment '创建人ID',
+    `create_by`             varchar(20) not null comment '创建人',
+    `update_by_id`          varchar(32) not null comment '更新人ID',
+    `update_by`             varchar(20) not null comment '更新人',
+    `create_time`           datetime default now() comment '创建时间',
+    `update_time`           datetime default now() comment '更新时间'
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '补货单' ROW_FORMAT = DYNAMIC;
+
+-- 补货单物料行
+DROP TABLE IF EXISTS `tbl_replenishment_order_line`;
+create table `tbl_replenishment_order_line`
+(
+    `id`                      varchar(32) primary key comment 'ID',
+    `replenishment_order_id`  varchar(32) NOT NULL COMMENT '补货单',
+    `purchase_order_line_id`  varchar(32) NOT NULL COMMENT '订货单表物料行ID',
+    `brand`                   varchar(100) COMMENT '牌号',
+    `thickness`               decimal(10, 4) COMMENT '厚度',
+    `width`                   decimal(10, 4) COMMENT '宽度',
+    `length`                  decimal(10, 4) COMMENT '长度',
+    `status`                  varchar(50) COMMENT '状态',
+    `quantity`                decimal(15, 4) COMMENT '需发(t)',
+    `shipped_quantity`        decimal(15, 4) COMMENT '实发(t)',
+    `supplementary_quantity`  decimal(15, 4) COMMENT '需求补发(t/件)',
+    `confirmed_delivery_date` DATE COMMENT '生产科确认交付日期',
+    `remarks`                 TEXT COMMENT '备注',
+    `show_order`              INT      DEFAULT 0 COMMENT '排序',
+    `item_id`                 varchar(50) COMMENT '前端用ID',
+    `create_by_id`            varchar(32) not null comment '创建人ID',
+    `create_by`               varchar(20) not null comment '创建人',
+    `update_by_id`            varchar(32) not null comment '更新人ID',
+    `update_by`               varchar(20) not null comment '更新人',
+    `create_time`             datetime default now() comment '创建时间',
+    `update_time`             datetime default now() comment '更新时间'
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '补货单物料行' ROW_FORMAT = DYNAMIC;
\ No newline at end of file

+package com.lframework.xingyun.sc.bo.purchase;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.lframework.starter.common.constants.StringPool;
+import com.lframework.starter.web.core.bo.BaseBo;
+import com.lframework.xingyun.sc.entity.ReplenishmentOrder;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * <p>
+ * 补货单 GetBo
+ * </p>
+ */
+@Data
+public class GetReplenishmentOrderBo extends BaseBo<ReplenishmentOrder> {
+
+    /**
+     * ID
+     */
+    @ApiModelProperty("ID")
+    private String id;
+
+    /**
+     * 编号
+     */
+    @ApiModelProperty("编号")
+    private String code;
+
+    /**
+     * 分厂
+     */
+    @ApiModelProperty("分厂")
+    private String workshopId;
+
+    /**
+     * 办事处
+     */
+    @ApiModelProperty("办事处")
+    private String deptId;
+
+    /**
+     * 购货单位
+     */
+    @ApiModelProperty("购货单位")
+    private String customerId;
+
+    /**
+     * 原计划发货日期
+     */
+    @ApiModelProperty("原计划发货日期")
+    @JsonFormat(pattern = StringPool.DATE_PATTERN)
+    private LocalDate originPlanShipDate;
+
+    /**
+     * 订货单
+     */
+    @ApiModelProperty("订货单")
+    private String purchaseOrderId;
+
+    /**
+     * 补货单物料行
+     */
+    @ApiModelProperty("补货单物料行")
+    private List<GetReplenishmentOrderLineBo> replenishmentOrderLineList;
+
+    public GetReplenishmentOrderBo() {
+
+    }
+
+    public GetReplenishmentOrderBo(ReplenishmentOrder dto) {
+
+        super(dto);
+    }
+
+    @Override
+    public BaseBo<ReplenishmentOrder> convert(ReplenishmentOrder dto) {
+        return super.convert(dto);
+    }
+
+    @Override
+    protected void afterInit(ReplenishmentOrder dto) {
+
+    }
+}

+package com.lframework.xingyun.sc.bo.purchase;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.lframework.starter.common.constants.StringPool;
+import com.lframework.starter.web.core.bo.BaseBo;
+import com.lframework.xingyun.sc.entity.ReplenishmentOrderLine;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+/**
+ * <p>
+ * 补货单物料行 GetBo
+ * </p>
+ */
+@Data
+public class GetReplenishmentOrderLineBo extends BaseBo<ReplenishmentOrderLine> {
+
+    /**
+     * ID
+     */
+    @ApiModelProperty("ID")
+    private String id;
+
+    /**
+     * 补货单
+     */
+    @ApiModelProperty("补货单")
+    private String replenishmentOrderId;
+
+    /**
+     * 订货单表物料行ID
+     */
+    @ApiModelProperty("订货单表物料行ID")
+    private String purchaseOrderLineId;
+
+    /**
+     * 牌号
+     */
+    @ApiModelProperty("牌号")
+    private String brand;
+
+    /**
+     * 厚度
+     */
+    @ApiModelProperty("厚度")
+    private BigDecimal thickness;
+
+    /**
+     * 宽度
+     */
+    @ApiModelProperty("宽度")
+    private BigDecimal width;
+
+    /**
+     * 长度
+     */
+    @ApiModelProperty("长度")
+    private BigDecimal length;
+
+    /**
+     * 状态
+     */
+    @ApiModelProperty("状态")
+    private String status;
+
+    /**
+     * 需发(t)
+     */
+    @ApiModelProperty("需发(t)")
+    private BigDecimal quantity;
+
+    /**
+     * 实发(t)
+     */
+    @ApiModelProperty("实发(t)")
+    private BigDecimal shippedQuantity;
+
+    /**
+     * 需求补发(t/件)
+     */
+    @ApiModelProperty("需求补发(t/件)")
+    private BigDecimal supplementaryQuantity;
+
+    /**
+     * 生产科确认交付日期
+     */
+    @ApiModelProperty("生产科确认交付日期")
+    @JsonFormat(pattern = StringPool.DATE_PATTERN)
+    private LocalDate confirmedDeliveryDate;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    private String remarks;
+
+    /**
+     * 排序
+     */
+    @ApiModelProperty("排序")
+    private Integer showOrder;
+
+    public GetReplenishmentOrderLineBo() {
+
+    }
+
+    public GetReplenishmentOrderLineBo(ReplenishmentOrderLine dto) {
+
+        super(dto);
+    }
+
+    @Override
+    public BaseBo<ReplenishmentOrderLine> convert(ReplenishmentOrderLine dto) {
+        return super.convert(dto);
+    }
+
+    @Override
+    protected void afterInit(ReplenishmentOrderLine dto) {
+
+    }
+}

+package com.lframework.xingyun.sc.bo.purchase;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.lframework.starter.common.constants.StringPool;
+import com.lframework.starter.web.core.bo.BaseBo;
+import com.lframework.xingyun.sc.entity.ReplenishmentOrder;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 补货单 QueryBo
+ * </p>
+ */
+@Data
+public class QueryReplenishmentOrderBo extends BaseBo<ReplenishmentOrder> {
+
+    /**
+     * ID
+     */
+    @ApiModelProperty("ID")
+    private String id;
+
+    /**
+     * 编号
+     */
+    @ApiModelProperty("编号")
+    private String code;
+
+    /**
+     * 分厂
+     */
+    @ApiModelProperty("分厂")
+    private String workshopId;
+
+    /**
+     * 办事处
+     */
+    @ApiModelProperty("办事处")
+    private String deptId;
+
+    /**
+     * 购货单位
+     */
+    @ApiModelProperty("购货单位")
+    private String customerId;
+
+    /**
+     * 原计划发货日期
+     */
+    @ApiModelProperty("原计划发货日期")
+    @JsonFormat(pattern = StringPool.DATE_PATTERN)
+    private LocalDate originPlanShipDate;
+
+    /**
+     * 状态
+     */
+    @ApiModelProperty("状态")
+    private String status;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN)
+    private LocalDateTime createTime;
+
+    public QueryReplenishmentOrderBo() {
+
+    }
+
+    public QueryReplenishmentOrderBo(ReplenishmentOrder dto) {
+
+        super(dto);
+    }
+
+    @Override
+    public BaseBo<ReplenishmentOrder> convert(ReplenishmentOrder dto) {
+        return super.convert(dto);
+    }
+
+    @Override
+    protected void afterInit(ReplenishmentOrder dto) {
+
+    }
+}
+

+package com.lframework.xingyun.sc.bo.purchase;
+
+import com.lframework.starter.web.core.bo.BaseBo;
+import com.lframework.xingyun.sc.entity.ReplenishmentOrderLine;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * 补货单物料行 QueryBo
+ * </p>
+ */
+@Data
+public class QueryReplenishmentOrderLineBo extends BaseBo<ReplenishmentOrderLine> {
+
+    /**
+     * ID
+     */
+    @ApiModelProperty("ID")
+    private String id;
+
+    /**
+     * 补货单
+     */
+    @ApiModelProperty("补货单")
+    private String replenishmentOrderId;
+
+    public QueryReplenishmentOrderLineBo() {
+
+    }
+
+    public QueryReplenishmentOrderLineBo(ReplenishmentOrderLine dto) {
+
+        super(dto);
+    }
+
+    @Override
+    public BaseBo<ReplenishmentOrderLine> convert(ReplenishmentOrderLine dto) {
+        return super.convert(dto);
+    }
+
+    @Override
+    protected void afterInit(ReplenishmentOrderLine dto) {
+
+    }
+}
+

+package com.lframework.xingyun.sc.controller.purchase;
+
+import com.lframework.starter.common.exceptions.impl.DefaultClientException;
+import com.lframework.starter.common.utils.CollectionUtil;
+import com.lframework.starter.web.core.annotations.security.HasPermission;
+import com.lframework.starter.web.core.components.resp.InvokeResult;
+import com.lframework.starter.web.core.components.resp.InvokeResultBuilder;
+import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.starter.web.core.controller.DefaultBaseController;
+import com.lframework.starter.web.core.utils.PageResultUtil;
+import com.lframework.xingyun.sc.bo.purchase.GetReplenishmentOrderBo;
+import com.lframework.xingyun.sc.bo.purchase.QueryReplenishmentOrderBo;
+import com.lframework.xingyun.sc.entity.ReplenishmentOrder;
+import com.lframework.xingyun.sc.service.purchase.ReplenishmentOrderService;
+import com.lframework.xingyun.sc.vo.purchase.CreateReplenishmentOrderVo;
+import com.lframework.xingyun.sc.vo.purchase.QueryReplenishmentOrderVo;
+import com.lframework.xingyun.sc.vo.purchase.UpdateReplenishmentOrderVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 补货单 Controller
+ */
+@Api(tags = "补货单")
+@Validated
+@RestController
+@RequestMapping("/purchase/replenishmentorder")
+public class ReplenishmentOrderController extends DefaultBaseController {
+
+    @Autowired
+    private ReplenishmentOrderService replenishmentOrderService;
+
+    /**
+     * 查询列表
+     */
+    @ApiOperation("查询列表")
+    @HasPermission({"entity:replenishmentorder:query"})
+    @GetMapping("/query")
+    public InvokeResult<PageResult<QueryReplenishmentOrderBo>> query(@Valid QueryReplenishmentOrderVo vo) {
+
+        PageResult<ReplenishmentOrder> pageResult = replenishmentOrderService.query(getPageIndex(vo), getPageSize(vo), vo);
+
+        List<ReplenishmentOrder> datas = pageResult.getDatas();
+        List<QueryReplenishmentOrderBo> results = null;
+
+        if (!CollectionUtil.isEmpty(datas)) {
+            results = datas.stream().map(QueryReplenishmentOrderBo::new).collect(Collectors.toList());
+        }
+
+        return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results));
+    }
+
+    /**
+     * 根据ID查询
+     */
+    @ApiOperation("根据ID查询")
+    @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
+    @HasPermission({"entity:replenishmentorder:query"})
+    @GetMapping
+    public InvokeResult<GetReplenishmentOrderBo> get(@NotBlank(message = "id不能为空！") String id) {
+
+        ReplenishmentOrder data = replenishmentOrderService.findById(id);
+        if (data == null) {
+            throw new DefaultClientException("补货单不存在！");
+        }
+
+        GetReplenishmentOrderBo result = new GetReplenishmentOrderBo(data);
+
+        return InvokeResultBuilder.success(result);
+    }
+
+    /**
+     * 新增
+     */
+    @ApiOperation("新增")
+    @HasPermission({"entity:replenishmentorder:add"})
+    @PostMapping
+    public InvokeResult<Void> create(@Valid @RequestBody CreateReplenishmentOrderVo vo) {
+
+        replenishmentOrderService.create(vo);
+
+        return InvokeResultBuilder.success();
+    }
+
+    /**
+     * 修改
+     */
+    @ApiOperation("修改")
+    @HasPermission({"entity:replenishmentorder:modify"})
+    @PutMapping
+    public InvokeResult<Void> update(@Valid @RequestBody UpdateReplenishmentOrderVo vo) {
+
+        replenishmentOrderService.update(vo);
+
+        replenishmentOrderService.cleanCacheByKey(vo.getId());
+
+        return InvokeResultBuilder.success();
+    }
+
+    /**
+     * 取消
+     */
+    @ApiOperation("取消")
+    @GetMapping("/cancel")
+    public InvokeResult<Void> cancel(@NotBlank(message = "id不能为空！") String id) {
+
+        replenishmentOrderService.cancel(id);
+
+        replenishmentOrderService.cleanCacheByKey(id);
+
+        return InvokeResultBuilder.success();
+    }
+
+    /**
+     * 填写补货时间
+     */
+    @ApiOperation("填写补货时间")
+    @PostMapping("/fillRestockTime")
+    public InvokeResult<Void> fillRestockTime(@RequestBody UpdateReplenishmentOrderVo vo) {
+
+        replenishmentOrderService.fillRestockTime(vo);
+
+        replenishmentOrderService.cleanCacheByKey(vo.getId());
+
+        return InvokeResultBuilder.success();
+    }
+}

+package com.lframework.xingyun.sc.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.lframework.starter.web.core.dto.BaseDto;
+import com.lframework.starter.web.core.entity.BaseEntity;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 补货单
+ * </p>
+ */
+@Data
+@TableName("tbl_replenishment_order")
+public class ReplenishmentOrder extends BaseEntity implements BaseDto {
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String CACHE_NAME = "ReplenishmentOrder";
+
+    /**
+     * ID
+     */
+    private String id;
+
+    /**
+     * 编号
+     */
+    private String code;
+
+    /**
+     * 分厂
+     */
+    private String workshopId;
+
+    /**
+     * 办事处
+     */
+    private String deptId;
+
+    /**
+     * 购货单位
+     */
+    private String customerId;
+
+    /**
+     * 原计划发货日期
+     */
+    private LocalDate originPlanShipDate;
+
+    /**
+     * 订货单
+     */
+    private String purchaseOrderId;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 创建人ID
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createById;
+
+    /**
+     * 创建人
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    /**
+     * 更新人ID
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateById;
+
+    /**
+     * 更新人
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime updateTime;
+
+    /**
+     * 是否展示正式合同审核按钮(非持久化字段)
+     */
+    @TableField(exist = false)
+    private Boolean showExamine;
+}
\ No newline at end of file

+package com.lframework.xingyun.sc.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.lframework.starter.web.core.dto.BaseDto;
+import com.lframework.starter.web.core.entity.BaseEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 补货单物料行
+ * </p>
+ */
+@Data
+@TableName("tbl_replenishment_order_line")
+public class ReplenishmentOrderLine extends BaseEntity implements BaseDto {
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String CACHE_NAME = "ReplenishmentOrderLine";
+
+    /**
+     * ID
+     */
+    private String id;
+
+    /**
+     * 补货单
+     */
+    private String replenishmentOrderId;
+
+    /**
+     * 订货单表物料行ID
+     */
+    private String purchaseOrderLineId;
+
+    /**
+     * 牌号
+     */
+    private String brand;
+
+    /**
+     * 厚度
+     */
+    private BigDecimal thickness;
+
+    /**
+     * 宽度
+     */
+    private BigDecimal width;
+
+    /**
+     * 长度
+     */
+    private BigDecimal length;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 需发(t)
+     */
+    private BigDecimal quantity;
+
+    /**
+     * 实发(t)
+     */
+    private BigDecimal shippedQuantity;
+
+    /**
+     * 需求补发(t/件)
+     */
+    private BigDecimal supplementaryQuantity;
+
+    /**
+     * 生产科确认交付日期
+     */
+    private LocalDate confirmedDeliveryDate;
+
+    /**
+     * 备注
+     */
+    private String remarks;
+
+    /**
+     * 排序
+     */
+    private Integer showOrder;
+
+    /**
+     * 前端用ID
+     */
+    private String itemId;
+
+    /**
+     * 创建人ID
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createById;
+
+    /**
+     * 创建人
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    /**
+     * 更新人ID
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateById;
+
+    /**
+     * 更新人
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime updateTime;
+
+}

@@ -18,6 +18,8 @@ import com.lframework.xingyun.sc.service.customer.CustomerCreditHistoryService;
 import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
 import com.lframework.xingyun.sc.service.customer.CustomerDevelopPlanService;
 import com.lframework.xingyun.sc.service.order.*;
+import com.lframework.xingyun.sc.service.purchase.ReplenishmentOrderService;
+import com.lframework.xingyun.sc.service.shipments.car.RequestCarTicketService;
 import com.lframework.xingyun.sc.service.shipments.car.DraftRequestCarTicketService;
 import com.lframework.xingyun.sc.vo.customer.credit.QueryCorePersonnelHistoryVo;
 import com.lframework.xingyun.sc.vo.customer.credit.UpdateCustomerCreditVo;
@@ -73,6 +75,10 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
     private SpecLockDelayApplicationService specLockDelayApplicationService;
     @Resource
     private DraftRequestCarTicketService draftRequestCarTicketService;
+    @Resource
+    private RequestCarTicketService requestCarTicketService;
+    @Resource
+    private ReplenishmentOrderService replenishmentOrderService;
 
 
     /**
@@ -131,6 +137,9 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
             case "DRAFT_REQUEST_CAR":
                 handleDraftRequestCarTicketData(flowStatus, businessId);
                 break;
+            case "RESTOCK_APPROVAL":
+                handleReplenishmentOrderStatus(flowStatus, businessId);
+                break;
             default:
                 break;
         }
@@ -163,7 +172,7 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
         }
     }
 
-    private void handleSpecLockDelayAuditData(String flowStatus, String businessId) {
+    private void handleReplenishmentOrderStatus(String flowStatus, String businessId) {
         if (FlowInstanceStatus.APPROVE_PASS.getCode().equals(flowStatus)
                 || FlowInstanceStatus.FINISH.getCode().equals(flowStatus)) {
             specLockDelayApplicationService.updateAuditStatus(businessId, "PASS");
@@ -176,6 +185,19 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
         }
     }
 
+    private void handleSpecLockDelayAuditData(String flowStatus, String businessId) {
+        if (FlowInstanceStatus.APPROVE_PASS.getCode().equals(flowStatus)
+                || FlowInstanceStatus.FINISH.getCode().equals(flowStatus)) {
+            replenishmentOrderService.updateStatus(businessId, "PASS");
+        } else if (FlowInstanceStatus.REVOKE.getCode().equals(flowStatus)
+                || FlowInstanceStatus.REFUSE.getCode().equals(flowStatus)
+                || FlowInstanceStatus.TERMINATION.getCode().equals(flowStatus)) {
+            replenishmentOrderService.updateStatus(businessId, "REFUSE");
+        } else if (FlowInstanceStatus.UNDO.getCode().equals(flowStatus)) {
+            replenishmentOrderService.updateStatus(businessId, "REFUSE");
+        }
+    }
+
     /**
      * 客户开发业务数据处理
      *

@@ -8,8 +8,10 @@ import com.lframework.starter.web.core.utils.JsonUtil;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
+import com.lframework.xingyun.sc.service.purchase.ReplenishmentOrderService;
 import com.lframework.xingyun.sc.vo.customer.credit.*;
 import com.lframework.xingyun.sc.vo.order.UpdatePurchaseOrderInfoVo;
+import com.lframework.xingyun.sc.vo.purchase.UpdateReplenishmentOrderVo;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -23,6 +25,8 @@ public class FlowTaskServiceImpl implements FlowTaskService {
     private CustomerCreditService customerCreditService;
     @Resource
     private PurchaseOrderInfoService purchaseOrderInfoService;
+    @Resource
+    private ReplenishmentOrderService replenishmentOrderService;
 
 
     @OpLog(type = OtherOpLogType.class, name = "修改客户资信，ID：{}", params = {"#id"})
@@ -59,4 +63,20 @@ public class FlowTaskServiceImpl implements FlowTaskService {
             e.printStackTrace();
         }
     }
+
+    @OpLog(type = OtherOpLogType.class, name = "修改补货单，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void updateReplenishmentOrderByMap(Map<String, Object> map) {
+        try {
+            // 创建 ObjectMapper 实例
+            ObjectMapper objectMapper = new ObjectMapper();
+            //先将 Map 序列化为 JSON 字符串，再反序列化为目标对象
+            String json = objectMapper.writeValueAsString(map);
+            UpdateReplenishmentOrderVo updateReplenishmentOrderVo = JsonUtil.parseObject(json, UpdateReplenishmentOrderVo.class);
+            replenishmentOrderService.updateFlowInstance(updateReplenishmentOrderVo);
+        } catch (JsonProcessingException e) {
+            e.printStackTrace();
+        }
+    }
 }

+package com.lframework.xingyun.sc.impl.purchase;
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.PageInfo;
+import com.lframework.starter.common.exceptions.impl.DefaultClientException;
+import com.lframework.starter.common.utils.Assert;
+import com.lframework.starter.common.utils.ObjectUtil;
+import com.lframework.starter.web.core.annotations.oplog.OpLog;
+import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
+import com.lframework.starter.web.core.utils.IdUtil;
+import com.lframework.starter.web.core.utils.OpLogUtil;
+import com.lframework.starter.web.core.utils.PageHelperUtil;
+import com.lframework.starter.web.core.utils.PageResultUtil;
+import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
+import com.lframework.xingyun.sc.entity.ReplenishmentOrderLine;
+import com.lframework.xingyun.sc.mappers.ReplenishmentOrderLineMapper;
+import com.lframework.xingyun.sc.service.purchase.ReplenishmentOrderLineService;
+import com.lframework.xingyun.sc.vo.purchase.CreateReplenishmentOrderLineVo;
+import com.lframework.xingyun.sc.vo.purchase.QueryReplenishmentOrderLineVo;
+import com.lframework.xingyun.sc.vo.purchase.UpdateReplenishmentOrderLineVo;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Service
+public class ReplenishmentOrderLineServiceImpl extends BaseMpServiceImpl<ReplenishmentOrderLineMapper, ReplenishmentOrderLine> implements ReplenishmentOrderLineService {
+
+    @Override
+    public PageResult<ReplenishmentOrderLine> query(Integer pageIndex, Integer pageSize, QueryReplenishmentOrderLineVo vo) {
+
+        Assert.greaterThanZero(pageIndex);
+        Assert.greaterThanZero(pageSize);
+
+        PageHelperUtil.startPage(pageIndex, pageSize);
+        List<ReplenishmentOrderLine> datas = this.query(vo);
+
+        return PageResultUtil.convert(new PageInfo<>(datas));
+    }
+
+    @Override
+    public List<ReplenishmentOrderLine> query(QueryReplenishmentOrderLineVo vo) {
+
+        return getBaseMapper().query(vo);
+    }
+
+    @Cacheable(value = ReplenishmentOrderLine.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null")
+    @Override
+    public ReplenishmentOrderLine findById(String id) {
+
+        return getBaseMapper().selectById(id);
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "新增补货单物料行，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public String create(CreateReplenishmentOrderLineVo vo) {
+
+        ReplenishmentOrderLine data = new ReplenishmentOrderLine();
+        data.setId(IdUtil.getUUID());
+        data.setReplenishmentOrderId(vo.getReplenishmentOrderId());
+        data.setPurchaseOrderLineId(vo.getPurchaseOrderLineId());
+        data.setBrand(vo.getBrand());
+        data.setThickness(vo.getThickness());
+        data.setWidth(vo.getWidth());
+        data.setLength(vo.getLength());
+        data.setStatus(vo.getStatus());
+        data.setQuantity(vo.getQuantity());
+        data.setShippedQuantity(vo.getShippedQuantity());
+        data.setSupplementaryQuantity(vo.getSupplementaryQuantity());
+        data.setConfirmedDeliveryDate(vo.getConfirmedDeliveryDate());
+        data.setRemarks(vo.getRemarks());
+        data.setShowOrder(vo.getShowOrder());
+        data.setItemId(vo.getItemId());
+
+        getBaseMapper().insert(data);
+
+        OpLogUtil.setVariable("id", data.getId());
+        OpLogUtil.setExtra(vo);
+
+        return data.getId();
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "修改补货单物料行，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void update(UpdateReplenishmentOrderLineVo vo) {
+
+        ReplenishmentOrderLine data = getBaseMapper().selectById(vo.getId());
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("补货单物料行不存在！");
+        }
+
+        LambdaUpdateWrapper<ReplenishmentOrderLine> updateWrapper = Wrappers.lambdaUpdate(ReplenishmentOrderLine.class)
+                .set(ReplenishmentOrderLine::getReplenishmentOrderId, vo.getReplenishmentOrderId())
+                .set(ReplenishmentOrderLine::getPurchaseOrderLineId, vo.getPurchaseOrderLineId())
+                .set(ReplenishmentOrderLine::getBrand, vo.getBrand())
+                .set(ReplenishmentOrderLine::getThickness, vo.getThickness())
+                .set(ReplenishmentOrderLine::getWidth, vo.getWidth())
+                .set(ReplenishmentOrderLine::getLength, vo.getLength())
+                .set(ReplenishmentOrderLine::getStatus, vo.getStatus())
+                .set(ReplenishmentOrderLine::getQuantity, vo.getQuantity())
+                .set(ReplenishmentOrderLine::getShippedQuantity, vo.getShippedQuantity())
+                .set(ReplenishmentOrderLine::getSupplementaryQuantity, vo.getSupplementaryQuantity())
+                .set(ReplenishmentOrderLine::getConfirmedDeliveryDate, vo.getConfirmedDeliveryDate())
+                .set(ReplenishmentOrderLine::getRemarks, vo.getRemarks())
+                .set(ReplenishmentOrderLine::getShowOrder, vo.getShowOrder())
+                .set(ReplenishmentOrderLine::getItemId, vo.getItemId())
+                .eq(ReplenishmentOrderLine::getId, vo.getId());
+
+        getBaseMapper().update(updateWrapper);
+
+        OpLogUtil.setVariable("id", data.getId());
+        OpLogUtil.setExtra(vo);
+    }
+
+    @CacheEvict(value = ReplenishmentOrderLine.CACHE_NAME, key = "@cacheVariables.tenantId() + #key")
+    @Override
+    public void cleanCacheByKey(Serializable key) {
+
+    }
+}

+package com.lframework.xingyun.sc.impl.purchase;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.PageInfo;
+import com.lframework.starter.bpm.dto.FlowTaskDto;
+import com.lframework.starter.bpm.mappers.FlowTaskWrapperMapper;
+import com.lframework.starter.bpm.service.FlowInstanceWrapperService;
+import com.lframework.starter.bpm.vo.flow.task.QueryTodoTaskListVo;
+import com.lframework.starter.common.exceptions.impl.DefaultClientException;
+import com.lframework.starter.common.utils.Assert;
+import com.lframework.starter.common.utils.ObjectUtil;
+import com.lframework.starter.web.core.annotations.oplog.OpLog;
+import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.starter.web.core.components.security.SecurityUtil;
+import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
+import com.lframework.starter.web.core.utils.IdUtil;
+import com.lframework.starter.web.core.utils.OpLogUtil;
+import com.lframework.starter.web.core.utils.PageHelperUtil;
+import com.lframework.starter.web.core.utils.PageResultUtil;
+import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
+import com.lframework.xingyun.sc.entity.ReplenishmentOrder;
+import com.lframework.xingyun.sc.entity.ReplenishmentOrderLine;
+import com.lframework.xingyun.sc.enums.CustomerDevelopStatus;
+import com.lframework.xingyun.sc.mappers.ReplenishmentOrderMapper;
+import com.lframework.xingyun.sc.service.purchase.ReplenishmentOrderLineService;
+import com.lframework.xingyun.sc.service.purchase.ReplenishmentOrderService;
+import com.lframework.xingyun.sc.vo.purchase.*;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+public class ReplenishmentOrderServiceImpl extends BaseMpServiceImpl<ReplenishmentOrderMapper, ReplenishmentOrder> implements ReplenishmentOrderService {
+
+    private static final String RESTOCK_APPROVAL_FLAG = "RESTOCK_APPROVAL"; // 补货单审批
+
+    @Resource
+    private ReplenishmentOrderLineService replenishmentOrderLineService;
+    @Resource
+    private FlowInstanceWrapperService flowInstanceWrapperService;
+    @Resource
+    private FlowTaskWrapperMapper flowTaskWrapperMapper;
+
+    @Override
+    public PageResult<ReplenishmentOrder> query(Integer pageIndex, Integer pageSize, QueryReplenishmentOrderVo vo) {
+
+        Assert.greaterThanZero(pageIndex);
+        Assert.greaterThanZero(pageSize);
+
+        PageHelperUtil.startPage(pageIndex, pageSize);
+        List<ReplenishmentOrder> datas = this.query(vo);
+        if (CollectionUtils.isNotEmpty(datas)) {
+            // 获取当前人员的待办任务数据
+            List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
+            if (CollectionUtils.isNotEmpty(flowTaskList)) {
+                List<String> businessIds = flowTaskList.stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toList());
+                datas.forEach(replenishmentOrder -> {
+                    replenishmentOrder.setShowExamine(businessIds.contains(replenishmentOrder.getId()));
+                });
+            }
+        }
+
+        return PageResultUtil.convert(new PageInfo<>(datas));
+    }
+
+    @Override
+    public List<ReplenishmentOrder> query(QueryReplenishmentOrderVo vo) {
+
+        return getBaseMapper().query(vo);
+    }
+
+    @Cacheable(value = ReplenishmentOrder.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null")
+    @Override
+    public ReplenishmentOrder findById(String id) {
+
+        return getBaseMapper().selectById(id);
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "新增补货单，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public String create(CreateReplenishmentOrderVo vo) {
+
+        if (vo == null || CollectionUtils.isEmpty(vo.getReplenishmentOrderLineList())) {
+            throw new DefaultClientException("参数错误！");
+        }
+
+
+        ReplenishmentOrder data = new ReplenishmentOrder();
+        data.setId(IdUtil.getUUID());
+        data.setCode(vo.getCode());
+        data.setWorkshopId(vo.getWorkshopId());
+        data.setDeptId(vo.getDeptId());
+        data.setCustomerId(vo.getCustomerId());
+        data.setOriginPlanShipDate(vo.getOriginPlanShipDate());
+        data.setPurchaseOrderId(vo.getPurchaseOrderId());
+        data.setStatus("AUDIT");
+
+        getBaseMapper().insert(data);
+
+        for (int index = 0; index < vo.getReplenishmentOrderLineList().size(); index++) {
+            CreateReplenishmentOrderLineVo lineVo = vo.getReplenishmentOrderLineList().get(index);
+            lineVo.setShowOrder(index);
+            lineVo.setReplenishmentOrderId(data.getId());
+            replenishmentOrderLineService.create(lineVo);
+        }
+
+        OpLogUtil.setVariable("id", data.getId());
+        OpLogUtil.setExtra(vo);
+
+        // 开启审核
+        flowInstanceWrapperService.startInstance(RESTOCK_APPROVAL_FLAG, data.getId(), RESTOCK_APPROVAL_FLAG, data);
+
+        return data.getId();
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "修改补货单，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void update(UpdateReplenishmentOrderVo vo) {
+
+        ReplenishmentOrder data = getBaseMapper().selectById(vo.getId());
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("补货单不存在！");
+        }
+
+        if (!CustomerDevelopStatus.REFUSE.name().equals(data.getStatus())) {
+            throw new DefaultClientException(CustomerDevelopStatus.getDescByNameSafe(data.getStatus()) + "的补货单不允许修改！");
+        }
+
+        LambdaUpdateWrapper<ReplenishmentOrder> updateWrapper = Wrappers.lambdaUpdate(ReplenishmentOrder.class)
+                .set(ReplenishmentOrder::getCode, vo.getCode())
+                .set(ReplenishmentOrder::getWorkshopId, vo.getWorkshopId())
+                .set(ReplenishmentOrder::getDeptId, vo.getDeptId())
+                .set(ReplenishmentOrder::getCustomerId, vo.getCustomerId())
+                .set(ReplenishmentOrder::getOriginPlanShipDate, vo.getOriginPlanShipDate())
+                .set(ReplenishmentOrder::getPurchaseOrderId, vo.getPurchaseOrderId())
+                .eq(ReplenishmentOrder::getId, vo.getId());
+
+        getBaseMapper().update(updateWrapper);
+
+        Wrapper<ReplenishmentOrderLine> lineWrapper = Wrappers.lambdaQuery(ReplenishmentOrderLine.class)
+                .eq(ReplenishmentOrderLine::getReplenishmentOrderId, data.getId());
+        List<ReplenishmentOrderLine> oldReplenishmentOrderLineList = replenishmentOrderLineService.list(lineWrapper);
+        List<String> oldLineIdList = CollectionUtils.emptyIfNull(oldReplenishmentOrderLineList)
+                .stream()
+                .map(ReplenishmentOrderLine::getId).collect(Collectors.toList());
+        List<String> existIdList = new ArrayList<>(oldLineIdList.size());
+        for (int index = 0; index < vo.getReplenishmentOrderLineList().size(); index++) {
+            UpdateReplenishmentOrderLineVo updateReplenishmentOrderLineVo = vo.getReplenishmentOrderLineList().get(index);
+            updateReplenishmentOrderLineVo.setShowOrder(index);
+            if (StringUtils.isNotBlank(updateReplenishmentOrderLineVo.getId())) {
+                existIdList.add(updateReplenishmentOrderLineVo.getId());
+                replenishmentOrderLineService.update(updateReplenishmentOrderLineVo);
+            } else {
+                updateReplenishmentOrderLineVo.setReplenishmentOrderId(data.getId());
+                CreateReplenishmentOrderLineVo createReplenishmentOrderLineVo = new CreateReplenishmentOrderLineVo();
+                createReplenishmentOrderLineVo.setReplenishmentOrderId(updateReplenishmentOrderLineVo.getReplenishmentOrderId());
+                createReplenishmentOrderLineVo.setPurchaseOrderLineId(updateReplenishmentOrderLineVo.getPurchaseOrderLineId());
+                createReplenishmentOrderLineVo.setBrand(updateReplenishmentOrderLineVo.getBrand());
+                createReplenishmentOrderLineVo.setThickness(updateReplenishmentOrderLineVo.getThickness());
+                createReplenishmentOrderLineVo.setWidth(updateReplenishmentOrderLineVo.getWidth());
+                createReplenishmentOrderLineVo.setLength(updateReplenishmentOrderLineVo.getLength());
+                createReplenishmentOrderLineVo.setStatus(updateReplenishmentOrderLineVo.getStatus());
+                createReplenishmentOrderLineVo.setQuantity(updateReplenishmentOrderLineVo.getQuantity());
+                createReplenishmentOrderLineVo.setShippedQuantity(updateReplenishmentOrderLineVo.getShippedQuantity());
+                createReplenishmentOrderLineVo.setSupplementaryQuantity(updateReplenishmentOrderLineVo.getSupplementaryQuantity());
+                createReplenishmentOrderLineVo.setRemarks(updateReplenishmentOrderLineVo.getRemarks());
+                createReplenishmentOrderLineVo.setItemId(updateReplenishmentOrderLineVo.getItemId());
+                createReplenishmentOrderLineVo.setShowOrder(updateReplenishmentOrderLineVo.getShowOrder());
+                replenishmentOrderLineService.create(createReplenishmentOrderLineVo);
+            }
+        }
+
+        List<String> needDeleteLineIdList = oldLineIdList.stream()
+                .filter(oldLineId -> !existIdList.contains(oldLineId))
+                .collect(Collectors.toList());
+        if (CollectionUtils.isNotEmpty(needDeleteLineIdList)) {
+            replenishmentOrderLineService.removeByIds(needDeleteLineIdList);
+        }
+
+        OpLogUtil.setVariable("id", data.getId());
+        OpLogUtil.setExtra(vo);
+
+        // 开启审核
+        flowInstanceWrapperService.startInstance(RESTOCK_APPROVAL_FLAG, data.getId(), RESTOCK_APPROVAL_FLAG, data);
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "取消补货单，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void cancel(String id) {
+        ReplenishmentOrder data = getBaseMapper().selectById(id);
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("补货单不存在！");
+        }
+
+        if (CustomerDevelopStatus.CANCEL.name().equals(data.getStatus())) {
+            throw new DefaultClientException("补货单已取消！");
+        }
+
+        if (!CustomerDevelopStatus.REFUSE.name().equals(data.getStatus())) {
+            throw new DefaultClientException(CustomerDevelopStatus.getDescByNameSafe(data.getStatus()) + "的补货单不允许取消！");
+        }
+
+        Wrapper<ReplenishmentOrder> wrapper = Wrappers.lambdaUpdate(ReplenishmentOrder.class)
+                .set(ReplenishmentOrder::getStatus, CustomerDevelopStatus.CANCEL.name())
+                .eq(ReplenishmentOrder::getId, id);
+
+        getBaseMapper().update(wrapper);
+
+        OpLogUtil.setVariable("id", id);
+        OpLogUtil.setExtra(data);
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "补货单填写补货时间，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void fillRestockTime(UpdateReplenishmentOrderVo vo) {
+
+        ReplenishmentOrder data = getBaseMapper().selectById(vo.getId());
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("补货单不存在！");
+        }
+
+        if (!CustomerDevelopStatus.PASS.name().equals(data.getStatus())) {
+            throw new DefaultClientException("只有审核通过的补货单才能填写补货时间");
+        }
+
+        vo.getReplenishmentOrderLineList().forEach(updateReplenishmentOrderLineVo -> {
+            Wrapper<ReplenishmentOrderLine> updateWrapper = Wrappers.lambdaUpdate(ReplenishmentOrderLine.class)
+                    .set(ReplenishmentOrderLine::getConfirmedDeliveryDate, updateReplenishmentOrderLineVo.getConfirmedDeliveryDate())
+                    .eq(ReplenishmentOrderLine::getId, updateReplenishmentOrderLineVo.getId());
+
+            replenishmentOrderLineService.update(updateWrapper);
+        });
+
+        OpLogUtil.setVariable("id", vo.getId());
+        OpLogUtil.setExtra(data);
+    }
+
+    @Override
+    @OpLog(type = OtherOpLogType.class, name = "补货单审批完成，ID：{}， 审批状态：{}", params = {"#id", "#status"})
+    @Transactional(rollbackFor = Exception.class)
+    public void updateStatus(String id, String status) {
+        if (StringUtils.isBlank(id) || StringUtils.isBlank(status)) {
+            return;
+        }
+
+        Wrapper<ReplenishmentOrder> wrapper = Wrappers.lambdaUpdate(ReplenishmentOrder.class)
+                .set(ReplenishmentOrder::getStatus, status)
+                .eq(ReplenishmentOrder::getId, id);
+
+        getBaseMapper().update(wrapper);
+
+        UpdateReplenishmentOrderVo vo = new UpdateReplenishmentOrderVo();
+        vo.setId(id);
+        vo.setStatus(status);
+
+        OpLogUtil.setVariable("id", vo.getId());
+        OpLogUtil.setExtra(vo);
+
+        cleanCacheByKey(id);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateFlowInstance(UpdateReplenishmentOrderVo vo) {
+        ReplenishmentOrder data = getBaseMapper().selectById(vo.getId());
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("补货单不存在！");
+        }
+
+        vo.getReplenishmentOrderLineList().forEach(updateReplenishmentOrderLineVo -> {
+            Wrapper<ReplenishmentOrderLine> lineWrapper = Wrappers.lambdaUpdate(ReplenishmentOrderLine.class)
+                    .set(ReplenishmentOrderLine::getQuantity, updateReplenishmentOrderLineVo.getQuantity())
+                    .set(ReplenishmentOrderLine::getShippedQuantity, updateReplenishmentOrderLineVo.getShippedQuantity())
+                    .set(ReplenishmentOrderLine::getSupplementaryQuantity, updateReplenishmentOrderLineVo.getSupplementaryQuantity())
+                    .eq(ReplenishmentOrderLine::getId, updateReplenishmentOrderLineVo.getId());
+
+            replenishmentOrderLineService.update(lineWrapper);
+        });
+
+        OpLogUtil.setVariable("id", vo.getId());
+        OpLogUtil.setExtra(vo);
+
+        cleanCacheByKey(vo.getId());
+    }
+
+    @CacheEvict(value = ReplenishmentOrder.CACHE_NAME, key = "@cacheVariables.tenantId() + #key")
+    @Override
+    public void cleanCacheByKey(Serializable key) {
+
+    }
+}

+package com.lframework.xingyun.sc.mappers;
+
+import com.lframework.starter.web.core.mapper.BaseMapper;
+import com.lframework.xingyun.sc.entity.ReplenishmentOrderLine;
+import com.lframework.xingyun.sc.vo.purchase.QueryReplenishmentOrderLineVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 补货单物料行 Mapper 接口
+ * </p>
+ */
+public interface ReplenishmentOrderLineMapper extends BaseMapper<ReplenishmentOrderLine> {
+
+    /**
+     * 查询列表
+     *
+     * @param vo
+     * @return
+     */
+    List<ReplenishmentOrderLine> query(@Param("vo") QueryReplenishmentOrderLineVo vo);
+}

+package com.lframework.xingyun.sc.mappers;
+
+import com.lframework.starter.web.core.mapper.BaseMapper;
+import com.lframework.xingyun.sc.entity.ReplenishmentOrder;
+import com.lframework.xingyun.sc.vo.purchase.QueryReplenishmentOrderVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 补货单 Mapper 接口
+ * </p>
+ */
+public interface ReplenishmentOrderMapper extends BaseMapper<ReplenishmentOrder> {
+
+    /**
+     * 查询列表
+     *
+     * @param vo
+     * @return
+     */
+    List<ReplenishmentOrder> query(@Param("vo") QueryReplenishmentOrderVo vo);
+}

+package com.lframework.xingyun.sc.service.purchase;
+
+import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.starter.web.core.service.BaseMpService;
+import com.lframework.xingyun.sc.entity.ReplenishmentOrderLine;
+import com.lframework.xingyun.sc.vo.purchase.CreateReplenishmentOrderLineVo;
+import com.lframework.xingyun.sc.vo.purchase.QueryReplenishmentOrderLineVo;
+import com.lframework.xingyun.sc.vo.purchase.UpdateReplenishmentOrderLineVo;
+
+import java.util.List;
+
+/**
+ * 补货单物料行 Service
+ */
+public interface ReplenishmentOrderLineService extends BaseMpService<ReplenishmentOrderLine> {
+
+    /**
+     * 查询列表
+     *
+     * @return
+     */
+    PageResult<ReplenishmentOrderLine> query(Integer pageIndex, Integer pageSize, QueryReplenishmentOrderLineVo vo);
+
+    /**
+     * 查询列表
+     *
+     * @param vo
+     * @return
+     */
+    List<ReplenishmentOrderLine> query(QueryReplenishmentOrderLineVo vo);
+
+    /**
+     * 根据ID查询
+     *
+     * @param id
+     * @return
+     */
+    ReplenishmentOrderLine findById(String id);
+
+    /**
+     * 创建
+     *
+     * @param vo
+     * @return
+     */
+    String create(CreateReplenishmentOrderLineVo vo);
+
+    /**
+     * 修改
+     *
+     * @param vo
+     */
+    void update(UpdateReplenishmentOrderLineVo vo);
+
+}

+package com.lframework.xingyun.sc.service.purchase;
+
+import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.starter.web.core.service.BaseMpService;
+import com.lframework.xingyun.sc.entity.ReplenishmentOrder;
+import com.lframework.xingyun.sc.vo.order.UpdatePurchaseOrderInfoVo;
+import com.lframework.xingyun.sc.vo.purchase.CreateReplenishmentOrderVo;
+import com.lframework.xingyun.sc.vo.purchase.QueryReplenishmentOrderVo;
+import com.lframework.xingyun.sc.vo.purchase.UpdateReplenishmentOrderVo;
+
+import java.util.List;
+
+/**
+ * 补货单 Service
+ */
+public interface ReplenishmentOrderService extends BaseMpService<ReplenishmentOrder> {
+
+    /**
+     * 查询列表
+     *
+     * @return
+     */
+    PageResult<ReplenishmentOrder> query(Integer pageIndex, Integer pageSize, QueryReplenishmentOrderVo vo);
+
+    /**
+     * 查询列表
+     *
+     * @param vo
+     * @return
+     */
+    List<ReplenishmentOrder> query(QueryReplenishmentOrderVo vo);
+
+    /**
+     * 根据ID查询
+     *
+     * @param id
+     * @return
+     */
+    ReplenishmentOrder findById(String id);
+
+    /**
+     * 创建
+     *
+     * @param vo
+     * @return
+     */
+    String create(CreateReplenishmentOrderVo vo);
+
+    /**
+     * 修改
+     *
+     * @param vo
+     */
+    void update(UpdateReplenishmentOrderVo vo);
+
+    /**
+     * 取消补货单
+     *
+     * @param id
+     */
+    void cancel(String id);
+
+    /**
+     * 填写补货时间
+     *
+     * @param vo
+     */
+    void fillRestockTime(UpdateReplenishmentOrderVo vo);
+
+    /**
+     * 更新审核状态
+     *
+     * @param id
+     * @param status
+     */
+    void updateStatus(String id, String status);
+
+    /**
+     * 更新审核数据
+     *
+     * @param vo 更新数据
+     */
+    void updateFlowInstance(UpdateReplenishmentOrderVo vo);
+}

+package com.lframework.xingyun.sc.vo.purchase;
+
+import com.lframework.starter.web.core.components.validation.IsNumberPrecision;
+import com.lframework.starter.web.core.components.validation.TypeMismatch;
+import com.lframework.starter.web.core.vo.BaseVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+@Data
+public class CreateReplenishmentOrderLineVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 补货单
+     */
+    @ApiModelProperty(value = "补货单")
+    @Length(message = "补货单最多允许32个字符！")
+    private String replenishmentOrderId;
+
+    /**
+     * 订货单表物料行ID
+     */
+    @ApiModelProperty(value = "订货单表物料行ID")
+    @Length(message = "订货单表物料行ID最多允许32个字符！")
+    private String purchaseOrderLineId;
+
+    /**
+     * 牌号
+     */
+    @ApiModelProperty(value = "牌号")
+    @Length(message = "牌号最多允许100个字符！")
+    private String brand;
+
+    /**
+     * 厚度
+     */
+    @ApiModelProperty(value = "厚度")
+    @TypeMismatch(message = "厚度格式有误！")
+    @IsNumberPrecision(message = "厚度最多允许4位小数！", value = 4)
+    private BigDecimal thickness;
+
+    /**
+     * 宽度
+     */
+    @ApiModelProperty(value = "宽度")
+    @TypeMismatch(message = "宽度格式有误！")
+    @IsNumberPrecision(message = "宽度最多允许4位小数！", value = 4)
+    private BigDecimal width;
+
+    /**
+     * 长度
+     */
+    @ApiModelProperty(value = "长度")
+    @TypeMismatch(message = "长度格式有误！")
+    @IsNumberPrecision(message = "长度最多允许4位小数！", value = 4)
+    private BigDecimal length;
+
+    /**
+     * 状态
+     */
+    @ApiModelProperty(value = "状态")
+    @Length(message = "状态最多允许50个字符！")
+    private String status;
+
+    /**
+     * 需发(t)
+     */
+    @ApiModelProperty(value = "需发(t)")
+    @TypeMismatch(message = "需发(t)格式有误！")
+    @IsNumberPrecision(message = "需发(t)最多允许4位小数！", value = 4)
+    private BigDecimal quantity;
+
+    /**
+     * 实发(t)
+     */
+    @ApiModelProperty(value = "实发(t)")
+    @TypeMismatch(message = "实发(t)格式有误！")
+    @IsNumberPrecision(message = "实发(t)最多允许4位小数！", value = 4)
+    private BigDecimal shippedQuantity;
+
+    /**
+     * 需求补发(t/件)
+     */
+    @ApiModelProperty(value = "需求补发(t/件)")
+    @TypeMismatch(message = "需求补发(t/件)格式有误！")
+    @IsNumberPrecision(message = "需求补发(t/件)最多允许4位小数！", value = 4)
+    private BigDecimal supplementaryQuantity;
+
+    /**
+     * 生产科确认交付日期
+     */
+    @ApiModelProperty(value = "生产科确认交付日期")
+    @TypeMismatch(message = "生产科确认交付日期格式有误！")
+    private LocalDate confirmedDeliveryDate;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注")
+    @Length(message = "备注最多允许65,535个字符！")
+    private String remarks;
+
+    /**
+     * 排序
+     */
+    @ApiModelProperty(value = "排序")
+    @TypeMismatch(message = "排序格式有误！")
+    private Integer showOrder;
+
+    /**
+     * 前端用ID
+     */
+    @ApiModelProperty(value = "前端用ID")
+    private String itemId;
+}

+package com.lframework.xingyun.sc.vo.purchase;
+
+import com.lframework.starter.web.core.components.validation.TypeMismatch;
+import com.lframework.starter.web.core.vo.BaseVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.util.List;
+
+@Data
+public class CreateReplenishmentOrderVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @ApiModelProperty(value = "编号", required = true)
+    @NotBlank(message = "请输入编号！")
+    @Length(message = "编号最多允许50个字符！")
+    private String code;
+
+    /**
+     * 分厂
+     */
+    @ApiModelProperty(value = "分厂", required = true)
+    @NotBlank(message = "请输入分厂！")
+    @Length(message = "分厂最多允许32个字符！")
+    private String workshopId;
+
+    /**
+     * 办事处
+     */
+    @ApiModelProperty(value = "办事处", required = true)
+    @NotBlank(message = "请输入办事处！")
+    @Length(message = "办事处最多允许32个字符！")
+    private String deptId;
+
+    /**
+     * 购货单位
+     */
+    @ApiModelProperty(value = "购货单位", required = true)
+    @NotBlank(message = "请输入购货单位！")
+    @Length(message = "购货单位最多允许32个字符！")
+    private String customerId;
+
+    /**
+     * 原计划发货日期
+     */
+    @ApiModelProperty(value = "原计划发货日期", required = true)
+    @NotNull(message = "请输入原计划发货日期！")
+    @TypeMismatch(message = "原计划发货日期格式有误！")
+    private LocalDate originPlanShipDate;
+
+    /**
+     * 订货单
+     */
+    @ApiModelProperty(value = "订货单", required = true)
+    @NotBlank(message = "请输入订货单！")
+    @Length(message = "订货单最多允许32个字符！")
+    private String purchaseOrderId;
+
+    /**
+     * 状态
+     */
+    @ApiModelProperty(value = "状态", required = true)
+    @NotBlank(message = "请输入状态！")
+    @Length(message = "状态最多允许20个字符！")
+    private String status;
+
+    /**
+     * 补货单物料行
+     */
+    @ApiModelProperty(value = "补货单物料行")
+    private List<CreateReplenishmentOrderLineVo> replenishmentOrderLineList;
+
+}

+package com.lframework.xingyun.sc.vo.purchase;
+
+import com.lframework.starter.web.core.vo.BaseVo;
+import com.lframework.starter.web.core.vo.PageVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class QueryReplenishmentOrderLineVo extends PageVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 补货单
+     */
+    @ApiModelProperty("补货单")
+    private String replenishmentOrderId;
+
+}
\ No newline at end of file

+package com.lframework.xingyun.sc.vo.purchase;
+
+import com.lframework.starter.web.core.components.validation.TypeMismatch;
+import com.lframework.starter.web.core.vo.BaseVo;
+import com.lframework.starter.web.core.vo.PageVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+public class QueryReplenishmentOrderVo extends PageVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @ApiModelProperty("编号")
+    private String code;
+
+    /**
+     * 分厂
+     */
+    @ApiModelProperty("分厂")
+    private String workshopId;
+
+    /**
+     * 购货单位
+     */
+    @ApiModelProperty("购货单位")
+    private String customerId;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    @TypeMismatch(message = "创建时间格式有误！")
+    private LocalDateTime createTime;
+
+}
\ No newline at end of file

+package com.lframework.xingyun.sc.vo.purchase;
+
+import com.lframework.starter.web.core.vo.BaseVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+@Data
+public class UpdateReplenishmentOrderLineVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @ApiModelProperty(value = "ID")
+    private String id;
+
+    /**
+     * 补货单
+     */
+    @ApiModelProperty(value = "补货单")
+    private String replenishmentOrderId;
+
+    /**
+     * 订货单表物料行ID
+     */
+    @ApiModelProperty(value = "订货单表物料行ID")
+    private String purchaseOrderLineId;
+
+    /**
+     * 牌号
+     */
+    @ApiModelProperty(value = "牌号")
+    private String brand;
+
+    /**
+     * 厚度
+     */
+    @ApiModelProperty(value = "厚度")
+    private BigDecimal thickness;
+
+    /**
+     * 宽度
+     */
+    @ApiModelProperty(value = "宽度")
+    private BigDecimal width;
+
+    /**
+     * 长度
+     */
+    @ApiModelProperty(value = "长度")
+    private BigDecimal length;
+
+    /**
+     * 状态
+     */
+    @ApiModelProperty(value = "状态")
+    private String status;
+
+    /**
+     * 需发(t)
+     */
+    @ApiModelProperty(value = "需发(t)")
+    private BigDecimal quantity;
+
+    /**
+     * 实发(t)
+     */
+    @ApiModelProperty(value = "实发(t)")
+    private BigDecimal shippedQuantity;
+
+    /**
+     * 需求补发(t/件)
+     */
+    @ApiModelProperty(value = "需求补发(t/件)")
+    private BigDecimal supplementaryQuantity;
+
+    /**
+     * 生产科确认交付日期
+     */
+    @ApiModelProperty(value = "生产科确认交付日期")
+    private LocalDate confirmedDeliveryDate;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+    /**
+     * 排序
+     */
+    @ApiModelProperty(value = "排序")
+    private Integer showOrder;
+
+    /**
+     * 前端用ID
+     */
+    @ApiModelProperty(value = "前端用ID")
+    private String itemId;
+
+}

+package com.lframework.xingyun.sc.vo.purchase;
+
+import com.lframework.starter.web.core.components.validation.TypeMismatch;
+import com.lframework.starter.web.core.vo.BaseVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.util.List;
+
+@Data
+public class UpdateReplenishmentOrderVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @ApiModelProperty(value = "ID", required = true)
+    @NotBlank(message = "id不能为空！")
+    private String id;
+
+    /**
+     * 编号
+     */
+    @ApiModelProperty(value = "编号", required = true)
+    @NotBlank(message = "请输入编号！")
+    @Length(message = "编号最多允许50个字符！")
+    private String code;
+
+    /**
+     * 分厂
+     */
+    @ApiModelProperty(value = "分厂", required = true)
+    @NotBlank(message = "请输入分厂！")
+    @Length(message = "分厂最多允许32个字符！")
+    private String workshopId;
+
+    /**
+     * 办事处
+     */
+    @ApiModelProperty(value = "办事处", required = true)
+    @NotBlank(message = "请输入办事处！")
+    @Length(message = "办事处最多允许32个字符！")
+    private String deptId;
+
+    /**
+     * 购货单位
+     */
+    @ApiModelProperty(value = "购货单位", required = true)
+    @NotBlank(message = "请输入购货单位！")
+    @Length(message = "购货单位最多允许32个字符！")
+    private String customerId;
+
+    /**
+     * 原计划发货日期
+     */
+    @ApiModelProperty(value = "原计划发货日期", required = true)
+    @TypeMismatch(message = "原计划发货日期格式有误！")
+    @NotNull(message = "请输入原计划发货日期！")
+    private LocalDate originPlanShipDate;
+
+    /**
+     * 订货单
+     */
+    @ApiModelProperty(value = "订货单", required = true)
+    @NotBlank(message = "请输入订货单！")
+    @Length(message = "订货单最多允许32个字符！")
+    private String purchaseOrderId;
+
+    /**
+     * 补货单物料行
+     */
+    @ApiModelProperty("补货单物料行")
+    private List<UpdateReplenishmentOrderLineVo> replenishmentOrderLineList;
+
+    /**
+     * 审批状态
+     */
+    @ApiModelProperty("审批状态")
+    private String status;
+}

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lframework.xingyun.sc.mappers.ReplenishmentOrderLineMapper">
+
+    <resultMap id="ReplenishmentOrderLine" type="com.lframework.xingyun.sc.entity.ReplenishmentOrderLine">
+        <id column="id" property="id"/>
+        <result column="replenishment_order_id" property="replenishmentOrderId"/>
+        <result column="purchase_order_line_id" property="purchaseOrderLineId"/>
+        <result column="brand" property="brand"/>
+        <result column="thickness" property="thickness"/>
+        <result column="width" property="width"/>
+        <result column="length" property="length"/>
+        <result column="status" property="status"/>
+        <result column="quantity" property="quantity"/>
+        <result column="shipped_quantity" property="shippedQuantity"/>
+        <result column="supplementary_quantity" property="supplementaryQuantity"/>
+        <result column="confirmed_delivery_date" property="confirmedDeliveryDate"/>
+        <result column="remarks" property="remarks"/>
+        <result column="show_order" property="showOrder"/>
+        <result column="create_by_id" property="createById"/>
+        <result column="create_by" property="createBy"/>
+        <result column="update_by_id" property="updateById"/>
+        <result column="update_by" property="updateBy"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
+    </resultMap>
+
+    <sql id="ReplenishmentOrderLine_sql">
+        SELECT tb.id,
+               tb.replenishment_order_id,
+               tb.purchase_order_line_id,
+               tb.brand,
+               tb.thickness,
+               tb.width,
+               tb.length,
+               tb.status,
+               tb.quantity,
+               tb.shipped_quantity,
+               tb.supplementary_quantity,
+               tb.confirmed_delivery_date,
+               tb.remarks,
+               tb.show_order,
+               tb.create_by_id,
+               tb.create_by,
+               tb.update_by_id,
+               tb.update_by,
+               tb.create_time,
+               tb.update_time
+        FROM tbl_replenishment_order_line AS tb
+    </sql>
+
+    <select id="query" resultMap="ReplenishmentOrderLine">
+        <include refid="ReplenishmentOrderLine_sql"/>
+        <where>
+            <if test="vo.replenishmentOrderId != null and vo.replenishmentOrderId != ''">
+                AND tb.replenishment_order_id = #{vo.replenishmentOrderId}
+            </if>
+        </where>
+    </select>
+</mapper>

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lframework.xingyun.sc.mappers.ReplenishmentOrderMapper">
+
+    <resultMap id="ReplenishmentOrder" type="com.lframework.xingyun.sc.entity.ReplenishmentOrder">
+        <id column="id" property="id"/>
+        <result column="code" property="code"/>
+        <result column="workshop_id" property="workshopId"/>
+        <result column="dept_id" property="deptId"/>
+        <result column="customer_id" property="customerId"/>
+        <result column="origin_plan_ship_date" property="originPlanShipDate"/>
+        <result column="purchase_order_id" property="purchaseOrderId"/>
+        <result column="status" property="status"/>
+        <result column="create_by_id" property="createById"/>
+        <result column="create_by" property="createBy"/>
+        <result column="update_by_id" property="updateById"/>
+        <result column="update_by" property="updateBy"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
+    </resultMap>
+
+    <sql id="ReplenishmentOrder_sql">
+        SELECT tb.id,
+               tb.code,
+               tb.workshop_id,
+               tb.dept_id,
+               tb.customer_id,
+               tb.origin_plan_ship_date,
+               tb.purchase_order_id,
+               tb.status,
+               tb.create_by_id,
+               tb.create_by,
+               tb.update_by_id,
+               tb.update_by,
+               tb.create_time,
+               tb.update_time
+        FROM tbl_replenishment_order AS tb
+    </sql>
+
+    <select id="query" resultMap="ReplenishmentOrder">
+        <include refid="ReplenishmentOrder_sql"/>
+        <where>
+            <if test="vo.code != null and vo.code != ''">
+                AND tb.code LIKE CONCAT('%', #{vo.code}, '%')
+            </if>
+            <if test="vo.workshopId != null and vo.workshopId != ''">
+                AND tb.workshop_id = #{vo.workshopId}
+            </if>
+            <if test="vo.customerId != null and vo.customerId != ''">
+                AND tb.customer_id = #{vo.customerId}
+            </if>
+            <if test="vo.createTime != null">
+                AND tb.create_time = #{vo.createTime}
+            </if>
+        </where>
+    </select>
+</mapper>