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 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 @@ + + update logpm_trunkline_cars_load + set start_time = #{date}, + load_status = #{loadStatus} + where id = #{loadId} + + 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