Merge remote-tracking branch 'origin/dev' into dev

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

@@ -531,7 +531,10 @@
         order_package_code = #{orderPackageCode}
         AND conditions = 2
         ) t
-        LEFT JOIN logpm_distribution_stock_list ldsl ON ldsl.incoming_batch = t.order_code and  ldsl.cargo_number=t.material_code
+        LEFT JOIN logpm_distribution_stock_list ldsl ON ldsl.incoming_batch = t.order_code
+        where
+        ldsl.cargo_number=t.material_code
+        and ldsl.is_deleted=0
     </select>
     <select id="getMerchantStockList" resultType="com.logpm.distribution.entity.DistributionStockListEntity">
         SELECT * FROM logpm_distribution_stock_list WHERE  tenant_id = #{tenantId} AND cargo_number= #{materielCode}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseRetentionRecordServiceImpl.java

@@ -315,6 +315,9 @@ public class WarehouseRetentionRecordServiceImpl extends BaseServiceImpl<Warehou
 							//零担
 							saveFlah.set(distributionDeliveryListClient.retentionDeliveryReservationZeroPackage(rs.getDeliveryId(), rs.getReservationId(), rs.getOrderPackageId(),rs.getRetentionQuantity(),rs.getOrderId()));
 							break;
+						default:
+							log.error(">>>>> rs.getConditions()={}",rs.getConditions());
+
 					}
 				}
 			});