diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforVO.java index 054759be2..120c99373 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforVO.java @@ -97,6 +97,30 @@ public class DistributionSignforVO extends DistributionSignforEntity { @ApiModelProperty(value = "装车件数") private Integer loadingNum; + /** + * 包件装车件数 + */ + @ApiModelProperty(value = "包件装车件数") + private Integer packageLoadingNum; + + /** + * 库存品装车件数 + */ + @ApiModelProperty(value = "库存品装车件数") + private Integer inventoryLoadingNum; + + /** + * 库存品签收数 + */ + @ApiModelProperty(value = "库存品签收数") + private Integer inventorySigningNum; + + /** + * 包件签收件数 + */ + @ApiModelProperty(value = "包件签收件数") + private Integer packageSigningNum; + /** * 未装车件数 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSignforOwnExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSignforOwnExcel.java index acc4d2918..cf35b64b8 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSignforOwnExcel.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSignforOwnExcel.java @@ -176,7 +176,7 @@ public class DistributionSignforOwnExcel implements Serializable { @ApiModelProperty(value = "装车未扫数") @ColumnWidth(20) @ExcelProperty("装车未扫数") - private String withoutScanning; + private Integer withoutScanning; /** * 未签收数目 @@ -184,7 +184,7 @@ public class DistributionSignforOwnExcel implements Serializable { @ApiModelProperty(value = "未签收数目") @ColumnWidth(20) @ExcelProperty("未签收数目") - private String unsigneds; + private Integer unsigneds; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java index 8424f6047..ab576ba84 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java @@ -25,6 +25,7 @@ import com.logpm.distribution.entity.DistributionParcelListEntity; import com.logpm.distribution.entity.DistributionReservationEntity; import com.logpm.distribution.entity.DistributionSignforEntity; import com.logpm.distribution.excel.DistributionSignforExcel; +import com.logpm.distribution.excel.DistributionSignforOwnExcel; import com.logpm.distribution.vo.*; import com.logpm.distribution.vo.app.*; import com.logpm.oldproject.dto.SignPushDataUnitDTO; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml index 6b0579f8e..85bc51e2d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml @@ -1043,46 +1043,58 @@ lddl.vehicle_name AS vehicleName, lddl.task_time AS taskTime, lddl.loading_time AS loadingTime, - IF(ldr.reservation_num > 0,GROUP_CONCAT(ldsa.order_code),'') AS orderCode, lds.signee_name AS signeeName, - ldr.warehouse_id AS warehouseId, + + ldr.consignee AS consigne, + ldr.delivery_phone AS driverPhone, + ldr.delivery_address AS deliveryAddress, + ldr.warehouse_name AS warehouseName, + GROUP_CONCAT(ldsa.order_code) AS orderCode, + CASE + ldr.delivery_type + WHEN 1 THEN + '商配' + WHEN 2 THEN + '市配' + WHEN 3 THEN + '自提' + END AS deliveryTypeName, ldr.consignee AS consignee, - ldr.delivery_phone AS deliveryPhone, - ldr.delivery_address AS deliveryAddress, - CASE ldr.delivery_type - WHEN 1 THEN '商配' - WHEN 2 THEN '市配' - WHEN 3 THEN '自提' - END deliveryTypeName, - (ldr.reservation_num + ldr.reservation_stock_list_num ) AS totalNum, - (COUNT(ldl.id) + COUNT(ldll.id) ) AS loadingNum, - lds.received_quantity AS signingNum, - ((ldr.reservation_num + ldr.reservation_stock_list_num ) - (COUNT(ldl.id) + COUNT(ldll.id) )) AS unLoadingNum, - ((ldr.reservation_num + ldr.reservation_stock_list_num ) - lds.received_quantity) AS unsigneds, + ldr.reservation_num + ldr.reservation_stock_list_num AS totalNum, + lds.loaded_number AS packageLoadingNum, + lds.loadedin_number AS inventoryLoadingNum, + lds.received_quantity AS packageSigningNum, + lds.receivedin_quantity AS inventorySigningNum, lds.signing_time AS signingTime, lds.sjsigning_time AS sjsigningTime, - lds.signee_name AS signeeName, lds.examine_user_name AS examineUserName, - CASE lddl.delivery_status - WHEN 1 THEN '待配送' - WHEN 2 THEN '配送中' - WHEN 3 THEN '已完成' - END deliveryStatusName, - CASE lds.signing_status - WHEN 1 THEN '文员待审核' - WHEN 2 THEN '文员已审核' - END signingStatusName, - IF(lddl.kind = 1,ldds.driver_phone,lddt.driver_phone) AS driverPhone + CASE + lddl.delivery_status + WHEN 1 THEN + '待配送' + WHEN 2 THEN + '配送中' + WHEN 3 THEN + '已完成' + END AS deliveryStatusName, + CASE + lds.signing_status + WHEN 1 THEN + '文员待审核' + WHEN 2 THEN + '文员已审核' + END AS signingStatusName, + IF + ( lddl.kind = 1, ldds.driver_phone, lddt.driver_phone ) AS deliveryPhone FROM logpm_distribution_signfor lds - JOIN logpm_distribution_delivery_list lddl ON lddl.id = lds.delivery_id - JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id - LEFT JOIN logpm_distribution_reservation_stockarticle ldrs on ldr.id = ldrs.reservation_id - LEFT JOIN logpm_distribution_stock_article ldsa on ldsa.id = ldrs.stock_article_id - LEFT JOIN logpm_distribution_loadscan AS ldl ON ldr.id = ldl.reservation_id AND ldl.delivery_id = ldl.delivery_id - LEFT JOIN logpm_distribution_loadscaninvn AS ldll ON ldr.id = ldll.reservation_id AND ldll.delivery_id = ldl.delivery_id - LEFT JOIN logpm_distribution_delivery_self AS ldds ON ldds.delivery_id = lddl.id AND ldds.is_master = 2 - LEFT JOIN logpm_distribution_delivery_tripartite AS lddt ON lddt.delivery_id = lddl.id + left JOIN logpm_distribution_delivery_list lddl ON lddl.id = lds.delivery_id + left JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id + LEFT JOIN logpm_distribution_reservation_stockarticle ldrs ON ldr.id = ldrs.reservation_id + LEFT JOIN logpm_distribution_stock_article ldsa ON ldsa.id = ldrs.stock_article_id + LEFT JOIN logpm_distribution_delivery_self ldds ON ldds.delivery_id = lddl.id + AND ldds.is_master = 2 + LEFT JOIN logpm_distribution_delivery_tripartite lddt ON lddt.delivery_id = lddl.id lds.is_deleted = 0 @@ -1140,7 +1152,12 @@ and lds.signing_status = #{param.signingStatus} + + and ldr.warehouse_id = #{param.warehouseId} AND lddl.warehouse_id =#{param.warehouseId} + + GROUP BY + ldr.id