Browse Source

1.;干线bug修复

dev
zhenghaoyu 2 months ago
parent
commit
7122aa5590
  1. 1
      blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/CarsStartNumVO.java
  2. 3
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.java
  3. 7
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml
  4. 4
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsOrderMapper.xml
  5. 26
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

1
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;

3
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);
}

7
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>

4
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

26
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());

Loading…
Cancel
Save