huojin
/
sdtms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

main
HUOJIN\92525 2024-12-02 17:38:22 +08:00
parent 1c720981b9
commit df35386e43
2 changed files with 7 additions and 306 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/main/java/com/dev/stms/server/service/order/pojo/DefaultOrderManager.java
View File

@ -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("客户合同不存在，请维护客户合同!");
}
}

263
target/sdtms/WEB-INF/classes/config/origen/signOrder/maintainSingOrderAuditingPage.xml
View File

@ -1,263 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<pages>
<maintainPage id="maintainSingOrderAuditingPage" title="maintainSingOrderAuditingPage" autoQuery="false">
<search>
<inputUIs>
<date id="date1" title="date1" row="0" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="true" managerName="orderManager" methodName="getClientNull" showTime="false" manualEditable="true" defaultCurrentDate="true"/>
<text id="orders.relateBill3" title="orders.relateBill3" row="1" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" invisible="false" trimSpace="true"/>
<remote id="orders.consignor.id" title="consignor" row="1" col="2" span="1" width="120" readOnly="false" required="false" reserve="false" forceOverride="true" displayColumn="2" editModel="uneditable" displayedTableHead="序号,名称">
<hql><![CDATA[SELECT
org.id,
org.name
FROM Organization org
left join org.department
where org.beCustomer=true
and (upper(org.code) like upper(:param) or org.name like :param)
and (org.id in (select detail.subOrg.id from OrganizationDetail detail where detail.org = #{SESSION_PLATFORM})
or org.id in (select detail.subOrg.id from OrganizationDetail detail where detail.org.code = #{PUBLIC_PLATFORM}))
and org.disabled=false
]]></hql>
</remote>
<dateRanger id="orders.signTime" title="maintainSingOrderPage.order.signTime" row="2" col="1" span="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="startDate" toDate="endDate"/>
<list id="orders.status" title="maintainSingOrderPage.order.status" row="3" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" enumType="OrderStatus">
<hql><![CDATA[ SELECT
enumerate.enumValue,
enumerate.enumValue From Enumerate enumerate
where enumerate.enumType = 'OrderStatus'
and enumerate.enumValue not in('CANCEL','AVAILABLE')
order by enumerate.id]]></hql>
</list>
<list id="orders.shipmentMethod" title="orders.shipmentMethod" row="3" col="2" span="1" width="120" readOnly="false" required="false" reserve="false" forceOverride="true" enumType="ShipmentMethod">
<hql><![CDATA[ SELECT
enumerate.enumValue,
enumerate.enumValue From Enumerate enumerate
where enumerate.enumType = 'ShipmentMethod' order by enumerate.id]]></hql>
</list>
<!-- <list id="orders.shipmentWay" title="orders.shipmentWay" row="6" col="2" span="1" readOnly="false" required="false" reserve="true" forceOverride="true" enumType="ShipmentWay">
<hql><![CDATA[ SELECT t.enumValue,t.enumValue
FROM Enumerate t
WHERE t.enumType = 'ShipmentWay' order by t.id]]></hql>
</list> -->
<!-- <dateRanger id="orders.planFromDate" title="orders.planFromDate" row="9" col="1" span="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="nodeFeeDate1" toDate="nodeFeeDate2"/> -->
<date id="planFromDate1" title="orders.planFromDate" row="4" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" managerName="orderManager" methodName="getClientTime" showTime="false" manualEditable="true" defaultCurrentDate="false"/>
<date id="planFromDate2" title="shipmentOrderQueryPage.maintainOrderPage.listMaintainOrderPage.order.orderDate2" row="4" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" managerName="orderManager" showTime="false" manualEditable="true" defaultCurrentDate="false"/>
<!-- <list id="orders.costStatus" title="orders.costStatus" row="11" col="1" span="1" readOnly="false" required="false" reserve="true" forceOverride="true" enumType="FeeStatus">
<hql><![CDATA[ SELECT t.enumValue,t.enumValue
FROM Enumerate t
WHERE t.enumType = 'FeeStatus' and t.enumValue in('OPEN','CHECK') order by t.id]]></hql>
</list>
<text id="orders.carPeople" title="orders.carpeople" row="11" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/> -->
<numberText id="receivefee1" title="receivefee1" row="5" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false" returnType="Double"/>
<numberText id="receivefee2" title="receivefee2" row="5" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true" isPrecision="false" returnType="Double"/>
<text id="orders.customerOrderNO" title="orders.customerOrderNO" row="6" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
<text id="orders.relateBill2" title="orders.bcdm" row="6" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" invisible="false" trimSpace="true"/>
<text id="toName" title="toName" row="7" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
<list id="ofv.invoice" title="be_invoice_no" row="14" col="1" span="1" readOnly="false" required="false" reserve="true" forceOverride="true" enumType="BooleanType">
<hql><![CDATA[ SELECT
enumerate.enumValue,
enumerate.enumValue From Enumerate enumerate
where enumerate.enumType = 'BooleanType'
order by enumerate.id]]></hql>
</list>
<list id="order.selfDelivery" title="orders.selfDelivery" row="14" col="2" span="1" readOnly="false" required="false" reserve="true" forceOverride="true" enumType="BooleanType">
<hql><![CDATA[ SELECT
enumerate.enumValue,
enumerate.enumValue From Enumerate enumerate
where enumerate.enumType = 'BooleanType'
order by enumerate.id
]]></hql>
</list>
<!-- <date id="planFromDate" title="orders.planFromDate" row="14" col="1" span="1" readOnly="false" required="false" reserve="true" forceOverride="false" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="true"/> -->
<text id="toAddress" title="toAddress" row="16" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
<checkbox id="ordersAll" title="ordersAll" row="16" col="2" defaultValue="false" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/>
<!-- <checkbox id="selfDelivery" title="orders.selfDelivery" row="17" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/> -->
</inputUIs>
</search>
<datasource type="hql" displayRowCount="50"><![CDATA[ SELECT
orders.id,
orders.relateBill3,
orders.customerOrderNO,
orders.consignor.name,
orders.fromName||orders.fromContact.address,
orders.toName,
orders.relateBill2,
orders.toContact.address,
orders.quantity,
round(orders.weight,4),
round(orders.volume,7),
orders.predictFee,
orders.planFromDate,
round(orders.fee1,2),
round(orders.fee4,2),
round(orders.receivefee,2),
toZone.name,
fromCity.name,
toCity.name,
orders.status,
orders.shipmentMethod,
orders.selfDelivery,
orders.signTime,
round(orders.payfee,2),
round(orders.profit,2),
round(orders.matFee,2),
round(orders.pwdd,2),
round(orders.fee11,2),
orders.paymentMethod,
orders.costStatus,
orders.description1,
orders.description,
orders.billCode,
orders.invName,
orders.invCode,
orders.responseTime,
orders.updateInfo.updateTime,
'ORDER',
'ORDER'
FROM Order orders
left join orders.contractor as pf
left join orders.fromLocation froml
left join orders.toLocation tol
left join orders.fromCityCountiy fromCity
left join orders.toCityCountiy toCity
left join toCity.zone toZone
left join orders.routeFee
left join orders.extends1 vt1
where orders.contractor = #{SESSION_PLATFORM}
and orders.status not in ('CANCEL','INPUT')
and (orders.status not in('AVAILABLE') or ( /~ordersAll: {ordersAll} = true~/ ))
/~ofv.invoice: AND ((orders.invCode is not null and 'true'={ofv.invoice} ) or (orders.invCode is null and 'false'={ofv.invoice} ))~/
/~orders.customerOrderNO: AND upper(orders.customerOrderNO) like upper({orders.customerOrderNO})~/
/~orders.signNo: AND orders.signNo LIKE {orders.signNo}~/
/~orders.status: AND orders.status = {orders.status}~/
/~orders.consignor.id: AND orders.consignor.id = {orders.consignor.id}~/
/~orders.shipmentWay: AND orders.shipmentWay = {orders.shipmentWay}~/
/~toName: AND orders.toName||orders.toContact.linkman like upper({toName})~/
/~startDate: AND trunc(orders.signTime) >= {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 ]]></datasource>
<columns>
<column id="orders.id" title="order.id" visible="false" horizonAlign="center" verticalAlign="middle"/>
<column id="orders.relateBill3" width="130" title="orders.relateBill3" visible="true" horizonAlign="left" verticalAlign="middle"/>
<column id="orders.customerOrderNO" width="80" title="orders.customerOrderNO" visible="true" horizonAlign="left" verticalAlign="middle"/>
<column id="orders.consignor.name" title="consignor" visible="true" horizonAlign="left" verticalAlign="middle"/>
<column id="orders.fromContact.address" title="fromAddress" visible="true" horizonAlign="left" verticalAlign="middle"/>
<column id="orders.toLocation.name" title="toName" visible="true" horizonAlign="left" verticalAlign="middle"/>
<column id="orders.relateBill2" width="100" title="orders.bcdm" visible="true" horizonAlign="center" verticalAlign="middle" />
<column id="orders.toContact.address" title="toAddress" visible="true" horizonAlign="left" verticalAlign="middle"/>
<column id="orders.quantity" title="order.quantity" width="50" visible="true" horizonAlign="center" verticalAlign="middle"/>
<column id="orders.weight" title="order.weight" width="50" visible="true" horizonAlign="center" verticalAlign="middle"/>
<column id="orders.volume" title="order.volume" width="50" visible="true" horizonAlign="center" verticalAlign="middle"/>
<column id="orders.orders.predictFee" width="70" title="orders.predictFee" visible="true" horizonAlign="center" verticalAlign="middle"/>
<column id="orders.planFromDate" width="80" title="orders.planFromDate" visible="true" horizonAlign="center" verticalAlign="middle"/>
<column id="orders.fee1" width="60" title="feeName.ysf" visible="true" horizonAlign="center" verticalAlign="middle"/>
<column id="orders.fee4" width="60" title="feeName.bxf" visible="true" horizonAlign="center" verticalAlign="middle"/>
<column id="orders.receivefee" width="80" title="receivefee" visible="true" horizonAlign="center" verticalAlign="middle"/>
<column id="toZone.name" title="toZone.name" width="60" visible="true" horizonAlign="left" verticalAlign="middle"/>
<column id="fromSiteName" width="70" title="fromSiteName" visible="true" horizonAlign="left" verticalAlign="middle"/>
<column id="toSiteName" width="70" title="toSiteName" visible="true" horizonAlign="left" verticalAlign="middle"/>
<column id="orders.status" title="maintainSingOrderPage.order.status" width="70" visible="true" horizonAlign="left" verticalAlign="middle" format="enumFormat" formatParam="OrderStatus"/>
<column id="orders.shipmentMethod" width="60" title="orders.shipmentMethod" visible="true" horizonAlign="left" verticalAlign="middle" format="enumFormat" formatParam="ShipmentMethod"/>
<column id="orders.selfDelivery" width="60" title="orders.selfDelivery" visible="true" horizonAlign="center" verticalAlign="middle" format="booleanFormat" formatParam="selfDelivery" />
<column id="orders.signTime" title="maintainSingOrderPage.orders.signTime" visible="true" horizonAlign="center" verticalAlign="middle" format="columnsDateFormatter" formatParam="ymd"/>
<column id="orders.payfee" width="80" title="orders.payfee" visible="true" horizonAlign="center" verticalAlign="middle"/>
<column id="orders.profit" width="80" title="orders.profit" visible="true" horizomaintainSingOrderPage.xmlnAlign="center" verticalAlign="middle"/>
<column id="orders.matFee" width="80" title="orders.matFee" visible="true" horizonAlign="center" verticalAlign="middle"/>
<column id="orders.pwdd" width="80" title="orders.pwdd" visible="true" horizonAlign="center" verticalAlign="middle"/>
<column id="orders.fee11" width="80" title="orders.fee11" visible="true" horizonAlign="center" verticalAlign="middle"/>
<column id="orders.paymentMethod" width="80" title="orders.paymentMethod" visible="true" horizonAlign="center" verticalAlign="middle"/>
<column id="orders.costStatus" width="80" title="orders.costStatus" visible="true" horizonAlign="center" verticalAlign="middle" format="enumFormat" formatParam="FeeStatus"/>
<column id="orders.description1" title="order.description1" visible="true" horizonAlign="left" verticalAlign="middle"/>
<column id="orders.description" title="order.description2" visible="true" horizonAlign="left" verticalAlign="middle"/>
<column id="orders.billCode" width="120" title="ofv.bill_code" visible="true" horizonAlign="center" verticalAlign="middle"/>
<!-- <column id="ofv.apply_code" width="120" title="ofv.apply_code" visible="true" horizonAlign="center" verticalAlign="middle"/> -->
<column id="ofv.company_name" width="80" title="ofv.company_name" visible="true" horizonAlign="center" verticalAlign="middle"/>
<column id="ofv.invoice_no" width="80" title="ofv.invoice_no" visible="true" horizonAlign="center" verticalAlign="middle"/>
<column id="ofv.invoice_date" width="80" title="ofv.invoice_date" visible="true" horizonAlign="center" verticalAlign="middle"/>
<column id="updateInfo.updateTime" title="updateInfo.updateTime" visible="true" horizonAlign="left" verticalAlign="middle"/>
<column id="checkImageView" width="80" title="checkImageView" visible="true" horizonAlign="left" format="lookPictureFormatter"/>
<column id="checkImageDown" width="80" title="checkImageDown" visible="true" horizonAlign="left" format="downloadPictureFormatter"/>
</columns>
<buttons>
<!-- <popup id="orderFeeInPut" title="orderFeeInPut" enableType="single" invisible="false" containId="true" pageId="editOrderFeeInPut"> -->
<!-- <enableExpression><![CDATA[${orders.billCode} =='-'|| ${orders.billCode} =='']]></enableExpression> -->
<!-- </popup> -->
<popup id="feeIn" title="shipmnetLegsFeeIn" enableType="single" invisible="false" containId="true" pageId="modifyShipmentBillFeePage">
</popup>
<!-- <popup id="feeinvoice" title="feeinvoice" enableType="multi" invisible="false" containId="true" pageId="editOrderInvoicePage"/> -->
<!-- <popup id="editParticularly" title="editParticularly" enableType="single" invisible="false" containId="true" pageId="editLegsOrderPageTwo">
<enableExpression><![CDATA[${orders.billCode} =='-'|| ${orders.billCode} =='']]></enableExpression>
</popup> -->
<popup id="view" title="viewOrderLegs" enableType="single" invisible="false" containId="true" pageId="viewOrderLegsPage"/>
<commit id="orderFeeCheck" title="maintainSingOrderPage.feeCheck" enableType="multi" invisible="false">
<enableExpression><![CDATA[${orders.costStatus} == 'OPEN']]></enableExpression>
<mappings>
<mapping id="ids" className="list"/>
</mappings>
<actions>
<action managerName="orderManager" methodName="orderFeeCheck" parameter="ids"/>
</actions>
<forwards>
<forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
</forwards>
</commit>
<commit id="cancelOrderFeeCheck" title="maintainSingOrderPage.cancelFeeCheck" enableType="multi" invisible="false">
<enableExpression><![CDATA[(${orders.costStatus} == 'CHECK')]]></enableExpression>
<mappings>
<mapping id="ids" className="list"/>
</mappings>
<actions>
<action managerName="orderManager" methodName="orderFeeCancelCheck" parameter="ids"/>
</actions>
<forwards>
<forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
</forwards>
</commit>
<commit id="cancelOrder" title="forceCancelOrder" enableType="multi" invisible="false" confirmMessage="forceCancelOrder.confirmMessage">
<mappings>
<mapping id="ids" className="list"/>
</mappings>
<actions>
<action managerName="orderManager" methodName="forceCancelOrder" parameter="ids"/>
</actions>
<forwards>
<forward name="refreshWindow" newEnabled="true" editEnabled="false"/>
</forwards>
</commit>
<commit id="refreshOrderFee" title="refreshOrderFee" enableType="multi" invisible="false">
<enableExpression><![CDATA[${orders.status} != 'INPUT' && ${orders.status} != 'CHECKED']]></enableExpression>
<mappings>
<mapping id="ids" className="list"/>
</mappings>
<actions>
<action managerName="orderManager" methodName="refreshOrderFee" parameter="ids"/>
</actions>
<forwards>
<forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
</forwards>
</commit>
<popup id="SeeTrackShipment" title="seeTrack" enableType="multi" invisible="false" containId="true" pageId="modifySeeTrackOrderPage">
</popup>
<popup id="Packagedetails" title="editPackagedetailsPage" enableType="single" invisible="false" containId="true" pageId="editPackagedetailsPage"/>
<popup id="editImportOrderFeePage" title="收入费用导入" enableType="none" invisible="false" containId="false" pageId="editImportOrderFeePage"/>
</buttons>
</maintainPage>
</pages>