From 28d73d68428aea505c0166a1671ea7750a1bfcb4 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Thu, 24 Oct 2024 03:14:44 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=8F=91=E8=BD=A6=E9=80=BB=E8=BE=91=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/TrunklineCarsLoadEntity.java       |  4 ++++
 .../impl/TrunklineCarsLoadServiceImpl.java    | 24 +++++++++----------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadEntity.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadEntity.java
index e4e382a7a..e0eac6929 100644
--- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadEntity.java
+++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadEntity.java
@@ -1,5 +1,7 @@
 package com.logpm.trunkline.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -138,9 +140,11 @@ public class TrunklineCarsLoadEntity extends TenantEntity {
 	@ApiModelProperty(name = "最新到车仓库id",notes = "")
 	private Long nowWarehouseId ;
 	/** 发车时间 */
+	@TableField(updateStrategy = FieldStrategy.ALWAYS)
 	@ApiModelProperty(name = "发车时间",notes = "")
 	private Date startTime ;
 	/** 到车时间 */
+	@TableField(updateStrategy = FieldStrategy.ALWAYS)
 	@ApiModelProperty(name = "到车时间",notes = "")
 	private Date arriveTime ;
 	/** 取消时间 */
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
index 804541d73..32ec50b51 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
@@ -1581,8 +1581,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			log.warn("###########updateNumByLoadId: 配载计划数据不存在 loadId={}", loadId);
 			throw new CustomerException(400, "配载计划数据不存在");
 		}
-		TrunklineCarsLoadEntity updateCarsLoadEntity = new TrunklineCarsLoadEntity();
-		updateCarsLoadEntity.setId(loadId);
+//		TrunklineCarsLoadEntity updateCarsLoadEntity = new TrunklineCarsLoadEntity();
+//		updateCarsLoadEntity.setId(loadId);
 
 			//计划件数
 		Integer loadPlanNum = 0;
@@ -1603,11 +1603,11 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		Integer realUnloadingNum = scanList.stream().filter(scan -> !Objects.isNull(scan.getScanStatus()) && !scan.getScanStatus().equals("1")).mapToInt(TrunklineCarsLoadScanEntity::getUnloadNum).sum();
 		Integer stockCarNum = scanList.stream().filter(scan -> !Objects.isNull(scan.getScanStatus()) && scan.getScanStatus().equals("1")).mapToInt(TrunklineCarsLoadScanEntity::getNum).sum();
 
-		updateCarsLoadEntity.setPlanLoadingNumber(loadPlanNum);
-		updateCarsLoadEntity.setRealLoadingNumber(realLoadingNum);
-		updateCarsLoadEntity.setUnloadNumber(realUnloadingNum);
-		updateCarsLoadEntity.setStockNumber(stockCarNum);
-		updateById(updateCarsLoadEntity);
+		carsLoadEntity.setPlanLoadingNumber(loadPlanNum);
+		carsLoadEntity.setRealLoadingNumber(realLoadingNum);
+		carsLoadEntity.setUnloadNumber(realUnloadingNum);
+		carsLoadEntity.setStockNumber(stockCarNum);
+		updateById(carsLoadEntity);
 
 		//节点数据
 		List<TrunklineCarsLoadLineEntity> carsLoadLineList = trunklineCarsLoadLineService.findListByLoadId(loadId);
@@ -1622,12 +1622,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			}
 			Integer lineRealLoadingNum = scanList.stream().filter(scan -> !Objects.isNull(scan.getWarehouseId()) && NumberUtil.equals(nodeId,scan.getWarehouseId())).mapToInt(TrunklineCarsLoadScanEntity::getNum).sum();
 			Integer lineRealUnloadingNum = scanList.stream().filter(scan -> !Objects.isNull(scan.getScanStatus()) && !scan.getScanStatus().equals("1") && !Objects.isNull(scan.getUnloadNodeId()) && NumberUtil.equals(nodeId,scan.getUnloadNodeId())).mapToInt(TrunklineCarsLoadScanEntity::getUnloadNum).sum();
-			TrunklineCarsLoadLineEntity updateEntity = new TrunklineCarsLoadLineEntity();
-			updateEntity.setId(loadLingId);
-			updateEntity.setPlanLoadingNumber(planNum);
-			updateEntity.setRealLoadingNumber(lineRealLoadingNum);
-			updateEntity.setUnloadNumber(lineRealUnloadingNum);
-			updateLoadLineList.add(updateEntity);
+			carsLoadLineEntity.setPlanLoadingNumber(planNum);
+			carsLoadLineEntity.setRealLoadingNumber(lineRealLoadingNum);
+			carsLoadLineEntity.setUnloadNumber(lineRealUnloadingNum);
+			updateLoadLineList.add(carsLoadLineEntity);
 		});
 
 		if(CollUtil.isNotEmpty(updateLoadLineList)){