From df35386e435043410058e024f228ea984cf0dda6 Mon Sep 17 00:00:00 2001 From: "HUOJIN\\92525" Date: Mon, 2 Dec 2024 17:38:22 +0800 Subject: [PATCH] no message --- .../order/pojo/DefaultOrderManager.java | 50 +--- .../maintainSingOrderAuditingPage.xml | 263 ------------------ 2 files changed, 7 insertions(+), 306 deletions(-) delete mode 100644 target/sdtms/WEB-INF/classes/config/origen/signOrder/maintainSingOrderAuditingPage.xml diff --git a/src/main/java/com/dev/stms/server/service/order/pojo/DefaultOrderManager.java b/src/main/java/com/dev/stms/server/service/order/pojo/DefaultOrderManager.java index 51128a9..714d54b 100644 --- a/src/main/java/com/dev/stms/server/service/order/pojo/DefaultOrderManager.java +++ b/src/main/java/com/dev/stms/server/service/order/pojo/DefaultOrderManager.java @@ -8251,11 +8251,7 @@ public class DefaultOrderManager extends DefaultBaseManager implements BillObjectType.ORDER, Boolean.TRUE); } } - } else { - throw new BusinessException("合同费率不存在,请维护合同费率!"); } - } else { - throw new BusinessException("客户合同不存在，请维护客户合同!"); } } @@ -8375,11 +8371,7 @@ public class DefaultOrderManager extends DefaultBaseManager implements feeManager.saveInputFee(order.getId(), BillObjectType.ORDER, null, "运输费", ysf); } - } else { - throw new BusinessException("合同费率不存在,请维护合同费率!"); - } - } else { - throw new BusinessException("客户合同不存在，请维护客户合同!"); + } } } @@ -8445,11 +8437,7 @@ public class DefaultOrderManager extends DefaultBaseManager implements feeManager.saveInputFee(order.getId(), BillObjectType.ORDER, null, "运输费", ysf); } - } else { - throw new BusinessException("合同费率不存在,请维护合同费率!"); - } - } else { - throw new BusinessException("客户合同不存在，请维护客户合同!"); + } } } @@ -8485,12 +8473,8 @@ public class DefaultOrderManager extends DefaultBaseManager implements } feeManager.saveInputFee(order.getId(), BillObjectType.ORDER, null, "运输费", ysf); - } else { - throw new BusinessException("合同费率不存在,请维护合同费率!"); - } - } else { - throw new BusinessException("客户合同不存在，请维护客户合同!"); - } + } + } } @@ -8699,12 +8683,8 @@ public class DefaultOrderManager extends DefaultBaseManager implements feeManager.saveInputFee(order.getId(), BillObjectType.ORDER, null, "运输费", ysf); } - } else { - throw new BusinessException("合同费率不存在,请维护合同费率!"); - } - } else { - throw new BusinessException("客户合同不存在，请维护客户合同!"); - } + } + } } @@ -8778,11 +8758,7 @@ public class DefaultOrderManager extends DefaultBaseManager implements + lt_price + "*" + order.getTyreQty() + "养护费：" + yh_price + "*" + order.getYhpQty()); this.commonDao.store(fee); - } else { - throw new BusinessException("合同费率不存在,请维护合同费率!"); } - } else { - throw new BusinessException("客户合同不存在，请维护客户合同!"); } } @@ -9401,11 +9377,7 @@ public class DefaultOrderManager extends DefaultBaseManager implements } } - } else { - throw new BusinessException("合同费率不存在,请维护合同费率!"); } - } else { - throw new BusinessException("客户合同不存在，请维护客户合同!"); } } @@ -9604,11 +9576,7 @@ public class DefaultOrderManager extends DefaultBaseManager implements feeManager.saveInputFee(order.getId(), BillObjectType.ORDER, null, "运输费", ysf); } - } else { - throw new BusinessException("合同费率不存在,请维护合同费率!"); - } - } else { - throw new BusinessException("客户合同不存在，请维护客户合同!"); + } } } @@ -9643,11 +9611,7 @@ public class DefaultOrderManager extends DefaultBaseManager implements null, "运输费", ysf); feeManager.refreshBillFee(order.getId(), BillObjectType.ORDER, Boolean.TRUE); - } else { - throw new BusinessException(lineName + "线路合同费率不存在,请维护合同费率!"); } - } else { - throw new BusinessException("客户合同不存在，请维护客户合同!"); } } diff --git a/target/sdtms/WEB-INF/classes/config/origen/signOrder/maintainSingOrderAuditingPage.xml b/target/sdtms/WEB-INF/classes/config/origen/signOrder/maintainSingOrderAuditingPage.xml deleted file mode 100644 index 3d4f8b8..0000000 --- a/target/sdtms/WEB-INF/classes/config/origen/signOrder/maintainSingOrderAuditingPage.xml +++ /dev/null @@ -1,263 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - = {startDate}~/ -/~endDate: AND trunc(orders.signTime) <= {endDate}~/ -/~planFromDate1: AND trunc(orders.planFromDate) >= {planFromDate1}~/ -/~planFromDate2: AND trunc(orders.planFromDate) <= {planFromDate2}~/ -/~orders.costStatus: AND orders.costStatus = {orders.costStatus}~/ -/~toAddress: AND (toCity.zone.name like {toAddress} or toCity.name like {toAddress} or orders.toContact.address like {toAddress}) ~/ -/~orders.carPeople: AND orders.carPeople like {orders.carPeople}~/ -/~orders.relateBill3: AND orders.relateBill3 like upper({orders.relateBill3})~/ -/~orders.relateBill2: AND orders.relateBill2 like upper({orders.relateBill2})~/ -/~orders.imageStatus: AND orders.imageStatus = {orders.imageStatus}~/ -/~orders.customerOrderNO: AND orders.customerOrderNO like upper({orders.customerOrderNO})~/ -/~receivefee1: AND orders.receivefee >= {receivefee1}~/ -/~receivefee2: AND orders.receivefee <= {receivefee2}~/ -/~date1: and (to_char(orders.planFromDate,'yyyy-mm-dd') >= #{CLIENT_DATE_SESSION} or trunc(orders.planFromDate) >= {date1})~/ -/~order.selfDelivery: AND ((orders.selfDelivery is not null and 'false'={order.selfDelivery} ) or (orders.selfDelivery is null and 'true'={order.selfDelivery} ))~/ -/~orders.shipmentMethod: AND orders.shipmentMethod = {orders.shipmentMethod}~/ -order by orders.id desc ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -