diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9f97022 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +target/ \ No newline at end of file diff --git a/src/main/java/com/dev/stms/server/service/fee/pojo/DefaultFeeManager.java b/src/main/java/com/dev/stms/server/service/fee/pojo/DefaultFeeManager.java index 1d86114..a20a9f9 100644 --- a/src/main/java/com/dev/stms/server/service/fee/pojo/DefaultFeeManager.java +++ b/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()); diff --git a/src/webapp/WEB-INF/classes/config/origen/fee/maintainCDAddBillFeeDetailPayPage.xml b/src/webapp/WEB-INF/classes/config/origen/fee/maintainCDAddBillFeeDetailPayPage.xml index cb51bba..e706812 100644 --- a/src/webapp/WEB-INF/classes/config/origen/fee/maintainCDAddBillFeeDetailPayPage.xml +++ b/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})~/ diff --git a/src/webapp/WEB-INF/classes/config/origen/shipment/maintainShipmentAllPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipment/maintainShipmentAllPage.xml index f2177d8..349f014 100644 --- a/src/webapp/WEB-INF/classes/config/origen/shipment/maintainShipmentAllPage.xml +++ b/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 + where enumerate.enumType = 'FeeStatus' and enumerate.enumValue in('OPEN','SUBMIT_CHECK','CHECK') order by enumerate.id asc ]]> diff --git a/target/cqtms/WEB-INF/classes/com/dev/stms/server/service/fee/pojo/DefaultFeeManager.class b/target/cqtms/WEB-INF/classes/com/dev/stms/server/service/fee/pojo/DefaultFeeManager.class index b79eb38..6444d9a 100644 Binary files a/target/cqtms/WEB-INF/classes/com/dev/stms/server/service/fee/pojo/DefaultFeeManager.class and b/target/cqtms/WEB-INF/classes/com/dev/stms/server/service/fee/pojo/DefaultFeeManager.class differ diff --git a/target/cqtms/WEB-INF/classes/config/origen/fee/maintainCDAddBillFeeDetailPayPage.xml b/target/cqtms/WEB-INF/classes/config/origen/fee/maintainCDAddBillFeeDetailPayPage.xml index cb51bba..e706812 100644 --- a/target/cqtms/WEB-INF/classes/config/origen/fee/maintainCDAddBillFeeDetailPayPage.xml +++ b/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})~/ diff --git a/target/cqtms/WEB-INF/classes/config/origen/shipment/maintainShipmentAllPage.xml b/target/cqtms/WEB-INF/classes/config/origen/shipment/maintainShipmentAllPage.xml index f2177d8..349f014 100644 --- a/target/cqtms/WEB-INF/classes/config/origen/shipment/maintainShipmentAllPage.xml +++ b/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 + where enumerate.enumType = 'FeeStatus' and enumerate.enumValue in('OPEN','SUBMIT_CHECK','CHECK') order by enumerate.id asc ]]>