From 44804e145dfd07f2537684a4358682774331cdaf Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期二, 25 七月 2023 17:44:16 +0800
Subject: [PATCH] 计划及合同相关优化
---
igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml | 26 +
igds-inout/src/main/java/com/ld/igds/m/view/ContractManage.view.xml | 106 +++++-
igds-inout/src/main/java/com/ld/igds/m/InoutManageUtil.java | 8
igds-inout/src/main/java/com/ld/igds/m/service/HPlanManageService.java | 2
igds-inout/src/main/java/com/ld/igds/m/view/ContractManagePR.java | 226 +++++++------
igds-inout/src/main/java/com/ld/igds/m/view/PlanManage.view.xml | 624 ++++++++++++++++++++++++++++++++++++
igds-inout/src/main/java/com/ld/igds/m/view/PlanManagePR.java | 2
7 files changed, 864 insertions(+), 130 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml b/igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml
index 1eca900..d1c8478 100644
--- a/igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml
+++ b/igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml
@@ -140,11 +140,11 @@
<Property name="label">鍏ュ簱鏃ユ湡</Property>
</PropertyDef>
<PropertyDef name="unit">
- <Property/>
+ <Property></Property>
<Property name="label">妫�楠屽崟浣�</Property>
</PropertyDef>
<PropertyDef name="zblb">
- <Property/>
+ <Property></Property>
<Property name="label">鎸囨爣绫诲埆</Property>
</PropertyDef>
<PropertyDef name="qfrq">
@@ -156,19 +156,19 @@
<Property name="label">鎶ュ憡鍑哄叿鏃堕棿</Property>
</PropertyDef>
<PropertyDef name="shrxm">
- <Property/>
+ <Property></Property>
<Property name="label">瀹℃牳浜哄鍚�</Property>
</PropertyDef>
<PropertyDef name="qydbh">
- <Property/>
+ <Property></Property>
<Property name="label">鎵︽牱鍗曠紪鍙�</Property>
</PropertyDef>
<PropertyDef name="jdrxm">
- <Property/>
+ <Property></Property>
<Property name="label">鐩戠潱浜哄鍚�</Property>
</PropertyDef>
<PropertyDef name="ypbh">
- <Property/>
+ <Property></Property>
<Property name="label">鏍峰搧缂栧彿</Property>
</PropertyDef>
<PropertyDef name="updateTime">
@@ -674,6 +674,20 @@
</DataPilot>
</Container>
<Dialog id="dialogMain">
+ <ClientEvent name="beforeShow">var data = view.get("#dsMain.data:#")
+var metricsBefore = data.get("zblb")
+if(metricsBefore){
+ var list = metricsBefore.split("#");
+ var metrics ="" ;
+ list.forEach(item=>{
+ if(item == 1)metrics+="1:璐ㄩ噺鎸囨爣妫�楠�#";
+ if(item == 2)metrics+="2:鍌ㄥ瓨鍝佽川妫�楠�#";
+ if(item == 3)metrics+="3:椋熷搧瀹夊叏妫�楠�#";
+ console.log(item)
+ console.log(metrics) 
+ });
+ data.set("zblb", metrics.substring(0,metrics.length-1));
+}</ClientEvent>
<Property name="visible">false</Property>
<Property name="caption">璐ㄩ噺宸℃淇℃伅</Property>
<Property name="width">80%</Property>
diff --git a/igds-inout/src/main/java/com/ld/igds/m/InoutManageUtil.java b/igds-inout/src/main/java/com/ld/igds/m/InoutManageUtil.java
index 018e9fe..de2ae06 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/InoutManageUtil.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/InoutManageUtil.java
@@ -74,6 +74,14 @@
*/
public static final String CUSTOMER_TYPE_2 = "2";
/**
+ * 缁撶畻涓庡悎鍚屼竴鑷存�� - 绗﹀悎
+ */
+ public static final String CONSISTENCY_1 = "1";
+ /**
+ * 缁撶畻涓庡悎鍚屼竴鑷存�� - 涓嶇鍚�
+ */
+ public static final String CONSISTENCY_2 = "2";
+ /**
* 缂撳瓨-鎬ц川杞彉ID
*/
public static final String CACHE_STOCK_ID = "STOCK_ID";
diff --git a/igds-inout/src/main/java/com/ld/igds/m/service/HPlanManageService.java b/igds-inout/src/main/java/com/ld/igds/m/service/HPlanManageService.java
index 373da1e..a72adf1 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/service/HPlanManageService.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/service/HPlanManageService.java
@@ -166,10 +166,12 @@
return;
for (InoutPlanDetail planDetail : details) {
if (null == planDetail.getId()) {
+ planDetail.setUpdateTime(new Date());
planDetail.setPlanId(planId);
planDetail.setId(ContextUtil.getUUID());
session.save(planDetail);
} else {
+ planDetail.setUpdateTime(new Date());
session.update(planDetail);
}
}
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/ContractManage.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/ContractManage.view.xml
index 57fc926..6932e76 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/ContractManage.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/ContractManage.view.xml
@@ -132,10 +132,12 @@
<Property name="valueProperty">name</Property>
<Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("KHKHH")}</Property>
</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="bankAccount">
<Property></Property>
<Property name="label">鏈柟寮�鎴疯璐﹀彿</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="signUser">
<Property></Property>
@@ -258,22 +260,32 @@
<PropertyDef name="lybzj">
<Property name="dataType">Double</Property>
<Property name="label">灞ョ害淇濊瘉閲�</Property>
+ <Property name="displayFormat">#,###0.00 鍏�</Property>
</PropertyDef>
<PropertyDef name="lyl">
<Property name="dataType">Double</Property>
<Property name="label">灞ョ害鐜�</Property>
+ <Property name="displayFormat"> ##.00%</Property>
</PropertyDef>
<PropertyDef name="jsjg">
<Property name="dataType">Double</Property>
- <Property name="label">缁撶畻浠锋牸锛屽厓/鍚�</Property>
+ <Property name="label">缁撶畻浠锋牸</Property>
+ <Property name="displayFormat">#,###0.000 鍏�/鍚�</Property>
</PropertyDef>
<PropertyDef name="jszje">
<Property name="dataType">Double</Property>
<Property name="label">缁撶畻鎬婚噾棰�</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="displayFormat">#,###0.00 鍏�</Property>
</PropertyDef>
<PropertyDef name="jsyhtyzx">
<Property></Property>
<Property name="label">缁撶畻涓庡悎鍚屼竴鑷存��</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("contractManagePR#triggerConsistency").getResult()}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
</PropertyDef>
<PropertyDef name="jsyhtbyzyy">
<Property></Property>
@@ -286,18 +298,16 @@
<PropertyDef name="auditDate">
<Property></Property>
<Property name="label">瀹℃壒鏃堕棿</Property>
+ <Property name="dataType">Date</Property>
</PropertyDef>
<PropertyDef name="auditStatus">
<Property></Property>
<Property name="label">瀹℃壒鐘舵��</Property>
</PropertyDef>
- <PropertyDef name="wcrq">
- <Property name="dataType">Date</Property>
- <Property name="label">瀹屾垚鏃堕棿</Property>
- </PropertyDef>
<PropertyDef name="updateTime">
<Property name="dataType">Date</Property>
<Property name="label">鏇存柊鏃堕棿</Property>
+ <Property name="readOnly">true</Property>
</PropertyDef>
<PropertyDef name="hqzz">
<Property></Property>
@@ -394,16 +404,22 @@
<ClientEvent name="onCreate">//鑷姩璁＄畻
countMoney = function(){
var curData = view.get("#dsMain.data:#");
- 
var price = curData.get("price");
- 
var contactAmount = curData.get("contactAmount");
- 
if(price && contactAmount){
- 
//璁＄畻鍊掑叆鏁伴噺
var money = price*contactAmount/1000;
curData.set("money",money); 
+ }
+};
+countSettleMoney = function(){
+ var curData = view.get("#dsMain.data:#");
+ var price = curData.get("jsjg");
+ var completeNum = curData.get("completeNum");
+ if(price && completeNum){
+ //璁＄畻鍊掑叆鏁伴噺
+ var money = price*completeNum/1000;
+ curData.set("jszje",money); 
}
};</ClientEvent>
<Property name="packages">font-awesome,css-common</Property>
@@ -661,16 +677,6 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">completeNum</Property>
- <Property name="property">completeNum</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">payType</Property>
- <Property name="property">payType</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
<Property name="name">beginTime</Property>
<Property name="property">beginTime</Property>
<Editor/>
@@ -691,6 +697,68 @@
<Property name="trigger">ddPlan</Property>
<Editor/>
</AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">auditUser</Property>
+ <Property name="property">auditUser</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">auditDate</Property>
+ <Property name="property">auditDate</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">payType</Property>
+ <Property name="property">payType</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">lybzj</Property>
+ <Property name="property">lybzj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">relEndTime</Property>
+ <Property name="property">relEndTime</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <ClientEvent name="onBlur">countSettleMoney();</ClientEvent>
+ <Property name="name">completeNum</Property>
+ <Property name="property">completeNum</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <ClientEvent name="onBlur">countSettleMoney();</ClientEvent>
+ <Property name="name">jsjg</Property>
+ <Property name="property">jsjg</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jszje</Property>
+ <Property name="property">jszje</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">lyl</Property>
+ <Property name="property">lyl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jsyhtyzx</Property>
+ <Property name="property">jsyhtyzx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">updateTime</Property>
+ <Property name="property">updateTime</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:3">
+ <Property name="name">jsyhtbyzyy</Property>
+ <Property name="property">jsyhtbyzyy</Property>
+ <Editor/>
+ </AutoFormElement>
</AutoForm>
</Children>
</FieldSet>
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/ContractManagePR.java b/igds-inout/src/main/java/com/ld/igds/m/view/ContractManagePR.java
index 64a9d4a..47da457 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/ContractManagePR.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/ContractManagePR.java
@@ -22,125 +22,143 @@
/**
* 鍚堝悓绠＄悊
- *
- * @author:
*
+ * @author:
*/
@Component
public class ContractManagePR {
- @Autowired
- private HContractManageService service;
- @Autowired
- private SysDeptService sysDeptService;
+ @Autowired
+ private HContractManageService service;
+ @Autowired
+ private SysDeptService sysDeptService;
- /**
- * contractManagePR#getContractTitle 鑾峰彇鍚堝悓title
- *
- * @param
- * @return
- */
- @DataProvider
- public Map<String, Object> getContractTitle(Map<String, Object> param) {
- Map<String, Object> result = new HashMap<String, Object>();
- //鑾峰彇鍙傛暟涓姤琛ㄧ被鍨�
- String type = (String)param.get("type");
+ /**
+ * contractManagePR#getContractTitle 鑾峰彇鍚堝悓title
+ *
+ * @param
+ * @return
+ */
+ @DataProvider
+ public Map<String, Object> getContractTitle(Map<String, Object> param) {
+ Map<String, Object> result = new HashMap<String, Object>();
+ //鑾峰彇鍙傛暟涓姤琛ㄧ被鍨�
+ String type = (String) param.get("type");
- //璁剧疆璁″垝title
- String title = "鍚堝悓";
- if(InoutManageUtil.CONTRACT_TYPE_1.equals(type)){
- title = "閿�鍞�" + title;
- }
- if(InoutManageUtil.CONTRACT_TYPE_2.equals(type)){
- title = "閲囪喘" + title;
- }
- if(InoutManageUtil.CONTRACT_TYPE_3.equals(type)){
- title = "杞崲" + title;
- }
+ //璁剧疆璁″垝title
+ String title = "鍚堝悓";
+ if (InoutManageUtil.CONTRACT_TYPE_1.equals(type)) {
+ title = "閿�鍞�" + title;
+ }
+ if (InoutManageUtil.CONTRACT_TYPE_2.equals(type)) {
+ title = "閲囪喘" + title;
+ }
+ if (InoutManageUtil.CONTRACT_TYPE_3.equals(type)) {
+ title = "杞崲" + title;
+ }
- //鑾峰彇鍙傛暟涓垎搴撶紪鐮�
- String deptId = (String)param.get("deptId");
- if (StringUtils.isEmpty(deptId)) {
- deptId = ContextUtil.subDeptId(null);
- }
- //鑾峰彇鍒嗗簱缂栫爜瀵瑰簲鐨勫垎搴撳悕绉�
- String deptName = "";
- List<DefaultDept> defaultDepts = sysDeptService.loadUserDepts(ContextUtil.getLoginUserName());
- for (DefaultDept defaultDept : defaultDepts) {
- if(defaultDept.getId().equals(deptId)){
- deptName = defaultDept.getName();
- }
- }
+ //鑾峰彇鍙傛暟涓垎搴撶紪鐮�
+ String deptId = (String) param.get("deptId");
+ if (StringUtils.isEmpty(deptId)) {
+ deptId = ContextUtil.subDeptId(null);
+ }
+ //鑾峰彇鍒嗗簱缂栫爜瀵瑰簲鐨勫垎搴撳悕绉�
+ String deptName = "";
+ List<DefaultDept> defaultDepts = sysDeptService.loadUserDepts(ContextUtil.getLoginUserName());
+ for (DefaultDept defaultDept : defaultDepts) {
+ if (defaultDept.getId().equals(deptId)) {
+ deptName = defaultDept.getName();
+ }
+ }
- if (StringUtils.isNotEmpty(deptName)) {
- title = deptName + " - " + title;
- }
- result.put("title", title);
- return result;
- }
+ if (StringUtils.isNotEmpty(deptName)) {
+ title = deptName + " - " + title;
+ }
+ result.put("title", title);
+ return result;
+ }
- /**
- * 鍚堝悓绫诲瀷
- * ${dorado.getDataProvider("contractManagePR#triggerContractType").getResult()}
- *
- * @return
- */
- @DataProvider
- public List<DicTrigger> triggerContractType() {
- List<DicTrigger> list = new ArrayList<DicTrigger>();
- list.add(new DicTrigger(InoutManageUtil.CONTRACT_TYPE_1, "閿�鍞悎鍚�"));
- list.add(new DicTrigger(InoutManageUtil.CONTRACT_TYPE_2, "閲囪喘鍚堝悓"));
- list.add(new DicTrigger(InoutManageUtil.CONTRACT_TYPE_3, "浠ｅ偍鍚堝悓"));
+ /**
+ * 鍚堝悓绫诲瀷
+ * ${dorado.getDataProvider("contractManagePR#triggerContractType").getResult()}
+ *
+ * @return
+ */
+ @DataProvider
+ public List<DicTrigger> triggerContractType() {
+ List<DicTrigger> list = new ArrayList<DicTrigger>();
+ list.add(new DicTrigger(InoutManageUtil.CONTRACT_TYPE_1, "閿�鍞悎鍚�"));
+ list.add(new DicTrigger(InoutManageUtil.CONTRACT_TYPE_2, "閲囪喘鍚堝悓"));
+ list.add(new DicTrigger(InoutManageUtil.CONTRACT_TYPE_3, "浠ｅ偍鍚堝悓"));
- return list;
- }
+ return list;
+ }
- /**
- * 瀹㈡埛绫诲瀷
- * ${dorado.getDataProvider("contractManagePR#triggerCustomerType").getResult()}
- *
- * @return
- */
- @DataProvider
- public List<DicTrigger> triggerCustomerType() {
- List<DicTrigger> list = new ArrayList<DicTrigger>();
+ /**
+ * 瀹㈡埛绫诲瀷
+ * ${dorado.getDataProvider("contractManagePR#triggerCustomerType").getResult()}
+ *
+ * @return
+ */
+ @DataProvider
+ public List<DicTrigger> triggerCustomerType() {
+ List<DicTrigger> list = new ArrayList<DicTrigger>();
- list.add(new DicTrigger(InoutManageUtil.CUSTOMER_TYPE_1, "浼佷笟"));
- list.add(new DicTrigger(InoutManageUtil.CUSTOMER_TYPE_2, "涓汉"));
+ list.add(new DicTrigger(InoutManageUtil.CUSTOMER_TYPE_1, "浼佷笟"));
+ list.add(new DicTrigger(InoutManageUtil.CUSTOMER_TYPE_2, "涓汉"));
- return list;
- }
+ return list;
+ }
- /**
- * contractManagePR#pageContract
- * @param page
- * @param param
- * @throws Exception
- */
- @DataProvider
- public void pageContract(Page<InoutContract> page, Map<String, Object> param) throws Exception {
- if (null == param) {
- param = new HashMap<String, Object>();
- }
- service.pageContract(page, param);
- }
+ /**
+ * 涓�鑷存�х被鍨�
+ * ${dorado.getDataProvider("contractManagePR#triggerConsistency").getResult()}
+ *
+ * @return
+ */
+ @DataProvider
+ public List<DicTrigger> triggerConsistency() {
+ List<DicTrigger> list = new ArrayList<DicTrigger>();
- /**
- * contractManagePR#saveContract
- * @param data
- */
- @DataResolver
- public void saveContract(InoutContract data) {
- service.saveContract(data);
- }
+ list.add(new DicTrigger(InoutManageUtil.CONSISTENCY_1, "绗﹀悎"));
+ list.add(new DicTrigger(InoutManageUtil.CONSISTENCY_2, "涓嶇鍚�"));
- /**
- * contractManagePR#delContract
- * @param data
- * @return
- */
- @Expose
- public String delContract(InoutContract data) {
- return service.delContract(data);
- }
+ return list;
+ }
+
+ /**
+ * contractManagePR#pageContract
+ *
+ * @param page
+ * @param param
+ * @throws Exception
+ */
+ @DataProvider
+ public void pageContract(Page<InoutContract> page, Map<String, Object> param) throws Exception {
+ if (null == param) {
+ param = new HashMap<String, Object>();
+ }
+ service.pageContract(page, param);
+ }
+
+ /**
+ * contractManagePR#saveContract
+ *
+ * @param data
+ */
+ @DataResolver
+ public void saveContract(InoutContract data) {
+ service.saveContract(data);
+ }
+
+ /**
+ * contractManagePR#delContract
+ *
+ * @param data
+ * @return
+ */
+ @Expose
+ public String delContract(InoutContract data) {
+ return service.delContract(data);
+ }
}
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/PlanManage.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/PlanManage.view.xml
new file mode 100644
index 0000000..68c1cf8
--- /dev/null
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/PlanManage.view.xml
@@ -0,0 +1,624 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ViewConfig>
+ <Arguments/>
+ <Context/>
+ <Model>
+ <DataType name="dtMain">
+ <Property name="creationType">com.ld.igds.models.InoutPlan</Property>
+ <PropertyDef name="id">
+ <Property></Property>
+ <Property name="label">璁″垝缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="referenceNumber">
+ <Property name="label">璁″垝鏂囧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="companyId">
+ <Property></Property>
+ <Property name="label">缁勭粐缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="deptId">
+ <Property></Property>
+ <Property name="label">鎵�灞炲垎搴�</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("deptPR#loadParents").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="type">
+ <Property></Property>
+ <Property name="label">璁″垝绫诲瀷</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("planManagePR#triggerPlanType").getResult()}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="name">
+ <Property></Property>
+ <Property name="label">璁″垝鍚嶇О</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="year">
+ <Property></Property>
+ <Property name="label">骞翠唤</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="beginTime">
+ <Property name="dataType">Date</Property>
+ <Property name="label">寮�濮嬫椂闂�</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="endTime">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鎴鏃堕棿</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="createUser">
+ <Property></Property>
+ <Property name="label">鍒涘缓浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="createTime">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鍒涘缓鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="remark">
+ <Property></Property>
+ <Property name="label">澶囨敞璇存槑</Property>
+ </PropertyDef>
+ <PropertyDef name="jhxddw">
+ <Property/>
+ <Property name="label">璁″垝涓嬭揪鍗曚綅</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="jhxddwmc">
+ <Property/>
+ <Property name="label">璁″垝涓嬭揪鍗曚綅鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="jhxdsj">
+ <Property name="dataType">Date</Property>
+ <Property name="label">璁″垝涓嬭揪鏃堕棿</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="updateTime">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鏁版嵁鏇存柊鏃堕棿</Property>
+ <Property name="readOnly">true</Property>
+ </PropertyDef>
+ <Reference name="details">
+ <Property name="dataType">[dtDetail]</Property>
+ <Property name="dataProvider">planManagePR#listPlanDetail</Property>
+ <Property name="parameter">$${this.id}</Property>
+ </Reference>
+ </DataType>
+ <DataType name="dtDetail">
+ <Property name="creationType">com.ld.igds.models.InoutPlanDetail</Property>
+ <PropertyDef name="id">
+ <Property></Property>
+ <Property name="label">ID_</Property>
+ </PropertyDef>
+ <PropertyDef name="planId">
+ <Property></Property>
+ <Property name="label">璁″垝ID</Property>
+ </PropertyDef>
+ <PropertyDef name="depotId">
+ <Property></Property>
+ <Property name="label">浠撳簱</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="year">
+ <Property></Property>
+ <Property name="label">骞翠唤</Property>
+ </PropertyDef>
+ <PropertyDef name="type">
+ <Property></Property>
+ <Property name="label">璁″垝绫诲瀷</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("planManagePR#triggerPlanTurn").getResult()}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="foodVariety">
+ <Property></Property>
+ <Property name="label">绮鍝佺</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_VARIETY_")}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="foodType">
+ <Property></Property>
+ <Property name="label">绮鎬ц川</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_TYPE_")}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="foodLevel">
+ <Property></Property>
+ <Property name="label">绮绛夌骇</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_LEVEL_")}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="planNum">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鏁伴噺</Property>
+ <Property name="displayFormat">#.0 KG</Property>
+ </PropertyDef>
+ <PropertyDef name="updateTime">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鏁版嵁鏇存柊鏃堕棿</Property>
+ <Property name="readOnly">true</Property>
+ </PropertyDef>
+ </DataType>
+ <DataType name="dtParam">
+ <PropertyDef name="type">
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("planManagePR#triggerPlanType").getResult()}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ <Property name="label">璁″垝绫诲瀷</Property>
+ </PropertyDef>
+ <PropertyDef name="deptId">
+ <Property></Property>
+ <Property name="label">鎵�灞炲垎搴�</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("deptPR#loadParents").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="id">
+ <Property></Property>
+ <Property name="label">璁″垝缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="year">
+ <Property></Property>
+ <Property name="label">璁″垝骞翠唤</Property>
+ </PropertyDef>
+ <PropertyDef name="referenceNumber">
+ <Property name="label">璁″垝鏂囧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="name">
+ <Property name="label">璁″垝鍚嶇О</Property>
+ </PropertyDef>
+ </DataType>
+ <DataType name="dtTitle">
+ <PropertyDef name="title">
+ <Property name="label">title</Property>
+ </PropertyDef>
+ </DataType>
+ </Model>
+ <View layout="padding:5;regionPadding:5">
+ <ClientEvent name="onReady">var deptId = window.parent.deptId;//鐖堕〉闈腑鐨勫垎搴撶紪鐮�
+queryTitle = function(){
+ view.get("#dsTitle").set("parameter",{deptId:deptId}).flushAsync();
+};
+queryTitle();
+
+addMain = function(){
+view.get("#dsMain").insert({});
+ view.get("#dialogMain").show();
+};
+view.get("#dsParam").insert({});</ClientEvent>
+ <Property name="packages">font-awesome,css-common</Property>
+ <DataSet id="dsMain">
+ <Property name="loadMode">lazy</Property>
+ <Property name="dataProvider">planManagePR#pagePlan</Property>
+ <Property name="dataType">[dtMain]</Property>
+ <Property name="pageSize">15</Property>
+ </DataSet>
+ <DataSet id="dsParam">
+ <Property name="dataType">dtParam</Property>
+ </DataSet>
+ <DataSet id="dsTitle">
+ <Property name="dataType">dtTitle</Property>
+ <Property name="dataProvider">planManagePR#getPlanTitle</Property>
+ <Property name="loadMode">manual</Property>
+ </DataSet>
+ <Container layout="regionPadding:10" layoutConstraint="top">
+ <Property name="exClassName">bg-color</Property>
+ <Property name="contentOverflow">hidden</Property>
+ <Property name="height">55</Property>
+ <Label layoutConstraint="left">
+ <Property name="text">鑿滃崟鏍忥細</Property>
+ </Label>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">addMain();</ClientEvent>
+ <Property name="caption">鏂板</Property>
+ <Property name="exClassName">btn-default</Property>
+ <Property name="iconClass">fa fa-plus</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
+ if(data){
+ view.get("#dialogMain").show();
+ }</ClientEvent>
+ <Property name="caption">璋冩暣</Property>
+ <Property name="exClassName">btn-warm</Property>
+ <Property name="iconClass">fa fa-pencil</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
+ if(!data){
+ return;
+ }
+ view.get("#ajaxDel").set("parameter",data).execute(function(result){
+ if(result){
+ $alert(result);
+ return;
+ }else{
+ data.remove();
+ }
+ });</ClientEvent>
+ <Property name="caption">鍒犻櫎</Property>
+ <Property name="exClassName">btn-warn</Property>
+ <Property name="iconClass">fa fa-minus</Property>
+ </Button>
+ </Container>
+ <Container layout="regionPadding:10" layoutConstraint="center">
+ <Property name="exClassName">bg-color</Property>
+ <AutoForm>
+ <Property name="cols">*,*,*,*,*</Property>
+ <Property name="dataSet">dsParam</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <Property name="labelWidth">100</Property>
+ <AutoFormElement>
+ <Property name="name">type</Property>
+ <Property name="property">type</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">id</Property>
+ <Property name="property">id</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">year</Property>
+ <Property name="property">year</Property>
+ <Property name="trigger">yearDropDown1</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">referenceNumber</Property>
+ <Property name="property">referenceNumber</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">name</Property>
+ <Property name="property">name</Property>
+ <Editor/>
+ </AutoFormElement>
+ <Container layout="regionPadding:15">
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var param = view.get("#dsParam.data");
+view.get("#dsMain").set("parameter",param.toJSON()).flushAsync();</ClientEvent>
+ <Property name="caption">鏌ヨ</Property>
+ <Property name="exClassName">btn-default</Property>
+ <Property name="iconClass">fa fa-refresh</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">view.get("#dsParam").setData({});
+view.get("#dsMain").set("parameter",{}).flushAsync();</ClientEvent>
+ <Property name="exClassName">btn-warn</Property>
+ <Property name="iconClass">fa fa-refresh</Property>
+ <Property name="caption">閲嶇疆</Property>
+ </Button>
+ </Container>
+ </AutoForm>
+ <DataGrid layoutConstraint="center padding:5px">
+ <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsMain.data:#");
+ if(data){
+ view.get("#dialogMain").show();
+ }</ClientEvent>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="readOnly">true</Property>
+ <RowNumColumn/>
+ <DataColumn name="id">
+ <Property name="property">id</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn id="referenceNumber">
+ <Property name="name">referenceNumber</Property>
+ <Property name="align">center</Property>
+ <Editor/>
+ </DataColumn>
+ <DataColumn name="name">
+ <Property name="property">name</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn id="type">
+ <Property name="name">type</Property>
+ <Property name="align">center</Property>
+ <Editor/>
+ </DataColumn>
+ <DataColumn name="year">
+ <Property name="property">year</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn id="beginTime">
+ <Property name="name">beginTime</Property>
+ <Property name="align">center</Property>
+ <Editor/>
+ </DataColumn>
+ <DataColumn id="endTime">
+ <Property name="name">endTime</Property>
+ <Property name="align">center</Property>
+ <Editor/>
+ </DataColumn>
+ <DataColumn id="createTime">
+ <Property name="name">createTime</Property>
+ <Property name="align">center</Property>
+ <Editor/>
+ </DataColumn>
+ <DataColumn name="remark">
+ <Property name="property">remark</Property>
+ </DataColumn>
+ </DataGrid>
+ </Container>
+ <Container layout="regionPadding:10" layoutConstraint="bottom">
+ <Property name="exClassName">bg-color</Property>
+ <DataPilot layoutConstraint="right">
+ <Property name="itemCodes">pageSize,pages</Property>
+ <Property name="dataSet">dsMain</Property>
+ </DataPilot>
+ </Container>
+ <Dialog id="dialogMain" layout="padding:5;regionPadding:10">
+ <Property name="height">85%</Property>
+ <Property name="width">85%</Property>
+ <Property name="caption">璁″垝淇℃伅</Property>
+ <Property name="iconClass">fa fa-flag-o</Property>
+ <Property name="closeable">false</Property>
+ <Buttons>
+ <Button>
+ <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
+if(data.validate() != 'ok'){
+ $notify("鏁版嵁鏍￠獙澶辫触锛侊紒");
+ return;
+}
+view.get("#uaAction").set("parameter",data).execute();
+self.get("parent").hide();</ClientEvent>
+ <Property name="caption">纭</Property>
+ <Property name="iconClass">fa fa-check-circle</Property>
+ <Property name="width">90</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">view.get("#dsMain.data:#").cancel();
+ self.get("parent").hide();</ClientEvent>
+ <Property name="caption">鍙栨秷</Property>
+ <Property name="iconClass">fa fa-times-circle</Property>
+ <Property name="width">90</Property>
+ </Button>
+ </Buttons>
+ <Children>
+ <Container>
+ <AutoForm id="autoTitle">
+ <Property name="cols">*</Property>
+ <Property name="dataSet">dsTitle</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="showHint">false</Property>
+ <AutoFormElement layoutConstraint="colSpan:7">
+ <Property name="name">title</Property>
+ <Property name="property">title</Property>
+ <Property name="showLabel">false</Property>
+ <Property name="editorType">Label</Property>
+ <Property name="style">
+ <Property name="font">bold 30px Georgia, serif;</Property>
+ <Property name="text-align">center</Property>
+ </Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ <Container layout="regionPadding:5">
+ <FieldSet layout="regionPadding:5">
+ <Property name="caption">鍩烘湰淇℃伅</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*,*</Property>
+ <Property name="labelWidth">150</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <AutoFormElement>
+ <Property name="name">type</Property>
+ <Property name="property">type</Property>
+ <Property name="editorType">RadioGroup</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">id</Property>
+ <Property name="property">id</Property>
+ <Property name="readOnly">true</Property>
+ <Editor>
+ <TextEditor>
+ <Property name="blankText"> -- 绯荤粺鑷姩鐢熸垚 --</Property>
+ </TextEditor>
+ </Editor>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">name</Property>
+ <Property name="property">name</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">year</Property>
+ <Property name="property">year</Property>
+ <Property name="trigger">yearDropDown1</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">referenceNumber</Property>
+ <Property name="property">referenceNumber</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">beginTime</Property>
+ <Property name="property">beginTime</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">endTime</Property>
+ <Property name="property">endTime</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">deptId</Property>
+ <Property name="property">deptId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jhxdsj</Property>
+ <Property name="property">jhxdsj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jhxddw</Property>
+ <Property name="property">jhxddw</Property>
+ <Editor>
+ <TextEditor>
+ <Property name="blankText">涓嬭揪鍗曚綅鐨勭粺涓�绀句細淇＄敤浠ｇ爜</Property>
+ </TextEditor>
+ </Editor>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jhxddwmc</Property>
+ <Property name="property">jhxddwmc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">updateTime</Property>
+ <Property name="property">updateTime</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:3">
+ <Property name="name">remark</Property>
+ <Property name="property">remark</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </FieldSet>
+ <Panel>
+ <Property name="caption">璁″垝璇︾粏淇℃伅</Property>
+ <Buttons/>
+ <Children>
+ <Container layout="regionPadding:10" layoutConstraint="top">
+ <Property name="exClassName">bg-color</Property>
+ <Property name="contentOverflow">hidden</Property>
+ <Property name="height">55</Property>
+ <Label layoutConstraint="left">
+ <Property name="text">鑿滃崟鏍忥細</Property>
+ </Label>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var list = view.get("#dsMain.data:#").get("details");
+list.insert({});</ClientEvent>
+ <Property name="caption">鏂板</Property>
+ <Property name="exClassName">btn-default</Property>
+ <Property name="iconClass">fa fa-plus</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var data = view.get("#dataGridDetail.currentEntity");
+ if(!data){
+ return;
+ }
+ view.get("#ajaxDelDetail").set("parameter",data).execute(function(result){
+ if(result){
+ $alert(result);
+ return;
+ }else{
+ data.remove();
+ }
+ });</ClientEvent>
+ <Property name="caption">鍒犻櫎</Property>
+ <Property name="exClassName">btn-warn</Property>
+ <Property name="iconClass">fa fa-minus</Property>
+ </Button>
+ </Container>
+ <DataGrid id="dataGridDetail">
+ <Property name="dataSet">dsMain</Property>
+ <Property name="dataPath">#.details</Property>
+ <DataColumn name="foodVariety">
+ <Property name="property">foodVariety</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="depotId">
+ <Property name="property">depotId</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn>
+ <Property name="property">foodType</Property>
+ <Property name="align">center</Property>
+ <Property name="name">foodType</Property>
+ </DataColumn>
+ <DataColumn>
+ <Property name="property">foodLevel</Property>
+ <Property name="align">center</Property>
+ <Property name="name">foodLevel</Property>
+ </DataColumn>
+ <DataColumn>
+ <Property name="property">type</Property>
+ <Property name="align">center</Property>
+ <Property name="name">type</Property>
+ </DataColumn>
+ <DataColumn>
+ <Property name="property">planNum</Property>
+ <Property name="align">center</Property>
+ <Property name="name">planNum</Property>
+ </DataColumn>
+ <DataColumn name="updateTime">
+ <Property name="property">updateTime</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ </DataGrid>
+ </Children>
+ <Tools/>
+ </Panel>
+ </Container>
+ </Container>
+ </Children>
+ <Tools/>
+ </Dialog>
+ <UpdateAction id="uaAction">
+ <Property name="dataResolver">planManagePR#savePlan</Property>
+ <UpdateItem>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="dataPath">[#current]</Property>
+ </UpdateItem>
+ </UpdateAction>
+ <AjaxAction id="ajaxDel">
+ <Property name="confirmMessage">纭畾瑕佸垹闄ゅ悧锛�</Property>
+ <Property name="service">planManagePR#delPlan</Property>
+ </AjaxAction>
+ <AjaxAction id="ajaxDelDetail">
+ <Property name="confirmMessage">纭畾瑕佸垹闄ゅ悧锛�</Property>
+ <Property name="service">planManagePR#delPlanDetail</Property>
+ </AjaxAction>
+ <ListDropDown id="yearDropDown1">
+ <ClientEvent name="onCreate">var curY = Number(new Date().formatDate("Y"));
+ var arrt = new Array();
+ arrt.push(curY-5);
+ arrt.push(curY-4);
+ arrt.push(curY-3);
+ arrt.push(curY-2);
+ arrt.push(curY-1);
+ arrt.push(curY);
+ arrt.push(curY+1);
+ self.set("items",arrt);</ClientEvent>
+ </ListDropDown>
+ </View>
+</ViewConfig>
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/PlanManagePR.java b/igds-inout/src/main/java/com/ld/igds/m/view/PlanManagePR.java
index 002ecde..586c83b 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/PlanManagePR.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/PlanManagePR.java
@@ -91,7 +91,7 @@
@DataProvider
public List<DicTrigger> triggerPlanType() {
List<DicTrigger> list = new ArrayList<DicTrigger>();
-
+
list.add(new DicTrigger(InoutManageUtil.PLAN_TYPE_1, "閲囪喘璁″垝"));
list.add(new DicTrigger(InoutManageUtil.PLAN_TYPE_2, "閿�鍞鍒�"));
list.add(new DicTrigger(InoutManageUtil.PLAN_TYPE_3, "杞崲璁″垝"));
--
Gitblit v1.9.3