From 7bf19d0e772511bab0b2eed9e1154cbc7d84c497 Mon Sep 17 00:00:00 2001 From: "HUOJIN\\92525" <925258474@qq.com> Date: Sat, 12 Oct 2024 13:42:31 +0800 Subject: [PATCH] no message --- .gitignore | 1 + .../service/fee/pojo/DefaultFeeManager.java | 3 +++ .../fee/maintainCDAddBillFeeDetailPayPage.xml | 2 +- .../shipment/maintainShipmentAllPage.xml | 2 +- .../service/fee/pojo/DefaultFeeManager.class | Bin 64386 -> 64484 bytes .../fee/maintainCDAddBillFeeDetailPayPage.xml | 2 +- .../shipment/maintainShipmentAllPage.xml | 2 +- 7 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 .gitignore 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 b79eb38ea7cc3f7577c80781a9768bc08b01bea1..6444d9a700901bca1857105185d68736d1cf9037 100644 GIT binary patch delta 1947 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 G$A1Bf-gKD& 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 ]]>