From 42bdd28ad6c64480521142c154d046ef66fd62da Mon Sep 17 00:00:00 2001 From: "HUOJIN\\92525" Date: Mon, 20 Jan 2025 14:07:35 +0800 Subject: [PATCH] no message --- .../shipment/pojo/DefaultShipmentManager.java | 5 ++-- .../origen/shipment/modifyNewTempListPage.xml | 25 ++++++++++++++++++- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/dev/stms/server/service/shipment/pojo/DefaultShipmentManager.java b/src/main/java/com/dev/stms/server/service/shipment/pojo/DefaultShipmentManager.java index 6796dd4..3459978 100644 --- a/src/main/java/com/dev/stms/server/service/shipment/pojo/DefaultShipmentManager.java +++ b/src/main/java/com/dev/stms/server/service/shipment/pojo/DefaultShipmentManager.java @@ -4970,7 +4970,7 @@ ShipmentManager { + " and leg.order.loading='1299' "; List legsList=commonDao.findByQuery(legs_hql); if(legsList.isEmpty()){ - throw new BusinessException("未找到已审核的订单数据!"); + throw new BusinessException("未找到满足条件的运单信息!"); } //根据送货地址分组；同一个地址一个预调度单 Map> groupedByAddress = legsList.stream().collect(Collectors.groupingBy(leg -> leg.getOrder().getToContact().getAddress())); @@ -5038,10 +5038,11 @@ ShipmentManager { tempShipment.setQuantity(quantity); tempShipment.setWeight(weight); tempShipment.setPointer(legs.size()); + tempShipment.setBusinessNode("ZD"); + tempShipment.setTransportType("派送"); commonDao.store(tempShipment); for(Legs leg:legs){ leg.setTempShipment(tempShipment); - leg.setStatus(LegsStatus.DISTRIBUTIONED);//已配载 commonDao.store(leg); } } diff --git a/src/webapp/WEB-INF/classes/config/origen/shipment/modifyNewTempListPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipment/modifyNewTempListPage.xml index 5d000a7..518c897 100644 --- a/src/webapp/WEB-INF/classes/config/origen/shipment/modifyNewTempListPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/shipment/modifyNewTempListPage.xml @@ -37,7 +37,30 @@ - + + + + + + + + + + + + + + + + + + + + + + + +