Merge branch 'dev' into pre-production

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

@@ -154,7 +154,6 @@
         left join logpm_distribution_parcel_list ldpl on ldsa.order_code = ldpl.order_code
         where ldpl.is_deleted = 0
         and ldpl.order_package_status = '20'
-        and
         and ldpl.is_deleted = 0
         and ldpl.is_transfer = 1
         and ldpl.waybill_number is not null

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

@@ -2970,16 +2970,9 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		}
 		String newRemark = openOrderDTO.getRemark();
 		String remark = waybillEntity.getRemark();
-		if (!StringUtil.isBlank(remark)) {
+		if(!ObjectUtil.equals(remark,newRemark)){
-			if (!remark.equals(newRemark)) {
+			stringBuilder.append("备注：").append(remark).append("-->").append(newRemark).append(";");
-				stringBuilder.append("备注：").append(remark).append("-->").append(newRemark).append(";");
+			waybillEntity.setRemark(newRemark);
-				waybillEntity.setRemark(newRemark);
-			}
-		} else {
-			if (!StringUtil.isBlank(newRemark)) {
-				stringBuilder.append("备注：").append(remark).append("-->").append(newRemark).append(";");
-				waybillEntity.setRemark(newRemark);
-			}
 		}
 
 		return stringBuilder.toString();

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

@@ -1359,6 +1359,19 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				if (1 == updateType) {
 					TrunklineCarsLoadLineEntity loadLineEntity = trunklineCarsLoadLineService.getById(carsLoadLineId);
 					loadLineEntity.setSort(sort);
+					loadLineEntity.setNowTransportCost(carsLoadLineDTO.getNowTransportCost());
+					loadLineEntity.setOilCost(carsLoadLineDTO.getOilCost());
+					loadLineEntity.setBackTransportCost(carsLoadLineDTO.getBackTransportCost());
+					loadLineEntity.setReachTransportCost(carsLoadLineDTO.getReachTransportCost());
+					loadLineEntity.setWholeCarInfoCost(carsLoadLineDTO.getWholeCarInfoCost());
+					loadLineEntity.setWholeCarInsuranceCost(carsLoadLineDTO.getWholeCarInsuranceCost());
+					loadLineEntity.setWholeCarGroundCost(carsLoadLineDTO.getWholeCarGroundCost());
+					loadLineEntity.setHairWholeCost(carsLoadLineDTO.getHairWholeCost());
+					loadLineEntity.setHairWholeOtherCost(carsLoadLineDTO.getHairWholeOtherCost());
+					loadLineEntity.setUnloadCost(carsLoadLineDTO.getUnloadCost());
+					loadLineEntity.setUnloadOtherCost(carsLoadLineDTO.getUnloadOtherCost());
+					loadLineEntity.setFuel(carsLoadLineDTO.getFuel());
+					loadLineEntity.setTollFee(carsLoadLineDTO.getTollFee());
 					trunklineCarsLoadLineService.updateById(loadLineEntity);
 				} else if (2 == updateType) {
 					TrunklineCarsLoadLineEntity carsLoadLineEntity = new TrunklineCarsLoadLineEntity();