From 25a5c1015e1582632fcc2281391be56bfefaea00 Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <jin982011>
Date: Wed, 12 Mar 2025 13:45:59 +0800
Subject: [PATCH] no message

---
 .../classes/config/origen/shipment/modifyShipmentPage.xml      | 3 ++-
 .../classes/config/origen/shipment/shipmentOrderQueryPage.xml  | 2 +-
 .../classes/config/origen/shipment/modifyShipmentPage.xml      | 3 ++-
 .../classes/config/origen/shipment/shipmentOrderQueryPage.xml  | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/webapp/WEB-INF/classes/config/origen/shipment/modifyShipmentPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipment/modifyShipmentPage.xml
index 6a425d5..594bada 100644
--- a/src/webapp/WEB-INF/classes/config/origen/shipment/modifyShipmentPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/shipment/modifyShipmentPage.xml
@@ -132,7 +132,8 @@ or carrier.id in (select detail.subOrg.id from OrganizationDetail detail where d
             </inputUIs>
          <buttons>
                 <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>
                         <mapping id="shipment" className="com.dev.stms.server.model.shipment.Shipment"/>
                         <mapping id="consignorName" className="string"/>
diff --git a/src/webapp/WEB-INF/classes/config/origen/shipment/shipmentOrderQueryPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipment/shipmentOrderQueryPage.xml
index 8792f02..e2cac6c 100644
--- a/src/webapp/WEB-INF/classes/config/origen/shipment/shipmentOrderQueryPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/shipment/shipmentOrderQueryPage.xml
@@ -102,7 +102,7 @@
  left join orders.fromLocation.city.zone fromZone
  left join orders.toLocation.city.zone toZone 
  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~/  ))
  /~order.code: AND orders.code like {order.code}~/
  /~orders.customerOrderNO: AND orders.customerOrderNO like {orders.customerOrderNO}~/
diff --git a/target/cqtms/WEB-INF/classes/config/origen/shipment/modifyShipmentPage.xml b/target/cqtms/WEB-INF/classes/config/origen/shipment/modifyShipmentPage.xml
index 6a425d5..594bada 100644
--- a/target/cqtms/WEB-INF/classes/config/origen/shipment/modifyShipmentPage.xml
+++ b/target/cqtms/WEB-INF/classes/config/origen/shipment/modifyShipmentPage.xml
@@ -132,7 +132,8 @@ or carrier.id in (select detail.subOrg.id from OrganizationDetail detail where d
             </inputUIs>
          <buttons>
                 <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>
                         <mapping id="shipment" className="com.dev.stms.server.model.shipment.Shipment"/>
                         <mapping id="consignorName" className="string"/>
diff --git a/target/cqtms/WEB-INF/classes/config/origen/shipment/shipmentOrderQueryPage.xml b/target/cqtms/WEB-INF/classes/config/origen/shipment/shipmentOrderQueryPage.xml
index 8792f02..e2cac6c 100644
--- a/target/cqtms/WEB-INF/classes/config/origen/shipment/shipmentOrderQueryPage.xml
+++ b/target/cqtms/WEB-INF/classes/config/origen/shipment/shipmentOrderQueryPage.xml
@@ -102,7 +102,7 @@
  left join orders.fromLocation.city.zone fromZone
  left join orders.toLocation.city.zone toZone 
  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~/  ))
  /~order.code: AND orders.code like {order.code}~/
  /~orders.customerOrderNO: AND orders.customerOrderNO like {orders.customerOrderNO}~/