签收列表详情数量统计

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppStockArticleVO.java

@@ -119,6 +119,12 @@ public class DistributionAppStockArticleVO extends DistributionStockArticleEntit
 	@ApiModelProperty(value = "单位")
 	private String logpmUnit;
 
+	/**
+	 * 包件码
+	 */
+	@ApiModelProperty(value = "包件码")
+	private String orderPackageCode;
+
 	@ApiModelProperty(value = "订单包件集合")
 	private List<DistributionAppParcelListVO> distributionAppParcelListVOS;
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml

@@ -308,16 +308,16 @@
         lddl.vehicle_name vehicleName,
         lddl.task_time taskTime,
         lddl.loading_time  AS signLoadingDate,
-        lds.received_quantity receivedQuantity,
+        (lds.received_quantity+receivedin_quantity) receivedQuantity,
         lds.examine_user_id examineUserId,
         lds.examine_user_name examineUserName,
         ldr.delivery_phone deliveryPhone,
         ldr.reservation_code reservationCode,
         ldr.delivery_address deliveryAddress,
         lds.delivery_sign_pictures deliverySignPictures,
-        ldr.reservation_num reservationNum,
+        (ldr.reservation_num + ldr.reservation_stock_list_num) reservationNum,
         lds.driver_signing driverSigning,
-        lds.loaded_number loadedNumber,
+        (lds.loaded_number+lds.loadedin_number) loadedNumber,
          lds.create_time   createTime,
         CASE  WHEN lds.signing_status ='2' THEN '文员签收'
           WHEN lds.driver_signing ='2' THEN '司机签收'
@@ -332,8 +332,8 @@
         ELSE '待签收'
         END sijiSigningStatus,
         lds.signing_status,
-        ldr.reservation_num - lds.received_quantity unsigneds,
-        ldr.reservation_num - lds.loaded_number withoutScanning,
+        (ldr.reservation_num + ldr.reservation_stock_list_num) - (lds.received_quantity+receivedin_quantity) unsigneds,
+        (ldr.reservation_num + ldr.reservation_stock_list_num) - (lds.loaded_number+lds.loadedin_number) withoutScanning,
         lds.reservation_id reservationId,
         CASE lddl.kind
         WHEN '1' THEN (SELECT driver_phone FROM logpm_distribution_delivery_self AS ldds WHERE ldds.delivery_id= lddl.id   AND ldds.is_deleted = 0 AND ldds.is_master = 2)