Commit 87745197 by yanHeng

Merge branch 'feature/vehicle-amount-party' into feature/sales_management

# Conflicts:
#	backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/DinasType$sequence.jmx
#	backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/DinasType$serial.jmx
#	backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/DinasType.jmx
#	backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Position$sequence.jmx
#	backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Position$serial.jmx
#	backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Position.jmx
#	backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/ShipInfo$sequence.jmx
#	backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/ShipInfo$serial.jmx
#	backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/ShipInfo.jmx
#	backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Station$sequence.jmx
#	backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Station$serial.jmx
#	backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Station.jmx
#	backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/xystOrganization$sequence.jmx
#	backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/xystOrganization$serial.jmx
#	backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/xystOrganization.jmx
#	backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/bill/ContractBill$sequence.jmx
#	backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/bill/ContractBill$serial.jmx
#	backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/bill/ContractBill.jmx
#	backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/ArtificialRecharge$sequence.jmx
#	backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/ArtificialRecharge$serial.jmx
#	backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/ArtificialRecharge.jmx
#	backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/BankRechargeDetail$sequence.jmx
#	backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/BankRechargeDetail$serial.jmx
#	backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/BankRechargeDetail.jmx
#	backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/ExpenseAdjust$sequence.jmx
#	backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/ExpenseAdjust$serial.jmx
#	backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/ExpenseAdjust.jmx
#	backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/FinanceRefund$sequence.jmx
#	backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/FinanceRefund$serial.jmx
#	backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/FinanceRefund.jmx
#	backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/BusinessTripApply$sequence.jmx
#	backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/BusinessTripApply$serial.jmx
#	backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/BusinessTripApply.jmx
#	backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/ProtocolDocument$sequence.jmx
#	backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/ProtocolDocument$serial.jmx
#	backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/ProtocolDocument.jmx
#	backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/SealBorrow$sequence.jmx
#	backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/SealBorrow$serial.jmx
#	backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/SealBorrow.jmx
#	backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/UseCarApply$sequence.jmx
#	backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/UseCarApply$serial.jmx
#	backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/UseCarApply.jmx
#	backend/xyst.dinas.production/src/main/resources/com/xyst/dinas/production/bill/Discharging$sequence.jmx
#	backend/xyst.dinas.production/src/main/resources/com/xyst/dinas/production/bill/Discharging$serial.jmx
#	backend/xyst.dinas.production/src/main/resources/com/xyst/dinas/production/bill/Discharging.jmx
#	backend/xyst.dinas.production/src/main/resources/com/xyst/dinas/production/bill/ProductionPlanReport$sequence.jmx
#	backend/xyst.dinas.production/src/main/resources/com/xyst/dinas/production/bill/ProductionPlanReport$serial.jmx
#	backend/xyst.dinas.production/src/main/resources/com/xyst/dinas/production/bill/ProductionPlanReport.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/PersonnelViolation$sequence.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/PersonnelViolation$serial.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/PersonnelViolation.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/ProductionLineViolation$sequence.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/ProductionLineViolation$serial.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/ProductionLineViolation.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/SafeLog$sequence.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/SafeLog$serial.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/SafeLog.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/ShipViolation$sequence.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/ShipViolation$serial.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/ShipViolation.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/StaffViolation$sequence.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/StaffViolation$serial.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/StaffViolation.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/TrainingEducation$sequence.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/TrainingEducation$serial.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/TrainingEducation.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/VehicleViolation$sequence.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/VehicleViolation$serial.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/VehicleViolation.jmx
#	backend/xyst.dinas.sales/src/main/resources/META-INF/spring.factories
#	backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/NeedPlan$sequence.jmx
#	backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/NeedPlan$serial.jmx
#	backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/NeedPlan.jmx
#	backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/SalesPlan$sequence.jmx
#	backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/SalesPlan$serial.jmx
#	backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/SalesPlan.jmx
#	backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/SalesPlanTemp$sequence.jmx
#	backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/SalesPlanTemp$serial.jmx
#	backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/SalesPlanTemp.jmx
#	backend/xyst.dinas.sales/src/main/resources/config/CoefficientOrPrice.hbm.xml
#	backend/xyst.dinas.transport/src/main/resources/com/xyst/dinas/transport/bill/TransportRecord$sequence.jmx
#	backend/xyst.dinas.transport/src/main/resources/com/xyst/dinas/transport/bill/TransportRecord$serial.jmx
#	backend/xyst.dinas.transport/src/main/resources/com/xyst/dinas/transport/bill/TransportRecord.jmx
#	backend/xyst.dinas.transport/src/main/resources/com/xyst/dinas/transport/bill/VehicleDispatch$sequence.jmx
#	backend/xyst.dinas.transport/src/main/resources/com/xyst/dinas/transport/bill/VehicleDispatch$serial.jmx
#	backend/xyst.dinas.transport/src/main/resources/com/xyst/dinas/transport/bill/VehicleDispatch.jmx
parents ebde4601 38b002e8
......@@ -540,6 +540,19 @@
<m:icon>iconfont iconkucunchaxun1x</m:icon>
</m:function-node>
<m:function-node>
<m:id>26783a66-bf30-42d5-af91-1aa7fcab1654</m:id>
<m:name>vehicle_amount_party</m:name>
<m:title>车辆量方</m:title>
<m:index>1400</m:index>
<m:license></m:license>
<m:privilege>com.xyst.dinas.sales.auth.VehicleAmountPartyList</m:privilege>
<m:function-definition>
<m:view>function-vehicle-amount-party</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:icon>iconfont iconcheliangliangfang1x</m:icon>
</m:function-node>
<m:function-node>
<m:id>e536e311-8d22-4730-b3d7-444fd718c883</m:id>
<m:name>self_pickup_car</m:name>
<m:title>自提车辆</m:title>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>fd5a8cb8-e24d-45c2-b5c4-8f80cde3fda6</id>
<id>133d847a-a8aa-4c11-a2e9-3b110e60b05e</id>
<name>com.xyst.dinas.biz.bill.DinasType$sequence</name>
<title>砂石类型$sequence</title>
<description>砂石类型</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>4dfb510e-962b-43db-8ab6-ed02c7fcfd9b</id>
<id>26416f69-5aac-41fd-aed3-c6244c13c7b3</id>
<name>com.xyst.dinas.biz.bill.DinasType$serial</name>
<title>砂石类型$serial</title>
<description>砂石类型</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>d9af8a12-b914-41da-a09e-a06206ad9b0f</id>
<id>5cdcd025-db60-44dd-8409-07ff415b69c1</id>
<name>com.xyst.dinas.biz.bill.DinasType</name>
<title>砂石类型</title>
<description>砂石类型</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>33a2f931-947d-4646-9e5c-1ba9f7ac4a6d</id>
<id>9b5deb8a-ed9d-422b-a5e3-7c1a654e658e</id>
<name>com.xyst.dinas.biz.bill.Position$sequence</name>
<title>岗位$sequence</title>
<description>岗位</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>338a0901-0bfc-458c-9b7e-6fe54b586cab</id>
<id>5625756c-93c7-4bbe-8c26-5c401ae99de4</id>
<name>com.xyst.dinas.biz.bill.Position$serial</name>
<title>岗位$serial</title>
<description>岗位</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>98daef45-24df-4763-8ac6-4147c2df7400</id>
<id>090d9c40-c59d-45eb-91e9-48339822c625</id>
<name>com.xyst.dinas.biz.bill.Position</name>
<title>岗位</title>
<description>岗位</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>f1d80085-b4e8-4817-918f-2bfbb88ec02a</id>
<id>9ee1f1a2-97fe-4700-83cb-0f60eb147913</id>
<name>com.xyst.dinas.biz.bill.ShipInfo$sequence</name>
<title>船舶备案$sequence</title>
<description>船舶备案</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>cc8cdcd9-ddae-4c51-8671-53dde5a17be2</id>
<id>bde53115-1ebc-40c7-8e92-19f40a6b8d88</id>
<name>com.xyst.dinas.biz.bill.ShipInfo$serial</name>
<title>船舶备案$serial</title>
<description>船舶备案</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>15ad83cf-71f2-4bcb-9771-586f78825681</id>
<id>01cbb80e-1e00-481c-ad2d-4d29b110f6e6</id>
<name>com.xyst.dinas.biz.bill.ShipInfo</name>
<title>船舶备案</title>
<description>船舶备案</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>8f4c0e93-acfc-44cc-b99d-ca7736f42d9d</id>
<id>869709ca-afd7-4c48-bd0f-f7d6ffccfc44</id>
<name>com.xyst.dinas.biz.bill.Station$sequence</name>
<title>场站$sequence</title>
<description>场站</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>01a03150-42ce-4439-8e44-1bca18be2917</id>
<id>c93c1c1b-0053-44cc-97aa-073f02980a5a</id>
<name>com.xyst.dinas.biz.bill.Station$serial</name>
<title>场站$serial</title>
<description>场站</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>b9f47fec-c5f8-429e-9b49-a7648ef59352</id>
<id>5e5ab116-de90-4417-9cf2-f5979a5054ab</id>
<name>com.xyst.dinas.biz.bill.Station</name>
<title>场站</title>
<description>场站</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>e935baf0-1daf-46e8-a540-ff1a39e74c0f</id>
<id>44e338dc-51f3-4604-b0bb-a64b128caa54</id>
<name>com.xyst.dinas.biz.bill.xystOrganization$sequence</name>
<title>组织机构$sequence</title>
<description>组织机构</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>5476eee3-8b8c-4d6e-b73d-ecd7ecc487a7</id>
<id>1c7a215f-18a0-4f9e-8e93-6026ba2ab3bf</id>
<name>com.xyst.dinas.biz.bill.xystOrganization$serial</name>
<title>组织机构$serial</title>
<description>组织机构</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>e0af541a-098f-493c-9161-7e3fbed50960</id>
<id>43140ee9-bdea-4471-b3e8-91514434110b</id>
<name>com.xyst.dinas.biz.bill.xystOrganization</name>
<title>组织机构</title>
<description>组织机构</description>
......
......@@ -101,16 +101,6 @@
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>generateSalePlanTime</m:name>
<m:title>销售计划生成时间</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>createTime</m:name>
<m:title>创建时间</m:title>
<m:type>datetime</m:type>
......
......@@ -348,4 +348,21 @@ public class ContractDao {
});
}
/**
* @Author yanHeng
* @Date 2022/4/7 18:15
* @Param [contract, amount] 合同,扣减总价
* @return java.lang.Boolean
**/
public Boolean updateContractAdvanceBalance(KObject contract, BigDecimal amount) {
boolean flag = false;
BigDecimal advanceBalance;
if(null != amount){
advanceBalance = new BigDecimal(contract.getDouble(ContractConstant.ADVANCE_BALANCE));
contract.set(ContractConstant.ADVANCE_BALANCE, advanceBalance.subtract(amount));
update(contract);
flag = true;
}
return flag;
}
}
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>c7d7832a-617a-4328-909c-1a6ae05887b7</id>
<id>e2a19cdb-6124-4c78-9935-bea0b5eb1241</id>
<name>com.xyst.dinas.contract.bill.ContractBill$sequence</name>
<title>合同单据$sequence</title>
<description>合同单据</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>07729f04-2bd3-42ec-aabc-105575ed430f</id>
<id>5f28e1fe-7c9f-4b26-9aa4-2ba9331e3966</id>
<name>com.xyst.dinas.contract.bill.ContractBill$serial</name>
<title>合同单据$serial</title>
<description>合同单据</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>c0cacc99-7e3c-44f1-b63e-6d67944fd45b</id>
<id>749d689e-027a-42ac-82bc-0f9efad3a22b</id>
<name>com.xyst.dinas.contract.bill.ContractBill</name>
<title>合同单据</title>
<description>合同单据</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>4e0d5546-fda2-4c83-ba4c-91d784f4e98b</id>
<id>2090943b-01c5-4c56-9913-ed136cd2485c</id>
<name>com.xyst.dinas.contract.bill.SelfPickupCarBill$sequence</name>
<title>自提车辆单据$sequence</title>
<description>自提车辆单据</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>adb7369d-2957-421c-b172-b00bd16150db</id>
<id>348d6482-db4c-4c3a-b2fc-c66dada7fd89</id>
<name>com.xyst.dinas.contract.bill.SelfPickupCarBill$serial</name>
<title>自提车辆单据$serial</title>
<description>自提车辆单据</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>536cdb2b-49be-46db-99c7-0aadb41077fc</id>
<id>e52eed8c-aa1e-4070-8163-f6101f29b786</id>
<name>com.xyst.dinas.contract.bill.SelfPickupCarBill</name>
<title>自提车辆单据</title>
<description>自提车辆单据</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-type">
<specification>1.0</specification>
<id>16eb1d1b-2b4f-4c28-93dc-39c30de9a072</id>
<id>e721e1da-726b-4c8a-b0f2-48851ca4d235</id>
<name>com.xyst.dinas.contract.datamodel.ContractAssociatedcontractDetail</name>
<title>合同子表</title>
<define>bcp.type.Class</define>
......
......@@ -7,22 +7,59 @@
<description>自提车辆表</description>
<define>bcp.type.Class</define>
<define-version>1.0</define-version>
<dependency>com.xyst.dinas.biz.datamodel.xystOrganization</dependency>
<dependency>com.xyst.dinas.project.datamodel.PurchaseSandCompany</dependency>
<dependency>javax.persistence.Entity</dependency>
<dependency>bcp.type.constraint.StringLength</dependency>
<dependency>javax.persistence.ManyToOne</dependency>
<dependency>com.beecode.inz.common.datamodel.BaseInfo</dependency>
<dependency>javax.persistence.JoinColumn</dependency>
<dependency>javax.persistence.OneToMany</dependency>
<dependency>com.xyst.dinas.contract.datamodel.Contract</dependency>
<dependency>com.xyst.dinas.biz.datamodel.xystOrganization</dependency>
<dependency>com.xyst.dinas.project.datamodel.PurchaseSandCompany</dependency>
<dependency>javax.persistence.Column</dependency>
<dependency>javax.persistence.Table</dependency>
<dependency>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</dependency>
<dependency>com.xyst.dinas.project.datamodel.ProjectFiled</dependency>
<dependency>com.xyst.dinas.contract.datamodel.Contract</dependency>
<content>
<m:class>
<m:annotations>
<m:annotation>
<m:type>javax.persistence.Entity</m:type>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Table</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>xyst_dinas_contract_self_pickup_car</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:parents>
<m:parent>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</m:parent>
<m:parent>com.beecode.inz.common.datamodel.BaseInfo</m:parent>
</m:parents>
<m:attributes>
<m:attribute>
<m:annotations/>
<m:annotations>
<m:annotation>
<m:type>javax.persistence.ManyToOne</m:type>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.JoinColumn</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>project_id</m:value>
</m:property>
<m:property>
<m:key>referencedColumnName</m:key>
<m:value>ID</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>fbfd1335-5f18-4bd3-98ca-2c63afe97827</m:id>
<m:name>project</m:name>
<m:title>项目</m:title>
......@@ -36,6 +73,15 @@
<m:type>bcp.type.constraint.StringLength</m:type>
<m:value>50</m:value>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>project_code</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>9ea6f374-f043-45d1-ab78-64d4b1ed7a05</m:id>
<m:name>projectCode</m:name>
......@@ -45,7 +91,24 @@
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations/>
<m:annotations>
<m:annotation>
<m:type>javax.persistence.ManyToOne</m:type>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.JoinColumn</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>regional_company_id</m:value>
</m:property>
<m:property>
<m:key>referencedColumnName</m:key>
<m:value>ID</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>f6b523af-1eeb-4c3b-b644-c51866087f60</m:id>
<m:name>regionalCompany</m:name>
<m:title>区域公司</m:title>
......@@ -59,6 +122,15 @@
<m:type>bcp.type.constraint.StringLength</m:type>
<m:value>50</m:value>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>regional_company_name</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>afc7f528-d6d1-491d-b867-e4824a8513c3</m:id>
<m:name>regionalCompanyName</m:name>
......@@ -68,7 +140,24 @@
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations/>
<m:annotations>
<m:annotation>
<m:type>javax.persistence.ManyToOne</m:type>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.JoinColumn</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>purchase_sand_Unit_id</m:value>
</m:property>
<m:property>
<m:key>referencedColumnName</m:key>
<m:value>ID</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>b201aec2-36b7-4dda-880d-36dcc6173796</m:id>
<m:name>purchaseSandUnit</m:name>
<m:title>购砂单位</m:title>
......@@ -82,6 +171,15 @@
<m:type>bcp.type.constraint.StringLength</m:type>
<m:value>50</m:value>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>purchase_sand_Unit_name</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>694805bd-715a-4a5c-9b90-6f4400ef39f1</m:id>
<m:name>purchaseSandUnitName</m:name>
......@@ -91,7 +189,24 @@
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations/>
<m:annotations>
<m:annotation>
<m:type>javax.persistence.ManyToOne</m:type>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.JoinColumn</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>contract_id</m:value>
</m:property>
<m:property>
<m:key>referencedColumnName</m:key>
<m:value>ID</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>a518f765-df1d-4670-a423-5c896149548e</m:id>
<m:name>contract</m:name>
<m:title>合同</m:title>
......@@ -105,6 +220,15 @@
<m:type>bcp.type.constraint.StringLength</m:type>
<m:value>50</m:value>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>contract_name</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>beefd5f9-a611-44aa-aeaa-f8992c4aeaee</m:id>
<m:name>contractName</m:name>
......@@ -119,6 +243,15 @@
<m:type>bcp.type.constraint.StringLength</m:type>
<m:value>50</m:value>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>contract_code</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>e907a0e2-140e-4a12-974b-293b42bfcb19</m:id>
<m:name>contractCode</m:name>
......@@ -133,6 +266,15 @@
<m:type>bcp.type.constraint.StringLength</m:type>
<m:value>800</m:value>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>car_info</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>8a23beaa-9ae0-4ade-a096-5dfa5a30ff8e</m:id>
<m:name>carInfo</m:name>
......@@ -147,6 +289,15 @@
<m:type>bcp.type.constraint.StringLength</m:type>
<m:value>500</m:value>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>memo</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>dd07132e-8ba0-4615-81c2-6f92ccb6df6d</m:id>
<m:name>memo</m:name>
......@@ -156,7 +307,17 @@
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations/>
<m:annotations>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>att_id</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>6b43184e-b4c6-4b87-b3ec-91adcb84d68d</m:id>
<m:name>attId</m:name>
<m:title>车辆行驶证</m:title>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>d5ac5ed0-5dc5-43bb-aed9-b55c656990b4</id>
<id>33b770a4-c9cd-4a54-a0bd-8e9d80736045</id>
<name>com.xyst.dinas.finance.bill.ArtificialRecharge$sequence</name>
<title>人工充值$sequence</title>
<define>bcp.sequence</define>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>ffbfa187-bb42-47e7-a528-2c50e262577e</id>
<id>35aa3c63-3f1f-4a7e-b187-335d561d6dfb</id>
<name>com.xyst.dinas.finance.bill.ArtificialRecharge$serial</name>
<title>人工充值$serial</title>
<define>bcp.serial</define>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>6b5001ad-97e2-4180-9b2d-39e82a221208</id>
<id>d70fda26-1c0c-4323-9ae4-de6153b30f3b</id>
<name>com.xyst.dinas.finance.bill.ArtificialRecharge</name>
<title>人工充值</title>
<define>bcp.biz.Biztype</define>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>9e9676b8-0005-429f-a2a0-3532e790cb2a</id>
<id>66cfe727-fbb0-4ecc-8bd0-b281a99c0f33</id>
<name>com.xyst.dinas.finance.bill.BankRechargeDetail$sequence</name>
<title>银行充值明细$sequence</title>
<define>bcp.sequence</define>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>6818db29-be3d-44c6-8c40-bf8fa1c9e1e5</id>
<id>07579571-97d1-400d-bc5f-a78bf8757912</id>
<name>com.xyst.dinas.finance.bill.BankRechargeDetail$serial</name>
<title>银行充值明细$serial</title>
<define>bcp.serial</define>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>917485a2-5dfa-46e0-944e-b803b9caf6c8</id>
<id>05292512-3b6b-4766-9af6-8e794064c67f</id>
<name>com.xyst.dinas.finance.bill.BankRechargeDetail</name>
<title>银行充值明细</title>
<define>bcp.biz.Biztype</define>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>bb311f59-439c-4448-b388-dcb212a0d779</id>
<id>c933719d-8b06-45a8-a2ad-1da8c0c3bba4</id>
<name>com.xyst.dinas.finance.bill.ExpenseAdjust$sequence</name>
<title>费用调整$sequence</title>
<define>bcp.sequence</define>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>e582c96f-40f8-490c-909b-be0678d7b140</id>
<id>2b56d22e-7a16-41bd-bf18-e23b49d1d6c2</id>
<name>com.xyst.dinas.finance.bill.ExpenseAdjust$serial</name>
<title>费用调整$serial</title>
<define>bcp.serial</define>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>4932c941-a05b-4db2-bc85-fde675b66d47</id>
<id>57b3e154-e83e-4a9c-ac2f-d6f88c203d70</id>
<name>com.xyst.dinas.finance.bill.ExpenseAdjust</name>
<title>费用调整</title>
<define>bcp.biz.Biztype</define>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>24ae3838-f9ab-4bb1-9e69-88e99f720b7e</id>
<id>4065bcc5-a8b7-495d-af02-af3fc8128f84</id>
<name>com.xyst.dinas.finance.bill.FinanceRefund$sequence</name>
<title>财务退款$sequence</title>
<define>bcp.sequence</define>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>491774e8-6be1-421b-b737-09318c87a6ff</id>
<id>ce4eb012-5633-4095-aeb1-c878446a0141</id>
<name>com.xyst.dinas.finance.bill.FinanceRefund$serial</name>
<title>财务退款$serial</title>
<define>bcp.serial</define>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>2c7157fc-49ca-4621-b6ad-d6c569624073</id>
<id>64290fb9-267e-451e-ab94-666a70d01fec</id>
<name>com.xyst.dinas.finance.bill.FinanceRefund</name>
<title>财务退款</title>
<define>bcp.biz.Biztype</define>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>f5cf6adf-3135-4166-afe9-8bdda8a2506f</id>
<id>d6655343-c11e-441d-9867-327e8f02cb66</id>
<name>com.xyst.dinas.oa.bill.BusinessTripApply$sequence</name>
<title>出差申请$sequence</title>
<description>出差申请</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>7f136b1e-9576-4a0e-9fc6-39aafc9fb151</id>
<id>68540c53-e8af-41fb-96f0-7769544efa4d</id>
<name>com.xyst.dinas.oa.bill.BusinessTripApply$serial</name>
<title>出差申请$serial</title>
<description>出差申请</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>a708e5c6-ec52-4d97-83a6-c4108aa64b30</id>
<id>5fc7ea9c-a5b6-4356-9241-1b0c6cf7b259</id>
<name>com.xyst.dinas.oa.bill.BusinessTripApply</name>
<title>出差申请</title>
<description>出差申请</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>7209907f-0f5c-4d93-bfa0-b275ca723e75</id>
<id>591d1a6a-23c4-42f4-97ee-dfdee099755c</id>
<name>com.xyst.dinas.oa.bill.ProtocolDocument$sequence</name>
<title>拟文$sequence</title>
<description>拟文</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>b5eca9b5-9369-4d49-8372-bb321e7a1e00</id>
<id>82602947-94d8-4952-973a-5d299d7eaa27</id>
<name>com.xyst.dinas.oa.bill.ProtocolDocument$serial</name>
<title>拟文$serial</title>
<description>拟文</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>81edf524-4457-4474-beb8-15d3bd77c7cf</id>
<id>dce1b269-f2f2-4a6a-bf9f-418ba3bf55dd</id>
<name>com.xyst.dinas.oa.bill.ProtocolDocument</name>
<title>拟文</title>
<description>拟文</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>bbcf83a1-36c8-4246-bf24-a90b9bc2efba</id>
<id>639945b7-a866-4cf3-84bf-cecd7aa0153f</id>
<name>com.xyst.dinas.oa.bill.SealBorrow$sequence</name>
<title>证章借出$sequence</title>
<description>证章借出</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>4c0517a9-8f7b-4bd1-b381-67fec3d79505</id>
<id>de698619-2007-4060-bd4d-bb3b5193759c</id>
<name>com.xyst.dinas.oa.bill.SealBorrow$serial</name>
<title>证章借出$serial</title>
<description>证章借出</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>3670ce6a-d27d-4940-aab2-c2a2c1bfa256</id>
<id>5d9efe7f-e11b-4ef6-9077-84c551c62af5</id>
<name>com.xyst.dinas.oa.bill.SealBorrow</name>
<title>证章借出</title>
<description>证章借出</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>aaaea5d3-b1ed-4cef-822d-a2739235e220</id>
<id>e5c22fba-6aed-48df-9fbe-778939fbeebf</id>
<name>com.xyst.dinas.oa.bill.UseCarApply$sequence</name>
<title>用车申请$sequence</title>
<description>用车申请</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>f680c320-0a98-49be-9fc4-f83091804542</id>
<id>db9f8720-d353-491f-9232-8008e06b7c6c</id>
<name>com.xyst.dinas.oa.bill.UseCarApply$serial</name>
<title>用车申请$serial</title>
<description>用车申请</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>e6667ad8-7516-4372-8f3b-7488055b1973</id>
<id>c4b4f611-9066-45d0-b6a4-477cbc5a5ee5</id>
<name>com.xyst.dinas.oa.bill.UseCarApply</name>
<title>用车申请</title>
<description>用车申请</description>
......
......@@ -54,4 +54,6 @@ public interface PriceAdjustmentDao extends BaseDao {
List<KObject> getNewsByRegionalCompanyIds(List<UUID> ids);
List<KObject> getSameAdjustmentDateAndLtCreateDate(KObject kobject);
KObject queryPriceAdjustmentByTime(UUID currentRegionalCompanyId, Date adjustmentDate, UUID dinasTypeId, UUID stationId);
}
......@@ -28,7 +28,6 @@ import org.springframework.util.CollectionUtils;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.ZoneId;
import java.time.temporal.ChronoField;
import java.time.temporal.ChronoUnit;
import java.util.*;
import java.util.stream.Collectors;
......@@ -318,6 +317,39 @@ public class PriceAdjustmentDaoImpl extends AbstractBaseDao implements PriceAdju
}
@Override
public KObject queryPriceAdjustmentByTime(UUID currentRegionalCompanyId, Date adjustmentDate, UUID dinasTypeId, UUID stationId) {
String hql = "from " + PriceAdjustmentConstant.ENTITY + " as a "+
" WHERE a.adjustmentDate <= :adjustmentDate and" +
" a.station.id = :stationId "
+ " and a.adjustmentStatus = 1 " ;
return template.execute(session ->{
Query<KObject> query = session.createQuery(hql, KObject.class);
query.setParameter("adjustmentDate", adjustmentDate);
query.setParameter("stationId", stationId);
List<KObject> resultList = query.getResultList();
if(resultList.size() > 0) {
return resultList.get(0);
}else {
String hqlOne = "from " + PriceAdjustmentConstant.ENTITY + " as a "+
" WHERE a.adjustmentDate <= :adjustmentDate and" +
" a.adjustmentEndDate >= :adjustmentDate and" +
" a.station.id = :stationId " ;
return template.execute(session1 ->{
Query<KObject> queryOne = session.createQuery(hqlOne, KObject.class);
queryOne.setParameter("adjustmentDate", adjustmentDate);
queryOne.setParameter("stationId", stationId);
List<KObject> resultOnList = queryOne.getResultList();
if(resultOnList.size() > 0) {
return resultOnList.get(0);
}else {
return null;
}
});
}
});
}
@Override
public List<KObject> getSameAdjustmentDateAndLtCreateDate(Date adjustmentDate, Date createTime, UUID stationId) {
KClass adjustment = Amino.getStaticMetadataContext().getBean(PriceAdjustmentConstant.ENTITY, KClass.class);
DetachedCriteria adjustmentDetachedCriteria = DetachedCriteria.forEntityName(adjustment.getName());
......
......@@ -142,6 +142,20 @@ public class PriceAdjustmentServiceImpl implements PriceAdjustmentService {
}
@Override
public String getNewsPriceByStationId(UUID currentRegionalCompanyId, Date adjustmentDate, UUID dinasTypeId, UUID stationId) {
KObject kObject= priceAdjustmentDao.queryPriceAdjustmentByTime(currentRegionalCompanyId, adjustmentDate,dinasTypeId,stationId);
if(null != kObject){
KObject[] dinasTypeDetails = kObject.get("dinasTypeDetails").toArray();
for (KObject dinasTypeDetail : dinasTypeDetails) {
if(dinasTypeDetail.get("dinasType").getUuid("id").equals(dinasTypeId)){
return dinasTypeDetail.get("dinasPrice").toString();
}
}
}
return "";
}
@Override
public UUID addPriceAdjustment(KObject kObject) {
return priceAdjustmentDao.create(kObject);
}
......
......@@ -46,4 +46,6 @@ public interface PriceAdjustmentService {
* @return
*/
List<KObject> getNewsByRegionalCompanyIds(UUID currentRegionalCompanyId);
String getNewsPriceByStationId(UUID currentRegionalCompanyId, Date adjustmentDate, UUID dinasTypeId, UUID stationId);
}
......@@ -6,8 +6,10 @@ import com.beecode.inz.basis.team.pojo.ResponseObj;
import com.xyst.dinas.price.service.PriceAdjustmentService;
import com.xyst.dinas.price.service.RegionalCompanyPriceAuthorityService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.*;
import java.util.Date;
import java.util.List;
import java.util.UUID;
......@@ -69,6 +71,23 @@ public class RegionalCompanyPriceAuthorityController {
return ResponseObj.success("查询成功",newsByRegionalCompanyIds);
}
/**
* 根据场站,时间,砂石获取价格
* @return
*/
@GetMapping("/getNewsPriceByStationId")
public ResponseObj getNewsPriceByStationId(
@RequestParam(value = "regionalCompanyId",required = false) UUID currentRegionalCompanyId,
@DateTimeFormat(pattern="yyyy-MM-dd") @RequestParam("adjustmentDate") Date adjustmentDate,
@RequestParam("dinasTypeId") UUID dinasTypeId,
@RequestParam("stationId") UUID stationId
){
String price = priceAdjustmentService.getNewsPriceByStationId(currentRegionalCompanyId,adjustmentDate,dinasTypeId,stationId);
return ResponseObj.success("查询成功",price);
}
}
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>58256242-1a03-4fac-8f30-fdc853883da4</id>
<id>5a4e1893-a05e-4736-80b1-dd4d88676c99</id>
<name>com.xyst.dinas.production.bill.Discharging$sequence</name>
<title>接驳管理$sequence</title>
<description>接驳管理</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>5e0375c6-6818-4d7d-b582-0ea506db21f1</id>
<id>20ca3202-a4f1-4188-a313-e30400bbe46b</id>
<name>com.xyst.dinas.production.bill.Discharging$serial</name>
<title>接驳管理$serial</title>
<description>接驳管理</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>d949835c-c0c1-4464-a306-ed0359945313</id>
<id>4a05ae91-629b-4846-988b-cf4eb0c9ecad</id>
<name>com.xyst.dinas.production.bill.Discharging</name>
<title>接驳管理</title>
<description>接驳管理</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>0cd8de7d-970c-429b-a4f6-c66ca9f8ba1a</id>
<id>2df6c8bf-5094-4c1e-9229-2c0381930dfe</id>
<name>com.xyst.dinas.production.bill.ProductionPlanReport$sequence</name>
<title>生产管理$sequence</title>
<description>生产管理</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>583ee153-cc0f-428c-85bc-5a09560f89ee</id>
<id>c1b2b5a4-32c1-4b9e-9a17-ac0f16e03f37</id>
<name>com.xyst.dinas.production.bill.ProductionPlanReport$serial</name>
<title>生产管理$serial</title>
<description>生产管理</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>232e8037-76ef-4922-9626-61c1cd334bfc</id>
<id>f713364c-c087-4e89-bcf5-3f70fac71818</id>
<name>com.xyst.dinas.production.bill.ProductionPlanReport</name>
<title>生产管理</title>
<description>生产管理</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-type">
<specification>1.0</specification>
<id>a55c46bb-f5a8-4c8d-b780-aef2a579f1d0</id>
<id>11d69604-24ab-46dc-8ed5-82ecc6b4dea8</id>
<name>com.xyst.dinas.production.datamodel.ProductionPlanReportAssociateddinasTypeDetail</name>
<title>生产计划采砂类型和砂石量子表</title>
<define>bcp.type.Class</define>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-type">
<specification>1.0</specification>
<id>1b94edef-b99d-4bf5-a0a3-f2c2c5839977</id>
<id>212de0e3-b4fc-4bc7-b4ee-930788d844aa</id>
<name>com.xyst.dinas.production.datamodel.SandMiningAssociatedstationDetail</name>
<title>采砂许可证场站表</title>
<define>bcp.type.Class</define>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>5a0c3fd6-d2d8-4218-8482-995b594974e3</id>
<id>70f0ca56-cf83-42ee-ba2c-89e9ec5241d2</id>
<name>com.xyst.dinas.safe.bill.PersonnelViolation$sequence</name>
<title>人员违规记录$sequence</title>
<description>人员违规记录</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>a26f7c0c-db38-42e1-8e62-1d129d4b990a</id>
<id>445f1c25-c5ad-493d-9cc6-0bc083fba7c1</id>
<name>com.xyst.dinas.safe.bill.PersonnelViolation$serial</name>
<title>人员违规记录$serial</title>
<description>人员违规记录</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>ddc54976-85a9-4fb5-98b4-1f4370a23a22</id>
<id>bcb70b44-639f-4995-9374-1559e7514552</id>
<name>com.xyst.dinas.safe.bill.PersonnelViolation</name>
<title>人员违规记录</title>
<description>人员违规记录</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>470340db-b390-481e-a5fe-cea5021db2bb</id>
<id>3635d1e7-3bb6-4748-a13a-39338b4ee037</id>
<name>com.xyst.dinas.safe.bill.ProductionLineViolation$sequence</name>
<title>生产违规记录$sequence</title>
<description>生产违规记录</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>70c0227b-c0ec-4d54-a795-14c978b4a1e0</id>
<id>bf1b8c35-8134-408d-b623-646003fc9d9a</id>
<name>com.xyst.dinas.safe.bill.ProductionLineViolation$serial</name>
<title>生产违规记录$serial</title>
<description>生产违规记录</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>d53a9bf5-19ce-4675-9888-ec4e10ca4712</id>
<id>37af3895-03a0-472f-88f2-a302ba38369d</id>
<name>com.xyst.dinas.safe.bill.ProductionLineViolation</name>
<title>生产违规记录</title>
<description>生产违规记录</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>833b81ff-3248-439c-a677-32e0a322461a</id>
<id>4a1531ea-5480-4a46-9699-705b408c7fbc</id>
<name>com.xyst.dinas.safe.bill.SafeLog$sequence</name>
<title>安全日志$sequence</title>
<description>安全日志</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>e490b1ff-5a8e-4ace-981c-f41fb97019b1</id>
<id>64940413-dc3f-4d9d-a7d8-3256f8f74639</id>
<name>com.xyst.dinas.safe.bill.SafeLog$serial</name>
<title>安全日志$serial</title>
<description>安全日志</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>f6416ad1-6e27-4bff-a854-897ffa2439a3</id>
<id>75f90c28-698a-4524-bceb-d46b3161082b</id>
<name>com.xyst.dinas.safe.bill.SafeLog</name>
<title>安全日志</title>
<description>安全日志</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>d18e2a39-a873-4822-8008-54cf20d028ae</id>
<id>d4c0b652-22d0-4c2f-b62a-ed80305e7866</id>
<name>com.xyst.dinas.safe.bill.ShipViolation$sequence</name>
<title>船舶违规记录$sequence</title>
<description>船舶违规记录</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>841b813a-71dd-4177-9c35-8da2e3dd8624</id>
<id>a99ff226-6c0c-4026-8ecc-b3ccc2ae8f7f</id>
<name>com.xyst.dinas.safe.bill.ShipViolation$serial</name>
<title>船舶违规记录$serial</title>
<description>船舶违规记录</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>a55e3107-b5c9-47a0-8f4b-6cee1682d756</id>
<id>de7f8c8b-c729-4702-a34a-0d2335384861</id>
<name>com.xyst.dinas.safe.bill.ShipViolation</name>
<title>船舶违规记录</title>
<description>船舶违规记录</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>a5f41ea7-9a80-4082-a82e-de9da5db38b1</id>
<id>c20d8a8c-fec2-4151-b24f-d00b36f6f18e</id>
<name>com.xyst.dinas.safe.bill.StaffViolation$sequence</name>
<title>人员违规记录$sequence</title>
<description>人员违规记录</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>2282d449-b3dc-4568-9b0a-eca4d8128d5f</id>
<id>eda12fd5-4434-4639-a8f0-acc5748e9dc1</id>
<name>com.xyst.dinas.safe.bill.StaffViolation$serial</name>
<title>人员违规记录$serial</title>
<description>人员违规记录</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>0a576416-1a3a-4558-81dd-d91978e383a8</id>
<id>16f0b947-2e81-4320-ae62-38ac8079d1bf</id>
<name>com.xyst.dinas.safe.bill.StaffViolation</name>
<title>人员违规记录</title>
<description>人员违规记录</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>ebb52d04-7ae3-4d6e-8ac9-c2bc50a4e5c7</id>
<id>47a3038f-5bb0-494c-afd9-5a332a87fcb5</id>
<name>com.xyst.dinas.safe.bill.TrainingEducation$sequence</name>
<title>安全教育培训记录$sequence</title>
<description>安全教育培训记录</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>af597004-48c0-4c4f-a410-00206d888239</id>
<id>53ec9523-fab6-47bb-b7a7-65fe3638daa6</id>
<name>com.xyst.dinas.safe.bill.TrainingEducation$serial</name>
<title>安全教育培训记录$serial</title>
<description>安全教育培训记录</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>bc11a6f7-7e04-4b04-8b5a-5ef2f57c270c</id>
<id>97c8a567-f0e3-4209-840c-e92f9cfe3cfe</id>
<name>com.xyst.dinas.safe.bill.TrainingEducation</name>
<title>安全教育培训记录</title>
<description>安全教育培训记录</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>5e6c5580-f621-474f-81f3-06cb8073ec3d</id>
<id>ba90df9d-42e4-4655-92ae-cdf9988bb9c2</id>
<name>com.xyst.dinas.safe.bill.VehicleViolation$sequence</name>
<title>车辆违规记录$sequence</title>
<description>车辆违规记录</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>2c3bad61-14ba-4e8f-a3a2-c88f3cce140a</id>
<id>38b8bc7f-0bd5-41e4-a218-5dd95552de4c</id>
<name>com.xyst.dinas.safe.bill.VehicleViolation$serial</name>
<title>车辆违规记录$serial</title>
<description>车辆违规记录</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>480d9a1b-ee62-4b0a-ab45-8cadd29d9f2d</id>
<id>c79949d6-6e52-48d2-9f61-2541c44e5f92</id>
<name>com.xyst.dinas.safe.bill.VehicleViolation</name>
<title>车辆违规记录</title>
<description>车辆违规记录</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-type">
<specification>1.0</specification>
<id>aebe6877-f966-4cff-9ff9-ee87a06ae302</id>
<id>85064c7c-010d-4f61-bb78-0dd5017f7a65</id>
<name>com.xyst.dinas.safe.datamodel.SafeLogAssociatedStaffDetail</name>
<title>检查人员明细表</title>
<define>bcp.type.Class</define>
......
package com.xyst.dinas.sales.config;
import com.beecode.amino.metadata.runtime.MetadataMech;
import com.beecode.bcp.type.KClass;
import com.beecode.bcp.type.TypeConstants;
import com.xyst.dinas.sales.constant.CoefficientOrPriceConstant;
import com.xyst.dinas.sales.dao.CoefficientOrPriceDao;
import com.xyst.dinas.sales.internal.dao.CoefficientOrPriceDaoImpl;
import com.xyst.dinas.sales.internal.service.CoefficientOrPriceServiceImpl;
import com.xyst.dinas.sales.service.CoefficientOrPriceService;
import com.xyst.dinas.sales.web.CoefficientOrPriceController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Bean;
import org.springframework.core.io.ClassPathResource;
public class CoefficientOrPriceConfiguration {
@Autowired
@Qualifier(TypeConstants.CLASS_MECH)
private MetadataMech<KClass> typeMech;
@org.springframework.context.annotation.Bean(CoefficientOrPriceConstant.ENTITY)
public KClass dischargingEntity() {
return typeMech.createStaticBeanByResource(
new ClassPathResource("/com/xyst/dinas/sales/datamodel/CoefficientOrPrice.jmx", KClass.class));
}
//CoefficientOrPriceDaoImpl相关bean配置
@Bean
public CoefficientOrPriceController coefficientOrPriceController(){
return new CoefficientOrPriceController();
}
@Bean
public CoefficientOrPriceService coefficientOrPriceService(){
return new CoefficientOrPriceServiceImpl();
}
@Bean
public CoefficientOrPriceDao coefficientOrPriceDao(){
return new CoefficientOrPriceDaoImpl();
}
}
package com.xyst.dinas.sales.config;
import org.springframework.context.annotation.Bean;
import com.xyst.dinas.contract.internal.scene.ContractListDefaultScene;
import com.xyst.dinas.contract.query.processor.ContractPerformWarningProcessor;
import com.xyst.dinas.contract.query.processor.ContractWarnSettingProcessor;
import com.xyst.dinas.sales.dao.InventoryDao;
import com.xyst.dinas.sales.dao.NeedPlanDao;
import com.xyst.dinas.sales.dao.SalesPlanDao;
......@@ -30,6 +25,7 @@ import com.xyst.dinas.sales.web.InventoryController;
import com.xyst.dinas.sales.web.NeedPlanController;
import com.xyst.dinas.sales.web.SalesPlanController;
import com.xyst.dinas.sales.web.SalesRecordController;
import org.springframework.context.annotation.Bean;
public class SalesConfiguration {
......
package com.xyst.dinas.sales.config;
import com.beecode.amino.metadata.runtime.MetadataMech;
import com.beecode.bcp.type.KClass;
import com.beecode.bcp.type.TypeConstants;
import com.xyst.dinas.sales.constant.VehicleAmountPartyConstant;
import com.xyst.dinas.sales.dao.VehicleAmountPartyDao;
import com.xyst.dinas.sales.internal.dao.VehicleAmountPartyDaoImpl;
import com.xyst.dinas.sales.internal.service.VehicleAmountPartyServiceImpl;
import com.xyst.dinas.sales.service.VehicleAmountPartyService;
import com.xyst.dinas.sales.web.VehicleAmountPartyController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Bean;
import org.springframework.core.io.ClassPathResource;
public class VehicleAmountPartyConfiguration {
@Autowired
@Qualifier(TypeConstants.CLASS_MECH)
private MetadataMech<KClass> typeMech;
@Bean(VehicleAmountPartyConstant.ENTITY)
public KClass dischargingEntity() {
return typeMech.createStaticBeanByResource(
new ClassPathResource("/com/xyst/dinas/sales/datamodel/VehicleAmountParty.jmx", KClass.class));
}
//VehicleAmountPartyDaoImpl相关bean配置
@Bean
public VehicleAmountPartyController vehicleAmountPartyController(){
return new VehicleAmountPartyController();
}
@Bean
public VehicleAmountPartyService vehicleAmountPartyService(){
return new VehicleAmountPartyServiceImpl();
}
@Bean
public VehicleAmountPartyDao vehicleAmountPartyDao(){
return new VehicleAmountPartyDaoImpl();
}
}
package com.xyst.dinas.sales.constant;
public interface CoefficientOrPriceConstant {
/**
* 实体名
*/
String ENTITY = "com.xyst.dinas.sales.datamodel.CoefficientOrPrice";
}
package com.xyst.dinas.sales.constant;
public interface VehicleAmountPartyConstant {
/**
* 实体名
*/
String ENTITY = "com.xyst.dinas.sales.datamodel.VehicleAmountParty";
}
package com.xyst.dinas.sales.dao;
import com.beecode.bap.attachment.common.Page;
import com.beecode.bcp.type.KObject;
import com.beecode.inz.basis.dao.BaseDao;
import java.util.List;
import java.util.UUID;
/**
* @author yanheng
*/
public interface CoefficientOrPriceDao extends BaseDao {
KObject load(UUID id);
//新增
UUID create(KObject insertKobject);
Page<KObject> listCoefficientOrPriceInfoPaging(Page<KObject> page, int type, List<UUID> regionalCompanyIds);
void modify(KObject insertKobject);
Object priceInfo(Integer type, UUID stationId, UUID dinasTypeId);
}
package com.xyst.dinas.sales.dao;
import com.beecode.bap.attachment.common.Page;
import com.beecode.bcp.type.KObject;
import com.beecode.inz.basis.dao.BaseDao;
import java.util.List;
import java.util.UUID;
/**
* @author yanheng
*/
public interface VehicleAmountPartyDao extends BaseDao {
KObject load(UUID id);
UUID create(KObject kObject);
Page<KObject> listVehicleAmountPartygInfoPaging(Page<KObject> page, UUID purchaseSandUnitId, List<UUID> regionalCompanyIds);
void deleteById(UUID id);
}
package com.xyst.dinas.sales.enumeration;
import com.beecode.inz.common.ErrorCode;
public enum VehicleAmountPartyErrorCodeEnum implements ErrorCode {
VEHICLE_AMOUNT_PARTY_ADVANCE_BALANCE("007032101", "预付款余额扣减失败"),
VEHICLE_AMOUNT_ADVANCE_BALANCE_INSUFFICIENT("007032102", "预付款余额不足,请先联系客户进行充值操作");
private String code;
private String description;
VehicleAmountPartyErrorCodeEnum(String code, String description) {
this.code = code;
this.description = description;
}
@Override
public String getCode() {
return code;
}
@Override
public String getDescription() {
return description;
}
}
package com.xyst.dinas.sales.internal.dao;
import com.beecode.amino.core.Amino;
import com.beecode.bap.attachment.common.Page;
import com.beecode.bap.staff.BapContext;
import com.beecode.bcp.core.context.AminoContextHolder;
import com.beecode.bcp.type.KClass;
import com.beecode.bcp.type.KObject;
import com.beecode.inz.basis.internal.dao.AbstractBaseDao;
import com.beecode.inz.common.BaseConstants;
import com.xyst.dinas.biz.enumeration.OrganizationTypeEnum;
import com.xyst.dinas.biz.service.DinasOrganizationService;
import com.xyst.dinas.sales.constant.CoefficientOrPriceConstant;
import com.xyst.dinas.sales.dao.CoefficientOrPriceDao;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.criterion.DetachedCriteria;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Projections;
import org.hibernate.criterion.Restrictions;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.orm.hibernate5.HibernateTemplate;
import org.springframework.util.CollectionUtils;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.UUID;
/**
* @author yanheng
*/
public class CoefficientOrPriceDaoImpl extends AbstractBaseDao implements CoefficientOrPriceDao , CoefficientOrPriceConstant {
@Autowired
private HibernateTemplate template;
@Autowired
private DinasOrganizationService dinasOrganizationService;
@Autowired
private BapContext bapContext;
@Autowired
private CoefficientOrPriceDao coefficientOrPriceDao;
@Override
public KObject load(UUID id) {
return (KObject) template.load(ENTITY, id);
}
@Override
public UUID create(KObject kObject) {
KObject staff = AminoContextHolder.getContext().getStaff();
if (null == kObject.getUuid(BaseConstants.ID)) {
kObject.set(BaseConstants.ID, UUID.randomUUID());
}
kObject.set(BaseConstants.CREATOR, staff);
kObject.set(BaseConstants.CREATE_TIME, new Date());
kObject.set(BaseConstants.DEL, false);
kObject.set("regionalCompany", getCurrentLoginRegionalCompany());
return ((UUID) template.save(kObject));
}
/**
* 获取当前登录的区域公司
* @return
*/
public KObject getCurrentLoginRegionalCompany() {
Map<String, String> map = bapContext.getCurrentUserDatas();
String currentRegionalCompany = map.get("currentRegionalCompany");
if(StringUtils.isNotBlank(currentRegionalCompany)){
JSONObject obj = new JSONObject(currentRegionalCompany);
return dinasOrganizationService.load(UUID.fromString(obj.getString("id")));
}
return null;
}
@Override
public Page<KObject> listCoefficientOrPriceInfoPaging(Page<KObject> page, int type, List<UUID> regionalCompanyIds) {
KClass bean = Amino.getStaticMetadataContext().getBean(CoefficientOrPriceConstant.ENTITY, KClass.class);
DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
detachedCriteria.add(Restrictions.eq(BaseConstants.DEL, false));
//类型查询 运船 还是 车辆
detachedCriteria.add(Restrictions.eq("type", type));
//区域公司
if(!CollectionUtils.isEmpty(regionalCompanyIds)){
detachedCriteria.add(Restrictions.in("regionalCompany.id", regionalCompanyIds));
}
detachedCriteria.addOrder(Order.desc(BaseConstants.CREATE_TIME));
int offset = page.getPageSize() * (page.getPageNo() - 1);
List<KObject> list = (List<KObject>) template.findByCriteria(detachedCriteria, offset, page.getPageSize());
Long totalCount = (Long) detachedCriteria.setProjection(Projections.rowCount()).getExecutableCriteria(template.getSessionFactory().getCurrentSession()).setFirstResult(0).setMaxResults(1).uniqueResult();
page.setTotal(Math.toIntExact(totalCount));
page.setDatas(list);
return page;
}
@Override
public void modify(KObject kobject) {
KObject id = load(kobject.getUuid("id"));
kobject.set(BaseConstants.CREATOR, id.get(BaseConstants.CREATOR));
kobject.set(BaseConstants.CREATE_TIME, id.getDate(BaseConstants.CREATE_TIME));
KObject staff = AminoContextHolder.getContext().getStaff();
kobject.set(BaseConstants.MODIFY_TIME, new Date());
kobject.set(BaseConstants.MODIFIER, staff);
kobject.set(BaseConstants.DEL, false);
kobject.set("regionalCompany", getCurrentLoginRegionalCompany());
template.merge(kobject);
}
@Override
public Object priceInfo(Integer type, UUID stationId, UUID dinasTypeId) {
KClass bean = Amino.getStaticMetadataContext().getBean(CoefficientOrPriceConstant.ENTITY, KClass.class);
DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
KObject currentLoginRegionalCompany = getCurrentLoginRegionalCompany();
if (currentLoginRegionalCompany != null && currentLoginRegionalCompany. getString("type").equals(OrganizationTypeEnum.REGIONAL_COMPANY.name())) {
detachedCriteria.add(Restrictions.eq("regionalCompany.id", currentLoginRegionalCompany.getUuid("id")));
}
detachedCriteria.add(Restrictions.eq(BaseConstants.DEL, false));
if (type != null) {
detachedCriteria.add(Restrictions.eq("type", type));
}
if (stationId != null) {
detachedCriteria.add(Restrictions.eq("station.id", stationId));
}
if (dinasTypeId != null) {
detachedCriteria.add(Restrictions.eq("dinasType.id", dinasTypeId));
}
List<KObject> queryList = (List<KObject>) template.findByCriteria(detachedCriteria);
if(queryList.size() > 0){
return queryList.get(0);
}
return null;
}
/**
* 抽象方法,需要实现类提供HibernateTemplate
*
* @return HibernateTemplate
*/
@Override
protected HibernateTemplate getHibernateTemplate() {
return template;
}
/**
* 抽象方法,需要实现类提供当前ModelName
*
* @return String
*/
@Override
protected String getModelName() {
return CoefficientOrPriceConstant.ENTITY;
}
}
package com.xyst.dinas.sales.internal.dao;
import com.beecode.amino.core.Amino;
import com.beecode.bap.attachment.common.Page;
import com.beecode.bap.staff.BapContext;
import com.beecode.bcp.core.context.AminoContextHolder;
import com.beecode.bcp.type.KClass;
import com.beecode.bcp.type.KObject;
import com.beecode.inz.basis.internal.dao.AbstractBaseDao;
import com.beecode.inz.common.BaseConstants;
import com.xyst.dinas.biz.service.DinasOrganizationService;
import com.xyst.dinas.sales.constant.VehicleAmountPartyConstant;
import com.xyst.dinas.sales.dao.VehicleAmountPartyDao;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.criterion.*;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.orm.hibernate5.HibernateTemplate;
import org.springframework.util.CollectionUtils;
import java.util.*;
/**
* @author yanheng
*/
public class VehicleAmountPartyDaoImpl extends AbstractBaseDao implements VehicleAmountPartyDao, VehicleAmountPartyConstant {
@Autowired
private HibernateTemplate template;
@Autowired
private DinasOrganizationService dinasOrganizationService;
@Autowired
private BapContext bapContext;
@Autowired
private VehicleAmountPartyDao vehicleAmountPartyDao;
@Override
public KObject load(UUID id) {
return (KObject) template.load(ENTITY, id);
}
@Override
public UUID create(KObject kObject) {
KObject staff = AminoContextHolder.getContext().getStaff();
if (null == kObject.getUuid(BaseConstants.ID)) {
kObject.set(BaseConstants.ID, UUID.randomUUID());
}
kObject.set(BaseConstants.CREATOR, staff);
kObject.set(BaseConstants.CREATE_TIME, new Date());
kObject.set(BaseConstants.DEL, false);
kObject.set("regionalCompany", getCurrentLoginRegionalCompany());
return ((UUID) template.save(kObject));
}
/**
* 获取当前登录的区域公司
* @return
*/
public KObject getCurrentLoginRegionalCompany() {
Map<String, String> map = bapContext.getCurrentUserDatas();
String currentRegionalCompany = map.get("currentRegionalCompany");
if(StringUtils.isNotBlank(currentRegionalCompany)){
JSONObject obj = new JSONObject(currentRegionalCompany);
return dinasOrganizationService.load(UUID.fromString(obj.getString("id")));
}
return null;
}
@Override
public Page<KObject> listVehicleAmountPartygInfoPaging(Page<KObject> page, UUID purchaseSandUnitId, List<UUID> regionalCompanyIds) {
KClass bean = Amino.getStaticMetadataContext().getBean(VehicleAmountPartyConstant.ENTITY, KClass.class);
DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
ArrayList<Criterion> criteria = new ArrayList<>();
Conjunction dis = Restrictions.conjunction();
//参数赋值
criteria.add(Restrictions.eq("del", false));
if (null != purchaseSandUnitId) {
criteria.add(Restrictions.eq("purchaseSandUnit.id", purchaseSandUnitId));
}
//区域公司
if(!CollectionUtils.isEmpty(regionalCompanyIds)){
detachedCriteria.add(Restrictions.in("regionalCompany.id", regionalCompanyIds));
}
for (Criterion criterion : criteria) {
dis.add(criterion);
}
detachedCriteria.add(Restrictions.and(dis));
detachedCriteria.addOrder(Order.desc("createTime"));
int offset = page.getPageSize() * (page.getPageNo() - 1);
page.setTotal(template.findByCriteria(detachedCriteria).size());
List<KObject> list = (List<KObject>) template.findByCriteria(detachedCriteria, offset, page.getPageSize());
page.setDatas(list);
return page;
}
@Override
public void deleteById(UUID id) {
KObject staff = AminoContextHolder.getContext().getStaff();
KObject kobject = (KObject) template.load(ENTITY, id);
kobject.set(BaseConstants.MODIFY_TIME, new Date());
kobject.set(BaseConstants.MODIFIER, staff);
kobject.set(BaseConstants.DEL, true);
template.update(kobject);
}
/**
* 抽象方法,需要实现类提供HibernateTemplate
*
* @return HibernateTemplate
*/
@Override
protected HibernateTemplate getHibernateTemplate() {
return template;
}
/**
* 抽象方法,需要实现类提供当前ModelName
*
* @return String
*/
@Override
protected String getModelName() {
return VehicleAmountPartyConstant.ENTITY;
}
}
package com.xyst.dinas.sales.internal.service;
import com.beecode.amino.core.Amino;
import com.beecode.bap.attachment.common.Page;
import com.beecode.bcp.type.KClass;
import com.beecode.bcp.type.KObject;
import com.beecode.bcp.type.json.JSONObjectUtils;
import com.fasterxml.jackson.databind.JsonNode;
import com.xyst.dinas.biz.dao.DinasTypeDao;
import com.xyst.dinas.biz.dao.StationDao;
import com.xyst.dinas.sales.constant.CoefficientOrPriceConstant;
import com.xyst.dinas.sales.dao.CoefficientOrPriceDao;
import com.xyst.dinas.sales.service.CoefficientOrPriceService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import java.math.BigDecimal;
import java.util.List;
import java.util.UUID;
@Transactional(rollbackFor = Exception.class)
public class CoefficientOrPriceServiceImpl implements CoefficientOrPriceService {
@Autowired
private CoefficientOrPriceDao coefficientOrPriceDao;
@Autowired
private StationDao stationDao;
@Autowired
private DinasTypeDao dinasTypeDao;
/**
* @return java.util.UUID
* 新建折方系数,单价
* @Author yanHeng
* @Date 2022/4/6 11:36
* @Param [kobject]
**/
@Override
@Transactional
public void addCoefficientOrPrice(JsonNode jsonNode) {
KObject insertKobject;
JsonNode coefficientOrPrices = jsonNode.withArray("coefficientOrPrices");
for (JsonNode coefficientOrPrice : coefficientOrPrices) {
insertKobject = JSONObjectUtils.toObject(coefficientOrPrice, Amino.getStaticMetadataContext().getBean(CoefficientOrPriceConstant.ENTITY, KClass.class));
//场站信息
if (null != coefficientOrPrice.get("stationId")) {
insertKobject.set("station", stationDao.load(coefficientOrPrice.get("stationId").textValue()));
}
//砂石
if (null != coefficientOrPrice.get("dinasTypeId")) {
insertKobject.set("dinasType", dinasTypeDao.load(coefficientOrPrice.get("dinasTypeId").textValue()));
}
//折方系数
if (null != coefficientOrPrice.get("coefficientOf")) {
insertKobject.set("coefficientOf", new BigDecimal(coefficientOrPrice.get("coefficientOf").doubleValue()));
}
//价格
if (null != coefficientOrPrice.get("price")) {
insertKobject.set("price", new BigDecimal(coefficientOrPrice.get("price").doubleValue()));
}
//类型必传
if (null != coefficientOrPrice.get("type")) {
insertKobject.set("type", coefficientOrPrice.get("type").intValue());
}
//判断是否是添加还是修改
if (null == insertKobject.getUuid("id")) {
UUID uuid = coefficientOrPriceDao.create(insertKobject);
} else {
coefficientOrPriceDao.modify(insertKobject);
}
}
}
@Override
public Page<KObject> queryByPaging(Page<KObject> page, int type, List<UUID> regionalCompanyIds) throws Exception {
if (page.getPageNo() == 0 || page.getPageSize() == 0) {
throw new Exception("pageSize or offset is null");
}
return coefficientOrPriceDao.listCoefficientOrPriceInfoPaging(page, type,regionalCompanyIds);
}
@Override
public void updateCoefficientOrPrice(JsonNode jsonNode) {
KObject updateKobject;
JsonNode coefficientOrPrices = jsonNode.withArray("coefficientOrPrices");
for (JsonNode coefficientOrPrice : coefficientOrPrices) {
updateKobject = JSONObjectUtils.toObject(coefficientOrPrice, Amino.getStaticMetadataContext().getBean(CoefficientOrPriceConstant.ENTITY, KClass.class));
//场站信息
if (!StringUtils.isEmpty(coefficientOrPrice.get("stationId").textValue())) {
updateKobject.set("station", stationDao.load(coefficientOrPrice.get("stationId").textValue()));
}
//砂石
if (!StringUtils.isEmpty(coefficientOrPrice.get("dinasTypeId").textValue())) {
updateKobject.set("dinasType", dinasTypeDao.load(coefficientOrPrice.get("dinasTypeId").textValue()));
}
//折方系数
if (null != coefficientOrPrice.get("coefficientOf")) {
updateKobject.set("coefficientOf", new BigDecimal(coefficientOrPrice.get("coefficientOf").doubleValue()));
}
//价格
if (null != coefficientOrPrice.get("price")) {
updateKobject.set("price", new BigDecimal(coefficientOrPrice.get("price").doubleValue()));
}
//类型必传
if (null != coefficientOrPrice.get("type")) {
updateKobject.set("type", coefficientOrPrice.get("type").intValue());
}
coefficientOrPriceDao.modify(updateKobject);
}
}
@Override
public Object priceInfo(Integer type, UUID stationId, UUID dinasTypeId) {
return coefficientOrPriceDao.priceInfo(type,stationId,dinasTypeId);
}
}
package com.xyst.dinas.sales.internal.service;
import com.beecode.bap.attachment.common.Page;
import com.beecode.bcp.type.KObject;
import com.beecode.inz.basis.team.pojo.ResponseObj;
import com.beecode.inz.common.exception.BusinessException;
import com.xyst.dinas.biz.dao.DinasTypeDao;
import com.xyst.dinas.biz.dao.StationDao;
import com.xyst.dinas.contract.internal.dao.ContractDao;
import com.xyst.dinas.contract.service.ContractService;
import com.xyst.dinas.project.dao.ProjectFiledDao;
import com.xyst.dinas.project.dao.PurchaseSandCompanyDao;
import com.xyst.dinas.sales.dao.VehicleAmountPartyDao;
import com.xyst.dinas.sales.enumeration.VehicleAmountPartyErrorCodeEnum;
import com.xyst.dinas.sales.service.VehicleAmountPartyService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.List;
import java.util.UUID;
@Transactional(rollbackFor = Exception.class)
public class VehicleAmountPartyServiceImpl implements VehicleAmountPartyService {
@Autowired
private VehicleAmountPartyDao vehicleAmountPartyDao;
@Autowired
private StationDao stationDao;
@Autowired
private DinasTypeDao dinasTypeDao;
@Autowired
private PurchaseSandCompanyDao purchaseSandCompanyDao;
@Autowired
private ProjectFiledDao projectFiledDao;
@Autowired
private ContractDao contractDao;
@Autowired
ContractService contractService;
/**
* @Author yanHeng
* @Date 2022/4/6 11:36
* @Param [kobject]
* @return java.util.UUID
* 新建车辆量方信息
**/
@Override
@Transactional(rollbackFor = Exception.class)
public UUID addVehicleAmountParty(KObject kObject)throws BusinessException {
//添加车辆量方信息
//场站信息
UUID stationId = kObject.get("station").getUuid("id");
UUID projectId = kObject.get("project").getUuid("id");
UUID purchaseSandUnitId = kObject.get("purchaseSandUnit").getUuid("id");
UUID contractId = kObject.get("contract").getUuid("id");
UUID dinasTypeId = kObject.get("dinasType").getUuid("id");
KObject contract = contractDao.load(contractId);
kObject.set("station", stationDao.load(stationId));
kObject.set("contract", contract);
kObject.set("project", projectFiledDao.load(projectId));
kObject.set("purchaseSandUnit", purchaseSandCompanyDao.load(purchaseSandUnitId));
kObject.set("dinasType", dinasTypeDao.load(dinasTypeId));
UUID uuid = vehicleAmountPartyDao.create(kObject);
//扣减预付款余额 ,取得总价 进行扣减
//查询合同余额,如果预付款小于总价,不允许交易
BigDecimal amount ;
KObject contractObject = contractService.queryContract(contractId);
BigDecimal advanceBalance = contractObject.getBigDecimal("advanceBalance");
if (advanceBalance == null || advanceBalance.compareTo(new BigDecimal(kObject.getString("amount"))) == -1) {
throw new BusinessException("预付款余额不足,请先联系客户进行充值操作",VehicleAmountPartyErrorCodeEnum.VEHICLE_AMOUNT_ADVANCE_BALANCE_INSUFFICIENT);
}
//进行扣减操作 传入当前合同 和 扣减总价,
// 更新合同子表合同砂石余量(吨)-更新合同表付款余额、销售总量信息
amount = BigDecimal.ZERO.subtract(new BigDecimal(kObject.getString("amount")));
Boolean flag = contractService.modifyInventory(contractId,
dinasTypeId, BigDecimal.ZERO, amount);
if(!flag){
throw new BusinessException("预付款余额扣减失败",VehicleAmountPartyErrorCodeEnum.VEHICLE_AMOUNT_PARTY_ADVANCE_BALANCE);
}
return uuid;
}
@Override
public Page<KObject> queryByPaging(Page<KObject> page, UUID purchaseSandUnitId, List<UUID> regionalCompanyIds) throws Exception {
if (page.getPageNo() == 0 || page.getPageSize() == 0) {
throw new Exception("pageSize or offset is null");
}
return vehicleAmountPartyDao.listVehicleAmountPartygInfoPaging(page, purchaseSandUnitId,regionalCompanyIds);
}
@Override
public KObject getById(UUID id) {
return vehicleAmountPartyDao.load(id);
}
@Override
@Transactional(rollbackFor = Exception.class)
public ResponseObj deleteById(UUID id) {
BigDecimal amount ;
//逻辑删除 反还合同的预付款金额= 车辆量方总价
KObject vehicleAmountParty = vehicleAmountPartyDao.load(id);
//获取车辆量方总价
amount = BigDecimal.ZERO.add(new BigDecimal(vehicleAmountParty.getString("amount")));
UUID contractId = vehicleAmountParty.get("contract").getUuid("id");
UUID dinasTypeId = vehicleAmountParty.get("dinasType").getUuid("id");
Boolean flag = contractService.modifyInventory(contractId,
dinasTypeId, BigDecimal.ZERO, amount);
if(!flag){
return ResponseObj.error(400,"预付款余额反还异常");
}else{
vehicleAmountPartyDao.deleteById(id);
}
return ResponseObj.success("删除成功");
}
}
package com.xyst.dinas.sales.service;
import com.beecode.bap.attachment.common.Page;
import com.beecode.bcp.type.KObject;
import com.fasterxml.jackson.databind.JsonNode;
import java.util.List;
import java.util.UUID;
public interface CoefficientOrPriceService {
//新增折方系数,单价
void addCoefficientOrPrice(JsonNode jsonNode);
//查询折方
Page<KObject> queryByPaging(Page<KObject> objectPage, int type, List<UUID> regionalCompanyIds)throws Exception;
//修改
void updateCoefficientOrPrice(JsonNode jsonNode);
//查询价格/系数
Object priceInfo(Integer type, UUID stationId, UUID dinasTypeId);
}
package com.xyst.dinas.sales.service;
import com.beecode.bap.attachment.common.Page;
import com.beecode.bcp.type.KObject;
import com.beecode.inz.basis.team.pojo.ResponseObj;
import java.util.List;
import java.util.UUID;
public interface VehicleAmountPartyService {
UUID addVehicleAmountParty(KObject kobject) throws Exception;
Object queryByPaging(Page<KObject> objectPage, UUID purchaseSandUnitId, List<UUID> regionalCompanyIds) throws Exception ;
KObject getById(UUID id);
ResponseObj deleteById(UUID id);
}
package com.xyst.dinas.sales.web;
import com.beecode.bap.attachment.common.Page;
import com.beecode.bcp.type.KObject;
import com.beecode.bcp.type.json.JSONObjectUtils;
import com.beecode.inz.basis.team.pojo.ResponseObj;
import com.fasterxml.jackson.databind.JsonNode;
import com.xyst.dinas.sales.service.CoefficientOrPriceService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.UUID;
@RestController
@RequestMapping(value="/sales/coefficient")
public class CoefficientOrPriceController {
private static final Logger logger = LoggerFactory.getLogger(CoefficientOrPriceController.class);
@Autowired
private CoefficientOrPriceService coefficientOrPriceService;
/**
* 新建折方系数
* @param body
* @return ResponseObj
*/
@PostMapping("/addCoefficientOrPrice")
public ResponseObj create(@RequestBody String body){
JsonNode jsonNode = JSONObjectUtils.toJson(body);
coefficientOrPriceService.addCoefficientOrPrice(jsonNode);
return ResponseObj.success("保存成功");
}
/**
* 修改折方系数
* @param body
* @return ResponseObj
*/
@PostMapping("/updateCoefficientOrPrice")
public ResponseObj update(@RequestBody String body){
JsonNode jsonNode = JSONObjectUtils.toJson(body);
coefficientOrPriceService.updateCoefficientOrPrice(jsonNode);
return ResponseObj.success("修改成功");
}
/**
* @Author yanHeng
* @Date 2022/4/7 10:02
* @Param [pageNo, pageSize, type]
* @return com.beecode.inz.basis.team.pojo.ResponseObj
* 查询折方系数,后续会对接运船折方单价
**/
@RequestMapping(value = "/list/page", method = RequestMethod.GET)
public ResponseObj getListPage(
@RequestParam(name = "pageNo") Integer pageNo,
@RequestParam(name = "pageSize") Integer pageSize,
@RequestParam(name = "type", required = true) int type,
@RequestParam(name = "regionalCompanyIds",required = false) List<UUID> regionalCompanyIds
) throws Exception {
Page<KObject> objectPage = new Page<>();
objectPage.setPageNo(pageNo);
objectPage.setPageSize(pageSize);
return ResponseObj.success("查询成功", coefficientOrPriceService.queryByPaging(objectPage, type, regionalCompanyIds));
}
@RequestMapping(value = "list/priceInfo", method = RequestMethod.GET)
public ResponseObj groupInfo(
@RequestParam(name = "type", required = false) Integer type,
@RequestParam(name = "stationId", required = false) UUID stationId,
@RequestParam(name = "dinasTypeId", required = false)UUID dinasTypeId
) throws Exception {
return ResponseObj.success("查询成功", coefficientOrPriceService.priceInfo(type,stationId,dinasTypeId));
}
@GetMapping("/test")
public ResponseObj init(@RequestParam("id") String id){
System.out.println("testok");
return ResponseObj.success("查询成功", id);
}
}
\ No newline at end of file
package com.xyst.dinas.sales.web;
import com.beecode.amino.core.Amino;
import com.beecode.bap.attachment.common.Page;
import com.beecode.bcp.type.KClass;
import com.beecode.bcp.type.KObject;
import com.beecode.bcp.type.json.JSONObjectUtils;
import com.beecode.inz.basis.team.pojo.ResponseObj;
import com.beecode.inz.common.BaseConstants;
import com.beecode.nlib.utils.StringUtils;
import com.xyst.dinas.sales.constant.VehicleAmountPartyConstant;
import com.xyst.dinas.sales.service.VehicleAmountPartyService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartException;
import java.math.BigDecimal;
import java.util.List;
import java.util.UUID;
@RestController()
@RequestMapping(value = "/sales/vehicle")
public class VehicleAmountPartyController {
private static final Logger logger = LoggerFactory.getLogger(VehicleAmountPartyController.class);
@Autowired
private VehicleAmountPartyService vehicleAmountPartyService;
/**
* 新建车辆量方
*
* @param body
* @return ResponseObj
*/
@PostMapping("/addVehicleAmountParty")
public ResponseObj create(@RequestBody String body) throws Exception {
KObject kobject = JSONObjectUtils.toObject(body, Amino.getApplicationMetadataContext().getBean(VehicleAmountPartyConstant.ENTITY, KClass.class));
//判空校验
if (null == kobject.get("station").get("id")) {
return ResponseObj.error(400, "请选择具体的场站");
}
if (null == kobject.get("project").get("id")) {
return ResponseObj.error(400, "请选择具体的项目");
}
if (null == kobject.get("purchaseSandUnit").get("id")) {
return ResponseObj.error(400, "请选择具体的购砂单位");
}
if (null == kobject.get("contract").get("id")) {
return ResponseObj.error(400, "请选择具体的合同");
}
if (null == kobject.get("dinasType").get("id")) {
return ResponseObj.error(400, "请选择具体的砂石类型");
}
if (StringUtils.isEmpty(kobject.getString("shipCodeName"))) {
return ResponseObj.error(400, "车牌号不能为空");
}
if (null == kobject.get("dealTime")) {
return ResponseObj.error(400, "销售时间不能为空");
}
if (null == kobject.getString("advanceBalance")) {
return ResponseObj.error(400, "预付款余额不能为空");
}
if (null == kobject.getString("longLength")) {
return ResponseObj.error(400, "长度不能为空");
}
if (null == kobject.getString("wideLength")) {
return ResponseObj.error(400, "宽度不能为空");
}
if (null == kobject.getString("highLength")) {
return ResponseObj.error(400, "高度不能为空");
}
if (null == kobject.getString("coefficientOf")) {
return ResponseObj.error(400, "折方系数不能为空");
}
if (null == kobject.getString("calculateTotalAmount")) {
return ResponseObj.error(400, "计量吨位不能为空");
}
if (null == kobject.getString("price")) {
return ResponseObj.error(400, "单价不能为空");
}
if (null == kobject.getString("amount")) {
return ResponseObj.error(400, "总价不能为空");
}
BigDecimal advanceBalance = new BigDecimal(kobject.getString("advanceBalance"));
BigDecimal amount = new BigDecimal(kobject.getString("amount"));
if(advanceBalance.compareTo(amount) == -1){
return ResponseObj.error(400, "预付款余额不足,请先联系客户进行充值操作");
}
if (kobject.getUuid(BaseConstants.ID) == null) {
return ResponseObj.error(400, "'id' must be not null!");
}
UUID id = vehicleAmountPartyService.addVehicleAmountParty(kobject);
return ResponseObj.success("保存成功", id);
}
/**
* @return com.beecode.inz.basis.team.pojo.ResponseObj
* 车辆量方列表查询
* @Author yanHeng
* @Date 2022/4/6 17:29
* @Param [pageNo, pageSize, purchaseSandUnitId]
**/
@RequestMapping(value = "list/page", method = RequestMethod.GET)
public ResponseObj getListPage(
@RequestParam(name = "pageNo") Integer pageNo,
@RequestParam(name = "pageSize") Integer pageSize,
@RequestParam(name = "purchaseSandUnit", required = false) UUID purchaseSandUnitId,
@RequestParam(name = "regionalCompanyIds",required = false) List<UUID> regionalCompanyIds
) throws Exception {
Page<KObject> objectPage = new Page<>();
objectPage.setPageNo(pageNo);
objectPage.setPageSize(pageSize);
return ResponseObj.success("查询成功", vehicleAmountPartyService.queryByPaging(objectPage, purchaseSandUnitId,regionalCompanyIds));
}
/**
* 根据id获取车辆量方数据
*
* @param id
* @return
*/
@GetMapping("/{id}")
public ResponseObj getById(@PathVariable("id") UUID id) {
if (id == null) {
return ResponseObj.error(400, "'id' must be not null!");
}
KObject discharging = vehicleAmountPartyService.getById(id);
return ResponseObj.success("获取成功", discharging);
}
/**
* 根据Id删除车辆量方
* @param id
* @return
*/
@DeleteMapping("/{id}")
public ResponseObj deleteById(@PathVariable("id") UUID id) throws MultipartException{
if(id == null){
return ResponseObj.error(400,"'id' must be not null!");
}
return vehicleAmountPartyService.deleteById(id);
}
@GetMapping("/test")
public ResponseObj init(@RequestParam("id") String id) {
System.out.println("testok");
return ResponseObj.success("查询成功", id);
}
}
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package>
<name>VehicleAmountPartyCard</name>
<title>卡片查看</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='811a31a1-d769-4598-8164-e45f28a829e0' category='销售/车辆量方(区域公司)' seq='3'></privilege>
</content>
</model>
\ No newline at end of file
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package>
<name>VehicleAmountPartyCreate</name>
<title>新建</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='e7e19316-d0ca-4da3-b028-6fcf87866ee8' category='销售/车辆量方(区域公司)' seq='2'></privilege>
</content>
</model>
\ No newline at end of file
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package>
<name>VehicleAmountPartyDelete</name>
<title>删除</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='c3f897f6-3b36-4743-a330-34c2211a89ec' category='销售/车辆量方(区域公司)' seq='4'></privilege>
</content>
</model>
\ No newline at end of file
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package>
<name>VehicleAmountPartyList</name>
<title>列表</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='a2e36510-49d1-41ed-b8c4-04c493812135' category='销售/车辆量方(区域公司)' seq='1'></privilege>
</content>
</model>
\ No newline at end of file
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package>
<name>VehicleAmountPartySetting</name>
<title>折方系数配置</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='87dd5f76-46b4-41e8-827b-714dd476c665' category='销售/车辆量方(区域公司)' seq='0'></privilege>
</content>
</model>
\ No newline at end of file
<model>
<header>
<type>bcp.biz.Bill</type>
<package>com.xyst.dinas.sales.bill</package>
<title>折方系数</title>
<name>CoefficientOrPrice</name>
<description>折方系数</description>
</header>
<content>
<bill>
<data>
{
"baseData": {
"name": "CoefficientOrPrice",
"title": "折方系数",
"billModel": "com.beecode.bap.biztrait.BasicBillBiztrait",
"functionLibrarys": [],
"description": "折方系数",
"dataModel": "com.xyst.dinas.sales.datamodel.CoefficientOrPrice"
},
"serial": {
"serialData": [
{
"segment": "literal",
"segmentData": "DG"
},
{
"segment": "sequence",
"segmentData": {
"start-with": 0,
"increment": 1,
"min": 0,
"max": 99999,
"length": 5,
"cycle": true,
"cut-direction": "left",
"pad-string": "0",
"pad-direction": "left",
"cache-size": 10
}
}
],
"buildTime": "add"
},
"formula": [],
"workflow": {
"workflow": "",
"processParamConfig": []
},
"print": [],
"authority": []
} </data>
</bill>
</content>
</model>
\ No newline at end of file
<model>
<header>
<type>bcp.biz.Bill</type>
<package>com.xyst.dinas.sales.bill</package>
<title>车辆量方</title>
<name>VehicleAmountParty</name>
<description>车辆量方</description>
</header>
<content>
<bill>
<data>
{
"baseData": {
"name": "VehicleAmountParty",
"title": "车辆量方",
"billModel": "com.beecode.bap.biztrait.BasicBillBiztrait",
"functionLibrarys": [],
"description": "车辆量方",
"dataModel": "com.xyst.dinas.sales.datamodel.VehicleAmountParty"
},
"serial": {
"serialData": [
{
"segment": "literal",
"segmentData": "DG"
},
{
"segment": "sequence",
"segmentData": {
"start-with": 0,
"increment": 1,
"min": 0,
"max": 99999,
"length": 5,
"cycle": true,
"cut-direction": "left",
"pad-string": "0",
"pad-direction": "left",
"cache-size": 10
}
}
],
"buildTime": "add"
},
"formula": [],
"workflow": {
"workflow": "",
"processParamConfig": []
},
"print": [],
"authority": []
} </data>
</bill>
</content>
</model>
\ No newline at end of file
<model>
<header>
<type>bcp.type.DataModel</type>
<package>com.xyst.dinas.sales.datamodel</package>
<title>折方</title>
<name>CoefficientOrPrice</name>
<tags></tags>
<description>折方</description>
<templateName>mk.ide.ui.editor.data.model.template.bill</templateName>
<tablePrefix>xyst_dinas_</tablePrefix>
</header>
<content>
<dataModel id='6141c2be-4e16-4c9f-9cad-b1a7628bac38' multiVersion='' domainInherit='undefined' tableName='xyst_dinas_sales_coefficient_or_price'>
<parent>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</parent>
<parent>com.beecode.inz.common.datamodel.BaseInfo</parent>
<attribute id='e6371bbe-2853-44b4-b607-619f3fa129e4' name='regionalCompany' columnName='regional_company_id' title='区域公司' type='com.xyst.dinas.biz.datamodel.xystOrganization' default='' precision='' isArray='false'>
<annotation id='ba08abd5-99e2-4bc4-ae22-f77e36fcc563' attributeId='b0a6535b-53f8-4bfa-ab34-3843a68ecde1' name='length' value='undefined'></annotation>
<annotation id='af55a274-ede3-4b4d-a3b2-fe749ad0750b' attributeId='13c0e87f-c418-448b-81a1-620dd17c7344' name='mappingType' value='many-to-one'></annotation>
</attribute>
<attribute id='c019806a-98ad-4249-a7dc-ab9a2f84d37e' name='dinasType' columnName='dinas_type_id' title='砂石类型' type='com.xyst.dinas.biz.datamodel.DinasType' default='' precision='' isArray='false'>
<annotation id='9a391235-e516-408b-aeb1-5d52e01a8509' attributeId='490642d0-ad36-4c7a-b3cc-388c8c9b7089' name='length' value='undefined'>
</annotation>
<annotation id='1846bfd1-0586-47e5-942a-c09c09cb4d94' attributeId='89a30680-32e5-462f-a5fd-c84c62906ff8' name='mappingType' value='many-to-one'>
</annotation>
</attribute>
<attribute id='39fdaa5d-19ab-4867-bb7d-7c45bdc6201d' name='station' columnName='station_id' title='所属场站' type='com.xyst.dinas.contract.datamodel.Contract' default='' precision='' isArray='false'>
<annotation id='94463797-ea22-4ec0-a991-5db7ba63353b' attributeId='78c31d46-61aa-4d19-ace2-9c71dd44c280' name='length' value='undefined'>
</annotation>
<annotation id='01b8b78d-d896-4d80-8cf4-a5d733ee024c' attributeId='2b05a356-c99a-4000-851d-43a2bf3e18b3' name='mappingType' value='many-to-one'>
</annotation>
</attribute>
<attribute id='e87a14b2-a9e8-4605-83fa-d78527ad5916' name='coefficientOf' columnName='coefficient_of' title='折方系数' type='fixnum' default='' precision='' isArray='false'>
<annotation i2d='91c11048-0cae-4451-9845-261f8a2a29fa' attributeId='a9843512-3b2f-41de-95e1-d0ce035f6945' name='length' value='100'></annotation>
<annotation id='92589400-8916-4a68-ae9a-1f8d6a08ec07' attributeId='f31953e5-b964-4244-8342-3ae59335cb88' name='precision' value='12'></annotation>
<annotation id='d1b9f5a4-512a-4be3-9340-8163196520ac' attributeId='d3b8d981-be30-4705-b823-f14b8fe78607' name='scale' value='3'></annotation>
</attribute>
<attribute id='c752216e-4b8f-477b-9dff-c4dd02f02d59' name='price' columnName='price' title='单价' type='fixnum' default='' precision='' isArray='false'>
<annotation i2d='46e857f5-c700-4e1c-ba87-e11a7e7c1c2c' attributeId='90f94f0d-385f-41e8-8fa1-b9d2b13f6a69' name='length' value='100'></annotation>
<annotation id='9ee60ef6-7ba2-4875-8c8f-d7a0063a364f' attributeId='06cb04fa-edec-41a0-96d7-45f725404b90' name='precision' value='12'></annotation>
<annotation id='e9827f66-4ac2-4379-9d8a-ae667b4774ed' attributeId='03ec17b0-bb72-432c-90eb-8a52b329096a' name='scale' value='2'></annotation>
</attribute>
<attribute id='d85d1bd7-2dda-4d37-a901-c4e5cd76d1fb' name='type' columnName='type' title='类型: 0车辆系数 1:运船系数 2:运船单价' type='int' default='' precision='' isArray='false'>
<annotation id='51f41497-322f-448b-8443-6bdd72961152' attributeId='c74247b6-a0e9-41af-86e1-1bcc31082147' name='length' value='1'>
</annotation>
</attribute>
<hibernate>/xyst.dinas.sales/src/main/resources/config/CoefficientOrPrice.hbm.xml</hibernate>
</dataModel>
</content>
</model>
<model>
<header>
<type>bcp.type.DataModel</type>
<package>com.xyst.dinas.sales.datamodel</package>
<title>车辆量方</title>
<tags></tags>
<name>VehicleAmountParty</name>
<description>车辆量方</description>
<templateName>mk.ide.ui.editor.data.model.template.bill</templateName>
<tablePrefix>xyst_dinas_</tablePrefix>
</header>
<content>
<dataModel id='d301fda1-0df0-49d4-a7fb-fc0a703eb855' multiVersion='' domainInherit='undefined' tableName='xyst_dinas_vehicle_amount_party'>
<parent>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</parent>
<parent>com.beecode.inz.common.datamodel.BaseInfo</parent>
<attribute id='b3c4e11e-7736-4858-9fe8-25e78a1443c2' name='regionalCompany' columnName='regional_company_id' title='区域公司' type='com.xyst.dinas.biz.datamodel.xystOrganization' default='' precision='' isArray='false'>
<annotation id='56008364-f446-4f06-b744-2c5928ffbf15' attributeId='6d31d3ba-fa63-441d-9985-d3dfb883ec6a' name='length' value='undefined'></annotation>
<annotation id='768f5e48-e6c3-4002-98fb-615f45521d6b' attributeId='23b736ff-a17c-495f-b582-7596e3429396' name='mappingType' value='many-to-one'></annotation>
</attribute>
<attribute id='9cc6473c-5ca3-42d2-a619-34c44cb0ee4f' name='purchaseSandUnit' columnName='purchase_sand_unit_id' title='购砂单位' type='com.xyst.dinas.project.datamodel.PurchaseSandCompany' default='' precision='' isArray='false'>
<annotation id='0b8a347b-f803-420f-95aa-1350f27fdcc8' attributeId='8da2c4c8-4dc3-4ed7-9630-2f3736bf766c' name='length' value='undefined'>
</annotation>
<annotation id='2b3e7094-34e2-4617-b40c-76f1d05237bf' attributeId='80a82ca3-e258-4041-9155-ebd8ecc8ed13' name='mappingType' value='many-to-one'>
</annotation>
</attribute>
<attribute id='a2b156fa-5c37-4533-9959-d7132bd6901e' name='contract' columnName='contract_id' title='所属合同' type='com.xyst.dinas.contract.datamodel.Contract' default='' precision='' isArray='false'>
<annotation id='3453abfd-32bb-49bd-853b-95ebc6358a62' attributeId='1ec0d01f-b5be-4dd4-97aa-ffaa75af7b84' name='length' value='undefined'>
</annotation>
<annotation id='fdd0adfa-fbd1-4db1-8bb5-e9ad5dd370b9' attributeId='d1e5e6bf-e917-4fec-9f46-d70a804fc668' name='mappingType' value='many-to-one'>
</annotation>
</attribute>
<attribute id='fba07ae9-1cc2-4699-a69a-bfda8e9cfa72' name='project' columnName='project_id' title='所属项目' type='com.xyst.dinas.project.datamodel.ProjectFiled' default='' precision='' isArray='false'>
<annotation id='cf61b302-ed9a-42c3-948a-523d539b47f8' attributeId='4b150b61-2913-46d4-80d9-1e53762875f6' name='length' value='undefined'></annotation>
<annotation id='ff2e13f6-04e3-48df-97bb-9263fcdc1f27' attributeId='964865d4-fcc4-46e6-8a77-a97eddac91ef' name='mappingType' value='many-to-one'></annotation>
</attribute>
<attribute id='4cb9757e-4714-4ffb-a455-054867845e08' name='station' columnName='station_id' title='场站' type='com.xyst.dinas.biz.datamodel.Station' default='' precision='' isArray='false'>
<annotation id='4ad4f548-dd40-49be-9a81-4d1dfdeaa24b' attributeId='b1c053e3-4745-46fb-b17b-86b6a35c54c8' name='length' value='undefined'></annotation>
<annotation id='2b255720-ca83-4457-a5cf-be132f77418f' attributeId='4034d834-90a0-475d-a94a-b19ddecfce7a' name='mappingType' value='many-to-one'></annotation>
</attribute>
<attribute id='8671e4c4-43ce-4edf-8762-ab56856c39d0' name='dinasType' columnName='dinas_type_id' title='砂石类型' type='com.xyst.dinas.biz.datamodel.DinasType' default='' precision='' isArray='false'>
<annotation id='de5fc5f8-3d69-423e-8c81-a359e83cd043' attributeId='c0e95569-ff41-413a-9e89-f8885d80ed04' name='length' value='undefined'>
</annotation>
<annotation id='a3d61169-4631-430a-bff5-2fe389f476da' attributeId='d5d02405-0890-4bfc-b673-3b4caac9627b' name='mappingType' value='many-to-one'>
</annotation>
</attribute>
<attribute id='e4bb57ae-780a-468a-9875-f3ffdc06824c' name='shipCodeName' columnName='ship_code_name' title='车牌号' type='string' default='' precision='' isArray='false'>
<annotation id='7257d91e-ca93-4c54-85cb-416df13cefef' attributeId='db872d82-d838-4169-b0fd-689dda532c21' name='length' value='50'/>
</attribute>
<attribute id='7bac0c3b-7a48-4450-810c-f064ee4f8439' name='calculateTotalAmount' columnName='calculate_total_amount' title='计量吨位' type='fixnum' default='' precision='' isArray='false'>
<annotation i2d='5880ae73-aa24-4647-97b6-7bf8e12e6ab7' attributeId='aed81256-f2f9-4793-af12-356c1c0d4956' name='length' value='100'></annotation>
<annotation id='3d190cc3-23f8-4f65-82ad-8698527d7c58' attributeId='78b95466-e876-4c33-83b1-f32a06444221' name='precision' value='12'></annotation>
<annotation id='f842fd2b-9d93-4f71-abfb-6759a512901b' attributeId='bf0193cf-66f4-4077-a498-83ee3bff2096' name='scale' value='2'></annotation>
</attribute>
<attribute id='5eaa1f96-851b-4fd8-9f78-b2a0e2541b29' name='advanceBalance' columnName='advance_balance' title='预付款余额' type='fixnum' default='' precision='' isArray='false'>
<annotation i2d='9b464e39-4d77-4fc6-933b-2d58da8659f4' attributeId='57c1b2d3-e805-4e5e-a8eb-568d800800db' name='length' value='100'></annotation>
<annotation id='0230a7ce-d47e-4a56-8963-f1c312a5a8a9' attributeId='e0fc43f1-1d54-41f8-9260-cc01f26d640c' name='precision' value='12'></annotation>
<annotation id='0d6478bc-e942-405e-96e1-e040c00d8dbf' attributeId='ed018c28-9ddc-4b05-9d95-bc2abf1c0959' name='scale' value='2'></annotation>
</attribute>
<attribute id='7e0368d1-1f80-4131-aefb-b49c2e9d5b47' name='longLength' columnName='long_length' title='长' type='fixnum' default='' precision='' isArray='false'>
<annotation i2d='3c14c293-0cef-4f2d-9824-f86925fd8c4a' attributeId='0a620ce2-7b68-4c95-af86-751fb2e7de5a' name='length' value='100'></annotation>
<annotation id='85881042-36bc-4049-b800-48d99c1ad96c' attributeId='df098287-2b1e-43b0-920f-cfba08fd4f9f' name='precision' value='12'></annotation>
<annotation id='56616e94-f858-408f-90da-d600220efd75' attributeId='8f14ffe2-0168-4789-85c1-3e9fea9f2617' name='scale' value='3'></annotation>
</attribute>
<attribute id='238fb270-5492-4515-8679-7df49e003821' name='wideLength' columnName='wide_length' title='宽' type='fixnum' default='' precision='' isArray='false'>
<annotation i2d='879ad218-abd0-4a65-ad96-eea205e342e6' attributeId='4bfd7afc-6941-4350-a977-5732d5fff8ce' name='length' value='100'></annotation>
<annotation id='e1f01ce9-8097-4d6a-a1cc-04f3c5b4bb75' attributeId='7effe849-f010-4bae-8f3f-cfdf894d0dd8' name='precision' value='12'></annotation>
<annotation id='2fde1c98-da69-48bc-b2eb-45cfe3568d24' attributeId='5d659f64-0914-4df0-8d0f-94bc37fbce66' name='scale' value='3'></annotation>
</attribute>
<attribute id='2e087da3-4b38-458c-874b-417f90e7b1df' name='highLength' columnName='high_length' title='高' type='fixnum' default='' precision='' isArray='false'>
<annotation i2d='9e2b375a-bd73-44f1-a167-bbeee20ec98b' attributeId='afcdbc41-4bb5-4059-aadc-561b2e8c90c6' name='length' value='100'></annotation>
<annotation id='680406d4-2233-4677-a572-a59db4723560' attributeId='79080944-c84f-4082-a6c9-c312b7eb5ca2' name='precision' value='12'></annotation>
<annotation id='79628319-d46a-4354-ab3a-8132a5db45d2' attributeId='6fea2b14-7a5e-4bee-abd4-d3718d610b47' name='scale' value='3'></annotation>
</attribute>
<attribute id='91531edf-0ec4-4af4-a17e-769221d90d38' name='coefficientOf' columnName='coefficient_of' title='折方系数' type='fixnum' default='' precision='' isArray='false'>
<annotation i2d='6cefac6c-7c8d-4b70-a19a-f1359dc37c73' attributeId='d0607771-be64-4e22-add5-93aa277c9d1b' name='length' value='100'></annotation>
<annotation id='31fa5b54-8ba8-4972-8533-45fac8e3278e' attributeId='af813c66-a78c-4f8e-bbb2-dd6c80ce5605' name='precision' value='12'></annotation>
<annotation id='ea56c403-0cf0-4c0d-8af0-abbe43cedd13' attributeId='035cb9f9-097d-4887-8ebd-fe2f5c6b335d' name='scale' value='3'></annotation>
</attribute>
<attribute id='2bc72dc5-b7fa-43e9-9941-255a379e1c81' name='price' columnName='price' title='单价' type='fixnum' default='' precision='' isArray='false'>
<annotation i2d='11030427-b628-48b3-a902-a01df33050b8' attributeId='804544c2-bc41-4935-b1ff-15f72ccaaf72' name='length' value='100'></annotation>
<annotation id='0f010c3a-9769-4519-8823-f055000d24e3' attributeId='06cb04fa-edec-41a0-96d7-45f725404b90' name='precision' value='12'></annotation>
<annotation id='7bbb934b-054b-4645-9fff-724bb03a609a' attributeId='6ca1c8d2-fbc8-491f-bfab-2e6181f97074' name='scale' value='2'></annotation>
</attribute>
<attribute id='79f62a0b-4f25-4cd5-adbc-576a2f969e23' name='amount' columnName='amount' title='总价' type='fixnum' default='' precision='' isArray='false'>
<annotation i2d='b408097d-fa06-4923-9361-dc13d0d3df11' attributeId='d9cd9dc6-ad75-41f2-b090-7420cc492af2' name='length' value='100'></annotation>
<annotation id='3a7923dc-3989-4b60-81a8-fc6e44338fa6' attributeId='16999e5a-cff8-4e1c-bafb-76b756ceca28' name='precision' value='12'></annotation>
<annotation id='9af1f4cf-8883-41cc-bd79-6596418b7089' attributeId='8be64835-202b-40f6-ae84-dca27672a2dd' name='scale' value='2'></annotation>
</attribute>
<attribute id='00dcc22f-19b1-483e-bcba-2c040dd750f0' name='dealTime' columnName='deal_time' title='销售时间' type='datetime' default='' precision='' isArray='false'>
<annotation id='89cf8046-f839-4f7f-b72f-09e011b37ee5' attributeId='cac0f539-5a09-4edb-b75b-00cb414044f8' name='length' value='undefined'/>
</attribute>
<hibernate>/xyst.dinas.sales/src/main/resources/config/VehicleAmountParty.hbm.xml</hibernate>
</dataModel>
</content>
</model>
<model>
<header>
<type>inz.query.Query</type>
<package>com.xyst.dinas.sales.query</package>
<name>VehicleAmountParty</name>
<title>车辆量方</title>
<tags></tags>
<description></description>
</header>
<content>
<customQuery id='acc92bc7-b3ea-4b0b-ba8a-ef7ee30c1013'>
<kclass>com.xyst.dinas.sales.datamodel.VehicleAmountParty</kclass>
<dataProcessor>com.xyst.dinas.sales.processor.SalesPlanProcessor</dataProcessor>
<authorityItem></authorityItem>
<innerScene title='全部'>
<id>57963eb7-9955-4567-ac85-51a06aadd48f</id>
<javaImplement>com.beecode.inz.common.scene.CommonAllScene</javaImplement>
<defaultExecute></defaultExecute>
<hide></hide>
</innerScene>
<innerScene title='已废弃'>
<id>e6839c4a-fd1c-4139-bd82-f1a7f8d91f4b</id>
<javaImplement>com.beecode.inz.common.scene.DefaultDiscardScene</javaImplement>
<defaultExecute></defaultExecute>
<hide></hide>
</innerScene>
<innerScene title='权限过滤'>
<id>e77ab19a-107d-430d-a5df-d54046d189ca</id>
<javaImplement>com.xyst.dinas.biz.scene.XystDinasCommonAllScene</javaImplement>
<defaultExecute>true</defaultExecute>
<hide>true</hide>
</innerScene>
<field title='id'>
<name>id</name>
<type>uuid</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='区域公司id'>
<name>regionalCompany.id</name>
<type>uuid</type>
<ref>
<type></type>
<name>com.xyst.dinas.biz.datamodel.xystOrganization</name>
</ref>
<description></description>
</field>
<field title='区域公司'>
<name>regionalCompany.name</name>
<type>string</type>
<ref>
<type></type>
<name>com.xyst.dinas.biz.datamodel.xystOrganization</name>
</ref>
<description></description>
</field>
<field title='购砂单位'>
<name>purchaseSandUnit.id</name>
<type>uuid</type>
<ref>
<type></type>
<name>com.xyst.dinas.project.datamodel.PurchaseSandCompany</name>
</ref>
<description></description>
</field>
<field title='购砂单位名称'>
<name>purchaseSandUnit.name</name>
<type>string</type>
<ref>
<type></type>
<name>com.xyst.dinas.project.datamodel.PurchaseSandCompany</name>
</ref>
<description></description>
</field>
<field title='合同id'>
<name>contract.id</name>
<type>uuid</type>
<ref>
<type></type>
<name>com.xyst.dinas.contract.datamodel.Contract</name>
</ref>
<description></description>
</field>
<field title='合同名称'>
<name>contract.contractName</name>
<type>string</type>
<description></description>
</field>
<field title='合同编号'>
<name>contract.contractCode</name>
<type>string</type>
<description></description>
</field>
<field title='项目'>
<name>project.id</name>
<type>uuid</type>
<ref>
<type></type>
<name>com.xyst.dinas.project.datamodel.ProjectFiled</name>
</ref>
<description></description>
</field>
<field title='项目名称'>
<name>project.projectName</name>
<type>string</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='场站id'>
<name>station.id</name>
<type>uuid</type>
<ref>
<type></type>
<name>com.xyst.dinas.biz.datamodel.Station</name>
</ref>
<description></description>
</field>
<field title='场站'>
<name>station.stationName</name>
<type>string</type>
<ref>
<type></type>
<name>com.xyst.dinas.biz.datamodel.Station</name>
</ref>
<description></description>
</field>
<field title='砂石种类id'>
<name>dinasType.id</name>
<type>uuid</type>
<ref>
<type></type>
<name>com.xyst.dinas.biz.datamodel.DinasType</name>
</ref>
<description></description>
</field>
<field title='砂石种类名称'>
<name>dinasType.dinasTypeName</name>
<type>string</type>
<description></description>
</field>
<field title='车牌号'>
<name>shipCodeName</name>
<type>string</type>
<description></description>
</field>
<field title='计量吨位'>
<name>calculateTotalAmount</name>
<type>fixnum</type>
<description></description>
</field>
<field title='单价'>
<name>price</name>
<type>fixnum</type>
<description></description>
</field>
<field title='总价'>
<name>amount</name>
<type>fixnum</type>
<description></description>
</field>
<field title='预付款余额'>
<name>advanceBalance</name>
<type>fixnum</type>
<description></description>
</field>
<field title='销售时间'>
<name>dealTime</name>
<type>datetime</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='审批状态'>
<name>approveState</name>
<type>int</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='创建时间'>
<name>createTime</name>
<type>datetime</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='创建人'>
<name>creator.name</name>
<type>string</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='修改时间'>
<name>modifyTime</name>
<type>datetime</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='修改人'>
<name>modifier.name</name>
<type>string</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='废弃'>
<name>discard</name>
<type>boolean</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='删除'>
<name>del</name>
<type>boolean</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
</customQuery>
</content>
</model>
\ No newline at end of file
# Auto Configure
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.xyst.dinas.sales.config.SalesConfiguration,\
com.xyst.dinas.sales.config.CoefficientOrPriceConfiguration,\
com.xyst.dinas.sales.config.VehicleAmountPartyConfiguration,\
com.xyst.dinas.sales.config.ShipQuantityConfiguration
007032101=\u9884\u4ED8\u6B3E\u4F59\u989D\u6263\u51CF\u5931\u8D25
007032102=\u9884\u4ED8\u6B3E\u4F59\u989D\u4E0D\u8DB3\uFF0C\u8BF7\u5148\u8054\u7CFB\u5BA2\u6237\u8FDB\u884C\u5145\u503C\u64CD\u4F5C
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>811a31a1-d769-4598-8164-e45f28a829e0</id>
<name>com.xyst.dinas.sales.auth.VehicleAmountPartyCard</name>
<title>卡片查看</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>销售/车辆量方(区域公司)</m:category>
<m:seq>3</m:seq>
</m:privilege>
</content>
</metadata>
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>e7e19316-d0ca-4da3-b028-6fcf87866ee8</id>
<name>com.xyst.dinas.sales.auth.VehicleAmountPartyCreate</name>
<title>新建</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>销售/车辆量方(区域公司)</m:category>
<m:seq>2</m:seq>
</m:privilege>
</content>
</metadata>
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>c3f897f6-3b36-4743-a330-34c2211a89ec</id>
<name>com.xyst.dinas.sales.auth.VehicleAmountPartyDelete</name>
<title>删除</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>销售/车辆量方(区域公司)</m:category>
<m:seq>4</m:seq>
</m:privilege>
</content>
</metadata>
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>a2e36510-49d1-41ed-b8c4-04c493812135</id>
<name>com.xyst.dinas.sales.auth.VehicleAmountPartyList</name>
<title>列表</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>销售/车辆量方(区域公司)</m:category>
<m:seq>1</m:seq>
</m:privilege>
</content>
</metadata>
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>87dd5f76-46b4-41e8-827b-714dd476c665</id>
<name>com.xyst.dinas.sales.auth.VehicleAmountPartySetting</name>
<title>折方系数配置</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>销售/车辆量方(区域公司)</m:category>
<m:seq>0</m:seq>
</m:privilege>
</content>
</metadata>
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>d89849bc-614d-41a1-aa1d-48d1c5840b11</id>
<name>com.xyst.dinas.sales.bill.CoefficientOrPrice$sequence</name>
<title>折方系数$sequence</title>
<description>折方系数</description>
<define>bcp.sequence</define>
<define-version>1.0</define-version>
<content>
<m:sequence>
<m:start-with>0</m:start-with>
<m:increment>1</m:increment>
<m:max>99999</m:max>
<m:min>0</m:min>
<m:cycle>true</m:cycle>
<m:cache-size>10</m:cache-size>
</m:sequence>
</content>
</metadata>
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>609475c6-3651-4950-b36d-08796ec9d6b1</id>
<name>com.xyst.dinas.sales.bill.CoefficientOrPrice$serial</name>
<title>折方系数$serial</title>
<description>折方系数</description>
<define>bcp.serial</define>
<define-version>1.0</define-version>
<dependency>com.xyst.dinas.sales.bill.CoefficientOrPrice$sequence</dependency>
<dependency>com.xyst.dinas.sales.datamodel.CoefficientOrPrice</dependency>
<content>
<m:serial>
<m:input>com.xyst.dinas.sales.datamodel.CoefficientOrPrice</m:input>
<m:functionLibrarys/>
<m:segments>
<m:literal>
<m:value>DG</m:value>
</m:literal>
<m:sequence>
<m:length>5</m:length>
<m:pad-direction>left</m:pad-direction>
<m:pad-string>0</m:pad-string>
<m:key>com.xyst.dinas.sales.bill.CoefficientOrPrice$serial</m:key>
<m:sequenceName>com.xyst.dinas.sales.bill.CoefficientOrPrice$sequence</m:sequenceName>
</m:sequence>
</m:segments>
</m:serial>
</content>
</metadata>
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>74fb2944-51dd-4f34-b4f1-303895c0fb36</id>
<name>com.xyst.dinas.sales.bill.CoefficientOrPrice</name>
<title>折方系数</title>
<description>折方系数</description>
<define>bcp.biz.Biztype</define>
<define-version>1.0</define-version>
<dependency>com.xyst.dinas.sales.bill.CoefficientOrPrice$serial</dependency>
<dependency>com.beecode.bap.biztrait.BasicBillBiztrait</dependency>
<dependency>com.xyst.dinas.sales.datamodel.CoefficientOrPrice</dependency>
<content>
<m:biztype>
<m:type>com.xyst.dinas.sales.datamodel.CoefficientOrPrice</m:type>
<m:inheritances>
<m:inheritance>
<m:biztrait>com.beecode.bap.biztrait.BasicBillBiztrait</m:biztrait>
<m:config type="xml">
<m:content>&lt;billBasictraitConfig&gt;&lt;formulas/&gt;&lt;parents&gt;&lt;parent&gt;&lt;billCodeConfig&gt;&lt;serialName&gt;com.xyst.dinas.sales.bill.CoefficientOrPrice$serial&lt;/serialName&gt;&lt;buildTime&gt;add&lt;/buildTime&gt;&lt;/billCodeConfig&gt;&lt;/parent&gt;&lt;parent&gt;&lt;workflowConfig&gt;&lt;workflow&gt;&lt;/workflow&gt;&lt;/workflowConfig&gt;&lt;/parent&gt;&lt;parent&gt;&lt;printConfig&gt;&lt;templates/&gt;&lt;/printConfig&gt;&lt;/parent&gt;&lt;/parents&gt;&lt;functionLibrarys/&gt;&lt;/billBasictraitConfig&gt;</m:content>
</m:config>
</m:inheritance>
</m:inheritances>
<m:methodAuthorityItems/>
</m:biztype>
</content>
</metadata>
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>94955bd2-a457-48ac-a2e0-f910a85274e6</id>
<id>91d6db6a-1475-4644-8835-7466de9db4c4</id>
<name>com.xyst.dinas.sales.bill.NeedPlan$sequence</name>
<title>需用计划$sequence</title>
<description>需用计划</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>b12be61f-42ed-47e5-aa91-dc2392e83d5c</id>
<id>ded413c6-eebe-4ef4-82cc-ab54fda0b911</id>
<name>com.xyst.dinas.sales.bill.NeedPlan$serial</name>
<title>需用计划$serial</title>
<description>需用计划</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>2d3763d0-5e64-4e35-b246-2909549b5122</id>
<id>7ea44cc6-8c8a-4f75-b71f-1d0096846085</id>
<name>com.xyst.dinas.sales.bill.NeedPlan</name>
<title>需用计划</title>
<description>需用计划</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>ac0504c0-ffb3-495f-bb27-32b1e930f78f</id>
<id>b57a974d-776e-46f9-a7e5-3d1b2cf059f7</id>
<name>com.xyst.dinas.sales.bill.SalesPlan$sequence</name>
<title>销售计划$sequence</title>
<description>销售计划</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>5563456b-ee88-4505-881b-18e7c76c5bd7</id>
<id>b518493d-1ad3-4e1a-98c5-0201358c2ad3</id>
<name>com.xyst.dinas.sales.bill.SalesPlan$serial</name>
<title>销售计划$serial</title>
<description>销售计划</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>83fb1284-d7f1-418b-bb1e-6535deaaa6a0</id>
<id>103cdf02-2ceb-416c-aeef-dcdea90c45e7</id>
<name>com.xyst.dinas.sales.bill.SalesPlan</name>
<title>销售计划</title>
<description>销售计划</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>fbce3094-c718-4efd-a3c3-c511d584e54a</id>
<id>0548c9bc-1690-4e9e-a8fa-41c46e4d3408</id>
<name>com.xyst.dinas.sales.bill.SalesPlanTemp$sequence</name>
<title>临时销售计划$sequence</title>
<define>bcp.sequence</define>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>8e2f5380-4be3-47fe-acaf-a483715f83e0</id>
<id>167394b7-547f-4a5d-925c-2e946a5e6b4f</id>
<name>com.xyst.dinas.sales.bill.SalesPlanTemp$serial</name>
<title>临时销售计划$serial</title>
<define>bcp.serial</define>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>cac85d34-9fa2-4538-9403-a6af98136f22</id>
<id>4972799d-6a37-4fc7-a468-27a813b48739</id>
<name>com.xyst.dinas.sales.bill.SalesPlanTemp</name>
<title>临时销售计划</title>
<define>bcp.biz.Biztype</define>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>c1648077-a6bf-4896-be8b-8d62785990b9</id>
<name>com.xyst.dinas.sales.bill.VehicleAmountParty$sequence</name>
<title>车辆量方$sequence</title>
<description>车辆量方</description>
<define>bcp.sequence</define>
<define-version>1.0</define-version>
<content>
<m:sequence>
<m:start-with>0</m:start-with>
<m:increment>1</m:increment>
<m:max>99999</m:max>
<m:min>0</m:min>
<m:cycle>true</m:cycle>
<m:cache-size>10</m:cache-size>
</m:sequence>
</content>
</metadata>
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>ead8f5d3-c64e-402a-a195-de50ebb6aaeb</id>
<name>com.xyst.dinas.sales.bill.VehicleAmountParty$serial</name>
<title>车辆量方$serial</title>
<description>车辆量方</description>
<define>bcp.serial</define>
<define-version>1.0</define-version>
<dependency>com.xyst.dinas.sales.bill.VehicleAmountParty$sequence</dependency>
<dependency>com.xyst.dinas.sales.datamodel.VehicleAmountParty</dependency>
<content>
<m:serial>
<m:input>com.xyst.dinas.sales.datamodel.VehicleAmountParty</m:input>
<m:functionLibrarys/>
<m:segments>
<m:literal>
<m:value>DG</m:value>
</m:literal>
<m:sequence>
<m:length>5</m:length>
<m:pad-direction>left</m:pad-direction>
<m:pad-string>0</m:pad-string>
<m:key>com.xyst.dinas.sales.bill.VehicleAmountParty$serial</m:key>
<m:sequenceName>com.xyst.dinas.sales.bill.VehicleAmountParty$sequence</m:sequenceName>
</m:sequence>
</m:segments>
</m:serial>
</content>
</metadata>
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>78233632-33dc-429e-93a3-a4772eab7190</id>
<name>com.xyst.dinas.sales.bill.VehicleAmountParty</name>
<title>车辆量方</title>
<description>车辆量方</description>
<define>bcp.biz.Biztype</define>
<define-version>1.0</define-version>
<dependency>com.xyst.dinas.sales.bill.VehicleAmountParty$serial</dependency>
<dependency>com.xyst.dinas.sales.datamodel.VehicleAmountParty</dependency>
<dependency>com.beecode.bap.biztrait.BasicBillBiztrait</dependency>
<content>
<m:biztype>
<m:type>com.xyst.dinas.sales.datamodel.VehicleAmountParty</m:type>
<m:inheritances>
<m:inheritance>
<m:biztrait>com.beecode.bap.biztrait.BasicBillBiztrait</m:biztrait>
<m:config type="xml">
<m:content>&lt;billBasictraitConfig&gt;&lt;formulas/&gt;&lt;parents&gt;&lt;parent&gt;&lt;billCodeConfig&gt;&lt;serialName&gt;com.xyst.dinas.sales.bill.VehicleAmountParty$serial&lt;/serialName&gt;&lt;buildTime&gt;add&lt;/buildTime&gt;&lt;/billCodeConfig&gt;&lt;/parent&gt;&lt;parent&gt;&lt;workflowConfig&gt;&lt;workflow&gt;&lt;/workflow&gt;&lt;/workflowConfig&gt;&lt;/parent&gt;&lt;parent&gt;&lt;printConfig&gt;&lt;templates/&gt;&lt;/printConfig&gt;&lt;/parent&gt;&lt;/parents&gt;&lt;functionLibrarys/&gt;&lt;/billBasictraitConfig&gt;</m:content>
</m:config>
</m:inheritance>
</m:inheritances>
<m:methodAuthorityItems/>
</m:biztype>
</content>
</metadata>
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-type">
<specification>1.0</specification>
<id>6141c2be-4e16-4c9f-9cad-b1a7628bac38</id>
<name>com.xyst.dinas.sales.datamodel.CoefficientOrPrice</name>
<title>折方</title>
<description>折方</description>
<define>bcp.type.Class</define>
<define-version>1.0</define-version>
<dependency>javax.persistence.Entity</dependency>
<dependency>com.xyst.dinas.biz.datamodel.xystOrganization</dependency>
<dependency>javax.persistence.Column</dependency>
<dependency>javax.persistence.ManyToOne</dependency>
<dependency>javax.persistence.Table</dependency>
<dependency>com.beecode.inz.common.datamodel.BaseInfo</dependency>
<dependency>com.xyst.dinas.biz.datamodel.DinasType</dependency>
<dependency>bcp.type.constraint.Numeric</dependency>
<dependency>javax.persistence.JoinColumn</dependency>
<dependency>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</dependency>
<dependency>javax.persistence.OneToMany</dependency>
<dependency>com.xyst.dinas.contract.datamodel.Contract</dependency>
<content>
<m:class>
<m:annotations>
<m:annotation>
<m:type>javax.persistence.Entity</m:type>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Table</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>xyst_dinas_sales_coefficient_or_price</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:parents>
<m:parent>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</m:parent>
<m:parent>com.beecode.inz.common.datamodel.BaseInfo</m:parent>
</m:parents>
<m:attributes>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>javax.persistence.ManyToOne</m:type>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.JoinColumn</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>regional_company_id</m:value>
</m:property>
<m:property>
<m:key>referencedColumnName</m:key>
<m:value>ID</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>e6371bbe-2853-44b4-b607-619f3fa129e4</m:id>
<m:name>regionalCompany</m:name>
<m:title>区域公司</m:title>
<m:type>com.xyst.dinas.biz.datamodel.xystOrganization</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>javax.persistence.ManyToOne</m:type>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.JoinColumn</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>dinas_type_id</m:value>
</m:property>
<m:property>
<m:key>referencedColumnName</m:key>
<m:value>ID</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>c019806a-98ad-4249-a7dc-ab9a2f84d37e</m:id>
<m:name>dinasType</m:name>
<m:title>砂石类型</m:title>
<m:type>com.xyst.dinas.biz.datamodel.DinasType</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>javax.persistence.ManyToOne</m:type>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.JoinColumn</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>station_id</m:value>
</m:property>
<m:property>
<m:key>referencedColumnName</m:key>
<m:value>ID</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>39fdaa5d-19ab-4867-bb7d-7c45bdc6201d</m:id>
<m:name>station</m:name>
<m:title>所属场站</m:title>
<m:type>com.xyst.dinas.contract.datamodel.Contract</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>bcp.type.constraint.Numeric</m:type>
<m:properties>
<m:property>
<m:key>precision</m:key>
<m:value>12</m:value>
</m:property>
<m:property>
<m:key>scale</m:key>
<m:value>3</m:value>
</m:property>
</m:properties>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>coefficient_of</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>e87a14b2-a9e8-4605-83fa-d78527ad5916</m:id>
<m:name>coefficientOf</m:name>
<m:title>折方系数</m:title>
<m:type>fixnum</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>bcp.type.constraint.Numeric</m:type>
<m:properties>
<m:property>
<m:key>precision</m:key>
<m:value>12</m:value>
</m:property>
<m:property>
<m:key>scale</m:key>
<m:value>2</m:value>
</m:property>
</m:properties>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>price</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>c752216e-4b8f-477b-9dff-c4dd02f02d59</m:id>
<m:name>price</m:name>
<m:title>单价</m:title>
<m:type>fixnum</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>type</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>d85d1bd7-2dda-4d37-a901-c4e5cd76d1fb</m:id>
<m:name>type</m:name>
<m:title>类型: 0车辆系数 1:运船系数 2:运船单价</m:title>
<m:type>int</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
</m:attributes>
</m:class>
</content>
</metadata>
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-type">
<specification>1.0</specification>
<id>4afc591a-5144-4cfc-91a4-e0fdcdcabc13</id>
<id>4ce1be10-e1e5-4504-abc9-a21efd675cdb</id>
<name>com.xyst.dinas.sales.datamodel.NeedPlanAssociatedNeedPlanDetail</name>
<title>需用计划明细表</title>
<define>bcp.type.Class</define>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-type">
<specification>1.0</specification>
<id>4607eb7a-672b-4a95-aae5-cb0b56eb72cb</id>
<id>8bb6133d-fc86-48db-b6ad-0a6b99d3d77f</id>
<name>com.xyst.dinas.sales.datamodel.SalesPlanAssociatedSalesPlanDetail</name>
<title>销售计划子表</title>
<define>bcp.type.Class</define>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-type">
<specification>1.0</specification>
<id>6f068ad9-d064-474d-aef7-3a95af4581c6</id>
<id>ad350a98-f681-4e33-9722-1d0109db2671</id>
<name>com.xyst.dinas.sales.datamodel.SalesPlanTempAssociatedSalesPlanTempDetail</name>
<title>临时销售计划子表</title>
<define>bcp.type.Class</define>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-type">
<specification>1.0</specification>
<id>d301fda1-0df0-49d4-a7fb-fc0a703eb855</id>
<name>com.xyst.dinas.sales.datamodel.VehicleAmountParty</name>
<title>车辆量方</title>
<description>车辆量方</description>
<define>bcp.type.Class</define>
<define-version>1.0</define-version>
<dependency>javax.persistence.Entity</dependency>
<dependency>bcp.type.constraint.StringLength</dependency>
<dependency>javax.persistence.ManyToOne</dependency>
<dependency>com.beecode.inz.common.datamodel.BaseInfo</dependency>
<dependency>com.xyst.dinas.biz.datamodel.DinasType</dependency>
<dependency>bcp.type.constraint.Numeric</dependency>
<dependency>javax.persistence.JoinColumn</dependency>
<dependency>javax.persistence.OneToMany</dependency>
<dependency>com.xyst.dinas.contract.datamodel.Contract</dependency>
<dependency>com.xyst.dinas.biz.datamodel.xystOrganization</dependency>
<dependency>com.xyst.dinas.project.datamodel.PurchaseSandCompany</dependency>
<dependency>javax.persistence.Column</dependency>
<dependency>javax.persistence.Table</dependency>
<dependency>com.xyst.dinas.biz.datamodel.Station</dependency>
<dependency>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</dependency>
<dependency>com.xyst.dinas.project.datamodel.ProjectFiled</dependency>
<content>
<m:class>
<m:annotations>
<m:annotation>
<m:type>javax.persistence.Entity</m:type>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Table</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>xyst_dinas_vehicle_amount_party</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:parents>
<m:parent>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</m:parent>
<m:parent>com.beecode.inz.common.datamodel.BaseInfo</m:parent>
</m:parents>
<m:attributes>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>javax.persistence.ManyToOne</m:type>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.JoinColumn</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>regional_company_id</m:value>
</m:property>
<m:property>
<m:key>referencedColumnName</m:key>
<m:value>ID</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>b3c4e11e-7736-4858-9fe8-25e78a1443c2</m:id>
<m:name>regionalCompany</m:name>
<m:title>区域公司</m:title>
<m:type>com.xyst.dinas.biz.datamodel.xystOrganization</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>javax.persistence.ManyToOne</m:type>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.JoinColumn</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>purchase_sand_unit_id</m:value>
</m:property>
<m:property>
<m:key>referencedColumnName</m:key>
<m:value>ID</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>9cc6473c-5ca3-42d2-a619-34c44cb0ee4f</m:id>
<m:name>purchaseSandUnit</m:name>
<m:title>购砂单位</m:title>
<m:type>com.xyst.dinas.project.datamodel.PurchaseSandCompany</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>javax.persistence.ManyToOne</m:type>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.JoinColumn</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>contract_id</m:value>
</m:property>
<m:property>
<m:key>referencedColumnName</m:key>
<m:value>ID</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>a2b156fa-5c37-4533-9959-d7132bd6901e</m:id>
<m:name>contract</m:name>
<m:title>所属合同</m:title>
<m:type>com.xyst.dinas.contract.datamodel.Contract</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>javax.persistence.ManyToOne</m:type>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.JoinColumn</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>project_id</m:value>
</m:property>
<m:property>
<m:key>referencedColumnName</m:key>
<m:value>ID</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>fba07ae9-1cc2-4699-a69a-bfda8e9cfa72</m:id>
<m:name>project</m:name>
<m:title>所属项目</m:title>
<m:type>com.xyst.dinas.project.datamodel.ProjectFiled</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>javax.persistence.ManyToOne</m:type>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.JoinColumn</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>station_id</m:value>
</m:property>
<m:property>
<m:key>referencedColumnName</m:key>
<m:value>ID</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>4cb9757e-4714-4ffb-a455-054867845e08</m:id>
<m:name>station</m:name>
<m:title>场站</m:title>
<m:type>com.xyst.dinas.biz.datamodel.Station</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>javax.persistence.ManyToOne</m:type>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.JoinColumn</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>dinas_type_id</m:value>
</m:property>
<m:property>
<m:key>referencedColumnName</m:key>
<m:value>ID</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>8671e4c4-43ce-4edf-8762-ab56856c39d0</m:id>
<m:name>dinasType</m:name>
<m:title>砂石类型</m:title>
<m:type>com.xyst.dinas.biz.datamodel.DinasType</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>bcp.type.constraint.StringLength</m:type>
<m:value>50</m:value>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>ship_code_name</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>e4bb57ae-780a-468a-9875-f3ffdc06824c</m:id>
<m:name>shipCodeName</m:name>
<m:title>车牌号</m:title>
<m:type>string</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>bcp.type.constraint.Numeric</m:type>
<m:properties>
<m:property>
<m:key>precision</m:key>
<m:value>12</m:value>
</m:property>
<m:property>
<m:key>scale</m:key>
<m:value>2</m:value>
</m:property>
</m:properties>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>calculate_total_amount</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>7bac0c3b-7a48-4450-810c-f064ee4f8439</m:id>
<m:name>calculateTotalAmount</m:name>
<m:title>计量吨位</m:title>
<m:type>fixnum</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>bcp.type.constraint.Numeric</m:type>
<m:properties>
<m:property>
<m:key>precision</m:key>
<m:value>12</m:value>
</m:property>
<m:property>
<m:key>scale</m:key>
<m:value>2</m:value>
</m:property>
</m:properties>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>advance_balance</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>5eaa1f96-851b-4fd8-9f78-b2a0e2541b29</m:id>
<m:name>advanceBalance</m:name>
<m:title>预付款余额</m:title>
<m:type>fixnum</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>bcp.type.constraint.Numeric</m:type>
<m:properties>
<m:property>
<m:key>precision</m:key>
<m:value>12</m:value>
</m:property>
<m:property>
<m:key>scale</m:key>
<m:value>3</m:value>
</m:property>
</m:properties>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>long_length</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>7e0368d1-1f80-4131-aefb-b49c2e9d5b47</m:id>
<m:name>longLength</m:name>
<m:title></m:title>
<m:type>fixnum</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>bcp.type.constraint.Numeric</m:type>
<m:properties>
<m:property>
<m:key>precision</m:key>
<m:value>12</m:value>
</m:property>
<m:property>
<m:key>scale</m:key>
<m:value>3</m:value>
</m:property>
</m:properties>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>wide_length</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>238fb270-5492-4515-8679-7df49e003821</m:id>
<m:name>wideLength</m:name>
<m:title></m:title>
<m:type>fixnum</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>bcp.type.constraint.Numeric</m:type>
<m:properties>
<m:property>
<m:key>precision</m:key>
<m:value>12</m:value>
</m:property>
<m:property>
<m:key>scale</m:key>
<m:value>3</m:value>
</m:property>
</m:properties>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>high_length</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>2e087da3-4b38-458c-874b-417f90e7b1df</m:id>
<m:name>highLength</m:name>
<m:title></m:title>
<m:type>fixnum</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>bcp.type.constraint.Numeric</m:type>
<m:properties>
<m:property>
<m:key>precision</m:key>
<m:value>12</m:value>
</m:property>
<m:property>
<m:key>scale</m:key>
<m:value>3</m:value>
</m:property>
</m:properties>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>coefficient_of</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>91531edf-0ec4-4af4-a17e-769221d90d38</m:id>
<m:name>coefficientOf</m:name>
<m:title>折方系数</m:title>
<m:type>fixnum</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>bcp.type.constraint.Numeric</m:type>
<m:properties>
<m:property>
<m:key>precision</m:key>
<m:value>12</m:value>
</m:property>
<m:property>
<m:key>scale</m:key>
<m:value>2</m:value>
</m:property>
</m:properties>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>price</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>2bc72dc5-b7fa-43e9-9941-255a379e1c81</m:id>
<m:name>price</m:name>
<m:title>单价</m:title>
<m:type>fixnum</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>bcp.type.constraint.Numeric</m:type>
<m:properties>
<m:property>
<m:key>precision</m:key>
<m:value>12</m:value>
</m:property>
<m:property>
<m:key>scale</m:key>
<m:value>2</m:value>
</m:property>
</m:properties>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>amount</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>79f62a0b-4f25-4cd5-adbc-576a2f969e23</m:id>
<m:name>amount</m:name>
<m:title>总价</m:title>
<m:type>fixnum</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>deal_time</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>00dcc22f-19b1-483e-bcba-2c040dd750f0</m:id>
<m:name>dealTime</m:name>
<m:title>销售时间</m:title>
<m:type>datetime</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
</m:attributes>
</m:class>
</content>
</metadata>
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/inz-query">
<specification>1.0</specification>
<id>acc92bc7-b3ea-4b0b-ba8a-ef7ee30c1013</id>
<name>com.xyst.dinas.sales.query.VehicleAmountParty</name>
<title>车辆量方</title>
<define>inz.query.Query</define>
<define-version>1.0</define-version>
<dependency>com.xyst.dinas.sales.datamodel.VehicleAmountParty</dependency>
<content>
<m:query>
<m:type>com.xyst.dinas.sales.datamodel.VehicleAmountParty</m:type>
<m:dataProcessor>com.xyst.dinas.sales.processor.SalesPlanProcessor</m:dataProcessor>
<m:authorityItem></m:authorityItem>
<m:innerScenes>
<m:innerScene>
<m:id>57963eb7-9955-4567-ac85-51a06aadd48f</m:id>
<m:title>全部</m:title>
<m:javaImplement>com.beecode.inz.common.scene.CommonAllScene</m:javaImplement>
<m:defaultExecute></m:defaultExecute>
<m:hide></m:hide>
</m:innerScene>
<m:innerScene>
<m:id>e6839c4a-fd1c-4139-bd82-f1a7f8d91f4b</m:id>
<m:title>已废弃</m:title>
<m:javaImplement>com.beecode.inz.common.scene.DefaultDiscardScene</m:javaImplement>
<m:defaultExecute></m:defaultExecute>
<m:hide></m:hide>
</m:innerScene>
<m:innerScene>
<m:id>e77ab19a-107d-430d-a5df-d54046d189ca</m:id>
<m:title>权限过滤</m:title>
<m:javaImplement>com.xyst.dinas.biz.scene.XystDinasCommonAllScene</m:javaImplement>
<m:defaultExecute>true</m:defaultExecute>
<m:hide>true</m:hide>
</m:innerScene>
</m:innerScenes>
<m:fields>
<m:field>
<m:name>id</m:name>
<m:title>id</m:title>
<m:type>uuid</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>regionalCompany.id</m:name>
<m:title>区域公司id</m:title>
<m:type>uuid</m:type>
<m:ref>
<m:name>com.xyst.dinas.biz.datamodel.xystOrganization</m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>regionalCompany.name</m:name>
<m:title>区域公司</m:title>
<m:type>string</m:type>
<m:ref>
<m:name>com.xyst.dinas.biz.datamodel.xystOrganization</m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>purchaseSandUnit.id</m:name>
<m:title>购砂单位</m:title>
<m:type>uuid</m:type>
<m:ref>
<m:name>com.xyst.dinas.project.datamodel.PurchaseSandCompany</m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>purchaseSandUnit.name</m:name>
<m:title>购砂单位名称</m:title>
<m:type>string</m:type>
<m:ref>
<m:name>com.xyst.dinas.project.datamodel.PurchaseSandCompany</m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>contract.id</m:name>
<m:title>合同id</m:title>
<m:type>uuid</m:type>
<m:ref>
<m:name>com.xyst.dinas.contract.datamodel.Contract</m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>contract.contractName</m:name>
<m:title>合同名称</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>contract.contractCode</m:name>
<m:title>合同编号</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>project.id</m:name>
<m:title>项目</m:title>
<m:type>uuid</m:type>
<m:ref>
<m:name>com.xyst.dinas.project.datamodel.ProjectFiled</m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>project.projectName</m:name>
<m:title>项目名称</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>station.id</m:name>
<m:title>场站id</m:title>
<m:type>uuid</m:type>
<m:ref>
<m:name>com.xyst.dinas.biz.datamodel.Station</m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>station.stationName</m:name>
<m:title>场站</m:title>
<m:type>string</m:type>
<m:ref>
<m:name>com.xyst.dinas.biz.datamodel.Station</m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>dinasType.id</m:name>
<m:title>砂石种类id</m:title>
<m:type>uuid</m:type>
<m:ref>
<m:name>com.xyst.dinas.biz.datamodel.DinasType</m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>dinasType.dinasTypeName</m:name>
<m:title>砂石种类名称</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>shipCodeName</m:name>
<m:title>车牌号</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>calculateTotalAmount</m:name>
<m:title>计量吨位</m:title>
<m:type>fixnum</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>price</m:name>
<m:title>单价</m:title>
<m:type>fixnum</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>amount</m:name>
<m:title>总价</m:title>
<m:type>fixnum</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>advanceBalance</m:name>
<m:title>预付款余额</m:title>
<m:type>fixnum</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>dealTime</m:name>
<m:title>销售时间</m:title>
<m:type>datetime</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>approveState</m:name>
<m:title>审批状态</m:title>
<m:type>int</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>createTime</m:name>
<m:title>创建时间</m:title>
<m:type>datetime</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>creator.name</m:name>
<m:title>创建人</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>modifyTime</m:name>
<m:title>修改时间</m:title>
<m:type>datetime</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>modifier.name</m:name>
<m:title>修改人</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>discard</m:name>
<m:title>废弃</m:title>
<m:type>boolean</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>del</m:name>
<m:title>删除</m:title>
<m:type>boolean</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
</m:fields>
</m:query>
</content>
</metadata>
......@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.hibernate.org/xsd/hibernate-mapping
http://www.hibernate.org/xsd/hibernate-mapping/hibernate-mapping-4.0.xsd">
<class entity-name="com.xyst.dinas.sales.datamodel.CoefficientOrPrice" table="xyst_dinas_sales_coefficent_or_price" optimistic-lock="version">
<class entity-name="com.xyst.dinas.sales.datamodel.CoefficientOrPrice" table="xyst_dinas_sales_coefficient_or_price" optimistic-lock="version">
<tuplizer entity-mode="dynamic-map" class="com.beecode.bcp.store.hibernate.KObjectEntityTuplizer"/>
<id name="id" type="uuid-binary" column="id" length="16">
<generator class="assigned" />
......@@ -39,7 +39,11 @@
<property name="approveState" type="integer" not-null="false">
<column name="approve_state"/>
</property>
<many-to-one name="regionalCompany" entity-name="com.xyst.dinas.biz.datamodel.xystOrganization" fetch="select">
<column name="regional_company" not-null="false">
<comment>区域公司</comment>
</column>
</many-to-one>
<many-to-one name="dinasType" entity-name="com.xyst.dinas.biz.datamodel.DinasType" fetch="select">
<column name="dinas_type_id" not-null="false">
<comment>砂石类型</comment>
......@@ -53,7 +57,7 @@
</many-to-one>
<property name="coefficientOf" type="big_decimal" not-null="false">
<column name="coefficient_of" precision="12" scale="2">
<column name="coefficient_of" precision="12" scale="3">
<comment>折方系数</comment>
</column>
</property>
......@@ -66,7 +70,7 @@
<property name="type" type="int" not-null="false" >
<column name="type" length="1" default="0" >
<comment>类型: 0运船 1车辆</comment>
<comment>类型: 0车辆系数 1:运船系数 2:运船单价</comment>
</column>
</property>
......
<?xml version="1.0" encoding="UTF-8"?>
<hibernate-mapping xmlns="http://www.hibernate.org/xsd/hibernate-mapping"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.hibernate.org/xsd/hibernate-mapping
http://www.hibernate.org/xsd/hibernate-mapping/hibernate-mapping-4.0.xsd">
<class entity-name="com.xyst.dinas.sales.datamodel.VehicleAmountParty" table="xyst_dinas_sales_vehicle_amount_party" optimistic-lock="version">
<tuplizer entity-mode="dynamic-map" class="com.beecode.bcp.store.hibernate.KObjectEntityTuplizer"/>
<id name="id" type="uuid-binary" column="id" length="16">
<generator class="assigned" />
</id>
<version name="version" type="int" column="version"/>
<property name="createTime" type="timestamp" not-null="false">
<column name="create_time"/>
</property>
<many-to-one name="creator" entity-name="com.beecode.bap.staff.datamodel.Staff" fetch="select">
<column name="creator_id" not-null="false"/>
</many-to-one>
<property name="modifyTime" type="timestamp" not-null="false">
<column name="modify_time"/>
</property>
<many-to-one name="modifier" entity-name="com.beecode.bap.staff.datamodel.Staff" fetch="select">
<column name="modifier_id" not-null="false"/>
</many-to-one>
<property name="billState" type="nstring" not-null="false">
<column name="bill_state" length="100"/>
</property>
<many-to-one name="bizProcess" entity-name="com.beecode.bap.workflow.datamodel.BizProcess" fetch="select">
<column name="biz_process_id" not-null="false"/>
</many-to-one>
<property name="billCode" type="nstring" not-null="false">
<column name="bill_code" length="200"/>
</property>
<property name="discard" type="boolean" not-null="false">
<column name="discard"/>
</property>
<property name="del" type="boolean" not-null="false">
<column name="del"/>
</property>
<property name="approveState" type="integer" not-null="false">
<column name="approve_state"/>
</property>
<many-to-one name="regionalCompany" entity-name="com.xyst.dinas.biz.datamodel.xystOrganization" fetch="select">
<column name="regional_company" not-null="false">
<comment>区域公司</comment>
</column>
</many-to-one>
<many-to-one name="purchaseSandUnit" entity-name="com.xyst.dinas.project.datamodel.PurchaseSandCompany" fetch="select">
<column name="purchase_sand_unit_id" not-null="false">
<comment>购砂单位</comment>
</column>
</many-to-one>
<many-to-one name="contract" entity-name="com.xyst.dinas.contract.datamodel.Contract" fetch="select">
<column name="contract_id" not-null="false">
<comment>所属合同</comment>
</column>
</many-to-one>
<many-to-one name="project" entity-name="com.xyst.dinas.project.datamodel.ProjectFiled" fetch="select">
<column name="project_id" not-null="false">
<comment>所属项目</comment>
</column>
</many-to-one>
<many-to-one name="station" entity-name="com.xyst.dinas.biz.datamodel.Station" fetch="select">
<column name="station_id" not-null="false">
<comment>场站</comment>
</column>
</many-to-one>
<many-to-one name="dinasType" entity-name="com.xyst.dinas.biz.datamodel.DinasType" fetch="select">
<column name="dinas_type_id" not-null="false">
<comment>砂石类型</comment>
</column>
</many-to-one>
<property name="shipCodeName" type="nstring" not-null="false">
<column name="ship_code_name">
<comment>车牌号</comment>
</column>
</property>
<property name="calculateTotalAmount" type="big_decimal" not-null="false">
<column name="calculate_total_amount" precision="12" scale="2">
<comment>计量吨位</comment>
</column>
</property>
<property name="advanceBalance" type="big_decimal" not-null="false">
<column name="advance_balance" precision="12" scale="2">
<comment>预付款余额</comment>
</column>
</property>
<property name="longLength" type="big_decimal" not-null="false">
<column name="long_length" precision="12" scale="3">
<comment></comment>
</column>
</property>
<property name="wideLength" type="big_decimal" not-null="false">
<column name="wide_length" precision="12" scale="3">
<comment></comment>
</column>
</property>
<property name="highLength" type="big_decimal" not-null="false">
<column name="high_length" precision="12" scale="3">
<comment></comment>
</column>
</property>
<property name="coefficientOf" type="big_decimal" not-null="false">
<column name="coefficient_of" precision="12" scale="3">
<comment>折方系数</comment>
</column>
</property>
<property name="price" type="big_decimal" not-null="false">
<column name="price" precision="12" scale="2">
<comment>单价</comment>
</column>
</property>
<property name="amount" type="big_decimal" not-null="false">
<column name="amount" precision="12" scale="2">
<comment>总价</comment>
</column>
</property>
<property name="dealTime" type="timestamp" not-null="false">
<column name="deal_time">
<comment>销售时间</comment>
</column>
</property>
</class>
</hibernate-mapping>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>31da64d7-b640-4431-81b5-f176302e5632</id>
<id>c51a2806-bf04-4da0-b02c-c16827884e9d</id>
<name>com.xyst.dinas.transport.bill.TransportRecord$sequence</name>
<title>运输记录$sequence</title>
<description>运输记录</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>607b1f16-85af-4f0d-a082-3538cbdfca91</id>
<id>0f1fd398-1d1e-4f21-8ae6-1bd3ce97c701</id>
<name>com.xyst.dinas.transport.bill.TransportRecord$serial</name>
<title>运输记录$serial</title>
<description>运输记录</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>d89bfc99-359c-4c80-b10d-f2f5352d7147</id>
<id>aaddfd2e-747d-4d56-9f8c-fd842bda038d</id>
<name>com.xyst.dinas.transport.bill.TransportRecord</name>
<title>运输记录</title>
<description>运输记录</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>0e3d95f3-2012-4c5e-bb22-03c700c305d9</id>
<id>83549661-8cc7-43a0-a968-7ed75b754543</id>
<name>com.xyst.dinas.transport.bill.VehicleDispatch$sequence</name>
<title>车辆派单$sequence</title>
<description>车辆派单</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>92a1958d-56a8-4dc2-a83c-72b567b921f8</id>
<id>9e52bc0e-4fde-43c1-80da-745bd7c6030f</id>
<name>com.xyst.dinas.transport.bill.VehicleDispatch$serial</name>
<title>车辆派单$serial</title>
<description>车辆派单</description>
......
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>d4b619f3-369f-4ce6-86af-7e448b98d826</id>
<id>7e7a28d1-9891-4154-8856-7d8237f41ebe</id>
<name>com.xyst.dinas.transport.bill.VehicleDispatch</name>
<title>车辆派单</title>
<description>车辆派单</description>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment