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

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

@@ -2759,7 +2759,6 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 	@Override
 	public R abolishWaybill(List<Long> waybillIds, Long warehouseId, String warehouseName, String abolishReson) {
 		List<WarehouseWaybillEntity> waybillList = warehouseWaybillClient.findListByWaybillIds(waybillIds);
-		List<WarehouseWaybillEntity> waybillEntities = warehouseWaybillClient.findListByWaybillIds(waybillIds);
 		waybillList.forEach(waybillEntity -> {
 			String waybillNo = waybillEntity.getWaybillNo();
 			String waybillStatus = waybillEntity.getWaybillStatus();
@@ -2781,7 +2780,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 			waybillEntity.setAbolishUserName(AuthUtil.getNickName());
 			waybillEntity.setAbolishTime(new Date());
 		});
-		warehouseWaybillClient.updateList(waybillEntities);
+		warehouseWaybillClient.updateList(waybillList);
 
 		//把装了车的包件取消装车
 		List<Long> carsLoadScanIds = trunklineCarsLoadScanService.findCarsLoadScanIdsByWaybillIds(waybillIds);
@@ -2809,7 +2808,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 			distributionParcelListClient.clearParceListWaybillByAdvanceIds(advanceIds);
 		}
 
-		waybillEntities.forEach(waybillEntity -> {
+		waybillList.forEach(waybillEntity -> {
 			String createOperationRemark = "作废运单" + waybillEntity.getWaybillNo() + ",时间：" + CommonUtil.dateToString(new Date());
 			openOrderAsyncService.saveLog(waybillEntity.getId(), waybillEntity.getWaybillNo(), "1000", "作废运单", createOperationRemark+" 原因："+abolishReson, AuthUtil.getNickName(), AuthUtil.getUserId(), warehouseId, warehouseName);
 		});

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

@@ -74,7 +74,7 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl<TrunklineBil
 		TrunklineBillladingEntity trunklineBillladingEntity = new TrunklineBillladingEntity();
 		BeanUtil.copy(billladingDTO,trunklineBillladingEntity);
 		trunklineBillladingEntity.setBillladingStatus("1");
-		trunklineBillladingEntity.setCreateUserName(AuthUtil.getUserName());
+		trunklineBillladingEntity.setCreateUserName(AuthUtil.getNickName());
 		trunklineBillladingEntity.setBillladingCode(billladingCode);
 		trunklineBillladingEntity.setRealVolume(BigDecimal.ZERO);
 		trunklineBillladingEntity.setRealWeight(BigDecimal.ZERO);