no message

.gitignore

@@ -0,0 +1 @@
+target/

src/main/java/com/dev/stms/server/service/fee/pojo/DefaultFeeManager.java

@@ -2471,6 +2471,9 @@ public class DefaultFeeManager extends DefaultBaseManager implements FeeManager
 		if(!"".equals(order.getBillCode()) && null!=order.getBillCode()){
 			throw new BusinessException("已对账！不能修改。");
 		}
+		if(FeeStatus.CHECK.equals(order.getCostStatus())){
+			throw new BusinessException(order.getRelateBill3()+"单据费用已审核，不能修改。");
+		}
 		Long id=order.getId();
 		String billObject=BillObjectType.ORDER;
 		saveInputFee(id, billObject, null, "运输费", order.getFee1());

src/webapp/WEB-INF/classes/config/origen/fee/maintainCDAddBillFeeDetailPayPage.xml

@@ -67,7 +67,7 @@
  and shipment.platForm=#{SESSION_PLATFORM}
  and f.billId=shipment.id
  and shipment.status='ARRIVED' 
- and shipment.costStatus in('SUBMIT_CHECK','CHECK')  
+ and shipment.costStatus in('CHECK')  
  and f.billObject='SHIPMENT' 
  and bf.id is null  
   /~shipment.code: AND shipment.code like upper({shipment.code})~/

src/webapp/WEB-INF/classes/config/origen/shipment/maintainShipmentAllPage.xml

@@ -77,7 +77,7 @@ or carrier.id in (select detail.subOrg.id from OrganizationDetail detail where d
                     <hql><![CDATA[ SELECT 
    enumerate.enumValue,
   enumerate.enumValue From Enumerate enumerate 
-  where enumerate.enumType = 'FeeStatus' and enumerate.enumValue in('OPEN','CHECK') order by enumerate.id asc ]]></hql> 
+  where enumerate.enumType = 'FeeStatus' and enumerate.enumValue in('OPEN','SUBMIT_CHECK','CHECK') order by enumerate.id asc ]]></hql> 
                 </list>
                 <booleanList id="shipment.needSinglePrice" title="是否支付" row="12" col="1" span="1" width="120" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/>
                 

target/cqtms/WEB-INF/classes/config/origen/fee/maintainCDAddBillFeeDetailPayPage.xml

@@ -67,7 +67,7 @@
  and shipment.platForm=#{SESSION_PLATFORM}
  and f.billId=shipment.id
  and shipment.status='ARRIVED' 
- and shipment.costStatus in('SUBMIT_CHECK','CHECK')  
+ and shipment.costStatus in('CHECK')  
  and f.billObject='SHIPMENT' 
  and bf.id is null  
   /~shipment.code: AND shipment.code like upper({shipment.code})~/

target/cqtms/WEB-INF/classes/config/origen/shipment/maintainShipmentAllPage.xml

@@ -77,7 +77,7 @@ or carrier.id in (select detail.subOrg.id from OrganizationDetail detail where d
                     <hql><![CDATA[ SELECT 
    enumerate.enumValue,
   enumerate.enumValue From Enumerate enumerate 
-  where enumerate.enumType = 'FeeStatus' and enumerate.enumValue in('OPEN','CHECK') order by enumerate.id asc ]]></hql> 
+  where enumerate.enumType = 'FeeStatus' and enumerate.enumValue in('OPEN','SUBMIT_CHECK','CHECK') order by enumerate.id asc ]]></hql> 
                 </list>
                 <booleanList id="shipment.needSinglePrice" title="是否支付" row="12" col="1" span="1" width="120" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/>