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

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

@@ -2450,6 +2450,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			if(CollUtil.isNotEmpty(noUnloadOrderPackageCodes)){
 				String content = "包件在 " + warehouseEntity.getName() + "三方中转取消装车";
 				packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), noUnloadOrderPackageCodes, warehouseId, warehouseEntity.getName(), WorkNodeEnums.CANCEL_INITIAL_WAREHOUSE_LOADING.getCode(), content);
+				distributionParcelListClient.updatePackageStatus(noUnloadOrderPackageCodes,warehouseId,"20");
 			}
 
 		} catch (Exception e) {