diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/CarsLoadAllOrderVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/CarsLoadAllOrderVO.java index 5fa8ea7d6..22e2366fd 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/CarsLoadAllOrderVO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/CarsLoadAllOrderVO.java @@ -14,6 +14,7 @@ public class CarsLoadAllOrderVO implements Serializable { private Long waybillId;//运单id private String waybillNo;//运单号 private Long nodeId;//计划仓库id + private Long finalNodeId;//计划目的仓库id private String nodeName;//计划仓库 private Date createTime;//创建时间 private String destination;//到站 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 d20c0095a..6a03bd563 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 @@ -315,6 +315,7 @@ ltco.waybill_no waybillNo, ltco.node_id nodeId, ltco.node_name nodeName, + ltco.final_node_id finalNodeId, lww.create_time createTime, lww.destination destination, lww.destination_warehouse_name destinationWarehouseName, @@ -342,6 +343,7 @@ ltco.waybill_no, ltco.node_id, ltco.node_name, + ltco.final_node_id, lww.create_time, lww.destination, lww.destination_warehouse_name, diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderAsyncServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderAsyncServiceImpl.java index f67512a8d..31bd36b70 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderAsyncServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderAsyncServiceImpl.java @@ -873,7 +873,7 @@ public class OpenOrderAsyncServiceImpl implements IOpenOrderAsyncService { Integer realNum = billladingNoWaybillEntity.getRealNum(); if (realNum > num) { billladingNoWaybillEntity.setRealNum(realNum - num); - } else if (realNum.equals(num)) { + } else { billladingNoWaybillEntity.setRealNum(0); billladingNoWaybillEntity.setIsDeleted(1); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingServiceImpl.java index 240017324..cc44bc805 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingServiceImpl.java @@ -701,7 +701,7 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl