Skip to content

C
cloud-fb
Commit 41e87b1e by shiwenbo
Options

Merge branch 'develop' of gitlab.beecode.cn:kunlun/xyst_dinas/xyst_dinas_backend into develop

parents bc51b08e 0d9280c7
Showing with 957 additions and 203 deletions
backend/xyst.dinas.biz/src/main/model/com/xyst/dinas/biz/datamodel/SandMiningArea.mk
......@@ -10,7 +10,7 @@
<tablePrefix>xyst_dinas_</tablePrefix>
</header>
<content>
<dataModel id='dc239645-f994-4413-b124-9911bff7f448' multiVersion='' domainInherit='undefined' tableName='xyst_dinas_position'>
<dataModel id='dc239645-f994-4413-b124-9911bff7f448' multiVersion='' domainInherit='undefined' tableName='xyst_dinas_biz_sand_mining_area'>
<parent>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</parent>
<parent>com.beecode.inz.common.datamodel.BaseInfo</parent>
<attribute id='05eb2a48-d303-47fe-aa54-fbf1a82d1a08' name='regionalCompany' columnName='regional_company' title='区域公司' type='com.xyst.dinas.biz.datamodel.xystOrganization' default='' precision='' isArray='false'>
......
backend/xyst.dinas.biz/src/main/model/com/xyst/dinas/biz/datamodel/ShipInfo.mk 0 → 100644
<model>
<header>
<type>bcp.type.DataModel</type>
<package>com.xyst.dinas.biz.datamodel</package>
<title>船舶备案</title>
<name>ShipInfo</name>
<tags></tags>
<description>船舶备案</description>
<templateName>mk.ide.ui.editor.data.model.template.bill</templateName>
<tablePrefix>xyst_dinas_</tablePrefix>
</header>
<content>
<dataModel id='a9292e6a-5eb5-4b76-832b-c824ccdafa71' multiVersion='' domainInherit='undefined' tableName='xyst_dinas_biz_ship_info'>
<parent>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</parent>
<parent>com.beecode.inz.common.datamodel.BaseInfo</parent>
<attribute id='9f1173ba-5166-43cd-ae4d-fc80ee23168f' name='regionalCompany' columnName='regional_company' title='区域公司' type='com.xyst.dinas.biz.datamodel.xystOrganization' default='' precision='' isArray='false'>
<annotation id='496ba374-8a72-47c6-af5c-e730cbe18215' attributeId='55efd3f5-036a-4ac4-83c9-14e22cf5465a' name='length' value='undefined'>
</annotation>
<annotation id='207041b7-c6c4-4534-84fc-8588da4d2a56' attributeId='43768653-e259-4b0f-8c9d-8739f030675b' name='mappingType' value='many-to-one'>
</annotation>
</attribute>
<attribute id='a3d690f5-830b-4eed-aaf1-a7c6ccba0231' name='shipName' columnName='ship_name' title='船舶名称' type='string' default='' precision='' isArray='false'>
<annotation id='6a0e7f2d-af4b-4988-b3ec-8b81401fbf32' attributeId='ffc0a199-4038-4ebf-a94f-a0f12bfc76dd' name='length' value='50'>
</annotation>
</attribute>
<attribute id='4e9dcb4b-ad42-4a8a-a0bf-1c6dd039567f' name='shipCodeNum' columnName='ship_code_num' title='船舶编号' type='string' default='' precision='' isArray='false'>
<annotation id='1aba99f0-1f5c-4e99-a13c-cf52fd01a0e6' attributeId='ffc0a199-4038-4ebf-a94f-a0f12bfc76dd' name='length' value='50'>
</annotation>
</attribute>
<attribute id='bc0df123-b29d-4d14-b141-f961233d79b8' name='deviceNumber' columnName='device_number' title='设备序列号' type='string' default='' precision='' isArray='false'>
<annotation id='fe37cb98-01c7-4862-82ae-69020d5c88ad' attributeId='ffc0a199-4038-4ebf-a94f-a0f12bfc76dd' name='length' value='50'>
</annotation>
</attribute>
<attribute id='bc0df123-b29d-4d14-b141-f961233d79b8' name='companyName' columnName='company_name' title='所属公司' type='string' default='' precision='' isArray='false'>
<annotation id='fe37cb98-01c7-4862-82ae-69020d5c88ad' attributeId='ffc0a199-4038-4ebf-a94f-a0f12bfc76dd' name='length' value='50'>
</annotation>
</attribute>
<attribute id='c76f5e03-61b8-44ce-b9f7-7cd504494749' name='account' columnName='account' title='账号' type='string' default='' precision='' isArray='false'>
<annotation id='098afec6-620f-4f69-bb57-741bbb4d1d35' attributeId='ffc0a199-4038-4ebf-a94f-a0f12bfc76dd' name='length' value='50'>
</annotation>
</attribute>
<attribute id='b190a024-923e-4177-a0c9-86031a87302f' name='accountPassword' columnName='account_password' title='账户的密码' type='string' default='' precision='' isArray='false'>
<annotation id='fb9951ba-eacb-4b53-84d4-9504864880a7' attributeId='ffc0a199-4038-4ebf-a94f-a0f12bfc76dd' name='length' value='50'>
</annotation>
</attribute>
<attribute id='5f054b17-d2ec-4610-ba49-7842539da881' name='reason' columnName='reason' title='备注' type='string' default='' precision='' isArray='false'>
<annotation id='ac2ecaf1-efc7-4718-b390-08de301ab8ea' attributeId='ffc0a199-4038-4ebf-a94f-a0f12bfc76dd' name='length' value='50'>
</annotation>
</attribute>
<attribute id='928140d6-22b4-4e25-9a9f-ffde51085374' name='sortOrder' columnName='sort_order' title='排序' type='int' default='' precision='' isArray='false'>
<annotation id='de20fe14-2d94-49ea-ba7d-beff15370f15' attributeId='dfbeaa83-63dc-4638-b55a-8dda62d74dd4' name='length' value='13'>
</annotation>
</attribute>
<attribute id='eecb120f-4a63-4029-9f0d-e08551343e9f' name='type' columnName='type' title='船只类型 0采砂 1运砂' type='int' default='' precision='' isArray='false'>
<annotation id='2ca5baa8-363e-4011-8521-7b6ed1a471f9' attributeId='dfbeaa83-63dc-4638-b55a-8dda62d74dd4' name='length' value='500'>
</annotation>
</attribute>
<hibernate>/xyst.dinas.biz/src/main/resources/config/ShipInfo.hbm.xml</hibernate>
</dataModel>
</content>
</model>
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/datamodel/SandMiningArea.jmx
......@@ -29,7 +29,7 @@
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>xyst_dinas_position</m:value>
<m:value>xyst_dinas_biz_sand_mining_area</m:value>
</m:property>
</m:properties>
</m:annotation>
......
backend/xyst.dinas.production/src/main/java/com/xyst/dinas/production/constant/ProductionPlanReportConstant.java
......@@ -10,6 +10,6 @@ public interface ProductionPlanReportConstant {
/**
* 子项目的实体名
*/
String DETAIL_ENTITY = "com.xyst.dinas.production.datamodel.ProductionPlanReportAssociatedDinasTypeDetails";
String DETAIL_ENTITY = "com.xyst.dinas.production.datamodel.ProductionPlanReportAssociateddinasTypeDetail";
}
backend/xyst.dinas.production/src/main/java/com/xyst/dinas/production/constant/SandMiningConstant.java
......@@ -9,7 +9,7 @@ public interface SandMiningConstant {
/**
* 实体名
*/
String STATION_DETAIL_ENTITY = "com.xyst.dinas.production.datamodel.SandMiningAssociatedSandMiningStationDetail";
String STATION_DETAIL_ENTITY = "com.xyst.dinas.production.datamodel.SandMiningAssociatedstationDetail";
......
backend/xyst.dinas.production/src/main/model/com/xyst/dinas/production/bill/Discharging.mk 0 → 100644
<model>
<header>
<type>bcp.biz.Bill</type>
<package>com.xyst.dinas.production.bill</package>
<title>接驳管理</title>
<name>Discharging</name>
<description>接驳管理</description>
</header>
<content>
<bill>
<data>
{
"baseData": {
"name": "Discharging",
"title": "接驳管理",
"billModel": "com.beecode.bap.biztrait.BasicBillBiztrait",
"functionLibrarys": [],
"description": "接驳管理",
"dataModel": "com.xyst.dinas.production.datamodel.Discharging"
},
"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.production/src/main/model/com/xyst/dinas/production/bill/ProductionPlanReport.mk 0 → 100644
<model>
<header>
<type>bcp.biz.Bill</type>
<package>com.xyst.dinas.production.bill</package>
<title>生产管理</title>
<name>ProductionPlanReport</name>
<description>生产管理</description>
</header>
<content>
<bill>
<data>
{
"baseData": {
"name": "ProductionPlanReport",
"title": "生产管理",
"billModel": "com.beecode.bap.biztrait.BasicBillBiztrait",
"functionLibrarys": [],
"description": "生产管理",
"dataModel": "com.xyst.dinas.production.datamodel.ProductionPlanReport"
},
"serial": {
"serialData": [
{
"segment": "literal",
"segmentData": "PR"
},
{
"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>
backend/xyst.dinas.production/src/main/model/com/xyst/dinas/production/datamodel/Discharging.mk 0 → 100644
<model>
<header>
<type>bcp.type.DataModel</type>
<package>com.xyst.dinas.production.datamodel</package>
<title>接驳管理</title>
<name>Discharging</name>
<tags></tags>
<description>接驳管理</description>
<templateName>mk.ide.ui.editor.data.model.template.bill</templateName>
<tablePrefix>xyst_dinas_</tablePrefix>
</header>
<content>
<dataModel id='3d247d94-f6ab-46f7-b174-88ef698042e7' multiVersion='' domainInherit='undefined' tableName='xyst_dinas_production_discharging'>
<parent>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</parent>
<parent>com.beecode.inz.common.datamodel.BaseInfo</parent>
<attribute id='40cb6eeb-147a-4129-9386-2cb35bd3f5a9' name='regionalCompany' columnName='regional_company' title='区域公司' type='com.xyst.dinas.biz.datamodel.xystOrganization' default='' precision='' isArray='false'>
<annotation id='37cd110b-d46b-4407-9c8c-23b92a994744' attributeId='0406b590-bef1-44a7-b699-25b2ff9daec2' name='length' value='undefined'>
</annotation>
<annotation id='cca582b1-16ac-47e4-be73-84dfafbc386b' attributeId='72c544ad-9052-4efb-8776-4e40f9734e90' name='mappingType' value='many-to-one'>
</annotation>
</attribute>
<attribute id='1bd161c3-540f-4224-89b2-66e681ce2b59' name='sandMiningArea' columnName='sand_mining_area_id' title='所属采区' type='com.xyst.dinas.biz.datamodel.SandMiningArea' default='' precision='' isArray='false'>
<annotation id='fd3abb55-8203-47ea-ab80-b45e2d8949e4' attributeId='0406b590-bef1-44a7-b699-25b2ff9daec2' name='length' value='undefined'>
</annotation>
<annotation id='613edaa4-836a-4b2d-8998-b50497c1e43a' attributeId='72c544ad-9052-4efb-8776-4e40f9734e90' name='mappingType' value='many-to-one'>
</annotation>
</attribute>
<attribute id='fea38c4c-0395-44c5-b193-e55db689dcf4' name='station' columnName='station_id' title='所属场站' type='com.xyst.dinas.biz.datamodel.Station' default='' precision='' isArray='false'>
<annotation id='45a668fb-34f8-4f93-a64c-330e4aff0106' attributeId='0406b590-bef1-44a7-b699-25b2ff9daec2' name='length' value='undefined'>
</annotation>
<annotation id='75c92583-3dca-405d-a16c-a558b3c87197' attributeId='72c544ad-9052-4efb-8776-4e40f9734e90' name='mappingType' value='many-to-one'>
</annotation>
</attribute>
<attribute id='8f99ce45-4148-4719-acea-deee5a80a93b' name='sandMiningShip' columnName='sand_mining_ship_id' title='采砂船' type='com.xyst.dinas.biz.datamodel.ShipInfo' default='' precision='' isArray='false'>
<annotation id='cb416ab1-a749-4954-b0fb-04ae793bfa76' attributeId='0406b590-bef1-44a7-b699-25b2ff9daec2' name='length' value='undefined'>
</annotation>
<annotation id='0b4e9383-2029-4076-974c-909effcfb682' attributeId='72c544ad-9052-4efb-8776-4e40f9734e90' name='mappingType' value='many-to-one'>
</annotation>
</attribute>
<attribute id='f9a840c1-16b8-40c3-b9f7-6c89115011f8' name='transportShip' columnName='transport_ship_id' title='运砂船' type='com.xyst.dinas.biz.datamodel.ShipInfo' default='' precision='' isArray='false'>
<annotation id='9f1ba85e-454b-48eb-b982-b25662df7f89' attributeId='0406b590-bef1-44a7-b699-25b2ff9daec2' name='length' value='undefined'>
</annotation>
<annotation id='03c89cc0-bf65-46cb-97b7-dba02faa217b' attributeId='72c544ad-9052-4efb-8776-4e40f9734e90' name='mappingType' value='many-to-one'>
</annotation>
</attribute>
<attribute id='49975b34-f3ce-4c35-bb6a-385be25b19c9' name='dischargingTime' columnName='discharging_time' title='上岸时间' type='datetime' default='' precision='' isArray='false'>
<annotation id='d2568a68-41b2-41c5-b7ee-8442201fa6d0' attributeId='ffc0a199-4038-4ebf-a94f-a0f12bfc76dd'
name='length' value='undefined'/>
</attribute>
<attribute id='e339070e-900b-43a6-ac43-b93b4c43bb6e' name='dischargingWeight' columnName='discharging_weight' title='上岸砂石量' type='fixnum' default='' precision='' isArray='false'>
<annotation id='1f7aacbb-a98e-4946-afc7-d86dc4bef8ea' attributeId='aee8df10-530c-44b7-b12b-474ab96694a7' name='length' value='undefined'>
</annotation>
</attribute>
<attribute id='4172794e-d861-48e2-b163-19d27c6dcabd' name='dischargingRegistrant' columnName='discharging_registrant' title='接驳人员' type='string' default='' precision='' isArray='false'>
<annotation id='8dfdf912-3d02-4390-908d-37975978fe96' attributeId='3d631cce-a3df-4530-b5a1-194ee035e94b' name='length' value='500'>
</annotation>
</attribute>
<attribute id='a040d434-713d-42b7-b23f-e8e8d5d125b9' name='type' columnName='type' title='数据类型,0每日新增 1数据修正新增' type='int' default='' precision='' isArray='false'>
<annotation id='cbfee014-f92c-43d7-ad88-b58b96640d17' attributeId='351db970-c7c5-4ddd-96f1-d4dda2a8afa6' name='length' value='6'>
</annotation>
</attribute>
<attribute id='faf91b16-8a3c-432f-a2f1-d5151a4adf46' name='parentId' columnName='parent_id' title='所属的修正数据id' type='uuid' default='' precision='' isArray='false'>
<annotation id='e759ce45-eeb8-45d5-a075-c902bccc1d8f' attributeId='55efd3f5-036a-4ac4-83c9-14e22cf5465a'
name='length' value='undefined'/>
</attribute>
<attribute id='5b421f93-778a-4b09-befb-161c472de9ae' name='reason' columnName='reason' title='修正原因' type='string' default='' precision='' isArray='false'>
<annotation id='b755676d-54cb-44b2-bd1b-38777c72da7b' attributeId='3d631cce-a3df-4530-b5a1-194ee035e94b' name='length' value='500'>
</annotation>
</attribute>
<hibernate>/xyst.dinas.production/src/main/resources/config/Discharging.hbm.xml</hibernate>
</dataModel>
</content>
</model>
backend/xyst.dinas.production/src/main/model/com/xyst/dinas/production/datamodel/ProductionPlanReport.mk 0 → 100644
<model>
<header>
<type>bcp.type.DataModel</type>
<package>com.xyst.dinas.production.datamodel</package>
<title>生产管理</title>
<name>ProductionPlanReport</name>
<tags></tags>
<description>生产管理</description>
<templateName>mk.ide.ui.editor.data.model.template.bill</templateName>
<tablePrefix>xyst_dinas_</tablePrefix>
</header>
<content>
<dataModel id='f0889100-c005-41fa-99c9-a1d46e3e43bd' multiVersion='' domainInherit='undefined' tableName='xyst_dinas_production_plan_report'>
<parent>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</parent>
<parent>com.beecode.inz.common.datamodel.BaseInfo</parent>
<attribute id='55cbbce0-60b5-4570-a50b-1ecc18521c46' name='regionalCompany' columnName='regional_company' title='区域公司' type='com.xyst.dinas.biz.datamodel.xystOrganization' default='' precision='' isArray='false'>
<annotation id='15424375-ea9d-4c7b-b8e9-f14ec7e231cf' attributeId='0406b590-bef1-44a7-b699-25b2ff9daec2' name='length' value='undefined'>
</annotation>
<annotation id='633713a2-e459-4ce5-b3a5-3fbc3141e05e' attributeId='72c544ad-9052-4efb-8776-4e40f9734e90' name='mappingType' value='many-to-one'>
</annotation>
</attribute>
<attribute id='b91e5b5e-2972-4ab3-8ae3-c17b4cb99a45' name='productionLine' columnName='production_line_id' title='所属生产线' type='com.xyst.dinas.biz.datamodel.ProductionLine' default='' precision='' isArray='false'>
<annotation id='7a96a762-b720-416a-82f8-dd7f569e62dc' attributeId='0406b590-bef1-44a7-b699-25b2ff9daec2' name='length' value='undefined'>
</annotation>
<annotation id='bd174ddc-2b10-4513-9a17-733b68142794' attributeId='72c544ad-9052-4efb-8776-4e40f9734e90' name='mappingType' value='many-to-one'>
</annotation>
</attribute>
<attribute id='87963f82-1f8b-4bea-8335-c75aa27b1660' name='station' columnName='station_id' title='所属场站' type='com.xyst.dinas.biz.datamodel.Station' default='' precision='' isArray='false'>
<annotation id='b842bb4d-039a-4f1b-98b6-e83b7adb83d5' attributeId='0406b590-bef1-44a7-b699-25b2ff9daec2' name='length' value='undefined'>
</annotation>
<annotation id='56f71728-d6e3-4208-a9ed-e4a76cf54937' attributeId='72c544ad-9052-4efb-8776-4e40f9734e90' name='mappingType' value='many-to-one'>
</annotation>
</attribute>
<attribute id='0bcaad0a-b1af-4426-8507-28c4dbd87e4e' name='productionPlanDate' columnName='production_plan_date' title='计划上报时间' type='datetime' default='' precision='' isArray='false'>
<annotation id='bb3f4d64-1a60-42d1-ae9b-cd0393d0bd9a' attributeId='ffc0a199-4038-4ebf-a94f-a0f12bfc76dd'
name='length' value='undefined'/>
</attribute>
<attribute id='362ef4cb-00f1-46a5-a5d8-ea8473b02444' name='warehousingStatus' columnName='warehousing_status' title='是否入库, false未入库 true已入库' type='boolean' default='' precision='' isArray='false'>
<annotation id='b9fef002-129f-414e-9b0e-7fbaebed0deb' attributeId='351db970-c7c5-4ddd-96f1-d4dda2a8afa6' name='length' value='6'>
</annotation>
</attribute>
<childModel id='11d69604-24ab-46dc-8ed5-82ecc6b4dea8' attributeId='a47c49cb-c892-420e-843e-d13ebbf273ee' refParentAttributeId='84b69479-935c-4b94-aaf1-3086d2a48592' name='dinasTypeDetail' tableName='xyst_dinas_production_plan_report_dinas_type_detail' domainInherit='' title='生产计划采砂类型和砂石量子表' >
<parent>com.beecode.bap.biztrait.datamodel.StoreSubTableRequirement</parent>
<attribute id='98a0a3da-b980-45b3-846f-57ee3e08e2fc' name='dinasType' columnName='dinas_type_id' title='砂石类型id' type='com.xyst.dinas.biz.datamodel.DinasType' default='' precision='' isArray='false'>
<annotation id='197f60c5-964f-452d-ace3-aa5076a7876b' attributeId='ebc2a6b5-8ff6-45ee-b64d-7d9fe454b49e' name='length' value='undefined'>
</annotation>
<annotation id='3b3bb7ce-11ba-4684-b8f6-3defd81db375' attributeId='93605880-def2-4f34-a067-046fb3367205' name='mappingType' value='many-to-one'>
</annotation>
</attribute>
<attribute id='3bc4c419-28da-4c35-bb10-26be8c2f2f0d' name='dinasWeight' columnName='dinas_weight' title='砂石量' type='fixnum' default='' precision='' isArray='false'>
<annotation id='e8f8a29e-9cba-4243-bb31-da7f298b524e' attributeId='aee8df10-530c-44b7-b12b-474ab96694a7' name='length' value='undefined'/>
</attribute>
</childModel>
<hibernate>/xyst.dinas.production/src/main/resources/config/ProductionPlanReport.hbm.xml</hibernate>
</dataModel>
</content>
</model>
backend/xyst.dinas.production/src/main/model/com/xyst/dinas/production/datamodel/SandMining.mk 0 → 100644
<model>
<header>
<type>bcp.type.DataModel</type>
<package>com.xyst.dinas.production.datamodel</package>
<title>采砂许可证管理</title>
<name>SandMining</name>
<tags></tags>
<description>采砂许可证管理</description>
<templateName>mk.ide.ui.editor.data.model.template.bill</templateName>
<tablePrefix>xyst_dinas_</tablePrefix>
</header>
<content>
<dataModel id='80ce4691-e0a2-4c66-b409-00a33173ba8f' multiVersion='' domainInherit='undefined' tableName='xyst_dinas_production_sand_mining'>
<parent>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</parent>
<parent>com.beecode.inz.common.datamodel.BaseInfo</parent>
<attribute id='11d0cfda-d35f-403a-852d-1c60bba4b661' name='regionalCompany' columnName='regional_company' title='区域公司' type='com.xyst.dinas.biz.datamodel.xystOrganization' default='' precision='' isArray='false'>
<annotation id='bb62ca17-de2a-4189-9199-4ef0bab7b4b1' attributeId='0406b590-bef1-44a7-b699-25b2ff9daec2' name='length' value='undefined'>
</annotation>
<annotation id='8c36ad99-a1b7-4423-8c46-f614f0cee937' attributeId='72c544ad-9052-4efb-8776-4e40f9734e90' name='mappingType' value='many-to-one'>
</annotation>
</attribute>
<attribute id='5b2d4862-f0f9-4529-8262-e454c2de2c61' name='sandMiningArea' columnName='sand_mining_area_id' title='所属采区' type='com.xyst.dinas.biz.datamodel.SandMiningArea' default='' precision='' isArray='false'>
<annotation id='00ba83f3-51a8-4d8b-b8af-b732539eeb92' attributeId='0406b590-bef1-44a7-b699-25b2ff9daec2' name='length' value='undefined'>
</annotation>
<annotation id='617910f2-f01e-453c-8425-5e4cc0b7dce2' attributeId='72c544ad-9052-4efb-8776-4e40f9734e90' name='mappingType' value='many-to-one'>
</annotation>
</attribute>
<attribute id='12a5c5b8-a5ed-46dd-9809-42163a356fb9' name='ship' columnName='ship_info_id' title='船只' type='com.xyst.dinas.biz.datamodel.ShipInfo' default='' precision='' isArray='false'>
<annotation id='bfad1fe5-1d42-4935-bef6-e711fc58a214' attributeId='0406b590-bef1-44a7-b699-25b2ff9daec2' name='length' value='undefined'>
</annotation>
<annotation id='169f8a62-ed54-47d5-8aff-9247e3b40658' attributeId='72c544ad-9052-4efb-8776-4e40f9734e90' name='mappingType' value='many-to-one'>
</annotation>
</attribute>
<attribute id='e8b35c59-4e33-45f4-8332-381c251832e7' name='permitCode' columnName='permit_code' title='许可证编号' type='string' default='' precision='' isArray='false'>
<annotation id='eab91383-ba61-4416-b55b-99f198e62212' attributeId='3d631cce-a3df-4530-b5a1-194ee035e94b' name='length' value='500'>
</annotation>
</attribute>
<attribute id='b0ac75d8-d6cf-4a1c-b823-0118b9fc631b' name='miningNature' columnName='mining_nature' title='开采性质 0公益性 1经营性' type='int' default='' precision='' isArray='false'>
<annotation id='7bb5e01f-9f5e-48e0-9d58-74328b335615' attributeId='351db970-c7c5-4ddd-96f1-d4dda2a8afa6' name='length' value='6'>
</annotation>
</attribute>
<attribute id='a79ee15e-4a7d-4c92-908d-12f549a1af75' name='status' columnName='status' title='许可证状态 0未开始 1生效中 2已结束' type='int' default='' precision='' isArray='false'>
<annotation id='647c517b-cee1-4a11-8adb-8b9bef239c03' attributeId='351db970-c7c5-4ddd-96f1-d4dda2a8afa6' name='length' value='6'>
</annotation>
</attribute>
<attribute id='ef779434-2644-407e-8dd6-fcb7baf0af74' name='workMethod' columnName='work_method' title='作业方式 0链条挖斗式 1抽泵式' type='int' default='' precision='' isArray='false'>
<annotation id='c936901d-dce1-44c5-8605-9c418b719f43' attributeId='351db970-c7c5-4ddd-96f1-d4dda2a8afa6' name='length' value='6'>
</annotation>
</attribute>
<attribute id='da0ec814-59ff-45f5-957f-98f5f6d121ef' name='sandMiningStart' columnName='sand_mining_start' title='可采期开始时间' type='datetime' default='' precision='' isArray='false'>
<annotation id='a7a97b1d-e583-4203-b550-30de142f252a' attributeId='ffc0a199-4038-4ebf-a94f-a0f12bfc76dd'
name='length' value='undefined'/>
</attribute>
<attribute id='d985e5ac-94f3-47f2-b699-317e7ff7d940' name='sandMiningEnd' columnName='sand_mining_end' title='可采期结束时间' type='datetime' default='' precision='' isArray='false'>
<annotation id='fb3adef8-9c3b-43c4-9962-0dca980be6ad' attributeId='ffc0a199-4038-4ebf-a94f-a0f12bfc76dd'
name='length' value='undefined'/>
</attribute>
<attribute id='1ebfef31-745f-4263-9443-c37c8de95d4e' name='workStartTime' columnName='work_start_time' title='作业开始时间' type='datetime' default='' precision='' isArray='false'>
<annotation id='406ad640-1db5-45f5-aa28-3cca6c1be63e' attributeId='ffc0a199-4038-4ebf-a94f-a0f12bfc76dd'
name='length' value='undefined'/>
</attribute>
<attribute id='3d0a1b75-e255-4307-b21b-4f0470f65423' name='workEndTime' columnName='work_end_time' title='作业结束时间' type='datetime' default='' precision='' isArray='false'>
<annotation id='c8af5549-f0be-4082-83c7-46856e7649aa' attributeId='ffc0a199-4038-4ebf-a94f-a0f12bfc76dd'
name='length' value='undefined'/>
</attribute>
<attribute id='0be5cce4-6d8f-4b6d-8281-5a32d0d6c29f' name='miningVolume' columnName='mining_volume' title='开采量' type='fixnum' default='' precision='' isArray='false'>
<annotation id='275b8dfe-45d6-4c35-b94e-4fd5fc28e5ca' attributeId='aee8df10-530c-44b7-b12b-474ab96694a7' name='length' value='undefined'>
</annotation>
</attribute>
<attribute id='d3d506a2-8b70-4a72-af58-a2d95aed3090' name='miningDepth' columnName='mining_depth' title='开采深度' type='fixnum' default='' precision='' isArray='false'>
<annotation id='30cc56b1-17d6-49f1-9072-1a314e31e3b5' attributeId='aee8df10-530c-44b7-b12b-474ab96694a7' name='length' value='undefined'>
</annotation>
</attribute>
<attribute id='bd84a183-08e3-43e5-b489-dd9c1f5ce5bd' name='sandMiningRange' columnName='sand_mining_range' title='采砂范围' type='string' default='' precision='' isArray='false'>
<annotation id='af5a5f45-5c38-40c8-aa49-85574465500a' attributeId='3d631cce-a3df-4530-b5a1-194ee035e94b' name='length' value='500'>
</annotation>
</attribute>
<attribute id='4747df48-273c-4e09-b34a-c4b69702b9e1' name='shipOwner' columnName='ship_owner' title='船只所有人逗号分隔' type='string' default='' precision='' isArray='false'>
<annotation id='903c41c8-0d37-4a22-8a90-1def701abcbc' attributeId='3d631cce-a3df-4530-b5a1-194ee035e94b' name='length' value='500'>
</annotation>
</attribute>
<attribute id='eaa325cf-58e2-42ca-b428-4cf73914709b' name='workUser' columnName='work_user' title='作业人员逗号分隔' type='string' default='' precision='' isArray='false'>
<annotation id='09601dbf-3a9e-4a79-a346-047ffd1b0766' attributeId='3d631cce-a3df-4530-b5a1-194ee035e94b' name='length' value='500'>
</annotation>
</attribute>
<attribute id='9fbf612d-4ccd-43ec-991b-f5d708ad47a7' name='sandMiningPower' columnName='sand_mining_power' title='采砂功率' type='string' default='' precision='' isArray='false'>
<annotation id='89e6ed60-0ec5-46c4-a457-8cc64159ae59' attributeId='3d631cce-a3df-4530-b5a1-194ee035e94b' name='length' value='500'>
</annotation>
</attribute>
<childModel id='212de0e3-b4fc-4bc7-b4ee-930788d844aa' attributeId='a47c49cb-c892-420e-843e-d13ebbf273ee' refParentAttributeId='84b69479-935c-4b94-aaf1-3086d2a48592' name='stationDetail' tableName='xyst_dinas_production_sand_mining_station_detail' domainInherit='' title='采砂许可证场站表' >
<parent>com.beecode.bap.biztrait.datamodel.StoreSubTableRequirement</parent>
<attribute id='70201952-061c-412e-a194-639fbae54c4a' name='station' columnName='station_id' title='场站' type='com.xyst.dinas.biz.datamodel.Station' default='' precision='' isArray='false'>
<annotation id='e39a80d5-e725-4796-8fee-5ef6ca5a49c2' attributeId='ebc2a6b5-8ff6-45ee-b64d-7d9fe454b49e' name='length' value='undefined'>
</annotation>
<annotation id='01a96585-5dcb-4edf-9697-5ca074961af1' attributeId='93605880-def2-4f34-a067-046fb3367205' name='mappingType' value='many-to-one'>
</annotation>
</attribute>
</childModel>
<hibernate>/xyst.dinas.production/src/main/resources/config/SandMining.hbm.xml</hibernate>
</dataModel>
</content>
</model>
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>f8c56d27-984d-4ea6-9b9a-cd5067a9d06f</id>
<id>0ff83c2b-6b46-4ccb-81f4-7253ff515371</id>
<name>com.xyst.dinas.production.bill.ProductionPlanReport$sequence</name>
<title>计划上报$sequence</title>
<description>计划上报</description>
<title>生产管理$sequence</title>
<description>生产管理</description>
<define>bcp.sequence</define>
<define-version>1.0</define-version>
<content>
......
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>e804c7a0-575d-41b3-ae86-568226f0c804</id>
<id>32df40d0-038e-48aa-b078-b9e907d62658</id>
<name>com.xyst.dinas.production.bill.ProductionPlanReport$serial</name>
<title>计划上报$serial</title>
<description>计划上报</description>
<title>生产管理$serial</title>
<description>生产管理</description>
<define>bcp.serial</define>
<define-version>1.0</define-version>
<dependency>com.xyst.dinas.production.datamodel.ProductionPlanReport</dependency>
......
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>6a063471-3c53-4755-a86f-d2cb563bb598</id>
<id>2c97d9da-30a9-4c84-b23f-192f89b2928d</id>
<name>com.xyst.dinas.production.bill.ProductionPlanReport</name>
<title>计划上报</title>
<description>计划上报</description>
<title>生产管理</title>
<description>生产管理</description>
<define>bcp.biz.Biztype</define>
<define-version>1.0</define-version>
<dependency>com.xyst.dinas.production.bill.ProductionPlanReport$serial</dependency>
......
backend/xyst.dinas.production/src/main/resources/com/xyst/dinas/production/datamodel/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-type">
<specification>1.0</specification>
<id>bc5621f0-0b82-4d72-90b9-bad517971960</id>
<id>f0889100-c005-41fa-99c9-a1d46e3e43bd</id>
<name>com.xyst.dinas.production.datamodel.ProductionPlanReport</name>
<title>生产计划上报</title>
<description>采砂许可证</description>
<title>生产管理</title>
<description>生产管理</description>
<define>bcp.type.Class</define>
<define-version>1.0</define-version>
<dependency>bcp.type.constraint.StringLength</dependency>
<dependency>javax.persistence.Entity</dependency>
<dependency>com.beecode.bap.biztrait.datamodel.SubTableAnnotation</dependency>
<dependency>javax.persistence.ManyToOne</dependency>
<dependency>com.beecode.inz.common.datamodel.BaseInfo</dependency>
<dependency>com.beecode.bap.biztrait.datamodel.SubTableAnnotation</dependency>
<dependency>com.beecode.bap.staff.datamodel.Staff</dependency>
<dependency>javax.persistence.JoinColumn</dependency>
<dependency>javax.persistence.OneToMany</dependency>
<dependency>com.xyst.dinas.biz.datamodel.xystOrganization</dependency>
<dependency>javax.persistence.Column</dependency>
<dependency>com.xyst.dinas.production.datamodel.ProductionPlanReportAssociateddinasTypeDetail</dependency>
<dependency>javax.persistence.Table</dependency>
<dependency>com.xyst.dinas.biz.datamodel.Station</dependency>
<dependency>com.xyst.dinas.biz.datamodel.DinasType</dependency>
<dependency>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</dependency>
<dependency>com.xyst.dinas.biz.datamodel.ProductionLine</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_production_plan_report</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:id>8a33a0d7-e5f8-4abd-b0bf-aeab76ec3142</m:id>
<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</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>55cbbce0-60b5-4570-a50b-1ecc18521c46</m:id>
<m:name>regionalCompany</m:name>
<m:title>区域公司</m:title>
<m:type>com.xyst.dinas.biz.datamodel.xystOrganization</m:type>
......@@ -34,55 +69,104 @@
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>bcp.type.constraint.NotNull</m:type>
</m:annotation>
<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>production_line_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>bf1bfe29-6e17-4ba0-8756-b2b3a3b05f3a</m:id>
<m:name>productionPlanDate</m:name>
<m:title>计划上报时间</m:title>
<m:type>datetime</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations/>
<m:id>bb32d8cc-10b6-4fe9-9e86-1760a1b1a266</m:id>
<m:id>b91e5b5e-2972-4ab3-8ae3-c17b4cb99a45</m:id>
<m:name>productionLine</m:name>
<m:title>所属生产线</m:title>
<m:type>com.xyst.dinas.biz.datamodel.ProductionLine</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations/>
<m:id>037b2fd4-f140-4389-9fd0-0b0dad9fe59c</m:id>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>javax.persistence.ManyToOne</m:type>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.JoinColumn</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>station_id</m:value>
</m:property>
<m:property>
<m:key>referencedColumnName</m:key>
<m:value>ID</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>87963f82-1f8b-4bea-8335-c75aa27b1660</m:id>
<m:name>station</m:name>
<m:title>所属场站</m:title>
<m:type>com.xyst.dinas.biz.datamodel.Station</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations/>
<m:id>037b2fd4-f140-4389-9fd0-0b0dad9fe59c</m:id>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>production_plan_date</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>0bcaad0a-b1af-4426-8507-28c4dbd87e4e</m:id>
<m:name>productionPlanDate</m:name>
<m:title>计划上报时间</m:title>
<m:type>datetime</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>warehousing_status</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>362ef4cb-00f1-46a5-a5d8-ea8473b02444</m:id>
<m:name>warehousingStatus</m:name>
<m:title>入库情况</m:title>
<m:title>是否入库, false未入库 true已入库</m:title>
<m:type>boolean</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>com.beecode.bap.biztrait.datamodel.SubTableAnnotation</m:type>
</m:annotation>
</m:annotations>
<m:id>862d0182-3296-4481-a1d9-6b0c6fe91aa4</m:id>
<m:id>a47c49cb-c892-420e-843e-d13ebbf273ee</m:id>
<m:name>dinasTypeDetails</m:name>
<m:title>包含砂石种类和砂石量子表</m:title>
<m:type>com.xyst.dinas.production.datamodel.ProductionPlanReportAssociatedDinasTypeDetails[]</m:type>
<m:title>生产计划采砂类型和砂石量子表</m:title>
<m:type>com.xyst.dinas.production.datamodel.ProductionPlanReportAssociateddinasTypeDetail[]</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
......
backend/xyst.dinas.production/src/main/resources/com/xyst/dinas/production/datamodel/ProductionPlanReportAssociatedDinasTypeDetails.jmx deleted 100644 → 0
<?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>224beb45-2976-49d7-b408-6fd3c208494e</id>
<name>com.xyst.dinas.production.datamodel.ProductionPlanReportAssociatedDinasTypeDetails</name>
<title>生产计划子表</title>
<description>生产计划采砂类型和砂石量子表</description>
<define>bcp.type.Class</define>
<define-version>1.0</define-version>
<dependency>com.xyst.dinas.biz.datamodel.DinasType</dependency>
<dependency>com.xyst.dinas.production.datamodel.ProductionPlanReport</dependency>
<dependency>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</dependency>
<dependency>com.beecode.bap.biztrait.datamodel.StoreSubTableRequirement</dependency>
<dependency>bcp.type.json.JsonIgnore</dependency>
<content>
<m:class>
<m:parents>
<m:parent>com.beecode.bap.biztrait.datamodel.StoreSubTableRequirement</m:parent>
</m:parents>
<m:attributes>
<m:attribute>
<m:annotations/>
<m:id>247a0284-b15d-4872-b9fa-2a37b8ec3e88</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:id>aa48aba2-e9db-48c9-be1a-f32d75470da5</m:id>
<m:name>dinasWeight</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.json.JsonIgnore</m:type>
</m:annotation>
</m:annotations>
<m:id>0f03ad12-3195-4696-b2c7-001e3aae8dc5</m:id>
<m:name>master</m:name>
<m:title>生产计划表</m:title>
<m:type>com.xyst.dinas.production.datamodel.ProductionPlanReport</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
</m:attributes>
</m:class>
</content>
</metadata>
backend/xyst.dinas.production/src/main/resources/com/xyst/dinas/production/datamodel/ProductionPlanReportAssociateddinasTypeDetail.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>11d69604-24ab-46dc-8ed5-82ecc6b4dea8</id>
<name>com.xyst.dinas.production.datamodel.ProductionPlanReportAssociateddinasTypeDetail</name>
<title>生产计划采砂类型和砂石量子表</title>
<define>bcp.type.Class</define>
<define-version>1.0</define-version>
<dependency>javax.persistence.Entity</dependency>
<dependency>javax.persistence.Column</dependency>
<dependency>com.beecode.bap.biztrait.datamodel.StoreSubTableRequirement</dependency>
<dependency>javax.persistence.ManyToOne</dependency>
<dependency>javax.persistence.Table</dependency>
<dependency>com.xyst.dinas.production.datamodel.ProductionPlanReport</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>bcp.type.json.JsonIgnore</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_production_plan_report_dinas_type_detail</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:parents>
<m:parent>com.beecode.bap.biztrait.datamodel.StoreSubTableRequirement</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>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>98a0a3da-b980-45b3-846f-57ee3e08e2fc</m:id>
<m:name>dinasType</m:name>
<m:title>砂石类型id</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>0</m:value>
</m:property>
<m:property>
<m:key>scale</m:key>
<m:value>0</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>dinas_weight</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>3bc4c419-28da-4c35-bb10-26be8c2f2f0d</m:id>
<m:name>dinasWeight</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.json.JsonIgnore</m:type>
</m:annotation>
<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>master_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>84b69479-935c-4b94-aaf1-3086d2a48592</m:id>
<m:name>master</m:name>
<m:title>master</m:title>
<m:type>com.xyst.dinas.production.datamodel.ProductionPlanReport</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
</m:attributes>
</m:class>
</content>
</metadata>
backend/xyst.dinas.production/src/main/resources/com/xyst/dinas/production/datamodel/SandMiningAssociatedSandMiningStationDetail.jmx → 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>5eb36512-4772-4397-a40e-1d257f005278</id>
<name>com.xyst.dinas.production.datamodel.SandMiningAssociatedSandMiningStationDetail</name>
<id>212de0e3-b4fc-4bc7-b4ee-930788d844aa</id>
<name>com.xyst.dinas.production.datamodel.SandMiningAssociatedstationDetail</name>
<title>采砂许可证场站表</title>
<define>bcp.type.Class</define>
<define-version>1.0</define-version>
<dependency>javax.persistence.Entity</dependency>
<dependency>javax.persistence.Column</dependency>
<dependency>com.beecode.bap.biztrait.datamodel.StoreSubTableRequirement</dependency>
<dependency>javax.persistence.ManyToOne</dependency>
<dependency>javax.persistence.Table</dependency>
<dependency>com.xyst.dinas.biz.datamodel.Station</dependency>
<dependency>com.xyst.dinas.production.datamodel.SandMining</dependency>
<dependency>javax.persistence.JoinColumn</dependency>
<dependency>javax.persistence.OneToMany</dependency>
<dependency>bcp.type.json.JsonIgnore</dependency>
<dependency>com.xyst.dinas.production.datamodel.SandMining</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_production_sand_mining_station_detail</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:parents>
<m:parent>com.beecode.bap.biztrait.datamodel.StoreSubTableRequirement</m:parent>
</m:parents>
<m:attributes>
<m:attribute>
<m:annotations/>
<m:id>e43b0c7a-d128-4b74-87c5-b6aade260ef9</m:id>
<m:annotations>
<m:annotation>
<m:type>javax.persistence.ManyToOne</m:type>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.JoinColumn</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>station_id</m:value>
</m:property>
<m:property>
<m:key>referencedColumnName</m:key>
<m:value>ID</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>70201952-061c-412e-a194-639fbae54c4a</m:id>
<m:name>station</m:name>
<m:title>场站</m:title>
<m:type>com.xyst.dinas.biz.datamodel.Station</m:type>
......@@ -30,10 +67,26 @@
<m:annotation>
<m:type>bcp.type.json.JsonIgnore</m:type>
</m:annotation>
<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>master_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>5452585c-7996-4d9c-aa18-071dfb28ddf7</m:id>
<m:id>84b69479-935c-4b94-aaf1-3086d2a48592</m:id>
<m:name>master</m:name>
<m:title>采砂许可证</m:title>
<m:title>master</m:title>
<m:type>com.xyst.dinas.production.datamodel.SandMining</m:type>
<m:description></m:description>
<m:default></m:default>
......
backend/xyst.dinas.production/src/main/resources/config/ProductionPlanReport.hbm.xml
......@@ -47,7 +47,7 @@
</many-to-one>
<many-to-one name="productionLine" entity-name="com.xyst.dinas.biz.datamodel.ProductionLine" fetch="select">
<column name="productionLine_id" not-null="false">
<column name="production_line_id" not-null="false">
<comment>所属生产线</comment>
</column>
</many-to-one>
......@@ -63,17 +63,17 @@
</property>
<property name="warehousingStatus" type="boolean" not-null="false">
<column name="warehousingStatus">
<column name="warehousing_status">
<comment>是否入库, false未入库 true已入库</comment>
</column>
</property>
<bag name="dinasTypeDetails" lazy="true" fetch="select" inverse="true">
<key column="master_id" not-null="true" />
<one-to-many entity-name="com.xyst.dinas.production.datamodel.ProductionPlanReportAssociatedDinasTypeDetails" />
<one-to-many entity-name="com.xyst.dinas.production.datamodel.ProductionPlanReportAssociateddinasTypeDetail" />
</bag>
</class>
<class entity-name="com.xyst.dinas.production.datamodel.ProductionPlanReportAssociatedDinasTypeDetails" table="xyst_dinas_production_plan_report_dinas_type_detail" >
<tuplizer entity-mode="dynamic-map" class="com.beecode.bcp.store.hibernate.KObjectEntityTuplizer" />
<class entity-name="com.xyst.dinas.production.datamodel.ProductionPlanReportAssociateddinasTypeDetail" table="xyst_dinas_production_plan_report_dinas_type_detail" >
<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>
......
backend/xyst.dinas.production/src/main/resources/config/SandMining.hbm.xml
......@@ -108,7 +108,7 @@
<bag name="stationDetails" lazy="true" fetch="select" inverse="true">
<key column="master_id" not-null="true" />
<one-to-many entity-name="com.xyst.dinas.production.datamodel.SandMiningAssociatedSandMiningStationDetail" />
<one-to-many entity-name="com.xyst.dinas.production.datamodel.SandMiningAssociatedstationDetail" />
</bag>
<property name="sandMiningRange" type="nstring" not-null="false">
<column name="sand_mining_range" length="3000" >
......@@ -137,7 +137,7 @@
</property>
</class>
<class entity-name="com.xyst.dinas.production.datamodel.SandMiningAssociatedSandMiningStationDetail" table="xyst_dinas_production_sand_mining_station_detail">
<class entity-name="com.xyst.dinas.production.datamodel.SandMiningAssociatedstationDetail" table="xyst_dinas_production_sand_mining_station_detail">
<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" />
......
backend/xyst.dinas.statistics/build.gradle
......@@ -25,6 +25,7 @@ dependencies {
compile project(":xyst.dinas.price")
compile project(":xyst.dinas.project")
compile project(":xyst.dinas.sales")
compile project(":xyst.dinas.production")
compile project(":xyst.dinas.finance")
testCompile lib.amino_boot_web
testCompile lib.mysql_connector
......
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/DinasTypeProductionStatisticsAdvQuery.jmx
......@@ -9,16 +9,16 @@
<define-version>1.0</define-version>
<content>
<template>
<sql-type>NPSQL</sql-type>
<sql-type>SQL</sql-type>
<sql>
SELECT
bdt.dinasTypeName as typeName,sum(dtd.dinasWeight)/1000 as weight, bdt.type as type
FROM
xystOrganization AS dbo
LEFT JOIN ProductionPlanReport AS ppr
LEFT JOIN ProductionPlanReportAssociatedDinasTypeDetails as dtd on dtd.master = ppr.id
LEFT JOIN DinasType as bdt on bdt.id = dtd.dinasType
on ppr.regionalCompany = dbo.id
LEFT JOIN ProductionPlanReportAssociateddinasTypeDetail as dtd on dtd.master = ppr.id
LEFT JOIN DinasType as bdt on bdt.id = dtd.dinasType
where (dbo.discard = 0 or dbo.discard is null)
and ppr.warehousingStatus = 1
and ppr.productionPlanDate &gt;= :?startDate
......
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/RegionalCompanyDischargingCountStatisticsAdvQuery.jmx
......@@ -9,7 +9,7 @@
<define-version>1.0</define-version>
<content>
<template>
<sql-type>NPSQL</sql-type>
<sql-type>SQL</sql-type>
<sql>
SELECT
dbo.id,
......
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/RegionalCompanyProductionStatisticsAdvQuery.jmx
......@@ -9,20 +9,20 @@
<define-version>1.0</define-version>
<content>
<template>
<sql-type>NPSQL</sql-type>
<sql-type>SQL</sql-type>
<sql>
SELECT
dbo.name ,sum(dtd.dinasWeight)/10000 as weight
FROM
xystOrganization AS dbo
LEFT JOIN ProductionPlanReport AS ppr
LEFT JOIN ProductionPlanReportAssociatedDinasTypeDetails as dtd on dtd.master = ppr.id
on ppr.regionalCompany = dbo.id
LEFT JOIN ProductionPlanReport AS ppr ON ppr.regionalCompany = dbo.id
LEFT JOIN ProductionPlanReportAssociateddinasTypeDetail as dtd on dtd.master = ppr.id
where (dbo.discard = 0 or dbo.discard is null)
and ppr.warehousingStatus = 1
and ppr.productionPlanDate &gt;= :?startDate
and ppr.productionPlanDate &lt;= :?endDate
GROUP BY dbo.id;
GROUP BY dbo.id
order by dbo.createTime
</sql>
</template>
</content>
......
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/SandMiningAreaScheduleAdvQuery.jmx
......@@ -9,26 +9,21 @@
<define-version>1.0</define-version>
<content>
<template>
<sql-type>NPSQL</sql-type>
<sql-type>SQL</sql-type>
<sql>
SELECT
( ma.sandMiningQuantity ) AS quantity,
sum( pd.dischargingWeight )/10000 AS sumWeight,
(
sum( pd.dischargingWeight )/(
sandMiningQuantity * 10000
)) AS quantityRate,
ma.sandMiningAreaName as sandAreaName
FROM
Discharging AS pd
INNER JOIN SandMiningArea AS ma ON pd.sandMiningArea = ma.id
SELECT sandMiningArea.sandMiningQuantity AS quantity,
sum( discharging.dischargingWeight )/10000 AS sumWeight,
(sum( discharging.dischargingWeight )/(sandMiningArea.sandMiningQuantity * 10000)) AS quantityRate,
sandMiningArea.sandMiningAreaName as sandAreaName
FROM Discharging AS discharging
LEFT JOIN SandMiningArea AS sandMiningArea ON sandMiningArea.id = discharging.sandMiningArea
WHERE
pd.del = 0
AND ma.del = 0
and pd.parentId is null
AND year(pd.dischargingTime ) = year(now())
discharging.del = 0
AND sandMiningArea.del = 0
and discharging.parentId is null
AND yearof(discharging.dischargingTime) = yearof(getdate())
GROUP BY
ma.id
sandMiningArea.id
</sql>
</template>
</content>
......
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/SandMiningScheduleAdvQuery.jmx
......@@ -9,14 +9,15 @@
<define-version>1.0</define-version>
<content>
<template>
<sql-type>NPSQL</sql-type>
<sql-type>SQL</sql-type>
<sql>
SELECT
psm.id,
bsi.shipName AS shipName,
(sum( dpd.dischargingWeight )/10000) AS sumWeight,
(1+datediff ( psm.sandMiningEnd, psm.sandMiningStart ))* psm.miningVolume AS sumVolume.
sum( dpd.dischargingWeight ) / ((1+datediff ( psm.sandMiningEnd, psm.sandMiningStart ))* psm.miningVolume) as volumeRate
psm.sandMiningStart as startDate,
psm.sandMiningEnd as endDate,
psm.miningVolume as dayVolume
FROM
SandMining AS psm
LEFT JOIN ShipInfo bsi ON psm.ship = bsi.id
......
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/SandMiningScheduleQueryView.jmx
......@@ -50,8 +50,18 @@
"columns": [
{
"type": "VALUE",
"title": "计划量(万吨炖)",
"key": "sumVolume",
"title": "每日计划量(万吨炖)",
"key": "dayVolume",
"columnType": {
"name" : "select",
"data": {
"selected": true
}
}
},{
"type": "VALUE",
"title": "许可证开始时间",
"key": "startDate",
"columnType": {
"name" : "select",
"data": {
......@@ -59,24 +69,26 @@
}
},
"format": {
"type": "DATE"
"type": "DATE"
}
},
{
},{
"type": "VALUE",
"title": "实际接驳量(万吨)",
"key": "sumWeight",
"title": "许可证结束时间",
"key": "endDate",
"columnType": {
"name": "select",
"name" : "select",
"data": {
"selected": true
}
},
"format": {
"type": "DATE"
}
},
{
"type": "VALUE",
"title": "计划进度(没有百分比的)",
"key": "volumeRate",
"title": "实际接驳量(万吨)",
"key": "sumWeight",
"columnType": {
"name": "select",
"data": {
......
backend/xyst.dinas.transport/src/main/java/com/xyst/dinas/transport/internal/dao/TransportRecordDaoImpl.java
......@@ -84,7 +84,7 @@ public class TransportRecordDaoImpl extends AbstractBaseDao implements Transport
}
if(driverUserName!=null){
detachedCriteria.add(Restrictions.like("driverUser.title",driverUserName,MatchMode.ANYWHERE));
detachedCriteria.add(Restrictions.or(Restrictions.like("driverUser.title",driverUserName,MatchMode.ANYWHERE),Restrictions.like("driverUser.username",driverUserName,MatchMode.ANYWHERE)));
}
if(vehicleId!=null){
detachedCriteria.add(Restrictions.eq("transportVehicle.id",vehicleId));
......@@ -155,7 +155,7 @@ public class TransportRecordDaoImpl extends AbstractBaseDao implements Transport
detachedCriteria.setProjection(Projections.projectionList()
.add(Projections.alias(Projections.sum("salesRecord."+SalesRecordConstant.DEALAMOUNT),"sumCount"))
.add(Projections.alias(Projections.sum("salesRecord."+SalesRecordConstant.AMOUNT),"sumAmount"))
.add(Projections.alias(Projections.max("regionalCompany.name"),"name"))
.add(Projections.alias(Projections.max(SalesRecordConstant.DINASTYPE+".dinasTypeName"),"name"))
.add(Projections.alias(Projections.groupProperty(SalesRecordConstant.DINASTYPE+".id"),SalesRecordConstant.DINASTYPE)));
detachedCriteria.setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP);
return (List<Map<String, Object>>)template.findByCriteria(detachedCriteria);
......
backend/xyst.dinas.transport/src/main/java/com/xyst/dinas/transport/internal/service/TransportRecordServiceImpl.java
......@@ -76,6 +76,7 @@ public class TransportRecordServiceImpl implements TransportRecordService {
KObject saleRecord = data.get("saleRecord");
KObject transportVehicle = data.get("transportVehicle");
KObject code = data.get("billCode");
KObject driverUser = data.get("driverUser");
String projectName = saleRecord.get(SalesRecordConstant.PROJECT).getString("projectName");
String dinasTypeName = saleRecord.get(SalesRecordConstant.DINASTYPE).getString("dinasTypeName");
BigDecimal dealAmount = saleRecord.getBigDecimal(SalesRecordConstant.DEALAMOUNT);
......@@ -114,6 +115,7 @@ public class TransportRecordServiceImpl implements TransportRecordService {
stringObjectHashMap.put("contactNumber",data.getString("contactNumber"));
stringObjectHashMap.put("confirmTime",data.getString("confirmTime"));
stringObjectHashMap.put("confirmStatus",data.getInt("confirmStatus"));
stringObjectHashMap.put("driverUser",driverUser.getString("title")+"("+driverUser.getString("username")+")");
}
}
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