1.干线bug修复

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingWaybillMapper.xml

@@ -41,7 +41,7 @@
                lww.consignee_address consigneeAddress,
                lww.remark remark,
                lww.total_count-lww.billlading_num totalPlanNum,
-               lww.total_count-lww.billlading_num planNum,
+               lww.total_count-lww.billlading_num+ltbw.real_num planNum,
                ltbw.real_num realNum,
                ltbw.billlading_fee billladingFee,
                lww.collect_pay collectPay,

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

@@ -383,7 +383,7 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl<TrunklineBil
 			TrunklineBillladingLogEntity logEntity = new TrunklineBillladingLogEntity();
 			logEntity.setWarehouseId(warehouseId);
 			logEntity.setWarehouseName(warehouseName);
-			logEntity.setCreateUserName(AuthUtil.getUserName());
+			logEntity.setCreateUserName(AuthUtil.getNickName());
 			logEntity.setBillladingId(billladingId);
 			logEntity.setBeforeOpreation(JSON.toJSONString(billladingEntity));