@ -299,13 +299,6 @@
<if test= "param.startWarehouseEntryTimeEnd != null and param.startWarehouseEntryTimeEnd !='' and param.lastWarehouseEntryTimeEnd !=''and param.lastWarehouseEntryTimeEnd != null" > <if test= "param.startWarehouseEntryTimeEnd != null and param.startWarehouseEntryTimeEnd !='' and param.lastWarehouseEntryTimeEnd !=''and param.lastWarehouseEntryTimeEnd != null" >
and ldpl.warehouse_entry_time_end BETWEEN #{param.startWarehouseEntryTimeEnd} AND #{param.lastWarehouseEntryTimeEnd} and ldpl.warehouse_entry_time_end BETWEEN #{param.startWarehouseEntryTimeEnd} AND #{param.lastWarehouseEntryTimeEnd}
</if> </if>
<!-- <if test="param.startLoadingTime != null and param.lastLoadingTime != null and param.startLoadingTime != '' and param.lastLoadingTime != ''"> -->
<!-- AND ldl.scan_time BETWEEN #{param.startLoadingTime} AND #{param.lastLoadingTime} -->
<!-- </if> -->
<!-- <if test="param.startSigningTime != null and param.lastSigningTime != null and param.startSigningTime != '' and param.lastSigningTime != ''"> -->
<!-- AND ldl.signing_time BETWEEN #{param.startSigningTime} AND #{param.lastSigningTime} -->
<!-- </if> -->
</where> </where>
</select> </select>
@ -893,55 +886,244 @@
<select id= "exportDistributionParcelList" <select id= "exportDistributionParcelList"
resultType="com.logpm.distribution.excel.DistributionParcelListExcel"> resultType="com.logpm.distribution.excel.DistributionParcelListExcel">
SELECT SELECT
ldpl.warehouse_id warehouseId, ldpl.warehouse_id warehouseId,
ldpl.id id, ldpl.id id,
lww.name warehouse, lww.name warehouse,
ldpl.conditions conditions, ldpl.conditions conditions,
ldpl.order_package_code orderPackageCode, ldpl.order_package_code orderPackageCode,
ldpl.firsts firsts, ldpl.firsts firsts,
ldpl.second second, ldpl.second second,
ldpl.third_product thirdProduct, ldpl.third_product thirdProduct,
ldpl.quantity quantity, ldpl.quantity quantity,
ldpl.train_number trainNumber, ldpl.train_number trainNumber,
ldpl.stock_article_id stockArticleId, ldpl.stock_article_id stockArticleId,
ldpl.order_code orderCode, ldpl.order_code orderCode,
ldpl.service_number serviceNumber, ldpl.service_number serviceNumber,
ldpl.material_id materialId, ldpl.material_id materialId,
ldpl.material_name materialName, ldpl.material_name materialName,
ldpl.brand_name brandName, ldpl.material_code materialCode,
ldpl.order_package_freeze_status orderPackageFreezeStatus, ldpl.brand_name brandName,
ldpl.order_package_grounding_status orderPackageGroundingStatus, ldpl.order_package_status orderPackageStatus,
ldpl.order_package_stockup_status orderPackageStockupStatus, ldpl.order_package_freeze_status orderPackageFreezeStatus,
ldpl.order_package_reservation_status orderPackageReservationStatus, ldpl.order_package_grounding_status orderPackageGroundingStatus,
ldpl.order_package_loading_status orderPackageLoadingStatus, ldpl.order_package_stockup_status orderPackageStockupStatus,
ldpl.waybill_number waybillNumber, ldpl.order_package_reservation_status orderPackageReservationStatus,
ldpl.warehouse_entry_time_end warehouseEntryTimeEnd, ldpl.order_package_loading_status orderPackageLoadingStatus,
ldpl.waybill_number waybillNumber, ldpl.warehouse_entry_time_end warehouseEntryTimeEnd,
lwug.position_code goodsAllocation, ldpl.waybill_number waybillNumber,
lwtg.tray_code pallet ldsa.type_service typeService,
ldpl.order_code,
IF(c.reservation_code is not null,c.reservation_code,IF(b.pickup_batch is not null,b.pickup_batch,a.reservation_code)) AS reservationCode,
IF(c.driver_name is not null,c.driver_name,IF(b.consignee is not null,b.consignee,a.driver_name)) AS driverName,
IF(c.vehicle_name is not null,c.vehicle_name,IF(b.pick_up_plate is not null,b.pick_up_plate,a.vehicle_name)) AS vehicleName,
IF(c.train_number is not null,c.train_number,IF(b.train_number is not null,b.train_number,a.train_number)) AS dvehicleName,
IF(c.scan_user is not null,c.scan_user,IF(b.scan_user is not null,b.scan_user,a.scan_user)) AS scanUser,
IF(c.signing_user is not null,c.signing_user,IF(b.signing_user is not null,b.signing_user,a.signing_user)) AS signingUser,
IF(c.scan_time is not null,c.scan_time,IF(b.scan_time is not null,b.scan_time,a.scan_time)) AS loadingTime,
IF(c.signing_time is not null,c.signing_time,IF(b.signing_time is not null,b.signing_time,a.signing_time)) AS signingTime,
m.qr_code AS goodsAllocation,
n.pallet_name AS pallet
FROM
logpm_distribution_parcel_list AS 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_distribution_stock_article ldsa on ldsa.id = ldpl.stock_article_id
LEFT join logpm_warehouse_warehouse lww on lww.id = ldpl.warehouse_id
LEFT JOIN (SELECT lwug.association_id,lwga.qr_code,lwug.is_deleted FROM logpm_warehouse_updown_goods AS lwug LEFT JOIN logpm_warehouse_goods_allocation AS lwga ON lwug.allocation_id = lwga.id ) AS m ON m.association_id = ldpl.id
LEFT JOIN (SELECT lwtg.association_id,lwt.pallet_name,lwtg.is_deleted FROM logpm_warehouse_tray_goods AS lwtg LEFT JOIN logpm_warehouse_tray AS lwt ON lwtg.tray_id = lwt.id) AS n ON n.association_id = ldpl.id
LEFT JOIN
(SELECT
ldrp.parce_list_id,
ldl.scan_time,
lddl.train_number,
lddl.driver_name,
lddl.vehicle_name,
ldl.signing_time,
ldl.scan_user,
ldl.signing_user,
ldr.reservation_code
FROM logpm_distribution_reservation_package ldrp
LEFT JOIN logpm_distribution_loadscan ldl on ldl.package_id = ldrp.parce_list_id and ldl.scan_status !=1 AND ldl.is_deleted = 0
LEFT JOIN logpm_distribution_reservation ldr on ldr.id = ldrp.reservation_id
LEFT JOIN logpm_distribution_signfor AS lds ON lds.reservation_id = ldr.id
LEFT JOIN logpm_distribution_delivery_list lddl on lds.delivery_id =lddl.id
<where >
ldrp.packet_bar_status != '2'
<if test= "param.reservationCode !='' and param.reservationCode != null" >
and ldr.reservation_code like concat(#{param.reservationCode},'%')
</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.signingTime !='' and param.signingTime != null" >
and date_format(from_unixtime(ldl.signing_time),'%Y-%m-%d') = date_format(#{param.signingTime}),'%Y-%m-%d')
</if>
<if test= "param.dvehicleName !='' and param.dvehicleName != null" >
and lddl.train_number = #{param.dvehicleName}
</if>
<if test= "param.vehicleName !='' and param.vehicleName != null" >
and lddl.vehicle_name like concat('%',#{param.vehicleName},'%')
</if>
<if test= "param.vehicleName !='' and param.vehicleName != null" >
and lddl.vehicle_name like concat('%',#{param.vehicleName},'%')
</if>
<if test= "param.driverName !='' and param.driverName != null" >
and lddl.driver_name like concat('%',#{param.driverName},'%')
</if>
<if test= "param.scanUser !='' and param.scanUser != null" >
and ldl.scan_user like concat('%',#{param.scanUser},'%')
</if>
<if test= "param.signingUser !='' and param.signingUser != null" >
and ldl.signing_user like concat('%',#{param.signingUser},'%')
</if>
</where>
) AS a ON a.parce_list_id = ldpl.id
LEFT JOIN (
SELECT
ldbp.parce_list_id,
ldbl.pickup_batch,
ldbl.pickup_batch AS train_number,
ldbl.pick_up_plate AS pick_up_plate,
ldbl.consignee AS consignee,
ldbls.create_time AS scan_time,
ldbls.create_time AS signing_time,
ldbls.scan_user AS scan_user,
ldbls.scan_user AS signing_user
FROM FROM
logpm_platform.logpm_distribution_parcel_list ldpl logpm_distrilbution_bill_package AS ldbp
LEFT JOIN logpm_platform.logpm_warehouse_updown_goods lwug ON ldpl.id = lwug.association_id LEFT JOIN logpm_distrilbution_bill_lading ldbl ON ldbl.id = ldbp.bill_lading_id
LEFT JOIN logpm_platform.logpm_warehouse_tray_goods lwtg ON ldpl.id = lwtg.association_id LEFT JOIN logpm_distribution_bill_lading_scan ldbls ON ldbls.parcel_list_id = ldbp.parce_list_id
Left join logpm_platform.logpm_warehouse_warehouse lww on lww.id = ldpl.warehouse_id <where >
ldbp.packet_bar_status != '2'
<if test= "param.reservationCode !='' and param.reservationCode != null" >
and ldbl.pickup_batch like concat(#{param.reservationCode},'%')
</if>
<if test= "param.scanTime !='' and param.scanTime != null" >
and date_format(from_unixtime(ldl.created_time),'%Y-%m-%d') = date_format(#{param.scanTime}),'%Y-%m-%d')
</if>
<if test= "param.signingTime !='' and param.signingTime != null" >
and date_format(from_unixtime(ldl.created_time),'%Y-%m-%d') = date_format(#{param.signingTime}),'%Y-%m-%d')
</if>
<if test= "param.dvehicleName !='' and param.dvehicleName != null" >
and ldbl.pickup_batch = #{param.dvehicleName}
</if>
<if test= "param.vehicleName !='' and param.vehicleName != null" >
and ldbl.pick_up_plate like concat('%',#{param.vehicleName},'%')
</if>
<if test= "param.driverName !='' and param.driverName != null" >
and lddl.consignee like concat('%',#{param.driverName},'%')
</if>
<if test= "param.scanUser !='' and param.scanUser != null" >
and ldbls.scan_user like concat('%',#{param.scanUser},'%')
</if>
<if test= "param.signingUser !='' and param.signingUser != null" >
and ldbls.scan_user like concat('%',#{param.signingUser},'%')
</if>
</where>
) AS b ON b.parce_list_id = ldpl.id
LEFT JOIN (
SELECT
ldrzp.parcel_list_id,
IF(lddl.train_number is not null,lddl.train_number,ldbl.pickup_batch) AS train_number,
IF(lddl.driver_name is not null,lddl.driver_name,ldbl.consignee) AS driver_name,
IF(lddl.vehicle_name is not null,lddl.vehicle_name,ldbl.pick_up_plate) AS vehicle_name,
IF(ldl.signing_time is not null,ldl.signing_time,ldbls.create_time) AS signing_time,
IF(ldl.scan_time is not null,ldl.scan_time,ldbls.create_time) AS scan_time,
IF(ldl.scan_user is not null,ldl.scan_user,ldbls.scan_user) AS scan_user,
IF(ldl.signing_user is not null,ldl.signing_user,ldbls.scan_user) AS signing_user,
IF(ldr.reservation_code is not null,ldr.reservation_code,ldbl.pickup_batch) AS reservation_code
FROM logpm_distribution_reservation_zero_package ldrzp
LEFT JOIN logpm_distribution_loadscan ldl on ldl.package_id = ldrzp.parcel_list_id and ldl.scan_status !=1 AND ldl.is_deleted = 0
LEFT JOIN logpm_distribution_reservation ldr on ldr.id = ldrzp.reservation_id
LEFT JOIN logpm_distribution_signfor AS lds ON lds.reservation_id = ldr.id
LEFT JOIN logpm_distribution_delivery_list lddl on lds.delivery_id =lddl.id
LEFT JOIN logpm_distrilbution_bill_lading ldbl ON ldrzp.reservation_id = ldbl.id
LEFT JOIN logpm_distribution_bill_lading_scan ldbls ON ldbls.parcel_list_id = ldrzp.parcel_list_id
) AS c ON c.parcel_list_id = ldpl.id
<where > <where >
ldpl.is_deleted = 0 ldpl.is_deleted = 0
<if test= "paramMap.warehouseId != null and paramMap.warehouseId != ''" > <if test= "param.warehouse !='' and param.warehouse != null" >
and ldpl.warehouse_id = #{paramMap.warehouseId} and lww.name like concat('%',#{param.warehouse},'%')
</if>
<if test= "param.pallet !='' and param.pallet != null" >
and n.pallet_name like concat('%',#{param.warehouse},'%')
</if>
<if test= "param.goodsAllocation !='' and param.goodsAllocation != null" >
and m.qr_code like concat('%',#{param.warehouse},'%')
</if>
<if test= "param.orderPackageGroundingStatus !='' and param.orderPackageGroundingStatus != null" >
and ldpl.order_package_grounding_status = #{param.orderPackageGroundingStatus}
</if> </if>
<if test= "paramMap.warehouseIds != null " > <if test= "param.warehouseIdLi st != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(param.warehouseIdList) " >
and ldpl.warehouse_id IN and ldpl.warehouse_id in
<foreach collection= "paramMap.warehouseIds" item= "wItem" index= "index" open= "(" close= ")" separator= "," > <foreach collection= "param.warehouseIdLi st " item= "item " open= "(" close= ")" separator= "," >
#{wItem} #{i tem}
</foreach> </foreach>
</if> </if>
<if test= "paramMap.tenantId != null and paramMap.tenantId != ''" > <if test= "param.orderPackageCode !='' and param.orderPackageCode != null " >
and ldpl.tenant_id = #{paramMap.tenantId} and ldpl.order_package_code like concat(#{param.orderPackageCode},'%')
</if> </if>
<if test= "paramMap.serviceNumber != null and paramMap.serviceNumber != ''" > <if test= "param.firsts !='' and param.firsts != null" >
and ldpl.service_Number = #{paramMap.serviceNumber} and ldpl.firsts = #{param.firsts}
</if>
<if test= "param.second !='' and param.second != null" >
and ldpl.second = #{param.second}
</if>
<if test= "param.thirdProduct !='' and param.thirdProduct != null" >
and ldpl.third_product = #{param.thirdProduct}
</if>
<if test= "param.quantity !='' and param.quantity != null" >
and ldpl.quantity = #{param.quantity}
</if>
<if test= "param.trainNumber !='' and param.trainNumber != null" >
and ldpl.train_number = #{param.trainNumber}
</if>
<if test= "param.stockArticleId !='' and param.stockArticleId != null" >
and ldpl.stock_article_id like concat('%',#{param.stockArticleId},'%')
</if>
<if test= "param.orderCode !='' and param.orderCode != null" >
and ldpl.order_code like concat(#{param.orderCode},'%')
</if>
<if test= "param.serviceNumber !='' and param.serviceNumber != null" >
and ldpl.service_number like concat('%',#{param.serviceNumber},'%')
</if>
<if test= "param.materialName !='' and param.materialName != null" >
and ldpl.material_name like concat('%',#{param.materialName},'%')
</if>
<if test= "param.materialCode !='' and param.materialCode != null" >
and ldpl.material_code =#{param.materialCode}
</if>
<if test= "param.brandName !='' and param.brandName != null" >
and ldpl.brand_name like concat('%',#{param.brandName},'%')
</if>
<if test= "param.orderPackageFreezeStatus !='' and param.orderPackageFreezeStatus != null" >
and ldpl.order_package_freeze_status = #{param.orderPackageFreezeStatus}
</if>
<if test= "param.orderPackageLoadingStatus !='' and param.orderPackageLoadingStatus != null" >
and ldpl.order_package_loading_status = #{param.orderPackageLoadingStatus}
</if>
<if test= "param.orderPackageReservationStatus !='' and param.orderPackageReservationStatus != null" >
and ldpl.order_package_reservation_status = #{param.orderPackageReservationStatus}
</if>
<if test= "param.pallet !='' and param.pallet != null" >
and lwtg.tray_code = #{param.pallet}
</if>
<if test= "param.goodsAllocation !='' and param.goodsAllocation != null" >
and lwug.position_code = #{param.goodsAllocation}
</if>
<if test= "param.conditions !='' and param.conditions != null" >
and ldpl.conditions = #{param.conditions}
</if>
<if test= "param.orderPackageStatus !='' and param.orderPackageStatus != null" >
and ldpl.order_package_status = #{param.orderPackageStatus}
</if>
<if test= "param.waybillNumber != '' and param.waybillNumber != null " >
and ldpl.waybill_number = #{param.waybillNumber}
</if>
<if test= "param.startWarehouseEntryTimeEnd != null and param.startWarehouseEntryTimeEnd !='' and param.lastWarehouseEntryTimeEnd !=''and param.lastWarehouseEntryTimeEnd != null" >
and ldpl.warehouse_entry_time_end BETWEEN #{param.startWarehouseEntryTimeEnd} AND #{param.lastWarehouseEntryTimeEnd}
</if> </if>
<if test= "idArr != null and idArr != ''" > <if test= "idArr != null " >
and ldpl.id in and ldpl.id in
<foreach collection= "idArr" item= "item" open= "(" close= ")" separator= "," > <foreach collection= "idArr" item= "item" open= "(" close= ")" separator= "," >
#{item} #{item}
