huojin
/
cqtms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

main
HUOJIN\92525 2025-03-12 13:45:59 +08:00
parent ab10193e9b
commit 25a5c1015e
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/webapp/WEB-INF/classes/config/origen/shipment/modifyShipmentPage.xml
View File

@ -132,7 +132,8 @@ or carrier.id in (select detail.subOrg.id from OrganizationDetail detail where d
</inputUIs> </inputUIs>
<buttons> <buttons>
<commit id="save" title="modifyShipmentPage.save" enableType="none" invisible="false"> <commit id="save" title="modifyShipmentPage.save" enableType="none" invisible="false">
<enableExpression><![CDATA[(${shipment.status}!='CANCEL')]]></enableExpression> <enableExpression>
<![CDATA[(${shipment.status}!='CANCEL')&&${shipment.costStatus} == 'OPEN']]></enableExpression>
<mappings> <mappings>
<mapping id="shipment" className="com.dev.stms.server.model.shipment.Shipment"/> <mapping id="shipment" className="com.dev.stms.server.model.shipment.Shipment"/>
<mapping id="consignorName" className="string"/> <mapping id="consignorName" className="string"/>

2
src/webapp/WEB-INF/classes/config/origen/shipment/shipmentOrderQueryPage.xml
View File

@ -102,7 +102,7 @@
left join orders.fromLocation.city.zone fromZone left join orders.fromLocation.city.zone fromZone
left join orders.toLocation.city.zone toZone left join orders.toLocation.city.zone toZone
left join orders.routeFee left join orders.routeFee
WHERE pf = #{SESSION_PLATFORM} and orders.status != 'INPUT' and orders.isShortBarge=false WHERE pf = #{SESSION_PLATFORM} and orders.isShortBarge=false
and (orders.status in('AVAILABLE','TRANS_AVAILABLE') or ( /~ordersAll: {ordersAll} = true~/ )) and (orders.status in('AVAILABLE','TRANS_AVAILABLE') or ( /~ordersAll: {ordersAll} = true~/ ))
/~order.code: AND orders.code like {order.code}~/ /~order.code: AND orders.code like {order.code}~/
/~orders.customerOrderNO: AND orders.customerOrderNO like {orders.customerOrderNO}~/ /~orders.customerOrderNO: AND orders.customerOrderNO like {orders.customerOrderNO}~/

3
target/cqtms/WEB-INF/classes/config/origen/shipment/modifyShipmentPage.xml
View File

@ -132,7 +132,8 @@ or carrier.id in (select detail.subOrg.id from OrganizationDetail detail where d
</inputUIs> </inputUIs>
<buttons> <buttons>
<commit id="save" title="modifyShipmentPage.save" enableType="none" invisible="false"> <commit id="save" title="modifyShipmentPage.save" enableType="none" invisible="false">
<enableExpression><![CDATA[(${shipment.status}!='CANCEL')]]></enableExpression> <enableExpression>
<![CDATA[(${shipment.status}!='CANCEL')&&${shipment.costStatus} == 'OPEN']]></enableExpression>
<mappings> <mappings>
<mapping id="shipment" className="com.dev.stms.server.model.shipment.Shipment"/> <mapping id="shipment" className="com.dev.stms.server.model.shipment.Shipment"/>
<mapping id="consignorName" className="string"/> <mapping id="consignorName" className="string"/>

2
target/cqtms/WEB-INF/classes/config/origen/shipment/shipmentOrderQueryPage.xml
View File

@ -102,7 +102,7 @@
left join orders.fromLocation.city.zone fromZone left join orders.fromLocation.city.zone fromZone
left join orders.toLocation.city.zone toZone left join orders.toLocation.city.zone toZone
left join orders.routeFee left join orders.routeFee
WHERE pf = #{SESSION_PLATFORM} and orders.status != 'INPUT' and orders.isShortBarge=false WHERE pf = #{SESSION_PLATFORM} and orders.isShortBarge=false
and (orders.status in('AVAILABLE','TRANS_AVAILABLE') or ( /~ordersAll: {ordersAll} = true~/ )) and (orders.status in('AVAILABLE','TRANS_AVAILABLE') or ( /~ordersAll: {ordersAll} = true~/ ))
/~order.code: AND orders.code like {order.code}~/ /~order.code: AND orders.code like {order.code}~/
/~orders.customerOrderNO: AND orders.customerOrderNO like {orders.customerOrderNO}~/ /~orders.customerOrderNO: AND orders.customerOrderNO like {orders.customerOrderNO}~/