补充订单到仓业务数据字段

sql/v2.1/20241027.sql

+-- 增加订单的到仓数据字段
+alter table ecw_order
+    add COLUMN `check_num` int DEFAULT '0' COMMENT '到仓件数',
+alter table ecw_order
+    add COLUMN `check_volume` decimal(10, 2) DEFAULT '0.00' COMMENT '到仓体积',
+alter table ecw_order
+    add COLUMN `check_quantity` int DEFAULT '0' COMMENT '到仓数量',
+alter table ecw_order
+    add COLUMN `check_weight` decimal(10, 2) DEFAULT '0.00' COMMENT '到仓重量',
\ No newline at end of file

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/dataobject/order/OrderDO.java

@@ -669,7 +669,17 @@ public class OrderDO extends BaseDO {
     private Boolean isInOpenSea;
 
 
+    @ApiModelProperty(value = "到仓件数")
+    private Integer checkNum;
 
+    @ApiModelProperty(value = "到仓数量")
+    private Integer checkQuantity;
+
+    @ApiModelProperty(value = "到仓体积")
+    private BigDecimal checkVolume;
+
+    @ApiModelProperty(value = "到仓重量")
+    private BigDecimal checkWeight;
 
     @ApiModelProperty(value = "订单修改是否变动了归属客户，此字段用来判定订单是否需要重置归属客户经理，下单后归属客户的客户经理是固定的，除非订单归属客户变动，才需要重置客户经理")
     @TableField(exist = false)

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dto/OrderBackInfoDto.java

@@ -549,6 +549,18 @@ public class OrderBackInfoDto {
     @ApiModelProperty(value = "放货箱数")
     private Integer releaseNum;
 
+    @ApiModelProperty(value = "到仓件数")
+    private Integer checkNum;
+
+    @ApiModelProperty(value = "到仓数量")
+    private Integer checkQuantity;
+
+    @ApiModelProperty(value = "到仓体积")
+    private BigDecimal checkVolume;
+
+    @ApiModelProperty(value = "到仓重量")
+    private BigDecimal checkWeight;
+
     public void setExceptionReason(String exceptionReason) {
         this.exceptionReason = exceptionReason;
         if (StringUtils.isNotBlank(exceptionReason) && Objects.nonNull(this.lang)) {

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/order/OrderBackPageVO.java

@@ -545,6 +545,17 @@ public class OrderBackPageVO {
     private String customerServiceName;
     // -----------end -----------
 
+    @ApiModelProperty(value = "到仓件数")
+    private Integer checkNum;
+
+    @ApiModelProperty(value = "到仓数量")
+    private Integer checkQuantity;
+
+    @ApiModelProperty(value = "到仓体积")
+    private BigDecimal checkVolume;
+
+    @ApiModelProperty(value = "到仓重量")
+    private BigDecimal checkWeight;
 
 
     public void setGuanLianOrderStatus(String guanLianOrderStatus) {

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/order/OrderBackVO.java

@@ -647,6 +647,17 @@ public class OrderBackVO {
     @ApiModelProperty(value = "放货箱数")
     private Integer releaseNum;
 
+    @ApiModelProperty(value = "到仓件数")
+    private Integer checkNum;
+
+    @ApiModelProperty(value = "到仓数量")
+    private Integer checkQuantity;
+
+    @ApiModelProperty(value = "到仓体积")
+    private BigDecimal checkVolume;
+
+    @ApiModelProperty(value = "到仓重量")
+    private BigDecimal checkWeight;
 
     public void setExternalWarehouseJson(String externalWarehouseJson) {
         this.externalWarehouseJson = externalWarehouseJson;

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/order/OrderBaseVO.java

@@ -389,6 +389,19 @@ public class OrderBaseVO {
     @ApiModelProperty(value = "是否有收货人，1-是，0-否")
     private Boolean hasConsignee = true;
 
+
+    @ApiModelProperty(value = "到仓件数")
+    private Integer checkNum;
+
+    @ApiModelProperty(value = "到仓数量")
+    private Integer checkQuantity;
+
+    @ApiModelProperty(value = "到仓体积")
+    private BigDecimal checkVolume;
+
+    @ApiModelProperty(value = "到仓重量")
+    private BigDecimal checkWeight;
+
     public void setExceptionReason(String exceptionReason) {
         this.exceptionReason = StringUtils.isNotBlank(exceptionReason) ? I18nMessage.getMessage(exceptionReason) : exceptionReason;
     }

yudao-module-order/yudao-module-order-core/src/main/resources/mapper/order/OrderMapper.xml

@@ -1522,6 +1522,9 @@
         o.sum_num,
         o.sum_volume,
         o.sum_weight,
+        o.check_num,
+        o.check_volume,
+        o.check_weight,
         o.sum_weight_finished_warehouse_in,
         o.sum_volume_finished_warehouse_in,
         o.packing_list_url,
@@ -1667,6 +1670,9 @@
         o.sum_num,
         o.sum_volume,
         o.sum_weight,
+        o.check_num,
+        o.check_volume,
+        o.check_weight,
         o.sum_weight_finished_warehouse_in,
         o.sum_volume_finished_warehouse_in,
         o.packing_list_url,
@@ -4467,8 +4473,6 @@
         o.audit_result,
         o.guan_lian_order_status,
         o.transport_id,
---         (select ifnull(sum(ccp.pick_num),0) from ecw_order_cargo_control_pick ccp where ccp.order_id = o.order_id and
---         ccp.status in(1,2,3,4) ) as release_num,
         o.release_num,
         o.release_ratio,
         o.is_cargo_control,
@@ -4480,6 +4484,9 @@
         o.sum_num,
         o.sum_volume,
         o.sum_weight,
+        o.check_num,
+        o.check_volume,
+        o.check_weight,
         o.sum_weight_finished_warehouse_in,
         o.sum_volume_finished_warehouse_in,
         o.packing_list_url,
@@ -4593,8 +4600,6 @@
         o.audit_result,
         o.guan_lian_order_status,
         o.transport_id,
---         (select ifnull(sum(ccp.pick_num),0) from ecw_order_cargo_control_pick ccp where ccp.order_id = o.order_id and
---         ccp.status in(1,2,3,4) ) as release_num,
         o.release_num,
         o.release_ratio,
         o.is_cargo_control,
@@ -4606,6 +4611,9 @@
         o.sum_num,
         o.sum_volume,
         o.sum_weight,
+        o.check_num,
+        o.check_volume,
+        o.check_weight,
         o.sum_weight_finished_warehouse_in,
         o.sum_volume_finished_warehouse_in,
         o.packing_list_url,
@@ -4745,8 +4753,6 @@
         o.audit_result,
         o.guan_lian_order_status,
         o.transport_id,
---         (select ifnull(sum(ccp.pick_num),0) from ecw_order_cargo_control_pick ccp where ccp.order_id = o.order_id and
---         ccp.status in(1,2,3,4) ) as release_num,
         o.release_num,
         o.release_ratio,
         o.is_cargo_control,
@@ -4758,6 +4764,9 @@
         o.sum_num,
         o.sum_volume,
         o.sum_weight,
+        o.check_num,
+        o.check_volume,
+        o.check_weight,
         o.sum_weight_finished_warehouse_in,
         o.sum_volume_finished_warehouse_in,
         o.packing_list_url,
@@ -4879,8 +4888,6 @@
         o.audit_result,
         o.guan_lian_order_status,
         o.transport_id,
---         (select ifnull(sum(ccp.pick_num),0) from ecw_order_cargo_control_pick ccp where ccp.order_id = o.order_id and
---         ccp.status in(1,2,3,4) ) as release_num,
         o.release_num,
         o.release_ratio,
         o.is_cargo_control,
@@ -4892,6 +4899,9 @@
         o.sum_num,
         o.sum_volume,
         o.sum_weight,
+        o.check_num,
+        o.check_volume,
+        o.check_weight,
         o.sum_weight_finished_warehouse_in,
         o.sum_volume_finished_warehouse_in,
         o.packing_list_url,
@@ -5000,6 +5010,9 @@
         o.sum_num,
         o.sum_volume,
         o.sum_weight,
+        o.check_num,
+        o.check_volume,
+        o.check_weight,
         o.sum_weight_finished_warehouse_in,
         o.sum_volume_finished_warehouse_in,
         o.packing_list_url,
@@ -5128,6 +5141,9 @@
         o.sum_num,
         o.sum_volume,
         o.sum_weight,
+        o.check_num,
+        o.check_volume,
+        o.check_weight,
         o.sum_weight_finished_warehouse_in,
         o.sum_volume_finished_warehouse_in,
         o.packing_list_url,