Commit 6763dde5 by 闫恒

Merge branch 'feature/sales_management' into 'develop'

Feature/sales management

See merge request kunlun/xyst_dinas/xyst_dinas_backend!83
parents bafed41d 8f36a65a
......@@ -11,7 +11,7 @@ spring:
name: jdbc/bap-ds
username: root
password: 123
url: jdbc:mysql://localhost:3306/inz_kunlun01?useSSL=true&characterEncoding=UTF-8
url: jdbc:mysql://47.94.114.232:3306/xyst_test?useSSL=true&characterEncoding=UTF-8
driverClassName: com.mysql.jdbc.Driver
thymeleaf:
cache: false
......
......@@ -540,6 +540,19 @@
<m:icon>iconfont iconkucunchaxun1x</m:icon>
</m:function-node>
<m:function-node>
<m:id>da8500bb-45de-4866-9489-aee643a410a0</m:id>
<m:name>ship_quantity</m:name>
<m:title>运船量方</m:title>
<m:index>1300</m:index>
<m:license></m:license>
<m:privilege>com.xyst.dinas.sales.auth.ShipQuantityList</m:privilege>
<m:function-definition>
<m:view>function-ship_quantity</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:icon>iconfont iconyunchuanliangfang1x</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>
......
<?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>133d847a-a8aa-4c11-a2e9-3b110e60b05e</id>
<id>252cffa5-044d-485f-9a16-32215143dc0a</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>26416f69-5aac-41fd-aed3-c6244c13c7b3</id>
<id>c758d97e-2efb-4c8d-b106-1e9c3c81f7d0</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>5cdcd025-db60-44dd-8409-07ff415b69c1</id>
<id>6df8f1d5-2175-4695-b81b-3ac5218f6a68</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>9b5deb8a-ed9d-422b-a5e3-7c1a654e658e</id>
<id>85ccab02-e1bd-4564-a89f-96c413dd8753</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>5625756c-93c7-4bbe-8c26-5c401ae99de4</id>
<id>319c663e-fcb7-4bc7-ac85-6184bcec652f</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>090d9c40-c59d-45eb-91e9-48339822c625</id>
<id>8a6eee7e-b1d3-4456-9887-5d3812c7c910</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>9ee1f1a2-97fe-4700-83cb-0f60eb147913</id>
<id>835372e3-4d90-4554-95c8-78bd94065d7d</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>bde53115-1ebc-40c7-8e92-19f40a6b8d88</id>
<id>ed27f7fc-a2b7-4deb-b421-58ab88ec3048</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>01cbb80e-1e00-481c-ad2d-4d29b110f6e6</id>
<id>4a2fcbf0-42a7-4f21-b503-77c09bff016e</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>869709ca-afd7-4c48-bd0f-f7d6ffccfc44</id>
<id>e5136cdb-78c7-4f28-b180-b0ad41765511</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>c93c1c1b-0053-44cc-97aa-073f02980a5a</id>
<id>3f164db5-adc7-4471-8a56-486e7701bd4e</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>5e5ab116-de90-4417-9cf2-f5979a5054ab</id>
<id>985a40c5-8ddd-4609-ae9c-f6d418cd4cbc</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>44e338dc-51f3-4604-b0bb-a64b128caa54</id>
<id>2314d3df-c9f7-464e-9d61-45268c2b65d5</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>1c7a215f-18a0-4f9e-8e93-6026ba2ab3bf</id>
<id>247e313e-b6ad-4bed-9097-4c82f5308add</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>43140ee9-bdea-4471-b3e8-91514434110b</id>
<id>54e6ef6f-b354-4722-897f-573f5a447ee4</id>
<name>com.xyst.dinas.biz.bill.xystOrganization</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>e2a19cdb-6124-4c78-9935-bea0b5eb1241</id>
<id>5d7afea9-6ec4-4262-bae8-11888169a9ff</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>5f28e1fe-7c9f-4b26-9aa4-2ba9331e3966</id>
<id>93803572-a807-41ff-a8f6-a4ce38947cf3</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>749d689e-027a-42ac-82bc-0f9efad3a22b</id>
<id>aea8d597-03e4-4593-9b51-df32528f7196</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>2090943b-01c5-4c56-9913-ed136cd2485c</id>
<id>4100cbaf-9d90-4981-9a21-9c5a942e1468</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>348d6482-db4c-4c3a-b2fc-c66dada7fd89</id>
<id>4048a7dd-15ef-4696-8bf2-9fde5a35d8be</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>e52eed8c-aa1e-4070-8163-f6101f29b786</id>
<id>151aaa7b-88f7-4573-a012-5771ba67ecce</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-sequence">
<specification>1.0</specification>
<id>33b770a4-c9cd-4a54-a0bd-8e9d80736045</id>
<id>df1c1654-fdb1-4548-beee-a4e423a32bb0</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>35aa3c63-3f1f-4a7e-b187-335d561d6dfb</id>
<id>dcfb0e84-4697-4f6c-ae23-e2791ae706c8</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>d70fda26-1c0c-4323-9ae4-de6153b30f3b</id>
<id>85e728e8-9cf5-47d0-b544-8469ce6529e6</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>66cfe727-fbb0-4ecc-8bd0-b281a99c0f33</id>
<id>8bc2c0d9-9011-45c0-9c82-c309204d2e0c</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>07579571-97d1-400d-bc5f-a78bf8757912</id>
<id>5de18b0d-556b-4352-901e-46aa5c6b0145</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>05292512-3b6b-4766-9af6-8e794064c67f</id>
<id>4f0aff5e-b511-405a-8b97-7b2117fa6f02</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>c933719d-8b06-45a8-a2ad-1da8c0c3bba4</id>
<id>5b46730f-6821-498b-b606-f79eecc6072d</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>2b56d22e-7a16-41bd-bf18-e23b49d1d6c2</id>
<id>48d99f2a-5816-4676-8f42-86c61c977df2</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>57b3e154-e83e-4a9c-ac2f-d6f88c203d70</id>
<id>522007f3-bfb4-40fe-9a86-11358e64813c</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>4065bcc5-a8b7-495d-af02-af3fc8128f84</id>
<id>2cebfa06-0570-45e6-9d21-7cccae449bca</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>ce4eb012-5633-4095-aeb1-c878446a0141</id>
<id>5394c9d4-a658-4b8c-94b9-c5fae4e7e71e</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>64290fb9-267e-451e-ab94-666a70d01fec</id>
<id>f98698a8-53db-4f81-b24a-68eeec7af0cd</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>d6655343-c11e-441d-9867-327e8f02cb66</id>
<id>41b79973-c3da-4b91-964b-def5e54ea31f</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>68540c53-e8af-41fb-96f0-7769544efa4d</id>
<id>1165c5a4-276b-497a-889b-6cd495733e8d</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>5fc7ea9c-a5b6-4356-9241-1b0c6cf7b259</id>
<id>9b6ead82-430f-4df2-b73f-b68b0d3d2309</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>591d1a6a-23c4-42f4-97ee-dfdee099755c</id>
<id>37709169-b7fe-4ea3-93c8-9a46855c3c68</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>82602947-94d8-4952-973a-5d299d7eaa27</id>
<id>c1008c92-eceb-4ad9-a2d3-572e9e330200</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>dce1b269-f2f2-4a6a-bf9f-418ba3bf55dd</id>
<id>7a67296c-e101-43c1-8697-e5c163e870ad</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>639945b7-a866-4cf3-84bf-cecd7aa0153f</id>
<id>fa46a6e6-b2cf-4f02-832f-ba3a45cf7e51</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>de698619-2007-4060-bd4d-bb3b5193759c</id>
<id>9d595bd8-dfa5-4a8e-ac01-d17831a50fdf</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>5d9efe7f-e11b-4ef6-9077-84c551c62af5</id>
<id>0682df01-1ba3-471d-9e33-6c6fa7ac7786</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>e5c22fba-6aed-48df-9fbe-778939fbeebf</id>
<id>048290c4-939a-4806-afbd-b65c306e3632</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>db9f8720-d353-491f-9232-8008e06b7c6c</id>
<id>6e297bb6-8607-4aa6-8828-c7f8ed994914</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>c4b4f611-9066-45d0-b6a4-477cbc5a5ee5</id>
<id>ddca5063-40d6-498b-bbaa-ae488c49e35a</id>
<name>com.xyst.dinas.oa.bill.UseCarApply</name>
<title>用车申请</title>
<description>用车申请</description>
......
......@@ -8,6 +8,6 @@
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='5abd34c1-4233-41db-97b3-154a0834ed99' category='生产/场站视频监控(区域公司)' seq='0'></privilege>
<privilege type='TOKEN' target-type='' id='5abd34c1-4233-41db-97b3-154a0834ed99' category='生产/场站视频监控(集团)' seq='0'></privilege>
</content>
</model>
......@@ -9,7 +9,7 @@
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>生产/场站视频监控(区域公司</m:category>
<m:category>生产/场站视频监控(集团</m:category>
<m:seq>0</m:seq>
</m:privilege>
</content>
......
<?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>5a4e1893-a05e-4736-80b1-dd4d88676c99</id>
<id>e3979bfa-5340-4276-86c1-063db0de8d8d</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>20ca3202-a4f1-4188-a313-e30400bbe46b</id>
<id>abdc391a-c7a8-46fe-9a1f-fe2d8c430aec</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>4a05ae91-629b-4846-988b-cf4eb0c9ecad</id>
<id>368da970-bc14-43c8-a5b2-ed28b4894bbb</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>2df6c8bf-5094-4c1e-9229-2c0381930dfe</id>
<id>af869fd7-15f3-47c3-887b-f95fb61772c0</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>c1b2b5a4-32c1-4b9e-9a17-ac0f16e03f37</id>
<id>58a1a87f-c436-4f98-a568-b4855c288a2d</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>f713364c-c087-4e89-bcf5-3f70fac71818</id>
<id>54dca8f4-4767-42e4-8e5d-861c2d22c553</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-sequence">
<specification>1.0</specification>
<id>70f0ca56-cf83-42ee-ba2c-89e9ec5241d2</id>
<id>0ec397eb-bca3-46c2-97f6-b6a4d7e2656b</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>445f1c25-c5ad-493d-9cc6-0bc083fba7c1</id>
<id>51fcc7ae-c4d9-4aae-8962-73f94cfb6665</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>bcb70b44-639f-4995-9374-1559e7514552</id>
<id>9ac76f8e-0a7a-4d72-972b-7507037da8bf</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>3635d1e7-3bb6-4748-a13a-39338b4ee037</id>
<id>725e3ed0-dfea-4e8f-ae28-0f112ea42a26</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>bf1b8c35-8134-408d-b623-646003fc9d9a</id>
<id>e4e75ddd-7753-4103-be8a-fdacda7f2d50</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>37af3895-03a0-472f-88f2-a302ba38369d</id>
<id>beb4e694-8b72-4910-90f5-7fd489c84b25</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>4a1531ea-5480-4a46-9699-705b408c7fbc</id>
<id>3eccce3d-2ed0-4b98-b016-ee4b00b3ca87</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>64940413-dc3f-4d9d-a7d8-3256f8f74639</id>
<id>132c9206-c90f-49d0-b9fb-d1c0e23902b5</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>75f90c28-698a-4524-bceb-d46b3161082b</id>
<id>4f91af25-602a-4361-a543-edac1e612e10</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>d4c0b652-22d0-4c2f-b62a-ed80305e7866</id>
<id>beba50a5-f168-456c-9434-74e2aa8836d9</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>a99ff226-6c0c-4026-8ecc-b3ccc2ae8f7f</id>
<id>1e3ebfc0-5778-4bb3-8499-331c913ba961</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>de7f8c8b-c729-4702-a34a-0d2335384861</id>
<id>d8bd0491-bdb1-4ffa-8dd2-07e14b3724c6</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>c20d8a8c-fec2-4151-b24f-d00b36f6f18e</id>
<id>35f52a1d-f171-45d2-aabe-54b321b4f0cc</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>eda12fd5-4434-4639-a8f0-acc5748e9dc1</id>
<id>10909fa0-f312-4b92-b1c7-12c6cada57a7</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>16f0b947-2e81-4320-ae62-38ac8079d1bf</id>
<id>05ddc169-c1fd-47d9-9261-3e51df25dd0c</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>47a3038f-5bb0-494c-afd9-5a332a87fcb5</id>
<id>749ff967-b8fe-499c-896d-5630b6ffa76e</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>53ec9523-fab6-47bb-b7a7-65fe3638daa6</id>
<id>56fe0816-61e4-4f8f-b8dc-aa0c96e117b1</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>97c8a567-f0e3-4209-840c-e92f9cfe3cfe</id>
<id>8cd46fdc-66ae-4b8b-8def-bdda3a44bd81</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>ba90df9d-42e4-4655-92ae-cdf9988bb9c2</id>
<id>473e6b67-65d5-4778-bfe9-4854e959cbdf</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>38b8bc7f-0bd5-41e4-a218-5dd95552de4c</id>
<id>22ae7bb1-f674-4c10-a8b6-dd8acf7e5ad1</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>c79949d6-6e52-48d2-9f61-2541c44e5f92</id>
<id>9e14c18d-30a7-4a35-a39a-0413a5de7b2f</id>
<name>com.xyst.dinas.safe.bill.VehicleViolation</name>
<title>车辆违规记录</title>
<description>车辆违规记录</description>
......
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.ShipQuantityConstant;
import com.xyst.dinas.sales.dao.ShipQuantityDao;
import com.xyst.dinas.sales.internal.dao.ShipQuantityDaoImpl;
import com.xyst.dinas.sales.internal.service.ShipQuantityServiceImpl;
import com.xyst.dinas.sales.service.ShipQuantityService;
import com.xyst.dinas.sales.web.ShipQuantityController;
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 ShipQuantityConfiguration {
@Autowired
@Qualifier(TypeConstants.CLASS_MECH)
private MetadataMech<KClass> typeMech;
@Bean(ShipQuantityConstant.ENTITY)
public KClass dischargingEntity() {
return typeMech.createStaticBeanByResource(
new ClassPathResource("/com/xyst/dinas/sales/datamodel/ShipQuantity.jmx", KClass.class));
}
//ShipQuantityDaoImpl相关bean配置
@Bean
public ShipQuantityController shipQuantityController(){
return new ShipQuantityController();
}
@Bean
public ShipQuantityService shipQuantityService(){
return new ShipQuantityServiceImpl();
}
@Bean
public ShipQuantityDao shipQuantityDao(){
return new ShipQuantityDaoImpl();
}
}
package com.xyst.dinas.sales.constant;
public interface ShipQuantityConstant {
/**
* 实体名
*/
String ENTITY = "com.xyst.dinas.sales.datamodel.ShipQuantity";
}
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 ShipQuantityDao extends BaseDao {
KObject load(UUID id);
UUID create(KObject kObject);
Page<KObject> listShipQuantitygInfoPaging(Page<KObject> page, UUID purchaseSandUnitId, List<UUID> regionalCompanyIds);
void deleteById(UUID id);
}
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.ShipQuantityConstant;
import com.xyst.dinas.sales.dao.ShipQuantityDao;
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 ShipQuantityDaoImpl extends AbstractBaseDao implements ShipQuantityDao, ShipQuantityConstant {
@Autowired
private HibernateTemplate template;
@Autowired
private DinasOrganizationService dinasOrganizationService;
@Autowired
private BapContext bapContext;
@Autowired
private ShipQuantityDao shipQuantityDao;
@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> listShipQuantitygInfoPaging(Page<KObject> page, UUID purchaseSandUnitId, List<UUID> regionalCompanyIds) {
KClass bean = Amino.getStaticMetadataContext().getBean(ShipQuantityConstant.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 ShipQuantityConstant.ENTITY;
}
}
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.ShipInfoDao;
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.ShipQuantityDao;
import com.xyst.dinas.sales.enumeration.VehicleAmountPartyErrorCodeEnum;
import com.xyst.dinas.sales.service.ShipQuantityService;
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 ShipQuantityServiceImpl implements ShipQuantityService {
@Autowired
private ShipQuantityDao shipQuantityDao;
@Autowired
private DinasTypeDao dinasTypeDao;
@Autowired
private PurchaseSandCompanyDao purchaseSandCompanyDao;
@Autowired
private ProjectFiledDao projectFiledDao;
@Autowired
private ContractDao contractDao;
@Autowired
ContractService contractService;
@Autowired
private ShipInfoDao shipInfoDao;
/**
* @Author yanHeng
* @Date 2022/4/6 11:36
* @Param [kobject]
* @return java.util.UUID
* 新建运船量方信息
**/
@Override
@Transactional(rollbackFor = Exception.class)
public UUID addShipQuantity(KObject kObject)throws Exception {
//添加运船量方信息
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("contract", contract);
kObject.set("project", projectFiledDao.load(projectId));
kObject.set("purchaseSandUnit", purchaseSandCompanyDao.load(purchaseSandUnitId));
kObject.set("dinasType", dinasTypeDao.load(dinasTypeId));
UUID uuid = shipQuantityDao.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 shipQuantityDao.listShipQuantitygInfoPaging(page, purchaseSandUnitId,regionalCompanyIds);
}
@Override
public KObject getById(UUID id) {
return shipQuantityDao.load(id);
}
@Override
@Transactional(rollbackFor = Exception.class)
public ResponseObj deleteById(UUID id) {
BigDecimal amount ;
//逻辑删除 反还合同的预付款金额= 运船量方总价
KObject shipQuantity = shipQuantityDao.load(id);
//获取运船量方总价
amount = BigDecimal.ZERO.add(new BigDecimal(shipQuantity.getString("amount")));
UUID contractId = shipQuantity.get("contract").getUuid("id");
UUID dinasTypeId = shipQuantity.get("dinasType").getUuid("id");
Boolean flag = contractService.modifyInventory(contractId,
dinasTypeId, BigDecimal.ZERO, amount);
if(!flag){
return ResponseObj.error(400,"预付款余额反还异常");
}else{
shipQuantityDao.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.beecode.inz.basis.team.pojo.ResponseObj;
import com.beecode.inz.common.exception.BusinessException;
import org.springframework.web.multipart.MultipartException;
import java.util.List;
import java.util.UUID;
public interface ShipQuantityService {
UUID addShipQuantity(KObject kobject) throws Exception;
Object queryByPaging(Page<KObject> objectPage, UUID purchaseSandUnitId, List<UUID> regionalCompanyIds) throws Exception ;
KObject getById(UUID id);
ResponseObj deleteById(UUID id) throws MultipartException;
}
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.xyst.dinas.sales.constant.ShipQuantityConstant;
import com.xyst.dinas.sales.service.ShipQuantityService;
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/ship/quantity")
public class ShipQuantityController {
private static final Logger logger = LoggerFactory.getLogger(ShipQuantityController.class);
@Autowired
private ShipQuantityService shipQuantity;
/**
* 新建运船量方
*
* @param body
* @return ResponseObj
*/
@PostMapping("/addShipQuantity")
public ResponseObj create(@RequestBody String body) throws Exception {
KObject kobject = JSONObjectUtils.toObject(body, Amino.getApplicationMetadataContext().getBean(ShipQuantityConstant.ENTITY, KClass.class));
//判空校验
if (null == kobject.get("project").getUuid("id")) {
return ResponseObj.error(400, "请选择具体的项目");
}
if (null == kobject.get("purchaseSandUnit").getUuid("id")) {
return ResponseObj.error(400, "请选择具体的购砂单位");
}
if (null == kobject.get("contract").getUuid("id")) {
return ResponseObj.error(400, "请选择具体的合同");
}
if (null == kobject.get("dinasType").getUuid("id")) {
return ResponseObj.error(400, "请选择具体的砂石类型");
}
if (null == kobject.get("transportShipName")) {
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 = shipQuantity.addShipQuantity(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("查询成功", shipQuantity.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 = shipQuantity.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 shipQuantity.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>ShipQuantityCard</name>
<title>卡片查看</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='7d23b8b6-829d-4f9a-b699-52a876192685' 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>ShipQuantityCoefficient</name>
<title>折方系数配置</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='8b67e91f-5a3e-4e83-b0aa-1527ab9bfad8' 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>ShipQuantityCreate</name>
<title>新建</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='6a78ea5e-a620-45ec-a297-762269f047e3' 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>ShipQuantityDelete</name>
<title>删除</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='418f297a-6e00-4c39-9306-b4872410bc30' category='销售/运船量方(区域公司)' seq='5'></privilege>
</content>
</model>
\ No newline at end of file
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package>
<name>ShipQuantityList</name>
<title>列表</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='deb57acd-6d99-4d85-944b-d857cd509d07' 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>ShipQuantityPrice</name>
<title>折方单价配置</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='22357852-7323-4b8f-abca-e0638ea0f8fa' 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>ShipQuantity</name>
<description>运船量方</description>
</header>
<content>
<bill>
<data>
{
"baseData": {
"name": "ShipQuantity",
"title": "运船量方",
"billModel": "com.beecode.bap.biztrait.BasicBillBiztrait",
"functionLibrarys": [],
"description": "运船量方",
"dataModel": "com.xyst.dinas.sales.datamodel.ShipQuantity"
},
"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>inz.query.Query</type>
<package>com.xyst.dinas.sales.query</package>
<name>ShipQuantity</name>
<title>运船量方</title>
<tags></tags>
<description></description>
</header>
<content>
<customQuery id='8d344b00-ee23-42fe-888b-2a0cf34eb4a6'>
<kclass>com.xyst.dinas.sales.datamodel.ShipQuantity</kclass>
<dataProcessor>com.xyst.dinas.sales.processor.SalesPlanProcessor</dataProcessor>
<authorityItem></authorityItem>
<innerScene title='全部'>
<id>9794d739-c44a-4b49-9733-9655af862283</id>
<javaImplement>com.beecode.inz.common.scene.CommonAllScene</javaImplement>
<defaultExecute></defaultExecute>
<hide></hide>
</innerScene>
<innerScene title='已废弃'>
<id>2170c1aa-3f63-4fb2-bb1e-cd2314ea18e6</id>
<javaImplement>com.beecode.inz.common.scene.DefaultDiscardScene</javaImplement>
<defaultExecute></defaultExecute>
<hide></hide>
</innerScene>
<innerScene title='权限过滤'>
<id>14c291e5-66d7-4cb4-80c2-e2a9d4143c8e</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='运砂船'>
<name>transportShipName</name>
<type>string</type>
<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>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
......@@ -2,4 +2,5 @@
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.VehicleAmountPartyConfiguration,\
com.xyst.dinas.sales.config.ShipQuantityConfiguration
<?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>7d23b8b6-829d-4f9a-b699-52a876192685</id>
<name>com.xyst.dinas.sales.auth.ShipQuantityCard</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>8b67e91f-5a3e-4e83-b0aa-1527ab9bfad8</id>
<name>com.xyst.dinas.sales.auth.ShipQuantityCoefficient</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>6a78ea5e-a620-45ec-a297-762269f047e3</id>
<name>com.xyst.dinas.sales.auth.ShipQuantityCreate</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>418f297a-6e00-4c39-9306-b4872410bc30</id>
<name>com.xyst.dinas.sales.auth.ShipQuantityDelete</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>5</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>deb57acd-6d99-4d85-944b-d857cd509d07</id>
<name>com.xyst.dinas.sales.auth.ShipQuantityList</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>22357852-7323-4b8f-abca-e0638ea0f8fa</id>
<name>com.xyst.dinas.sales.auth.ShipQuantityPrice</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>
<id>51def093-e3b9-4121-8cc2-2aa74442d430</id>
<name>com.xyst.dinas.sales.bill.CoefficientOrPrice$sequence</name>
<title>折方系数$sequence</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