1.干线bug修复

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;//到站

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,

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

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingServiceImpl.java

@@ -701,7 +701,7 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl<TrunklineBil
 		TrunklineBillladingWaybillEntity entity = billladingWaybillService.findEntityByWaybillIdAndBillladingId(waybillId, billladingId);
 		if(!Objects.isNull(entity)){
 			log.warn("#############addWaybillToBillladingId: 运单已绑定到该提货单 totalCount={} finishNum={} enterNum={}",totalCount,finishNum,enterNum);
-			return R.fail(405,"总提货数大于运单总数量");
+			return R.fail(405,"运单已绑定到该提货单");
 		}
 
 		entity = new TrunklineBillladingWaybillEntity();