1.干线-bug修复

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

@@ -1012,6 +1012,20 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		String loadType = carsLoadDTO.getLoadType();
 		String assistantName = carsLoadDTO.getAssistantName();
 		String assistantMobile = carsLoadDTO.getAssistantMobile();
+		Long carrierId = carsLoadDTO.getCarrierId();
+		String carrierName = carsLoadDTO.getCarrierName();
+		String operator = carsLoadDTO.getOperator();
+		String deliveryType = carsLoadDTO.getDeliveryType();
+		String payMethod = carsLoadDTO.getPayMethod();
+		String customerType = carsLoadDTO.getCustomerType();
+		String isSettlement = carsLoadDTO.getIsSettlement();
+		BigDecimal replacePrice = carsLoadDTO.getReplacePrice();
+		String carrierOrderCode = carsLoadDTO.getCarrierOrderCode();
+		String carrierTimestr = carsLoadDTO.getCarrierTimeStr();
+		String receivingTimeStr = carsLoadDTO.getReceivingTimeStr();
+		BigDecimal countTransportCost = carsLoadDTO.getCountTransportCost();
+		BigDecimal settlementValue = carsLoadDTO.getSettlementValue();
+
 		List<TrunklineCarsLoadLineDTO> addCarsLoadLineList = carsLoadDTO.getAddCarsLoadLineList();
 		List<TrunklineCarsLoadLineDTO> removeCarsLoadLineList = carsLoadDTO.getRemoveCarsLoadLineList();
 
@@ -1031,6 +1045,19 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		carsLoadEntity.setCarNumber(carNumber);
 		carsLoadEntity.setLoadType(loadType);
 		carsLoadEntity.setRemark(remark);
+		carsLoadEntity.setCarrierId(carrierId);
+		carsLoadEntity.setCarrierName(carrierName);
+		carsLoadEntity.setOperator(operator);
+		carsLoadEntity.setDeliveryType(deliveryType);
+		carsLoadEntity.setPayMethod(payMethod);
+		carsLoadEntity.setCustomerType(customerType);
+		carsLoadEntity.setIsSettlement(isSettlement);
+		carsLoadEntity.setReplacePrice(replacePrice);
+		carsLoadEntity.setCarrierOrderCode(carrierOrderCode);
+		carsLoadEntity.setCarrierTime(CommonUtil.StringToDate(carrierTimestr));
+		carsLoadEntity.setReceivingTime(CommonUtil.StringToDate(receivingTimeStr));
+		carsLoadEntity.setCountTransportCost(countTransportCost);
+		carsLoadEntity.setSettlementValue(settlementValue);
 		updateById(carsLoadEntity);
 
 		for (TrunklineCarsLoadLineDTO carsLoadLineDTO : removeCarsLoadLineList) {