Skip to content

C
cloud-fb
Commit 93ad73f3 by yanHeng
Options

[新增] 车辆量方接口增加

parent 472e3760
Showing with 543 additions and 165 deletions
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/DinasType$sequence.jmx
<?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>5135df09-f69a-46c1-a3b1-f7755931c284</id>
<id>1fcd99da-ae3e-4b6b-9889-c0afb11803f8</id>
<name>com.xyst.dinas.biz.bill.DinasType$sequence</name>
<title>砂石类型$sequence</title>
<description>砂石类型</description>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/DinasType$serial.jmx
<?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>c59fac44-18ba-45cc-b5c8-09e36094a7a1</id>
<id>7d1c908c-bd12-43c9-b7ce-07d8ca86932e</id>
<name>com.xyst.dinas.biz.bill.DinasType$serial</name>
<title>砂石类型$serial</title>
<description>砂石类型</description>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/DinasType.jmx
<?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>48aa8b39-f86a-40bc-b1d6-77f6d44cbad0</id>
<id>118ff82e-c9d6-4bba-9be1-f6a7415d3b1d</id>
<name>com.xyst.dinas.biz.bill.DinasType</name>
<title>砂石类型</title>
<description>砂石类型</description>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Position$sequence.jmx
<?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>4adc7582-b6ec-4e8e-bf9f-80da52f9c3fc</id>
<id>dbdf7c13-5cb0-4364-9a41-f34f599843b3</id>
<name>com.xyst.dinas.biz.bill.Position$sequence</name>
<title>岗位$sequence</title>
<description>岗位</description>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Position$serial.jmx
<?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>ccb543fc-0fab-43ad-a794-dfe372e94921</id>
<id>ad568f32-2377-499a-8245-32a133592100</id>
<name>com.xyst.dinas.biz.bill.Position$serial</name>
<title>岗位$serial</title>
<description>岗位</description>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Position.jmx
<?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>ff23a442-2d8f-4953-ad58-d5653f56ff5b</id>
<id>feb7816d-13ef-4723-8676-5d63cba71f56</id>
<name>com.xyst.dinas.biz.bill.Position</name>
<title>岗位</title>
<description>岗位</description>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/ShipInfo$sequence.jmx
<?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>0bc76490-a6bb-4f67-b527-6c3bd00e8617</id>
<id>fd466795-82c7-41c4-9b6f-27fc9568a35a</id>
<name>com.xyst.dinas.biz.bill.ShipInfo$sequence</name>
<title>船舶备案$sequence</title>
<description>船舶备案</description>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/ShipInfo$serial.jmx
<?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>1c06a5bb-50ec-41c1-a9b0-7bc4eabfc4f2</id>
<id>ddc5e2a5-cb8e-4e20-9b7f-6d89798d0fb3</id>
<name>com.xyst.dinas.biz.bill.ShipInfo$serial</name>
<title>船舶备案$serial</title>
<description>船舶备案</description>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/ShipInfo.jmx
<?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>a7ab36a6-fe87-4aab-84d3-5fca800d5cd7</id>
<id>91d5cfa4-4ecf-4a96-90f4-ec66a6803791</id>
<name>com.xyst.dinas.biz.bill.ShipInfo</name>
<title>船舶备案</title>
<description>船舶备案</description>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Station$sequence.jmx
<?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>5904a898-6b55-4b75-a28e-924247e81b91</id>
<id>3f9f7f67-4ee7-4976-916f-08a47c4af616</id>
<name>com.xyst.dinas.biz.bill.Station$sequence</name>
<title>场站$sequence</title>
<description>场站</description>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Station$serial.jmx
<?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>98c9fc26-cb05-46fa-ac99-6d9fa0cd3924</id>
<id>ff7d68c1-0742-4a8f-ba2f-4a76c9c06e3f</id>
<name>com.xyst.dinas.biz.bill.Station$serial</name>
<title>场站$serial</title>
<description>场站</description>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Station.jmx
<?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>44610cb5-a18f-4342-af93-db7aece28c04</id>
<id>4a9cbea1-40de-457b-9154-cc285edf558f</id>
<name>com.xyst.dinas.biz.bill.Station</name>
<title>场站</title>
<description>场站</description>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/xystOrganization$sequence.jmx
<?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>264b084e-540c-4469-a5cc-57ef0b1e6e66</id>
<id>ff5a8d2d-b30d-4078-bcb0-149a07d2369c</id>
<name>com.xyst.dinas.biz.bill.xystOrganization$sequence</name>
<title>组织机构$sequence</title>
<description>组织机构</description>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/xystOrganization$serial.jmx
<?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>c26d1f41-2ef2-4f88-9c77-557f60fd8f80</id>
<id>3213e399-0acf-4577-987c-cb12430b8bfa</id>
<name>com.xyst.dinas.biz.bill.xystOrganization$serial</name>
<title>组织机构$serial</title>
<description>组织机构</description>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/xystOrganization.jmx
<?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>6e20c555-cfc0-4b0f-a4f8-5c317b954884</id>
<id>273de633-8239-4867-9671-e52d831b527c</id>
<name>com.xyst.dinas.biz.bill.xystOrganization</name>
<title>组织机构</title>
<description>组织机构</description>
......
backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/internal/dao/ContractDao.java
......@@ -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;
}
}
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/bill/ContractBill$sequence.jmx
<?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>4035c5f4-850a-4d4c-9a79-f397c161acd4</id>
<id>3e17d6f7-0b51-4312-8d53-cc177ac3cf83</id>
<name>com.xyst.dinas.contract.bill.ContractBill$sequence</name>
<title>合同单据$sequence</title>
<description>合同单据</description>
......
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/bill/ContractBill$serial.jmx
<?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>9a55b07a-64f5-466a-b6ab-c79aff4190cb</id>
<id>033f42cc-cd08-4de2-a96f-d9dd74eba2e3</id>
<name>com.xyst.dinas.contract.bill.ContractBill$serial</name>
<title>合同单据$serial</title>
<description>合同单据</description>
......
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/bill/ContractBill.jmx
<?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>249b0ebe-a921-42e4-87e5-978be55223e7</id>
<id>f7096b4c-8936-469c-a98a-03096a641b22</id>
<name>com.xyst.dinas.contract.bill.ContractBill</name>
<title>合同单据</title>
<description>合同单据</description>
......
backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/ArtificialRecharge$sequence.jmx
<?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>9dc7b1b3-efa6-41fe-9424-d539b1e024ac</id>
<id>0bb1d92c-1b41-4a1b-9cd2-6220b43976da</id>
<name>com.xyst.dinas.finance.bill.ArtificialRecharge$sequence</name>
<title>人工充值$sequence</title>
<define>bcp.sequence</define>
......
backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/ArtificialRecharge$serial.jmx
<?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>5f271107-900b-4482-a5cf-ae67a289cc61</id>
<id>778bdb2a-ee28-4679-b12b-7b6658b2c5b0</id>
<name>com.xyst.dinas.finance.bill.ArtificialRecharge$serial</name>
<title>人工充值$serial</title>
<define>bcp.serial</define>
......
backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/ArtificialRecharge.jmx
<?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>7427b5db-29d7-4edc-914c-5a0346e3c9a8</id>
<id>bbad4263-de84-448d-93b9-7ca3129bd48b</id>
<name>com.xyst.dinas.finance.bill.ArtificialRecharge</name>
<title>人工充值</title>
<define>bcp.biz.Biztype</define>
......
backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/BankRechargeDetail$sequence.jmx
<?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>271e938f-e884-45d0-8dc6-9ace12816bf9</id>
<id>cf25f09d-e567-45b1-9bc1-10f381b0d6db</id>
<name>com.xyst.dinas.finance.bill.BankRechargeDetail$sequence</name>
<title>银行充值明细$sequence</title>
<define>bcp.sequence</define>
......
backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/BankRechargeDetail$serial.jmx
<?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>1a2827fd-17c0-4f8c-b987-6e8ca9ca9bfa</id>
<id>1dcfca01-5194-44df-a8bb-3a8f54798ac9</id>
<name>com.xyst.dinas.finance.bill.BankRechargeDetail$serial</name>
<title>银行充值明细$serial</title>
<define>bcp.serial</define>
......
backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/BankRechargeDetail.jmx
<?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>168c68fe-8b11-4b1c-90aa-5d30529d1611</id>
<id>40c0dcc3-f7bf-48bc-b6f0-b406187a51f5</id>
<name>com.xyst.dinas.finance.bill.BankRechargeDetail</name>
<title>银行充值明细</title>
<define>bcp.biz.Biztype</define>
......
backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/ExpenseAdjust$sequence.jmx
<?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>e2bc49ef-469d-4718-88fc-ac2e836efea7</id>
<id>6d094a46-9904-4655-96eb-5d345c4710c2</id>
<name>com.xyst.dinas.finance.bill.ExpenseAdjust$sequence</name>
<title>费用调整$sequence</title>
<define>bcp.sequence</define>
......
backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/ExpenseAdjust$serial.jmx
<?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>46da1c1e-0c51-4d55-a7cb-48eff4339f34</id>
<id>a2bf35e4-b3d1-43b8-a76b-bd35b136bb67</id>
<name>com.xyst.dinas.finance.bill.ExpenseAdjust$serial</name>
<title>费用调整$serial</title>
<define>bcp.serial</define>
......
backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/ExpenseAdjust.jmx
<?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>aa65bf2c-d0ce-48b1-aa29-54ba1c1e25fd</id>
<id>774da827-8ec3-407d-bdda-95a6067fb02a</id>
<name>com.xyst.dinas.finance.bill.ExpenseAdjust</name>
<title>费用调整</title>
<define>bcp.biz.Biztype</define>
......
backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/FinanceRefund$sequence.jmx
<?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>d741dd7b-81e1-4139-856d-05a410717afa</id>
<id>63c20e7f-967f-4ba5-be92-abfa5580ef69</id>
<name>com.xyst.dinas.finance.bill.FinanceRefund$sequence</name>
<title>财务退款$sequence</title>
<define>bcp.sequence</define>
......
backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/FinanceRefund$serial.jmx
<?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>a672cd9c-3006-4684-adbf-8c294960187a</id>
<id>7621ae2f-9f93-4b58-b589-663c27e3b227</id>
<name>com.xyst.dinas.finance.bill.FinanceRefund$serial</name>
<title>财务退款$serial</title>
<define>bcp.serial</define>
......
backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/FinanceRefund.jmx
<?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>cf2da459-d197-432d-86b8-c13ac5110b57</id>
<id>bbccf1f0-944a-459e-ac88-7844720047db</id>
<name>com.xyst.dinas.finance.bill.FinanceRefund</name>
<title>财务退款</title>
<define>bcp.biz.Biztype</define>
......
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/BusinessTripApply$sequence.jmx
<?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>9f17243f-fe3e-4aa7-94d5-193db7912561</id>
<id>697c466e-aecd-4e95-a5ac-75cacff0c5ed</id>
<name>com.xyst.dinas.oa.bill.BusinessTripApply$sequence</name>
<title>出差申请$sequence</title>
<description>出差申请</description>
......
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/BusinessTripApply$serial.jmx
<?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>5dc0e38a-fd14-4a76-b3fb-38880a532345</id>
<id>04238b76-bffc-44f7-af88-a971d8951c69</id>
<name>com.xyst.dinas.oa.bill.BusinessTripApply$serial</name>
<title>出差申请$serial</title>
<description>出差申请</description>
......
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/BusinessTripApply.jmx
<?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>e3f01da5-ead7-43ec-9904-f68626d3087b</id>
<id>8b2da032-63f4-4aa2-a40f-4c6dd21b4af0</id>
<name>com.xyst.dinas.oa.bill.BusinessTripApply</name>
<title>出差申请</title>
<description>出差申请</description>
......
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/ProtocolDocument$sequence.jmx
<?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>87d7f4bb-58bd-4633-b905-e822c65863d3</id>
<id>97c17ccd-d68b-412c-b352-83c27849ddff</id>
<name>com.xyst.dinas.oa.bill.ProtocolDocument$sequence</name>
<title>拟文$sequence</title>
<description>拟文</description>
......
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/ProtocolDocument$serial.jmx
<?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>c1bf4d3c-3596-4b61-88b5-818008dc4ae2</id>
<id>a4ec58ac-43dd-47ff-bda5-1d1de6a96eb9</id>
<name>com.xyst.dinas.oa.bill.ProtocolDocument$serial</name>
<title>拟文$serial</title>
<description>拟文</description>
......
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/ProtocolDocument.jmx
<?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>48529dea-c747-4f62-bb0c-e359008e7c76</id>
<id>cf7cbea4-52be-485c-a953-0e360e247b5c</id>
<name>com.xyst.dinas.oa.bill.ProtocolDocument</name>
<title>拟文</title>
<description>拟文</description>
......
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/SealBorrow$sequence.jmx
<?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>3db85288-c147-4c80-a88a-0deaf859f39c</id>
<id>9b61a610-cf75-4b46-97be-e0e65327faed</id>
<name>com.xyst.dinas.oa.bill.SealBorrow$sequence</name>
<title>证章借出$sequence</title>
<description>证章借出</description>
......
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/SealBorrow$serial.jmx
<?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>db5c8c5b-e6e8-4c2c-99a9-de2cb6b6a6fa</id>
<id>54ab7ab0-b86f-4a93-947d-3001bca83a1e</id>
<name>com.xyst.dinas.oa.bill.SealBorrow$serial</name>
<title>证章借出$serial</title>
<description>证章借出</description>
......
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/SealBorrow.jmx
<?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>4f3c165f-7ff2-4346-831c-96d49fe6f0c3</id>
<id>11fe5a6a-04cd-4b4a-8113-ded4b879a72b</id>
<name>com.xyst.dinas.oa.bill.SealBorrow</name>
<title>证章借出</title>
<description>证章借出</description>
......
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/UseCarApply$sequence.jmx
<?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>5da4f1f7-a337-441d-b592-60d72d0be66e</id>
<id>4c0ef1c8-de69-402a-9fdd-763a54f82926</id>
<name>com.xyst.dinas.oa.bill.UseCarApply$sequence</name>
<title>用车申请$sequence</title>
<description>用车申请</description>
......
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/UseCarApply$serial.jmx
<?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>76330aa6-3f2f-4c8f-8b7c-69669073ffd6</id>
<id>719ba5a3-8b7d-4b9b-82a7-b563087b6a29</id>
<name>com.xyst.dinas.oa.bill.UseCarApply$serial</name>
<title>用车申请$serial</title>
<description>用车申请</description>
......
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/UseCarApply.jmx
<?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>454a7419-45af-4763-ad1d-f65106839177</id>
<id>4ca79c7d-5b4b-4ca5-8f0a-514d138a28b2</id>
<name>com.xyst.dinas.oa.bill.UseCarApply</name>
<title>用车申请</title>
<description>用车申请</description>
......
backend/xyst.dinas.production/src/main/resources/com/xyst/dinas/production/bill/Discharging$sequence.jmx
<?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>a49eb824-4fd7-40de-be21-b87e21db27d5</id>
<id>160b113c-eeb9-47ad-9106-2bfa27b10cfe</id>
<name>com.xyst.dinas.production.bill.Discharging$sequence</name>
<title>接驳管理$sequence</title>
<description>接驳管理</description>
......
backend/xyst.dinas.production/src/main/resources/com/xyst/dinas/production/bill/Discharging$serial.jmx
<?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>a8a25984-5248-4342-82c6-ff8c44d4f93b</id>
<id>5982094e-32d9-4cf6-8a94-28c7dd471f31</id>
<name>com.xyst.dinas.production.bill.Discharging$serial</name>
<title>接驳管理$serial</title>
<description>接驳管理</description>
......
backend/xyst.dinas.production/src/main/resources/com/xyst/dinas/production/bill/Discharging.jmx
<?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>48ab49e3-8309-4495-b67f-045fffb9d7a7</id>
<id>b673733a-b0f5-4632-8a3b-03b80969c0cd</id>
<name>com.xyst.dinas.production.bill.Discharging</name>
<title>接驳管理</title>
<description>接驳管理</description>
......
backend/xyst.dinas.production/src/main/resources/com/xyst/dinas/production/bill/ProductionPlanReport$sequence.jmx
<?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>eec858f0-fd4e-424c-91ee-241e9bca0dc5</id>
<id>e63abb19-a8b0-4d26-9471-d6337fd446ff</id>
<name>com.xyst.dinas.production.bill.ProductionPlanReport$sequence</name>
<title>生产管理$sequence</title>
<description>生产管理</description>
......
backend/xyst.dinas.production/src/main/resources/com/xyst/dinas/production/bill/ProductionPlanReport$serial.jmx
<?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>c89c8bcb-f1f2-48f8-9f66-4e8b82719152</id>
<id>af12874d-79be-4998-b0b8-463e848afb34</id>
<name>com.xyst.dinas.production.bill.ProductionPlanReport$serial</name>
<title>生产管理$serial</title>
<description>生产管理</description>
......
backend/xyst.dinas.production/src/main/resources/com/xyst/dinas/production/bill/ProductionPlanReport.jmx
<?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>0a2824ee-72a6-44b4-842b-b64e72c68849</id>
<id>4c76e206-b105-4223-9f8c-a37eed8e4fb9</id>
<name>com.xyst.dinas.production.bill.ProductionPlanReport</name>
<title>生产管理</title>
<description>生产管理</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/PersonnelViolation$sequence.jmx
<?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>7c8cb47d-a20c-436e-bb5d-8de33bb51949</id>
<id>2aff0281-3377-44ef-8f1b-532fbb8e2ff5</id>
<name>com.xyst.dinas.safe.bill.PersonnelViolation$sequence</name>
<title>人员违规记录$sequence</title>
<description>人员违规记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/PersonnelViolation$serial.jmx
<?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>69cb3119-5e11-49ad-9a04-70dc4651f62b</id>
<id>10510a26-f6d9-4204-93aa-5f44d5823816</id>
<name>com.xyst.dinas.safe.bill.PersonnelViolation$serial</name>
<title>人员违规记录$serial</title>
<description>人员违规记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/PersonnelViolation.jmx
<?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>38dd2da8-c0b7-47d2-a920-a60ac0fc32d6</id>
<id>3ac2ffa1-64d6-4017-b811-a7f9bc51392c</id>
<name>com.xyst.dinas.safe.bill.PersonnelViolation</name>
<title>人员违规记录</title>
<description>人员违规记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/ProductionLineViolation$sequence.jmx
<?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>eb2d6e29-da46-4447-a265-814bb10c77fe</id>
<id>4ebf11bc-fc7a-4de1-a519-e61651859c6b</id>
<name>com.xyst.dinas.safe.bill.ProductionLineViolation$sequence</name>
<title>生产违规记录$sequence</title>
<description>生产违规记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/ProductionLineViolation$serial.jmx
<?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>c49b4788-196e-42f0-bf49-0d0880e63bbf</id>
<id>82b2e89f-ed36-46b8-8d3b-6ffd52d6a9d9</id>
<name>com.xyst.dinas.safe.bill.ProductionLineViolation$serial</name>
<title>生产违规记录$serial</title>
<description>生产违规记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/ProductionLineViolation.jmx
<?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>c1d6671f-1fe6-4154-b517-1b6cbbdf9fd6</id>
<id>4ad2ec60-7bab-4c90-a83a-db9b86a90156</id>
<name>com.xyst.dinas.safe.bill.ProductionLineViolation</name>
<title>生产违规记录</title>
<description>生产违规记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/SafeLog$sequence.jmx
<?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>7a66fb38-ab45-4633-be3f-f678bec50095</id>
<id>73fe74a9-51ac-46fc-bb5f-6e3418a0c46b</id>
<name>com.xyst.dinas.safe.bill.SafeLog$sequence</name>
<title>安全日志$sequence</title>
<description>安全日志</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/SafeLog$serial.jmx
<?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>ebc59dc2-896f-4be5-9efc-df9a72f41cad</id>
<id>2cda0902-6c51-484f-bd6d-fc18bac70807</id>
<name>com.xyst.dinas.safe.bill.SafeLog$serial</name>
<title>安全日志$serial</title>
<description>安全日志</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/SafeLog.jmx
<?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>086ced2b-38b5-4edb-b393-95de97c2daf1</id>
<id>6edb4731-8083-4ccd-a51f-f2d78c8724c5</id>
<name>com.xyst.dinas.safe.bill.SafeLog</name>
<title>安全日志</title>
<description>安全日志</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/ShipViolation$sequence.jmx
<?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>0dbd86f1-8e54-4856-a0c6-9eae3fb1acea</id>
<id>5a95db2d-4f8c-4053-8a7e-7406f9fbf68a</id>
<name>com.xyst.dinas.safe.bill.ShipViolation$sequence</name>
<title>船舶违规记录$sequence</title>
<description>船舶违规记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/ShipViolation$serial.jmx
<?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>d153dec9-8d83-448b-bf2c-4805bea85744</id>
<id>25504932-5e09-4e65-a2ae-635015f38947</id>
<name>com.xyst.dinas.safe.bill.ShipViolation$serial</name>
<title>船舶违规记录$serial</title>
<description>船舶违规记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/ShipViolation.jmx
<?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>5bc6ca03-75d1-4063-a495-e9e17328088a</id>
<id>874218ee-952c-45f7-8eb7-9341989dbb20</id>
<name>com.xyst.dinas.safe.bill.ShipViolation</name>
<title>船舶违规记录</title>
<description>船舶违规记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/StaffViolation$sequence.jmx
<?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>b7deaa60-43e1-40e2-9200-310c3a235ea7</id>
<id>15cfec21-137e-481a-b983-19c8f62170e8</id>
<name>com.xyst.dinas.safe.bill.StaffViolation$sequence</name>
<title>人员违规记录$sequence</title>
<description>人员违规记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/StaffViolation$serial.jmx
<?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>bdf0b4ac-2bbb-42ba-8124-f6f999a00727</id>
<id>507911f2-b0a6-4cde-8ce7-de0cd878e081</id>
<name>com.xyst.dinas.safe.bill.StaffViolation$serial</name>
<title>人员违规记录$serial</title>
<description>人员违规记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/StaffViolation.jmx
<?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>9c72c86d-47a3-4c57-8dff-4234c1f4017e</id>
<id>e11b493c-5be4-4251-b6ba-f8d4fdffd5b3</id>
<name>com.xyst.dinas.safe.bill.StaffViolation</name>
<title>人员违规记录</title>
<description>人员违规记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/TrainingEducation$sequence.jmx
<?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>ed6439a7-d16c-49c4-a05f-5ba851ace6bb</id>
<id>40e4c497-c3c9-469b-8f98-0c37312a3194</id>
<name>com.xyst.dinas.safe.bill.TrainingEducation$sequence</name>
<title>安全教育培训记录$sequence</title>
<description>安全教育培训记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/TrainingEducation$serial.jmx
<?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>5177efee-9f8a-4a74-8778-38e55ce7a6d4</id>
<id>50c0b56c-09a6-452f-8da5-ec128e7fe86d</id>
<name>com.xyst.dinas.safe.bill.TrainingEducation$serial</name>
<title>安全教育培训记录$serial</title>
<description>安全教育培训记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/TrainingEducation.jmx
<?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>feaa8a4e-1ce0-4879-a5b2-7b79fe4421f7</id>
<id>18ee7669-40e6-4212-bf80-c1d62b5eccb2</id>
<name>com.xyst.dinas.safe.bill.TrainingEducation</name>
<title>安全教育培训记录</title>
<description>安全教育培训记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/VehicleViolation$sequence.jmx
<?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>4cba8fa8-b217-40fe-865c-fc7cc99268a3</id>
<id>b18fceb3-630e-4139-b3a7-6b0a79aa23ee</id>
<name>com.xyst.dinas.safe.bill.VehicleViolation$sequence</name>
<title>车辆违规记录$sequence</title>
<description>车辆违规记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/VehicleViolation$serial.jmx
<?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>ec5d7314-7487-4253-a2a8-95e675208df1</id>
<id>0be6009b-6bef-41df-99a0-dd810bc275a3</id>
<name>com.xyst.dinas.safe.bill.VehicleViolation$serial</name>
<title>车辆违规记录$serial</title>
<description>车辆违规记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/VehicleViolation.jmx
<?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>799e4d62-66e5-4738-bf6e-ec3323e303a8</id>
<id>90a90083-b62a-4037-a807-45eca685b5c3</id>
<name>com.xyst.dinas.safe.bill.VehicleViolation</name>
<title>车辆违规记录</title>
<description>车辆违规记录</description>
......
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/dao/CoefficientOrPriceDao.java
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;
/**
......@@ -12,4 +14,10 @@ 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);
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/dao/VehicleAmountPartyDao.java
......@@ -4,6 +4,7 @@ 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;
/**
......@@ -15,5 +16,5 @@ public interface VehicleAmountPartyDao extends BaseDao {
UUID create(KObject kObject);
Page<KObject> listVehicleAmountPartygInfoPaging(Page<KObject> page, UUID purchaseSandUnitId);
Page<KObject> listVehicleAmountPartygInfoPaging(Page<KObject> page, UUID purchaseSandUnitId, List<UUID> regionalCompanyIds);
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/dao/CoefficientOrPriceDaoImpl.java
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.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;
......@@ -18,6 +35,11 @@ public class CoefficientOrPriceDaoImpl extends AbstractBaseDao implements Coeffi
@Autowired
private HibernateTemplate template;
@Autowired
private DinasOrganizationService dinasOrganizationService;
@Autowired
private BapContext bapContext;
@Autowired
private CoefficientOrPriceDao coefficientOrPriceDao;
......@@ -26,6 +48,66 @@ public class CoefficientOrPriceDaoImpl extends AbstractBaseDao implements Coeffi
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);
}
/**
......
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/dao/VehicleAmountPartyDaoImpl.java
......@@ -2,22 +2,24 @@ 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.CoefficientOrPriceConstant;
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.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.UUID;
import java.util.*;
/**
* @author yanheng
......@@ -28,6 +30,11 @@ public class VehicleAmountPartyDaoImpl extends AbstractBaseDao implements Vehicl
private HibernateTemplate template;
@Autowired
private DinasOrganizationService dinasOrganizationService;
@Autowired
private BapContext bapContext;
@Autowired
private VehicleAmountPartyDao vehicleAmountPartyDao;
@Override
......@@ -44,11 +51,27 @@ public class VehicleAmountPartyDaoImpl extends AbstractBaseDao implements Vehicl
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) {
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<>();
......@@ -60,6 +83,10 @@ public class VehicleAmountPartyDaoImpl extends AbstractBaseDao implements Vehicl
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);
......
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/service/CoefficientOrPriceServiceImpl.java
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;
......@@ -11,15 +24,97 @@ import java.util.UUID;
public class CoefficientOrPriceServiceImpl implements CoefficientOrPriceService {
@Autowired
private CoefficientOrPriceDao coefficientOrPriceDao;
@Autowired
private StationDao stationDao;
@Autowired
private DinasTypeDao dinasTypeDao;
/**
* @Author yanHeng
* @Date 2022/4/6 11:36
* @Param [kobject]
* @return java.util.UUID
* 新建折方系数,单价
* @Author yanHeng
* @Date 2022/4/6 11:36
* @Param [kobject]
**/
@Override
public UUID addCoefficientOrPrice(KObject kobject) {
return null;
@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);
}
}
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/service/VehicleAmountPartyServiceImpl.java
......@@ -5,6 +5,7 @@ import com.beecode.bcp.type.KObject;
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;
......@@ -12,7 +13,8 @@ import com.xyst.dinas.sales.service.VehicleAmountPartyService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.math.BigDecimal;
import java.util.List;
import java.util.UUID;
......@@ -39,6 +41,8 @@ public class VehicleAmountPartyServiceImpl implements VehicleAmountPartyService
@Autowired
private ContractDao contractDao;
@Autowired
ContractService contractService;
/**
* @Author yanHeng
......@@ -48,31 +52,55 @@ public class VehicleAmountPartyServiceImpl implements VehicleAmountPartyService
* 新建车辆量方信息
**/
@Override
public UUID addVehicleAmountParty(KObject kObject) {
@Transactional(rollbackFor = Exception.class)
public UUID addVehicleAmountParty(KObject kObject)throws Exception {
//添加车辆量方信息
//场站信息
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");
Date dealTime = kObject.getDate("dealTime");
KObject contract = contractDao.load(contractId);
kObject.set("station", stationDao.load(stationId));
kObject.set("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 = vehicleAmountPartyDao.create(kObject);
//扣减预付款余额 ,取得总价 进行扣减
try {
//查询合同余额,如果预付款小于总价,不允许交易
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 Exception("预付款余额不足，请先联系客户进行充值操作");
}
//进行扣减操作 传入当前合同 和 扣减总价,
// 更新合同子表合同砂石余量(吨)-更新合同表付款余额、销售总量信息
amount = BigDecimal.ZERO.subtract(new BigDecimal(kObject.getString("amount")));
Boolean flag = contractService.modifyInventory(contractId,
dinasTypeId, BigDecimal.ZERO, amount);
if(!flag){
throw new Exception("预付款余额扣减失败");
}
}catch (Exception e){
throw new Exception(e.toString());
}
return uuid;
}
@Override
public Page<KObject> queryByPaging(Page<KObject> page, UUID purchaseSandUnitId) throws Exception {
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);
return vehicleAmountPartyDao.listVehicleAmountPartygInfoPaging(page, purchaseSandUnitId,regionalCompanyIds);
}
......
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/service/CoefficientOrPriceService.java
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 {
//新增折方系数,单价
UUID addCoefficientOrPrice(KObject kobject);
void addCoefficientOrPrice(JsonNode jsonNode);
//查询折方
Page<KObject> queryByPaging(Page<KObject> objectPage, int type, List<UUID> regionalCompanyIds)throws Exception;
//修改
void updateCoefficientOrPrice(JsonNode jsonNode);
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/service/VehicleAmountPartyService.java
......@@ -3,13 +3,14 @@ package com.xyst.dinas.sales.service;
import com.beecode.bap.attachment.common.Page;
import com.beecode.bcp.type.KObject;
import java.util.List;
import java.util.UUID;
public interface VehicleAmountPartyService {
UUID addVehicleAmountParty(KObject kobject);
UUID addVehicleAmountParty(KObject kobject) throws Exception;
Object queryByPaging(Page<KObject> objectPage, UUID purchaseSandUnitId) throws Exception ;
Object queryByPaging(Page<KObject> objectPage, UUID purchaseSandUnitId, List<UUID> regionalCompanyIds) throws Exception ;
KObject getById(UUID id);
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/web/CoefficientOrPriceController.java
package com.xyst.dinas.sales.web;
import com.beecode.amino.core.Amino;
import com.beecode.bcp.type.KClass;
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.beecode.inz.common.BaseConstants;
import com.xyst.dinas.sales.constant.CoefficientOrPriceConstant;
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
......@@ -32,15 +31,44 @@ public class CoefficientOrPriceController {
*/
@PostMapping("/addCoefficientOrPrice")
public ResponseObj create(@RequestBody String body){
KObject kobject = JSONObjectUtils.toObject(body, Amino.getApplicationMetadataContext().getBean(CoefficientOrPriceConstant.ENTITY, KClass.class));
JsonNode jsonNode = JSONObjectUtils.toJson(body);
coefficientOrPriceService.addCoefficientOrPrice(jsonNode);
return ResponseObj.success("保存成功");
}
if(kobject.getUuid(BaseConstants.ID) == null){
return ResponseObj.error(400,"'id' must be not null!");
}
UUID id = coefficientOrPriceService.addCoefficientOrPrice(kobject);
return ResponseObj.success("保存成功", id);
/**
* 修改折方系数
* @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));
}
@GetMapping("/test")
public ResponseObj init(@RequestParam("id") String id){
System.out.println("testok");
......
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/web/VehicleAmountPartyController.java
......@@ -15,10 +15,12 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal;
import java.util.List;
import java.util.UUID;
@RestController()
@RequestMapping(value="/sales/vehicle")
@RequestMapping(value = "/sales/vehicle")
public class VehicleAmountPartyController {
private static final Logger logger = LoggerFactory.getLogger(VehicleAmountPartyController.class);
......@@ -29,104 +31,117 @@ public class VehicleAmountPartyController {
/**
* 新建车辆量方
*
* @param body
* @return ResponseObj
*/
@PostMapping("/addVehicleAmountParty")
public ResponseObj create(@RequestBody String body){
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("station").get("id")) {
return ResponseObj.error(400, "请选择具体的场站");
}
if(null==kobject.get("project").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("purchaseSandUnit").get("id")) {
return ResponseObj.error(400, "请选择具体的项目");
}
if(null==kobject.get("contract").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 (null == kobject.get("dinasType").get("id")) {
return ResponseObj.error(400, "请选择具体的砂石类型");
}
if(StringUtils.isEmpty(kobject.getString("shipCodeName"))){
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.get("dealTime")) {
return ResponseObj.error(400, "销售时间不能为空");
}
if(null==kobject.get("advanceBalance")){
return ResponseObj.error(400,"预付款余额不能为空");
if (null == kobject.getString("advanceBalance")) {
return ResponseObj.error(400, "预付款余额不能为空");
}
if(null==kobject.get("longLength")){
return ResponseObj.error(400,"长度不能为空");
if (null == kobject.getString("longLength")) {
return ResponseObj.error(400, "长度不能为空");
}
if(null==kobject.get("wideLength")){
return ResponseObj.error(400,"宽度不能为空");
if (null == kobject.getString("wideLength")) {
return ResponseObj.error(400, "宽度不能为空");
}
if(null==kobject.get("highLength")){
return ResponseObj.error(400,"高度不能为空");
if (null == kobject.getString("highLength")) {
return ResponseObj.error(400, "高度不能为空");
}
if(null==kobject.get("coefficientOf")){
return ResponseObj.error(400,"折方系数不能为空");
if (null == kobject.getString("coefficientOf")) {
return ResponseObj.error(400, "折方系数不能为空");
}
if(null==kobject.get("calculateTotalAmount")){
return ResponseObj.error(400,"计量吨位不能为空");
if (null == kobject.getString("calculateTotalAmount")) {
return ResponseObj.error(400, "计量吨位不能为空");
}
if(null==kobject.get("price")){
return ResponseObj.error(400,"单价不能为空");
if (null == kobject.getString("price")) {
return ResponseObj.error(400, "单价不能为空");
}
if(null==kobject.get("amount")){
return ResponseObj.error(400,"总价不能为空");
if (null == kobject.getString("amount")) {
return ResponseObj.error(400, "总价不能为空");
}
if(kobject.getUuid(BaseConstants.ID) == null){
return ResponseObj.error(400,"'id' must be not null!");
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);
}
/**
* @Author yanHeng
* @Date 2022/4/6 17:29
* @Param [pageNo, pageSize, purchaseSandUnitId]
* @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 = "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));
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!");
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);
KObject discharging = vehicleAmountPartyService.getById(id);
return ResponseObj.success("获取成功", discharging);
}
@GetMapping("/test")
public ResponseObj init(@RequestParam("id") String id){
public ResponseObj init(@RequestParam("id") String id) {
System.out.println("testok");
return ResponseObj.success("查询成功", id);
}
......
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/datamodel/CoefficientOrPrice.mk
......@@ -14,7 +14,10 @@
<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>
......@@ -40,7 +43,7 @@
<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车辆' type='int' default='' precision='' isArray='false'>
<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>
......
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/datamodel/VehicleAmountParty.mk
......@@ -13,6 +13,11 @@
<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>
......@@ -42,6 +47,7 @@
</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>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/CoefficientOrPrice$sequence.jmx
<?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>9b08365e-aa18-4316-a570-601aab263acd</id>
<id>0f076b81-7ea4-4e42-a781-a63bc31d7837</id>
<name>com.xyst.dinas.sales.bill.CoefficientOrPrice$sequence</name>
<title>折方系数$sequence</title>
<description>折方系数</description>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/CoefficientOrPrice$serial.jmx
<?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>7a7a2702-e496-4860-ac9e-e5ae0ba0bd1c</id>
<id>5e7e2493-6154-446d-929f-c87da3daa169</id>
<name>com.xyst.dinas.sales.bill.CoefficientOrPrice$serial</name>
<title>折方系数$serial</title>
<description>折方系数</description>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/CoefficientOrPrice.jmx
<?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>cdf087df-e4a8-4b0e-9b32-effae668b598</id>
<id>e7a3dda7-581a-4011-b6aa-8e1a68107d6a</id>
<name>com.xyst.dinas.sales.bill.CoefficientOrPrice</name>
<title>折方系数</title>
<description>折方系数</description>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/NeedPlan$sequence.jmx
<?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>576583d8-4f0d-43d1-a6cc-35315df99394</id>
<id>84395215-8daf-4e78-aa39-097cf01535d5</id>
<name>com.xyst.dinas.sales.bill.NeedPlan$sequence</name>
<title>需用计划$sequence</title>
<description>需用计划</description>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/NeedPlan$serial.jmx
<?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>400af693-f1fe-4373-ab46-7bcd8a944bfc</id>
<id>e42322d9-5f5f-45e5-a692-0beccf712388</id>
<name>com.xyst.dinas.sales.bill.NeedPlan$serial</name>
<title>需用计划$serial</title>
<description>需用计划</description>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/NeedPlan.jmx
<?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>3cd92a2b-07c6-48c1-9c92-7a485360ef80</id>
<id>69d95754-2209-4a91-9ca2-7b0b25e3a21e</id>
<name>com.xyst.dinas.sales.bill.NeedPlan</name>
<title>需用计划</title>
<description>需用计划</description>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/SalesPlan$sequence.jmx
<?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>ccd07fdf-47bd-4959-98dc-02c7dcec723b</id>
<id>f59c8459-3b86-4ceb-a8b0-58ebc4608047</id>
<name>com.xyst.dinas.sales.bill.SalesPlan$sequence</name>
<title>销售计划$sequence</title>
<description>销售计划</description>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/SalesPlan$serial.jmx
<?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>7ad858a2-7721-4093-9209-511fb9ea6193</id>
<id>0ebc5486-ca4f-4634-bac4-45bd4f4670a5</id>
<name>com.xyst.dinas.sales.bill.SalesPlan$serial</name>
<title>销售计划$serial</title>
<description>销售计划</description>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/SalesPlan.jmx
<?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>4796f20c-eb6b-4a45-b061-96a3be32f649</id>
<id>d7492c48-3dc4-4421-820e-cf6931e09080</id>
<name>com.xyst.dinas.sales.bill.SalesPlan</name>
<title>销售计划</title>
<description>销售计划</description>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/SalesPlanTemp$sequence.jmx
<?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>daf49d2f-4026-4c3d-be68-0e8d4a9adf02</id>
<id>898c09fb-a719-4698-aed6-3bbee273e431</id>
<name>com.xyst.dinas.sales.bill.SalesPlanTemp$sequence</name>
<title>临时销售计划$sequence</title>
<define>bcp.sequence</define>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/SalesPlanTemp$serial.jmx
<?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>bf8833b7-3d8a-48f8-a15d-1b867656a8ec</id>
<id>7dc2b7ff-e127-46a4-be5d-17694c57685d</id>
<name>com.xyst.dinas.sales.bill.SalesPlanTemp$serial</name>
<title>临时销售计划$serial</title>
<define>bcp.serial</define>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/SalesPlanTemp.jmx
<?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>c4d80296-20e9-4827-99d2-fb0d93d7797c</id>
<id>38737119-0416-4678-9f7d-1cebcb01c6f4</id>
<name>com.xyst.dinas.sales.bill.SalesPlanTemp</name>
<title>临时销售计划</title>
<define>bcp.biz.Biztype</define>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/VehicleAmountParty$sequence.jmx
<?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>f37d48cb-67a9-4175-a28b-0a6dba72a80e</id>
<id>cf51cf53-48ca-4088-9a56-0a0a10aa1f96</id>
<name>com.xyst.dinas.sales.bill.VehicleAmountParty$sequence</name>
<title>车辆量方$sequence</title>
<description>车辆量方</description>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/VehicleAmountParty$serial.jmx
<?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>8ce566a5-e468-447c-9615-f47fd685a5d0</id>
<id>82f98964-0111-40d4-9c59-8ac00c70f796</id>
<name>com.xyst.dinas.sales.bill.VehicleAmountParty$serial</name>
<title>车辆量方$serial</title>
<description>车辆量方</description>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/VehicleAmountParty.jmx
<?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>f79bd0fb-0eff-452a-b338-80c6c36d6acb</id>
<id>89f675c7-8e82-436d-b77a-a38a4bc0f56d</id>
<name>com.xyst.dinas.sales.bill.VehicleAmountParty</name>
<title>车辆量方</title>
<description>车辆量方</description>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/datamodel/CoefficientOrPrice.jmx
......@@ -8,6 +8,7 @@
<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>
......@@ -49,6 +50,32 @@
<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>
......@@ -169,7 +196,7 @@
</m:annotations>
<m:id>d85d1bd7-2dda-4d37-a901-c4e5cd76d1fb</m:id>
<m:name>type</m:name>
<m:title>类型: 0运船 1车辆</m:title>
<m:title>类型: 0车辆系数 1：运船系数 2：运船单价</m:title>
<m:type>int</m:type>
<m:description></m:description>
<m:default></m:default>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/datamodel/VehicleAmountParty.jmx
......@@ -16,6 +16,7 @@
<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>
......@@ -53,6 +54,32 @@
<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>
......
backend/xyst.dinas.sales/src/main/resources/config/CoefficientOrPrice.hbm.xml
......@@ -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>
......@@ -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>
......
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