igds-core/src/main/java/com/ld/igds/models/Building.java
@@ -36,6 +36,10 @@ @PropertyDef(label = "组织编码") private String companyId; @Column(name = "gbm", length = 50) @PropertyDef(label = "廒间国别码") private String gbm; @Column(name = "DEPT_ID_", length = 40) @PropertyDef(label = "所属库点") private String deptId; igds-inout/src/main/java/com/ld/igds/m/service/HInoutCustomerService.java
@@ -6,6 +6,7 @@ import org.apache.commons.lang3.StringUtils; import org.hibernate.Session; import org.springframework.stereotype.Component; import javax.transaction.Transactional; import java.util.HashMap; import java.util.List; @@ -76,7 +77,7 @@ data.setId(customerId); session.save(data); } else { session.update(data); session.saveOrUpdate(data); } } finally { session.flush(); @@ -87,6 +88,7 @@ /** * 获取客户编码 * * @param companyId * @return */ igds-inout/src/main/java/com/ld/igds/m/service/HPlanManageService.java
@@ -69,7 +69,16 @@ this.pagingQuery(page, hql, count, args); } public List<InoutPlan> listPlan() { String hql = " from " + InoutPlan.class.getName() + " where companyId =:companyId and deptId =:deptId"; Map<String, Object> args = new HashMap<String, Object>(); args.put("companyId", ContextUtil.getCompanyId()); args.put("deptId", ContextUtil.subDeptId(null)); return this.query(hql, args); } public List<InoutPlanDetail> listPlanDetail(String planId) {
@@ -107,6 +107,11 @@ <PropertyDef name="customerBank"> <Property></Property> <Property name="label">客户开户行</Property> <Property name="mapping"> <Property name="keyProperty">code</Property> <Property name="valueProperty">name</Property> <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("KHKHH")}</Property> </Property> </PropertyDef> <PropertyDef name="customerBankAccount"> <Property></Property> @@ -119,6 +124,11 @@ <PropertyDef name="bank"> <Property></Property> <Property name="label">本方开户行</Property> <Property name="mapping"> <Property name="keyProperty">code</Property> <Property name="valueProperty">name</Property> <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("KHKHH")}</Property> </Property> </PropertyDef> <PropertyDef name="bankAccount"> <Property></Property> @@ -378,7 +388,7 @@ if(price && contactAmount){
 
 //计算倒入数量
 var money = price*contactAmount;
 var money = price*contactAmount/1000;
 curData.set("money",money); 
 }
 };</ClientEvent> igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticeIn.view.xml
@@ -22,6 +22,11 @@ <Property></Property> <Property name="label">所属计划</Property> <Property name="required">false</Property> <Property name="mapping"> <Property name="keyProperty">id</Property> <Property name="valueProperty">name</Property> <Property name="mapValues">${dorado.getDataProvider("planManagePR#listPlan").getResult()}</Property> </Property> </PropertyDef> <PropertyDef name="planName"> <Property></Property> @@ -715,8 +720,8 @@ <Editor/> </AutoFormElement> <AutoFormElement> <Property name="name">planName</Property> <Property name="property">planName</Property> <Property name="name">planId</Property> <Property name="property">planId</Property> <Property name="trigger">ddPlan</Property> <Editor/> </AutoFormElement> @@ -876,7 +881,7 @@ <DataSet id="dsPlan"> <Property name="dataProvider">planManagePR#pagePlan</Property> <Property name="dataType">[dtPlan]</Property> <Property name="parameter"/> <Property name="parameter"></Property> <Property name="pageSize">5</Property> </DataSet> <Container layout="hbox regionPadding:5"> @@ -952,7 +957,7 @@ <DataSet id="dsContract"> <Property name="dataProvider">contractManagePR#pageContract</Property> <Property name="dataType">[dtContract]</Property> <Property name="parameter"/> <Property name="parameter"></Property> <Property name="pageSize">5</Property> </DataSet> <Container layout="hbox regionPadding:5"> igds-inout/src/main/java/com/ld/igds/m/view/PlanManage01.view.xml
@@ -529,21 +529,6 @@ <Property name="align">center</Property> <Property name="name">planNum</Property> </DataColumn> <DataColumn> <Property name="property">price</Property> <Property name="align">center</Property> <Property name="name">price</Property> </DataColumn> <DataColumn> <Property name="property">total</Property> <Property name="align">center</Property> <Property name="name">total</Property> </DataColumn> <DataColumn> <Property name="property">createTime</Property> <Property name="align">center</Property> <Property name="name">createTime</Property> </DataColumn> </DataGrid> </Children> <Tools/> igds-inout/src/main/java/com/ld/igds/m/view/PlanManage02.view.xml
@@ -529,21 +529,6 @@ <Property name="align">center</Property> <Property name="name">planNum</Property> </DataColumn> <DataColumn> <Property name="property">price</Property> <Property name="align">center</Property> <Property name="name">price</Property> </DataColumn> <DataColumn> <Property name="property">total</Property> <Property name="align">center</Property> <Property name="name">total</Property> </DataColumn> <DataColumn> <Property name="property">createTime</Property> <Property name="align">center</Property> <Property name="name">createTime</Property> </DataColumn> </DataGrid> </Children> <Tools/> igds-inout/src/main/java/com/ld/igds/m/view/PlanManage03.view.xml
@@ -529,21 +529,6 @@ <Property name="align">center</Property> <Property name="name">planNum</Property> </DataColumn> <DataColumn> <Property name="property">price</Property> <Property name="align">center</Property> <Property name="name">price</Property> </DataColumn> <DataColumn> <Property name="property">total</Property> <Property name="align">center</Property> <Property name="name">total</Property> </DataColumn> <DataColumn> <Property name="property">createTime</Property> <Property name="align">center</Property> <Property name="name">createTime</Property> </DataColumn> </DataGrid> </Children> <Tools/> igds-inout/src/main/java/com/ld/igds/m/view/PlanManage04.view.xml
@@ -529,21 +529,6 @@ <Property name="align">center</Property> <Property name="name">planNum</Property> </DataColumn> <DataColumn> <Property name="property">price</Property> <Property name="align">center</Property> <Property name="name">price</Property> </DataColumn> <DataColumn> <Property name="property">total</Property> <Property name="align">center</Property> <Property name="name">total</Property> </DataColumn> <DataColumn> <Property name="property">createTime</Property> <Property name="align">center</Property> <Property name="name">createTime</Property> </DataColumn> </DataGrid> </Children> <Tools/> igds-inout/src/main/java/com/ld/igds/m/view/PlanManagePR.java
@@ -25,7 +25,6 @@ * 综合业务-计划管理 * * @author: chen * */ @Component public class PlanManagePR { @@ -135,6 +134,19 @@ /** * 获取计划详细列表 * planManagePR#listPlan * * @param * @return */ @DataProvider public List<InoutPlan> listPlan() { return service.listPlan(); } /** * 获取计划详细列表 * planManagePR#listPlanDetail * * @param planId
