Skip to content

C
cloud-fb
Commit abcb6b0f by 闫恒
Options

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

Feature/exception data

See merge request kunlun/xyst_dinas/xyst_dinas_backend!89
parents 38b002e8 9c891472
Showing with 3520 additions and 140 deletions
backend/build.war/src/test/resources/application.yml-template
......@@ -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
......
backend/inz.basis/src/main/resources/com/beecode/inz/portal/functiontree/DefaultFunctionTree.jmx
......@@ -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>
......@@ -552,6 +565,37 @@
</m:function-definition>
<m:icon>iconfont iconcheliangliangfang1x</m:icon>
</m:function-node>
<m:function-node>
<m:id>dd4ab671-52ba-4040-bd65-7ba13786106a</m:id>
<m:name>exception_data</m:name>
<m:title>异常数据</m:title>
<m:index>1600</m:index>
<m:license></m:license>
<m:privilege>com.xyst.dinas.sales.auth.ExceptionList</m:privilege>
<m:role></m:role>
<m:function-definition>
<m:view>function-exception-data</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:icon>iconfont iconhetongzhihangfenxi1x</m:icon>
</m:function-node>
<m:function-node>
<m:id>db78d057-269e-4689-b3ea-f90642334060</m:id>
<m:name>exception_data_approval</m:name>
<m:title>异常数据审核</m:title>
<m:index>1700</m:index>
<m:license></m:license>
<m:privilege>com.xyst.dinas.sales.auth.ExceptionApprovalList</m:privilege>
<m:role></m:role>
<m:function-definition>
<m:view>function-exception-data-approval</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:icon>iconfont iconhetongzhihangfenxi1x</m:icon>
</m:function-node>
<m:function-node>
<m:id>e536e311-8d22-4730-b3d7-444fd718c883</m:id>
<m:name>self_pickup_car</m:name>
......@@ -1502,7 +1546,7 @@
<m:function-node>
<m:id>18ecb4c7-1d00-42f7-af60-1b55bb895199</m:id>
<m:name>ship_list</m:name>
<m:title>船只备案</m:title>
<m:title>船舶台账</m:title>
<m:index>9000</m:index>
<m:license></m:license>
<m:privilege>com.xyst.dinas.biz.auth.ShipInfoList</m:privilege>
......
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/service/RetailInfoServiceImpl.java
......@@ -213,5 +213,18 @@ public class RetailInfoServiceImpl implements RetailInfoService {
return orGet;
}
@Override
public KObject createRetailInfo(KObject station, KObject dinasType, String carNum, String retailName, Double dealAmount, Double amount) {
KObject orGet = retailInfoDao.createOrGet(retailName, carNum, station);
KClass bean = Amino.getStaticMetadataContext().getBean(RetailInfoConstant.DETAIL_ENTITY, KClass.class);
KObject object = bean.newInstance();
object.set("purchaseAmount",dealAmount);
object.set("master",retailInfoDao.load(orGet.getUuid("id")));
object.set("dinasType",dinasType);
object.set(BaseConstants.ID,UUID.randomUUID());
retailInfoDao.saveOrUpdate(object);
return orGet;
}
}
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/service/RetailInfoService.java
......@@ -30,4 +30,6 @@ public interface RetailInfoService {
BigDecimal selectBuyAmountByIdCard(String idCard, UUID fromString);
KObject create(KObject station, KObject dinasType, String retailIdNum, String retailName, String carInfo, Double dealAmount, Double amount);
KObject createRetailInfo(KObject station, KObject dinasType, String carNum, String retailName, Double dealAmount, Double amount);
}
backend/xyst.dinas.biz/src/main/model/com/xyst/dinas/biz/auth/ShipInfoCard.mk
......@@ -8,6 +8,6 @@
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='78b3f83f-2b84-4db6-88b6-c99869a91037' category='业务管理/船只备案（区域公司）' seq='0'></privilege>
<privilege type='TOKEN' target-type='' id='78b3f83f-2b84-4db6-88b6-c99869a91037' category='业务管理/船舶台账（区域公司）' seq='0'></privilege>
</content>
</model>
backend/xyst.dinas.biz/src/main/model/com/xyst/dinas/biz/auth/ShipInfoCreate.mk
......@@ -8,6 +8,6 @@
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='604b514f-52b2-43b0-8c16-cba1f511c7ab' category='业务管理/船只备案（区域公司）' seq='0'></privilege>
<privilege type='TOKEN' target-type='' id='604b514f-52b2-43b0-8c16-cba1f511c7ab' category='业务管理/船舶台账（区域公司）' seq='0'></privilege>
</content>
</model>
backend/xyst.dinas.biz/src/main/model/com/xyst/dinas/biz/auth/ShipInfoDelete.mk
......@@ -8,6 +8,6 @@
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='f250186a-ffd6-4b3e-94f7-00fadbf2e7c0' category='业务管理/船只备案（区域公司）' seq='0'></privilege>
<privilege type='TOKEN' target-type='' id='f250186a-ffd6-4b3e-94f7-00fadbf2e7c0' category='业务管理/船舶台账（区域公司）' seq='0'></privilege>
</content>
</model>
backend/xyst.dinas.biz/src/main/model/com/xyst/dinas/biz/auth/ShipInfoEdit.mk
......@@ -8,6 +8,6 @@
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='0a5129cd-ee16-491f-9f99-8817c7d75925' category='业务管理/船只备案（区域公司）' seq='0'></privilege>
<privilege type='TOKEN' target-type='' id='0a5129cd-ee16-491f-9f99-8817c7d75925' category='业务管理/船舶台账（区域公司）' seq='0'></privilege>
</content>
</model>
backend/xyst.dinas.biz/src/main/model/com/xyst/dinas/biz/auth/ShipInfoList.mk
......@@ -8,6 +8,6 @@
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='dfa9012c-dccc-463e-a3ee-4e181f702dbb' category='业务管理/船只备案（区域公司）' seq='0'></privilege>
<privilege type='TOKEN' target-type='' id='dfa9012c-dccc-463e-a3ee-4e181f702dbb' category='业务管理/船舶台账（区域公司）' seq='0'></privilege>
</content>
</model>
backend/xyst.dinas.biz/src/main/model/com/xyst/dinas/biz/datamodel/SandMiningArea.mk
......@@ -31,6 +31,10 @@
<annotation id='7c36721e-9bbd-42ae-bfbb-1b0395567be3' attributeId='aee8df10-530c-44b7-b12b-474ab96694a7' name='length' value='undefined'>
</annotation>
</attribute>
<attribute id='8a13aebf-60e6-4ce2-9b69-5a3233adf10b' name='areaCoordType' columnName='area_coord_type' title='坐标类型' type='int' default='' precision='' isArray='false'>
<annotation id='71293be4-9f0f-4f6c-90dd-2302126527c7' attributeId='cf03eccd-1f62-4514-b054-196b8ab201c9' name='length' value='1'>
</annotation>
</attribute>
<attribute id='05241b45-15d9-425b-933a-d20f108c2052' name='stationCoordinate' columnName='station_coordinate' title='采区坐标' type='string' default='' precision='' isArray='false'>
<annotation id='0981a94a-a675-4817-9e9b-64ce28bc6735' attributeId='6321c30c-0e52-4b7b-9034-b87a5a8026f7' name='length' value='1500'>
</annotation>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/auth/ShipInfoCard.jmx
......@@ -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>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/auth/ShipInfoCreate.jmx
......@@ -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>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/auth/ShipInfoDelete.jmx
......@@ -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>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/auth/ShipInfoEdit.jmx
......@@ -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>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/auth/ShipInfoList.jmx
......@@ -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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/datamodel/SandMiningArea.jmx
......@@ -142,6 +142,25 @@
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>area_coord_type</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>8a13aebf-60e6-4ce2-9b69-5a3233adf10b</m:id>
<m:name>areaCoordType</m:name>
<m:title>坐标类型</m:title>
<m:type>int</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>bcp.type.constraint.StringLength</m:type>
<m:value>1500</m:value>
</m:annotation>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/query/SandMiningArea.jmx
......@@ -135,6 +135,16 @@
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>areaCoordType</m:name>
<m:title>坐标类型</m:title>
<m:type>int</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>sandMiningQuantity</m:name>
<m:title>可采量</m:title>
<m:type>string</m:type>
......
backend/xyst.dinas.biz/src/main/resources/config/SandMiningArea.hbm.xml
......@@ -59,6 +59,12 @@
</column>
</property>
<property name="areaCoordType" type="integer" not-null="true">
<column name="area_coord_type" >
<comment>坐标类型 </comment>
</column>
</property>
<property name="stationCoordinate" type="nstring" not-null="false">
<column name="station_coordinate">
<comment>采区坐标区域 按照逗号和分号分隔</comment>
......
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>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>
......
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>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>
......
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>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>
......
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/bill/SelfPickupCarBill$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>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>
......
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/bill/SelfPickupCarBill$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>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>
......
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/bill/SelfPickupCarBill.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>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>
......
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/datamodel/ContractAssociatedcontractDetail.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-type">
<specification>1.0</specification>
<id>e721e1da-726b-4c8a-b0f2-48851ca4d235</id>
<id>16eb1d1b-2b4f-4c28-93dc-39c30de9a072</id>
<name>com.xyst.dinas.contract.datamodel.ContractAssociatedcontractDetail</name>
<title>合同子表</title>
<define>bcp.type.Class</define>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
backend/xyst.dinas.production/src/main/model/com/xyst/dinas/production/auth/StationCameraList.mk
......@@ -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>
backend/xyst.dinas.production/src/main/resources/com/xyst/dinas/production/auth/StationCameraList.jmx
......@@ -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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
backend/xyst.dinas.production/src/main/resources/com/xyst/dinas/production/datamodel/ProductionPlanReportAssociateddinasTypeDetail.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-type">
<specification>1.0</specification>
<id>11d69604-24ab-46dc-8ed5-82ecc6b4dea8</id>
<id>a55c46bb-f5a8-4c8d-b780-aef2a579f1d0</id>
<name>com.xyst.dinas.production.datamodel.ProductionPlanReportAssociateddinasTypeDetail</name>
<title>生产计划采砂类型和砂石量子表</title>
<define>bcp.type.Class</define>
......
backend/xyst.dinas.production/src/main/resources/com/xyst/dinas/production/datamodel/SandMiningAssociatedstationDetail.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-type">
<specification>1.0</specification>
<id>212de0e3-b4fc-4bc7-b4ee-930788d844aa</id>
<id>1b94edef-b99d-4bf5-a0a3-f2c2c5839977</id>
<name>com.xyst.dinas.production.datamodel.SandMiningAssociatedstationDetail</name>
<title>采砂许可证场站表</title>
<define>bcp.type.Class</define>
......
backend/xyst.dinas.project/src/main/resources/com/xyst/dinas/project/datamodel/ProjectFiledAssociatedProjectFiledDinasDetail.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-type">
<specification>1.0</specification>
<id>8561c49e-d5ae-4418-8714-738be6daffc3</id>
<id>b5474ccf-e65c-4df5-9e9f-646b410d2c30</id>
<name>com.xyst.dinas.project.datamodel.ProjectFiledAssociatedProjectFiledDinasDetail</name>
<title>砂石明细表</title>
<define>bcp.type.Class</define>
......
backend/xyst.dinas.project/src/main/resources/com/xyst/dinas/project/datamodel/ProjectFiledAssociatedProjectSubContractorDetail.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-type">
<specification>1.0</specification>
<id>3c743954-a153-45f6-b619-dce0c18f40eb</id>
<id>b4292074-138f-4c6c-86e7-3ddf3fe19b91</id>
<name>com.xyst.dinas.project.datamodel.ProjectFiledAssociatedProjectSubContractorDetail</name>
<title>分包明细表</title>
<define>bcp.type.Class</define>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
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>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>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/datamodel/SafeLogAssociatedStaffDetail.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-type">
<specification>1.0</specification>
<id>85064c7c-010d-4f61-bb78-0dd5017f7a65</id>
<id>aebe6877-f966-4cff-9ff9-ee87a06ae302</id>
<name>com.xyst.dinas.safe.datamodel.SafeLogAssociatedStaffDetail</name>
<title>检查人员明细表</title>
<define>bcp.type.Class</define>
......
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/config/ShipQuantityConfiguration.java 0 → 100644
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();
}
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/constant/SalesRecordConstant.java
......@@ -152,4 +152,40 @@ public interface SalesRecordConstant {
*/
String PIC = "pic";
//数据来源
String DATA_SOURCE = "dataSource";
//原因
String REASON = "reason";
//删除原因
String DEL_REASON = "delReason";
//方法类型
String METHOD_TYPE = "methodType";
//数据来源字段值
String DATA_SOURCE_REN_GONG = "人工补录";
String DATA_SOURCE_DI_BANG = "地磅";
//方法类型 新增
Integer ADD_METHOD = 0;
//---- 删除
Integer DEL_METHOD = 1;
//未提交状态
Integer TO_NOT_SUBMITTED= 0;
//待审核状态
Integer TO_AUDIT = 1;
//审核通过状态
Integer APPROVED = 2;
//审核驳回
Integer APPROVE_BACK = 3;
/**
* 代表新增审核通过 扣过钱
*/
String APPROVE_STATE_DEL = "approveStateDel";
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/constant/ShipQuantityConstant.java 0 → 100644
package com.xyst.dinas.sales.constant;
public interface ShipQuantityConstant {
/**
* 实体名
*/
String ENTITY = "com.xyst.dinas.sales.datamodel.ShipQuantity";
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/dao/SalesRecordDao.java
package com.xyst.dinas.sales.dao;
import com.beecode.bcp.type.KObject;
import com.xyst.dinas.sales.web.info.SalesRecordInfo;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import com.beecode.bcp.type.KObject;
import com.xyst.dinas.sales.web.info.SalesRecordInfo;
public interface SalesRecordDao {
KObject load(UUID id);
......@@ -21,4 +21,10 @@ public interface SalesRecordDao {
void insertList(List<KObject> salesRecordInfos);
void updateActualTransportationById(SalesRecordInfo salesRecordInfo);
void deleteById(UUID id,String delReason);
void approval(KObject kobject);
void update(KObject salesRecord);
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/dao/ShipQuantityDao.java 0 → 100644
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);
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/dao/SalesRecordDaoImpl.java
package com.xyst.dinas.sales.internal.dao;
import java.math.BigDecimal;
import java.util.*;
import javax.persistence.Tuple;
import com.beecode.amino.common.Convert;
import com.beecode.amino.core.Amino;
import com.beecode.bcp.core.context.AminoContextHolder;
import com.beecode.bcp.serial.Serial;
import com.beecode.bcp.type.KClass;
import com.beecode.bcp.type.KObject;
import com.beecode.inz.common.BaseConstants;
import com.beecode.util.DateUtil;
import com.xyst.dinas.sales.constant.SalesRecordConstant;
import com.xyst.dinas.sales.dao.SalesRecordDao;
import com.xyst.dinas.sales.web.info.SalesRecordInfo;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
......@@ -22,10 +22,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.orm.hibernate5.HibernateCallback;
import org.springframework.orm.hibernate5.HibernateOperations;
import com.beecode.amino.common.Convert;
import com.beecode.bcp.type.KObject;
import com.xyst.dinas.sales.constant.SalesRecordConstant;
import com.xyst.dinas.sales.dao.SalesRecordDao;
import javax.persistence.Tuple;
import java.math.BigDecimal;
import java.util.*;
public class SalesRecordDaoImpl implements SalesRecordDao, SalesRecordConstant {
@Autowired
......@@ -129,4 +128,77 @@ public class SalesRecordDaoImpl implements SalesRecordDao, SalesRecordConstant {
}
}
@Override
public void deleteById(UUID id,String delReason) {
KObject staff = AminoContextHolder.getContext().getStaff();
KObject kobject = (KObject) template.load(ENTITY, id);
//审核状态
Integer approvalState = Integer.valueOf(kobject.getString(SalesRecordConstant.APPROVE_STATE));
//当前 数据来源
String dataSource = kobject.getString(SalesRecordConstant.DATA_SOURCE);
//当前数据 付款类型
String payMentSource = kobject.getString(SalesRecordConstant.PAYMENTSOURCE);
if(SalesRecordConstant.DATA_SOURCE_REN_GONG.equals(dataSource)){ //人工
//当前数据方法类型
Integer methodType = Integer.valueOf(kobject.getString(SalesRecordConstant.METHOD_TYPE));
//赋值删除状态 为后续删除审核做判断
if(SalesRecordConstant.ADD_METHOD.equals(methodType)){ //如果是新增的数据判断状态
if(SalesRecordConstant.TO_NOT_SUBMITTED.equals(approvalState)){
kobject.set(SalesRecordConstant.APPROVE_STATE, SalesRecordConstant.TO_NOT_SUBMITTED );
}else if(SalesRecordConstant.APPROVE_BACK.equals(approvalState) ){
kobject.set(SalesRecordConstant.APPROVE_STATE, SalesRecordConstant.APPROVE_BACK );
}else{
if(SalesRecordConstant.APPROVED.equals(approvalState) ||SalesRecordConstant.APPROVED.equals(Integer.valueOf(kobject.getString(SalesRecordConstant.APPROVE_STATE_DEL))) ){
kobject.set(SalesRecordConstant.APPROVE_STATE, SalesRecordConstant.TO_AUDIT );
}
}
}else if(SalesRecordConstant.DEL_METHOD.equals(methodType)){ //新增过 然后进行删除过的数据
if(SalesRecordConstant.APPROVE_BACK.equals(approvalState) ){
kobject.set(SalesRecordConstant.APPROVE_STATE, SalesRecordConstant.TO_AUDIT );
}
}
}else if(SalesRecordConstant.DATA_SOURCE_DI_BANG.equals(dataSource)){ // 地磅
kobject.set(SalesRecordConstant.APPROVE_STATE_DEL,SalesRecordConstant.APPROVED);//如果是地磅数据 赋值二次状态为通过,地磅数据不需要审核
kobject.set(SalesRecordConstant.APPROVE_STATE, SalesRecordConstant.TO_AUDIT ); //删除赋予状态为未审核
}
kobject.set(BaseConstants.MODIFY_TIME, new Date());
kobject.set(SalesRecordConstant.DEL_REASON, delReason);
kobject.set(BaseConstants.DEL, true);
kobject.set(SalesRecordConstant.METHOD_TYPE, SalesRecordConstant.DEL_METHOD);
template.update(kobject);
}
@Override
public void approval(KObject approObject) {
KObject kobject = (KObject) template.load(ENTITY, approObject.getUuid(BaseConstants.ID));
kobject.set(BaseConstants.MODIFY_TIME, new Date());
Integer approvalState = Integer.valueOf(approObject.getString(SalesRecordConstant.APPROVE_STATE));
kobject.set(SalesRecordConstant.APPROVE_STATE, approvalState);
if(approObject.getString(SalesRecordConstant.APPROVE_STATE_DEL) != null){
kobject.set(SalesRecordConstant.APPROVE_STATE_DEL, Integer.valueOf(approObject.getString(SalesRecordConstant.APPROVE_STATE_DEL)));
}
//当前数据方法类型
Integer methodType = Integer.valueOf(approObject.getString(SalesRecordConstant.METHOD_TYPE));
if(SalesRecordConstant.DEL_METHOD.equals(methodType)){
if(SalesRecordConstant.APPROVE_BACK.equals(approvalState)){
//逻辑
kobject.set(BaseConstants.DEL, false);
}
}
template.update(kobject);
}
@Override
public void update(KObject kobject) {
KObject id = load(kobject.getUuid("id"));
kobject.set(BaseConstants.CREATE_TIME, id.getDate(BaseConstants.CREATE_TIME));
kobject.set(BaseConstants.MODIFY_TIME, new Date());
kobject.set(BaseConstants.DEL, false);
template.merge(kobject);
}
}
\ No newline at end of file
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/dao/ShipQuantityDaoImpl.java 0 → 100644
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;
}
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/service/SalesRecordServiceImpl.java
package com.xyst.dinas.sales.internal.service;
import com.beecode.amino.core.Amino;
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.basis.util.JsonUtil;
import com.beecode.inz.common.BaseConstants;
import com.fasterxml.jackson.databind.JsonNode;
import com.xyst.dinas.biz.dao.DinasOrganizationDao;
import com.xyst.dinas.biz.dao.DinasTypeDao;
import com.xyst.dinas.biz.dao.ProductionLineDao;
......@@ -104,6 +109,8 @@ public class SalesRecordServiceImpl implements SalesRecordService {
salesRecord.set(SalesRecordConstant.DEALTIME, salesRecordInfo.getGrossWeightTime());
salesRecord.set(SalesRecordConstant.DEALBILLCODE, salesRecordInfo.getDealBillCode());
salesRecord.set(SalesRecordConstant.CARINFO, salesRecordInfo.getCarNum());
//modify by 新增数据来源类型 from yanH for 2022-04-18
salesRecord.set(SalesRecordConstant.DATA_SOURCE, SalesRecordConstant.DATA_SOURCE_DI_BANG);
salesRecord.set(SalesRecordConstant.PRICE, salesRecordInfo.getPrice());
Integer paymentSource = salesRecordInfo.getPaymentSource();
......@@ -346,6 +353,230 @@ public class SalesRecordServiceImpl implements SalesRecordService {
return error1;
}
/**
* @Author yanHeng
* @Date 2022/4/18 10:07
* @Param [salesRecord, station]
* @return java.util.HashMap<java.lang.String,java.lang.Object>
**/
@Override
@Transactional
public HashMap<String, Object> saveSalesRecordInfo(SalesRecordInfo salesRecordVO, KObject station) {
logger.info("补录异常数据,传输参数为:"+ JsonUtil.beanToJson(salesRecordVO));
HashMap<String, Object> returnMap = new HashMap<>(12);
try {
BigDecimal advanceBalance1 = new BigDecimal(0);
Date thentime = new Date();
// 获取砂石类型
KObject dinasType;
dinasType = dinasTypeDao.load(UUID.fromString(salesRecordVO.getDinasTypeId()));
KObject regionalCompany;
//获取区域公司
regionalCompany = station.get("regionalCompany");
salesRecordVO.setDealAmount(salesRecordVO.getGrossWeight().subtract(salesRecordVO.getTareWeight()).doubleValue());
KObject salesRecord = salesRecordClass.newInstance();
if(null == salesRecordVO.getId()){
salesRecord.set(SalesRecordConstant.ID, UUID.randomUUID());
}
salesRecord.set(SalesRecordConstant.CREATETIME, thentime);
salesRecord.set(SalesRecordConstant.STATION, station);
salesRecord.set(SalesRecordConstant.GROSS_WEIGHT, salesRecordVO.getGrossWeight());
salesRecord.set(SalesRecordConstant.TARE_WEIGHT, salesRecordVO.getTareWeight());
salesRecord.set(SalesRecordConstant.DEALAMOUNT, salesRecordVO.getGrossWeight().subtract(salesRecordVO.getTareWeight()));
salesRecord.set(SalesRecordConstant.GROSS_WEIGHT_TIME, salesRecordVO.getGrossWeightTimeInfo());
salesRecord.set(SalesRecordConstant.TARE_WEIGHT_TIME, salesRecordVO.getTareWeightTimeInfo());
salesRecord.set(SalesRecordConstant.SYNCTIME, thentime);
salesRecord.set(SalesRecordConstant.DEALTIME, salesRecordVO.getGrossWeightTimeInfo()); // 销售时间为毛重时间
salesRecord.set(SalesRecordConstant.DEALBILLCODE, salesRecordVO.getDealBillCode()); //销售单号
salesRecord.set(SalesRecordConstant.CARINFO, salesRecordVO.getCarNum());
salesRecord.set(SalesRecordConstant.DATA_SOURCE, SalesRecordConstant.DATA_SOURCE_REN_GONG);
salesRecord.set(SalesRecordConstant.REASON, salesRecordVO.getReason());
salesRecord.set(SalesRecordConstant.PRICE, salesRecordVO.getPrice());
salesRecord.set(SalesRecordConstant.METHOD_TYPE, SalesRecordConstant.ADD_METHOD);
salesRecord.set(SalesRecordConstant.APPROVE_STATE, salesRecordVO.getApproveState());
Integer paymentSource = salesRecordVO.getPaymentSource();
if(paymentSource==0){
salesRecord.set(SalesRecordConstant.PAYMENTSOURCE,PayMentSourceEnum.Advance );
}else{
salesRecord.set(SalesRecordConstant.PAYMENTSOURCE,PayMentSourceEnum.Cash );
}
salesRecord.set(SalesRecordConstant.REGIONALCOMPANY, regionalCompany);
salesRecord.set(SalesRecordConstant.DINASTYPE, dinasType);
salesRecord.set(SalesRecordConstant.AMOUNT, salesRecordVO.getAmount());
salesRecord.set(SalesRecordConstant.DEALAMOUNT, salesRecordVO.getDealAmount());
//如果是散客
if (null != salesRecordVO.getRetailName() && ! "".equals(salesRecordVO.getRetailName())) {
salesRecord.set(SalesRecordConstant.CUSTOMERTYPE, CustomerTypeEnum.RetailInfo.name());
KObject retailInfo = retailInfoService.createRetailInfo(station, dinasType, salesRecordVO.getCarNum(), salesRecordVO.getRetailName(), salesRecordVO.getDealAmount(), salesRecordVO.getAmount());
salesRecord.set(SalesRecordConstant.RETAILINFO, retailInfo);
} else {
//如果不为散户 则必定有合同 项目 购砂单位 区域公司
salesRecord.set(SalesRecordConstant.CUSTOMERTYPE, CustomerTypeEnum.PurchaseSandCompany.name());
// 获取项目KObject
KObject project;
KObject contract;
KObject purchaseSandCompany;
contract = contractDao.load(UUID.fromString(salesRecordVO.getContractId()));
// 获取合同KObject
project = contract.get("project");
// 获取区域公司KObject
regionalCompany = contract.get("regionalCompany");
// 获取购砂单位KObject
purchaseSandCompany = contract.get("purchaseSandUnit");
salesRecord.set(SalesRecordConstant.PROJECT, project);
salesRecord.set(SalesRecordConstant.REGIONALCOMPANY, regionalCompany);
salesRecord.set(SalesRecordConstant.CONTRACT, contract);
salesRecord.set(SalesRecordConstant.PURCHASESANDCOMPANY, purchaseSandCompany);
salesRecord.set(SalesRecordConstant.DEALAMOUNT, salesRecordVO.getDealAmount() == null ? BigDecimal.ZERO : BigDecimal.valueOf(salesRecordVO.getDealAmount()));
salesRecord.set(SalesRecordConstant.DISCARD, false);
salesRecord.set(SalesRecordConstant.DEL, false);
}
String salesRecordId = "";
if (null == salesRecordVO.getId()) {
UUID salesRecordIds = salesRecordDao.insert(salesRecord);
salesRecordId = salesRecordIds.toString();
}else {
salesRecord.set(BaseConstants.ID,UUID.fromString(salesRecordVO.getId()));
salesRecord.set("version",salesRecordVO.getVersion());
salesRecordDao.update(salesRecord);
salesRecordId = salesRecordVO.getId();
}
returnMap.put("code", 200);
returnMap.put("id", salesRecordId);
returnMap.put("advanceBalance", advanceBalance1);
returnMap.put("message", "保存成功");
return returnMap;
} catch (Exception e) {
e.printStackTrace();
returnMap.put("code", 10031);
returnMap.put("message", "系统内部错误");
return returnMap;
}
}
@Override
@org.springframework.transaction.annotation.Transactional
public ResponseObj deleteById(JsonNode jsonNode) {
KObject kobject;
JsonNode salesRecords = jsonNode.withArray("salesRecords");
for (JsonNode salesRecord : salesRecords) {
kobject = JSONObjectUtils.toObject(salesRecord, Amino.getStaticMetadataContext().getBean(SalesRecordConstant.ENTITY, KClass.class));
salesRecordDao.deleteById(kobject.getUuid(BaseConstants.ID),kobject.getString(SalesRecordConstant.DEL_REASON));
}
return ResponseObj.success("删除成功");
}
@Override
@org.springframework.transaction.annotation.Transactional
public ResponseObj approvalBatch(JsonNode jsonNode) {
KObject kobject;
Boolean flag = true;
JsonNode salesRecords = jsonNode.withArray("salesRecords");
for (JsonNode salesRecord : salesRecords) {
kobject = JSONObjectUtils.toObject(salesRecord, Amino.getStaticMetadataContext().getBean(SalesRecordConstant.ENTITY, KClass.class));
UUID id = kobject.getUuid("id");
if (null == id) {
return ResponseObj.error(400, "'id' must be not null!");
}
//判断是审核通过 还是驳回
if (null == kobject.getString(SalesRecordConstant.APPROVE_STATE) && kobject.getString(SalesRecordConstant.APPROVE_STATE).isEmpty()) {
return ResponseObj.error(400, "审核状态 must be not null!");
}
//决定审批状态
Integer approvalState = Integer.valueOf(kobject.getString(SalesRecordConstant.APPROVE_STATE));
KObject salesRecordInfo = salesRecordDao.load(id); //查询当前数据方法类型
//判断当前数据 收款类型是否为预付款
String payMentSource = salesRecordInfo.getString(SalesRecordConstant.PAYMENTSOURCE);
//当前数据方法类型
Integer methodType = Integer.valueOf(salesRecordInfo.getString(SalesRecordConstant.METHOD_TYPE));
//判断客户类型是否是区域公司 是否有合同
if(CustomerTypeEnum.PurchaseSandCompany.name().equals(salesRecordInfo.getString(SalesRecordConstant.CUSTOMERTYPE))){
//如果通过 //如果为预付款类型 进行 对金额进行操作
if(SalesRecordConstant.APPROVED.equals(approvalState) && PayMentSourceEnum.Advance.name().equals(payMentSource)){
UUID contractId = salesRecordInfo.get("contract").getUuid("id");
UUID dinasTypeId = salesRecordInfo.get("dinasType").getUuid("id");
BigDecimal amount = BigDecimal.ZERO;
// 扣减合同的预付款金额= 异常数据的总价 扣减
if(SalesRecordConstant.ADD_METHOD.equals(methodType)){
if(null == salesRecordInfo.getString(SalesRecordConstant.APPROVE_STATE_DEL)){
kobject.set(SalesRecordConstant.APPROVE_STATE_DEL, SalesRecordConstant.APPROVED); //代表新增审核通过了 扣过钱
//查询合同余额,如果扣减后小于0则不允许交易
KObject kObject = contractService.queryContract(contractId);
BigDecimal advanceBalance = kObject.getBigDecimal("advanceBalance");
if (advanceBalance == null || advanceBalance.compareTo(new BigDecimal(kObject.getString(SalesRecordConstant.AMOUNT))) == -1) {
return ResponseObj.error(400,"合同名称为："+salesRecordInfo.get("contract").getUuid("contractName") +"的预付款余额不足");
}
//获取当前异常数据的总价
amount = BigDecimal.ZERO.subtract(BigDecimal.valueOf(salesRecordInfo.getDouble(SalesRecordConstant.AMOUNT)));
}else {
if(!SalesRecordConstant.APPROVED.equals(Integer.valueOf(salesRecordInfo.getString(SalesRecordConstant.APPROVE_STATE_DEL)))){ //如果没扣过钱 则进行扣钱
kobject.set(SalesRecordConstant.APPROVE_STATE_DEL, SalesRecordConstant.APPROVED); //代表新增审核通过了 扣过钱
//查询合同余额,如果扣减后小于0则不允许交易
KObject kObject = contractService.queryContract(contractId);
BigDecimal advanceBalance = kObject.getBigDecimal("advanceBalance");
if (advanceBalance == null || advanceBalance.compareTo(new BigDecimal(kObject.getString(SalesRecordConstant.AMOUNT))) == -1) {
return ResponseObj.error(400,"合同名称为："+salesRecordInfo.get("contract").getUuid("contractName") +"的预付款余额不足");
}
//获取当前异常数据的总价
amount = BigDecimal.ZERO.subtract(BigDecimal.valueOf(salesRecordInfo.getDouble(SalesRecordConstant.AMOUNT)));
}
}
}else if(SalesRecordConstant.DEL_METHOD.equals(methodType)){
//如果数据状态为新增后的审核通过,进行删除
if(SalesRecordConstant.APPROVED.equals(Integer.valueOf(salesRecordInfo.getString(SalesRecordConstant.APPROVE_STATE_DEL)))){
//逻辑删除 反还合同的预付款金额= 异常数据的总价 退还
amount = BigDecimal.ZERO.add(new BigDecimal(salesRecordInfo.getString(SalesRecordConstant.AMOUNT)));
}
}
flag = contractService.modifyInventory(contractId,
dinasTypeId, BigDecimal.ZERO, amount);
}
}
if(!flag){
return ResponseObj.error(400,"预付款余额审核异常");
}else{
//修改审核状态
kobject.set(SalesRecordConstant.METHOD_TYPE,Integer.valueOf(salesRecordInfo.getString(SalesRecordConstant.METHOD_TYPE)));
salesRecordDao.approval(kobject);
}
}
return ResponseObj.success("审核成功");
}
@Override
public KObject getById(UUID id) {
return salesRecordDao.load(id);
}
private Set<String> createNoExist(Sheet sheet, int lastRowNum, Set<KObject> organizations, Set<KObject> stations, Set<KObject> dinasTypes, Set<KObject> retailInfos, Set<String> strings) {
Row row;
List<KObject> saleRecord = new ArrayList<>();
......@@ -481,6 +712,8 @@ public class SalesRecordServiceImpl implements SalesRecordService {
salesRecord.set(SalesRecordConstant.TARE_WEIGHT, tareWeight);
salesRecord.set(SalesRecordConstant.DISCARD, false);
salesRecord.set(SalesRecordConstant.DEL, false);
//modify by 新增数据来源类型 from yanH for 2022-04-18
salesRecord.set(SalesRecordConstant.DATA_SOURCE, SalesRecordConstant.DATA_SOURCE_REN_GONG);
return salesRecord;
}
......
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/service/ShipQuantityServiceImpl.java 0 → 100644
package com.xyst.dinas.sales.internal.service;
import com.beecode.amino.core.Amino;
import com.beecode.bap.attachment.common.Page;
import com.beecode.bap.log.LogConstants;
import com.beecode.bap.log.service.LogService;
import com.beecode.bcp.type.KClass;
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.SandMiningAreaDao;
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.constant.ShipQuantityConstant;
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;
@Autowired
private SandMiningAreaDao sandMiningAreaDao;
@Autowired
private LogService logService;
/**
* @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");
UUID sandMiningAreaId = kObject.get("sandMiningArea").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));
kObject.set("sandMiningArea", sandMiningAreaDao.load(sandMiningAreaId));
UUID uuid = shipQuantityDao.create(kObject);
//记录操作日志
KObject log = Amino.getApplicationContext()
.getBean(LogConstants.LOG_ENTIY_NAME, KClass.class).newInstance();
log.set("module", ShipQuantityConstant.ENTITY);
log.set("businessObjectId", uuid);
log.set("logContent", "新增了这条运船量方数据");
logService.addLog(log);
//扣减预付款余额 ,取得总价 进行扣减
//查询合同余额,如果预付款小于总价,不允许交易
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);
}
//记录操作日志
KObject log = Amino.getApplicationContext()
.getBean(LogConstants.LOG_ENTIY_NAME, KClass.class).newInstance();
log.set("module", ShipQuantityConstant.ENTITY);
log.set("businessObjectId", id);
log.set("logContent", "删除了这条运船量方数据");
logService.addLog(log);
return ResponseObj.success("删除成功");
}
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/service/VehicleAmountPartyServiceImpl.java
package com.xyst.dinas.sales.internal.service;
import com.beecode.amino.core.Amino;
import com.beecode.bap.attachment.common.Page;
import com.beecode.bap.log.LogConstants;
import com.beecode.bap.log.service.LogService;
import com.beecode.bcp.type.KClass;
import com.beecode.bcp.type.KObject;
import com.beecode.inz.basis.team.pojo.ResponseObj;
import com.beecode.inz.common.exception.BusinessException;
......@@ -10,6 +14,7 @@ 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.constant.VehicleAmountPartyConstant;
import com.xyst.dinas.sales.dao.VehicleAmountPartyDao;
import com.xyst.dinas.sales.enumeration.VehicleAmountPartyErrorCodeEnum;
import com.xyst.dinas.sales.service.VehicleAmountPartyService;
......@@ -47,6 +52,9 @@ public class VehicleAmountPartyServiceImpl implements VehicleAmountPartyService
@Autowired
ContractService contractService;
@Autowired
private LogService logService;
/**
* @Author yanHeng
* @Date 2022/4/6 11:36
......@@ -73,6 +81,14 @@ public class VehicleAmountPartyServiceImpl implements VehicleAmountPartyService
kObject.set("dinasType", dinasTypeDao.load(dinasTypeId));
UUID uuid = vehicleAmountPartyDao.create(kObject);
//记录操作日志
KObject log = Amino.getApplicationContext()
.getBean(LogConstants.LOG_ENTIY_NAME, KClass.class).newInstance();
log.set("module", VehicleAmountPartyConstant.ENTITY);
log.set("businessObjectId", uuid);
log.set("logContent", "新增了这条车辆量方数据");
logService.addLog(log);
//扣减预付款余额 ,取得总价 进行扣减
//查询合同余额,如果预付款小于总价,不允许交易
BigDecimal amount ;
......@@ -90,6 +106,7 @@ public class VehicleAmountPartyServiceImpl implements VehicleAmountPartyService
throw new BusinessException("预付款余额扣减失败",VehicleAmountPartyErrorCodeEnum.VEHICLE_AMOUNT_PARTY_ADVANCE_BALANCE);
}
return uuid;
}
......@@ -126,6 +143,14 @@ public class VehicleAmountPartyServiceImpl implements VehicleAmountPartyService
}else{
vehicleAmountPartyDao.deleteById(id);
}
//记录操作日志
KObject log = Amino.getApplicationContext()
.getBean(LogConstants.LOG_ENTIY_NAME, KClass.class).newInstance();
log.set("module", VehicleAmountPartyConstant.ENTITY);
log.set("businessObjectId", id);
log.set("logContent", "删除了这条车辆量方数据");
logService.addLog(log);
return ResponseObj.success("删除成功");
}
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/service/SalesRecordService.java
package com.xyst.dinas.sales.service;
import java.util.HashMap;
import com.beecode.bcp.type.KObject;
import com.beecode.inz.basis.team.pojo.ResponseObj;
import com.fasterxml.jackson.databind.JsonNode;
import com.xyst.dinas.sales.web.info.SalesRecordInfo;
import org.springframework.web.multipart.MultipartFile;
import java.util.HashMap;
import java.util.UUID;
public interface SalesRecordService {
/**
......@@ -18,4 +21,30 @@ public interface SalesRecordService {
HashMap<String, Object> saveSalesRecordService(SalesRecordInfo salesRecordList, KObject station);
HashMap<String,Object> qualityReportExcelImport(MultipartFile file);
/**
* @Author yanHeng
* @Date 2022/4/18 9:59
* @Param [kobject, station]
* @return java.util.HashMap<java.lang.String,java.lang.Object>
**/
HashMap<String, Object> saveSalesRecordInfo(SalesRecordInfo salesRecord, KObject station);
/**
* @Author yanHeng
* @Date 2022/4/18 15:00
* @Param [jsonNode]
* @return com.beecode.inz.basis.team.pojo.ResponseObj
**/
ResponseObj deleteById(JsonNode jsonNode);
/**
* @Author yanHeng
* @Date 2022/4/18 17:38
* @Param [jsonNode]
* @return void
**/
ResponseObj approvalBatch(JsonNode jsonNode);
KObject getById(UUID id);
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/service/ShipQuantityService.java 0 → 100644
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;
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/web/SalesRecordController.java
package com.xyst.dinas.sales.web;
import java.util.HashMap;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import com.beecode.bcp.type.KObject;
import com.beecode.bcp.type.json.JSONObjectUtils;
import com.beecode.inz.basis.team.pojo.ResponseObj;
import com.fasterxml.jackson.databind.JsonNode;
import com.xyst.dinas.biz.service.StationService;
import com.xyst.dinas.sales.service.SalesRecordService;
import com.xyst.dinas.sales.web.info.SalesRecordInfo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.util.HashMap;
import java.util.UUID;
@RestController
public class SalesRecordController {
@Autowired
SalesRecordService salesRecordService;
@Autowired
StationService stationService;
/**
* create by: 导入销售记录,没有的数据全部新建
......@@ -38,4 +42,109 @@ public class SalesRecordController {
}
return ResponseObj.success("success");
}
/**
* @Author yanHeng
* @Date 2022/4/18 9:56
* @Param [SalesRecordInfo]
* @return java.lang.Object
* 异常数据添加/编辑
**/
@PostMapping(value = "/salesRecord/saveSalesRecordInfo")
public Object saveSalesRecordInfo(@RequestBody SalesRecordInfo salesRecord) {
//判空校验
if (null == salesRecord.getStationId()) {
return ResponseObj.error(400, "请选择具体的场站");
}
if (null == salesRecord.getCarNum()) {
return ResponseObj.error(400, "车牌号不能为空");
}
if (null == salesRecord.getTareWeightTimeInfo()) {
return ResponseObj.error(400, "皮重时间不能为空");
}
if (null == salesRecord.getGrossWeightTimeInfo()) {
return ResponseObj.error(400, "毛重时间不能为空");
}
if (null == salesRecord.getCarNum()) {
return ResponseObj.error(400, "车牌号不能为空");
}
if (null == salesRecord.getDealBillCode()) {
return ResponseObj.error(400, "销售单号不能为空");
}
if (null == salesRecord.getDinasTypeId()) {
return ResponseObj.error(400, "请选择具体的砂石");
}
if (null == salesRecord.getGrossWeight()) {
return ResponseObj.error(400, "毛重不能为空");
}
if (null == salesRecord.getTareWeight()) {
return ResponseObj.error(400, "皮重不能为空");
}
if (null == salesRecord.getPrice()) {
return ResponseObj.error(400, "单价不能为空");
}
if (null == salesRecord.getAmount()) {
return ResponseObj.error(400, "总价不能为空");
}
if (null == salesRecord.getPaymentSource()) {
return ResponseObj.error(400, "收款类型不能为空");
}
if (null == salesRecord.getReason()) {
return ResponseObj.error(400, "原因不能为空");
}
KObject station = stationService.getById(UUID.fromString(salesRecord.getStationId()));
HashMap<String, Object> stringObjectHashMap = salesRecordService.saveSalesRecordInfo(salesRecord, station);
return ResponseObj.error((Integer) stringObjectHashMap.get("code"),stringObjectHashMap.get("message").toString(),stringObjectHashMap.get("id"));
}
/**
* 根据id获取异常数据信息
*
* @param id
* @return
*/
@GetMapping("/salesRecord/{id}")
public ResponseObj getById(@PathVariable("id") UUID id) {
if (id == null) {
return ResponseObj.error(400, "'id' must be not null!");
}
KObject discharging = salesRecordService.getById(id);
return ResponseObj.success("获取成功", discharging);
}
/**
* 根据Id删除销售明细数据
* 只做数据修改,退款需审核
* @param body
* @return
*/
@PostMapping("/salesRecord/deleteSalesRecordBatch")
public ResponseObj deleteById(@RequestBody String body) {
JsonNode jsonNode = JSONObjectUtils.toJson(body);
return salesRecordService.deleteById(jsonNode);
}
/**
* 批量审核异常数据,进行扣款或者退款
* @param body
* @return
*/
@PostMapping("/salesRecord/approvalBatch")
public ResponseObj approvalBatch(@RequestBody String body) {
JsonNode jsonNode = JSONObjectUtils.toJson(body);
return salesRecordService.approvalBatch(jsonNode);
}
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/web/ShipQuantityController.java 0 → 100644
package com.xyst.dinas.sales.web;
import com.beecode.amino.core.Amino;
import com.beecode.bap.attachment.common.Page;
import com.beecode.bap.log.LogConstants;
import com.beecode.bap.log.service.LogService;
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;
@Autowired
private LogService logService;
/**
* 新建运船量方
*
* @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("sandMiningArea").getUuid("id")) {
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);
}
@PostMapping("/addLog")
public ResponseObj addLog(@RequestParam("id") UUID id,
@RequestParam("module") String module,
@RequestParam("logContent") String logContent) {
//记录操作日志
KObject log = Amino.getApplicationContext()
.getBean(LogConstants.LOG_ENTIY_NAME, KClass.class).newInstance();
log.set("module", module);
log.set("businessObjectId", id);
log.set("logContent", logContent);
logService.addLog(log);
return ResponseObj.success("保存成功", id);
}
@GetMapping("/test")
public ResponseObj init(@RequestParam("id") String id) {
System.out.println("testok");
return ResponseObj.success("查询成功", id);
}
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/web/info/SalesRecordInfo.java
package com.xyst.dinas.sales.web.info;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.util.Date;
......@@ -10,6 +13,8 @@ import java.util.Date;
public class SalesRecordInfo {
//主键id
private String id;
/**
* 项目
*/
......@@ -66,6 +71,20 @@ public class SalesRecordInfo {
*/
private Date tareWeightTime;
/**
* 毛重时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date grossWeightTimeInfo;
/**
* 皮重时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date tareWeightTimeInfo;
/**
* 皮重
*/
......@@ -150,7 +169,83 @@ public class SalesRecordInfo {
*/
private Integer saleType;
public String getProductionLineId() {
//数据来源
private String dataSource;
//原因
private String reason;
//删除原因
private String delReason;
//方法类型
private Integer methodType;
//版本号
private Integer version;
/**
* 审核状态
*/
private Integer approveState;
public Integer getApproveState() {
return approveState;
}
public void setApproveState(Integer approveState) {
this.approveState = approveState;
}
public Date getGrossWeightTimeInfo() {
return grossWeightTimeInfo;
}
public void setGrossWeightTimeInfo(Date grossWeightTimeInfo) {
this.grossWeightTimeInfo = grossWeightTimeInfo;
}
public Date getTareWeightTimeInfo() {
return tareWeightTimeInfo;
}
public void setTareWeightTimeInfo(Date tareWeightTimeInfo) {
this.tareWeightTimeInfo = tareWeightTimeInfo;
}
public Integer getVersion() {
return version;
}
public void setVersion(Integer version) {
this.version = version;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public Integer getMethodType() {
return methodType;
}
public void setMethodType(Integer methodType) {
this.methodType = methodType;
}
public String getDelReason() {
return delReason;
}
public void setDelReason(String delReason) {
this.delReason = delReason;
}
public String getProductionLineId() {
return productionLineId;
}
......@@ -397,4 +492,20 @@ public class SalesRecordInfo {
public void setSaleType(Integer saleType) {
this.saleType = saleType;
}
public String getDataSource() {
return dataSource;
}
public void setDataSource(String dataSource) {
this.dataSource = dataSource;
}
public String getReason() {
return reason;
}
public void setReason(String reason) {
this.reason = reason;
}
}
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/ExceptionApprovalCheck.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package>
<name>ExceptionApprovalCheck</name>
<title>审核</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='843c71cc-2c88-4dd7-9ce4-c9fd33470389' category='销售/异常数据审核（区域公司）' seq='1'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/ExceptionApprovalList.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package>
<name>ExceptionApprovalList</name>
<title>列表</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='367fd08f-ad86-4931-957e-b9f98cf8c66d' category='销售/异常数据审核（区域公司）' seq='0'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/ExceptionCard.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package>
<name>ExceptionCard</name>
<title>卡片查看</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='abf4d4f0-f3c4-404f-997c-396f005a9802' category='销售/异常数据（区域公司）' seq='3'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/ExceptionCreate.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package>
<name>ExceptionCreate</name>
<title>新建</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='313913f0-ff31-4ecf-989c-78353a754d68' category='销售/异常数据（区域公司）' seq='1'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/ExceptionDelete.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package>
<name>ExceptionDelete</name>
<title>删除</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='de6beff4-ccb1-46e1-9df6-e95c3d3ef79d' category='销售/异常数据（区域公司）' seq='4'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/ExceptionEdit.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package>
<name>ExceptionEdit</name>
<title>编辑</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='2d92b31f-31d1-447c-b00d-1de1e63a6ff9' category='销售/异常数据（区域公司）' seq='2'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/ExceptionList.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package>
<name>ExceptionList</name>
<title>列表</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='3e9ed943-d381-4291-828b-7f963715cdbf' category='销售/异常数据（区域公司）' seq='0'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/ShipQuantityCard.mk 0 → 100644
<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
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/ShipQuantityCoefficient.mk 0 → 100644
<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
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/ShipQuantityCreate.mk 0 → 100644
<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
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/ShipQuantityDelete.mk 0 → 100644
<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
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/ShipQuantityList.mk 0 → 100644
<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
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/ShipQuantityPrice.mk 0 → 100644
<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
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/bill/ShipQuantity.mk 0 → 100644
<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
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/datamodel/SalesRecord.mk
......@@ -112,6 +112,29 @@
<attribute id='7b72bf25-26fd-4e24-b3f9-67d4f4733ff2' name='dealBillCode' columnName='deal_bill_code' title='销售单号' type='string' default='' precision='' isArray='false'>
<annotation id='82dec9ef-61f8-4e17-ba12-4df0472b1e73' attributeId='511c5c00-ccf7-48cb-a7bb-1743a2b92e57' name='length' value='50'></annotation>
</attribute>
<attribute id='80dd565a-8a2e-4661-b89b-5384ebafd73c' name='dataSource' columnName='data_source' title='数据来源' type='string' default='' precision='' isArray='false'>
<annotation id='f05b84c7-476d-4397-9d5e-2c37488d9c92' attributeId='f9a9d6f4-a208-45e5-9318-22af73e404ab' name='length' value='50'></annotation>
</attribute>
<attribute id='988d3d4c-1062-41e0-94b9-bd339718330d' name='reason' columnName='reason' title='原因' type='string' default='' precision='' isArray='false'>
<annotation id='d4ae7313-828a-48ff-84cf-d2b1db59a6c9' attributeId='107e0691-586b-49e8-bb75-372e56b01f43' name='length' value='50'></annotation>
</attribute>
<attribute id='e7ca1203-2dfe-4ef0-b6a6-c204aa9a04da' name='delReason' columnName='del_reason' title='删除原因' type='string' default='' precision='' isArray='false'>
<annotation id='23d02bbd-eabd-47b0-a1ea-674af1ee5695' attributeId='8378869d-f001-44fe-9837-a0ccada7d11c' name='length' value='50'></annotation>
</attribute>
<attribute id='76cb3a45-d1ef-4ac7-ade5-3c3c34c21811' name='methodType' columnName='method_type' title='数据方法类型 0:新增 1:删除' type='int' default='' precision='' isArray='false'>
<annotation id='363be135-5265-4354-acd3-09448a570214' attributeId='e5872b18-5a17-431f-a927-b41966b7b982' name='length' value='undefined'>
</annotation>
</attribute>
<attribute id='4cbbfe49-27b0-4439-b357-e6087c3c740b' name='approveStateDel' columnName='approve_state_del' title='删除审核状态 1:待审核 2:审核通过 3 驳回' type='int' default='' precision='' isArray='false'>
<annotation id='999a9b8c-80f4-4b9e-8cf6-2b6d841cb03f' attributeId='bd8184ee-3da7-4f72-a2c1-f44ab3094328' name='length' value='undefined'>
</annotation>
</attribute>
<hibernate>/xyst.dinas.sales/src/main/resources/config/SalesRecord.hbm.xml</hibernate>
</dataModel>
</content>
......
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/datamodel/ShipQuantity.mk 0 → 100644
<model>
<header>
<type>bcp.type.DataModel</type>
<package>com.xyst.dinas.sales.datamodel</package>
<title>运船量方</title>
<tags></tags>
<name>ShipQuantity</name>
<description>运船量方</description>
<templateName>mk.ide.ui.editor.data.model.template.bill</templateName>
<tablePrefix>xyst_dinas_</tablePrefix>
</header>
<content>
<dataModel id='620d12bd-2763-4dbc-bb17-9a1d6cfac370' multiVersion='' domainInherit='undefined'
tableName='xyst_dinas_ship_quantity'>
<parent>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</parent>
<parent>com.beecode.inz.common.datamodel.BaseInfo</parent>
<attribute id='7cd74073-959e-4df1-a648-277cc2c37f56' name='regionalCompany' columnName='regional_company_id' title='区域公司' type='com.xyst.dinas.biz.datamodel.xystOrganization' default='' precision='' isArray='false'>
<annotation id='f416f259-7cfa-44a3-9d22-4e56d10dfd55'
attributeId='1314c3b5-9dde-4ea1-8e63-8da7b559877b' name='length' value='undefined'></annotation>
<annotation id='b883e9de-04e0-4189-9747-637c38a53744'
attributeId='a8025c84-30ee-44a1-9763-c691577cce38' name='mappingType' value='many-to-one'></annotation>
</attribute>
<attribute id='47a14fbf-c11a-4043-9073-950f746e778a' name='purchaseSandUnit' columnName='purchase_sand_unit_id' title='购砂单位' type='com.xyst.dinas.project.datamodel.PurchaseSandCompany' default='' precision='' isArray='false'>
<annotation id='b79108b6-1f04-400d-b7dd-c11891b67f87' attributeId='7a9a301c-9daf-497a-a1fe-c89bcdd42018' name='length' value='undefined'></annotation>
<annotation id='8a60e7da-debd-4330-9b4d-e273d9e82c93' attributeId='b1b8a82a-2449-4536-a9e5-07bb1427cdb6' name='mappingType' value='many-to-one'></annotation>
</attribute>
<attribute id='2f504eb0-dd78-4f0a-b433-aa8742144b39' name='contract' columnName='contract_id' title='所属合同' type='com.xyst.dinas.contract.datamodel.Contract' default='' precision='' isArray='false'>
<annotation id='687514f4-2608-49d2-981e-379c38378109' attributeId='6cb98088-e679-4f8d-945e-1abf4a2ec59d' name='length' value='undefined'></annotation>
<annotation id='e07f9f5c-ecc5-4682-bfb4-85ad79df86ec' attributeId='b01e36fd-e927-4b1a-9060-70f17de025cd' name='mappingType' value='many-to-one'></annotation>
</attribute>
<attribute id='7060c04b-f1e0-4e51-a9b6-bc790097338d' name='project' columnName='project_id' title='所属项目' type='com.xyst.dinas.project.datamodel.ProjectFiled' default='' precision='' isArray='false'>
<annotation id='8f2cfde0-eb76-4da9-ace1-dfc550fdf72b' attributeId='8258fb3b-a4c7-4cd2-b6bc-1b3ad8b42b3b' name='length' value='undefined'></annotation>
<annotation id='fdc39c46-ab51-4a55-8a6f-a6ee32b8980a' attributeId='1ef4d20c-2b03-49bb-b2b8-a169470a39b0' name='mappingType' value='many-to-one'></annotation>
</attribute>
<attribute id='ede9a1dc-8cec-4978-96aa-602873d48f09' name='transportShipName' columnName='transport_ship_Name' title='运砂船' type='string' default='' precision='' isArray='false'>
<annotation id='42b07dc1-1859-4522-97ab-a821eda11c0f' attributeId='6cebbeb2-2f53-4b2d-beea-451ceb076044' name='length' value='50'/>
</attribute>
<attribute id='966c39b5-8bc0-4ca9-a151-373b02a4eed3' name='sandMiningArea' columnName='sand_mining_area_id' title='所属采区' type='com.xyst.dinas.biz.datamodel.SandMiningArea' default='' precision='' isArray='false'>
<annotation id='5fd9ba55-db5c-4bb6-b292-e18277e6c54e' attributeId='616b9c07-9791-435e-bfd3-989066a546eb' name='length' value='undefined'></annotation>
<annotation id='f6b6964d-bd09-4767-b380-40c4d93e8f87' attributeId='7837cb05-0429-4a74-bd4f-38a061ca5dfb' name='mappingType' value='many-to-one'></annotation>
</attribute>
<attribute id='d18c33cf-39bf-4220-bff7-5428a68a5142' name='dinasType' columnName='dinas_type_id' title='砂石类型' type='com.xyst.dinas.biz.datamodel.DinasType' default='' precision='' isArray='false'>
<annotation id='7c09730e-4da9-45c6-9cbb-b37c22b88bbe' attributeId='90ab8c99-6c83-4a68-9e0f-e6bb303566af' name='length' value='undefined'></annotation>
<annotation id='12fbe06c-0562-4d5c-9ec1-23631daaaf54' attributeId='491dbd7e-00b3-4c12-b924-17ae623bbfdf' name='mappingType' value='many-to-one'></annotation>
</attribute>
<attribute id='813268db-b321-410d-92e2-c50ce8b1c980' name='calculateTotalAmount'
columnName='calculate_total_amount' title='计量吨位' type='fixnum' default='' precision='' isArray='false'>
<annotation i2d='ff2b4ad5-fd41-4e46-b66b-f25d522837dc' attributeId='212af012-b9df-428c-bf01-29a3776c0af3' name='length' value='100'></annotation>
<annotation id='48ce23a0-f1de-41bb-9721-63dafddef011' attributeId='850a5c56-ed3b-40e6-8c6c-2a40632c683d' name='precision' value='12'></annotation>
<annotation id='5eef6fee-bf2c-4c82-9e9e-3bef20296d24' attributeId='5080dfd7-015b-41e9-966c-9bc2a6cb46bf' name='scale' value='2'></annotation>
</attribute>
<attribute id='fabeb6cd-37a0-499d-9447-f69050172c92' name='advanceBalance' columnName='advance_balance' title='预付款余额' type='fixnum' default='' precision='' isArray='false'>
<annotation i2d='d7983cae-e083-4e1c-ba60-c299893d65d4' attributeId='d6e0a71e-afde-4cda-b497-bf28f540713e' name='length' value='100'></annotation>
<annotation id='a636e098-0728-4dcc-9504-cf1fb894b1a3' attributeId='b020ebc8-c639-4150-9aa8-96bae0a1ae57' name='precision' value='12'></annotation>
<annotation id='cb47eb9e-2e98-4700-8efb-26363733804b' attributeId='0f94f456-2cbc-4e96-bb24-fae66a34edd3' name='scale' value='2'></annotation>
</attribute>
<attribute id='b26fa331-11e4-452a-b62a-cd60298379dc' name='longLength' columnName='long_length' title='长' type='fixnum' default='' precision='' isArray='false'>
<annotation i2d='522b4bc3-cc04-4c3b-96e5-b95c7d84ff14' attributeId='983a7272-430e-4cc3-83ca-1053a9ff7bd2' name='length' value='100'></annotation>
<annotation id='cc2dce81-efe1-4ece-b19b-1af48517ca8b' attributeId='1c09d428-2612-4382-810e-094d33e13054' name='precision' value='12'></annotation>
<annotation id='63c6fc29-8225-479d-8f06-29549524f247' attributeId='24c216b6-3c93-4039-ad08-beced4c498de' name='scale' value='3'></annotation>
</attribute>
<attribute id='c2f59f7b-9085-4e99-8bbe-a93930608d9c' name='wideLength' columnName='wide_length' title='宽' type='fixnum' default='' precision='' isArray='false'>
<annotation i2d='b199ff78-c0ce-4c89-b45f-d71c61ae4eaa' attributeId='31b38f18-d654-49dd-ad85-a922e8750d23' name='length' value='100'></annotation>
<annotation id='67c84da8-47c8-4b91-90d9-e6723080ef3e' attributeId='20b9d8f6-7ff3-44ac-8ee4-c9986f98a36b' name='precision' value='12'></annotation>
<annotation id='29801af8-a805-4854-8cdf-85912ce84bf1' attributeId='1fe4d6bc-206d-4148-a831-873d718bee6e' name='scale' value='3'></annotation>
</attribute>
<attribute id='65828ee0-1dcf-4127-a5e8-a57518c9e886' name='highLength' columnName='high_length' title='高' type='fixnum' default='' precision='' isArray='false'>
<annotation i2d='0c82c847-6a82-479b-8773-899782f47528' attributeId='d4425115-9e18-4331-8b2f-c1f36657756f' name='length' value='100'></annotation>
<annotation id='5c7b649b-cc0f-4b44-b799-717ecfbaf849' attributeId='5e50f3c1-64cd-488e-bec5-97a68cab6fa8' name='precision' value='12'></annotation>
<annotation id='389225d8-70b0-495f-8d88-9d84ea6303ee' attributeId='23690a19-881b-45f4-babd-f05c0d51dfc1' name='scale' value='3'></annotation>
</attribute>
<attribute id='0aa522b9-2bff-4327-8818-7cd17a41ab5e' name='coefficientOf' columnName='coefficient_of' title='折方系数' type='fixnum' default='' precision='' isArray='false'>
<annotation i2d='3532d64e-beba-4044-8da7-b67084afa2dc' attributeId='11215846-c098-411a-b78b-9506230c3985' name='length' value='100'></annotation>
<annotation id='7805bac6-1a09-448b-adfd-21c44ddb7ff8' attributeId='5990b43d-a0ff-4fab-b9c5-2bbd9853f7f5' name='precision' value='12'></annotation>
<annotation id='8e6015e8-7ed4-484c-93c7-d74a56b58d56' attributeId='b47767ea-a1cd-45a8-b191-c888a53cf30b' name='scale' value='3'></annotation>
</attribute>
<attribute id='24ad18f1-84c5-4c03-a26f-35399ee88e72' name='price' columnName='price' title='单价' type='fixnum' default='' precision='' isArray='false'>
<annotation i2d='5eae302e-4ddd-46ad-9718-d95ddfd4fa72' attributeId='5e60868b-d4df-4727-8e63-146b5a2e37cc' name='length' value='100'></annotation>
<annotation id='bcacff52-686c-4a72-a142-aa93b0cdc9b6' attributeId='beb2d79d-b527-42eb-ae68-7a0ad81b6f1f' name='precision' value='12'></annotation>
<annotation id='f128c5dc-2eab-4c69-8676-bed73dd9dbd9' attributeId='7084760b-2b79-4595-aafa-75a32b697ac0' name='scale' value='2'></annotation>
</attribute>
<attribute id='de41ce11-1a36-4964-95fb-fdd364b985fe' name='amount' columnName='amount' title='总价' type='fixnum' default='' precision='' isArray='false'>
<annotation i2d='7b9d9494-cd52-43cd-8340-c47cb4f1ee4d' attributeId='28129468-fc38-4299-a3ec-ee4efee93305' name='length' value='100'></annotation>
<annotation id='23eba1f0-f555-4cf7-b474-a865db68f9ec' attributeId='439579a4-b975-4dde-9e4d-b0b2ec08853a' name='precision' value='12'></annotation>
<annotation id='27d6ce93-0764-489a-9af2-31ad667b4587' attributeId='25a24f57-3c3d-40b4-bfa1-1b8e835379d1' name='scale' value='2'></annotation>
</attribute>
<attribute id='df2c7137-b6d6-441a-96e5-6db64d82fba6' name='dealTime' columnName='deal_time' title='销售时间' type='datetime' default='' precision='' isArray='false'>
<annotation id='ddbe4dba-333a-43ac-b064-9323d3f8deed' attributeId='58d669cf-479c-4474-bd43-eec2d69edfe3' name='length' value='undefined'/>
</attribute>
<hibernate>/xyst.dinas.sales/src/main/resources/config/ShipQuantity.hbm.xml</hibernate>
</dataModel>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/query/SalesRecord.mk
......@@ -294,6 +294,52 @@
</ref>
<description></description>
</field>
<field title='数据来源'>
<name>dataSource</name>
<type>string</type>
<description></description>
</field>
<field title='原因'>
<name>reason</name>
<type>string</type>
<description></description>
</field>
<field title='删除原因'>
<name>delReason</name>
<type>string</type>
<description></description>
</field>
<field title='审批状态'>
<name>approveState</name>
<type>int</type>
<description></description>
</field>
<field title='方法类型'>
<name>methodType</name>
<type>int</type>
<description></description>
</field>
<field title='删除审核状态'>
<name>approveStateDel</name>
<type>int</type>
<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
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/query/ShipQuantity.mk 0 → 100644
<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='所属采区唯一主键编码'>
<name>sandMiningArea.id</name>
<description>采砂区域</description>
<type>uuid</type>
<ref>
<name>com.xyst.dinas.biz.datamodel.SandMiningArea</name>
<type></type>
</ref>
</field>
<field title='所属采区名称'>
<name>sandMiningArea.sandMiningAreaName</name>
<description>所属采区名称</description>
<type>string</type>
<ref>
<name>com.xyst.dinas.biz.datamodel.SandMiningArea</name>
<type></type>
</ref>
</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
backend/xyst.dinas.sales/src/main/resources/META-INF/spring.factories
......@@ -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
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/ExceptionApprovalCheck.jmx 0 → 100644
<?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>843c71cc-2c88-4dd7-9ce4-c9fd33470389</id>
<name>com.xyst.dinas.sales.auth.ExceptionApprovalCheck</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>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/ExceptionApprovalList.jmx 0 → 100644
<?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>367fd08f-ad86-4931-957e-b9f98cf8c66d</id>
<name>com.xyst.dinas.sales.auth.ExceptionApprovalList</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>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/ExceptionCard.jmx 0 → 100644
<?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>abf4d4f0-f3c4-404f-997c-396f005a9802</id>
<name>com.xyst.dinas.sales.auth.ExceptionCard</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>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/ExceptionCreate.jmx 0 → 100644
<?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>313913f0-ff31-4ecf-989c-78353a754d68</id>
<name>com.xyst.dinas.sales.auth.ExceptionCreate</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>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/ExceptionDelete.jmx 0 → 100644
<?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>de6beff4-ccb1-46e1-9df6-e95c3d3ef79d</id>
<name>com.xyst.dinas.sales.auth.ExceptionDelete</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>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/ExceptionEdit.jmx 0 → 100644
<?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>2d92b31f-31d1-447c-b00d-1de1e63a6ff9</id>
<name>com.xyst.dinas.sales.auth.ExceptionEdit</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>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/ExceptionList.jmx 0 → 100644
<?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>3e9ed943-d381-4291-828b-7f963715cdbf</id>
<name>com.xyst.dinas.sales.auth.ExceptionList</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>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/ShipQuantityCard.jmx 0 → 100644
<?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>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/ShipQuantityCoefficient.jmx 0 → 100644
<?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>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/ShipQuantityCreate.jmx 0 → 100644
<?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>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/ShipQuantityDelete.jmx 0 → 100644
<?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>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/ShipQuantityList.jmx 0 → 100644
<?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>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/ShipQuantityPrice.jmx 0 → 100644
<?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>
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>d89849bc-614d-41a1-aa1d-48d1c5840b11</id>
<id>ff252764-684e-4a1c-8dc4-e8ae9be96221</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>609475c6-3651-4950-b36d-08796ec9d6b1</id>
<id>dc3641eb-3c2e-4b2a-809e-75918d8de485</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>74fb2944-51dd-4f34-b4f1-303895c0fb36</id>
<id>042bb8a6-0510-4743-99a2-ee67849c0083</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>91d6db6a-1475-4644-8835-7466de9db4c4</id>
<id>301746c5-745d-444e-a137-06e6e89343d9</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>ded413c6-eebe-4ef4-82cc-ab54fda0b911</id>
<id>f54aea81-d428-45bb-83eb-ad3fd31aeb70</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>7ea44cc6-8c8a-4f75-b71f-1d0096846085</id>
<id>004d95cc-bf1f-4058-940f-2d6b36e1044b</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>b57a974d-776e-46f9-a7e5-3d1b2cf059f7</id>
<id>a00450b4-1667-495b-93c4-d9bba2eb01d4</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>b518493d-1ad3-4e1a-98c5-0201358c2ad3</id>
<id>2986ba9a-f4b4-45df-ac73-facc6f39a161</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>103cdf02-2ceb-416c-aeef-dcdea90c45e7</id>
<id>cffd3a4e-f920-4c4c-94e0-2834863b2764</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>0548c9bc-1690-4e9e-a8fa-41c46e4d3408</id>
<id>9ffc7bf0-cdfc-4bc7-bfd7-e348bd9fd045</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>167394b7-547f-4a5d-925c-2e946a5e6b4f</id>
<id>23a13afe-7da5-43f1-a134-96ea5a457508</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>4972799d-6a37-4fc7-a468-27a813b48739</id>
<id>581cc94c-1082-480e-8d0c-bda7a5256aa5</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/ShipQuantity$sequence.jmx 0 → 100644
<?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>246c9383-3efa-40db-839a-fd19e0131d87</id>
<name>com.xyst.dinas.sales.bill.ShipQuantity$sequence</name>
<title>运船量方$sequence</title>
<description>运船量方</description>
<define>bcp.sequence</define>
<define-version>1.0</define-version>
<content>
<m:sequence>
<m:start-with>0</m:start-with>
<m:increment>1</m:increment>
<m:max>99999</m:max>
<m:min>0</m:min>
<m:cycle>true</m:cycle>
<m:cache-size>10</m:cache-size>
</m:sequence>
</content>
</metadata>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/ShipQuantity$serial.jmx 0 → 100644
<?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>a84a60f3-55d2-4995-b295-1e44cf0ad0f5</id>
<name>com.xyst.dinas.sales.bill.ShipQuantity$serial</name>
<title>运船量方$serial</title>
<description>运船量方</description>
<define>bcp.serial</define>
<define-version>1.0</define-version>
<dependency>com.xyst.dinas.sales.bill.ShipQuantity$sequence</dependency>
<dependency>com.xyst.dinas.sales.datamodel.ShipQuantity</dependency>
<content>
<m:serial>
<m:input>com.xyst.dinas.sales.datamodel.ShipQuantity</m:input>
<m:functionLibrarys/>
<m:segments>
<m:literal>
<m:value>DG</m:value>
</m:literal>
<m:sequence>
<m:length>5</m:length>
<m:pad-direction>left</m:pad-direction>
<m:pad-string>0</m:pad-string>
<m:key>com.xyst.dinas.sales.bill.ShipQuantity$serial</m:key>
<m:sequenceName>com.xyst.dinas.sales.bill.ShipQuantity$sequence</m:sequenceName>
</m:sequence>
</m:segments>
</m:serial>
</content>
</metadata>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/ShipQuantity.jmx 0 → 100644
<?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>7817b4fc-6cdc-4229-9a5e-00f2b26d2b22</id>
<name>com.xyst.dinas.sales.bill.ShipQuantity</name>
<title>运船量方</title>
<description>运船量方</description>
<define>bcp.biz.Biztype</define>
<define-version>1.0</define-version>
<dependency>com.xyst.dinas.sales.datamodel.ShipQuantity</dependency>
<dependency>com.xyst.dinas.sales.bill.ShipQuantity$serial</dependency>
<dependency>com.beecode.bap.biztrait.BasicBillBiztrait</dependency>
<content>
<m:biztype>
<m:type>com.xyst.dinas.sales.datamodel.ShipQuantity</m:type>
<m:inheritances>
<m:inheritance>
<m:biztrait>com.beecode.bap.biztrait.BasicBillBiztrait</m:biztrait>
<m:config type="xml">
<m:content>&lt;billBasictraitConfig&gt;&lt;formulas/&gt;&lt;parents&gt;&lt;parent&gt;&lt;billCodeConfig&gt;&lt;serialName&gt;com.xyst.dinas.sales.bill.ShipQuantity$serial&lt;/serialName&gt;&lt;buildTime&gt;add&lt;/buildTime&gt;&lt;/billCodeConfig&gt;&lt;/parent&gt;&lt;parent&gt;&lt;workflowConfig&gt;&lt;workflow&gt;&lt;/workflow&gt;&lt;/workflowConfig&gt;&lt;/parent&gt;&lt;parent&gt;&lt;printConfig&gt;&lt;templates/&gt;&lt;/printConfig&gt;&lt;/parent&gt;&lt;/parents&gt;&lt;functionLibrarys/&gt;&lt;/billBasictraitConfig&gt;</m:content>
</m:config>
</m:inheritance>
</m:inheritances>
<m:methodAuthorityItems/>
</m:biztype>
</content>
</metadata>
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>c1648077-a6bf-4896-be8b-8d62785990b9</id>
<id>6a4de93b-77da-4e8a-82e2-cb59e61f5d30</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>ead8f5d3-c64e-402a-a195-de50ebb6aaeb</id>
<id>7cd00f77-5428-4cec-8074-3ef756cb3c44</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>78233632-33dc-429e-93a3-a4772eab7190</id>
<id>239717be-513e-4020-9f96-267d132880fa</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/NeedPlanAssociatedNeedPlanDetail.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-type">
<specification>1.0</specification>
<id>4ce1be10-e1e5-4504-abc9-a21efd675cdb</id>
<id>4afc591a-5144-4cfc-91a4-e0fdcdcabc13</id>
<name>com.xyst.dinas.sales.datamodel.NeedPlanAssociatedNeedPlanDetail</name>
<title>需用计划明细表</title>
<define>bcp.type.Class</define>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/datamodel/SalesPlanAssociatedSalesPlanDetail.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-type">
<specification>1.0</specification>
<id>8bb6133d-fc86-48db-b6ad-0a6b99d3d77f</id>
<id>4607eb7a-672b-4a95-aae5-cb0b56eb72cb</id>
<name>com.xyst.dinas.sales.datamodel.SalesPlanAssociatedSalesPlanDetail</name>
<title>销售计划子表</title>
<define>bcp.type.Class</define>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/datamodel/SalesPlanTempAssociatedSalesPlanTempDetail.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-type">
<specification>1.0</specification>
<id>ad350a98-f681-4e33-9722-1d0109db2671</id>
<id>6f068ad9-d064-474d-aef7-3a95af4581c6</id>
<name>com.xyst.dinas.sales.datamodel.SalesPlanTempAssociatedSalesPlanTempDetail</name>
<title>临时销售计划子表</title>
<define>bcp.type.Class</define>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/datamodel/SalesRecord.jmx
......@@ -704,6 +704,113 @@
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>bcp.type.constraint.StringLength</m:type>
<m:value>50</m:value>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>data_source</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>80dd565a-8a2e-4661-b89b-5384ebafd73c</m:id>
<m:name>dataSource</m:name>
<m:title>数据来源</m:title>
<m:type>string</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>bcp.type.constraint.StringLength</m:type>
<m:value>50</m:value>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>reason</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>988d3d4c-1062-41e0-94b9-bd339718330d</m:id>
<m:name>reason</m:name>
<m:title>原因</m:title>
<m:type>string</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>bcp.type.constraint.StringLength</m:type>
<m:value>50</m:value>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>del_reason</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>e7ca1203-2dfe-4ef0-b6a6-c204aa9a04da</m:id>
<m:name>delReason</m:name>
<m:title>删除原因</m:title>
<m:type>string</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>method_type</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>76cb3a45-d1ef-4ac7-ade5-3c3c34c21811</m:id>
<m:name>methodType</m:name>
<m:title>数据方法类型 0:新增 1:删除</m:title>
<m:type>int</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>approve_state_del</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>4cbbfe49-27b0-4439-b357-e6087c3c740b</m:id>
<m:name>approveStateDel</m:name>
<m:title>删除审核状态 1:待审核 2:审核通过 3 驳回</m:title>
<m:type>int</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
</m:attributes>
</m:class>
</content>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/datamodel/ShipQuantity.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-type">
<specification>1.0</specification>
<id>620d12bd-2763-4dbc-bb17-9a1d6cfac370</id>
<name>com.xyst.dinas.sales.datamodel.ShipQuantity</name>
<title>运船量方</title>
<description>运船量方</description>
<define>bcp.type.Class</define>
<define-version>1.0</define-version>
<dependency>javax.persistence.Entity</dependency>
<dependency>bcp.type.constraint.StringLength</dependency>
<dependency>javax.persistence.ManyToOne</dependency>
<dependency>com.beecode.inz.common.datamodel.BaseInfo</dependency>
<dependency>com.xyst.dinas.biz.datamodel.DinasType</dependency>
<dependency>bcp.type.constraint.Numeric</dependency>
<dependency>javax.persistence.JoinColumn</dependency>
<dependency>javax.persistence.OneToMany</dependency>
<dependency>com.xyst.dinas.contract.datamodel.Contract</dependency>
<dependency>com.xyst.dinas.biz.datamodel.xystOrganization</dependency>
<dependency>com.xyst.dinas.project.datamodel.PurchaseSandCompany</dependency>
<dependency>javax.persistence.Column</dependency>
<dependency>javax.persistence.Table</dependency>
<dependency>com.xyst.dinas.biz.datamodel.SandMiningArea</dependency>
<dependency>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</dependency>
<dependency>com.xyst.dinas.project.datamodel.ProjectFiled</dependency>
<content>
<m:class>
<m:annotations>
<m:annotation>
<m:type>javax.persistence.Entity</m:type>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Table</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>xyst_dinas_ship_quantity</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:parents>
<m:parent>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</m:parent>
<m:parent>com.beecode.inz.common.datamodel.BaseInfo</m:parent>
</m:parents>
<m:attributes>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>javax.persistence.ManyToOne</m:type>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.JoinColumn</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>regional_company_id</m:value>
</m:property>
<m:property>
<m:key>referencedColumnName</m:key>
<m:value>ID</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>7cd74073-959e-4df1-a648-277cc2c37f56</m:id>
<m:name>regionalCompany</m:name>
<m:title>区域公司</m:title>
<m:type>com.xyst.dinas.biz.datamodel.xystOrganization</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>javax.persistence.ManyToOne</m:type>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.JoinColumn</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>purchase_sand_unit_id</m:value>
</m:property>
<m:property>
<m:key>referencedColumnName</m:key>
<m:value>ID</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>47a14fbf-c11a-4043-9073-950f746e778a</m:id>
<m:name>purchaseSandUnit</m:name>
<m:title>购砂单位</m:title>
<m:type>com.xyst.dinas.project.datamodel.PurchaseSandCompany</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>javax.persistence.ManyToOne</m:type>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.JoinColumn</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>contract_id</m:value>
</m:property>
<m:property>
<m:key>referencedColumnName</m:key>
<m:value>ID</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>2f504eb0-dd78-4f0a-b433-aa8742144b39</m:id>
<m:name>contract</m:name>
<m:title>所属合同</m:title>
<m:type>com.xyst.dinas.contract.datamodel.Contract</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>javax.persistence.ManyToOne</m:type>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.JoinColumn</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>project_id</m:value>
</m:property>
<m:property>
<m:key>referencedColumnName</m:key>
<m:value>ID</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>7060c04b-f1e0-4e51-a9b6-bc790097338d</m:id>
<m:name>project</m:name>
<m:title>所属项目</m:title>
<m:type>com.xyst.dinas.project.datamodel.ProjectFiled</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>bcp.type.constraint.StringLength</m:type>
<m:value>50</m:value>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>transport_ship_Name</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>ede9a1dc-8cec-4978-96aa-602873d48f09</m:id>
<m:name>transportShipName</m:name>
<m:title>运砂船</m:title>
<m:type>string</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>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>sand_mining_area_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>966c39b5-8bc0-4ca9-a151-373b02a4eed3</m:id>
<m:name>sandMiningArea</m:name>
<m:title>所属采区</m:title>
<m:type>com.xyst.dinas.biz.datamodel.SandMiningArea</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>javax.persistence.ManyToOne</m:type>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.JoinColumn</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>dinas_type_id</m:value>
</m:property>
<m:property>
<m:key>referencedColumnName</m:key>
<m:value>ID</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>d18c33cf-39bf-4220-bff7-5428a68a5142</m:id>
<m:name>dinasType</m:name>
<m:title>砂石类型</m:title>
<m:type>com.xyst.dinas.biz.datamodel.DinasType</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>bcp.type.constraint.Numeric</m:type>
<m:properties>
<m:property>
<m:key>precision</m:key>
<m:value>12</m:value>
</m:property>
<m:property>
<m:key>scale</m:key>
<m:value>2</m:value>
</m:property>
</m:properties>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>calculate_total_amount</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>813268db-b321-410d-92e2-c50ce8b1c980</m:id>
<m:name>calculateTotalAmount</m:name>
<m:title>计量吨位</m:title>
<m:type>fixnum</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>bcp.type.constraint.Numeric</m:type>
<m:properties>
<m:property>
<m:key>precision</m:key>
<m:value>12</m:value>
</m:property>
<m:property>
<m:key>scale</m:key>
<m:value>2</m:value>
</m:property>
</m:properties>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>advance_balance</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>fabeb6cd-37a0-499d-9447-f69050172c92</m:id>
<m:name>advanceBalance</m:name>
<m:title>预付款余额</m:title>
<m:type>fixnum</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>bcp.type.constraint.Numeric</m:type>
<m:properties>
<m:property>
<m:key>precision</m:key>
<m:value>12</m:value>
</m:property>
<m:property>
<m:key>scale</m:key>
<m:value>3</m:value>
</m:property>
</m:properties>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>long_length</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>b26fa331-11e4-452a-b62a-cd60298379dc</m:id>
<m:name>longLength</m:name>
<m:title>长</m:title>
<m:type>fixnum</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>bcp.type.constraint.Numeric</m:type>
<m:properties>
<m:property>
<m:key>precision</m:key>
<m:value>12</m:value>
</m:property>
<m:property>
<m:key>scale</m:key>
<m:value>3</m:value>
</m:property>
</m:properties>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>wide_length</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>c2f59f7b-9085-4e99-8bbe-a93930608d9c</m:id>
<m:name>wideLength</m:name>
<m:title>宽</m:title>
<m:type>fixnum</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>bcp.type.constraint.Numeric</m:type>
<m:properties>
<m:property>
<m:key>precision</m:key>
<m:value>12</m:value>
</m:property>
<m:property>
<m:key>scale</m:key>
<m:value>3</m:value>
</m:property>
</m:properties>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>high_length</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>65828ee0-1dcf-4127-a5e8-a57518c9e886</m:id>
<m:name>highLength</m:name>
<m:title>高</m:title>
<m:type>fixnum</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>bcp.type.constraint.Numeric</m:type>
<m:properties>
<m:property>
<m:key>precision</m:key>
<m:value>12</m:value>
</m:property>
<m:property>
<m:key>scale</m:key>
<m:value>3</m:value>
</m:property>
</m:properties>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>coefficient_of</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>0aa522b9-2bff-4327-8818-7cd17a41ab5e</m:id>
<m:name>coefficientOf</m:name>
<m:title>折方系数</m:title>
<m:type>fixnum</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>bcp.type.constraint.Numeric</m:type>
<m:properties>
<m:property>
<m:key>precision</m:key>
<m:value>12</m:value>
</m:property>
<m:property>
<m:key>scale</m:key>
<m:value>2</m:value>
</m:property>
</m:properties>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>price</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>24ad18f1-84c5-4c03-a26f-35399ee88e72</m:id>
<m:name>price</m:name>
<m:title>单价</m:title>
<m:type>fixnum</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>bcp.type.constraint.Numeric</m:type>
<m:properties>
<m:property>
<m:key>precision</m:key>
<m:value>12</m:value>
</m:property>
<m:property>
<m:key>scale</m:key>
<m:value>2</m:value>
</m:property>
</m:properties>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>amount</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>de41ce11-1a36-4964-95fb-fdd364b985fe</m:id>
<m:name>amount</m:name>
<m:title>总价</m:title>
<m:type>fixnum</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>deal_time</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>df2c7137-b6d6-441a-96e5-6db64d82fba6</m:id>
<m:name>dealTime</m:name>
<m:title>销售时间</m:title>
<m:type>datetime</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
</m:attributes>
</m:class>
</content>
</metadata>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/query/SalesRecord.jmx
......@@ -389,6 +389,76 @@
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>dataSource</m:name>
<m:title>数据来源</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>reason</m:name>
<m:title>原因</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>delReason</m:name>
<m:title>删除原因</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>approveState</m:name>
<m:title>审批状态</m:title>
<m:type>int</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>methodType</m:name>
<m:title>方法类型</m:title>
<m:type>int</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>approveStateDel</m:name>
<m:title>删除审核状态</m:title>
<m:type>int</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>del</m:name>
<m:title>删除</m:title>
<m:type>boolean</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
</m:fields>
</m:query>
</content>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/query/ShipQuantity.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/inz-query">
<specification>1.0</specification>
<id>8d344b00-ee23-42fe-888b-2a0cf34eb4a6</id>
<name>com.xyst.dinas.sales.query.ShipQuantity</name>
<title>运船量方</title>
<define>inz.query.Query</define>
<define-version>1.0</define-version>
<dependency>com.xyst.dinas.sales.datamodel.ShipQuantity</dependency>
<content>
<m:query>
<m:type>com.xyst.dinas.sales.datamodel.ShipQuantity</m:type>
<m:dataProcessor>com.xyst.dinas.sales.processor.SalesPlanProcessor</m:dataProcessor>
<m:authorityItem></m:authorityItem>
<m:innerScenes>
<m:innerScene>
<m:id>9794d739-c44a-4b49-9733-9655af862283</m:id>
<m:title>全部</m:title>
<m:javaImplement>com.beecode.inz.common.scene.CommonAllScene</m:javaImplement>
<m:defaultExecute></m:defaultExecute>
<m:hide></m:hide>
</m:innerScene>
<m:innerScene>
<m:id>2170c1aa-3f63-4fb2-bb1e-cd2314ea18e6</m:id>
<m:title>已废弃</m:title>
<m:javaImplement>com.beecode.inz.common.scene.DefaultDiscardScene</m:javaImplement>
<m:defaultExecute></m:defaultExecute>
<m:hide></m:hide>
</m:innerScene>
<m:innerScene>
<m:id>14c291e5-66d7-4cb4-80c2-e2a9d4143c8e</m:id>
<m:title>权限过滤</m:title>
<m:javaImplement>com.xyst.dinas.biz.scene.XystDinasCommonAllScene</m:javaImplement>
<m:defaultExecute>true</m:defaultExecute>
<m:hide>true</m:hide>
</m:innerScene>
</m:innerScenes>
<m:fields>
<m:field>
<m:name>id</m:name>
<m:title>id</m:title>
<m:type>uuid</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>regionalCompany.id</m:name>
<m:title>区域公司id</m:title>
<m:type>uuid</m:type>
<m:ref>
<m:name>com.xyst.dinas.biz.datamodel.xystOrganization</m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>regionalCompany.name</m:name>
<m:title>区域公司</m:title>
<m:type>string</m:type>
<m:ref>
<m:name>com.xyst.dinas.biz.datamodel.xystOrganization</m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>purchaseSandUnit.id</m:name>
<m:title>购砂单位</m:title>
<m:type>uuid</m:type>
<m:ref>
<m:name>com.xyst.dinas.project.datamodel.PurchaseSandCompany</m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>purchaseSandUnit.name</m:name>
<m:title>购砂单位名称</m:title>
<m:type>string</m:type>
<m:ref>
<m:name>com.xyst.dinas.project.datamodel.PurchaseSandCompany</m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>contract.id</m:name>
<m:title>合同id</m:title>
<m:type>uuid</m:type>
<m:ref>
<m:name>com.xyst.dinas.contract.datamodel.Contract</m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>contract.contractName</m:name>
<m:title>合同名称</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>contract.contractCode</m:name>
<m:title>合同编号</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>project.id</m:name>
<m:title>项目</m:title>
<m:type>uuid</m:type>
<m:ref>
<m:name>com.xyst.dinas.project.datamodel.ProjectFiled</m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>project.projectName</m:name>
<m:title>项目名称</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>transportShipName</m:name>
<m:title>运砂船</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>sandMiningArea.id</m:name>
<m:title>所属采区唯一主键编码</m:title>
<m:type>uuid</m:type>
<m:ref>
<m:name>com.xyst.dinas.biz.datamodel.SandMiningArea</m:name>
<m:type></m:type>
</m:ref>
<m:desc>采砂区域</m:desc>
</m:field>
<m:field>
<m:name>sandMiningArea.sandMiningAreaName</m:name>
<m:title>所属采区名称</m:title>
<m:type>string</m:type>
<m:ref>
<m:name>com.xyst.dinas.biz.datamodel.SandMiningArea</m:name>
<m:type></m:type>
</m:ref>
<m:desc>所属采区名称</m:desc>
</m:field>
<m:field>
<m:name>dinasType.id</m:name>
<m:title>砂石种类id</m:title>
<m:type>uuid</m:type>
<m:ref>
<m:name>com.xyst.dinas.biz.datamodel.DinasType</m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>dinasType.dinasTypeName</m:name>
<m:title>砂石种类名称</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>calculateTotalAmount</m:name>
<m:title>计量吨位</m:title>
<m:type>fixnum</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>price</m:name>
<m:title>单价</m:title>
<m:type>fixnum</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>amount</m:name>
<m:title>总价</m:title>
<m:type>fixnum</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>advanceBalance</m:name>
<m:title>预付款余额</m:title>
<m:type>fixnum</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>dealTime</m:name>
<m:title>销售时间</m:title>
<m:type>datetime</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>approveState</m:name>
<m:title>审批状态</m:title>
<m:type>int</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>createTime</m:name>
<m:title>创建时间</m:title>
<m:type>datetime</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>creator.name</m:name>
<m:title>创建人</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>modifyTime</m:name>
<m:title>修改时间</m:title>
<m:type>datetime</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>modifier.name</m:name>
<m:title>修改人</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>discard</m:name>
<m:title>废弃</m:title>
<m:type>boolean</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>del</m:name>
<m:title>删除</m:title>
<m:type>boolean</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
</m:fields>
</m:query>
</content>
</metadata>
backend/xyst.dinas.sales/src/main/resources/config/SalesRecord.hbm.xml
......@@ -111,5 +111,35 @@
<property name="dealBillCode" type="nstring" not-null="false">
<column name="deal_bill_code" length="50"></column>
</property>
<property name="dataSource" type="nstring" not-null="false">
<column name="data_source" length="50">
<comment>数据来源</comment>
</column>
</property>
<property name="reason" type="nstring" not-null="false">
<column name="reason" length="50">
<comment>原因</comment>
</column>
</property>
<property name="delReason" type="nstring" not-null="false">
<column name="del_reason" length="50">
<comment>删除原因</comment>
</column>
</property>
<property name="methodType" type="integer" not-null="false">
<column name="method_type">
<comment>数据方法类型 0:新增 1:删除</comment>
</column>
</property>
<property name="approveStateDel" type="integer" not-null="false">
<column name="approve_state_del">
<comment>删除审核状态 1:待审核 2:审核通过 3 驳回</comment>
</column>
</property>
</class>
</hibernate-mapping>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/resources/config/ShipQuantity.hbm.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<hibernate-mapping
xmlns="http://www.hibernate.org/xsd/hibernate-mapping"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.hibernate.org/xsd/hibernate-mapping
http://www.hibernate.org/xsd/hibernate-mapping/hibernate-mapping-4.0.xsd">
<class entity-name="com.xyst.dinas.sales.datamodel.ShipQuantity" table="xyst_dinas_sales_ship_quantity" optimistic-lock="version">
<tuplizer entity-mode="dynamic-map" class="com.beecode.bcp.store.hibernate.KObjectEntityTuplizer"/>
<id name="id" type="uuid-binary" column="id" length="16">
<generator class="assigned"/>
</id>
<version name="version" type="int" column="version"/>
<property name="createTime" type="timestamp" not-null="false">
<column name="create_time"/>
</property>
<many-to-one name="creator" entity-name="com.beecode.bap.staff.datamodel.Staff" fetch="select">
<column name="creator_id" not-null="false"/>
</many-to-one>
<property name="modifyTime" type="timestamp" not-null="false">
<column name="modify_time"/>
</property>
<many-to-one name="modifier" entity-name="com.beecode.bap.staff.datamodel.Staff" fetch="select">
<column name="modifier_id" not-null="false"/>
</many-to-one>
<property name="billState" type="nstring" not-null="false">
<column name="bill_state" length="100"/>
</property>
<many-to-one name="bizProcess" entity-name="com.beecode.bap.workflow.datamodel.BizProcess" fetch="select">
<column name="biz_process_id" not-null="false"/>
</many-to-one>
<property name="billCode" type="nstring" not-null="false">
<column name="bill_code" length="200"/>
</property>
<property name="discard" type="boolean" not-null="false">
<column name="discard"/>
</property>
<property name="del" type="boolean" not-null="false">
<column name="del"/>
</property>
<property name="approveState" type="integer" not-null="false">
<column name="approve_state"/>
</property>
<many-to-one name="regionalCompany" entity-name="com.xyst.dinas.biz.datamodel.xystOrganization" fetch="select">
<column name="regional_company" not-null="false">
<comment>区域公司</comment>
</column>
</many-to-one>
<many-to-one name="purchaseSandUnit" entity-name="com.xyst.dinas.project.datamodel.PurchaseSandCompany"
fetch="select">
<column name="purchase_sand_unit_id" not-null="false">
<comment>购砂单位</comment>
</column>
</many-to-one>
<many-to-one name="contract" entity-name="com.xyst.dinas.contract.datamodel.Contract" fetch="select">
<column name="contract_id" not-null="false">
<comment>所属合同</comment>
</column>
</many-to-one>
<many-to-one name="project" entity-name="com.xyst.dinas.project.datamodel.ProjectFiled" fetch="select">
<column name="project_id" not-null="false">
<comment>所属项目</comment>
</column>
</many-to-one>
<property name="transportShipName" type="nstring" not-null="false">
<column name="transport_ship_name">
<comment>运砂船</comment>
</column>
</property>
<many-to-one name="sandMiningArea" entity-name="com.xyst.dinas.biz.datamodel.SandMiningArea" fetch="select">
<column name="sand_mining_area_id" not-null="false">
<comment>所属采区</comment>
</column>
</many-to-one>
<many-to-one name="dinasType" entity-name="com.xyst.dinas.biz.datamodel.DinasType" fetch="select">
<column name="dinas_type_id" not-null="false">
<comment>砂石类型</comment>
</column>
</many-to-one>
<property name="calculateTotalAmount" type="big_decimal" not-null="false">
<column name="calculate_total_amount" precision="12" scale="2">
<comment>计量吨位</comment>
</column>
</property>
<property name="advanceBalance" type="big_decimal" not-null="false">
<column name="advance_balance" precision="12" scale="3">
<comment>预付款余额</comment>
</column>
</property>
<property name="longLength" type="big_decimal" not-null="false">
<column name="long_length" precision="12" scale="3">
<comment>长</comment>
</column>
</property>
<property name="wideLength" type="big_decimal" not-null="false">
<column name="wide_length" precision="12" scale="3">
<comment>宽</comment>
</column>
</property>
<property name="highLength" type="big_decimal" not-null="false">
<column name="high_length" precision="12" scale="3">
<comment>高</comment>
</column>
</property>
<property name="coefficientOf" type="big_decimal" not-null="false">
<column name="coefficient_of" precision="12" scale="3">
<comment>折方系数</comment>
</column>
</property>
<property name="price" type="big_decimal" not-null="false">
<column name="price" precision="12" scale="2">
<comment>单价</comment>
</column>
</property>
<property name="amount" type="big_decimal" not-null="false">
<column name="amount" precision="12" scale="2">
<comment>总价</comment>
</column>
</property>
<property name="dealTime" type="timestamp" not-null="false">
<column name="deal_time">
<comment>销售时间</comment>
</column>
</property>
</class>
</hibernate-mapping>
\ No newline at end of file
backend/xyst.dinas.transport/src/main/resources/com/xyst/dinas/transport/bill/TransportRecord$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>c51a2806-bf04-4da0-b02c-c16827884e9d</id>
<id>3b3dcef7-94b8-4c2d-9a19-6b7532a35cb8</id>
<name>com.xyst.dinas.transport.bill.TransportRecord$sequence</name>
<title>运输记录$sequence</title>
<description>运输记录</description>
......
backend/xyst.dinas.transport/src/main/resources/com/xyst/dinas/transport/bill/TransportRecord$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>0f1fd398-1d1e-4f21-8ae6-1bd3ce97c701</id>
<id>5745152a-5f78-4b6a-9979-526c1ca12159</id>
<name>com.xyst.dinas.transport.bill.TransportRecord$serial</name>
<title>运输记录$serial</title>
<description>运输记录</description>
......
backend/xyst.dinas.transport/src/main/resources/com/xyst/dinas/transport/bill/TransportRecord.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>aaddfd2e-747d-4d56-9f8c-fd842bda038d</id>
<id>7ec43754-af40-4892-b637-2824ac6011fa</id>
<name>com.xyst.dinas.transport.bill.TransportRecord</name>
<title>运输记录</title>
<description>运输记录</description>
......
backend/xyst.dinas.transport/src/main/resources/com/xyst/dinas/transport/bill/VehicleDispatch$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>83549661-8cc7-43a0-a968-7ed75b754543</id>
<id>2b902151-e82d-41cd-ac7f-329714fdfe6c</id>
<name>com.xyst.dinas.transport.bill.VehicleDispatch$sequence</name>
<title>车辆派单$sequence</title>
<description>车辆派单</description>
......
backend/xyst.dinas.transport/src/main/resources/com/xyst/dinas/transport/bill/VehicleDispatch$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>9e52bc0e-4fde-43c1-80da-745bd7c6030f</id>
<id>9e27a3eb-4c89-4c55-b4d9-be38372ed678</id>
<name>com.xyst.dinas.transport.bill.VehicleDispatch$serial</name>
<title>车辆派单$serial</title>
<description>车辆派单</description>
......
backend/xyst.dinas.transport/src/main/resources/com/xyst/dinas/transport/bill/VehicleDispatch.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>7e7a28d1-9891-4154-8856-7d8237f41ebe</id>
<id>ee72e8b5-bdf1-48e5-bec7-433f45edfad9</id>
<name>com.xyst.dinas.transport.bill.VehicleDispatch</name>
<title>车辆派单</title>
<description>车辆派单</description>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment