Merge branch 'dev' into pre-production

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

@@ -3004,6 +3004,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						distributionLoadscanEntity.setIsAbnormalLoading(2);
 						distributionLoadscanEntity.setIsAbnormalSigning(2);
 						distributionLoadscanEntity.setAbnormalNote("异常签收");
+						log.info("异常签收>>>>>>>>>>>>>>>reservationId:{},deliveryId:{},orderPackageCode:{}",distributionLoadscanEntity.getReservationId(),distributionLoadscanEntity.getDeliveryId(),distributionLoadscanEntity.getOrderPackageCode());
 						//进行签收数量的修改
 						Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId());
 						//修改签收数量
@@ -3011,9 +3012,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						warehouseUpdownTypeClient.downPackageOrDelTray(parcelListEntity.getOrderPackageCode(), myCurrentWarehouse.getId(), "签收下架解托");
 						List<JSONObject> jsonObjects = new ArrayList<>();
 						JSONObject jsonObject = new JSONObject();
-						jsonObject.put("code",loadscanEntity.getOrderPackageCode());
+						jsonObject.put("code",distributionLoadscanEntity.getOrderPackageCode());
 						jsonObject.put("warehouseId",myCurrentWarehouse.getId());
-						jsonObject.put("taskId",loadscanEntity.getReservationId());
+						jsonObject.put("taskId",distributionLoadscanEntity.getReservationId());
 						jsonObject.put("type",1);
 						jsonObject.put("num",1);
 						jsonObject.put("remark","异常签收下架");