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

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

@@ -1127,7 +1127,7 @@
         LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldla.package_id = ldpl.id
         WHERE
         ldla.reservation_id = #{reservationId} and ldl.reservation_id = #{reservationId} and ldla.delivery_list_id =
-        #{deliveryListId} AND ldl.scan_status != 1 AND ldl.is_deleted = 0
+        #{deliveryListId} AND ldl.scan_status != 1 AND ldl.is_deleted = 0 AND ldla.is_deleted = 0
     </select>
     <select id="selectSignImgsUrl" resultType="com.logpm.distribution.vo.DistributionSignPrintVO">
         SELECT * FROM logpm_distribution_sign_print WHERE reservation_id = #{reservationId} and is_deleted = 0

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

@@ -3303,6 +3303,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 										boolean isExit = checkList(list, reservationEntity.getId(), reservationStockarticleEntity.getStockArticleId(), p.getOrderPackageCode());
 										log.info(">>>>> 修改计划 验证包件是否存在 {}", isExit);
 										if (!isExit) {
+											list.add(reservationPackageEntity);
 											distributionReservationPackageService.save(reservationPackageEntity);
 											distributionAsyncService.checkStockArticleReservationStatus(p);
 											packageLockIds.add(p.getId());
@@ -3353,7 +3354,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 										JSONObject js = handleLogJSONObject(myCurrentWarehouse, AuthUtil.getUser(), parcelListEntity.getOrderPackageCode(), content, WorkNodeEnums.PLAN_DISTRIBUTION.getCode());
 										logs.add(js);
 									});
-
 								}
 							} else {
 								//查找该订单没有进行包件选择的操作，  但是存在newOrder列表中  视为该订单保持计划选择

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

@@ -5736,7 +5736,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				if (loadscanEntity.getSignforState().equals(LoadScanSigningStatusConstant.yiqianshou.getValue())) {
 					//已经进行签收了  这里就需要将异常签收的状态变更为正常
 					loadscanEntity.setIsAbnormalSigning(1);
-					loadscanEntity.setIsAbnormalLoading(1);
 				}
 				distributionLoadscanService.updateById(loadscanEntity);
 			}
@@ -5814,6 +5813,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		//维护包件的预约状态
 		DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(distributionLoadscanAbnormalEntity.getPackageId());
 		parcelListEntity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.yiyueyue.getValue());
+		parcelListEntity.setOrderPackageLoadingStatus(OrderPackageLoadingStatusConstant.yizhuangche.getValue());
 		distributionParcelListService.updateById(parcelListEntity);
 		distributionLoadscanAbnormalEntity.setAuditingStatus(2);
 		distributionLoadscanAbnormalEntity.setAuditingTime(new Date());