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

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

@@ -7938,7 +7938,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						warehouseUpdownTypeClient.downPackageOrDelTray(distributionLoadscanEntity.getOrderPackageCode(), myCurrentWarehouse.getId(), "签收下架解托");
 					}
 					pushList.add(distributionLoadscanEntity);
-					packageLockIds.add(distributionLoadscanEntity.getPackageId());
+					packageLockIds.add(parcelListEntity.getId());
 					parcelListEntity.setOrderPackageLoadingStatus(OrderPackageLoadingStatusConstant.yizhuangche.getValue());
 					parcelListEntity.setOrderPackageStatus(OrderPackageStatusConstant.yiqianshou.getValue());
 					distributionParcelListService.updateById(parcelListEntity);