放货率数据冗余及查询

sql/v2.1/20240909.sql

+-- 放货箱数与放货率
+alter table `ecw_order`
+    add column `release_ratio` decimal(5,2) DEFAULT '0.00' COMMENT '放货率';
+alter table `ecw_order`
+    add column `release_num` int DEFAULT 0 COMMENT '放货箱数';
+
+-- 批量刷新订单放货数量、放货率
+update ecw_order t LEFT JOIN (select ccp.order_id , ifnull(sum(ccp.pick_num),0) as releaseNum from ecw_order_cargo_control_pick ccp where ccp.order_id = o.order_id and
+    ccp.status in(1,2,3,4,5,6) group by ccp.order_id) t1 on t.order_id=t1.order_id set t.release_num=t1.releaseNum, t.release_ratio=ROUND(t1.releaseNum/t.sum_num,2)*100;

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

@@ -537,12 +537,18 @@ public class OrderDO extends BaseDO {
     @ApiModelProperty(value = "提货状态：0 未提货 1 部分提货 2 已提货")
     private Integer pickState;
 
-    @ApiModelProperty(value = "'提货率'")
+    @ApiModelProperty(value = "提货率")
     private BigDecimal pickRatio;
 
-    @ApiModelProperty(value = "'提货箱数'")
+    @ApiModelProperty(value = "提货箱数")
     private Integer pickNum;
 
+    @ApiModelProperty(value = "放货率")
+    private BigDecimal releaseRatio;
+
+    @ApiModelProperty(value = "放货箱数")
+    private Integer releaseNum;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "订单商品项列表")
     @NotNull(message = "订单商品项列表不能为空")

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

@@ -539,6 +539,13 @@ public class OrderBackInfoDto {
     @ApiModelProperty(value = "'提货箱数'")
     private Integer pickNum;
 
+
+    @ApiModelProperty(value = "放货率")
+    private BigDecimal releaseRatio;
+
+    @ApiModelProperty(value = "放货箱数")
+    private Integer releaseNum;
+
     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

@@ -380,6 +380,13 @@ public class OrderBackPageVO {
     @ApiModelProperty(value = "'提货箱数'")
     private Integer pickNum;
 
+
+    @ApiModelProperty(value = "放货率")
+    private BigDecimal releaseRatio;
+
+    @ApiModelProperty(value = "放货箱数")
+    private Integer releaseNum;
+
     /**
      * 渠道名称
      */
@@ -399,9 +406,6 @@ public class OrderBackPageVO {
     @ApiModelProperty(value = "当前控货箱数")
     private BigDecimal controlWeight;
 
-    @ApiModelProperty(value = "已放货箱数")
-    private Integer releaseNum;
-
     @ApiModelProperty(value = "放货数量")
     private Integer releaseQuantity;
 

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

@@ -640,6 +640,13 @@ public class OrderBackVO {
     private Integer pickNum;
 
 
+    @ApiModelProperty(value = "放货率")
+    private BigDecimal releaseRatio;
+
+    @ApiModelProperty(value = "放货箱数")
+    private Integer releaseNum;
+
+
     public void setExternalWarehouseJson(String externalWarehouseJson) {
         this.externalWarehouseJson = externalWarehouseJson;
         if (StringUtils.isNotBlank(externalWarehouseJson)) {

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

@@ -364,6 +364,13 @@ public class OrderBaseVO {
     @ApiModelProperty(value = "'提货箱数'")
     private Integer pickNum;
 
+
+    @ApiModelProperty(value = "放货率")
+    private BigDecimal releaseRatio;
+
+    @ApiModelProperty(value = "放货箱数")
+    private Integer releaseNum;
+
     public void setExceptionReason(String exceptionReason) {
         this.exceptionReason = StringUtils.isNotBlank(exceptionReason) ? I18nMessage.getMessage(exceptionReason) : exceptionReason;
     }

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

@@ -553,6 +553,18 @@ public class OrderQueryVO {
     @ApiModelProperty(value = "大于等于提货率")
     private BigDecimal gePickRatio;
 
+    @ApiModelProperty(value = "'放货率'")
+    private BigDecimal releaseRatio;
+
+    @ApiModelProperty(value = "小于等于放货率")
+    private BigDecimal leReleaseRatio;
+
+    @ApiModelProperty(value = "等于放货率")
+    private BigDecimal eqReleaseRatio;
+
+    @ApiModelProperty(value = "大于等于放货率")
+    private BigDecimal geReleaseRatio;
+
     @ApiModelProperty(value = "'提货箱数'")
     private Integer pickNum;