添加配送查询字段

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java

@@ -70,6 +70,42 @@ public class DistributionParcelListEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "订单自编号")
 	private String orderCode;
+	/**
+	 * 预约号
+	 */
+	@ApiModelProperty(value = "预约号")
+	@TableField(exist = false)
+	private String reservationCode;
+	/**
+	 * 装车时间
+	 */
+	@ApiModelProperty(value = "装车时间")
+	@TableField(exist = false)
+	private String scanTime;
+	/**
+	 * 配送车次
+	 */
+	@ApiModelProperty(value = "配送车次")
+	@TableField(exist = false)
+	private String dvehicleName;
+	/**
+	 *签收车次
+	 */
+	@ApiModelProperty(value = "签收车次")
+	@TableField(exist = false)
+	private String zvehicleName;
+	/**
+	 *配送司机
+	 */
+	@ApiModelProperty(value = "配送司机")
+	@TableField(exist = false)
+	private String driverName;
+	/**
+	 *配送单号
+	 */
+	@ApiModelProperty(value = "配送单号")
+	@TableField(exist = false)
+	private String noteNumber;
 	/**
 	 * 仓库
 	 */

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

@@ -335,6 +335,15 @@ public class DistributionDeliveryInfoVO extends DistributionDeliveryInfoEntity {
 	 */
 	@ApiModelProperty(value = "指派状态")
 	private String assignStatusName;
+
+	/**
+	 * 签收人员
+	 */
+	private String signingUser;
+	/**
+	 * 签收时间
+	 */
+	private String signingTime;
 //	/**
 //	 * 配送方式
 //	 */

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

@@ -16,7 +16,9 @@
  */
 package com.logpm.distribution.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.logpm.distribution.entity.DistributionParcelListEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -127,9 +129,36 @@ public class DistributionParcelListVO extends DistributionParcelListEntity {
 	 */
 	private Date  loadingTime;
 
-
-
-
+	/**
+	 * 预约号
+	 */
+	@ApiModelProperty(value = "预约号")
+	@TableField(exist = false)
+	private String reservationCode;
+	/**
+	 * 装车时间
+	 */
+	@ApiModelProperty(value = "装车时间")
+	@TableField(exist = false)
+	private String scanTime;
+	/**
+	 * 配送车次
+	 */
+	@ApiModelProperty(value = "配送车次")
+	@TableField(exist = false)
+	private String dvehicleName;
+	/**
+	 *签收车次
+	 */
+	@ApiModelProperty(value = "签收车次")
+	@TableField(exist = false)
+	private String zvehicleName;
+	/**
+	 *配送单号
+	 */
+	@ApiModelProperty(value = "配送单号")
+	@TableField(exist = false)
+	private String noteNumber;
 
 
 }

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

@@ -134,17 +134,45 @@
         ldpl.warehouse_entry_time_end warehouseEntryTimeEnd,
         ldpl.waybill_number waybillNumber,
         lwug.position_code goodsAllocation,
-        lwtg.tray_code pallet
+        lwtg.tray_code pallet,
+        ldr.reservation_code reservationCode,
+        ldl.scan_time scanTime,
+        lddl.vehicle_name dvehicleName,
+        ldl.vehicle_name zvehicleName,
+        lddl.driver_name driverName,
+        lddl.note_number noteNumber
         FROM
         logpm_distribution_parcel_list ldpl
         LEFT JOIN logpm_warehouse_updown_goods lwug ON ldpl.id = lwug.association_id
         LEFT JOIN logpm_warehouse_tray_goods lwtg ON ldpl.id = lwtg.association_id
         left join logpm_warehouse_warehouse lww on lww.id = ldpl.warehouse_id
+        LEFT JOIN logpm_distribution_reservation_package ldrp on ldrp.parce_list_id = ldpl.id
+        LEFT JOIN logpm_distribution_reservation ldr on ldr.id = ldrp.reservation_id
+        LEFT JOIN logpm_distribution_loadscan ldl on ldl.package_id = ldpl.id and ldl.type = 2
+        LEFT JOIN logpm_distribution_delivery_list lddl on lddl.id = ldl.delivery_id
         <where>
             ldpl.is_deleted = 0
             <if test="param.warehouse !='' and param.warehouse != null">
                 and lww.name like concat('%',#{param.warehouse},'%')
             </if>
+            <if test="param.reservationCode !='' and param.reservationCode != null">
+                and ldr.reservation_code = #{param.reservationCode}
+            </if>
+            <if test="param.DvehicleName !='' and param.DvehicleName != null">
+                and lddl.vehicle_name = #{param.DvehicleName}
+            </if>
+            <if test="param.ZvehicleName !='' and param.ZvehicleName != null">
+                and ldl.vehicle_name = #{param.ZvehicleName}
+            </if>
+            <if test="param.scanTime !='' and param.scanTime != null">
+                and date_format(from_unixtime(ldl.scan_time),'%Y-%m-%d') = date_format(#{param.scanTime}),'%Y-%m-%d')
+            </if>
+            <if test="param.driverName !='' and param.driverName != null">
+                and lddl.driver_name = #{param.driverName}
+            </if>
+           <if test="param.noteNumber !='' and param.noteNumber != null">
+                and lddl.note_number = #{param.noteNumber}
+            </if>
 
            <if test="param.orderPackageGroundingStatus !='' and param.orderPackageGroundingStatus != null">
                 and ldpl.order_package_grounding_status = #{param.orderPackageGroundingStatus}

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

@@ -359,10 +359,12 @@
         ldpl.firsts firsts,
         ldpl.SECOND SECOND,
         ldpl.third_product thirdProduct,
-        (select  COALESCE (ldl.received_quantity ,0) from logpm_distribution_loadscan ldl WHERE ldl.package_id =ldpl.id)    receivedQuantity
+        (select  COALESCE (ldl.received_quantity ,0) from logpm_distribution_loadscan ldl WHERE ldl.package_id =ldpl.id and ldl.signfor_state = 2 )    receivedQuantity,
+        ldl.signing_user signingUser, ldl.signing_time signingTime
         FROM
         logpm_distribution_reservation_package  ldrp
         JOIN logpm_distribution_parcel_list ldpl ON ldpl.id = ldrp.parce_list_id
+        LEFT JOIN logpm_distribution_loadscan ldl on ldl.package_id = ldpl.id
         <where>
             ldrp.stock_article_id = #{param.id}
         </where>