楚江ERP：补货单增加统计字段

@@ -256,20 +256,23 @@ create table `tbl_holidays`
 DROP TABLE IF EXISTS `tbl_replenishment_order`;
 DROP TABLE IF EXISTS `tbl_replenishment_order`;
 create table `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 '更新时间'
+    `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 '订货单',
+    `total_quantity`               decimal(15, 4) COMMENT '总需发',
+    `total_shipped_quantity`       decimal(15, 4) COMMENT '总实发',
+    `total_supplementary_quantity` decimal(15, 4) 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;
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '补货单' ROW_FORMAT = DYNAMIC;
 
 
 -- 补货单物料行
 -- 补货单物料行

@@ -7,6 +7,7 @@ import com.lframework.xingyun.sc.entity.ReplenishmentOrder;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 
 
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDate;
 
 
 /**
 /**
@@ -73,6 +74,24 @@ public class QueryReplenishmentOrderBo extends BaseBo<ReplenishmentOrder> {
     private LocalDate originPlanShipDate;
     private LocalDate originPlanShipDate;
 
 
     /**
     /**
+     * 总需发
+     */
+    @ApiModelProperty(value = "总需发")
+    private BigDecimal totalQuantity;
+
+    /**
+     * 总实发
+     */
+    @ApiModelProperty(value = "总实发")
+    private BigDecimal totalShippedQuantity;
+
+    /**
+     * 总补发
+     */
+    @ApiModelProperty(value = "总补发")
+    private BigDecimal totalSupplementaryQuantity;
+
+    /**
      * 状态
      * 状态
      */
      */
     @ApiModelProperty("状态")
     @ApiModelProperty("状态")

@@ -7,6 +7,7 @@ import com.lframework.starter.web.core.dto.BaseDto;
 import com.lframework.starter.web.core.entity.BaseEntity;
 import com.lframework.starter.web.core.entity.BaseEntity;
 import lombok.Data;
 import lombok.Data;
 
 
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 
 
@@ -59,6 +60,21 @@ public class ReplenishmentOrder extends BaseEntity implements BaseDto {
     private String purchaseOrderId;
     private String purchaseOrderId;
 
 
     /**
     /**
+     * 总需发
+     */
+    private BigDecimal totalQuantity;
+
+    /**
+     * 总实发
+     */
+    private BigDecimal totalShippedQuantity;
+
+    /**
+     * 总补发
+     */
+    private BigDecimal totalSupplementaryQuantity;
+
+    /**
      * 状态
      * 状态
      */
      */
     private String status;
     private String status;

@@ -111,6 +111,9 @@ public class ReplenishmentOrderServiceImpl extends BaseMpServiceImpl<Replenishme
         data.setCustomerId(vo.getCustomerId());
         data.setCustomerId(vo.getCustomerId());
         data.setOriginPlanShipDate(vo.getOriginPlanShipDate());
         data.setOriginPlanShipDate(vo.getOriginPlanShipDate());
         data.setPurchaseOrderId(vo.getPurchaseOrderId());
         data.setPurchaseOrderId(vo.getPurchaseOrderId());
+        data.setTotalQuantity(vo.getTotalQuantity());
+        data.setTotalShippedQuantity(vo.getTotalShippedQuantity());
+        data.setTotalSupplementaryQuantity(vo.getTotalSupplementaryQuantity());
         data.setStatus("AUDIT");
         data.setStatus("AUDIT");
 
 
         getBaseMapper().insert(data);
         getBaseMapper().insert(data);
@@ -152,6 +155,9 @@ public class ReplenishmentOrderServiceImpl extends BaseMpServiceImpl<Replenishme
                 .set(ReplenishmentOrder::getCustomerId, vo.getCustomerId())
                 .set(ReplenishmentOrder::getCustomerId, vo.getCustomerId())
                 .set(ReplenishmentOrder::getOriginPlanShipDate, vo.getOriginPlanShipDate())
                 .set(ReplenishmentOrder::getOriginPlanShipDate, vo.getOriginPlanShipDate())
                 .set(ReplenishmentOrder::getPurchaseOrderId, vo.getPurchaseOrderId())
                 .set(ReplenishmentOrder::getPurchaseOrderId, vo.getPurchaseOrderId())
+                .set(ReplenishmentOrder::getTotalQuantity, vo.getTotalQuantity())
+                .set(ReplenishmentOrder::getTotalShippedQuantity, vo.getTotalShippedQuantity())
+                .set(ReplenishmentOrder::getTotalSupplementaryQuantity, vo.getTotalSupplementaryQuantity())
                 .set(ReplenishmentOrder::getStatus, "AUDIT")
                 .set(ReplenishmentOrder::getStatus, "AUDIT")
                 .eq(ReplenishmentOrder::getId, vo.getId());
                 .eq(ReplenishmentOrder::getId, vo.getId());
 
 

@@ -9,6 +9,7 @@ import org.hibernate.validator.constraints.Length;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDate;
 import java.util.List;
 import java.util.List;
 
 
@@ -60,6 +61,24 @@ public class CreateReplenishmentOrderVo implements BaseVo, Serializable {
     private String purchaseOrderId;
     private String purchaseOrderId;
 
 
     /**
     /**
+     * 总需发
+     */
+    @ApiModelProperty(value = "总需发")
+    private BigDecimal totalQuantity;
+
+    /**
+     * 总实发
+     */
+    @ApiModelProperty(value = "总实发")
+    private BigDecimal totalShippedQuantity;
+
+    /**
+     * 总补发
+     */
+    @ApiModelProperty(value = "总补发")
+    private BigDecimal totalSupplementaryQuantity;
+
+    /**
      * 状态
      * 状态
      */
      */
     @ApiModelProperty(value = "状态")
     @ApiModelProperty(value = "状态")

@@ -9,6 +9,7 @@ import org.hibernate.validator.constraints.Length;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDate;
 import java.util.List;
 import java.util.List;
 
 
@@ -73,6 +74,24 @@ public class UpdateReplenishmentOrderVo implements BaseVo, Serializable {
     private String purchaseOrderId;
     private String purchaseOrderId;
 
 
     /**
     /**
+     * 总需发
+     */
+    @ApiModelProperty(value = "总需发")
+    private BigDecimal totalQuantity;
+
+    /**
+     * 总实发
+     */
+    @ApiModelProperty(value = "总实发")
+    private BigDecimal totalShippedQuantity;
+
+    /**
+     * 总补发
+     */
+    @ApiModelProperty(value = "总补发")
+    private BigDecimal totalSupplementaryQuantity;
+
+    /**
      * 补货单物料行
      * 补货单物料行
      */
      */
     @ApiModelProperty("补货单物料行")
     @ApiModelProperty("补货单物料行")

@@ -10,6 +10,9 @@
         <result column="customer_id" property="customerId"/>
         <result column="customer_id" property="customerId"/>
         <result column="origin_plan_ship_date" property="originPlanShipDate"/>
         <result column="origin_plan_ship_date" property="originPlanShipDate"/>
         <result column="purchase_order_id" property="purchaseOrderId"/>
         <result column="purchase_order_id" property="purchaseOrderId"/>
+        <result column="total_quantity" property="totalQuantity"/>
+        <result column="total_shipped_quantity" property="totalShippedQuantity"/>
+        <result column="total_supplementary_quantity" property="totalSupplementaryQuantity"/>
         <result column="status" property="status"/>
         <result column="status" property="status"/>
         <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"/>
@@ -27,6 +30,9 @@
                tb.customer_id,
                tb.customer_id,
                tb.origin_plan_ship_date,
                tb.origin_plan_ship_date,
                tb.purchase_order_id,
                tb.purchase_order_id,
+               tb.total_quantity,
+               tb.total_shipped_quantity,
+               tb.total_supplementary_quantity,
                tb.status,
                tb.status,
                tb.create_by_id,
                tb.create_by_id,
                tb.create_by,
                tb.create_by,