no message

main
HUOJIN\92525 2025-01-20 14:07:35 +08:00
parent 0ee22a924d
commit 42bdd28ad6
2 changed files with 27 additions and 3 deletions

View File

@ -4970,7 +4970,7 @@ ShipmentManager {
+ " and leg.order.loading='1299' "; + " and leg.order.loading='1299' ";
List<Legs> legsList=commonDao.findByQuery(legs_hql); List<Legs> legsList=commonDao.findByQuery(legs_hql);
if(legsList.isEmpty()){ if(legsList.isEmpty()){
throw new BusinessException("未找到已审核的订单数据!"); throw new BusinessException("未找到满足条件的运单信息!");
} }
//根据送货地址分组;同一个地址一个预调度单 //根据送货地址分组;同一个地址一个预调度单
Map<String, List<Legs>> groupedByAddress = legsList.stream().collect(Collectors.groupingBy(leg -> leg.getOrder().getToContact().getAddress())); Map<String, List<Legs>> groupedByAddress = legsList.stream().collect(Collectors.groupingBy(leg -> leg.getOrder().getToContact().getAddress()));
@ -5038,10 +5038,11 @@ ShipmentManager {
tempShipment.setQuantity(quantity); tempShipment.setQuantity(quantity);
tempShipment.setWeight(weight); tempShipment.setWeight(weight);
tempShipment.setPointer(legs.size()); tempShipment.setPointer(legs.size());
tempShipment.setBusinessNode("ZD");
tempShipment.setTransportType("派送");
commonDao.store(tempShipment); commonDao.store(tempShipment);
for(Legs leg:legs){ for(Legs leg:legs){
leg.setTempShipment(tempShipment); leg.setTempShipment(tempShipment);
leg.setStatus(LegsStatus.DISTRIBUTIONED);//已配载
commonDao.store(leg); commonDao.store(leg);
} }
} }

View File

@ -37,7 +37,30 @@
<column id="shipment.weight" title="weight" visible="true" horizonAlign="left" verticalAlign="middle"/> <column id="shipment.weight" title="weight" visible="true" horizonAlign="left" verticalAlign="middle"/>
</columns> </columns>
<buttons> <buttons>
<popup id="singleConfirm" title="singleConfirm" enableType="single" invisible="false" containId="true" pageId="editSingleConfirmShipmentPage">
</popup>
<commit id="multiConfirm" title="multiConfirm" enableType="multi" invisible="false" confirmMessage="multiConfirmShipment.confirmMessage">
<mappings>
<mapping id="ids" className="list"/>
</mappings>
<actions>
<action managerName="shipmentManager" methodName="createShipmentMutilConfirmShipent" parameter="ids"/>
</actions>
<forwards>
<forward name="refreshWindow" newEnabled="true" editEnabled="false"/>
</forwards>
</commit>
<commit id="cancel" title="cancel" enableType="multi" invisible="false" confirmMessage="cancelConfirmShipment.confirmMessage">
<mappings>
<mapping id="ids" className="list"/>
</mappings>
<actions>
<action managerName="shipmentManager" methodName="cancelShipmentConfirmShipent" parameter="ids"/>
</actions>
<forwards>
<forward name="refreshWindow" newEnabled="true" editEnabled="false"/>
</forwards>
</commit>
</buttons> </buttons>
</detail> </detail>
</modifyDetailPage> </modifyDetailPage>