推送老系统仓库BUG修复、预约编辑订单编辑BUG修复

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

@@ -1040,7 +1040,11 @@
         FROM
         logpm_distribution_parcel_list AS ldpl
         WHERE
-        ldpl.order_package_reservation_status  = 10  and ldpl.order_package_freeze_status = 10 AND ldpl.order_package_loading_status = 10 AND order_package_status IN (10,20)
+        ldpl.order_package_reservation_status  = 10
+        and ldpl.order_package_freeze_status = 10
+        AND ldpl.order_package_loading_status = 10
+        AND ldpl.conditions = 1
+        AND order_package_status IN (10,20)
         and ldpl.stock_article_id = #{param.orderId} and ldpl.warehouse_id = #{warehouseId}
         <if test="param.waybillNumber != null and param.waybillNumber != ''">
             and ldpl.waybill_number like concat('%',#{param.waybillNumber},'%')

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

@@ -274,7 +274,16 @@ public interface DistributionSignforMapper extends BaseMapper<DistributionSignfo
 	 * @param deliveryId
 	 * @return
 	 */
-	List<SignPushDataUnitDTO> selectPushOldInventory(@Param("reservationId")Long reservationId, @Param("deliveryId")Long deliveryId);
+	List<SignPushDataUnitDTO> selectLoadingPushOldInventory(@Param("reservationId")Long reservationId, @Param("deliveryId")Long deliveryId);
+
+
+	/**
+	 * 推送老系统库存品包件
+	 * @param reservationId
+	 * @param deliveryId
+	 * @return
+	 */
+	List<SignPushDataUnitDTO> selectSigningPushOldInventory(@Param("reservationId")Long reservationId, @Param("deliveryId")Long deliveryId);
 
 	/**
 	 * 减少装车数
@@ -339,4 +348,6 @@ public interface DistributionSignforMapper extends BaseMapper<DistributionSignfo
 	 * @return
 	 */
     List<Map<String, Object>> getByReservationIds(@Param("reservationIds") List<Long> longList);
+
+
 }

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

@@ -1230,7 +1230,7 @@
             AND ldl.is_deleted = 0
             AND ldl.signfor_state = 2
     </select>
-    <select id="selectPushOldInventory" resultType="com.logpm.oldproject.dto.SignPushDataUnitDTO">
+    <select id="selectLoadingPushOldInventory" resultType="com.logpm.oldproject.dto.SignPushDataUnitDTO">
         SELECT
             ldsl.id AS id,
             ldsl.warehouse_id AS warehouse_id,
@@ -1240,6 +1240,43 @@
             lddl.order_code AS orderSelfNum,
             ldsld.stock_package_code AS unitNo,
             ldl.signfor_state AS type,
+            ldl.create_time AS operateTime,
+            ldl.create_user AS administratorsId,
+            IF
+            ( ldl.id IS NOT NULL, 1, ldl.id ) AS is_loading,
+            ldl.scan_time AS loading_time,
+            ldl.signing_time AS sign_time,
+            1 AS is_out,
+            ldsl.quantity_stock AS num,
+            3 AS goods_type,
+            ldl.received_quantity AS sign_num,
+            4 AS broke_state
+        FROM
+            logpm_distribution_loadscaninvn AS ldl
+            LEFT JOIN logpm_distribution_delivery_list AS lddl ON ldl.delivery_id = lddl.id
+            AND lddl.is_deleted = 0
+            LEFT JOIN logpm_dis_stock_list_detail AS ldsld ON ldsld.reservation_id = ldl.reservation_id
+            AND ldl.inventory_id = ldsld.stock_list_id
+            AND ldsld.is_deleted = 0
+            LEFT JOIN logpm_distribution_stock_list AS ldsl ON ldsl.id = ldl.inventory_id
+            AND ldsl.is_deleted = 0
+        WHERE
+            ldl.delivery_id = #{deliveryId}
+            AND ldl.reservation_id = #{reservationId}
+            AND ldl.scan_status != 1
+    </select>
+    <select id="selectSigningPushOldInventory" resultType="com.logpm.oldproject.dto.SignPushDataUnitDTO">
+        SELECT
+            ldsl.id AS id,
+            ldsl.warehouse_id AS warehouse_id,
+            lddl.id AS distribution_id,
+            lddl.train_number AS trans_no,
+            ldsl.incoming_batch AS waybill_no,
+            lddl.order_code AS orderSelfNum,
+            ldsld.stock_package_code AS unitNo,
+            ldl.signfor_state AS type,
+            ldl.signing_time AS operateTime,
+            ldl.signing_user_id AS administratorsId,
             IF
             ( ldl.id IS NOT NULL, 1, ldl.id ) AS is_loading,
             ldl.scan_time AS loading_time,

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/ClerkCheckPushDataQueueHandler.java

@@ -182,9 +182,16 @@ public class ClerkCheckPushDataQueueHandler {
 
 					if (distributionReservationEntity.getReservationStockListNum() > 0) {
 						//查询库存品扫描签收
-						List<SignPushDataUnitDTO> pushOldInventory = distributionSignforMapper.selectPushOldInventory(distributionSignforEntity.getReservationId(), distributionSignforEntity.getDeliveryId());
+						List<SignPushDataUnitDTO> loadingPushOldInventory = distributionSignforMapper.selectLoadingPushOldInventory(distributionSignforEntity.getReservationId(), distributionSignforEntity.getDeliveryId());
-						if (Func.isNotEmpty(pushOldInventory)) {
+						List<SignPushDataUnitDTO> signingPushOldInventory = distributionSignforMapper.selectSigningPushOldInventory(distributionSignforEntity.getReservationId(), distributionSignforEntity.getDeliveryId());
-							signPushDataUnitDTOS.addAll(pushOldInventory);
+						if (Func.isNotEmpty(loadingPushOldInventory)) {
+							buildNameAndPhone(loadingPushOldInventory);
+							signPushDataUnitDTOS.addAll(loadingPushOldInventory);
+						}
+
+						if (Func.isNotEmpty(signingPushOldInventory)) {
+							buildNameAndPhone(signingPushOldInventory);
+							signPushDataUnitDTOS.addAll(signingPushOldInventory);
 						}
 					}
 					//查询签收图片

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/WarehouseServiceImpl.java

@@ -61,6 +61,7 @@ public class WarehouseServiceImpl implements IWarehouseService {
 	public WarehouseEntity findByName(String destinationWarehouse) {
 		QueryWrapper<WarehouseEntity> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("title",destinationWarehouse);
+		queryWrapper.eq("delete_time",0);
 
 		return warehouseMapper.selectOne(queryWrapper);
 	}