From 54f0d5ebf93674d63426e6d3ad1dcfae64b21a82 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 13 七月 2023 18:51:38 +0800
Subject: [PATCH] 损溢页面修改
---
igds-inout/src/main/java/com/ld/igds/m/view/LossOver.view.xml | 499 +++++++++++++++++++++++++++++++++++++-------
igds-inout/src/main/java/com/ld/igds/m/InoutManageUtil.java | 4
igds-inout/src/main/java/com/ld/igds/m/service/HLossOverService.java | 7
igds-inout/src/main/java/com/ld/igds/m/view/LossOverPR.java | 92 +++++---
4 files changed, 477 insertions(+), 125 deletions(-)
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 e2a1900..018e9fe 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
@@ -81,7 +81,9 @@
* 缂撳瓨-鎬ц川杞彉ID
*/
public static final String CACHE_VARIETY_ID = "VARIETY_ID";
-
+ /**
+ * 缂撳瓨-鎹熸孩ID
+ */
public static final String CACHE_LOSS_OVER_ID = "LOSS_OVER_ID";
/**
diff --git a/igds-inout/src/main/java/com/ld/igds/m/service/HLossOverService.java b/igds-inout/src/main/java/com/ld/igds/m/service/HLossOverService.java
index 9d9eda4..559f11f 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/service/HLossOverService.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/service/HLossOverService.java
@@ -84,7 +84,9 @@
Session session = this.getSessionFactory().openSession();
data.setUpdateTime(new Date());
data.setUpdateUser(ContextUtil.getLoginUserCName());
-
+ if ("OVER".equals(data.getType())) {
+ data.setAmount(0 - data.getAmount());
+ }
try {
if (null == data.getId()) {
@@ -104,11 +106,12 @@
}
String id = createId(data.getSubmitTime(), data.getCompanyId(), data.getHwdm());
// String id = addInoutDataByLossOver(data);
-
+ data.setCzbz("i");
data.setId(id);
session.save(data);
} else {
+ data.setCzbz("u");
session.update(data);
}
} catch (Exception e) {
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/LossOver.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/LossOver.view.xml
index ade63a5..fa84e4b 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/LossOver.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/LossOver.view.xml
@@ -4,17 +4,18 @@
<Context/>
<Model>
<DataType name="dtMain">
- <ClientEvent name="onDataChange">if(arg.property =="depotId"){
- autoByDepot(arg.newValue);
-}</ClientEvent>
+ <ClientEvent name="onDataChange">//if(arg.property =="depotId"){autoByDepot(arg.newValue);}</ClientEvent>
<Property name="creationType">com.ld.igds.models.InoutLossOver</Property>
<PropertyDef name="id">
<Property></Property>
- <Property name="label">ID</Property>
+ <Property name="label">鎹熺泭鍗曞彿</Property>
+ <Property name="readOnly">true</Property>
</PropertyDef>
<PropertyDef name="companyId">
<Property></Property>
<Property name="label">缁勭粐缂栫爜</Property>
+ <Property name="required">false</Property>
+ <Property name="readOnly">true</Property>
</PropertyDef>
<PropertyDef name="deptId">
<Property></Property>
@@ -44,37 +45,140 @@
<Property name="valueProperty">name</Property>
</Property>
</PropertyDef>
- <PropertyDef name="foodVariety">
- <Property></Property>
- <Property name="label">绮鍝佺</Property>
- <Property name="required">true</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>
- </PropertyDef>
<PropertyDef name="amount">
<Property name="dataType">Double</Property>
- <Property name="label">閲嶉噺</Property>
+ <Property name="label">鎹熸孩閲嶉噺</Property>
<Property name="required">true</Property>
- <Property name="displayFormat">#.0 KG</Property>
- </PropertyDef>
- <PropertyDef name="foodLocation">
- <Property></Property>
- <Property name="label">绮浜у湴</Property>
+ <Property name="displayFormat">#,##0.00 KG</Property>
</PropertyDef>
<PropertyDef name="updateTime">
<Property name="dataType">Date</Property>
<Property name="label">鏇存柊鏃堕棿</Property>
+ <Property name="required">false</Property>
+ <Property name="readOnly">true</Property>
</PropertyDef>
<PropertyDef name="updateUser">
<Property></Property>
<Property name="label">鏇存柊浜�</Property>
+ <Property name="readOnly">true</Property>
</PropertyDef>
<PropertyDef name="remark">
<Property></Property>
<Property name="label">澶囨敞</Property>
+ </PropertyDef>
+ <PropertyDef name="hwdm">
+ <Property></Property>
+ <Property name="label">璐т綅浠ｇ爜</Property>
+ </PropertyDef>
+ <PropertyDef name="rkjz">
+ <Property name="dataType">double</Property>
+ <Property name="label">鍏ュ簱鍑�閲�</Property>
+ </PropertyDef>
+ <PropertyDef name="rksj">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鍏ュ簱鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="rksf">
+ <Property name="dataType">double</Property>
+ <Property name="label">鍏ュ簱姘村垎(%)</Property>
+ </PropertyDef>
+ <PropertyDef name="rkzz">
+ <Property name="dataType">double</Property>
+ <Property name="label">鍏ュ簱鏉傝川(%)</Property>
+ </PropertyDef>
+ <PropertyDef name="cksj">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鍑哄簱鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="ckjz">
+ <Property name="dataType">double</Property>
+ <Property name="label">鍑哄簱鍑�閲�</Property>
+ </PropertyDef>
+ <PropertyDef name="cksf">
+ <Property name="dataType">double</Property>
+ <Property name="label">鍑哄簱姘村垎(%)</Property>
+ </PropertyDef>
+ <PropertyDef name="ckzz">
+ <Property name="dataType">double</Property>
+ <Property name="label">鍑哄簱鏉傝川(%)</Property>
+ </PropertyDef>
+ <PropertyDef name="sysfzc">
+ <Property></Property>
+ <Property name="label">鎹熺泭鏄惁姝ｅ父</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("lossOverPR#triggerType").getResult()}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="syyy">
+ <Property></Property>
+ <Property name="label">鎹熸孩鍘熷洜</Property>
+ </PropertyDef>
+ <PropertyDef name="ccshr">
+ <Property></Property>
+ <Property name="label">浠撳偍瀹℃牳浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="auditCcsh">
+ <Property></Property>
+ <Property name="label">瀹℃壒鐘舵��</Property>
+ </PropertyDef>
+ <PropertyDef name="InfoCcsh">
+ <Property></Property>
+ <Property name="label">瀹℃牳璇存槑</Property>
+ </PropertyDef>
+ <PropertyDef name="zjshr">
+ <Property></Property>
+ <Property name="label">璐ㄦ瀹℃牳浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="auditZjsh">
+ <Property></Property>
+ <Property name="label">瀹℃壒鐘舵��</Property>
+ </PropertyDef>
+ <PropertyDef name="infoZjsh">
+ <Property></Property>
+ <Property name="label">瀹℃牳璇存槑</Property>
+ </PropertyDef>
+ <PropertyDef name="tjshr">
+ <Property></Property>
+ <Property name="label">缁熻瀹℃牳浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="auditTjsh">
+ <Property></Property>
+ <Property name="label">瀹℃壒鐘舵��</Property>
+ </PropertyDef>
+ <PropertyDef name="infoTjsh">
+ <Property></Property>
+ <Property name="label">瀹℃牳璇存槑</Property>
+ </PropertyDef>
+ <PropertyDef name="kjshr">
+ <Property></Property>
+ <Property name="label">浼氳瀹℃牳浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="auditKjsh">
+ <Property></Property>
+ <Property name="label">瀹℃壒鐘舵��</Property>
+ </PropertyDef>
+ <PropertyDef name="infoKjsh">
+ <Property></Property>
+ <Property name="label">瀹℃牳璇存槑</Property>
+ </PropertyDef>
+ <PropertyDef name="ldshr">
+ <Property></Property>
+ <Property name="label">棰嗗瀹℃牳浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="auditLdsh">
+ <Property></Property>
+ <Property name="label">瀹℃壒鐘舵��</Property>
+ </PropertyDef>
+ <PropertyDef name="infoLdsh">
+ <Property></Property>
+ <Property name="label">瀹℃牳璇存槑</Property>
+ </PropertyDef>
+ <PropertyDef name="czbz">
+ <Property></Property>
+ <Property name="label">鎿嶄綔鏍囧織</Property>
+ <Property name="readOnly">true</Property>
</PropertyDef>
</DataType>
<DataType name="dtParam">
@@ -97,15 +201,6 @@
<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="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>
</PropertyDef>
@@ -151,7 +246,7 @@
<Property name="dataProvider">lossOverPR#pageData</Property>
<Property name="dataType">[dtMain]</Property>
<Property name="pageSize">15</Property>
- <Property name="parameter"/>
+ <Property name="parameter"></Property>
</DataSet>
<DataSet id="dsParam">
<Property name="dataType">dtParam</Property>
@@ -178,7 +273,6 @@
<Property name="caption">璋冩暣</Property>
<Property name="exClassName">btn-warm</Property>
<Property name="iconClass">fa fa-pencil</Property>
- <Property name="visible">false</Property>
<Property name="hideMode">display</Property>
</Button>
<Button layoutConstraint="left">
@@ -213,12 +307,6 @@
<Property name="trigger">autoMappingDropDown2</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement>
- <Property name="name">foodVariety</Property>
- <Property name="property">foodVariety</Property>
- <Property name="trigger">autoMappingDropDown2</Property>
- <Editor/>
- </AutoFormElement>
<Button layoutConstraint="left">
<ClientEvent name="onClick">var param = view.get("#dsParam.data");
view.get("#dsMain").set("parameter",param.toJSON()).flushAsync();</ClientEvent>
@@ -228,9 +316,18 @@
</Button>
</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>
+ <Property name="property">id</Property>
+ <Property name="align">center</Property>
+ <Property name="name">id</Property>
+ </DataColumn>
<DataColumn name="submitTime">
<Property name="property">submitTime</Property>
<Property name="align">center</Property>
@@ -239,16 +336,8 @@
<Property name="property">depotId</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="foodVariety">
- <Property name="property">foodVariety</Property>
- <Property name="align">center</Property>
- </DataColumn>
<DataColumn name="amount">
<Property name="property">amount</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="foodLocation">
- <Property name="property">foodLocation</Property>
<Property name="align">center</Property>
</DataColumn>
<DataColumn name="remark">
@@ -264,8 +353,8 @@
</DataPilot>
</Container>
<Dialog id="dialogMain" layout="padding:5;regionPadding:10">
- <Property name="height">400</Property>
- <Property name="width">800</Property>
+ <Property name="height">80%</Property>
+ <Property name="width">70%</Property>
<Property name="caption">鎹熸孩淇℃伅</Property>
<Property name="iconClass">fa fa-flag-o</Property>
<Property name="closeable">false</Property>
@@ -292,44 +381,284 @@
</Button>
</Buttons>
<Children>
- <AutoForm>
- <Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*</Property>
- <Property name="labelWidth">100</Property>
- <Property name="labelAlign">right</Property>
- <Property name="labelSeparator">锛�</Property>
- <AutoFormElement>
- <Property name="name">submitTime</Property>
- <Property name="property">submitTime</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">depotId</Property>
- <Property name="property">depotId</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">foodVariety</Property>
- <Property name="property">foodVariety</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">amount</Property>
- <Property name="property">amount</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">foodLocation</Property>
- <Property name="property">foodLocation</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">remark</Property>
- <Property name="property">remark</Property>
- <Property name="editorType">TextArea</Property>
- <Editor/>
- </AutoFormElement>
- </AutoForm>
+ <FieldSet>
+ <Property name="caption">鍩烘湰淇℃伅</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*</Property>
+ <Property name="labelWidth">120</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <AutoFormElement>
+ <Property name="name">id</Property>
+ <Property name="property">id</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">companyId</Property>
+ <Property name="property">companyId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">submitTime</Property>
+ <Property name="property">submitTime</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">depotId</Property>
+ <Property name="property">depotId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">amount</Property>
+ <Property name="property">amount</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">deptId</Property>
+ <Property name="property">deptId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">hwdm</Property>
+ <Property name="property">hwdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">rkjz</Property>
+ <Property name="property">rkjz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">rksj</Property>
+ <Property name="property">rksj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">rksf</Property>
+ <Property name="property">rksf</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">rkzz</Property>
+ <Property name="property">rkzz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cksj</Property>
+ <Property name="property">cksj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ckjz</Property>
+ <Property name="property">ckjz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cksf</Property>
+ <Property name="property">cksf</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ckzz</Property>
+ <Property name="property">ckzz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sysfzc</Property>
+ <Property name="property">sysfzc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">syyy</Property>
+ <Property name="property">syyy</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">updateUser</Property>
+ <Property name="property">updateUser</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">updateTime</Property>
+ <Property name="property">updateTime</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">czbz</Property>
+ <Property name="property">czbz</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </FieldSet>
+ <FieldSet>
+ <Property name="caption">瀹℃壒淇℃伅</Property>
+ <Buttons/>
+ <Children>
+ <FieldSet>
+ <Property name="caption">浠撳偍瀹℃壒</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="cols">*,*</Property>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="labelSeparator">:</Property>
+ <Property name="labelWidth">120</Property>
+ <AutoFormElement>
+ <Property name="name">ccshr</Property>
+ <Property name="property">ccshr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">auditCcsh</Property>
+ <Property name="property">auditCcsh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="rowSpan:2;colSpan:2">
+ <Property name="name">InfoCcsh</Property>
+ <Property name="property">InfoCcsh</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </FieldSet>
+ <FieldSet>
+ <Property name="caption">璐ㄦ瀹℃壒</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="cols">*,*</Property>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="labelSeparator">:</Property>
+ <Property name="labelWidth">120</Property>
+ <AutoFormElement>
+ <Property name="name">zjshr</Property>
+ <Property name="property">zjshr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">auditZjsh</Property>
+ <Property name="property">auditZjsh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="rowSpan:2;colSpan:2">
+ <Property name="name">infoZjsh</Property>
+ <Property name="property">infoZjsh</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </FieldSet>
+ <FieldSet>
+ <Property name="caption">缁熻瀹℃壒</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="cols">*,*</Property>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="labelWidth">120</Property>
+ <Property name="labelSeparator">:</Property>
+ <Property name="labelAlign">right</Property>
+ <AutoFormElement>
+ <Property name="name">tjshr</Property>
+ <Property name="property">tjshr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">auditTjsh</Property>
+ <Property name="property">auditTjsh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2;rowSpan:2">
+ <Property name="name">infoTjsh</Property>
+ <Property name="property">infoTjsh</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </FieldSet>
+ <FieldSet>
+ <Property name="caption">浼氳瀹℃壒</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="cols">*,*</Property>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="labelSeparator">:</Property>
+ <Property name="labelWidth">120</Property>
+ <AutoFormElement>
+ <Property name="name">kjshr</Property>
+ <Property name="property">kjshr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">auditKjsh</Property>
+ <Property name="property">auditKjsh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="rowSpan:2;colSpan:2">
+ <Property name="name">infoKjsh</Property>
+ <Property name="property">infoKjsh</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </FieldSet>
+ <FieldSet>
+ <Property name="caption">棰嗗瀹℃壒</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="cols">*,*</Property>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="labelSeparator">:</Property>
+ <Property name="labelWidth">140</Property>
+ <AutoFormElement>
+ <Property name="name">ldshr</Property>
+ <Property name="property">ldshr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">auditLdsh</Property>
+ <Property name="property">auditLdsh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="rowSpan:2;colSpan:2">
+ <Property name="name">infoLdsh</Property>
+ <Property name="property">infoLdsh</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </FieldSet>
+ </Children>
+ </FieldSet>
+ <FieldSet>
+ <Property name="caption">澶囨敞淇℃伅</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="cols">*,*</Property>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="labelSeparator">:</Property>
+ <Property name="labelWidth">120</Property>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">remark</Property>
+ <Property name="property">remark</Property>
+ <Property name="editorType">TextArea</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </FieldSet>
</Children>
<Tools/>
</Dialog>
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/LossOverPR.java b/igds-inout/src/main/java/com/ld/igds/m/view/LossOverPR.java
index 43022de..f0c32fd 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/LossOverPR.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/LossOverPR.java
@@ -1,7 +1,10 @@
package com.ld.igds.m.view;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Map;
+import com.ld.igds.models.DicTrigger;
import com.ld.igds.models.InoutLossOver;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -15,53 +18,68 @@
/**
* 缁煎悎涓氬姟-鎹熸孩绠＄悊
* 鎹熸孩鐨勯�昏緫鏄紝鏂板鏀跺湪鍑哄叆搴撴祦姘翠腑娣诲姞瀵瑰簲鐨勬祦姘达紝杩欎釜娴佹按绫诲瀷灏辨槸鎹熸孩銆備互渚跨粺璁℃椂鍊欎娇鐢�
- *
+ *
* @author: andy.jia
* @description:
* @version:
* @data:2020骞�5鏈�28鏃�
- *
*/
@Component
public class LossOverPR {
- @Autowired
- private HLossOverService service;
+ @Autowired
+ private HLossOverService service;
- /**
- * lossOverPR#pageData
- *
- * @param page
- * @param param
- * @throws Exception
- */
- @DataProvider
- public void pageData(Page<InoutLossOver> page, Map<String, Object> param)
- throws Exception {
- service.pageData(page, param);
- }
- /**
- * lossOverPR#saveData
- *
- * @param data
- * @throws Exception
- */
- @DataResolver
- public void saveData(InoutLossOver data) throws Exception {
- service.saveData(data);
- }
+ /**
+ * ${dorado.getDataProvider("lossOverPR#triggerType").getResult()}
+ *
+ * @return
+ */
+ @DataProvider
+ public List<DicTrigger> triggerType() {
+ List<DicTrigger> list = new ArrayList<DicTrigger>();
- /**
- * lossOverPR#delData
- *
- * @param data
- * @return
- * @throws Exception
- */
- @Expose
- public String delData(InoutLossOver data) throws Exception {
- return service.delData(data);
- }
+ list.add(new DicTrigger("0", "姝ｅ父"));
+ list.add(new DicTrigger("1", "涓嶆甯�"));
+
+ return list;
+ }
+
+ /**
+ * lossOverPR#pageData
+ *
+ * @param page
+ * @param param
+ * @throws Exception
+ */
+ @DataProvider
+ public void pageData(Page<InoutLossOver> page, Map<String, Object> param)
+ throws Exception {
+ service.pageData(page, param);
+ }
+
+ /**
+ * lossOverPR#saveData
+ *
+ * @param data
+ * @throws Exception
+ */
+ @DataResolver
+ public void saveData(InoutLossOver data) throws Exception {
+ service.saveData(data);
+ }
+
+ /**
+ * lossOverPR#delData
+ *
+ * @param data
+ * @return
+ * @throws Exception
+ */
+ @Expose
+ public String delData(InoutLossOver data) throws Exception {
+ return service.delData(data);
+ }
}
--
Gitblit v1.9.3