Merge branch 'dev' into pre-production

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

@@ -1171,6 +1171,7 @@
         logpm_distribution_signfor lds
         JOIN logpm_distribution_reservation ldr ON lds.reservation_id = ldr.id
         <where>
+            ldr.reservation_status != 40
             <if test="deliveryListId != null and deliveryListId != ''">
                 and lds.delivery_id = #{deliveryListId}
             </if>

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

@@ -457,14 +457,15 @@
     </select>
     <select id="selectBillLadingPackage"
             resultType="com.logpm.distribution.entity.DistributionParcelListEntity">
-        SELECT ldpl.* FROM logpm_distrilbution_bill_package AS ldbp LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldbp.parce_list_id = ldpl.id WHERE bill_lading_id in
+        SELECT ldpl.* FROM logpm_distrilbution_bill_package AS ldbp LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldbp.parce_list_id = ldpl.id
+        WHERE packet_bar_status != '3' AND bill_lading_id in
         <foreach collection="ids" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>
     </select>
     <select id="selectBillLadingInventory"
             resultType="com.logpm.distribution.entity.DistributionDeliveryDetailsEntity">
-        SELECT * FROM logpm_distribution_addvalue_detail WHERE bill_lading_id IN
+        SELECT * FROM logpm_distribution_delivery_details WHERE inventory_status != '3' AND bill_lading_id IN
         <foreach collection="ids" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockListService.java

@@ -182,6 +182,12 @@ public interface IDistributionStockListService extends BaseService<DistributionS
 	 */
     List<DistributionMerchantStockListVO> getMerchantStockList(String materielCode);
 
+	/**
+	 * 维护库存品的占用数量
+	 * @param stockListId
+	 * @param quantity
+	 */
+    void updateInventoryQuantityOccupied(Long stockListId, Integer quantity);
 
 
 //	/**

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

@@ -6782,7 +6782,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		String reservationCodes = reservationEntities.stream().filter(f -> !f.getLoadingStatus().equals(ReservationLoadingStatusConstant.daizhuangche.getValue())).map(DistributionReservationEntity::getReservationCode).collect(Collectors.joining(","));
 		if (Func.isNotEmpty(reservationCodes)) {
 			log.info(method + "存在装车数据:{}", reservationCodes);
-			return R.fail(reservationCodes + "存在装车包件!!!");
+			return R.fail(deliveryListEntity.getTrainNumber() + "存在装车包件!!!");
 		}
 		//该配送是否存在异常装车或者异常签收数据
 		List<DistributionLoadscanEntity> loadscanEntityList = distributionDeliveryListService.selectAbnormalLoadingBydeliveryId(deliveryId);

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java

@@ -704,6 +704,16 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 
 		return distributionMerchantStockListVOS;
 	}
+
+	@Override
+	@Transactional
+	public void updateInventoryQuantityOccupied(Long stockListId, Integer quantity) {
+		DistributionStockListEntity stockListEntity = this.getById(stockListId);
+		if (Func.isNotEmpty(stockListEntity)){
+			stockListEntity.setQuantityOccupied(stockListEntity.getQuantityOccupied() - quantity);
+			this.updateById(stockListEntity);
+		}
+	}
 }
 
 //	@Override