Merge remote-tracking branch 'origin/jd_dev' into jd_dev

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

@@ -123,6 +123,9 @@ public class OrderCargoControlReleaseInfoDto {
     @ApiModelProperty(value = "收货人编号")
     private String consigneeNumber;
 
+    @ApiModelProperty(value = "收货人Id")
+    private Long consigneeId;
+
     @ApiModelProperty(value = "收货人姓名(英文)")
     private String consigneeNameEn;
 
@@ -138,6 +141,9 @@ public class OrderCargoControlReleaseInfoDto {
     @ApiModelProperty(value = "发货人编号")
     private String consignerNumber;
 
+    @ApiModelProperty(value = "发货人id")
+    private Long consignerId;
+
     @ApiModelProperty(value = "运输方式")
     private Integer transportId;
 

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

@@ -20,22 +20,24 @@
         SELECT o.order_no,
                o.order_id,
                nor.customer_number as consignerNumber,
+               nor.customer_id as consignerId,
                nee.customer_number as consigneeNumber,
+               nee.customer_id as consigneeId,
                nee.NAME            as consigneeName,
                nee.phone           as consigneePhone,
                nee.country_code    as consigneeCountryCode,
                o.sum_num,
                occ.pick_num,
                occ.pick_volume,
-               truncate(ceil((occ.pick_num/round(o.sum_num*occ.pick_volume,5))*100)/100,2) as chargeVol,
+               truncate(ceil((round((occ.pick_num/o.sum_num)*occ.pick_volume,5))*100)/100,2) as chargeVolume,
                occ.pick_weight,
-               truncate(ceil((occ.pick_num/round(o.sum_num*occ.pick_weight,5))*100)/100,2) as chargeWeight,
+               truncate(ceil((round((occ.pick_num/o.sum_num)*occ.pick_weight,5))*100)/100,2) as chargeWeight,
                occ.status,
                occ.remarks,
                occ.operator,
                occ.create_time,
                occ.check_time,
-               o.pick_state as cargoControlStatus,
+               o.cargo_control_status as cargoControlStatus,
                ew_start.title_zh as startTitleZh,
                ew_start.title_en as startTitleEn,
                ew_start.title_fr as startTitleFr,
@@ -49,7 +51,7 @@
         FROM ecw_order_cargo_control_pick occ
                  JOIN ecw_order o on o.order_id = occ.order_id
                  LEFT JOIN ecw_order_consignor nor ON nor.order_id = o.order_id AND nor.deleted = 0
-                 LEFT JOIN ecw_order_consignee nee ON nee.order_id = o.order_id AND nee.deleted = 0
+                 LEFT JOIN ecw_order_consignor nee ON nee.phone = occ.consignee_phone AND nee.deleted = 0
                  LEFT JOIN ecw_warehouse_line ewl on ewl.id = o.line_id
                  LEFT JOIN ecw_warehouse ew_start ON ew_start.id = ewl.start_warehouse_id
                  LEFT JOIN ecw_warehouse ew_dest ON ew_dest.id = ewl.dest_warehouse_id
@@ -69,9 +71,9 @@
     <select id="statisticsOrderControl" resultType="cn.iocoder.yudao.module.order.vo.order.StatisticsOrderVO">
         SELECT sum(occ.pick_num) as totalNum,
         sum(occ.pick_volume) as totalVolume,
-        sum(truncate(ceil((occ.pick_num/round(o.sum_num*occ.pick_volume,5))*100)/100,2)) as totalChargeVolume,
+        sum(truncate(ceil((round((occ.pick_num/o.sum_num)*occ.pick_volume,5))*100)/100,2)) as totalChargeVolume,
         sum(occ.pick_weight) as totalWeight,
-        sum(truncate(ceil((occ.pick_num/round(o.sum_num*occ.pick_weight,5))*100)/100,2)) as totalChargeWeight
+        sum(truncate(ceil((round((occ.pick_num/o.sum_num)*occ.pick_weight,5))*100)/100,2)) as totalChargeWeight
         FROM ecw_order_cargo_control_pick occ
         JOIN ecw_order o on o.order_id = occ.order_id
         LEFT JOIN ecw_order_consignor nor ON nor.order_id = o.order_id AND nor.deleted = 0
@@ -81,7 +83,6 @@
         LEFT JOIN ecw_warehouse ew_dest ON ew_dest.id = ewl.dest_warehouse_id
         LEFT JOIN ecw_channel ec on ec.channel_id = o.channel_id
         <include refid="query"/>
-        and occ.status = 3
     </select>
 
     <sql id="query">