Skip to content

C
cloud-fb
Commit 2f6a2742 by yanHeng
Options

Merge branches 'develop' and 'feature/vehicle-amount-party' of… 

Merge branches 'develop' and 'feature/vehicle-amount-party' of gitlab.beecode.cn:kunlun/xyst_dinas/xyst_dinas_backend into feature/vehicle-amount-party

 Conflicts:
	backend/inz.basis/src/main/resources/com/beecode/inz/portal/functiontree/DefaultFunctionTree.jmx
parents d9a5fc25 d9cef7db
Showing with 1620 additions and 11 deletions
backend/inz.basis/src/main/resources/com/beecode/inz/portal/functiontree/CompanyFunctionTree.jmx
......@@ -74,6 +74,19 @@
</m:function-definition>
<m:icon>iconfont iconhetongliebiao1x</m:icon>
</m:function-node>
<m:function-node>
<m:id>a5a301a5-64c4-44ae-b0cb-0cd2e102422b</m:id>
<m:name>self_pickup_car</m:name>
<m:title>自提车辆</m:title>
<m:index>1500</m:index>
<m:license></m:license>
<m:privilege></m:privilege>
<m:function-definition>
<m:view>function-self-pickup-car</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:icon>iconfont iconkucunchaxun1x</m:icon>
</m:function-node>
</m:children>
</m:function-node>
<m:function-node>
......
backend/inz.basis/src/main/resources/com/beecode/inz/portal/functiontree/DefaultFunctionTree.jmx
......@@ -27,6 +27,7 @@
<dependency>com.xyst.dinas.oa.auth.OAWorkflowSetting</dependency>
<dependency>com.xyst.dinas.oa.auth.OAWorkflowEntrust</dependency>
<dependency>com.xyst.dinas.oa.auth.OARemind</dependency>
<dependency>com.xyst.dinas.contract.auth.SelfPickupCarList</dependency>
<dependency>com.xyst.dinas.contract.auth.ContractList</dependency>
<dependency>com.xyst.dinas.contract.auth.ContractApproveList</dependency>
<dependency>com.xyst.dinas.contract.auth.ContractWarningExeList</dependency>
......@@ -542,7 +543,7 @@
<m:id>26783a66-bf30-42d5-af91-1aa7fcab1654</m:id>
<m:name>vehicle_amount_party</m:name>
<m:title>车辆量方</m:title>
<m:index>1500</m:index>
<m:index>1400</m:index>
<m:license></m:license>
<m:privilege></m:privilege>
<m:function-definition>
......@@ -551,6 +552,19 @@
</m:function-definition>
<m:icon>iconfont iconcheliangliangfang1x</m:icon>
</m:function-node>
<m:function-node>
<m:id>e536e311-8d22-4730-b3d7-444fd718c883</m:id>
<m:name>self_pickup_car</m:name>
<m:title>自提车辆</m:title>
<m:index>1500</m:index>
<m:license></m:license>
<m:privilege>com.xyst.dinas.contract.auth.SelfPickupCarList</m:privilege>
<m:function-definition>
<m:view>function-self-pickup-car</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:icon>iconfont iconkucunchaxun1x</m:icon>
</m:function-node>
<m:function-node>
<m:id>ef2613a6-33b9-4da1-b01e-40b9060e7d62</m:id>
<m:name>market_plan</m:name>
......@@ -567,7 +581,7 @@
<m:function-node>
<m:id>3e69c168-3f45-46a7-bed6-1612520148b7</m:id>
<m:name>market_plan_temporary</m:name>
<m:title>临时销售计划</m:title>
<m:title>销售计划补充</m:title>
<m:index>4500</m:index>
<m:license></m:license>
<m:privilege>com.xyst.dinas.sales.auth.SalesPlanTempList</m:privilege>
......@@ -593,7 +607,7 @@
<m:function-node>
<m:id>9e32391e-1911-4951-80a2-15875e688d0f</m:id>
<m:name>market_plan_temporary_approve</m:name>
<m:title>临时销售计划审核</m:title>
<m:title>销售计划补充审核</m:title>
<m:index>4500</m:index>
<m:license></m:license>
<m:privilege>com.xyst.dinas.sales.auth.SalesPlanTempAuditList</m:privilege>
......
backend/inz.init.data/src/main/resources/com/beecode/inz/basis/auth/ManagerRole.json
......@@ -30,6 +30,8 @@
"name":"xystBizManagerRole",
"title":"业务管理员",
"description":"管理系统当中的组织机构、部门人员、权限、数据字典、工作流等功能。",
"privilegeNames":[]
"privilegeNames":[
"com.beecode.bcp.authz.AdminPrivilege"
]
}
]
\ No newline at end of file
backend/xyst.dinas.biz/src/main/model/com/xyst/dinas/biz/datamodel/xystOrganization.mk
......@@ -41,6 +41,10 @@
<annotation id='n544a6100-2a92-42e9-8558-6c5e5833c217' attributeId='n2d966eb7-8acf-431b-87fe-147167a15f47' name='length' value='100'>
</annotation>
</attribute>
<attribute id='10bccca6-1883-4f8a-bdce-e5d339da32b1' name='generateSalePlanTime' columnName='generate_sale_plan_time' title='销售计划生成时间' type='string' default='' precision='' isArray='false'>
<annotation id='78ce8451-849a-41ed-90dc-2fd3d8a632a9' attributeId='9e58ba4c-2ec3-492c-8ec5-9e1b64cc1852' name='length' value='100'>
</annotation>
</attribute>
<attribute id='8a9c2549-d7fd-4874-970f-a38c7eaf4955' name='department' columnName='department' title='部门' type='com.beecode.bap.department.datamodel.Department' default='' precision='' isArray='false'>
<annotation id='31b269b5-aa63-440d-8ca0-6e9a8d54e5d3' attributeId='b6231426-0fb5-47c3-a7ce-75408c4135b0' name='mappingType' value='many-to-one'>
</annotation>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/datamodel/xystOrganization.jmx
......@@ -202,6 +202,29 @@
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>bcp.type.constraint.StringLength</m:type>
<m:value>100</m:value>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>generate_sale_plan_time</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>10bccca6-1883-4f8a-bdce-e5d339da32b1</m:id>
<m:name>generateSalePlanTime</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>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/query/xystOrganization.jmx
......@@ -101,6 +101,16 @@
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>generateSalePlanTime</m:name>
<m:title>销售计划生成时间</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>createTime</m:name>
<m:title>创建时间</m:title>
<m:type>datetime</m:type>
......
backend/xyst.dinas.biz/src/main/resources/config/Organization.hbm.xml
......@@ -57,6 +57,9 @@
<property name="planningCycle" type="nstring" not-null="false">
<column name="planning_cycle" length="100"></column>
</property>
<property name="generateSalePlanTime" type="nstring" not-null="false">
<column name="generate_sale_plan_time" length="100"></column>
</property>
<many-to-one name="department" entity-name="com.beecode.bap.department.datamodel.Department" fetch="select">
<column name="department" not-null="false"/>
</many-to-one>
......
backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/config/ContractConfiguration.java
......@@ -11,11 +11,14 @@ import com.beecode.inz.workflow.config.ProcessConfiguration;
import com.beecode.inz.workflow.config.TriggerAction;
import com.beecode.inz.workflow.config.TriggerCondition;
import com.xyst.dinas.contract.constant.ContractConstant;
import com.xyst.dinas.contract.dao.SelfPickupCarDao;
import com.xyst.dinas.contract.internal.dao.ContractDao;
import com.xyst.dinas.contract.internal.dao.ContractInfoDao;
import com.xyst.dinas.contract.internal.dao.SelfPickupCarDaoImpl;
import com.xyst.dinas.contract.internal.scene.ContractListDefaultScene;
import com.xyst.dinas.contract.internal.service.ContractServiceImpl;
import com.xyst.dinas.contract.internal.service.ContractWarnServiceImpl;
import com.xyst.dinas.contract.internal.service.SelfPickupCarServiceImpl;
import com.xyst.dinas.contract.listener.ContractProcessEventListener;
import com.xyst.dinas.contract.listener.ContractTaskEventListenerHandle;
import com.xyst.dinas.contract.listener.ContractUpdateProcessListener;
......@@ -25,6 +28,7 @@ import com.xyst.dinas.contract.query.processor.ContractPerformWarningProcessor;
import com.xyst.dinas.contract.query.processor.ContractWarnSettingProcessor;
import com.xyst.dinas.contract.service.ContractService;
import com.xyst.dinas.contract.service.ContractWarnService;
import com.xyst.dinas.contract.service.SelfPickupCarService;
import com.xyst.dinas.contract.task.ContractExpireCheckTask;
import com.xyst.dinas.contract.task.ContractExpireCheckTaskRegister;
import com.xyst.dinas.contract.warn.AdvanceBalanceWarningCalculator;
......@@ -32,6 +36,7 @@ import com.xyst.dinas.contract.warn.ContractExpireWarningCalculator;
import com.xyst.dinas.contract.warn.DinasCountWarningCalculator;
import com.xyst.dinas.contract.web.ContractController;
import com.xyst.dinas.contract.web.ContractWarnController;
import com.xyst.dinas.contract.web.SelfPickupCarController;
/**
* 开启自动配置,无需手动注册Bean
*
......@@ -69,6 +74,21 @@ public class ContractConfiguration {
}
@Bean
public SelfPickupCarController createSelfPickupCarController() {
return new SelfPickupCarController();
}
@Bean
public SelfPickupCarService createSelfPickupCarService() {
return new SelfPickupCarServiceImpl();
}
@Bean
public SelfPickupCarDao createSelfPickupCarDao() {
return new SelfPickupCarDaoImpl();
}
//合同审批工作流
......
backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/constant/SelfPickupCarConstant.java 0 → 100644
package com.xyst.dinas.contract.constant;
public class SelfPickupCarConstant {
public static final String ENTITY = "com.xyst.dinas.contract.datamodel.SelfPickupCar";
public static final String PROJECT = "project";
public static final String PROJECT_CODE = "projectCode";
public static final String REGIONAL_COMPANY = "regionalCompany";
public static final String REGIONAL_COMPANY_NAME = "regionalCompanyName";
public static final String PURCHASE_SAND_UNIT = "purchaseSandUnit";
public static final String PURCHASE_SAND_UNIT_NAME = "purchaseSandUnitName";
public static final String CONTRACT = "contract";
public static final String CONTRACT_NAME = "contractName";
public static final String CONTRACT_CODE = "contractCode";
public static final String CAR_INFO = "carInfo";
public static final String MEMO = "memo";
public static final String ATTID = "attId";
}
backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/dao/SelfPickupCarDao.java 0 → 100644
package com.xyst.dinas.contract.dao;
import java.util.UUID;
import com.beecode.bcp.type.KObject;
public interface SelfPickupCarDao {
void update(KObject kobject);
UUID create(KObject kobject);
KObject load(UUID id);
KObject getCarInfoByContractId(UUID contractId);
}
backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/internal/dao/SelfPickupCarDaoImpl.java 0 → 100644
package com.xyst.dinas.contract.internal.dao;
import java.util.UUID;
import org.hibernate.HibernateException;
import org.hibernate.Session;
import org.hibernate.query.Query;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.orm.hibernate5.HibernateCallback;
import org.springframework.orm.hibernate5.HibernateOperations;
import org.springframework.stereotype.Repository;
import com.beecode.bcp.type.KObject;
import com.xyst.dinas.contract.constant.SelfPickupCarConstant;
import com.xyst.dinas.contract.dao.SelfPickupCarDao;
@Repository
public class SelfPickupCarDaoImpl implements SelfPickupCarDao {
@Autowired
private HibernateOperations template;
public void update(KObject kobject) {
template.update(kobject.getType().getName(), kobject);
}
public UUID create(KObject kObject) {
return (UUID) template.save(kObject.getType().getName(), kObject);
}
public KObject load(UUID id) {
return (KObject) template.get(SelfPickupCarConstant.ENTITY, id);
}
@Override
public KObject getCarInfoByContractId(UUID contractId) {
return (KObject)template.execute(new HibernateCallback<KObject>() {
@Override
public KObject doInHibernate(Session session) throws HibernateException {
Query<KObject> query = session.createQuery("from " + SelfPickupCarConstant.ENTITY + " where (discard is null or discard = 0) and contract.id =:contractId", KObject.class);
query.setParameter("contractId", contractId);
return query.getSingleResult();
}
});
}
}
backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/internal/service/SelfPickupCarServiceImpl.java 0 → 100644
package com.xyst.dinas.contract.internal.service;
import java.util.Date;
import java.util.UUID;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.beecode.bcp.core.context.AminoContextHolder;
import com.beecode.bcp.type.KObject;
import com.beecode.inz.common.BaseConstants;
import com.xyst.dinas.biz.dao.DinasOrganizationDao;
import com.xyst.dinas.contract.constant.SelfPickupCarConstant;
import com.xyst.dinas.contract.dao.SelfPickupCarDao;
import com.xyst.dinas.contract.internal.dao.ContractDao;
import com.xyst.dinas.contract.service.SelfPickupCarService;
import com.xyst.dinas.project.dao.ProjectFiledDao;
import com.xyst.dinas.project.dao.PurchaseSandCompanyDao;
@Service
public class SelfPickupCarServiceImpl implements SelfPickupCarService {
@Autowired
private SelfPickupCarDao selfPickupCarDao;
@Autowired
private ProjectFiledDao projectFiledDao;
@Autowired
private DinasOrganizationDao dinasOrganizationDao;
@Autowired
private PurchaseSandCompanyDao purchaseSandCompanyDao;
@Autowired
private ContractDao contractDao;
@Override
@Transactional
public void update(String param) {
JSONObject obj = new JSONObject(param);
String id = obj.getString("id");
String carInfo = obj.getString("carInfo");
KObject kobject = selfPickupCarDao.load(UUID.fromString(id));
KObject staff = AminoContextHolder.getContext().getStaff();
kobject.set(BaseConstants.MODIFIER, staff);
kobject.set(BaseConstants.MODIFY_TIME, new Date());
kobject.set(SelfPickupCarConstant.CAR_INFO, carInfo);
selfPickupCarDao.update(kobject);
}
@Override
@Transactional
public UUID create(KObject kobject) {
KObject staff = AminoContextHolder.getContext().getStaff();
kobject.set(BaseConstants.CREATOR, staff);
kobject.set(BaseConstants.CREATE_TIME, new Date());
kobject.set(BaseConstants.DISCARD, false);
KObject projectKobj = projectFiledDao.load(kobject.get(SelfPickupCarConstant.PROJECT).getUuid("id"));
kobject.set(SelfPickupCarConstant.PROJECT, projectKobj);
KObject organizationKobj = dinasOrganizationDao
.load(kobject.get(SelfPickupCarConstant.REGIONAL_COMPANY).getUuid("id"));
kobject.set(SelfPickupCarConstant.REGIONAL_COMPANY, organizationKobj);
KObject companyKobj = purchaseSandCompanyDao
.load(kobject.get(SelfPickupCarConstant.PURCHASE_SAND_UNIT).getUuid("id"));
kobject.set(SelfPickupCarConstant.PURCHASE_SAND_UNIT, companyKobj);
KObject contractKobj = contractDao.getContractByContractInfoId(kobject.get(SelfPickupCarConstant.CONTRACT).getUuid("id"));
kobject.set(SelfPickupCarConstant.CONTRACT, contractKobj);
return selfPickupCarDao.create(kobject);
}
@Override
public String getCarInfoByContractId(String contractId) {
KObject carInfoKObject = selfPickupCarDao.getCarInfoByContractId(UUID.fromString(contractId));
String carInfo = "";
if(null != carInfoKObject) {
carInfo = carInfoKObject.getString("carInfo");
}
return carInfo;
}
}
backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/service/SelfPickupCarService.java 0 → 100644
package com.xyst.dinas.contract.service;
import java.util.UUID;
import com.beecode.bcp.type.KObject;
public interface SelfPickupCarService {
UUID create(KObject kobject);
void update(String param);
String getCarInfoByContractId(String contractId);
}
backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/web/SelfPickupCarController.java 0 → 100644
package com.xyst.dinas.contract.web;
import java.util.UUID;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
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.xyst.dinas.contract.constant.SelfPickupCarConstant;
import com.xyst.dinas.contract.entity.CommonResult;
import com.xyst.dinas.contract.service.SelfPickupCarService;
@RestController
public class SelfPickupCarController {
@Autowired
private SelfPickupCarService selfPickupCarService;
@PostMapping("/selfPickupCar/create")
public UUID create(@RequestBody String selfPickupCarInfo) {
KClass type = Amino.getApplicationMetadataContext().getBean(SelfPickupCarConstant.ENTITY,
KClass.class);
KObject kObject = JSONObjectUtils.toObject(selfPickupCarInfo, type);
return selfPickupCarService.create(kObject);
}
@PostMapping("/selfPickupCar/update")
public CommonResult update(@RequestBody String selfPickupCarInfo) {
selfPickupCarService.update(selfPickupCarInfo);
return CommonResult.SUCCESS_RESULT;
}
@PostMapping("/sand/user/selfPickupCar/update")
public CommonResult updateForCompany(@RequestBody String selfPickupCarInfo) {
selfPickupCarService.update(selfPickupCarInfo);
return CommonResult.SUCCESS_RESULT;
}
@GetMapping("/selfPickupCar/getCarInfoByContractId/{contractId}")
public Object getCarInfoByContractId(@PathVariable String contractId) {
String carInfo = selfPickupCarService.getCarInfoByContractId(contractId);
return ResponseObj.success("查询成功", carInfo);
}
}
backend/xyst.dinas.contract/src/main/model/com/xyst/dinas/contract/auth/SelfPickupCarEdit.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.contract.auth</package>
<name>SelfPickupCarEdit</name>
<title>编辑</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='410b14b9-100b-4781-9ea1-ac4c12dba983' category='销售/自提车辆（区域公司）' seq='2'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.contract/src/main/model/com/xyst/dinas/contract/auth/SelfPickupCarList.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.contract.auth</package>
<name>SelfPickupCarList</name>
<title>列表</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='539a53f0-fd0c-45f5-a15a-f8e7d9dacfe5' category='销售/自提车辆（区域公司）' seq='1'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.contract/src/main/model/com/xyst/dinas/contract/bill/SelfPickupCar.mk 0 → 100644
<model>
<header>
<type>bcp.biz.Bill</type>
<package>com.xyst.dinas.contract.bill</package>
<title>自提车辆单据</title>
<name>SelfPickupCarBill</name>
<description>自提车辆单据</description>
</header>
<content>
<bill>
<data>
{"baseData":{"name":"SelfPickupCarBill","title":"自提车辆单据","billModel":"com.beecode.bap.biztrait.BasicBillBiztrait","functionLibrarys":[],"description":"自提车辆单据","dataModel":"com.xyst.dinas.contract.datamodel.SelfPickupCar"},"serial":{"serialData":[{"segment":"literal","segmentData":"SPC"},{"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.contract/src/main/model/com/xyst/dinas/contract/datamodel/SelfPickupCar.mk 0 → 100644
<model>
<header>
<type>bcp.type.DataModel</type>
<package>com.xyst.dinas.contract.datamodel</package>
<title>自提车辆表</title>
<name>SelfPickupCar</name>
<tags></tags>
<description>自提车辆表</description>
<templateName>mk.ide.ui.editor.data.model.template.bill</templateName>
<tablePrefix>xyst_dinas_</tablePrefix>
</header>
<content>
<dataModel id='92e87a62-f2e0-4374-9e9b-7a700ed775a9' multiVersion='' domainInherit='undefined' tableName='xyst_dinas_contract_self_pickup_car'>
<parent>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</parent>
<parent>com.beecode.inz.common.datamodel.BaseInfo</parent>
<attribute id='fbfd1335-5f18-4bd3-98ca-2c63afe97827' name='project' columnName='project_id' title='项目' type='com.xyst.dinas.project.datamodel.ProjectFiled' default='' precision='' isArray='false'>
<annotation id='5dd0433d-5022-4c09-a931-429754e7fee2' attributeId='41d87c94-726b-4899-993e-03b9583b5716' name='length' value='undefined'></annotation>
<annotation id='d6e66c5a-64cc-4500-bc16-349137294985' attributeId='0f8b980a-5b92-43fb-95b8-e2aea04aa631' name='mappingType' value='many-to-one'></annotation>
</attribute>
<attribute id='9ea6f374-f043-45d1-ab78-64d4b1ed7a05' name='projectCode' columnName='project_code' title='项目编号' type='string' default='' precision='' isArray='false'>
<annotation id='045bc20b-9c40-4475-960b-124bc56c4262' attributeId='ebc329c9-e5c4-44a8-a3d5-edadebcd4e0c' name='length' value='50'>
</annotation>
</attribute>
<attribute id='f6b523af-1eeb-4c3b-b644-c51866087f60' name='regionalCompany' columnName='regional_company_id' title='区域公司' type='com.xyst.dinas.biz.datamodel.xystOrganization' default='' precision='' isArray='false'>
<annotation id='0e4b6eea-3e40-4791-968c-a53c3c443901' attributeId='0a27af63-b441-496d-96cf-aa328001c9d9' name='length' value='undefined'></annotation>
<annotation id='06fc9d81-480f-4d0a-b250-b6451cc94e87' attributeId='2384c314-3f02-4e62-b0cc-fd244fe34a13' name='mappingType' value='many-to-one'></annotation>
</attribute>
<attribute id='afc7f528-d6d1-491d-b867-e4824a8513c3' name='regionalCompanyName' columnName='regional_company_name' title='区域公司名称' type='string' default='' precision='' isArray='false'>
<annotation id='2f33c00e-a4c6-4877-9b43-111cbb87d0d3' attributeId='d9e28cad-f4d8-4d4d-b366-da3e13970324' name='length' value='50'>
</annotation>
</attribute>
<attribute id='b201aec2-36b7-4dda-880d-36dcc6173796' name='purchaseSandUnit' columnName='purchase_sand_Unit_id' title='购砂单位' type='com.xyst.dinas.project.datamodel.PurchaseSandCompany' default='' precision='' isArray='false'>
<annotation id='bec9695c-cd9c-4595-8a13-a671741d1a07' attributeId='e06a5549-d94a-4bf0-a1f0-8acfdeffe588' name='length' value='undefined'></annotation>
<annotation id='464e766b-c8d6-44aa-87b5-e22fa9454b36' attributeId='af54ed85-26b1-48f2-913c-0969b7363ef3' name='mappingType' value='many-to-one'></annotation>
</attribute>
<attribute id='694805bd-715a-4a5c-9b90-6f4400ef39f1' name='purchaseSandUnitName' columnName='purchase_sand_Unit_name' title='购砂单位名称' type='string' default='' precision='' isArray='false'>
<annotation id='41d90025-ab9a-4324-b4ab-220d8fe7f902' attributeId='99a8a39b-e039-4692-b853-75fe9f854250' name='length' value='50'>
</annotation>
</attribute>
<attribute id='a518f765-df1d-4670-a423-5c896149548e' name='contract' columnName='contract_id' title='合同' type='com.xyst.dinas.contract.datamodel.Contract' default='' precision='' isArray='false'>
<annotation id='c31136fc-6e0f-4e19-a21b-505949f7dfd9' attributeId='0de3a277-1d14-44ed-aeff-ecf5d681436c' name='length' value='undefined'></annotation>
<annotation id='d8ee5a6b-c839-4270-a86d-589f1c1e665c' attributeId='f379ba55-34ba-4955-aa22-6a07ebb4557c' name='mappingType' value='many-to-one'></annotation>
</attribute>
<attribute id='beefd5f9-a611-44aa-aeaa-f8992c4aeaee' name='contractName' columnName='contract_name' title='合同名称' type='string' default='' precision='' isArray='false'>
<annotation id='4cbc0e23-ccea-48b9-85dc-088d36998ebd' attributeId='c87a72a8-cff1-46db-85b3-9009f11d9217' name='length' value='50'></annotation>
</attribute>
<attribute id='e907a0e2-140e-4a12-974b-293b42bfcb19' name='contractCode' columnName='contract_code' title='合同编号' type='string' default='' precision='' isArray='false'>
<annotation id='1f709ba4-37ca-4e7d-9f9c-2658c46f37c8' attributeId='f5d9ed1b-219f-453e-8e0f-d02af1d5f4d5' name='length' value='50'></annotation>
</attribute>
<attribute id='8a23beaa-9ae0-4ade-a096-5dfa5a30ff8e' name='carInfo' columnName='car_info' title='车辆信息' type='string' default='' precision='' isArray='false'>
<annotation id='c0f80b1d-2f80-4c20-9e1f-165ee40909c8' attributeId='5baa0d9f-bb2b-46f0-ad13-ebba0fb1e94d' name='length' value='800'></annotation>
</attribute>
<attribute id='dd07132e-8ba0-4615-81c2-6f92ccb6df6d' name='memo' columnName='memo' title='备注' type='string' default='' precision='' isArray='false'>
<annotation id='d1e4303b-ca9a-489a-a51d-369cc4578a8d' attributeId='53cf70f7-9e06-4ce8-952e-e65eca6c020d' name='length' value='500'></annotation>
</attribute>
<attribute id='6b43184e-b4c6-4b87-b3ec-91adcb84d68d' name='attId' columnName='att_id' title='车辆行驶证' type='uuid' default='' precision='' isArray='false'>
<annotation id='70eaac44-b767-4fc4-843d-af4cee314678' attributeId='6c49109c-4b2f-4e8e-b737-685a2d38ef96' name='length' value='undefined'>
</annotation>
</attribute>
<hibernate>/xyst.dinas.contract/src/main/resources/config/SelfPickupCar.hbm.xml</hibernate>
</dataModel>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.contract/src/main/model/com/xyst/dinas/contract/query/SelfPickupCar.mk 0 → 100644
<model>
<header>
<type>inz.query.Query</type>
<package>com.xyst.dinas.contract.query</package>
<name>SelfPickupCar</name>
<title>自提车辆</title>
<tags></tags>
<description></description>
</header>
<content>
<customQuery id='09777c08-5e47-40aa-995e-a8b13658caa1'>
<kclass>com.xyst.dinas.contract.datamodel.SelfPickupCar</kclass>
<dataProcessor></dataProcessor>
<innerScene title='全部'>
<id>9f7042a8-8a24-40a7-9d29-7224e16822ab</id>
<javaImplement>com.beecode.inz.common.scene.CommonAllScene</javaImplement>
<defaultExecute></defaultExecute>
<hide></hide>
</innerScene>
<innerScene title='已废弃'>
<id>f6ed7c06-e53b-4891-be6a-6ab4d8ab123b</id>
<javaImplement>com.beecode.inz.common.scene.DefaultDiscardScene</javaImplement>
<defaultExecute></defaultExecute>
<hide></hide>
</innerScene>
<innerScene title='权限过滤'>
<id>3e6943cf-022c-42cb-bd3d-1b878065f4e2</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>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.projectNum</name>
<type>string</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='项目名称'>
<name>project.projectName</name>
<type>string</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='区域公司ID'>
<name>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></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>
<description></description>
</field>
<field title='合同'>
<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>carInfo</name>
<type>string</type>
<description></description>
</field>
<field title='备注'>
<name>memo</name>
<type>string</type>
<description></description>
</field>
<field title='车辆行驶证'>
<name>attId</name>
<type>uuid</type>
<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>
</customQuery>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.contract/src/main/model/com/xyst/dinas/contract/query/SelfPickupCarNoAuthFilterScene.mk 0 → 100644
<model>
<header>
<type>inz.query.Query</type>
<package>com.xyst.dinas.contract.query</package>
<name>SelfPickupCarNoAuthFilterScene</name>
<title>自提车辆</title>
<tags></tags>
<description></description>
</header>
<content>
<customQuery id='9e608aff-d801-4d21-83bd-77c650f06d66'>
<kclass>com.xyst.dinas.contract.datamodel.SelfPickupCar</kclass>
<dataProcessor></dataProcessor>
<innerScene title='全部'>
<id>aa22e7aa-741a-4a19-aee8-09ed1315c575</id>
<javaImplement>com.beecode.inz.common.scene.CommonAllScene</javaImplement>
<defaultExecute></defaultExecute>
<hide></hide>
</innerScene>
<innerScene title='已废弃'>
<id>dd174342-9395-4f2c-972f-71841ed302fb</id>
<javaImplement>com.beecode.inz.common.scene.DefaultDiscardScene</javaImplement>
<defaultExecute></defaultExecute>
<hide></hide>
</innerScene>
<field title='id'>
<name>id</name>
<type>uuid</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='项目ID'>
<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.projectNum</name>
<type>string</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='项目名称'>
<name>project.projectName</name>
<type>string</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='区域公司ID'>
<name>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></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>
<description></description>
</field>
<field title='合同'>
<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>carInfo</name>
<type>string</type>
<description></description>
</field>
<field title='备注'>
<name>memo</name>
<type>string</type>
<description></description>
</field>
<field title='车辆行驶证'>
<name>attId</name>
<type>uuid</type>
<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>
</customQuery>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/auth/SelfPickupCarEdit.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>410b14b9-100b-4781-9ea1-ac4c12dba983</id>
<name>com.xyst.dinas.contract.auth.SelfPickupCarEdit</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.contract/src/main/resources/com/xyst/dinas/contract/auth/SelfPickupCarList.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>539a53f0-fd0c-45f5-a15a-f8e7d9dacfe5</id>
<name>com.xyst.dinas.contract.auth.SelfPickupCarList</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.contract/src/main/resources/com/xyst/dinas/contract/bill/SelfPickupCarBill$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>4e0d5546-fda2-4c83-ba4c-91d784f4e98b</id>
<name>com.xyst.dinas.contract.bill.SelfPickupCarBill$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.contract/src/main/resources/com/xyst/dinas/contract/bill/SelfPickupCarBill$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>adb7369d-2957-421c-b172-b00bd16150db</id>
<name>com.xyst.dinas.contract.bill.SelfPickupCarBill$serial</name>
<title>自提车辆单据$serial</title>
<description>自提车辆单据</description>
<define>bcp.serial</define>
<define-version>1.0</define-version>
<dependency>com.xyst.dinas.contract.bill.SelfPickupCarBill$sequence</dependency>
<dependency>com.xyst.dinas.contract.datamodel.SelfPickupCar</dependency>
<content>
<m:serial>
<m:input>com.xyst.dinas.contract.datamodel.SelfPickupCar</m:input>
<m:functionLibrarys/>
<m:segments>
<m:literal>
<m:value>SPC</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.contract.bill.SelfPickupCarBill$serial</m:key>
<m:sequenceName>com.xyst.dinas.contract.bill.SelfPickupCarBill$sequence</m:sequenceName>
</m:sequence>
</m:segments>
</m:serial>
</content>
</metadata>
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/bill/SelfPickupCarBill.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>536cdb2b-49be-46db-99c7-0aadb41077fc</id>
<name>com.xyst.dinas.contract.bill.SelfPickupCarBill</name>
<title>自提车辆单据</title>
<description>自提车辆单据</description>
<define>bcp.biz.Biztype</define>
<define-version>1.0</define-version>
<dependency>com.xyst.dinas.contract.bill.SelfPickupCarBill$serial</dependency>
<dependency>com.beecode.bap.biztrait.BasicBillBiztrait</dependency>
<dependency>com.xyst.dinas.contract.datamodel.SelfPickupCar</dependency>
<content>
<m:biztype>
<m:type>com.xyst.dinas.contract.datamodel.SelfPickupCar</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.contract.bill.SelfPickupCarBill$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.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.contract/src/main/resources/com/xyst/dinas/contract/datamodel/SelfPickupCar.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>92e87a62-f2e0-4374-9e9b-7a700ed775a9</id>
<name>com.xyst.dinas.contract.datamodel.SelfPickupCar</name>
<title>自提车辆表</title>
<description>自提车辆表</description>
<define>bcp.type.Class</define>
<define-version>1.0</define-version>
<dependency>com.xyst.dinas.biz.datamodel.xystOrganization</dependency>
<dependency>com.xyst.dinas.project.datamodel.PurchaseSandCompany</dependency>
<dependency>bcp.type.constraint.StringLength</dependency>
<dependency>com.beecode.inz.common.datamodel.BaseInfo</dependency>
<dependency>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</dependency>
<dependency>com.xyst.dinas.project.datamodel.ProjectFiled</dependency>
<dependency>com.xyst.dinas.contract.datamodel.Contract</dependency>
<content>
<m:class>
<m: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>fbfd1335-5f18-4bd3-98ca-2c63afe97827</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:annotations>
<m:id>9ea6f374-f043-45d1-ab78-64d4b1ed7a05</m:id>
<m:name>projectCode</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:id>f6b523af-1eeb-4c3b-b644-c51866087f60</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>bcp.type.constraint.StringLength</m:type>
<m:value>50</m:value>
</m:annotation>
</m:annotations>
<m:id>afc7f528-d6d1-491d-b867-e4824a8513c3</m:id>
<m:name>regionalCompanyName</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:id>b201aec2-36b7-4dda-880d-36dcc6173796</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>bcp.type.constraint.StringLength</m:type>
<m:value>50</m:value>
</m:annotation>
</m:annotations>
<m:id>694805bd-715a-4a5c-9b90-6f4400ef39f1</m:id>
<m:name>purchaseSandUnitName</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:id>a518f765-df1d-4670-a423-5c896149548e</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>bcp.type.constraint.StringLength</m:type>
<m:value>50</m:value>
</m:annotation>
</m:annotations>
<m:id>beefd5f9-a611-44aa-aeaa-f8992c4aeaee</m:id>
<m:name>contractName</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:annotations>
<m:id>e907a0e2-140e-4a12-974b-293b42bfcb19</m:id>
<m:name>contractCode</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>800</m:value>
</m:annotation>
</m:annotations>
<m:id>8a23beaa-9ae0-4ade-a096-5dfa5a30ff8e</m:id>
<m:name>carInfo</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>500</m:value>
</m:annotation>
</m:annotations>
<m:id>dd07132e-8ba0-4615-81c2-6f92ccb6df6d</m:id>
<m:name>memo</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:id>6b43184e-b4c6-4b87-b3ec-91adcb84d68d</m:id>
<m:name>attId</m:name>
<m:title>车辆行驶证</m:title>
<m:type>uuid</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
</m:attributes>
</m:class>
</content>
</metadata>
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/query/SelfPickupCar.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>09777c08-5e47-40aa-995e-a8b13658caa1</id>
<name>com.xyst.dinas.contract.query.SelfPickupCar</name>
<title>自提车辆</title>
<define>inz.query.Query</define>
<define-version>1.0</define-version>
<dependency>com.xyst.dinas.contract.datamodel.SelfPickupCar</dependency>
<content>
<m:query>
<m:type>com.xyst.dinas.contract.datamodel.SelfPickupCar</m:type>
<m:dataProcessor></m:dataProcessor>
<m:authorityItem></m:authorityItem>
<m:innerScenes>
<m:innerScene>
<m:id>9f7042a8-8a24-40a7-9d29-7224e16822ab</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>f6ed7c06-e53b-4891-be6a-6ab4d8ab123b</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>3e6943cf-022c-42cb-bd3d-1b878065f4e2</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>project.id</m:name>
<m:title>项目ID</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.projectNum</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.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>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></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></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>contract.id</m:name>
<m:title>合同</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>carInfo</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>memo</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>attId</m:name>
<m:title>车辆行驶证</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>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:fields>
</m:query>
</content>
</metadata>
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/query/SelfPickupCarNoAuthFilterScene.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>9e608aff-d801-4d21-83bd-77c650f06d66</id>
<name>com.xyst.dinas.contract.query.SelfPickupCarNoAuthFilterScene</name>
<title>自提车辆</title>
<define>inz.query.Query</define>
<define-version>1.0</define-version>
<dependency>com.xyst.dinas.contract.datamodel.SelfPickupCar</dependency>
<content>
<m:query>
<m:type>com.xyst.dinas.contract.datamodel.SelfPickupCar</m:type>
<m:dataProcessor></m:dataProcessor>
<m:authorityItem></m:authorityItem>
<m:innerScenes>
<m:innerScene>
<m:id>aa22e7aa-741a-4a19-aee8-09ed1315c575</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>dd174342-9395-4f2c-972f-71841ed302fb</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: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>project.id</m:name>
<m:title>项目ID</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.projectNum</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.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>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></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></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>contract.id</m:name>
<m:title>合同</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>carInfo</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>memo</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>attId</m:name>
<m:title>车辆行驶证</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>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:fields>
</m:query>
</content>
</metadata>
backend/xyst.dinas.contract/src/main/resources/config/SelfPickupCar.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.contract.datamodel.SelfPickupCar" table="xyst_dinas_contract_self_pickup_car" 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="uuid2" />
</id>
<version name="version" type="int" column="version"/>
<property name="createTime" type="timestamp" not-null="false">
<column name="create_time"></column>
</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"></column>
</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"></column>
</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"></column>
</property>
<property name="discard" type="boolean" not-null="false">
<column name="discard"></column>
</property>
<property name="del" type="boolean" not-null="false">
<column name="del"></column>
</property>
<property name="approveState" type="integer" not-null="false">
<column name="approve_state"></column>
</property>
<many-to-one name="project" entity-name="com.xyst.dinas.project.datamodel.ProjectFiled" fetch="select">
<column name="project_id" not-null="false"/>
</many-to-one>
<property name="projectCode" type="nstring" not-null="false">
<column name="project_code" length="50"></column>
</property>
<many-to-one name="regionalCompany" entity-name="com.xyst.dinas.biz.datamodel.xystOrganization" fetch="select">
<column name="regional_company_id" not-null="false"/>
</many-to-one>
<property name="regionalCompanyName" type="nstring" not-null="false">
<column name="regional_company_name" length="50"></column>
</property>
<many-to-one name="purchaseSandUnit" entity-name="com.xyst.dinas.project.datamodel.PurchaseSandCompany" fetch="select">
<column name="purchase_sand_unit_id" not-null="false"/>
</many-to-one>
<property name="purchaseSandUnitName" type="nstring" not-null="false">
<column name="purchase_sand_unit_name" length="50"></column>
</property>
<many-to-one name="contract" entity-name="com.xyst.dinas.contract.datamodel.Contract" fetch="select">
<column name="contract_id" not-null="false"/>
</many-to-one>
<property name="contractName" type="nstring" not-null="false">
<column name="contract_name" length="50"></column>
</property>
<property name="contractCode" type="nstring" not-null="false">
<column name="contract_code" length="50"></column>
</property>
<property name="carInfo" type="nstring" not-null="false">
<column name="car_info" length="800"></column>
</property>
<property name="memo" type="nstring" not-null="false">
<column name="memo" length="500"></column>
</property>
<property name="attId" type="uuid-binary" not-null="false" length="16">
<column name="att_id" not-null="false"></column>
</property>
</class>
</hibernate-mapping>
\ No newline at end of file
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.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/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>
......
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