From 7122aa5590d5751e28ea9fd5c127fe129655f69b Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Tue, 19 Nov 2024 18:05:53 +0800
Subject: [PATCH] =?UTF-8?q?1.=EF=BC=9B=E5=B9=B2=E7=BA=BFbug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logpm/trunkline/vo/CarsStartNumVO.java    |  1 +
 .../mapper/TrunklineCarsLoadMapper.java       |  3 +++
 .../mapper/TrunklineCarsLoadMapper.xml        |  7 +++++
 .../mapper/TrunklineCarsOrderMapper.xml       |  4 ++-
 .../impl/TrunklineCarsLoadServiceImpl.java    | 26 +++++++++++--------
 5 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/CarsStartNumVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/CarsStartNumVO.java
index f91c1f4c2..23121ef29 100644
--- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/CarsStartNumVO.java
+++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/CarsStartNumVO.java
@@ -11,6 +11,7 @@ public class CarsStartNumVO implements Serializable {
 	private String orderCode;
 	private String waybillNo;
 	private String startNum;
+	private String trainNumber;
 	private Long loadId;
 
 
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.java
index 082948dae..8bbe17c5a 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.java
@@ -14,6 +14,7 @@ import com.logpm.trunkline.vo.ZeroSuppleListVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 
 @Mapper
@@ -64,5 +65,7 @@ public interface TrunklineCarsLoadMapper extends BaseMapper<TrunklineCarsLoadEnt
 	 * @return
 	 */
 	List<TrunklineCarsLoadExcel> exportCarsPageList(@Param("param")LoadCarsDTO loadCarsDTO);
+
+	void updateStartTime(@Param("loadId")Long loadId, @Param("loadStatus")String loadStatus, @Param("date")Date date);
 }
 
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml
index a4b2b4d8b..75672b3d0 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml
@@ -1118,4 +1118,11 @@
     </select>
 
 
+    <update id="updateStartTime" >
+        update logpm_trunkline_cars_load
+        set start_time = #{date},
+            load_status = #{loadStatus}
+        where id = #{loadId}
+    </update>
+
 </mapper>
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.xml
index db80defb6..1be2684d0 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.xml
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.xml
@@ -424,9 +424,11 @@
                ltco.order_code orderCode,
                ltco.waybill_no waybillNo,
                ltco.start_num startNum,
-               ltco.load_id loadId
+               ltco.load_id loadId,
+               lww.customer_train trainNumber
         from logpm_trunkline_cars_order ltco
         left join logpm_trunkline_cars_load ltcl on ltco.load_id = ltcl.id
+        left join logpm_warehouse_waybill lww on lww.waybill_no = ltco.waybill_no
         where ltco.order_code = #{orderCode}
         and ltco.node_id = #{warehouseId}
         and ltco.start_num > 0
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 1b0c45f6f..34a5ce1f5 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
@@ -312,9 +312,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			trunklineCarsLoadLineService.updateStartTime(carsLoadLineEntity.getId(),"20",date,AuthUtil.getUserId(),AuthUtil.getNickName());
 
 			//修改配载计划的节点状态
-			carsLoadEntity.setStartTime(date);
-			carsLoadEntity.setLoadStatus("10");
-			updateById(carsLoadEntity);
+			baseMapper.updateStartTime(loadId,"10",date);
+//			carsLoadEntity.setStartTime(date);
+//			carsLoadEntity.setLoadStatus("10");
+//			updateById(carsLoadEntity);
 
 			try {
 				//异步存入日志
@@ -387,8 +388,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			trunklineCarsLoadLineService.updateStartTime(currentCarsLoadLineEntity.getId(),"20",date,AuthUtil.getUserId(),AuthUtil.getNickName());
 
 			//修改配载计划的节点状态
-			carsLoadEntity.setLoadStatus("30");
-			updateById(carsLoadEntity);
+			baseMapper.updateStartTime(loadId,"30",date);
+//			carsLoadEntity.setLoadStatus("30");
+//			updateById(carsLoadEntity);
 
 			try {
 				//异步存入日志
@@ -815,9 +817,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 //			trunklineCarsLoadLineService.updateById(currentCarsLoadLineEntity);
 			trunklineCarsLoadLineService.updateStartTime(currentCarsLoadLineEntity.getId(),"10",null,null,null);
 
-			carsLoadEntity.setLoadStatus("0");
-			carsLoadEntity.setStartTime(null);
-			updateById(carsLoadEntity);
+			baseMapper.updateStartTime(loadId,"0",null);
+//			carsLoadEntity.setLoadStatus("0");
+//			carsLoadEntity.setStartTime(null);
+//			updateById(carsLoadEntity);
 			try {
 				carsLoadAsyncService.saveLog(carsLoadEntity, currentCarsLoadLineEntity, CarsLoadLogTypeConstant.CANCEL_FIRST_START_CARS_LOAD.getValue(), AuthUtil.getNickName(), AuthUtil.getUserId());
 				openOrderAsyncService.saveCancelStartCarLog(currentCarsLoadLineEntity, AuthUtil.getNickName(), AuthUtil.getUserId());
@@ -833,9 +836,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			//中间网点发车
 			trunklineCarsLoadLineService.updateStartTime(currentCarsLoadLineEntity.getId(),"10",null,null,null);
 
-			carsLoadEntity.setLoadStatus("20");
-			carsLoadEntity.setStartTime(null);
-			updateById(carsLoadEntity);
+			baseMapper.updateStartTime(loadId,"20",null);
+//			carsLoadEntity.setLoadStatus("20");
+//			carsLoadEntity.setStartTime(null);
+//			updateById(carsLoadEntity);
 
 			try {
 				carsLoadAsyncService.saveLog(carsLoadEntity, currentCarsLoadLineEntity, CarsLoadLogTypeConstant.CANCEL_NET_START_CARS_LOAD.getValue(), AuthUtil.getNickName(), AuthUtil.getUserId());