Skip to content

C
cloud-fb
Commit f653b6ec by yanHeng
Options

[修改] 运船量方 功能

parent 0a83ab84
Showing with 58 additions and 68 deletions
backend/inz.basis/src/main/resources/com/beecode/inz/portal/functiontree/DefaultFunctionTree.jmx
......@@ -540,6 +540,19 @@
<m:icon>iconfont iconkucunchaxun1x</m:icon>
</m:function-node>
<m:function-node>
<m:id>da8500bb-45de-4866-9489-aee643a410a0</m:id>
<m:name>ship_quantity</m:name>
<m:title>运船量方</m:title>
<m:index>1300</m:index>
<m:license></m:license>
<m:privilege></m:privilege>
<m:function-definition>
<m:view>function-ship_quantity</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:icon>iconfont iconyunchuanliangfang1x</m:icon>
</m:function-node>
<m:function-node>
<m:id>26783a66-bf30-42d5-af91-1aa7fcab1654</m:id>
<m:name>vehicle_amount_party</m:name>
<m:title>车辆量方</m:title>
......
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/service/ShipQuantityServiceImpl.java
......@@ -63,9 +63,7 @@ public class ShipQuantityServiceImpl implements ShipQuantityService {
UUID purchaseSandUnitId = kObject.get("purchaseSandUnit").getUuid("id");
UUID contractId = kObject.get("contract").getUuid("id");
UUID dinasTypeId = kObject.get("dinasType").getUuid("id");
UUID transportShipId = kObject.get("transportShip").getUuid("id");
KObject contract = contractDao.load(contractId);
kObject.set("transportShip", shipInfoDao.load(transportShipId));
kObject.set("contract", contract);
kObject.set("project", projectFiledDao.load(projectId));
kObject.set("purchaseSandUnit", purchaseSandCompanyDao.load(purchaseSandUnitId));
......
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/web/ShipQuantityController.java
......@@ -40,20 +40,20 @@ public class ShipQuantityController {
KObject kobject = JSONObjectUtils.toObject(body, Amino.getApplicationMetadataContext().getBean(ShipQuantityConstant.ENTITY, KClass.class));
//判空校验
if (null == kobject.get("project").get("id")) {
if (null == kobject.get("project").getUuid("id")) {
return ResponseObj.error(400, "请选择具体的项目");
}
if (null == kobject.get("purchaseSandUnit").get("id")) {
if (null == kobject.get("purchaseSandUnit").getUuid("id")) {
return ResponseObj.error(400, "请选择具体的购砂单位");
}
if (null == kobject.get("contract").get("id")) {
if (null == kobject.get("contract").getUuid("id")) {
return ResponseObj.error(400, "请选择具体的合同");
}
if (null == kobject.get("dinasType").get("id")) {
if (null == kobject.get("dinasType").getUuid("id")) {
return ResponseObj.error(400, "请选择具体的砂石类型");
}
if (null == kobject.get("transportShip").get("id")) {
return ResponseObj.error(400, "请选择具体的运砂船");
if (null == kobject.get("transportShipName")) {
return ResponseObj.error(400, "运砂船不能为空");
}
if (null == kobject.get("dealTime")) {
......@@ -91,7 +91,6 @@ public class ShipQuantityController {
return ResponseObj.error(400, "预付款余额不足，请先联系客户进行充值操作");
}
if (kobject.getUuid(BaseConstants.ID) == null) {
return ResponseObj.error(400, "'id' must be not null!");
}
......
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/ShipQuantityCard.mk
......@@ -8,6 +8,6 @@
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='7d23b8b6-829d-4f9a-b699-52a876192685' category='销售/车辆量方（区域公司）' seq='4'></privilege>
<privilege type='TOKEN' target-type='' id='7d23b8b6-829d-4f9a-b699-52a876192685' category='销售/运船量方（区域公司）' seq='4'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/ShipQuantityCoefficient.mk
......@@ -8,6 +8,6 @@
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='8b67e91f-5a3e-4e83-b0aa-1527ab9bfad8' category='销售/车辆量方（区域公司）' seq='1'></privilege>
<privilege type='TOKEN' target-type='' id='8b67e91f-5a3e-4e83-b0aa-1527ab9bfad8' category='销售/运船量方（区域公司）' seq='1'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/ShipQuantityCreate.mk
......@@ -8,6 +8,6 @@
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='6a78ea5e-a620-45ec-a297-762269f047e3' category='销售/车辆量方（区域公司）' seq='3'></privilege>
<privilege type='TOKEN' target-type='' id='6a78ea5e-a620-45ec-a297-762269f047e3' category='销售/运船量方（区域公司）' seq='3'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/ShipQuantityDelete.mk
......@@ -8,6 +8,6 @@
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='418f297a-6e00-4c39-9306-b4872410bc30' category='销售/车辆量方（区域公司）' seq='5'></privilege>
<privilege type='TOKEN' target-type='' id='418f297a-6e00-4c39-9306-b4872410bc30' category='销售/运船量方（区域公司）' seq='5'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/ShipQuantityList.mk
......@@ -8,6 +8,6 @@
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='deb57acd-6d99-4d85-944b-d857cd509d07' category='销售/车辆量方（区域公司）' seq='2'></privilege>
<privilege type='TOKEN' target-type='' id='deb57acd-6d99-4d85-944b-d857cd509d07' category='销售/运船量方（区域公司）' seq='2'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/ShipQuantityPrice.mk
......@@ -8,6 +8,6 @@
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='22357852-7323-4b8f-abca-e0638ea0f8fa' category='销售/车辆量方（区域公司）' seq='0'></privilege>
<privilege type='TOKEN' target-type='' id='22357852-7323-4b8f-abca-e0638ea0f8fa' category='销售/运船量方（区域公司）' seq='0'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/datamodel/ShipQuantity.mk
......@@ -32,9 +32,9 @@
<annotation id='8f2cfde0-eb76-4da9-ace1-dfc550fdf72b' attributeId='8258fb3b-a4c7-4cd2-b6bc-1b3ad8b42b3b' name='length' value='undefined'></annotation>
<annotation id='fdc39c46-ab51-4a55-8a6f-a6ee32b8980a' attributeId='1ef4d20c-2b03-49bb-b2b8-a169470a39b0' name='mappingType' value='many-to-one'></annotation>
</attribute>
<attribute id='ede9a1dc-8cec-4978-96aa-602873d48f09' name='transportShip' columnName='transport_ship_id' title='运砂船' type='com.xyst.dinas.biz.datamodel.ShipInfo' default='' precision='' isArray='false'>
<annotation id='42b07dc1-1859-4522-97ab-a821eda11c0f' attributeId='5c4d5239-8b7b-4078-84a4-292058e53a67' name='length' value='undefined'></annotation>
<annotation id='6cebbeb2-2f53-4b2d-beea-451ceb076044' attributeId='1c475f1a-9029-46e1-b681-c936f6856bdb' name='mappingType' value='many-to-one'></annotation>
<attribute id='ede9a1dc-8cec-4978-96aa-602873d48f09' name='transportShipName' columnName='transport_ship_Name' title='运砂船' type='string' default='' precision='' isArray='false'>
<annotation id='42b07dc1-1859-4522-97ab-a821eda11c0f' attributeId='6cebbeb2-2f53-4b2d-beea-451ceb076044' name='length' value='50'/>
</attribute>
<attribute id='d18c33cf-39bf-4220-bff7-5428a68a5142' name='dinasType' columnName='dinas_type_id' title='砂石类型' type='com.xyst.dinas.biz.datamodel.DinasType' default='' precision='' isArray='false'>
<annotation id='7c09730e-4da9-45c6-9cbb-b37c22b88bbe' attributeId='90ab8c99-6c83-4a68-9e0f-e6bb303566af' name='length' value='undefined'></annotation>
......
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/query/ShipQuantity.mk
......@@ -112,22 +112,9 @@
</ref>
<description></description>
</field>
<field title='运砂船id'>
<name>transportShip.id</name>
<type>uuid</type>
<ref>
<type></type>
<name>com.xyst.dinas.biz.datamodel.ShipInfo</name>
</ref>
<description></description>
</field>
<field title='运砂船名称'>
<name>transportShip.shipName</name>
<field title='运砂船'>
<name>transportShipName</name>
<type>string</type>
<ref>
<type></type>
<name>com.xyst.dinas.biz.datamodel.ShipInfo</name>
</ref>
<description></description>
</field>
<field title='砂石种类id'>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/ShipQuantityCard.jmx
......@@ -9,7 +9,7 @@
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>销售/车辆量方（区域公司）</m:category>
<m:category>销售/运船量方（区域公司）</m:category>
<m:seq>4</m:seq>
</m:privilege>
</content>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/ShipQuantityCoefficient.jmx
......@@ -9,7 +9,7 @@
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>销售/车辆量方（区域公司）</m:category>
<m:category>销售/运船量方（区域公司）</m:category>
<m:seq>1</m:seq>
</m:privilege>
</content>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/ShipQuantityCreate.jmx
......@@ -9,7 +9,7 @@
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>销售/车辆量方（区域公司）</m:category>
<m:category>销售/运船量方（区域公司）</m:category>
<m:seq>3</m:seq>
</m:privilege>
</content>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/ShipQuantityDelete.jmx
......@@ -9,7 +9,7 @@
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>销售/车辆量方（区域公司）</m:category>
<m:category>销售/运船量方（区域公司）</m:category>
<m:seq>5</m:seq>
</m:privilege>
</content>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/ShipQuantityList.jmx
......@@ -9,7 +9,7 @@
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>销售/车辆量方（区域公司）</m:category>
<m:category>销售/运船量方（区域公司）</m:category>
<m:seq>2</m:seq>
</m:privilege>
</content>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/ShipQuantityPrice.jmx
......@@ -9,7 +9,7 @@
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>销售/车辆量方（区域公司）</m:category>
<m:category>销售/运船量方（区域公司）</m:category>
<m:seq>0</m:seq>
</m:privilege>
</content>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/ShipQuantity$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>4e49c978-43a5-4c04-b2f2-91698e44c5d6</id>
<id>b77e29a3-4adb-44b0-abd0-aff3fce97110</id>
<name>com.xyst.dinas.sales.bill.ShipQuantity$sequence</name>
<title>运船量方$sequence</title>
<description>运船量方</description>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/ShipQuantity$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>c5ccc513-61cf-4239-8736-41a48e85c9ef</id>
<id>a15e721b-043b-49f8-83b5-8591003b195d</id>
<name>com.xyst.dinas.sales.bill.ShipQuantity$serial</name>
<title>运船量方$serial</title>
<description>运船量方</description>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/ShipQuantity.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>677f5674-905d-4449-b01d-349cd8df45fa</id>
<id>e97b46ec-daf5-4d26-b5b0-e9ef80af4975</id>
<name>com.xyst.dinas.sales.bill.ShipQuantity</name>
<title>运船量方</title>
<description>运船量方</description>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/datamodel/ShipQuantity.jmx
......@@ -8,7 +8,7 @@
<define>bcp.type.Class</define>
<define-version>1.0</define-version>
<dependency>javax.persistence.Entity</dependency>
<dependency>com.xyst.dinas.biz.datamodel.ShipInfo</dependency>
<dependency>bcp.type.constraint.StringLength</dependency>
<dependency>javax.persistence.ManyToOne</dependency>
<dependency>com.beecode.inz.common.datamodel.BaseInfo</dependency>
<dependency>com.xyst.dinas.biz.datamodel.DinasType</dependency>
......@@ -150,26 +150,23 @@
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>javax.persistence.ManyToOne</m:type>
<m:type>bcp.type.constraint.StringLength</m:type>
<m:value>50</m:value>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.JoinColumn</m:type>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>transport_ship_id</m:value>
</m:property>
<m:property>
<m:key>referencedColumnName</m:key>
<m:value>ID</m:value>
<m:value>transport_ship_Name</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>ede9a1dc-8cec-4978-96aa-602873d48f09</m:id>
<m:name>transportShip</m:name>
<m:name>transportShipName</m:name>
<m:title>运砂船</m:title>
<m:type>com.xyst.dinas.biz.datamodel.ShipInfo</m:type>
<m:type>string</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/query/ShipQuantity.jmx
......@@ -137,21 +137,11 @@
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>transportShip.id</m:name>
<m:title>运砂船id</m:title>
<m:type>uuid</m:type>
<m:ref>
<m:name>com.xyst.dinas.biz.datamodel.ShipInfo</m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>transportShip.shipName</m:name>
<m:title>运砂船名称</m:title>
<m:name>transportShipName</m:name>
<m:title>运砂船</m:title>
<m:type>string</m:type>
<m:ref>
<m:name>com.xyst.dinas.biz.datamodel.ShipInfo</m:name>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
......
backend/xyst.dinas.sales/src/main/resources/config/ShipQuantity.hbm.xml
......@@ -61,11 +61,11 @@
<comment>所属项目</comment>
</column>
</many-to-one>
<many-to-one name="transportShip" entity-name="com.xyst.dinas.biz.datamodel.ShipInfo" fetch="select">
<column name="transport_ship_id" not-null="false">
<property name="transportShipName" type="nstring" not-null="false">
<column name="transport_ship_name">
<comment>运砂船</comment>
</column>
</many-to-one>
</property>
<many-to-one name="dinasType" entity-name="com.xyst.dinas.biz.datamodel.DinasType" fetch="select">
<column name="dinas_type_id" not-null="false">
<comment>砂石类型</comment>
......
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