From e7cfae909181ab9e7ffacd0370b0ad9d4ad50123 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 30 六月 2023 20:15:09 +0800
Subject: [PATCH] 质检管理
---
igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml | 1519 +++++++++---------
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java | 31
igds-web/src/main/resources/templates/test/qualityReport03.html | 2
igds-inout/src/main/java/com/ld/igds/inout/view/InoutList202306.view.xml | 3002 ++++++++++++++++++------------------
igds-web/src/main/resources/templates/test/qualityReport04.html | 2
igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.js | 30
igds-web/src/main/resources/templates/test/qualityReport02.html | 4
igds-core/src/main/java/com/ld/igds/constant/FoodVariety.java | 16
igds-web/src/main/resources/templates/test/inWeightDefault.html | 109 +
igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml | 5
igds-web/src/main/resources/templates/test/qualityReport01.html | 2
igds-inout/src/main/java/com/ld/igds/inout/InoutBill.java | 18
igds-core/src/main/java/com/ld/igds/models/MQuality.java | 2
13 files changed, 2,481 insertions(+), 2,261 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/constant/FoodVariety.java b/igds-core/src/main/java/com/ld/igds/constant/FoodVariety.java
index 5a8858a..334deb4 100644
--- a/igds-core/src/main/java/com/ld/igds/constant/FoodVariety.java
+++ b/igds-core/src/main/java/com/ld/igds/constant/FoodVariety.java
@@ -11,6 +11,22 @@
* 鍙傝�冿細LST1703-2017 鏍囧噯閲嶆柊瀹氫箟
*/
public class FoodVariety {
+ /**
+ * 灏忛害
+ */
+ public static final String FOOD_VARIETY_WHEAT = "111";
+ /**
+ * 绋昏胺
+ */
+ public static final String FOOD_VARIETY_PADDY = "112";
+ /**
+ * 鐜夌背
+ */
+ public static final String FOOD_VARIETY_CORN = "113";
+ /**
+ * 澶ц眴
+ */
+ public static final String FOOD_VARIETY_SOYBEAN = "1411001";
/**
* 鏍规嵁鍚嶇О鎵剧紪鐮�
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 e9314de..12c04ae 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
@@ -1,246 +1,240 @@
<?xml version="1.0" encoding="UTF-8"?>
<ViewConfig>
- <Arguments/>
- <Context/>
- <Model>
- <DataType name="dtMain">
- <ClientEvent name="onDataChange">if(arg.property =="depotId"){
+ <Arguments/>
+ <Context/>
+ <Model>
+ <DataType name="dtMain">
+ <ClientEvent name="onDataChange">if(arg.property =="depotId"){
autoByDepot(arg.newValue);
}
if(arg.property =="foodVariety"){
checkByFood(arg.newValue);
}
</ClientEvent>
- <Property name="creationType">com.ld.igds.models.MQuality</Property>
- <PropertyDef name="id">
- <Property name="label">ID</Property>
- </PropertyDef>
- <PropertyDef name="companyId">
- <Property name="label">缁勭粐缂栫爜</Property>
- </PropertyDef>
- <PropertyDef name="deptId">
- <Property name="label">搴撳尯缂栫爜</Property>
- </PropertyDef>
- <PropertyDef name="depotId">
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}
+ <Property name="creationType">com.ld.igds.models.MQuality</Property>
+ <PropertyDef name="id">
+ <Property name="label">ID</Property>
+ </PropertyDef>
+ <PropertyDef name="companyId">
+ <Property name="label">缁勭粐缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="deptId">
+ <Property name="label">搴撳尯缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="depotId">
+ <Property name="label">妫�娴嬩粨搴�</Property>
+ <Property name="required">true</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="foodVariety">
+ <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="label">绮鍝佺</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="foodLevel">
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_LEVEL_")}
+ ${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_LEVEL_")}
</Property>
- <Property name="keyProperty">id</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- <Property name="label">妫�娴嬩粨搴�</Property>
- <Property name="required">true</Property>
- </PropertyDef>
- <PropertyDef name="foodVariety">
- <Property name="mapping">
- <Property name="mapValues">
- ${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_VARIETY_")}
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ <Property name="label">绮绛夌骇</Property>
+ </PropertyDef>
+ <PropertyDef name="foodType">
+ <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>
- <Property name="label">绮鍝佺</Property>
- <Property name="required">true</Property>
- </PropertyDef>
- <PropertyDef name="foodLevel">
- <Property name="mapping">
- <Property name="mapValues">
- ${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_LEVEL_")}
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="foodLocation">
+ <Property name="label">绮浜у湴</Property>
+ </PropertyDef>
+ <PropertyDef name="type">
+ <Property name="label">妫�楠岀被鍒�</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("qualityManagerPR#triggerType").getResult()}
</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- <Property name="label">绮绛夌骇</Property>
- </PropertyDef>
- <PropertyDef name="foodType">
- <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="foodLocation">
- <Property name="label">绮浜у湴</Property>
- </PropertyDef>
- <PropertyDef name="type">
- <Property name="label">妫�楠岀被鍒�</Property>
- <Property name="mapping">
- <Property name="mapValues">
- ${dorado.getDataProvider("qualityManagerPR#triggerType").getResult()}
- </Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- <Property name="required">true</Property>
- </PropertyDef>
- <PropertyDef name="standard">
- <Property name="label">妫�楠屼緷鎹�</Property>
- <Property name="required">true</Property>
- <Property name="mapping">
- <Property name="mapValues">
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="standard">
+ <Property name="label">妫�楠屼緷鎹�</Property>
+ <Property name="required">true</Property>
+ <Property name="mapping">
+ <Property name="mapValues">
${dorado.getDataProvider("qualityManagerPR#triggerStandard").getResult()}
</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="user">
- <Property name="label">妫�楠屼汉</Property>
- </PropertyDef>
- <PropertyDef name="time">
- <Property name="label">妫�楠屾椂闂�</Property>
- <Property name="dataType">Date</Property>
- </PropertyDef>
- <PropertyDef name="result">
- <Property name="label">妫�楠岀粨璁�</Property>
- </PropertyDef>
- <PropertyDef name="checkArea">
- <Property name="label">鎵︽牱鍖哄煙</Property>
- </PropertyDef>
- <PropertyDef name="checkUser">
- <Property name="label">鎵︽牱浜�</Property>
- </PropertyDef>
- <PropertyDef name="checkNum">
- <Property name="label">鏍峰搧鏁伴噺</Property>
- <Property name="displayFormat">0.0%</Property>
- <Property name="dataType">Double</Property>
- </PropertyDef>
- <PropertyDef name="checkTime">
- <Property name="label">鎵︽牱鏃堕棿</Property>
- <Property name="dataType">Date</Property>
- </PropertyDef>
- <PropertyDef name="checkRepresent">
- <Property name="label">鏍峰搧浠ｈ〃</Property>
- </PropertyDef>
- <PropertyDef name="checkLevel">
- <Property name="label">鏍峰搧绛夌骇</Property>
- </PropertyDef>
- <PropertyDef name="normalYear">
- <Property name="label">姝ｅ父瀛樺偍骞撮檺</Property>
- <Property name="mapping">
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- <Property name="mapValues">
- <Collection>
- <Entity>
- <Property name="name">鏄�</Property>
- <Property name="code">1</Property>
- </Entity>
- <Entity>
- <Property name="name">鍚�</Property>
- <Property name="code">0</Property>
- </Entity>
- </Collection>
- </Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="remark">
- <Property name="label">澶囨敞淇℃伅</Property>
- </PropertyDef>
- <Reference name="checkItems">
- <Property name="dataProvider">checkStandardPR#listCheckItemsByParam</Property>
- <Property name="dataType">[dtCheckItems]</Property>
- <Property name="parameter">
- <Entity>
- <Property name="checkId">$${this.id}</Property>
- <Property name="foodVariety">$${this.foodVariety}</Property>
- <Property name="deptId">$${this.deptId}</Property>
- </Entity>
- </Property>
- </Reference>
- </DataType>
- <DataType name="dtQualityParam">
- <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="type">
- <Property name="label">妫�楠岀被鍒�</Property>
- <Property name="mapping">
- <Property name="mapValues">
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="user">
+ <Property name="label">妫�楠屼汉</Property>
+ </PropertyDef>
+ <PropertyDef name="time">
+ <Property name="label">妫�楠屾椂闂�</Property>
+ <Property name="dataType">Date</Property>
+ </PropertyDef>
+ <PropertyDef name="result">
+ <Property name="label">妫�楠岀粨璁�</Property>
+ </PropertyDef>
+ <PropertyDef name="checkArea">
+ <Property name="label">鎵︽牱鍖哄煙</Property>
+ </PropertyDef>
+ <PropertyDef name="checkUser">
+ <Property name="label">鎵︽牱浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="checkNum">
+ <Property name="label">鏍峰搧鏁伴噺</Property>
+ <Property name="displayFormat">0.0%</Property>
+ <Property name="dataType">Double</Property>
+ </PropertyDef>
+ <PropertyDef name="checkTime">
+ <Property name="label">鎵︽牱鏃堕棿</Property>
+ <Property name="dataType">Date</Property>
+ </PropertyDef>
+ <PropertyDef name="checkRepresent">
+ <Property name="label">鏍峰搧浠ｈ〃</Property>
+ </PropertyDef>
+ <PropertyDef name="checkLevel">
+ <Property name="label">鏍峰搧绛夌骇</Property>
+ </PropertyDef>
+ <PropertyDef name="normalYear">
+ <Property name="label">姝ｅ父瀛樺偍骞撮檺</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="name">鏄�</Property>
+ <Property name="code">1</Property>
+ </Entity>
+ <Entity>
+ <Property name="name">鍚�</Property>
+ <Property name="code">0</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="remark">
+ <Property name="label">澶囨敞淇℃伅</Property>
+ </PropertyDef>
+ <Reference name="checkItems">
+ <Property name="dataProvider">checkStandardPR#listCheckItemsByParam</Property>
+ <Property name="dataType">[dtCheckItems]</Property>
+ <Property name="parameter">
+ <Entity>
+ <Property name="checkId">$${this.id}</Property>
+ <Property name="foodVariety">$${this.foodVariety}</Property>
+ <Property name="deptId">$${this.deptId}</Property>
+ </Entity>
+ </Property>
+ </Reference>
+ </DataType>
+ <DataType name="dtQualityParam">
+ <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="type">
+ <Property name="label">妫�楠岀被鍒�</Property>
+ <Property name="mapping">
+ <Property name="mapValues">
${dorado.getDataProvider("qualityManagerPR#triggerType").getResult()}
</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="start">
- <Property name="dataType">Date</Property>
- <Property name="label">妫�娴嬪紑濮嬫椂闂�</Property>
- </PropertyDef>
- <PropertyDef name="end">
- <Property name="dataType">Date</Property>
- <Property name="label">妫�娴嬫埅姝㈡椂闂�</Property>
- </PropertyDef>
- </DataType>
- <DataType name="dtCheckItems">
- <Property name="creationType">com.ld.igds.check.dto.CheckItemData</Property>
- <PropertyDef name="updateTime">
- <Property></Property>
- <Property name="label">浠撳簱</Property>
- <Property name="dataType">Date</Property>
- </PropertyDef>
- <PropertyDef name="checkId">
- <Property name="label">妫�娴嬬紪鐮�</Property>
- </PropertyDef>
- <PropertyDef name="companyId">
- <Property name="label">缁勭粐缂栫爜</Property>
- </PropertyDef>
- <PropertyDef name="standardId">
- <Property name="label">妫�娴嬮」缂栫爜</Property>
- </PropertyDef>
- <PropertyDef name="standardName">
- <Property name="label">妫�娴嬮」鍚嶇О</Property>
- </PropertyDef>
- <PropertyDef name="unit">
- <Property name="label">鍗曚綅</Property>
- </PropertyDef>
- <PropertyDef name="upperLimit">
- <Property name="label">鏍囧噯涓婇檺</Property>
- <Property name="dataType">Double</Property>
- </PropertyDef>
- <PropertyDef name="lowerLimit">
- <Property name="label">鏍囧噯涓嬮檺</Property>
- <Property name="dataType">Double</Property>
- </PropertyDef>
- <PropertyDef name="value">
- <Property name="label">妫�娴嬪��</Property>
- </PropertyDef>
- <PropertyDef name="remarks">
- <Property name="label">鍖栭獙缁撴灉</Property>
- </PropertyDef>
- </DataType>
- <DataType name="dataTypeUser">
- <Property name="creationType">com.bstek.bdf2.core.model.DefaultUser</Property>
- <PropertyDef name="password">
- <Property name="dataType">String</Property>
- <Property name="label">瀵嗙爜</Property>
- <Property name="required">true</Property>
- <Validator type="length">
- <Property name="minLength">6</Property>
- </Validator>
- <Validator type="custom">
- <ClientEvent name="onValidate">if (arg.entity.get("confirmPassword")){
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="start">
+ <Property name="dataType">Date</Property>
+ <Property name="label">妫�娴嬪紑濮嬫椂闂�</Property>
+ </PropertyDef>
+ <PropertyDef name="end">
+ <Property name="dataType">Date</Property>
+ <Property name="label">妫�娴嬫埅姝㈡椂闂�</Property>
+ </PropertyDef>
+ </DataType>
+ <DataType name="dtCheckItems">
+ <Property name="creationType">com.ld.igds.check.dto.CheckItemData</Property>
+ <PropertyDef name="updateTime">
+ <Property></Property>
+ <Property name="label">浠撳簱</Property>
+ <Property name="dataType">Date</Property>
+ </PropertyDef>
+ <PropertyDef name="checkId">
+ <Property name="label">妫�娴嬬紪鐮�</Property>
+ </PropertyDef>
+ <PropertyDef name="companyId">
+ <Property name="label">缁勭粐缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="standardId">
+ <Property name="label">妫�娴嬮」缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="standardName">
+ <Property name="label">妫�娴嬮」鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="unit">
+ <Property name="label">鍗曚綅</Property>
+ </PropertyDef>
+ <PropertyDef name="upperLimit">
+ <Property name="label">鏍囧噯涓婇檺</Property>
+ <Property name="dataType">Double</Property>
+ </PropertyDef>
+ <PropertyDef name="lowerLimit">
+ <Property name="label">鏍囧噯涓嬮檺</Property>
+ <Property name="dataType">Double</Property>
+ </PropertyDef>
+ <PropertyDef name="value">
+ <Property name="label">妫�娴嬪��</Property>
+ </PropertyDef>
+ <PropertyDef name="remarks">
+ <Property name="label">鍖栭獙缁撴灉</Property>
+ </PropertyDef>
+ </DataType>
+ <DataType name="dataTypeUser">
+ <Property name="creationType">com.bstek.bdf2.core.model.DefaultUser</Property>
+ <PropertyDef name="password">
+ <Property name="dataType">String</Property>
+ <Property name="label">瀵嗙爜</Property>
+ <Property name="required">true</Property>
+ <Validator type="length">
+ <Property name="minLength">6</Property>
+ </Validator>
+ <Validator type="custom">
+ <ClientEvent name="onValidate">if (arg.entity.get("confirmPassword")){
arg.entity.validate("confirmPassword");
}
</ClientEvent>
- </Validator>
- </PropertyDef>
- <PropertyDef name="confirmPassword">
- <Property name="dataType">String</Property>
- <Property name="label">纭瀵嗙爜</Property>
- <Property name="required">true</Property>
- <Validator type="custom">
- <ClientEvent name="onValidate">var confirm = arg.data;
+ </Validator>
+ </PropertyDef>
+ <PropertyDef name="confirmPassword">
+ <Property name="dataType">String</Property>
+ <Property name="label">纭瀵嗙爜</Property>
+ <Property name="required">true</Property>
+ <Validator type="custom">
+ <ClientEvent name="onValidate">var confirm = arg.data;
var password = arg.entity.get("password");
if (confirm ==password) {
arg.result = { state:"ok"}
@@ -248,109 +242,109 @@
arg.result = { state:"error", text: "涓ゆ瀵嗙爜涓嶄竴鑷�"}; 
}
</ClientEvent>
- </Validator>
- </PropertyDef>
- <PropertyDef name="salt">
- <Property name="dataType">String</Property>
- </PropertyDef>
- <PropertyDef name="male">
- <Property name="dataType">boolean</Property>
- <Property name="label">鎬у埆</Property>
- <Property name="mapping">
- <Property name="mapValues">
- <Collection>
- <Entity>
- <Property name="key">true</Property>
- <Property name="value">鐢�</Property>
- </Entity>
- <Entity>
- <Property name="key">false</Property>
- <Property name="value">濂�</Property>
- </Entity>
- </Collection>
+ </Validator>
+ </PropertyDef>
+ <PropertyDef name="salt">
+ <Property name="dataType">String</Property>
+ </PropertyDef>
+ <PropertyDef name="male">
+ <Property name="dataType">boolean</Property>
+ <Property name="label">鎬у埆</Property>
+ <Property name="mapping">
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">true</Property>
+ <Property name="value">鐢�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">false</Property>
+ <Property name="value">濂�</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ <Property name="defaultValue">true</Property>
+ </PropertyDef>
+ <PropertyDef name="enabled">
+ <Property name="dataType">boolean</Property>
+ <Property name="label">鏄惁鍙敤</Property>
+ <Property name="defaultValue">true</Property>
+ </PropertyDef>
+ <PropertyDef name="birthday">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鍑虹敓鏃ユ湡</Property>
+ </PropertyDef>
+ <PropertyDef name="address">
+ <Property name="dataType">String</Property>
+ <Property name="label">鍦板潃</Property>
+ <Validator type="length">
+ <Property name="maxLength">120</Property>
+ </Validator>
+ </PropertyDef>
+ <PropertyDef name="username">
+ <Property name="dataType">String</Property>
+ <Property name="label">鐢ㄦ埛鍚�</Property>
+ <Property name="required">true</Property>
+ <Validator type="ajax">
+ <Property name="service">bdf2.userMaintain#userIsExists</Property>
+ </Validator>
+ <Validator type="length">
+ <Property name="maxLength">60</Property>
+ </Validator>
+ </PropertyDef>
+ <PropertyDef name="cname">
+ <Property name="dataType">String</Property>
+ <Property name="label">涓枃鍚�</Property>
+ <Property name="required">true</Property>
+ <Validator type="length">
+ <Property name="minLength">2</Property>
+ <Property name="maxLength">60</Property>
+ </Validator>
+ </PropertyDef>
+ <PropertyDef name="ename">
+ <Property name="dataType">String</Property>
+ <Property name="label">鑻辨枃鍚�</Property>
+ <Property name="required">true</Property>
+ <Validator type="length">
+ <Property name="maxLength">60</Property>
+ </Validator>
+ </PropertyDef>
+ <PropertyDef name="administrator">
+ <Property name="dataType">boolean</Property>
+ <Property name="label">鏄惁涓虹鐞嗗憳</Property>
+ </PropertyDef>
+ <PropertyDef name="mobile">
+ <Property name="dataType">String</Property>
+ <Property name="label">鎵嬫満</Property>
+ <Property name="required">true</Property>
+ <Validator type="length">
+ <Property name="maxLength">11</Property>
+ <Property name="minLength">11</Property>
+ <Property name="resultMessage">璇疯緭鍏�11浣嶆墜鏈哄彿鐮�</Property>
+ </Validator>
+ </PropertyDef>
+ <PropertyDef name="email">
+ <Property name="dataType">String</Property>
+ <Property name="label">閭</Property>
+ <Property name="required">true</Property>
+ <Validator type="regExp">
+ <Property name="resultMessage">閭鏍煎紡杈撳叆閿欒</Property>
+ <Property name="whiteRegExp">^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})$
</Property>
- </Property>
- <Property name="defaultValue">true</Property>
- </PropertyDef>
- <PropertyDef name="enabled">
- <Property name="dataType">boolean</Property>
- <Property name="label">鏄惁鍙敤</Property>
- <Property name="defaultValue">true</Property>
- </PropertyDef>
- <PropertyDef name="birthday">
- <Property name="dataType">Date</Property>
- <Property name="label">鍑虹敓鏃ユ湡</Property>
- </PropertyDef>
- <PropertyDef name="address">
- <Property name="dataType">String</Property>
- <Property name="label">鍦板潃</Property>
- <Validator type="length">
- <Property name="maxLength">120</Property>
- </Validator>
- </PropertyDef>
- <PropertyDef name="username">
- <Property name="dataType">String</Property>
- <Property name="label">鐢ㄦ埛鍚�</Property>
- <Property name="required">true</Property>
- <Validator type="ajax">
- <Property name="service">bdf2.userMaintain#userIsExists</Property>
- </Validator>
- <Validator type="length">
- <Property name="maxLength">60</Property>
- </Validator>
- </PropertyDef>
- <PropertyDef name="cname">
- <Property name="dataType">String</Property>
- <Property name="label">涓枃鍚�</Property>
- <Property name="required">true</Property>
- <Validator type="length">
- <Property name="minLength">2</Property>
- <Property name="maxLength">60</Property>
- </Validator>
- </PropertyDef>
- <PropertyDef name="ename">
- <Property name="dataType">String</Property>
- <Property name="label">鑻辨枃鍚�</Property>
- <Property name="required">true</Property>
- <Validator type="length">
- <Property name="maxLength">60</Property>
- </Validator>
- </PropertyDef>
- <PropertyDef name="administrator">
- <Property name="dataType">boolean</Property>
- <Property name="label">鏄惁涓虹鐞嗗憳</Property>
- </PropertyDef>
- <PropertyDef name="mobile">
- <Property name="dataType">String</Property>
- <Property name="label">鎵嬫満</Property>
- <Property name="required">true</Property>
- <Validator type="length">
- <Property name="maxLength">11</Property>
- <Property name="minLength">11</Property>
- <Property name="resultMessage">璇疯緭鍏�11浣嶆墜鏈哄彿鐮�</Property>
- </Validator>
- </PropertyDef>
- <PropertyDef name="email">
- <Property name="dataType">String</Property>
- <Property name="label">閭</Property>
- <Property name="required">true</Property>
- <Validator type="regExp">
- <Property name="resultMessage">閭鏍煎紡杈撳叆閿欒</Property>
- <Property name="whiteRegExp">^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})$
- </Property>
- <Property name="validateMode">whiteBlack</Property>
- </Validator>
- <Validator type="length">
- <Property name="maxLength">120</Property>
- </Validator>
- </PropertyDef>
- <PropertyDef name="companyId">
- <Property name="dataType">String</Property>
- </PropertyDef>
- </DataType>
- </Model>
- <View layout="padding:5;regionPadding:5">
- <ClientEvent name="onReady">var deptId = window.parent.DEPT_ID;//鐖堕〉闈腑鐨勫垎搴撶紪鐮�
+ <Property name="validateMode">whiteBlack</Property>
+ </Validator>
+ <Validator type="length">
+ <Property name="maxLength">120</Property>
+ </Validator>
+ </PropertyDef>
+ <PropertyDef name="companyId">
+ <Property name="dataType">String</Property>
+ </PropertyDef>
+ </DataType>
+ </Model>
+ <View layout="padding:5;regionPadding:5">
+ <ClientEvent name="onReady">var deptId = window.parent.DEPT_ID;//鐖堕〉闈腑鐨勫垎搴撶紪鐮�

//鏍规嵁浠撳簱鑷姩鍥炲～绮鍝佺锛岀櫥璁帮紝浜у湴鏂�
autoByDepot = function(depotId){
@@ -375,49 +369,49 @@
}); 
};
</ClientEvent>
- <Property name="packages">font-awesome,css-common</Property>
- <DataSet id="dsMain">
- <Property name="loadMode">lazy</Property>
- <Property name="dataProvider">qualityManagerPR#listQuality</Property>
- <Property name="dataType">[dtMain]</Property>
- <Property name="pageSize">15</Property>
- </DataSet>
- <DataSet id="dsParam">
- <ClientEvent name="onReady">self.insert({});</ClientEvent>
- <Property name="dataType">dtQualityParam</Property>
- </DataSet>
- <DataSet id="dataSetUser">
- <Property name="dataType">[dataTypeUser]</Property>
- <Property name="pageSize">100</Property>
- <Property name="dataProvider">bdf2.userMaintain#loadUsers</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">view.get("#dsMain").insert();
+ <Property name="packages">font-awesome,css-common</Property>
+ <DataSet id="dsMain">
+ <Property name="loadMode">lazy</Property>
+ <Property name="dataProvider">qualityManagerPR#listQuality</Property>
+ <Property name="dataType">[dtMain]</Property>
+ <Property name="pageSize">15</Property>
+ </DataSet>
+ <DataSet id="dsParam">
+ <ClientEvent name="onReady">self.insert({});</ClientEvent>
+ <Property name="dataType">dtQualityParam</Property>
+ </DataSet>
+ <DataSet id="dataSetUser">
+ <Property name="dataType">[dataTypeUser]</Property>
+ <Property name="pageSize">100</Property>
+ <Property name="dataProvider">bdf2.userMaintain#loadUsers</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">view.get("#dsMain").insert();
view.get("#dialogMain").show();
</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:#");
+ <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:#");
+ <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;
}
@@ -430,140 +424,140 @@
}
});
</ClientEvent>
- <Property name="caption">鍒犻櫎</Property>
- <Property name="exClassName">btn-warn</Property>
- <Property name="iconClass">fa fa-minus</Property>
- </Button>
- <Button layoutConstraint="left">
- <ClientEvent name="onClick">view.get("#dsMain").flushAsync();
+ <Property name="caption">鍒犻櫎</Property>
+ <Property name="exClassName">btn-warn</Property>
+ <Property name="iconClass">fa fa-minus</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">view.get("#dsMain").flushAsync();
</ClientEvent>
- <Property name="caption">鍒锋柊</Property>
- <Property name="exClassName">btn-default</Property>
- <Property name="iconClass">fa fa-refresh</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">110</Property>
- <AutoFormElement>
- <Property name="name">depotId</Property>
- <Property name="property">depotId</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">type</Property>
- <Property name="property">type</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">start</Property>
- <Property name="property">start</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">end</Property>
- <Property name="property">end</Property>
- <Editor/>
- </AutoFormElement>
- <Container layout="hbox regionPadding:15">
- <Button layoutConstraint="left">
- <ClientEvent name="onClick">var param = view.get("#dsParam.data");
+ <Property name="caption">鍒锋柊</Property>
+ <Property name="exClassName">btn-default</Property>
+ <Property name="iconClass">fa fa-refresh</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">110</Property>
+ <AutoFormElement>
+ <Property name="name">depotId</Property>
+ <Property name="property">depotId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">type</Property>
+ <Property name="property">type</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">start</Property>
+ <Property name="property">start</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">end</Property>
+ <Property name="property">end</Property>
+ <Editor/>
+ </AutoFormElement>
+ <Container layout="hbox 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({});</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:#");
+ <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({});</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>
- <Property name="property">depotId</Property>
- <Property name="align">center</Property>
- <Property name="name">depotId</Property>
- </DataColumn>
- <DataColumn>
- <Property name="property">type</Property>
- <Property name="align">center</Property>
- <Property name="name">type</Property>
- </DataColumn>
- <DataColumn>
- <Property name="property">foodVariety</Property>
- <Property name="align">center</Property>
- <Property name="name">foodVariety</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">standard</Property>
- <Property name="align">center</Property>
- <Property name="name">standard</Property>
- </DataColumn>
- <DataColumn>
- <Property name="property">user</Property>
- <Property name="align">center</Property>
- <Property name="name">user</Property>
- </DataColumn>
- <DataColumn>
- <Property name="property">time</Property>
- <Property name="align">center</Property>
- <Property name="name">time</Property>
- </DataColumn>
- <DataColumn>
- <Property name="property">result</Property>
- <Property name="align">center</Property>
- <Property name="name">result</Property>
- </DataColumn>
- <DataColumn>
- <Property name="property">normalYear</Property>
- <Property name="align">center</Property>
- <Property name="name">normalYear</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">
- <Property name="visible">false</Property>
- <Property name="caption">璐ㄩ噺宸℃淇℃伅</Property>
- <Property name="width">80%</Property>
- <Property name="height">720</Property>
- <Property name="closeable">false</Property>
- <Buttons>
- <Button>
- <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
+ <Property name="dataSet">dsMain</Property>
+ <Property name="readOnly">true</Property>
+ <RowNumColumn/>
+ <DataColumn>
+ <Property name="property">depotId</Property>
+ <Property name="align">center</Property>
+ <Property name="name">depotId</Property>
+ </DataColumn>
+ <DataColumn>
+ <Property name="property">type</Property>
+ <Property name="align">center</Property>
+ <Property name="name">type</Property>
+ </DataColumn>
+ <DataColumn>
+ <Property name="property">foodVariety</Property>
+ <Property name="align">center</Property>
+ <Property name="name">foodVariety</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">standard</Property>
+ <Property name="align">center</Property>
+ <Property name="name">standard</Property>
+ </DataColumn>
+ <DataColumn>
+ <Property name="property">user</Property>
+ <Property name="align">center</Property>
+ <Property name="name">user</Property>
+ </DataColumn>
+ <DataColumn>
+ <Property name="property">time</Property>
+ <Property name="align">center</Property>
+ <Property name="name">time</Property>
+ </DataColumn>
+ <DataColumn>
+ <Property name="property">result</Property>
+ <Property name="align">center</Property>
+ <Property name="name">result</Property>
+ </DataColumn>
+ <DataColumn>
+ <Property name="property">normalYear</Property>
+ <Property name="align">center</Property>
+ <Property name="name">normalYear</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">
+ <Property name="visible">false</Property>
+ <Property name="caption">璐ㄩ噺宸℃淇℃伅</Property>
+ <Property name="width">80%</Property>
+ <Property name="height">720</Property>
+ <Property name="closeable">false</Property>
+ <Buttons>
+ <Button>
+ <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
if(data.validate() != 'ok'){
$notify("鏁版嵁鏍￠獙澶辫触锛侊紒");
return;
@@ -572,289 +566,290 @@
self.get("parent").hide();
});
</ClientEvent>
- <Property name="caption">淇濆瓨</Property>
- <Property name="iconClass">fa fa-check</Property>
- <Property name="exClassName">btn-normal</Property>
- </Button>
- <Button>
- <ClientEvent name="onClick">view.get("#dsMain.data:#").cancel();
+ <Property name="caption">淇濆瓨</Property>
+ <Property name="iconClass">fa fa-check</Property>
+ <Property name="exClassName">btn-normal</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</Property>
- <Property name="exClassName">btn-warn</Property>
- </Button>
- </Buttons>
- <Children>
- <FieldSet layout="padding:5">
- <Property name="caption">鍩虹淇℃伅</Property>
- <Buttons/>
- <Children>
- <AutoForm>
- <Property name="dataSet">dsMain</Property>
- <Property name="readOnly">false</Property>
- <Property name="labelSeparator">:</Property>
- <Property name="labelAlign">right</Property>
- <Property name="cols">*,*,*</Property>
- <Property name="labelWidth">120</Property>
- <AutoFormElement>
- <Property name="name">depotId</Property>
- <Property name="property">depotId</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">type</Property>
- <Property name="property">type</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">checkArea</Property>
- <Property name="property">checkArea</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">foodVariety</Property>
- <Property name="property">foodVariety</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">standard</Property>
- <Property name="property">standard</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">checkUser</Property>
- <Property name="property">checkUser</Property>
- <Property name="trigger">triggerUserList</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">foodType</Property>
- <Property name="property">foodType</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">user</Property>
- <Property name="property">user</Property>
- <Property name="trigger">triggerUserList1</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">checkNum</Property>
- <Property name="property">checkNum</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">foodLevel</Property>
- <Property name="property">foodLevel</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">time</Property>
- <Property name="property">time</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">checkTime</Property>
- <Property name="property">checkTime</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">foodLocation</Property>
- <Property name="property">foodLocation</Property>
- <Property name="trigger">ddFoodOrigin</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">checkRepresent</Property>
- <Property name="property">checkRepresent</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">checkLevel</Property>
- <Property name="property">checkLevel</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">normalYear</Property>
- <Property name="property">normalYear</Property>
- <Editor>
- <RadioGroup>
- <RadioButton>
- <Property name="text">鍚�</Property>
- <Property name="value">0</Property>
- </RadioButton>
- <RadioButton>
- <Property name="text">鏄�</Property>
- <Property name="value">1</Property>
- </RadioButton>
- </RadioGroup>
- </Editor>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">result</Property>
- <Property name="property">result</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:3">
- <Property name="name">remark</Property>
- <Property name="property">remark</Property>
- <Editor/>
- </AutoFormElement>
- </AutoForm>
- </Children>
- </FieldSet>
- <Control>
- <Property name="height">10</Property>
- </Control>
- <FieldSet layout="padding:5">
- <Property name="caption">妫�娴嬮」淇℃伅</Property>
- <Buttons/>
- <Children>
- <DataGrid id="dataGridCheckItem">
- <Property name="dataPath">#.checkItems</Property>
- <Property name="dataSet">dsMain</Property>
- <Property name="hideMode">display</Property>
- <Property name="highlightCurrentRow">false</Property>
- <Property name="visible">true</Property>
- <RowNumColumn/>
- <DataColumn>
- <Property name="name">standardName</Property>
- <Property name="property">standardName</Property>
- <Property name="align">center</Property>
- <Property name="readOnly">true</Property>
- <Editor/>
- </DataColumn>
- <DataColumn>
- <Property name="name">value</Property>
- <Property name="property">value</Property>
- <Property name="align">center</Property>
- <Editor/>
- </DataColumn>
- <DataColumn>
- <Property name="name">upperLimit</Property>
- <Property name="property">upperLimit</Property>
- <Property name="align">center</Property>
- <Property name="readOnly">true</Property>
- <Editor/>
- </DataColumn>
- <DataColumn>
- <Property name="name">lowerLimit</Property>
- <Property name="property">lowerLimit</Property>
- <Property name="align">center</Property>
- <Property name="readOnly">true</Property>
- <Editor/>
- </DataColumn>
- <DataColumn>
- <Property name="name">unit</Property>
- <Property name="property">unit</Property>
- <Property name="align">center</Property>
- <Property name="readOnly">true</Property>
- <Editor/>
- </DataColumn>
- <DataColumn>
- <Property name="name">remarks</Property>
- <Property name="property">remarks</Property>
- <Property name="align">center</Property>
- <Editor/>
- </DataColumn>
- </DataGrid>
- </Children>
- </FieldSet>
- </Children>
- <Tools/>
- </Dialog>
- <UpdateAction id="uaAction">
- <Property name="dataResolver">qualityManagerPR#saveQuality</Property>
- <UpdateItem>
- <Property name="dataSet">dsMain</Property>
- <Property name="dataPath">[#current]</Property>
- </UpdateItem>
- </UpdateAction>
- <AjaxAction id="ajaxDel">
- <Property name="confirmMessage">纭畾瑕佸垹闄ゅ悧锛�</Property>
- <Property name="service">qualityManagerPR#delQuality</Property>
- </AjaxAction>
- <AjaxAction id="ajaxGetDepot">
- <Property name="service">depotPR#getDepot</Property>
- </AjaxAction>
- <AjaxAction id="ajaxGetCheck">
- <Property name="service">checkStandardPR#listCheckItemsByFoodVariety</Property>
- </AjaxAction>
- <CustomDropDown id="ddFoodOrigin">
- <Property name="minHeight">480</Property>
- <Property name="assignmentMap">foodLocation=name</Property>
- <Property name="minWidth">360</Property>
- <Container layout="regionPadding:5">
- <DataSet id="dsFoodOrigin">
- <Property name="dataProvider">dicAreaPR#pageList</Property>
- <Property name="dataType">[dtArea]</Property>
- <Property name="parameter"></Property>
- <Property name="pageSize">30</Property>
- </DataSet>
- <Container layout="hbox regionPadding:5">
- <TextEditor id="key2">
- <Property name="blankText">-- 缂栫爜鎴栬�呭悕绉� --</Property>
- <Property name="width">200</Property>
- </TextEditor>
- <Button>
- <ClientEvent name="onClick">var key = view.get("#key2.value");
+ <Property name="caption">鍙栨秷</Property>
+ <Property name="iconClass">fa fa-times</Property>
+ <Property name="exClassName">btn-warn</Property>
+ </Button>
+ </Buttons>
+ <Children>
+ <FieldSet layout="padding:5">
+ <Property name="caption">鍩虹淇℃伅</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="readOnly">false</Property>
+ <Property name="labelSeparator">:</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="cols">*,*,*</Property>
+ <Property name="labelWidth">120</Property>
+ <AutoFormElement>
+ <Property name="name">depotId</Property>
+ <Property name="property">depotId</Property>
+ <Property name="trigger">autoMappingDropDown2</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">type</Property>
+ <Property name="property">type</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">checkArea</Property>
+ <Property name="property">checkArea</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">foodVariety</Property>
+ <Property name="property">foodVariety</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">standard</Property>
+ <Property name="property">standard</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">checkUser</Property>
+ <Property name="property">checkUser</Property>
+ <Property name="trigger">triggerUserList</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">foodType</Property>
+ <Property name="property">foodType</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">user</Property>
+ <Property name="property">user</Property>
+ <Property name="trigger">triggerUserList1</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">checkNum</Property>
+ <Property name="property">checkNum</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">foodLevel</Property>
+ <Property name="property">foodLevel</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">time</Property>
+ <Property name="property">time</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">checkTime</Property>
+ <Property name="property">checkTime</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">foodLocation</Property>
+ <Property name="property">foodLocation</Property>
+ <Property name="trigger">ddFoodOrigin</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">checkRepresent</Property>
+ <Property name="property">checkRepresent</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">checkLevel</Property>
+ <Property name="property">checkLevel</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">normalYear</Property>
+ <Property name="property">normalYear</Property>
+ <Editor>
+ <RadioGroup>
+ <RadioButton>
+ <Property name="text">鍚�</Property>
+ <Property name="value">0</Property>
+ </RadioButton>
+ <RadioButton>
+ <Property name="text">鏄�</Property>
+ <Property name="value">1</Property>
+ </RadioButton>
+ </RadioGroup>
+ </Editor>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">result</Property>
+ <Property name="property">result</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:3">
+ <Property name="name">remark</Property>
+ <Property name="property">remark</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </FieldSet>
+ <Control>
+ <Property name="height">10</Property>
+ </Control>
+ <FieldSet layout="padding:5">
+ <Property name="caption">妫�娴嬮」淇℃伅</Property>
+ <Buttons/>
+ <Children>
+ <DataGrid id="dataGridCheckItem">
+ <Property name="dataPath">#.checkItems</Property>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="hideMode">display</Property>
+ <Property name="highlightCurrentRow">false</Property>
+ <Property name="visible">true</Property>
+ <RowNumColumn/>
+ <DataColumn>
+ <Property name="name">standardName</Property>
+ <Property name="property">standardName</Property>
+ <Property name="align">center</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </DataColumn>
+ <DataColumn>
+ <Property name="name">value</Property>
+ <Property name="property">value</Property>
+ <Property name="align">center</Property>
+ <Editor/>
+ </DataColumn>
+ <DataColumn>
+ <Property name="name">upperLimit</Property>
+ <Property name="property">upperLimit</Property>
+ <Property name="align">center</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </DataColumn>
+ <DataColumn>
+ <Property name="name">lowerLimit</Property>
+ <Property name="property">lowerLimit</Property>
+ <Property name="align">center</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </DataColumn>
+ <DataColumn>
+ <Property name="name">unit</Property>
+ <Property name="property">unit</Property>
+ <Property name="align">center</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </DataColumn>
+ <DataColumn>
+ <Property name="name">remarks</Property>
+ <Property name="property">remarks</Property>
+ <Property name="align">center</Property>
+ <Editor/>
+ </DataColumn>
+ </DataGrid>
+ </Children>
+ </FieldSet>
+ </Children>
+ <Tools/>
+ </Dialog>
+ <UpdateAction id="uaAction">
+ <Property name="dataResolver">qualityManagerPR#saveQuality</Property>
+ <UpdateItem>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="dataPath">[#current]</Property>
+ </UpdateItem>
+ </UpdateAction>
+ <AjaxAction id="ajaxDel">
+ <Property name="confirmMessage">纭畾瑕佸垹闄ゅ悧锛�</Property>
+ <Property name="service">qualityManagerPR#delQuality</Property>
+ </AjaxAction>
+ <AjaxAction id="ajaxGetDepot">
+ <Property name="service">depotPR#getDepot</Property>
+ </AjaxAction>
+ <AjaxAction id="ajaxGetCheck">
+ <Property name="service">checkStandardPR#listCheckItemsByParam</Property>
+ </AjaxAction>
+ <CustomDropDown id="ddFoodOrigin">
+ <Property name="minHeight">480</Property>
+ <Property name="assignmentMap">foodLocation=name</Property>
+ <Property name="minWidth">360</Property>
+ <Container layout="regionPadding:5">
+ <DataSet id="dsFoodOrigin">
+ <Property name="dataProvider">dicAreaPR#pageList</Property>
+ <Property name="dataType">[dtArea]</Property>
+ <Property name="parameter"></Property>
+ <Property name="pageSize">30</Property>
+ </DataSet>
+ <Container layout="hbox regionPadding:5">
+ <TextEditor id="key2">
+ <Property name="blankText">-- 缂栫爜鎴栬�呭悕绉� --</Property>
+ <Property name="width">200</Property>
+ </TextEditor>
+ <Button>
+ <ClientEvent name="onClick">var key = view.get("#key2.value");
view.get("#dsFoodOrigin").set("parameter",{key:key}).flushAsync();
</ClientEvent>
- <Property name="caption">鏌ヨ</Property>
- <Property name="iconClass">fa fa-search</Property>
- </Button>
- <Button>
- <ClientEvent name="onClick">var data = view.get("#dsFoodOrigin.data:#");
+ <Property name="caption">鏌ヨ</Property>
+ <Property name="iconClass">fa fa-search</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">var data = view.get("#dsFoodOrigin.data:#");
if(data){
view.get("#ddFoodOrigin").close(data.toJSON());
}
</ClientEvent>
- <Property name="iconClass">fa fa-check</Property>
- <Property name="caption">纭畾</Property>
- </Button>
- </Container>
- <DataGrid>
- <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsFoodOrigin.data:#");
+ <Property name="iconClass">fa fa-check</Property>
+ <Property name="caption">纭畾</Property>
+ </Button>
+ </Container>
+ <DataGrid>
+ <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsFoodOrigin.data:#");
if(data){
view.get("#ddFoodOrigin").close(data.toJSON());
}
</ClientEvent>
- <Property name="dataSet">dsFoodOrigin</Property>
- <Property name="readOnly">true</Property>
- <DataColumn name="code">
- <Property name="property">code</Property>
- <Property name="readOnly">true</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="name">
- <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
+ <Property name="dataSet">dsFoodOrigin</Property>
+ <Property name="readOnly">true</Property>
+ <DataColumn name="code">
+ <Property name="property">code</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="name">
+ <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
arg.processDefault = true;
</ClientEvent>
- <Property name="property">name</Property>
- <Property name="readOnly">true</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="simple">
- <Property name="property">simple</Property>
- <Property name="readOnly">true</Property>
- <Property name="align">center</Property>
- </DataColumn>
- </DataGrid>
- <DataPilot layoutConstraint="bottom">
- <Property name="dataSet">dsFoodOrigin</Property>
- </DataPilot>
- </Container>
- </CustomDropDown>
- <DataSetDropDown id="triggerUserList">
- <Property name="dataSet">dataSetUser</Property>
- <Property name="property">cname</Property>
- <Property name="assignmentMap">checkUser=cname</Property>
- </DataSetDropDown>
- <DataSetDropDown id="triggerUserList1">
- <Property name="dataSet">dataSetUser</Property>
- <Property name="property">cname</Property>
- <Property name="assignmentMap">user=cname</Property>
- </DataSetDropDown>
- </View>
+ <Property name="property">name</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="simple">
+ <Property name="property">simple</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ </DataGrid>
+ <DataPilot layoutConstraint="bottom">
+ <Property name="dataSet">dsFoodOrigin</Property>
+ </DataPilot>
+ </Container>
+ </CustomDropDown>
+ <DataSetDropDown id="triggerUserList">
+ <Property name="dataSet">dataSetUser</Property>
+ <Property name="property">cname</Property>
+ <Property name="assignmentMap">checkUser=cname</Property>
+ </DataSetDropDown>
+ <DataSetDropDown id="triggerUserList1">
+ <Property name="dataSet">dataSetUser</Property>
+ <Property name="property">cname</Property>
+ <Property name="assignmentMap">user=cname</Property>
+ </DataSetDropDown>
+ </View>
</ViewConfig>
diff --git a/igds-core/src/main/java/com/ld/igds/models/MQuality.java b/igds-core/src/main/java/com/ld/igds/models/MQuality.java
index 62e08a3..a8000d3 100644
--- a/igds-core/src/main/java/com/ld/igds/models/MQuality.java
+++ b/igds-core/src/main/java/com/ld/igds/models/MQuality.java
@@ -91,7 +91,7 @@
private Date bgcjsj;
@PropertyDef(label = "瀹℃牳浜哄鍚�")
- @Column(name = "shrxm", length = 64, nullable = false)
+ @Column(name = "shrxm", length = 64)
private String shrxm;
@PropertyDef(label = "鎵︽牱鍗曠紪鍙�")
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/InoutBill.java b/igds-inout/src/main/java/com/ld/igds/inout/InoutBill.java
index c14dd6d..47491f9 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/InoutBill.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/InoutBill.java
@@ -19,8 +19,22 @@
* 榛樿楠屾鍗�
*/
public static String IN_CHECK_DEFAULT = "<!DOCTYPE html><html lang='zh-cn'><head><meta http-equiv='Content-Type'content='text/html;charset=UTF-8'><title>鍑哄簱鍖栭獙鍗�</title><style>body{text-align:center;padding:10px}h1{font-weight:400;font-size:24px;margin:5px}span{padding-bottom:10px}.div-tit{padding-top:10px}.div-tit2{padding-top:30px}.fl{float:left}.fr{float:right}.fp{margin-left:145px}.f2{float:left}table{width:100%;border-right:1px solid;border-bottom:1px solid}table td{border-left:1px solid;border-top:1px solid;height:30px;font-size:14px}</style></head><body><h1>billTitle</h1><div class='div-tit'><span class='fl'>鍙戣揣鍗曚綅锛歝ustomerName</span><span>鏃堕棿锛歵ime</span><span class='fr'>鍏ュ簱鍗曞彿锛歴erId</span></div><table cellspacing='0'cellpadding='0'><tr><td>鍝佺</td><td>foodVariety</td><td>鏍峰搧鏉ユ簮</td><td>鐜板満鎵︽牱</td><td>杞︾墝鍙�</td><td>plateNum</td><td>鎵胯繍浜�</td><td>userName</td><td></td></tr><tr><td>鏀惰揣骞翠唤</td><td>foodYear</td><td>鑹叉辰姘斿懗</td><td>姝ｅ父</td><td>鍏ュ簱浠撳彿</td><td>depotName</td><td>绮鎬ц川</td><td>鍟嗗搧绮�</td><td></td></tr><tr><td>妫�楠岄」鐩�</td><td>鏍囧噯鍊�</td><td>妫�楠屽��</td><td>妫�楠岄」鐩�</td><td>鏍囧噯鍊�</td><td>妫�楠屽��</td><td>妫�楠岄」鐩�</td><td>鏍囧噯鍊�</td><td>妫�楠屽��</td></tr><tr><td>瀹归噸g/l</td><td>C03_ST</td><td>C03_VAL</td><td>姘村垎</td><td>C01_ST</td><td>C01_VAL</td><td>鏉傝川</td><td>C02_ST</td><td>C02_VAL</td></tr><tr><td>鍑虹硻鐜�%</td><td>C09_ST</td><td>C09_VAL</td><td>閰稿��</td><td>C22_ST</td><td>C22_VAL</td><td>杩囨哀鍖栧��</td><td>C23_ST</td><td>C23_VAL</td></tr><tr><td>鏁寸簿绫崇巼%</td><td>C10_ST</td><td>C10_VAL</td><td>涓嶅畬鍠勭矑%</td><td>C04_ST</td><td>C04_VAL</td><td>婧跺墏娈嬬暀閲�</td><td>C24_ST</td><td>C24_VAL</td></tr><tr><td>闈㈢瓔鍚告按閲�</td><td>C08_ST</td><td>C08_VAL</td><td>璋峰绯欑背%</td><td>C12_ST</td><td>C12_VAL</td><td>閲嶉噾灞�(闀�)</td><td>C25_ST</td><td>C25_VAL</td></tr><tr><td>鑴傝偑閰稿��</td><td>C14_ST</td><td>C14_VAL</td><td>鐢熼湁鐜�%</td><td>C29_ST</td><td>C29_VAL</td><td>榛勭矑绫�%</td><td>C11_ST</td><td>C11_VAL</td></tr><tr><td>鍛曞悙姣掔礌</td><td>C27_ST</td><td>C27_VAL</td><td>榛勬洸闇夋瘨绱燘1</td><td>C28_ST</td><td>C28_VAL</td><td>閲嶉噾灞�(鐮�)</td><td>C30_ST</td><td>C30_VAL</td></tr><tr><td>鐜夌背璧ら湁鐑叜</td><td>C31_ST</td><td>C31_VAL</td><td></td><td></td><td></td><td></td><td></td><td></td></tr><tr><td colspan=鈥�2鈥�>妫�楠岀粨璁哄強寤鸿</td><td rowspan='8'colspan='8'></td></tr></table><div class='div-tit'><span class='fl'>妫�楠屽憳锛歝heckUser</span><span class='fr'>鎵胯繍浜虹瀛楋細 </span></div></body></html>";
-
-
+ /**
+ * 灏忛害鍖栭獙鍗�
+ */
+ public static String IN_CHECK_WHEAT = "<!DOCTYPE html><html lang='zh-cn'><head><meta http-equiv='Content-Type' content='text/html;charset=UTF-8'><title>璐ㄦ鎶ュ憡(灏忛害)</title><style>body {text-align: center;padding: 10px} .tit {margin: 10px;font-size: 24px;font-family: '瀹嬩綋';padding-top: 15px} .div-tit {padding-top: 10px} table {width: 100%;border-right: 1px solid;border-bottom: 1px solid;font-size: 14px} table td {border-left: 1px solid;border-top: 1px solid;height: 38px} .sp1 {width: 33%;float: left;padding-bottom: 10px}</style></head><body><h1 class='tit'>璐ㄦ鎶ュ憡(foodVariety)</h1><div class='div-tit'><span class='sp1'></span><span class='sp1'></span><span class='sp1'>鍗曞彿锛歴erId</span></div><table cellspacing='0' cellpadding='0'><tr><td colspan='2' rowspan=\"5\" `width`=\"15%\">鏍峰搧淇℃伅</td><td width='14%'>鍗曚綅鍚嶇О</td><td colspan='2' `width`='28%'>customerName</td><td width='15%'>搴撳尯鍚嶇О</td><td colspan='2' `width`='28%'>deptName</td></tr><tr><td width='14%'>浠撴埧鍚嶇О</td><td width='14%'>depotName</td><td width='14%'>璐т綅鍚嶇О</td><td width='15%'>hwmc</td><td width='14%'>淇濈鍛�</td><td width='14%'>storeKeeperName</td></tr><tr><td>鍝佺</td><td>foodVariety</td><td>鎬ц川</td><td>foodType</td><td>浠撳唴绮鏁伴噺</td><td>foodNumber KG</td></tr><tr><td>浜у湴</td><td>foodLocation</td><td>绛夌骇</td><td>foodLevel</td><td>鐢熶骇骞撮檺</td><td>scnx</td></tr><tr><td>鏍峰搧鏁伴噺</td><td>checkNum</td><td>鏍峰搧浠ｈ〃鏁伴噺</td><td>foodNumber KG</td><td colspan=\"2\"></td></tr><tr><td colspan='2'>妫�楠屽崟浣�</td><td colspan=\"6\">unit</td></tr><tr><td colspan='2' rowspan=\"2\">璐ㄦ浜哄憳</td><td>鎵︽牱鍛�</td><td>sampleUser</td><td>妫�楠屽憳</td><td>checkUser</td><td colspan=\"2\"></td></tr><tr><td>鎵︽牱鏃堕棿</td><td>sampleTime</td><td>妫�楠屾椂闂�</td><td>checkTime2</td><td>鎶ュ憡鍑哄叿鏃堕棿</td><td>bgcjsj</td></tr><tr><td rowspan=\"6\">璐ㄦ缁撴灉</td><td rowspan=\"3\">璐ㄩ噺鎸囨爣妫�楠�</td><td>鍝佺</td><td>foodVariety</td><td>瀹归噸锛坓/L锛�</td><td>bulkWeight</td><td>绛夌骇</td><td>foodLevel</td></tr><tr><td>鑹叉辰銆佹皵鍛�</td><td>C16_ST</td><td>鏉傝川锛�%锛�</td><td>C02_ST</td><td>姘村垎锛�%锛�</td><td>c_perWet</td></tr><tr><td>涓嶅畬鍠勭矑锛�%锛�</td><td>C04_ST</td><td>鐢熻娊绮掞紙%锛�</td><td>C05_ST</td><td>鐢熼湁绮掞紙%锛�</td><td>C06_ST</td></tr><tr><td>鍌ㄥ瓨鍝佽川妫�楠�</td><td>闈㈢瓔鍚告按閲忥紙%锛�</td><td>C08_ST</td><td>鍝佸皾鍒嗗��</td><td>C15_ST</td><td>鑹叉辰銆佹皵鍛�</td><td>C16_ST</td></tr><tr><td rowspan=\"2\">椋熷搧瀹夊叏妫�楠�</td><td>鍛曞悙姣掞紙mg/kg锛�</td><td>C27_ST</td><td>鐜夌背璧ら湁鐑叜锛埼糶/kg锛�</td><td>C31_ST</td><td>閾咃紙mg/kg锛�</td><td>C18_ST</td></tr><tr><td>闀夛紙mg/kg锛�</td><td>C19_ST</td><td>姹烇紙渭g/kg锛�</td><td>C20_ST</td><td>鏃犳満鐮凤紙mg/kg锛�</td><td>C21_ST</td></tr><tr><td colspan=\"2\">澶囨敞</td><td colspan=\"6\">remark</td></tr></table></body></html>";
+ /**
+ * 绋昏胺鍖栭獙鍗�
+ */
+ public static String IN_CHECK_PADDY = "<!DOCTYPE html><html lang='zh-cn'><head><meta http-equiv='Content-Type' content='text/html;charset=UTF-8'><title>璐ㄦ鎶ュ憡(绋昏胺)</title><style>body {text-align: center;padding: 10px} .tit {margin: 10px;font-size: 24px;font-family: '瀹嬩綋';padding-top: 15px} .div-tit {padding-top: 10px} table {width: 100%;border-right: 1px solid;border-bottom: 1px solid;font-size: 14px} table td {border-left: 1px solid;border-top: 1px solid;height: 38px} .sp1 {width: 33%;float: left;padding-bottom: 10px}</style></head><body><h1 class='tit'>璐ㄦ鎶ュ憡(绋昏胺)</h1><div class='div-tit'><span class='sp1'></span><span class='sp1'></span><span class='sp1'>鍗曞彿锛歴erId</span></div><table cellspacing='0' cellpadding='0'><tr><td colspan='2' rowspan=\"5\" `width`=\"15%\">鏍峰搧淇℃伅</td><td width='14%'>鍗曚綅鍚嶇О</td><td colspan='2' `width`='28%'>customerName</td><td width='15%'>搴撳尯鍚嶇О</td><td colspan='2' `width`='28%'>deptName</td></tr><tr><td width='14%'>浠撴埧鍚嶇О</td><td width='14%'>depotName</td><td width='14%'>璐т綅鍚嶇О</td><td width='15%'>hwmc</td><td width='14%'>淇濈鍛�</td><td width='14%'>storeKeeperName</td></tr><tr><td>鍝佺</td><td>foodVariety</td><td>鎬ц川</td><td>foodType</td><td>浠撳唴绮鏁伴噺</td><td>foodNumber KG</td></tr><tr><td>浜у湴</td><td>foodLocation</td><td>绛夌骇</td><td>foodLevel</td><td>鐢熶骇骞撮檺</td><td>scnx</td></tr><tr><td>鏍峰搧鏁伴噺</td><td>checkNum</td><td>鏍峰搧浠ｈ〃鏁伴噺</td><td>foodNumber KG</td><td colspan=\"2\"></td></tr><tr><td colspan='2'>妫�楠屽崟浣�</td><td colspan=\"6\">unit</td></tr><tr><td colspan='2' rowspan=\"2\">璐ㄦ浜哄憳</td><td>鎵︽牱鍛�</td><td>sampleUser</td><td>妫�楠屽憳</td><td>checkUser</td><td colspan=\"2\"></td></tr><tr><td>鎵︽牱鏃堕棿</td><td>sampleTime</td><td>妫�楠屾椂闂�</td><td>checkTime2</td><td>鎶ュ憡鍑哄叿鏃堕棿</td><td>bgcjsj</td></tr><tr><td rowspan=\"7\">璐ㄦ缁撴灉</td><td rowspan=\"4\">璐ㄩ噺鎸囨爣妫�楠�</td><td>鍝佺</td><td>foodVariety</td><td>鍑虹硻鐜囷紙%锛�</td><td>rough</td><td>绛夌骇</td><td>foodLevel</td></tr><tr><td>鏁寸簿绫崇巼锛�%锛�</td><td>C10_ST</td><td>鏉傝川锛�%锛�</td><td>C02_ST</td><td>姘村垎锛�%锛�</td><td>c_perWet</td></tr><tr><td>榛勭矑绫筹紙%锛�</td><td>C11_ST</td><td>璋峰绯欑背锛�%锛�</td><td>C12_ST</td><td>鑹叉辰銆佹皵鍛�</td><td>C16_ST</td></tr><tr><td>浜掓贩鐜囷紙%锛�</td><td>C13_ST</td><td colspan=\"4\"></td></tr><tr><td>鍌ㄥ瓨鍝佽川妫�楠�</td><td>鑴傝偑閰稿�硷紙mgKOH/100g锛�</td><td>C14_ST</td><td>鍝佸皾鍒嗗��</td><td>C15_ST</td><td>鑹叉辰銆佹皵鍛�</td><td>C16_ST</td></tr><tr><td rowspan=\"2\">椋熷搧瀹夊叏妫�楠�</td><td>榛勬洸闇夋瘨绱� B1锛埼糶/kg锛�</td><td>C17_ST</td><td>閾咃紙mg/kg锛�</td><td>C18_ST</td><td>闀夛紙mg/kg锛�</td><td>C19_ST</td></tr><tr><td>姹烇紙渭g/kg锛�</td><td>C20_ST</td><td>鏃犳満鐮凤紙mg/kg锛�</td><td>C21_ST</td><td colspan=\"2\"></td></tr><tr><td colspan=\"2\">澶囨敞</td><td colspan=\"6\">remark</td></tr></table></body></html>";
+ /**
+ * 鐜夌背鍖栭獙鍗�
+ */
+ public static String IN_CHECK_CORN = "<!DOCTYPE html><html lang='zh-cn'><head><meta http-equiv='Content-Type' content='text/html;charset=UTF-8'><title>璐ㄦ鎶ュ憡(鐜夌背)</title><style>body {text-align: center;padding: 10px} .tit {margin: 10px;font-size: 24px;font-family: '瀹嬩綋';padding-top: 15px} .div-tit {padding-top: 10px} table {width: 100%;border-right: 1px solid;border-bottom: 1px solid;font-size: 14px} table td {border-left: 1px solid;border-top: 1px solid;height: 38px} .sp1 {width: 33%;float: left;padding-bottom: 10px}</style></head><body><h1 class='tit'>璐ㄦ鎶ュ憡(foodVariety)</h1><div class='div-tit'><span class='sp1'></span><span class='sp1'></span><span class='sp1'>鍗曞彿锛歴erId</span></div><table cellspacing='0' cellpadding='0'><tr><td colspan='2' rowspan=\"5\" `width`=\"15%\">鏍峰搧淇℃伅</td><td width='14%'>鍗曚綅鍚嶇О</td><td colspan='2' `width`='28%'>customerName</td><td width='15%'>搴撳尯鍚嶇О</td><td colspan='2' `width`='28%'>deptName</td></tr><tr><td width='14%'>浠撴埧鍚嶇О</td><td width='14%'>depotName</td><td width='14%'>璐т綅鍚嶇О</td><td width='15%'>hwmc</td><td width='14%'>淇濈鍛�</td><td width='14%'>storeKeeperName</td></tr><tr><td>鍝佺</td><td>foodVariety</td><td>鎬ц川</td><td>foodType</td><td>浠撳唴绮鏁伴噺</td><td>foodNumber KG</td></tr><tr><td>浜у湴</td><td>foodLocation</td><td>绛夌骇</td><td>foodLevel</td><td>鐢熶骇骞撮檺</td><td>scnx</td></tr><tr><td>鏍峰搧鏁伴噺</td><td>checkNum</td><td>鏍峰搧浠ｈ〃鏁伴噺</td><td>foodNumber KG</td><td colspan=\"2\"></td></tr><tr><td colspan='2'>妫�楠屽崟浣�</td><td colspan=\"6\">unit</td></tr><tr><td colspan='2' rowspan=\"2\">璐ㄦ浜哄憳</td><td>鎵︽牱鍛�</td><td>sampleUser</td><td>妫�楠屽憳</td><td>checkUser</td><td colspan=\"2\"></td></tr><tr><td>鎵︽牱鏃堕棿</td><td>sampleTime</td><td>妫�楠屾椂闂�</td><td>checkTime2</td><td>鎶ュ憡鍑哄叿鏃堕棿</td><td>bgcjsj</td></tr><tr><td rowspan=\"6\">璐ㄦ缁撴灉</td><td rowspan=\"3\">璐ㄩ噺鎸囨爣妫�楠�</td><td>鍝佺</td><td>foodVariety</td><td>瀹归噸锛坓/L锛�</td><td>bulkWeight</td><td>绛夌骇</td><td>foodLevel</td></tr><tr><td>鑹叉辰銆佹皵鍛�</td><td>C16_ST</td><td>鏉傝川锛�%锛�</td><td>C02_ST</td><td>姘村垎锛�%锛�</td><td>c_perWet</td></tr><tr><td>涓嶅畬鍠勭矑锛�%锛�</td><td>C04_ST</td><td>鐢熼湁绮掞紙%锛�</td><td>C06_ST</td><td>闇夊彉绮掞紙%锛�</td><td>C07_ST</td></tr><tr><td>鍌ㄥ瓨鍝佽川妫�楠�</td><td>鑴傝偑閰稿�硷紙mgKOH/100g锛�</td><td>C14_ST</td><td>鍝佸皾鍒嗗��</td><td>C15_ST</td><td>鑹叉辰銆佹皵鍛�</td><td>C16_ST</td></tr><tr><td rowspan=\"2\">椋熷搧瀹夊叏妫�楠�</td><td>鍛曞悙姣掞紙mg/kg锛�</td><td>C27_ST</td><td>鐜夌背璧ら湁鐑叜锛埼糶/kg锛�</td><td>C31_ST</td><td>閾咃紙mg/kg锛�</td><td>C18_ST</td></tr><tr><td>闀夛紙mg/kg锛�</td><td>C19_ST</td><td>姹烇紙渭g/kg锛�</td><td>C20_ST</td><td>鏃犳満鐮凤紙mg/kg锛�</td><td>C21_ST</td></tr><tr><td colspan=\"2\">澶囨敞</td><td colspan=\"6\">remark</td></tr></table></body></html>";
+ /**
+ * 澶ц眴鍖栭獙鍗�
+ */
+ public static String IN_CHECK_SOYBEAN = "<!DOCTYPE html><html lang='zh-cn'><head><meta http-equiv='Content-Type' content='text/html;charset=UTF-8'><title>璐ㄦ鎶ュ憡(澶ц眴)</title><style>body {text-align: center;padding: 10px} .tit {margin: 10px;font-size: 24px;font-family: '瀹嬩綋';padding-top: 15px} .div-tit {padding-top: 10px} table {width: 100%;border-right: 1px solid;border-bottom: 1px solid;font-size: 14px} table td {border-left: 1px solid;border-top: 1px solid;height: 38px} .sp1 {width: 33%;float: left;padding-bottom: 10px}</style></head><body><h1 class='tit'>璐ㄦ鎶ュ憡(foodVariety)</h1><div class='div-tit'><span class='sp1'></span><span class='sp1'></span><span class='sp1'>鍗曞彿锛歴erId</span></div><table cellspacing='0' cellpadding='0'><tr><td colspan='2' rowspan=\"5\" `width`=\"15%\">鏍峰搧淇℃伅</td><td width='14%'>鍗曚綅鍚嶇О</td><td colspan='2' `width`='28%'>customerName</td><td width='15%'>搴撳尯鍚嶇О</td><td colspan='2' `width`='28%'>deptName</td></tr><tr><td width='14%'>浠撴埧鍚嶇О</td><td width='14%'>depotName</td><td width='14%'>璐т綅鍚嶇О</td><td width='15%'>hwmc</td><td width='14%'>淇濈鍛�</td><td width='14%'>storeKeeperName</td></tr><tr><td>鍝佺</td><td>foodVariety</td><td>鎬ц川</td><td>foodType</td><td>浠撳唴绮鏁伴噺</td><td>foodNumber KG</td></tr><tr><td>浜у湴</td><td>foodLocation</td><td>绛夌骇</td><td>foodLevel</td><td>鐢熶骇骞撮檺</td><td>scnx</td></tr><tr><td>鏍峰搧鏁伴噺</td><td>checkNum</td><td>鏍峰搧浠ｈ〃鏁伴噺</td><td>foodNumber KG</td><td colspan=\"2\"></td></tr><tr><td colspan='2'>妫�楠屽崟浣�</td><td colspan=\"6\">unit</td></tr><tr><td colspan='2' rowspan=\"2\">璐ㄦ浜哄憳</td><td>鎵︽牱鍛�</td><td>sampleUser</td><td>妫�楠屽憳</td><td>checkUser</td><td colspan=\"2\"></td></tr><tr><td>鎵︽牱鏃堕棿</td><td>sampleTime</td><td>妫�楠屾椂闂�</td><td>checkTime2</td><td>鎶ュ憡鍑哄叿鏃堕棿</td><td>bgcjsj</td></tr><tr><td rowspan=\"5\">璐ㄦ缁撴灉</td><td rowspan=\"3\">璐ㄩ噺鎸囨爣妫�楠�</td><td>鍝佺</td><td>foodVariety</td><td>瀹屾暣绮掔巼锛�%锛�</td><td>C22_ST</td><td>绛夌骇</td><td>foodLevel</td></tr><tr><td>鏉傝川锛�%锛�</td><td>C02_ST</td><td>姘村垎锛�%锛�</td><td>c_perWet</td><td>鑹叉辰銆佹皵鍛�</td><td>C16_ST</td></tr><tr><td>鎹熶激绮掔巼锛�%锛�</td><td>C23_ST</td><td>鐑崯浼ょ矑锛�%锛�</td><td>C24_ST</td><td colspan=\"2\"></td></tr><tr><td>鍌ㄥ瓨鍝佽川妫�楠�</td><td>绮楄剛鑲吀鍊硷紙mgKOH/100g锛�</td><td>C25_ST</td><td>鍝佸皾鍒嗗��</td><td>C15_ST</td><td>鑹叉辰銆佹皵鍛�</td><td>C16_ST</td></tr><tr><td>椋熷搧瀹夊叏妫�楠�</td><td>閾咃紙mg/kg锛�</td><td>C18_ST</td><td>闀夛紙mg/kg锛�</td><td>C19_ST</td><td colspan=\"2\"></td></tr><tr><td colspan=\"2\">澶囨敞</td><td colspan=\"6\">remark</td></tr></table></body></html>";
/**
* 榛樿缁撶畻鍗�
*/
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java
index 01a5ee0..e8e762e 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java
@@ -335,15 +335,26 @@
// 鑾峰彇鍖栭獙鏁版嵁
List<CheckItemData> checkLst = data.getCheckItems();
if (null == checkLst)
- checkStandardService.getCheckItemById(data.getCheckId(),
- data.getCompanyId());
+ checkStandardService.getCheckItemById(data.getCheckId(), data.getCompanyId());
if (checkLst == null || checkLst.size() < 1) {
return "鏃犲寲楠屾暟鎹紝涓嶆墦鍗帮紒";
}
-
+ String mark = data.getFoodVariety().substring(0, 3);
// 璋冩暣妯＄増鏁版嵁骞惰繑鍥�
- String htmlStr = InoutBill.IN_CHECK_DEFAULT;
+ String htmlStr = "";
+ if (mark == FoodVariety.FOOD_VARIETY_WHEAT) {
+ htmlStr = InoutBill.IN_CHECK_WHEAT;
+ } else if (mark == FoodVariety.FOOD_VARIETY_PADDY) {
+ htmlStr = InoutBill.IN_CHECK_PADDY;
+ } else if (mark == FoodVariety.FOOD_VARIETY_CORN) {
+ htmlStr = InoutBill.IN_CHECK_CORN;
+ } else if (data.getFoodVariety() == FoodVariety.FOOD_VARIETY_SOYBEAN) {
+ htmlStr = InoutBill.IN_CHECK_SOYBEAN;
+ } else {
+ return "妯℃澘鏆傛湭纭畾锛侊紒";
+ }
+
DefaultDept dept = sysDeptService.getCacheDept(data.getCompanyId(),
data.getDeptId());
@@ -354,24 +365,30 @@
// 鏇挎崲鍩虹鏁版嵁
String time = DateFormatUtils.format(data.getRegisterTime(),
"yyyy-MM-dd");
- htmlStr = htmlStr.replace("time", time);
+// htmlStr = htmlStr.replace("time", time);
htmlStr = htmlStr.replace("customerName", data.getCustomerName());
htmlStr = htmlStr.replace("serId", data.getId());
+ htmlStr = htmlStr.replace("deptName", dept.getName());
htmlStr = htmlStr.replace("foodVariety", FoodVariety.getMsg(data.getFoodVariety()));
htmlStr = htmlStr.replace("plateNum", data.getPlateNum());
htmlStr = htmlStr.replace("userName", data.getUserName());
htmlStr = htmlStr.replace("foodYear", data.getFoodYear() == null ? "/" : data.getFoodYear());
Depot depot = commonService.getCacheDepot(data.getCompanyId(), data.getDepotId());
+ htmlStr = htmlStr.replace("storeKeeperName", depot == null ? "" : (depot.getStoreKeeperName() == null ? "" : depot.getStoreKeeperName()));
htmlStr = htmlStr.replace("depotName", depot == null ? "/" : depot.getName());
htmlStr = htmlStr.replace("checkUser", data.getCheckUser() == null ? "/" : data.getCheckUser());
-
+ htmlStr = htmlStr.replace("foodType", data.getFoodType() == null ? "/" : data.getFoodType());
+ htmlStr = htmlStr.replace("foodNumber", data.getSettleWeight() + "");
+ htmlStr = htmlStr.replace("checkNum", data.getDeCheck() + "");
+ htmlStr = htmlStr.replace("foodLocation", data.getFoodLocation() == null ? "/" : data.getFoodLocation());
+ htmlStr = htmlStr.replace("foodLevel", data.getFoodLevel() == null ? "/" : data.getFoodLevel());
Map<String, String> checkBillItems = getCheckBillItems();
// 閬嶅巻鍖栭獙缁撴灉锛屽瓨鍏ap闆嗗悎涓�
String key;
for (CheckItemData item : checkLst) {
key = item.getStandardId() + "_ST";
// checkBillItems.put(key, item.getStandardValue());
- key = item.getStandardId() + "_VAL";
+// key = item.getStandardId() + "_VAL";
checkBillItems.put(key, item.getValue());
}
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.js b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.js
index 69a988a..02c20df 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.js
+++ b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.js
@@ -18,9 +18,37 @@
LODOP.PREVIEW();
};
+/**
+ * 鎵撳嵃璐ㄦ鍗�
+ */
+printCheckBill = function(htmlStr) {
+ var LODOP = CLODOP;
+ LODOP.PRINT_INIT("璐ㄦ鍗�");
+ LODOP.SET_PRINT_PAGESIZE(1,2100,2970, "A4");
+ LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", htmlStr);
+ LODOP.PREVIEW();
+};
+print5016CheckBill = function(htmlStr) {
+ var LODOP = CLODOP;
+ LODOP.PRINT_INIT("璐ㄦ鍗�");
+ LODOP.SET_PRINT_PAGESIZE(1, 1050, 1400, "");
+ LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", htmlStr);
+ LODOP.PREVIEW();
+};
+
//鎵撳嵃鎵︽牱鍗�
printCheck = function(){
- $alert("鎵撳嵃妯＄増鏈畾涔夆�︹��");
+ var data = view.get("#dsMain.data");
+ if(!data) return;
+ var companyId = data.get("companyId");
+ console.log(companyId);
+ view.get("#ajaxPrintCheckBill").set("parameter",data).execute(function(result){
+ if(companyId && companyId == "5016"){
+ print5016ShipBill(result);
+ }else {
+ printCheckBill(result);
+ }
+ });
};
//鎵撳嵃绉伴噸鍗�
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml
index 3f25fb1..3e27763 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml
@@ -607,6 +607,11 @@
<Property name="executingMessage">姝ｅ湪鎵ц鎵撳嵃鈥︹��</Property>
<Property name="async">false</Property>
</AjaxAction>
+ <AjaxAction id="ajaxPrintCheckBill">
+ <Property name="async">false</Property>
+ <Property name="executingMessage">姝ｅ湪鎵ц鎵撳嵃鈥︹��</Property>
+ <Property name="service">inoutDataPR#printShipBill</Property>
+ </AjaxAction>
<CustomDropDown id="ddDicArea">
<Property name="minHeight">500</Property>
<Property name="minWidth">500</Property>
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutList202306.view.xml b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutList202306.view.xml
index 9f75b8f..f301284 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutList202306.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutList202306.view.xml
@@ -1,1504 +1,1540 @@
<?xml version="1.0" encoding="UTF-8"?>
<ViewConfig>
- <Arguments/>
- <Context/>
- <Model>
- <DataType name="dtMain" parent="dtInoutRecord">
- <ClientEvent name="onDataChange">if(arg.property =="depotId"){
- autoByDepot(arg.newValue);
-}
-if(arg.property =="foodVariety"){
- checkByFood(arg.newValue);
-}</ClientEvent>
- <PropertyDef name="price">
- <Property name="dataType">Double</Property>
- <Property name="label">绮瀹氫环</Property>
- <Property name="required">false</Property>
- </PropertyDef>
- <Reference name="checkItems">
- <Property name="parameter">
- <Entity>
- <Property name="checkId">$${this.checkId}</Property>
- <Property name="foodVariety">$${this.foodVariety}</Property>
- <Property name="deptId">$${this.deptId}</Property>
- </Entity>
- </Property>
- <Property name="dataProvider">checkStandardPR#listCheckItemsByCheckId</Property>
- <Property name="dataType">[dtCheckItems]</Property>
- </Reference>
- </DataType>
- <DataType name="dtQuery">
- <Property name="creationType">com.ld.igds.inout.dto.InoutParam</Property>
- <PropertyDef name="type">
- <Property name="label">鍑哄叆搴撶被鍨�</Property>
- </PropertyDef>
- <PropertyDef name="deptId">
- <Property></Property>
- <Property name="label">鎵�灞炲垎搴�</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="plateNum">
- <Property name="label">杞﹁埞鍙�</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>
- <PropertyDef name="progress">
- <Property></Property>
- <Property name="label">娴佺▼杩涘害</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("PROCESS_STATUS_")}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="recordStatus">
- <Property></Property>
- <Property name="label">鏁版嵁鐘舵��</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("RECORD_STATUS")}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="checkStatus">
- <Property></Property>
- <Property name="label">鏄惁鍚堟牸</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("CHECK_STATUS")}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="start">
- <Property name="label">寮�濮嬫椂闂�</Property>
- <Property name="dataType">Date</Property>
- </PropertyDef>
- <PropertyDef name="end">
- <Property name="label">鎴鏃堕棿</Property>
- <Property name="dataType">Date</Property>
- </PropertyDef>
- <PropertyDef name="userId">
- <Property name="label">韬唤璇�</Property>
- </PropertyDef>
- <PropertyDef name="orderTag">
- <Property name="defaultValue">DESC</Property>
- <Property name="label">鎺掑簭瑙勫垯</Property>
- <Property name="mapping">
- <Property name="mapValues">
- <Collection>
- <Entity>
- <Property name="code">DESC</Property>
- <Property name="name">鏃堕棿闄嶅簭</Property>
- </Entity>
- <Entity>
- <Property name="code">ASC</Property>
- <Property name="name">鏃堕棿鍗囧簭</Property>
- </Entity>
- </Collection>
- </Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- </DataType>
- <DataType name="dtCheckItems">
- <Property name="creationType">com.ld.igds.check.dto.CheckItemData</Property>
- <PropertyDef name="updateTime">
- <Property name="dataType">Date</Property>
- </PropertyDef>
- <PropertyDef name="checkId">
- <Property></Property>
- <Property name="label">妫�娴嬬紪鐮�</Property>
- </PropertyDef>
- <PropertyDef name="companyId">
- <Property></Property>
- <Property name="label">缁勭粐缂栫爜</Property>
- </PropertyDef>
- <PropertyDef name="standardId">
- <Property></Property>
- <Property name="label">妫�娴嬮」缂栫爜</Property>
- </PropertyDef>
- <PropertyDef name="standardName">
- <Property></Property>
- <Property name="label">鍖栭獙椤�</Property>
- </PropertyDef>
- <PropertyDef name="unit">
- <Property></Property>
- <Property name="label">鍗曚綅</Property>
- </PropertyDef>
- <PropertyDef name="upperLimit">
- <Property name="dataType">Double</Property>
- <Property name="label">鏍囧噯涓婇檺</Property>
- </PropertyDef>
- <PropertyDef name="standardValue">
- <Property></Property>
- <Property name="label">鍚堟牸璇存槑</Property>
- </PropertyDef>
- <PropertyDef name="value">
- <Property></Property>
- <Property name="label">妫�娴嬪��</Property>
- </PropertyDef>
- <PropertyDef name="remarks">
- <Property></Property>
- <Property name="label">鍖栭獙缁撴灉</Property>
- </PropertyDef>
- <PropertyDef name="ruleNum">
- <Property name="dataType">Double</Property>
- <Property name="label">鎵ｉ噸绯绘暟</Property>
- </PropertyDef>
- <PropertyDef name="ruleAdd">
- <Property name="dataType">Double</Property>
- <Property name="label">澧為噸%</Property>
- </PropertyDef>
- <PropertyDef name="ruleAddEnd">
- <Property name="dataType">Double</Property>
- <Property name="label">澧為噸涓婇檺%</Property>
- </PropertyDef>
- <PropertyDef name="ruleReduce">
- <Property name="dataType">Double</Property>
- <Property name="label">鎵ｉ噸鍊�%</Property>
- </PropertyDef>
- <PropertyDef name="standardPrice">
- <Property name="dataType">Double</Property>
- <Property name="label">鏍囧噯鍗曚环锛堝厓/鏂わ級</Property>
- </PropertyDef>
- <PropertyDef name="rulePrice">
- <Property name="dataType">Double</Property>
- <Property name="label">鎵ｈ垂绯绘暟</Property>
- </PropertyDef>
- <PropertyDef name="ruleReducePrice">
- <Property name="dataType">Double</Property>
- <Property name="label">鎵ｈ垂</Property>
- </PropertyDef>
- <PropertyDef name="operaSymbol">
- <Property></Property>
- <Property name="label">杩愮畻绗﹀彿</Property>
- </PropertyDef>
- </DataType>
- </Model>
- <View layout="padding:5;regionPadding:5">
- <ClientEvent name="onReady">var TYPE = "${request.getParameter('type')}";
-var EDIT = "${request.getParameter('edit')}";
-
-var deptId = window.parent.DEPT_ID;//鐖堕〉闈腑鐨勫垎搴撶紪鐮�
-
-//濡傛灉edit鏈夊�艰〃绀洪殣钘廇DD鍜岀紪杈戞寜閽�
-if(EDIT){
- view.get("#btnEdit").set("visible",false);
- view.get("#btnDel").set("visible",false);
- view.get("#btn2End").set("visible",false);
-}
-
-//绫诲瀷鍒囨崲
-if("OUT" == TYPE){
- view.get("#dataGridCheckItem").set("visible",false);
- view.get("#deWet").set("label","姘村垎澧為噸");
-}else{
- view.get("#deWet").set("label","姘村垎鎵ｉ噸");
- view.get("#dataGridCheckItem").set("visible",true);
-}
-
-//榛樿鏌ヨ鏌ヨ鎻愭潯浠�
-view.get("#dsQuery").insert({
- type:TYPE,
- deptId:deptId
-});
-
-//鏌ヨ
-query = function(){
- var data = view.get("#dsQuery.data");
- view.get("#dsMain").set("parameter",data).flushAsync();
-};
-query();
-
-
-//缂栬緫锛屽彧鏈夋祦绋嬬粨鏉熺殑鎵嶅彲浠ヤ慨鏀�
-edit = function(){
- var data = view.get("#dataGridMain.currentEntity");
- if(!data) return;
- 
- if ("RECORD" == data.get("progress")) {
- view.get("#btnOK").set("visible",true);
- }else{
- view.get("#btnOK").set("visible",false);
- }
- view.get("#dialogMain").show();
-};
-
-//涓讳俊鎭獥鍙ｅ叧闂�
-cancelMain = function(){
- view.get("#dsMain.data:#").cancel();
- view.get("#btnComplete").set("visible",false);
- view.get("#btnOK").set("visible",true);
- view.get("#dialogMain").hide();
-};
-
-//寮傚父鎿嶄綔
-showAbnormal = function(){
- var data = view.get("#dataGridMain.currentEntity");
- if(!data) return;
- view.get("#dialogAbnormal").show();
- view.get("#textAbnormal").set("value",null);
-};
-
-//鍒犻櫎
-del = function(){
- var data = view.get("#dataGridMain.currentEntity");
- if(!data) return;
- 
- var textDel = view.get("#textAbnormal.text");
- if(!textDel){
- $notify("璇峰～鍐欏紓甯稿垹闄ゅ師鍥狅紒");
- return;
- }
- data.set("remarks",textDel);
- view.get("#ajaxDel").execute(function(result){
- if(result){
- $alert(result);
- return;
- }else{
- data.remove();
- view.get("#dialogAbnormal").close();
- }
- });
-};
-
-//杩借釜
-showImg = function(){
- var data = view.get("#dataGridMain.currentEntity");
- if (!data) return;
- var user = encodeURIComponent(data.get("userName"));
- var plateNum = encodeURIComponent(data.get("plateNum"));
- 
- view.get("#iFrameImg").set("path", "./basic/inout/inout-img?id=" + data.get("id")+"&plateNum="+plateNum+"&user="+user);
- view.get("#dialogImg").show();
-};
-
-todoError = function(){
- var data = view.get("#dataGridMain.currentEntity");
- if(!data) return;
- 
- var textError = view.get("#textAbnormal.text");
- if(!textError){
- $alert("璇疯鏄庡紓甯哥粓姝㈠師鍥狅紒锛�");
- return;
- }
- data.set("remarks",textError);
- view.get("#ajaxError").execute(function(result){
- if(result){
- $alert(result);
- return;
- }else{
- view.get("#dialogAbnormal").close();
- query();
- $alert("鎵ц鎴愬姛锛岃嚜鍔ㄥ埛鏂版暟鎹紒");
- }
- });
-};
-
-//娴佺▼瀹屾垚-寮�濮�
-completeStart = function(){
- var data = view.get("#dataGridMain.currentEntity");
- if(!data) return;
- 
- if( data.validate() != 'ok'){
- $notify("璇峰～鍐欏畬鏁翠俊鎭紒锛�");
- }
- 
- view.get("#btnComplete").set("visible",true);
- view.get("#btnOK").set("visible",false);
- view.get("#dialogMain").show();
-};
-//娴佺▼瀹屾垚-鎵ц
-completeExe = function(){
- var data = view.get("#dataGridMain.currentEntity");
- if(!data) return;
- 
- if (data.validate() != 'ok') {
- $notify("璇峰～鍐欏畬鏁翠俊鎭紒锛�");
- return;
- }
- 
- view.get("#ajaxComplete").set("parameter",data).execute(function(result){
- if(result){
- $alert(result);
- return;
- }else{
- $alert("鎵ц鎴愬姛锛岃嚜鍔ㄥ埛鏂版暟鎹紒");
- view.get("#btnComplete").set("visible",false);
- view.get("#dialogMain").hide();
- }
- });
-};
-
-//鏍规嵁浠撳簱鑷姩鍥炲～绮鍝佺锛岀櫥璁帮紝浜у湴鏂�
-autoByDepot = function(depotId){
- view.get("#ajaxGetDepot").set("parameter",depotId).execute(function(result){
- if(result){
- var data = view.get("#dataGridMain.currentEntity");
- data.set("foodLocation",result.foodLocation);
- data.set("foodLevel",result.foodLevel);
- data.set("foodVariety",result.foodVariety);
- data.set("foodYear",result.foodYear);
- }
- });
-};
-
-//鏍规嵁绮鍝佺鏌ヨ鍖栭獙椤瑰苟鍥炴樉
-checkByFood = function(foodVariety){
- if(TYPE == "IN"){
- view.get("#ajaxGetCheck").set("parameter",{foodVariety:foodVariety,deptId:deptId}).execute(function(result){
+ <Arguments/>
+ <Context/>
+ <Model>
+ <DataType name="dtMain" parent="dtInoutRecord">
+ <ClientEvent name="onDataChange">if(arg.property =="depotId"){
+ autoByDepot(arg.newValue);
+ }
+ if(arg.property =="foodVariety"){
+ checkByFood(arg.newValue);
+ }
+ </ClientEvent>
+ <PropertyDef name="price">
+ <Property name="dataType">Double</Property>
+ <Property name="label">绮瀹氫环</Property>
+ <Property name="required">false</Property>
+ </PropertyDef>
+ <Reference name="checkItems">
+ <Property name="parameter">
+ <Entity>
+ <Property name="checkId">$${this.checkId}</Property>
+ <Property name="foodVariety">$${this.foodVariety}</Property>
+ <Property name="deptId">$${this.deptId}</Property>
+ </Entity>
+ </Property>
+ <Property name="dataProvider">checkStandardPR#listCheckItemsByParam</Property>
+ <Property name="dataType">[dtCheckItems]</Property>
+ </Reference>
+ </DataType>
+ <DataType name="dtQuery">
+ <Property name="creationType">com.ld.igds.inout.dto.InoutParam</Property>
+ <PropertyDef name="type">
+ <Property name="label">鍑哄叆搴撶被鍨�</Property>
+ </PropertyDef>
+ <PropertyDef name="deptId">
+ <Property></Property>
+ <Property name="label">鎵�灞炲垎搴�</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="plateNum">
+ <Property name="label">杞﹁埞鍙�</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>
+ <PropertyDef name="progress">
+ <Property></Property>
+ <Property name="label">娴佺▼杩涘害</Property>
+ <Property name="mapping">
+ <Property name="mapValues">
+ ${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("PROCESS_STATUS_")}
+ </Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="recordStatus">
+ <Property></Property>
+ <Property name="label">鏁版嵁鐘舵��</Property>
+ <Property name="mapping">
+ <Property name="mapValues">
+ ${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("RECORD_STATUS")}
+ </Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="checkStatus">
+ <Property></Property>
+ <Property name="label">鏄惁鍚堟牸</Property>
+ <Property name="mapping">
+ <Property name="mapValues">
+ ${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("CHECK_STATUS")}
+ </Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="start">
+ <Property name="label">寮�濮嬫椂闂�</Property>
+ <Property name="dataType">Date</Property>
+ </PropertyDef>
+ <PropertyDef name="end">
+ <Property name="label">鎴鏃堕棿</Property>
+ <Property name="dataType">Date</Property>
+ </PropertyDef>
+ <PropertyDef name="userId">
+ <Property name="label">韬唤璇�</Property>
+ </PropertyDef>
+ <PropertyDef name="orderTag">
+ <Property name="defaultValue">DESC</Property>
+ <Property name="label">鎺掑簭瑙勫垯</Property>
+ <Property name="mapping">
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="code">DESC</Property>
+ <Property name="name">鏃堕棿闄嶅簭</Property>
+ </Entity>
+ <Entity>
+ <Property name="code">ASC</Property>
+ <Property name="name">鏃堕棿鍗囧簭</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ </DataType>
+ <DataType name="dtCheckItems">
+ <Property name="creationType">com.ld.igds.check.dto.CheckItemData</Property>
+ <PropertyDef name="updateTime">
+ <Property name="dataType">Date</Property>
+ </PropertyDef>
+ <PropertyDef name="checkId">
+ <Property></Property>
+ <Property name="label">妫�娴嬬紪鐮�</Property>
+ </PropertyDef>
+ <PropertyDef name="companyId">
+ <Property></Property>
+ <Property name="label">缁勭粐缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="standardId">
+ <Property></Property>
+ <Property name="label">妫�娴嬮」缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="standardName">
+ <Property></Property>
+ <Property name="label">鍖栭獙椤�</Property>
+ </PropertyDef>
+ <PropertyDef name="unit">
+ <Property></Property>
+ <Property name="label">鍗曚綅</Property>
+ </PropertyDef>
+ <PropertyDef name="upperLimit">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鏍囧噯涓婇檺</Property>
+ </PropertyDef>
+ <PropertyDef name="standardValue">
+ <Property></Property>
+ <Property name="label">鍚堟牸璇存槑</Property>
+ </PropertyDef>
+ <PropertyDef name="value">
+ <Property></Property>
+ <Property name="label">妫�娴嬪��</Property>
+ </PropertyDef>
+ <PropertyDef name="remarks">
+ <Property></Property>
+ <Property name="label">鍖栭獙缁撴灉</Property>
+ </PropertyDef>
+ <PropertyDef name="ruleNum">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鎵ｉ噸绯绘暟</Property>
+ </PropertyDef>
+ <PropertyDef name="ruleAdd">
+ <Property name="dataType">Double</Property>
+ <Property name="label">澧為噸%</Property>
+ </PropertyDef>
+ <PropertyDef name="ruleAddEnd">
+ <Property name="dataType">Double</Property>
+ <Property name="label">澧為噸涓婇檺%</Property>
+ </PropertyDef>
+ <PropertyDef name="ruleReduce">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鎵ｉ噸鍊�%</Property>
+ </PropertyDef>
+ <PropertyDef name="standardPrice">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鏍囧噯鍗曚环锛堝厓/鏂わ級</Property>
+ </PropertyDef>
+ <PropertyDef name="rulePrice">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鎵ｈ垂绯绘暟</Property>
+ </PropertyDef>
+ <PropertyDef name="ruleReducePrice">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鎵ｈ垂</Property>
+ </PropertyDef>
+ <PropertyDef name="operaSymbol">
+ <Property></Property>
+ <Property name="label">杩愮畻绗﹀彿</Property>
+ </PropertyDef>
+ </DataType>
+ </Model>
+ <View layout="padding:5;regionPadding:5">
+ <ClientEvent name="onReady">var TYPE = "${request.getParameter('type')}";
+ var EDIT = "${request.getParameter('edit')}";
+ 
+ var deptId = window.parent.DEPT_ID;//鐖堕〉闈腑鐨勫垎搴撶紪鐮�
+ 
+ //濡傛灉edit鏈夊�艰〃绀洪殣钘廇DD鍜岀紪杈戞寜閽�
+ if(EDIT){
+ view.get("#btnEdit").set("visible",false);
+ view.get("#btnDel").set("visible",false);
+ view.get("#btn2End").set("visible",false);
+ }
+ 
+ //绫诲瀷鍒囨崲
+ if("OUT" == TYPE){
+ view.get("#dataGridCheckItem").set("visible",false);
+ view.get("#deWet").set("label","姘村垎澧為噸");
+ }else{
+ view.get("#deWet").set("label","姘村垎鎵ｉ噸");
+ view.get("#dataGridCheckItem").set("visible",true);
+ }
+ 
+ //榛樿鏌ヨ鏌ヨ鎻愭潯浠�
+ view.get("#dsQuery").insert({
+ type:TYPE,
+ deptId:deptId
+ });
+ 
+ //鏌ヨ
+ query = function(){
+ var data = view.get("#dsQuery.data");
+ view.get("#dsMain").set("parameter",data).flushAsync();
+ };
+ query();
+ 
+ 
+ //缂栬緫锛屽彧鏈夋祦绋嬬粨鏉熺殑鎵嶅彲浠ヤ慨鏀�
+ edit = function(){
+ var data = view.get("#dataGridMain.currentEntity");
+ if(!data) return;
+ 
+ if ("RECORD" == data.get("progress")) {
+ view.get("#btnOK").set("visible",true);
+ }else{
+ view.get("#btnOK").set("visible",false);
+ }
+ view.get("#dialogMain").show();
+ };
+ 
+ //涓讳俊鎭獥鍙ｅ叧闂�
+ cancelMain = function(){
+ view.get("#dsMain.data:#").cancel();
+ view.get("#btnComplete").set("visible",false);
+ view.get("#btnOK").set("visible",true);
+ view.get("#dialogMain").hide();
+ };
+ 
+ //寮傚父鎿嶄綔
+ showAbnormal = function(){
+ var data = view.get("#dataGridMain.currentEntity");
+ if(!data) return;
+ view.get("#dialogAbnormal").show();
+ view.get("#textAbnormal").set("value",null);
+ };
+ 
+ //鍒犻櫎
+ del = function(){
+ var data = view.get("#dataGridMain.currentEntity");
+ if(!data) return;
+ 
+ var textDel = view.get("#textAbnormal.text");
+ if(!textDel){
+ $notify("璇峰～鍐欏紓甯稿垹闄ゅ師鍥狅紒");
+ return;
+ }
+ data.set("remarks",textDel);
+ view.get("#ajaxDel").execute(function(result){
+ if(result){
+ $alert(result);
+ return;
+ }else{
+ data.remove();
+ view.get("#dialogAbnormal").close();
+ }
+ });
+ };
+ 
+ //杩借釜
+ showImg = function(){
+ var data = view.get("#dataGridMain.currentEntity");
+ if (!data) return;
+ var user = encodeURIComponent(data.get("userName"));
+ var plateNum = encodeURIComponent(data.get("plateNum"));
+ 
+ view.get("#iFrameImg").set("path", "./basic/inout/inout-img?id=" + data.get("id")+"&plateNum="+plateNum+"&user="+user);
+ view.get("#dialogImg").show();
+ };
+ 
+ todoError = function(){
+ var data = view.get("#dataGridMain.currentEntity");
+ if(!data) return;
+ 
+ var textError = view.get("#textAbnormal.text");
+ if(!textError){
+ $alert("璇疯鏄庡紓甯哥粓姝㈠師鍥狅紒锛�");
+ return;
+ }
+ data.set("remarks",textError);
+ view.get("#ajaxError").execute(function(result){
+ if(result){
+ $alert(result);
+ return;
+ }else{
+ view.get("#dialogAbnormal").close();
+ query();
+ $alert("鎵ц鎴愬姛锛岃嚜鍔ㄥ埛鏂版暟鎹紒");
+ }
+ });
+ };
+ 
+ //娴佺▼瀹屾垚-寮�濮�
+ completeStart = function(){
+ var data = view.get("#dataGridMain.currentEntity");
+ if(!data) return;
+ 
+ if( data.validate() != 'ok'){
+ $notify("璇峰～鍐欏畬鏁翠俊鎭紒锛�");
+ }
+ 
+ view.get("#btnComplete").set("visible",true);
+ view.get("#btnOK").set("visible",false);
+ view.get("#dialogMain").show();
+ };
+ //娴佺▼瀹屾垚-鎵ц
+ completeExe = function(){
+ var data = view.get("#dataGridMain.currentEntity");
+ if(!data) return;
+ 
+ if (data.validate() != 'ok') {
+ $notify("璇峰～鍐欏畬鏁翠俊鎭紒锛�");
+ return;
+ }
+ 
+ view.get("#ajaxComplete").set("parameter",data).execute(function(result){
+ if(result){
+ $alert(result);
+ return;
+ }else{
+ $alert("鎵ц鎴愬姛锛岃嚜鍔ㄥ埛鏂版暟鎹紒");
+ view.get("#btnComplete").set("visible",false);
+ view.get("#dialogMain").hide();
+ }
+ });
+ };
+ 
+ //鏍规嵁浠撳簱鑷姩鍥炲～绮鍝佺锛岀櫥璁帮紝浜у湴鏂�
+ autoByDepot = function(depotId){
+ view.get("#ajaxGetDepot").set("parameter",depotId).execute(function(result){
+ if(result){
+ var data = view.get("#dataGridMain.currentEntity");
+ data.set("foodLocation",result.foodLocation);
+ data.set("foodLevel",result.foodLevel);
+ data.set("foodVariety",result.foodVariety);
+ data.set("foodYear",result.foodYear);
+ }
+ });
+ };
+ 
+ //鏍规嵁绮鍝佺鏌ヨ鍖栭獙椤瑰苟鍥炴樉
+ checkByFood = function(foodVariety){
+ if(TYPE == "IN"){
+ view.get("#ajaxGetCheck").set("parameter",{foodVariety:foodVariety,deptId:deptId}).execute(function(result){
if(result){
var data = view.get("#dsMain.data:#");
data.set("checkItems",result);
- }
- });
- }
-};
-</ClientEvent>
- <ClientEvent name="onCreate">
-/**
- * 鑷姩璁＄畻锛屽綋鍓嶉〉闈笉鑷姩鍏宠仈鎵︽牱璁板綍锛屽叏閮ㄧ敱鎵嬪姩涓哄噯
- * 
- * 1.鍑�閲� = 姣涢噸 - 鐨噸
- * 2.鎬绘墸閲� = 鐜板満鎵ｉ噸 + 鍏朵粬鎵ｉ噸 + 鎵ｆ按鏉傝川
- * 3.缁撶畻閲嶉噺 = 鍑�閲� - 鎬绘墸閲� 锛堝惈姘存潅澧為噸锛�
- * 4.鍑�/鍏ュ簱閲嶉噺 = 鍑�閲� - 鎬绘墸閲� 锛堜笉鍚按鏉傚閲嶏級
- * 
- * 5.鍏ュ簱鏃讹細鎵ｆ按鏉� 姝ｆ暟 = 鎵ｉ噸锛岃礋鏁� = 澧為噸
- * 6.鍑哄簱鏃讹細姘村垎澧為噸锛屾鏁�=澧為噸锛岃礋鏁�=鎵ｉ噸
- */
-deAutoByWeight = function(name){
- 
- if(null == name) name = "1";
- 
- var curData = view.get("#dsMain.data:#");
- var fullWeight = curData.get("fullWeight");
- var emptyWeight = curData.get("emptyWeight");
- 
- if(fullWeight == 0 || emptyWeight == 0){
- return;
- }
- // 鍑�閲�
- var netWeight = Number(fullWeight) - Number(emptyWeight);
- 
- if (netWeight <= 0){
- $notify("鍑�閲嶅皬浜�0锛屽綋鍓嶇О閲嶅瓨鍦ㄩ�昏緫闂");
- return;
- }
- 
- //姹囨�荤粨鏋�
- var deSum = 0, addSum = 0, settleWeight = 0, recordWeight = 0;
- //鎵ｆ按鏉�
- var deWet = curData.get("deWet"), deImpurity = curData.get("deImpurity");
- 
- var impurity = curData.get("impurity"), wet = curData.get("wet");
- 
- 
- var deBase = 0, multiple = 0;
- var checkItems = curData.get("checkItems");
- //姘村垎鏉傝川锛屾洿鏀规瘮渚嬪苟涓旀按鍒嗘墸閲嶈繕娌¤绠楁儏鍐典笅
- if ("wet" == name) {
- var checkItem = this.getCheckItem(checkItems,"C01", "C020101");
- if (checkItem) {
+ }
+ });
+ }
+ };
+ </ClientEvent>
+ <ClientEvent name="onCreate">
+ /**
+ * 鑷姩璁＄畻锛屽綋鍓嶉〉闈笉鑷姩鍏宠仈鎵︽牱璁板綍锛屽叏閮ㄧ敱鎵嬪姩涓哄噯
+ * 
+ * 1.鍑�閲� = 姣涢噸 - 鐨噸
+ * 2.鎬绘墸閲� = 鐜板満鎵ｉ噸 + 鍏朵粬鎵ｉ噸 + 鎵ｆ按鏉傝川
+ * 3.缁撶畻閲嶉噺 = 鍑�閲� - 鎬绘墸閲� 锛堝惈姘存潅澧為噸锛�
+ * 4.鍑�/鍏ュ簱閲嶉噺 = 鍑�閲� - 鎬绘墸閲� 锛堜笉鍚按鏉傚閲嶏級
+ * 
+ * 5.鍏ュ簱鏃讹細鎵ｆ按鏉� 姝ｆ暟 = 鎵ｉ噸锛岃礋鏁� = 澧為噸
+ * 6.鍑哄簱鏃讹細姘村垎澧為噸锛屾鏁�=澧為噸锛岃礋鏁�=鎵ｉ噸
+ */
+ deAutoByWeight = function(name){
+ 
+ if(null == name) name = "1";
+ 
+ var curData = view.get("#dsMain.data:#");
+ var fullWeight = curData.get("fullWeight");
+ var emptyWeight = curData.get("emptyWeight");
+ 
+ if(fullWeight == 0 || emptyWeight == 0){
+ return;
+ }
+ // 鍑�閲�
+ var netWeight = Number(fullWeight) - Number(emptyWeight);
+ 
+ if (netWeight <= 0){
+ $notify("鍑�閲嶅皬浜�0锛屽綋鍓嶇О閲嶅瓨鍦ㄩ�昏緫闂");
+ return;
+ }
+ 
+ //姹囨�荤粨鏋�
+ var deSum = 0, addSum = 0, settleWeight = 0, recordWeight = 0;
+ //鎵ｆ按鏉�
+ var deWet = curData.get("deWet"), deImpurity = curData.get("deImpurity");
+ 
+ var impurity = curData.get("impurity"), wet = curData.get("wet");
+ 
+ 
+ var deBase = 0, multiple = 0;
+ var checkItems = curData.get("checkItems");
+ //姘村垎鏉傝川锛屾洿鏀规瘮渚嬪苟涓旀按鍒嗘墸閲嶈繕娌¤绠楁儏鍐典笅
+ if ("wet" == name) {
+ var checkItem = this.getCheckItem(checkItems,"C01", "C020101");
+ if (checkItem) {
deBase = Number(wet) - Number(checkItem.get("upperLimit"));
if (deBase == 0) return;
multiple = parseInt(deBase / checkItem.get("ruleNum"));//鍊嶆暟
deWet = (netWeight * multiple * checkItem.get("ruleReduce") / 100.00).toFixed(0);
- }
- }
- 
- //鏉傝川
- if ("impurity" == name) {
- checkItem = this.getCheckItem(recordData.checkItems, "C02","C01010301");
- if (checkItem) {
+ }
+ }
+ 
+ //鏉傝川
+ if ("impurity" == name) {
+ checkItem = this.getCheckItem(recordData.checkItems, "C02","C01010301");
+ if (checkItem) {
deBase = Number(impurity) - Number(checkItem.get("upperLimit"));
if (deBase == 0) return;
multiple = parseInt(deBase / checkItem.get("ruleNum"));
deImpurity = (netWeight * multiple * checkItem.get("ruleReduce") / 100.00).toFixed(0);
- }
- }
-
- /** 鎬绘墸閲嶏紝涓嶅惈澧為噸*/
- deSum = Number(curData.get("deOther")) + Number(curData.get("deHandle"));
- 
- //鍑哄簱
- if ("OUT" == curData.get("type")) {
- if (Number(deWet) > 0) {//澧為噸
- addSum = addSum + Number(deWet);
- } else {
- deSum = deSum + Number(deWet);
- }
-
- if (Number(deImpurity) > 0) {//鎵ｉ噸
- deSum = deSum + Number(deImpurity);
- } else {
- addSum = addSum + Number(deImpurity);
- }
- }else{
- if (Number(deWet) > 0) {//鎵ｉ噸
- deSum = deSum + Number(deWet);
- } else {
- addSum = addSum + Number(deWet);
- }
- if (Number(deImpurity) > 0) {//鎵ｉ噸
- deSum = deSum + Number(deImpurity);
- } else {
- addSum = addSum + Number(deImpurity);
- }
- }
- 
- deSum = deSum.toFixed(0);
- /** 澧為噸杞鏁帮紝渚夸簬璁＄畻 */
- addSum = Math.abs(addSum).toFixed(0);
- 
- /** 鍏ュ簱閲嶉噺 = 鍑�閲� - 鎬绘墸閲� */
- recordWeight = Number(netWeight) - Number(deSum);
- 
- /** 缁撶畻閲嶉噺 = 鍑�閲� - 鎬绘墸閲� + 澧為噸 */
- settleWeight = Number(netWeight) - Number(deSum) + Number(addSum);
- 
- curData.set("impurity",impurity);
- curData.set("wet",wet);
- curData.set("deImpurity",deImpurity);
- curData.set("deWet",deWet);
- curData.set("deSum",deSum);
- curData.set("netWeight",netWeight);
- curData.set("settleWeight",settleWeight);
- curData.set("recordWeight",recordWeight);
-};
-
-
-/**
- * 鏍规嵁鍖栭獙椤瑰拰浼犻�掕繃鏉ョ殑鍙傛暟鑾峰彇褰撳墠鍙傛暟鐨勯厤缃俊鎭�
- * @param checkItems
- * @param code1 绯荤粺鍙傛暟ID
- * @param code2 鍥芥爣鍙傛暟ID
- * @returns {undefined}
- */
-function getCheckItem(checkItems, code1, code2) {
- if (!checkItems) return null;
- $.each(checkItems, function (index, checkItem) {
- if (checkItem.get("standardId") == code1 || checkItem.get("standardId") == code2) {
- if (checkItem.get("ruleNum") && checkItem.get("upperLimit") > 0.0) {
- return checkItem;
}
- }
- });
- return null;
-}</ClientEvent>
- <Property name="packages">font-awesome,css-common</Property>
- <Property name="javaScriptFile">./static/plugins/lodop/LodopFuncs.js</Property>
- <DataSet id="dsMain">
- <Property name="dataType">[dtMain]</Property>
- <Property name="pageSize">20</Property>
- <Property name="dataProvider">inoutDataPR#pageInoutData</Property>
- <Property name="loadMode">manual</Property>
- </DataSet>
- <DataSet id="dsQuery">
- <Property name="dataType">dtQuery</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 id="btnEdit" layoutConstraint="left">
- <ClientEvent name="onClick">edit();</ClientEvent>
- <Property name="caption">缂栬緫</Property>
- <Property name="exClassName">btn-warm</Property>
- <Property name="iconClass">fa fa-pencil</Property>
- <Property name="hideMode">display</Property>
- </Button>
- <Button id="btnDel" layoutConstraint="left">
- <ClientEvent name="onClick">showAbnormal();</ClientEvent>
- <Property name="caption">寮傚父鎿嶄綔</Property>
- <Property name="exClassName">btn-warn</Property>
- <Property name="iconClass">fa fa-minus</Property>
- <Property name="hideMode">display</Property>
- </Button>
- <Button layoutConstraint="left">
- <ClientEvent name="onClick">showImg();</ClientEvent>
- <Property name="caption">杩囩▼杩借釜</Property>
- <Property name="exClassName">btn-normal</Property>
- <Property name="iconClass">fa fa-picture-o</Property>
- </Button>
- <Button id="btn2End" layoutConstraint="left">
- <ClientEvent name="onClick">completeStart();</ClientEvent>
- <Property name="caption">蹇�熺粨鏉�</Property>
- <Property name="exClassName">btn-default</Property>
- <Property name="iconClass">fa fa-gavel</Property>
- <Property name="hideMode">display</Property>
- </Button>
- <Button layoutConstraint="left">
- <Property name="caption">鍗曟嵁鎵撳嵃</Property>
- <Property name="exClassName">btn-warm</Property>
- <Property name="iconClass">fa fa-print</Property>
- <Property name="menu">menuEdit</Property>
- </Button>
- <Button layoutConstraint="left">
- <Property name="caption">瀵煎嚭EXCEL</Property>
- <Property name="exClassName">btn-normal</Property>
- <Property name="iconClass">fa fa-file-excel-o</Property>
- <Property name="action">exportExcel</Property>
- </Button>
- </Container>
- <AutoForm layoutConstraint="top">
- <Property name="cols">*,*,*,*</Property>
- <Property name="dataSet">dsQuery</Property>
- <Property name="exClassName">bg-color</Property>
- <Property name="labelAlign">right</Property>
- <AutoFormElement>
- <Property name="name">start</Property>
- <Property name="property">start</Property>
- <Property name="trigger">defaultDateDropDown</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">end</Property>
- <Property name="property">end</Property>
- <Property name="trigger">defaultDateDropDown</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">plateNum</Property>
- <Property name="property">plateNum</Property>
- <Editor>
- <TextEditor>
- <Property name="blankText">-- 鏀寔妯＄硦 --</Property>
- </TextEditor>
- </Editor>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">userId</Property>
- <Property name="property">userId</Property>
- <Editor>
- <TextEditor>
- <Property name="blankText">-- 鏀寔妯＄硦 --</Property>
- </TextEditor>
- </Editor>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">depotId</Property>
- <Property name="property">depotId</Property>
- <Property name="trigger">autoMappingDropDown2</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">foodVariety</Property>
- <Property name="property">foodVariety</Property>
- <Property name="trigger">autoOpenMappingDropDown2</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">orderTag</Property>
- <Property name="property">orderTag</Property>
- <Property name="trigger">autoMappingDropDown1</Property>
- <Editor/>
- </AutoFormElement>
- <Container layout="hbox regionPadding:15">
- <Button>
- <ClientEvent name="onClick">query();
-</ClientEvent>
- <Property name="caption">鏌ヨ</Property>
- <Property name="exClassName">btn-normal</Property>
- <Property name="iconClass">fa fa-search</Property>
- </Button>
- <Button>
- <ClientEvent name="onClick">var type ="${request.getParameter('type')}";
-var deptId = window.parent.DEPT_ID;//鐖堕〉闈腑鐨勫垎搴撶紪鐮�
-view.get("#dsQuery").setData({type:type,deptId:deptId});</ClientEvent>
- <Property name="exClassName">btn-warn</Property>
- <Property name="iconClass">fa fa-refresh</Property>
- <Property name="caption">閲嶇疆</Property>
- </Button>
- </Container>
- </AutoForm>
- <Container layoutConstraint="center">
- <Property name="exClassName">bg-color</Property>
- <DataGrid id="dataGridMain" layoutConstraint="center">
- <ClientEvent name="onDataRowDoubleClick">edit();</ClientEvent>
- <ClientEvent name="onDataRowClick">//瀹炵幇鐐瑰嚮鍗抽�変腑
-//self.set("selection",arg.data);
+ }
+ 
+ /** 鎬绘墸閲嶏紝涓嶅惈澧為噸*/
+ deSum = Number(curData.get("deOther")) + Number(curData.get("deHandle"));
+ 
+ //鍑哄簱
+ if ("OUT" == curData.get("type")) {
+ if (Number(deWet) > 0) {//澧為噸
+ addSum = addSum + Number(deWet);
+ } else {
+ deSum = deSum + Number(deWet);
+ }
+ 
+ if (Number(deImpurity) > 0) {//鎵ｉ噸
+ deSum = deSum + Number(deImpurity);
+ } else {
+ addSum = addSum + Number(deImpurity);
+ }
+ }else{
+ if (Number(deWet) > 0) {//鎵ｉ噸
+ deSum = deSum + Number(deWet);
+ } else {
+ addSum = addSum + Number(deWet);
+ }
+ if (Number(deImpurity) > 0) {//鎵ｉ噸
+ deSum = deSum + Number(deImpurity);
+ } else {
+ addSum = addSum + Number(deImpurity);
+ }
+ }
+ 
+ deSum = deSum.toFixed(0);
+ /** 澧為噸杞鏁帮紝渚夸簬璁＄畻 */
+ addSum = Math.abs(addSum).toFixed(0);
+ 
+ /** 鍏ュ簱閲嶉噺 = 鍑�閲� - 鎬绘墸閲� */
+ recordWeight = Number(netWeight) - Number(deSum);
+ 
+ /** 缁撶畻閲嶉噺 = 鍑�閲� - 鎬绘墸閲� + 澧為噸 */
+ settleWeight = Number(netWeight) - Number(deSum) + Number(addSum);
+ 
+ curData.set("impurity",impurity);
+ curData.set("wet",wet);
+ curData.set("deImpurity",deImpurity);
+ curData.set("deWet",deWet);
+ curData.set("deSum",deSum);
+ curData.set("netWeight",netWeight);
+ curData.set("settleWeight",settleWeight);
+ curData.set("recordWeight",recordWeight);
+ };
+ 
+ 
+ /**
+ * 鏍规嵁鍖栭獙椤瑰拰浼犻�掕繃鏉ョ殑鍙傛暟鑾峰彇褰撳墠鍙傛暟鐨勯厤缃俊鎭�
+ * @param checkItems
+ * @param code1 绯荤粺鍙傛暟ID
+ * @param code2 鍥芥爣鍙傛暟ID
+ * @returns {undefined}
+ */
+ function getCheckItem(checkItems, code1, code2) {
+ if (!checkItems) return null;
+ $.each(checkItems, function (index, checkItem) {
+ if (checkItem.get("standardId") == code1 || checkItem.get("standardId") == code2) {
+ if (checkItem.get("ruleNum") && checkItem.get("upperLimit") > 0.0) {
+ return checkItem;
+ }
+ }
+ });
+ return null;
+ }
</ClientEvent>
- <Property name="dataSet">dsMain</Property>
- <Property name="readOnly">true</Property>
- <Property name="dynaRowHeight">false</Property>
- <Property name="selectionMode">multiRows</Property>
- <RowSelectorColumn/>
- <DataColumn name="id">
- <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
-arg.dom.style.color = "#f67d06";
-arg.processDefault = true;</ClientEvent>
- <Property name="property">id</Property>
- <Property name="align">center</Property>
- <Property name="width">150</Property>
- </DataColumn>
- <DataColumn name="plateNum">
- <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
-arg.processDefault = true;</ClientEvent>
- <Property name="property">plateNum</Property>
- <Property name="align">center</Property>
- <Property name="width">150</Property>
- </DataColumn>
- <DataColumn>
- <Property name="property">userName</Property>
- <Property name="align">center</Property>
- <Property name="width">120</Property>
- <Property name="name">userName</Property>
- </DataColumn>
- <DataColumn>
- <Property name="property">customerName</Property>
- <Property name="width">250</Property>
- <Property name="name">customerName</Property>
- <Property name="align">center</Property>
- <Property name="caption">瀹㈡埛鍚嶇О</Property>
- </DataColumn>
- <DataColumn name="foodVariety">
- <Property name="property">foodVariety</Property>
- <Property name="align">center</Property>
- <Property name="width">120</Property>
- </DataColumn>
- <DataColumn name="depotId">
- <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
-arg.processDefault = true;</ClientEvent>
- <Property name="property">depotId</Property>
- <Property name="align">center</Property>
- <Property name="width">120</Property>
- </DataColumn>
- <DataColumn name="fullWeight">
- <Property name="property">fullWeight</Property>
- <Property name="caption">姣涢噸</Property>
- <Property name="align">center</Property>
- <Property name="width">100</Property>
- </DataColumn>
- <DataColumn name="emptyWeight">
- <Property name="property">emptyWeight</Property>
- <Property name="caption">鐨噸</Property>
- <Property name="align">center</Property>
- <Property name="width">100</Property>
- </DataColumn>
- <DataColumn name="netWeight">
- <Property name="property">netWeight</Property>
- <Property name="align">center</Property>
- <Property name="caption">鍑�閲�</Property>
- <Property name="width">100</Property>
- </DataColumn>
- <DataColumn id="columnDeSum">
- <Property name="property">deSum</Property>
- <Property name="width">100</Property>
- <Property name="caption">鎬绘墸閲�</Property>
- <Property name="align">center</Property>
- <Property name="name">deSum</Property>
- </DataColumn>
- <DataColumn name="settleWeight">
- <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
-arg.processDefault = true;</ClientEvent>
- <Property name="property">settleWeight</Property>
- <Property name="align">center</Property>
- <Property name="width">100</Property>
- </DataColumn>
- <DataColumn>
- <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
-arg.processDefault = true;</ClientEvent>
- <Property name="property">recordWeight</Property>
- <Property name="align">center</Property>
- <Property name="width">100</Property>
- <Property name="visible">true</Property>
- <Property name="name">recordWeight</Property>
- </DataColumn>
- <DataColumn name="progress">
- <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
-arg.processDefault = true;</ClientEvent>
- <Property name="property">progress</Property>
- <Property name="align">center</Property>
- <Property name="width">100</Property>
- </DataColumn>
- <DataColumn name="recordStatus">
- <Property name="property">recordStatus</Property>
- <Property name="align">center</Property>
- <Property name="width">100</Property>
- <Property name="visible">false</Property>
- </DataColumn>
- <DataColumn name="completeTime">
- <Property name="property">completeTime</Property>
- <Property name="align">center</Property>
- <Property name="width">150</Property>
- </DataColumn>
- </DataGrid>
- </Container>
- <Container 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">
- <Property name="closeable">false</Property>
- <Property name="caption">琛ㄥ崟淇℃伅</Property>
- <Property name="width">1200</Property>
- <Property name="iconClass">fa fa-tasks</Property>
- <Property name="showCaptionBar">false</Property>
- <Buttons>
- <Button id="btnOK">
- <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
-if(data.validate() != 'ok'){
- $notify("鏁版嵁鏍￠獙澶辫触锛侊紒");
- return;
-}
-view.get("#uaSave").execute(function(result){
- if(result){
- $alert(result);
- return;
- }
- $notify("鏁版嵁鎵ц瀹屾垚锛侊紒");
- self.get("parent").hide();
-});</ClientEvent>
- <Property name="caption">纭畾淇濆瓨</Property>
- <Property name="iconClass">fa fa-check</Property>
- <Property name="exClassName">btn-normal</Property>
- </Button>
- <Button id="btnComplete" layoutConstraint="left">
- <ClientEvent name="onClick">completeExe();</ClientEvent>
- <Property name="caption">缁撴潫娴佺▼</Property>
- <Property name="exClassName">btn-default</Property>
- <Property name="iconClass">fa fa-gavel</Property>
- <Property name="hideMode">display</Property>
- <Property name="visible">false</Property>
- </Button>
- <Button id="btnAddCheck">
- <ClientEvent name="onClick">var data = view.get("#dataGridMain.currentEntity");
-var list = data.get("checkItems");
-
-list.insert({});
-console.log(list);
-</ClientEvent>
- <Property name="caption">鏂板鍖栭獙椤�</Property>
- <Property name="iconClass">fa fa-plus</Property>
- <Property name="hideMode">display</Property>
- <Property name="visible">true</Property>
- </Button>
- <Button>
- <ClientEvent name="onClick">cancelMain();</ClientEvent>
- <Property name="caption">鍙栨秷鎿嶄綔</Property>
- <Property name="iconClass">fa fa-times</Property>
- </Button>
- </Buttons>
- <Children>
- <TabControl>
- <ClientEvent name="onTabChange">if(arg.newTab.get("name") == "tabCheck"){
- view.get("#btnAddCheck").set("visible",true);
-}else{
- view.get("#btnAddCheck").set("visible",false);
-}</ClientEvent>
- <ControlTab>
- <Property name="caption">鍩虹淇℃伅</Property>
- <Property name="iconClass">fa fa-download</Property>
- <Property name="width">150</Property>
- <Property name="name">tabCommon</Property>
- <Container>
- <FieldSet layout="regionPadding:5" layoutConstraint="padding:10">
- <Property name="caption">鍩烘湰淇℃伅</Property>
- <Buttons/>
- <Children>
- <AutoForm>
- <Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*,*</Property>
- <Property name="labelAlign">right</Property>
- <Property name="labelSeparator">锛�</Property>
- <Property name="labelWidth">100</Property>
- <AutoFormElement>
- <Property name="name">plateNum</Property>
- <Property name="property">plateNum</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">userName</Property>
- <Property name="property">userName</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">userId</Property>
- <Property name="property">userId</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">userContact</Property>
- <Property name="property">userContact</Property>
- <Property name="label">鑱旂郴鐢佃瘽</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="label">瀹㈡埛鍚嶇О</Property>
- <Property name="property">customerName</Property>
- <Property name="editable">false</Property>
- <Property name="trigger">ddNotice</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">transType</Property>
- <Property name="property">transType</Property>
- <Editor>
- <RadioGroup>
- <RadioButton>
- <Property name="text">姹借溅</Property>
- <Property name="value">1</Property>
- </RadioButton>
- <RadioButton>
- <Property name="text">鐏溅</Property>
- <Property name="value">2</Property>
- </RadioButton>
- <RadioButton>
- <Property name="text">杞埞</Property>
- <Property name="value">3</Property>
- </RadioButton>
- <RadioButton>
- <Property name="text">鍏朵粬</Property>
- <Property name="value">4</Property>
- </RadioButton>
- </RadioGroup>
- </Editor>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">depotId</Property>
- <Property name="property">depotId</Property>
- <Property name="label">瑁呭嵏浠撳簱</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">foodVariety</Property>
- <Property name="property">foodVariety</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">specType</Property>
- <Property name="property">specType</Property>
- <Editor>
- <RadioGroup>
- <RadioButton>
- <Property name="text">鏁ｇ伯</Property>
- <Property name="value">鏁ｇ伯</Property>
- </RadioButton>
- <RadioButton>
- <Property name="text">25kg</Property>
- <Property name="value">25kg</Property>
- </RadioButton>
- <RadioButton>
- <Property name="text">50kg</Property>
- <Property name="value">50kg</Property>
- </RadioButton>
- </RadioGroup>
- </Editor>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">foodLevel</Property>
- <Property name="property">foodLevel</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">foodYear</Property>
- <Property name="property">foodYear</Property>
- <Property name="trigger">yearDropDown</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">registerTime</Property>
- <Property name="property">registerTime</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">foodLocation</Property>
- <Property name="property">foodLocation</Property>
- <Property name="trigger">ddFoodOrigin</Property>
- <Editor/>
- </AutoFormElement>
- </AutoForm>
- </Children>
- </FieldSet>
- <FieldSet layout="regionPadding:5" layoutConstraint="padding:10">
- <Property name="caption">绉伴噸淇℃伅锛堝崟浣嶏細KG锛�</Property>
- <Buttons/>
- <Children>
- <AutoForm>
- <Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*,*,*,*,*</Property>
- <Property name="labelAlign">right</Property>
- <Property name="labelWidth">100</Property>
- <Property name="labelSeparator">锛�</Property>
- <AutoFormElement layoutConstraint="colSpan:2">
- <ClientEvent name="onBlur">//id 瑙勫垯 d_prop
-var id = self.getDom().id;
-var prop = id.substring(2,id.length);
-deAutoByWeight(prop);</ClientEvent>
- <Property name="name">emptyWeight</Property>
- <Property name="property">emptyWeight</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <ClientEvent name="onBlur">//id 瑙勫垯 d_prop
-var id = self.getDom().id;
-var prop = id.substring(2,id.length);
-deAutoByWeight(prop);
- </ClientEvent>
- <Property name="name">fullWeight</Property>
- <Property name="property">fullWeight</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">netWeight</Property>
- <Property name="property">netWeight</Property>
- <Property name="readOnly">true</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <ClientEvent name="onBlur">//id 瑙勫垯 d_prop
-var id = self.getDom().id;
-var prop = id.substring(2,id.length);
-deAutoByWeight(prop);</ClientEvent>
- <Property name="name">deImpurity</Property>
- <Property name="property">deImpurity</Property>
- <Property name="showHint">false</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">impurity</Property>
- <Property name="property">impurity</Property>
- <Property name="showLabel">false</Property>
- <Editor>
- <TextEditor>
- <Property name="blankText"> -- % --</Property>
- </TextEditor>
- </Editor>
- </AutoFormElement>
- <AutoFormElement id="deWet">
- <ClientEvent name="onBlur">//id 瑙勫垯 d_prop
-var id = self.getDom().id;
-var prop = id.substring(2,id.length);
-deAutoByWeight(prop);</ClientEvent>
- <Property name="name">deWet</Property>
- <Property name="property">deWet</Property>
- <Property name="showHint">false</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">wet</Property>
- <Property name="property">wet</Property>
- <Property name="showLabel">false</Property>
- <Editor>
- <TextEditor>
- <Property name="blankText"> -- % --</Property>
- </TextEditor>
- </Editor>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <ClientEvent name="onBlur">//id 瑙勫垯 d_prop
-var id = self.getDom().id;
-var prop = id.substring(2,id.length);
-deAutoByWeight(prop);</ClientEvent>
- <Property name="name">deHandle</Property>
- <Property name="property">deHandle</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <ClientEvent name="onBlur">//id 瑙勫垯 d_prop
-var id = self.getDom().id;
-var prop = id.substring(2,id.length);
-deAutoByWeight(prop);</ClientEvent>
- <Property name="name">deOther</Property>
- <Property name="property">deOther</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">deSum</Property>
- <Property name="property">deSum</Property>
- <Property name="readOnly">true</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">settleWeight</Property>
- <Property name="property">settleWeight</Property>
- <Property name="readOnly">true</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">fullWeightTime</Property>
- <Property name="property">fullWeightTime</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">emptyWeightTime</Property>
- <Property name="property">emptyWeightTime</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">recordWeight</Property>
- <Property name="property">recordWeight</Property>
- <Property name="readOnly">true</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">completeTime</Property>
- <Property name="property">completeTime</Property>
- <Editor/>
- </AutoFormElement>
- <Label layoutConstraint="colSpan:4">
- <Property name="style">
- <Property name="color">blue</Property>
- <Property name="padding-left">80px</Property>
- </Property>
- <Property name="text">璇存槑锛氱粨绠楅噸閲�=鍑�閲�-鎵ｉ噸+澧為噸锛涘叆搴撻噸閲�=鍑�閲�-鎵ｉ噸锛涙墸姘存潅锛氭鏁�=鎵ｉ噸锛岃礋鏁�=澧為噸</Property>
- </Label>
- </AutoForm>
- </Children>
- </FieldSet>
- <FieldSet layout="regionPadding:5" layoutConstraint="padding:10">
- <Property name="caption">澶囨敞璇存槑</Property>
- <Buttons/>
- <Children>
- <AutoForm>
- <Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*</Property>
- <Property name="labelAlign">right</Property>
- <Property name="labelSeparator">锛�</Property>
- <Property name="labelWidth">100</Property>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">remarks</Property>
- <Property name="property">remarks</Property>
- <Property name="editorType">TextArea</Property>
- <Property name="showLabel">false</Property>
- <Editor/>
- </AutoFormElement>
- </AutoForm>
- </Children>
- </FieldSet>
- </Container>
- </ControlTab>
- <ControlTab id="tabCheck">
- <Property name="caption">鎵︽牱鍖栭獙</Property>
- <Property name="iconClass">fa fa-gavel</Property>
- <Property name="width">150</Property>
- <Property name="name">tabCheck</Property>
- <Container layout="padding:10">
- <AutoForm>
- <Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*,*,*</Property>
- <Property name="labelAlign">right</Property>
- <Property name="labelWidth">100</Property>
- <Property name="labelSeparator">锛�</Property>
- <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">foodLevel</Property>
- <Property name="property">foodLevel</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">foodYear</Property>
- <Property name="property">foodYear</Property>
- <Property name="trigger">yearDropDown</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">checkUser</Property>
- <Property name="property">checkUser</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">price</Property>
- <Property name="property">price</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">checkStatus</Property>
- <Property name="property">checkStatus</Property>
- <Property name="label">鍖栭獙缁撴灉</Property>
- <Editor/>
- </AutoFormElement>
- </AutoForm>
- <DataGrid id="dataGridCheckItem" layoutConstraint="padding:10">
- <ClientEvent name="onCellValueEdit">//瀹炵幇鍖栭獙椤圭洰璋冩暣锛屾洿鏂颁富琛ㄤ腑鍊�
-var entity = arg.entity;
-var inoutData = view.get("#dsMain.data:#");
-
-if(entity.get("standardId") =="C01"){//姘村垎
- inoutData.set("wet",entity.get("value"));
-}
-
-if(entity.get("standardId") =="C02"){//闆滃織
- inoutData.set("impurity",entity.get("value"));
-}</ClientEvent>
- <Property name="dataSet">dsMain</Property>
- <Property name="dataPath">#.checkItems</Property>
- <Property name="highlightCurrentRow">false</Property>
- <Property name="visible">true</Property>
+ <Property name="packages">font-awesome,css-common</Property>
+ <Property name="javaScriptFile">./static/plugins/lodop/LodopFuncs.js</Property>
+ <DataSet id="dsMain">
+ <Property name="dataType">[dtMain]</Property>
+ <Property name="pageSize">20</Property>
+ <Property name="dataProvider">inoutDataPR#pageInoutData</Property>
+ <Property name="loadMode">manual</Property>
+ </DataSet>
+ <DataSet id="dsQuery">
+ <Property name="dataType">dtQuery</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 id="btnEdit" layoutConstraint="left">
+ <ClientEvent name="onClick">edit();</ClientEvent>
+ <Property name="caption">缂栬緫</Property>
+ <Property name="exClassName">btn-warm</Property>
+ <Property name="iconClass">fa fa-pencil</Property>
<Property name="hideMode">display</Property>
- <RowNumColumn/>
- <DataColumn name="standardName">
- <Property name="property">standardName</Property>
- <Property name="align">center</Property>
- <Property name="readOnly">true</Property>
- </DataColumn>
- <DataColumn name="value">
- <Property name="property">value</Property>
- <Property name="align">center</Property>
- <Property name="caption">妫�娴嬪�硷紙鍙紪杈戯級</Property>
- <Editor/>
- </DataColumn>
- <DataColumn name="unit">
- <Property name="property">unit</Property>
- <Property name="width">80</Property>
- <Property name="readOnly">true</Property>
- </DataColumn>
- <DataColumn name="standardValue">
- <Property name="property">standardValue</Property>
- <Property name="readOnly">true</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="remarks">
- <Property name="property">remarks</Property>
- </DataColumn>
- </DataGrid>
+ </Button>
+ <Button id="btnDel" layoutConstraint="left">
+ <ClientEvent name="onClick">showAbnormal();</ClientEvent>
+ <Property name="caption">寮傚父鎿嶄綔</Property>
+ <Property name="exClassName">btn-warn</Property>
+ <Property name="iconClass">fa fa-minus</Property>
+ <Property name="hideMode">display</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">showImg();</ClientEvent>
+ <Property name="caption">杩囩▼杩借釜</Property>
+ <Property name="exClassName">btn-normal</Property>
+ <Property name="iconClass">fa fa-picture-o</Property>
+ </Button>
+ <Button id="btn2End" layoutConstraint="left">
+ <ClientEvent name="onClick">completeStart();</ClientEvent>
+ <Property name="caption">蹇�熺粨鏉�</Property>
+ <Property name="exClassName">btn-default</Property>
+ <Property name="iconClass">fa fa-gavel</Property>
+ <Property name="hideMode">display</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <Property name="caption">鍗曟嵁鎵撳嵃</Property>
+ <Property name="exClassName">btn-warm</Property>
+ <Property name="iconClass">fa fa-print</Property>
+ <Property name="menu">menuEdit</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <Property name="caption">瀵煎嚭EXCEL</Property>
+ <Property name="exClassName">btn-normal</Property>
+ <Property name="iconClass">fa fa-file-excel-o</Property>
+ <Property name="action">exportExcel</Property>
+ </Button>
+ </Container>
+ <AutoForm layoutConstraint="top">
+ <Property name="cols">*,*,*,*</Property>
+ <Property name="dataSet">dsQuery</Property>
+ <Property name="exClassName">bg-color</Property>
+ <Property name="labelAlign">right</Property>
+ <AutoFormElement>
+ <Property name="name">start</Property>
+ <Property name="property">start</Property>
+ <Property name="trigger">defaultDateDropDown</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">end</Property>
+ <Property name="property">end</Property>
+ <Property name="trigger">defaultDateDropDown</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">plateNum</Property>
+ <Property name="property">plateNum</Property>
+ <Editor>
+ <TextEditor>
+ <Property name="blankText">-- 鏀寔妯＄硦 --</Property>
+ </TextEditor>
+ </Editor>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">userId</Property>
+ <Property name="property">userId</Property>
+ <Editor>
+ <TextEditor>
+ <Property name="blankText">-- 鏀寔妯＄硦 --</Property>
+ </TextEditor>
+ </Editor>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">depotId</Property>
+ <Property name="property">depotId</Property>
+ <Property name="trigger">autoMappingDropDown2</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">foodVariety</Property>
+ <Property name="property">foodVariety</Property>
+ <Property name="trigger">autoOpenMappingDropDown2</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">orderTag</Property>
+ <Property name="property">orderTag</Property>
+ <Property name="trigger">autoMappingDropDown1</Property>
+ <Editor/>
+ </AutoFormElement>
+ <Container layout="hbox regionPadding:15">
+ <Button>
+ <ClientEvent name="onClick">query();
+ </ClientEvent>
+ <Property name="caption">鏌ヨ</Property>
+ <Property name="exClassName">btn-normal</Property>
+ <Property name="iconClass">fa fa-search</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">var type ="${request.getParameter('type')}";
+ var deptId = window.parent.DEPT_ID;//鐖堕〉闈腑鐨勫垎搴撶紪鐮�
+ view.get("#dsQuery").setData({type:type,deptId:deptId});
+ </ClientEvent>
+ <Property name="exClassName">btn-warn</Property>
+ <Property name="iconClass">fa fa-refresh</Property>
+ <Property name="caption">閲嶇疆</Property>
+ </Button>
</Container>
- </ControlTab>
- </TabControl>
- </Children>
- <Tools/>
- </Dialog>
- <Dialog id="dialogImg">
- <Property name="width">1000</Property>
- <Property name="height">95%</Property>
- <Property name="iconClass">fa fa-tasks</Property>
- <Property name="caption">娴佺▼杩芥函灞曠ず</Property>
- <Buttons/>
- <Children>
- <IFrame id="iFrameImg">
- <Property name="width">100%</Property>
- </IFrame>
- </Children>
- <Tools/>
- </Dialog>
- <Dialog id="dialogAbnormal" layout="regionPadding:5">
- <Property name="width">450</Property>
- <Property name="iconClass">fa fa-tasks</Property>
- <Property name="caption">寮傚父鎿嶄綔鍘熷洜</Property>
- <Property name="closeable">false</Property>
- <Buttons>
- <Button>
- <ClientEvent name="onClick">del();</ClientEvent>
- <Property name="caption">纭畾鍒犻櫎</Property>
- <Property name="iconClass">fa fa-check</Property>
- <Property name="exClassName">btn-warn</Property>
- </Button>
- <Button>
- <ClientEvent name="onClick">todoError();</ClientEvent>
- <Property name="caption">寮傚父缁堟</Property>
- <Property name="iconClass">fa fa-check</Property>
- <Property name="exClassName">btn-warn</Property>
- <Property name="hideMode">visibility</Property>
- </Button>
- <Button>
- <ClientEvent name="onClick">self.get("parent").close();</ClientEvent>
- <Property name="caption">鍙栨秷鎿嶄綔</Property>
- <Property name="iconClass">fa fa-times</Property>
- </Button>
- </Buttons>
- <Children>
- <TextArea id="textAbnormal">
- <Property name="height">165</Property>
- </TextArea>
- <AutoForm>
- <Property name="cols">*</Property>
- <Label layoutConstraint="colSpan:1">
- <Property name="style">
- <Property name="color">blue</Property>
- </Property>
- <Property name="text">寮傚父缁堟锛氫笟鍔℃暟鎹祦绋嬬粨鏉燂紝閲嶉噺淇℃伅涓嶈繘琛岀粺璁¤绠椼��</Property>
- </Label>
- <Label layoutConstraint="colSpan:1">
- <Property name="style">
- <Property name="color">blue</Property>
- </Property>
- <Property name="text">鍒犻櫎鎿嶄綔锛氫笟鍔℃暟鎹鍒犻櫎涓斾笉缁熻锛屽彧淇濈暀鏃ュ織璁板綍銆�</Property>
- </Label>
</AutoForm>
- </Children>
- <Tools/>
- </Dialog>
- <UpdateAction id="uaSave">
- <Property name="dataResolver">inoutDataPR#saveInoutData</Property>
- <UpdateItem>
- <Property name="dataSet">dsMain</Property>
- <Property name="dataPath">[#current]</Property>
- <Property name="validateData">false</Property>
- </UpdateItem>
- </UpdateAction>
- <UpdateAction id="ajaxDel">
- <Property name="dataResolver">inoutDataPR#delInoutData</Property>
- <Property name="confirmMessage">纭畾瑕佹墽琛屽垹闄や箞锛�</Property>
- <UpdateItem>
- <Property name="dataSet">dsMain</Property>
- <Property name="dataPath">[#current]</Property>
- <Property name="validateData">false</Property>
- </UpdateItem>
- </UpdateAction>
- <UpdateAction id="ajaxError">
- <Property name="dataResolver">inoutDataPR#errorInoutData</Property>
- <UpdateItem>
- <Property name="dataSet">dsMain</Property>
- <Property name="dataPath">[#current]</Property>
- <Property name="validateData">false</Property>
- </UpdateItem>
- </UpdateAction>
- <UpdateAction id="ajaxComplete">
- <Property name="dataResolver">inoutDataPR#completeInoutData</Property>
- <Property name="confirmMessage">纭畾瑕佺粨鏉熸祦绋嬩箞锛�</Property>
- <UpdateItem>
- <Property name="dataSet">dsMain</Property>
- <Property name="dataPath">[#current]</Property>
- </UpdateItem>
- </UpdateAction>
- <AjaxAction id="ajaxPrint">
- <Property name="service">inoutDataPR#printWeightBill</Property>
- <Property name="executingMessage">姝ｅ湪鎵ц鎵撳嵃鈥︹��</Property>
- <Property name="async">false</Property>
- </AjaxAction>
- <AjaxAction id="ajaxShipPrint">
- <Property name="service">inoutDataPR#printShipBill</Property>
- <Property name="executingMessage">姝ｅ湪鎵ц鎵撳嵃鈥︹��</Property>
- <Property name="async">false</Property>
- </AjaxAction>
- <AjaxAction id="ajaxPrintCheck">
- <Property name="service">inoutDataPR#printCheckBill</Property>
- <Property name="executingMessage">姝ｅ湪鎵ц鎵撳嵃鈥︹��</Property>
- <Property name="async">false</Property>
- </AjaxAction>
- <AjaxAction id="ajaxInitAdd">
- <Property name="service">inoutDataPR#initAddData</Property>
- </AjaxAction>
- <AjaxAction id="ajaxGetDepot">
- <Property name="service">depotPR#getDepot</Property>
- </AjaxAction>
- <AjaxAction id="ajaxGetCheck">
- <Property name="service">checkStandardPR#listCheckItemsByFoodVariety</Property>
- </AjaxAction>
- <Export2ReportAction id="exportExcel">
- <Property name="extension">xls</Property>
- <Property name="template">dataGridMain</Property>
- <Property name="maxSize">3000</Property>
- <Property name="fileName">鍗曟嵁鍒楄〃</Property>
- <Property name="showTitle">true</Property>
- <Property name="titleName">鍗曟嵁鍒楄〃</Property>
- <Property name="dataScope">currentPage</Property>
- </Export2ReportAction>
- <CustomDropDown id="ddFoodOrigin">
- <Property name="minHeight">500</Property>
- <Property name="assignmentMap">foodLocation=name</Property>
- <Property name="minWidth">500</Property>
- <Container layout="regionPadding:5">
- <DataSet id="dsFoodOrigin">
- <Property name="dataProvider"></Property>
- <Property name="dataType">[dtFoodOrigin]</Property>
- <Property name="parameter"></Property>
- <Property name="pageSize">30</Property>
- </DataSet>
- <Container layout="hbox regionPadding:5">
- <TextEditor id="key2">
- <Property name="blankText"> -- 缂栫爜鎴栬�呭悕绉� --</Property>
- <Property name="width">200</Property>
- </TextEditor>
- <Button>
- <ClientEvent name="onClick">var key = view.get("#key2.value");
-view.get("#dsFoodOrigin").set("parameter",{key:key}).flushAsync();</ClientEvent>
- <Property name="caption">鏌ヨ</Property>
- <Property name="iconClass">fa fa-search</Property>
- </Button>
- <Button>
- <ClientEvent name="onClick">var data = view.get("#dsFoodOrigin.data:#");
-if(data){
- view.get("#ddFoodOrigin").close(data.toJSON());
-}</ClientEvent>
- <Property name="iconClass">fa fa-check</Property>
- <Property name="caption">纭畾</Property>
- </Button>
+ <Container layoutConstraint="center">
+ <Property name="exClassName">bg-color</Property>
+ <DataGrid id="dataGridMain" layoutConstraint="center">
+ <ClientEvent name="onDataRowDoubleClick">edit();</ClientEvent>
+ <ClientEvent name="onDataRowClick">//瀹炵幇鐐瑰嚮鍗抽�変腑
+ //self.set("selection",arg.data);
+ </ClientEvent>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="dynaRowHeight">false</Property>
+ <Property name="selectionMode">multiRows</Property>
+ <RowSelectorColumn/>
+ <DataColumn name="id">
+ <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
+ arg.dom.style.color = "#f67d06";
+ arg.processDefault = true;
+ </ClientEvent>
+ <Property name="property">id</Property>
+ <Property name="align">center</Property>
+ <Property name="width">150</Property>
+ </DataColumn>
+ <DataColumn name="plateNum">
+ <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
+ arg.processDefault = true;
+ </ClientEvent>
+ <Property name="property">plateNum</Property>
+ <Property name="align">center</Property>
+ <Property name="width">150</Property>
+ </DataColumn>
+ <DataColumn>
+ <Property name="property">userName</Property>
+ <Property name="align">center</Property>
+ <Property name="width">120</Property>
+ <Property name="name">userName</Property>
+ </DataColumn>
+ <DataColumn>
+ <Property name="property">customerName</Property>
+ <Property name="width">250</Property>
+ <Property name="name">customerName</Property>
+ <Property name="align">center</Property>
+ <Property name="caption">瀹㈡埛鍚嶇О</Property>
+ </DataColumn>
+ <DataColumn name="foodVariety">
+ <Property name="property">foodVariety</Property>
+ <Property name="align">center</Property>
+ <Property name="width">120</Property>
+ </DataColumn>
+ <DataColumn name="depotId">
+ <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
+ arg.processDefault = true;
+ </ClientEvent>
+ <Property name="property">depotId</Property>
+ <Property name="align">center</Property>
+ <Property name="width">120</Property>
+ </DataColumn>
+ <DataColumn name="fullWeight">
+ <Property name="property">fullWeight</Property>
+ <Property name="caption">姣涢噸</Property>
+ <Property name="align">center</Property>
+ <Property name="width">100</Property>
+ </DataColumn>
+ <DataColumn name="emptyWeight">
+ <Property name="property">emptyWeight</Property>
+ <Property name="caption">鐨噸</Property>
+ <Property name="align">center</Property>
+ <Property name="width">100</Property>
+ </DataColumn>
+ <DataColumn name="netWeight">
+ <Property name="property">netWeight</Property>
+ <Property name="align">center</Property>
+ <Property name="caption">鍑�閲�</Property>
+ <Property name="width">100</Property>
+ </DataColumn>
+ <DataColumn id="columnDeSum">
+ <Property name="property">deSum</Property>
+ <Property name="width">100</Property>
+ <Property name="caption">鎬绘墸閲�</Property>
+ <Property name="align">center</Property>
+ <Property name="name">deSum</Property>
+ </DataColumn>
+ <DataColumn name="settleWeight">
+ <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
+ arg.processDefault = true;
+ </ClientEvent>
+ <Property name="property">settleWeight</Property>
+ <Property name="align">center</Property>
+ <Property name="width">100</Property>
+ </DataColumn>
+ <DataColumn>
+ <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
+ arg.processDefault = true;
+ </ClientEvent>
+ <Property name="property">recordWeight</Property>
+ <Property name="align">center</Property>
+ <Property name="width">100</Property>
+ <Property name="visible">true</Property>
+ <Property name="name">recordWeight</Property>
+ </DataColumn>
+ <DataColumn name="progress">
+ <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
+ arg.processDefault = true;
+ </ClientEvent>
+ <Property name="property">progress</Property>
+ <Property name="align">center</Property>
+ <Property name="width">100</Property>
+ </DataColumn>
+ <DataColumn name="recordStatus">
+ <Property name="property">recordStatus</Property>
+ <Property name="align">center</Property>
+ <Property name="width">100</Property>
+ <Property name="visible">false</Property>
+ </DataColumn>
+ <DataColumn name="completeTime">
+ <Property name="property">completeTime</Property>
+ <Property name="align">center</Property>
+ <Property name="width">150</Property>
+ </DataColumn>
+ </DataGrid>
</Container>
- <DataGrid>
- <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsFoodOrigin.data:#");
-if(data){
- view.get("#ddFoodOrigin").close(data.toJSON());
-}</ClientEvent>
- <Property name="dataSet">dsFoodOrigin</Property>
- <Property name="readOnly">true</Property>
- <DataColumn name="code">
- <Property name="property">code</Property>
- <Property name="readOnly">true</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="name">
- <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
-arg.processDefault = true;</ClientEvent>
- <Property name="property">name</Property>
- <Property name="readOnly">true</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="simple">
- <Property name="property">simple</Property>
- <Property name="readOnly">true</Property>
- <Property name="align">center</Property>
- </DataColumn>
- </DataGrid>
- <DataPilot layoutConstraint="bottom">
- <Property name="dataSet">dsFoodOrigin</Property>
- </DataPilot>
- </Container>
- </CustomDropDown>
- <CustomDropDown id="ddNotice">
- <Property name="minHeight">400</Property>
- <Property name="assignmentMap">noticeId=id,customerId=customerId,customerName=customerName</Property>
- <Property name="minWidth">500</Property>
- <Property name="autoOpen">true</Property>
- <Container layout="regionPadding:5">
- <DataSet id="dsNotice">
- <Property name="dataProvider">inoutNoticePR#queryNoticeByKey</Property>
- <Property name="parameter">
- <Entity>
- <Property name="type">${request.getParameter('type')}</Property>
- </Entity>
- </Property>
- <Property name="dataType">[dtNoticeDto]</Property>
- </DataSet>
- <Container layout="hbox regionPadding:5">
- <TextEditor id="key3">
- <Property name="blankText"> -- 瀹㈡埛鍚嶇О鎴栫紪鐮� --</Property>
- <Property name="width">200</Property>
- </TextEditor>
- <Button>
- <ClientEvent name="onClick">var key = view.get("#key3.value");
-var type = "${request.getParameter('type')}";
-view.get("#dsNotice").set("parameter",{key: key,type: type}).flushAsync();</ClientEvent>
- <Property name="caption">鏌ヨ</Property>
- <Property name="iconClass">fa fa-search</Property>
- </Button>
- <Button>
- <ClientEvent name="onClick">var data = view.get("#dsNotice.data:#");
-if(data){
- view.get("#ddNotice").close(data.toJSON());
-}</ClientEvent>
- <Property name="iconClass">fa fa-check</Property>
- <Property name="caption">纭畾</Property>
- </Button>
+ <Container layoutConstraint="bottom">
+ <Property name="exClassName">bg-color</Property>
+ <DataPilot layoutConstraint="right">
+ <Property name="itemCodes">pageSize,pages</Property>
+ <Property name="dataSet">dsMain</Property>
+ </DataPilot>
</Container>
- <DataGrid>
- <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsNotice.data:#");
-if(data){
- view.get("#ddNotice").close(data.toJSON());
-}</ClientEvent>
- <Property name="dataSet">dsNotice</Property>
- <Property name="readOnly">true</Property>
- <DataColumn>
- <Property name="property">customerName</Property>
- <Property name="align">center</Property>
- <Property name="name">customerName</Property>
- </DataColumn>
- <DataColumn name="name">
- <Property name="property">name</Property>
- </DataColumn>
- </DataGrid>
- </Container>
- </CustomDropDown>
- <YearDropDown id="yearDropDown"/>
- <Dialog id="dialogSelfPrint">
- <Property name="height">300</Property>
- <Property name="width">600</Property>
- <Property name="caption">鑷畾涔夋墦鍗�</Property>
- <Buttons>
- <Button>
- <ClientEvent name="onClick">var html = view.get("#textAreaPrint.text");
-
-self.get("parent").hide();
-printBill(html);</ClientEvent>
- <Property name="caption">纭畾</Property>
- </Button>
- <Button>
- <ClientEvent name="onClick">self.get("parent").hide();
-</ClientEvent>
- <Property name="caption">鍙栨秷</Property>
- </Button>
- </Buttons>
- <Children>
- <TextArea id="textAreaPrint"/>
- </Children>
- <Tools/>
- </Dialog>
- <Menu id="menuEdit">
- <MenuItem>
- <ClientEvent name="onClick">var data = view.get("#dataGridMain.currentEntity");
-if (!data) {
- $alert("璇峰厛閫夋嫨鏁版嵁锛�");
- return;
-}
-
-var transType = data.get("transType");
-if(transType == "3"){
- printShipWeight();
-}else{
- printWeight();
-}</ClientEvent>
- <Property name="caption">鎵撳嵃杩囩鍗�</Property>
- <Property name="iconClass">fa fa-print</Property>
- </MenuItem>
- <MenuItem>
- <ClientEvent name="onClick">printCheck();</ClientEvent>
- <Property name="caption">鎵撳嵃妫�楠屽崟</Property>
- <Property name="iconClass">fa fa-print</Property>
- </MenuItem>
- <MenuItem>
- <ClientEvent name="onClick">printPay();</ClientEvent>
- <Property name="caption">鎵撳嵃缁撶畻鍗�</Property>
- <Property name="iconClass">fa fa-print</Property>
- <Property name="disabled">true</Property>
- </MenuItem>
- <Separator/>
- <MenuItem>
- <ClientEvent name="onClick">printBatchWeight();</ClientEvent>
- <Property name="caption">鎵归噺杩囩鍗�</Property>
- <Property name="iconClass">fa fa-print</Property>
- </MenuItem>
- <MenuItem>
- <ClientEvent name="onClick">printBatchCheck();</ClientEvent>
- <Property name="caption">鎵归噺鍖栭獙鍗�</Property>
- <Property name="iconClass">fa fa-print</Property>
- </MenuItem>
- <MenuItem>
- <ClientEvent name="onClick">view.get("#dialogSelfPrint").show();</ClientEvent>
- <Property name="caption">鑷畾涔夋墦鍗�</Property>
- <Property name="iconClass">fa fa-print</Property>
- </MenuItem>
- </Menu>
- </View>
+ <Dialog id="dialogMain">
+ <Property name="closeable">false</Property>
+ <Property name="caption">琛ㄥ崟淇℃伅</Property>
+ <Property name="width">1200</Property>
+ <Property name="iconClass">fa fa-tasks</Property>
+ <Property name="showCaptionBar">false</Property>
+ <Buttons>
+ <Button id="btnOK">
+ <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
+ if(data.validate() != 'ok'){
+ $notify("鏁版嵁鏍￠獙澶辫触锛侊紒");
+ return;
+ }
+ view.get("#uaSave").execute(function(result){
+ if(result){
+ $alert(result);
+ return;
+ }
+ $notify("鏁版嵁鎵ц瀹屾垚锛侊紒");
+ self.get("parent").hide();
+ });
+ </ClientEvent>
+ <Property name="caption">纭畾淇濆瓨</Property>
+ <Property name="iconClass">fa fa-check</Property>
+ <Property name="exClassName">btn-normal</Property>
+ </Button>
+ <Button id="btnComplete" layoutConstraint="left">
+ <ClientEvent name="onClick">completeExe();</ClientEvent>
+ <Property name="caption">缁撴潫娴佺▼</Property>
+ <Property name="exClassName">btn-default</Property>
+ <Property name="iconClass">fa fa-gavel</Property>
+ <Property name="hideMode">display</Property>
+ <Property name="visible">false</Property>
+ </Button>
+ <Button id="btnAddCheck">
+ <ClientEvent name="onClick">var data = view.get("#dataGridMain.currentEntity");
+ var list = data.get("checkItems");
+ 
+ list.insert({});
+ console.log(list);
+ </ClientEvent>
+ <Property name="caption">鏂板鍖栭獙椤�</Property>
+ <Property name="iconClass">fa fa-plus</Property>
+ <Property name="hideMode">display</Property>
+ <Property name="visible">true</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">cancelMain();</ClientEvent>
+ <Property name="caption">鍙栨秷鎿嶄綔</Property>
+ <Property name="iconClass">fa fa-times</Property>
+ </Button>
+ </Buttons>
+ <Children>
+ <TabControl>
+ <ClientEvent name="onTabChange">if(arg.newTab.get("name") == "tabCheck"){
+ view.get("#btnAddCheck").set("visible",true);
+ }else{
+ view.get("#btnAddCheck").set("visible",false);
+ }
+ </ClientEvent>
+ <ControlTab>
+ <Property name="caption">鍩虹淇℃伅</Property>
+ <Property name="iconClass">fa fa-download</Property>
+ <Property name="width">150</Property>
+ <Property name="name">tabCommon</Property>
+ <Container>
+ <FieldSet layout="regionPadding:5" layoutConstraint="padding:10">
+ <Property name="caption">鍩烘湰淇℃伅</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*,*</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <Property name="labelWidth">100</Property>
+ <AutoFormElement>
+ <Property name="name">plateNum</Property>
+ <Property name="property">plateNum</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">userName</Property>
+ <Property name="property">userName</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">userId</Property>
+ <Property name="property">userId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">userContact</Property>
+ <Property name="property">userContact</Property>
+ <Property name="label">鑱旂郴鐢佃瘽</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="label">瀹㈡埛鍚嶇О</Property>
+ <Property name="property">customerName</Property>
+ <Property name="editable">false</Property>
+ <Property name="trigger">ddNotice</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">transType</Property>
+ <Property name="property">transType</Property>
+ <Editor>
+ <RadioGroup>
+ <RadioButton>
+ <Property name="text">姹借溅</Property>
+ <Property name="value">1</Property>
+ </RadioButton>
+ <RadioButton>
+ <Property name="text">鐏溅</Property>
+ <Property name="value">2</Property>
+ </RadioButton>
+ <RadioButton>
+ <Property name="text">杞埞</Property>
+ <Property name="value">3</Property>
+ </RadioButton>
+ <RadioButton>
+ <Property name="text">鍏朵粬</Property>
+ <Property name="value">4</Property>
+ </RadioButton>
+ </RadioGroup>
+ </Editor>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">depotId</Property>
+ <Property name="property">depotId</Property>
+ <Property name="label">瑁呭嵏浠撳簱</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">foodVariety</Property>
+ <Property name="property">foodVariety</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">specType</Property>
+ <Property name="property">specType</Property>
+ <Editor>
+ <RadioGroup>
+ <RadioButton>
+ <Property name="text">鏁ｇ伯</Property>
+ <Property name="value">鏁ｇ伯</Property>
+ </RadioButton>
+ <RadioButton>
+ <Property name="text">25kg</Property>
+ <Property name="value">25kg</Property>
+ </RadioButton>
+ <RadioButton>
+ <Property name="text">50kg</Property>
+ <Property name="value">50kg</Property>
+ </RadioButton>
+ </RadioGroup>
+ </Editor>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">foodLevel</Property>
+ <Property name="property">foodLevel</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">foodYear</Property>
+ <Property name="property">foodYear</Property>
+ <Property name="trigger">yearDropDown</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">registerTime</Property>
+ <Property name="property">registerTime</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">foodLocation</Property>
+ <Property name="property">foodLocation</Property>
+ <Property name="trigger">ddFoodOrigin</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </FieldSet>
+ <FieldSet layout="regionPadding:5" layoutConstraint="padding:10">
+ <Property name="caption">绉伴噸淇℃伅锛堝崟浣嶏細KG锛�</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*,*,*,*,*</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="labelWidth">100</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <ClientEvent name="onBlur">//id 瑙勫垯 d_prop
+ var id = self.getDom().id;
+ var prop = id.substring(2,id.length);
+ deAutoByWeight(prop);
+ </ClientEvent>
+ <Property name="name">emptyWeight</Property>
+ <Property name="property">emptyWeight</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <ClientEvent name="onBlur">//id 瑙勫垯 d_prop
+ var id = self.getDom().id;
+ var prop = id.substring(2,id.length);
+ deAutoByWeight(prop);
+ </ClientEvent>
+ <Property name="name">fullWeight</Property>
+ <Property name="property">fullWeight</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">netWeight</Property>
+ <Property name="property">netWeight</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <ClientEvent name="onBlur">//id 瑙勫垯 d_prop
+ var id = self.getDom().id;
+ var prop = id.substring(2,id.length);
+ deAutoByWeight(prop);
+ </ClientEvent>
+ <Property name="name">deImpurity</Property>
+ <Property name="property">deImpurity</Property>
+ <Property name="showHint">false</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">impurity</Property>
+ <Property name="property">impurity</Property>
+ <Property name="showLabel">false</Property>
+ <Editor>
+ <TextEditor>
+ <Property name="blankText">-- % --</Property>
+ </TextEditor>
+ </Editor>
+ </AutoFormElement>
+ <AutoFormElement id="deWet">
+ <ClientEvent name="onBlur">//id 瑙勫垯 d_prop
+ var id = self.getDom().id;
+ var prop = id.substring(2,id.length);
+ deAutoByWeight(prop);
+ </ClientEvent>
+ <Property name="name">deWet</Property>
+ <Property name="property">deWet</Property>
+ <Property name="showHint">false</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">wet</Property>
+ <Property name="property">wet</Property>
+ <Property name="showLabel">false</Property>
+ <Editor>
+ <TextEditor>
+ <Property name="blankText">-- % --</Property>
+ </TextEditor>
+ </Editor>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <ClientEvent name="onBlur">//id 瑙勫垯 d_prop
+ var id = self.getDom().id;
+ var prop = id.substring(2,id.length);
+ deAutoByWeight(prop);
+ </ClientEvent>
+ <Property name="name">deHandle</Property>
+ <Property name="property">deHandle</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <ClientEvent name="onBlur">//id 瑙勫垯 d_prop
+ var id = self.getDom().id;
+ var prop = id.substring(2,id.length);
+ deAutoByWeight(prop);
+ </ClientEvent>
+ <Property name="name">deOther</Property>
+ <Property name="property">deOther</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">deSum</Property>
+ <Property name="property">deSum</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">settleWeight</Property>
+ <Property name="property">settleWeight</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">fullWeightTime</Property>
+ <Property name="property">fullWeightTime</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">emptyWeightTime</Property>
+ <Property name="property">emptyWeightTime</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">recordWeight</Property>
+ <Property name="property">recordWeight</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">completeTime</Property>
+ <Property name="property">completeTime</Property>
+ <Editor/>
+ </AutoFormElement>
+ <Label layoutConstraint="colSpan:4">
+ <Property name="style">
+ <Property name="color">blue</Property>
+ <Property name="padding-left">80px</Property>
+ </Property>
+ <Property name="text">璇存槑锛氱粨绠楅噸閲�=鍑�閲�-鎵ｉ噸+澧為噸锛涘叆搴撻噸閲�=鍑�閲�-鎵ｉ噸锛涙墸姘存潅锛氭鏁�=鎵ｉ噸锛岃礋鏁�=澧為噸</Property>
+ </Label>
+ </AutoForm>
+ </Children>
+ </FieldSet>
+ <FieldSet layout="regionPadding:5" layoutConstraint="padding:10">
+ <Property name="caption">澶囨敞璇存槑</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <Property name="labelWidth">100</Property>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">remarks</Property>
+ <Property name="property">remarks</Property>
+ <Property name="editorType">TextArea</Property>
+ <Property name="showLabel">false</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </FieldSet>
+ </Container>
+ </ControlTab>
+ <ControlTab id="tabCheck">
+ <Property name="caption">鎵︽牱鍖栭獙</Property>
+ <Property name="iconClass">fa fa-gavel</Property>
+ <Property name="width">150</Property>
+ <Property name="name">tabCheck</Property>
+ <Container layout="padding:10">
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*,*,*</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="labelWidth">100</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <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">foodLevel</Property>
+ <Property name="property">foodLevel</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">foodYear</Property>
+ <Property name="property">foodYear</Property>
+ <Property name="trigger">yearDropDown</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">checkUser</Property>
+ <Property name="property">checkUser</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">price</Property>
+ <Property name="property">price</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">checkStatus</Property>
+ <Property name="property">checkStatus</Property>
+ <Property name="label">鍖栭獙缁撴灉</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ <DataGrid id="dataGridCheckItem" layoutConstraint="padding:10">
+ <ClientEvent name="onCellValueEdit">//瀹炵幇鍖栭獙椤圭洰璋冩暣锛屾洿鏂颁富琛ㄤ腑鍊�
+ var entity = arg.entity;
+ var inoutData = view.get("#dsMain.data:#");
+ 
+ if(entity.get("standardId") =="C01"){//姘村垎
+ inoutData.set("wet",entity.get("value"));
+ }
+ 
+ if(entity.get("standardId") =="C02"){//闆滃織
+ inoutData.set("impurity",entity.get("value"));
+ }
+ </ClientEvent>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="dataPath">#.checkItems</Property>
+ <Property name="highlightCurrentRow">false</Property>
+ <Property name="visible">true</Property>
+ <Property name="hideMode">display</Property>
+ <RowNumColumn/>
+ <DataColumn name="standardName">
+ <Property name="property">standardName</Property>
+ <Property name="align">center</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="value">
+ <Property name="property">value</Property>
+ <Property name="align">center</Property>
+ <Property name="caption">妫�娴嬪�硷紙鍙紪杈戯級</Property>
+ <Editor/>
+ </DataColumn>
+ <DataColumn name="unit">
+ <Property name="property">unit</Property>
+ <Property name="width">80</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="standardValue">
+ <Property name="property">standardValue</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="remarks">
+ <Property name="property">remarks</Property>
+ </DataColumn>
+ </DataGrid>
+ </Container>
+ </ControlTab>
+ </TabControl>
+ </Children>
+ <Tools/>
+ </Dialog>
+ <Dialog id="dialogImg">
+ <Property name="width">1000</Property>
+ <Property name="height">95%</Property>
+ <Property name="iconClass">fa fa-tasks</Property>
+ <Property name="caption">娴佺▼杩芥函灞曠ず</Property>
+ <Buttons/>
+ <Children>
+ <IFrame id="iFrameImg">
+ <Property name="width">100%</Property>
+ </IFrame>
+ </Children>
+ <Tools/>
+ </Dialog>
+ <Dialog id="dialogAbnormal" layout="regionPadding:5">
+ <Property name="width">450</Property>
+ <Property name="iconClass">fa fa-tasks</Property>
+ <Property name="caption">寮傚父鎿嶄綔鍘熷洜</Property>
+ <Property name="closeable">false</Property>
+ <Buttons>
+ <Button>
+ <ClientEvent name="onClick">del();</ClientEvent>
+ <Property name="caption">纭畾鍒犻櫎</Property>
+ <Property name="iconClass">fa fa-check</Property>
+ <Property name="exClassName">btn-warn</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">todoError();</ClientEvent>
+ <Property name="caption">寮傚父缁堟</Property>
+ <Property name="iconClass">fa fa-check</Property>
+ <Property name="exClassName">btn-warn</Property>
+ <Property name="hideMode">visibility</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">self.get("parent").close();</ClientEvent>
+ <Property name="caption">鍙栨秷鎿嶄綔</Property>
+ <Property name="iconClass">fa fa-times</Property>
+ </Button>
+ </Buttons>
+ <Children>
+ <TextArea id="textAbnormal">
+ <Property name="height">165</Property>
+ </TextArea>
+ <AutoForm>
+ <Property name="cols">*</Property>
+ <Label layoutConstraint="colSpan:1">
+ <Property name="style">
+ <Property name="color">blue</Property>
+ </Property>
+ <Property name="text">寮傚父缁堟锛氫笟鍔℃暟鎹祦绋嬬粨鏉燂紝閲嶉噺淇℃伅涓嶈繘琛岀粺璁¤绠椼��</Property>
+ </Label>
+ <Label layoutConstraint="colSpan:1">
+ <Property name="style">
+ <Property name="color">blue</Property>
+ </Property>
+ <Property name="text">鍒犻櫎鎿嶄綔锛氫笟鍔℃暟鎹鍒犻櫎涓斾笉缁熻锛屽彧淇濈暀鏃ュ織璁板綍銆�</Property>
+ </Label>
+ </AutoForm>
+ </Children>
+ <Tools/>
+ </Dialog>
+ <UpdateAction id="uaSave">
+ <Property name="dataResolver">inoutDataPR#saveInoutData</Property>
+ <UpdateItem>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="dataPath">[#current]</Property>
+ <Property name="validateData">false</Property>
+ </UpdateItem>
+ </UpdateAction>
+ <UpdateAction id="ajaxDel">
+ <Property name="dataResolver">inoutDataPR#delInoutData</Property>
+ <Property name="confirmMessage">纭畾瑕佹墽琛屽垹闄や箞锛�</Property>
+ <UpdateItem>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="dataPath">[#current]</Property>
+ <Property name="validateData">false</Property>
+ </UpdateItem>
+ </UpdateAction>
+ <UpdateAction id="ajaxError">
+ <Property name="dataResolver">inoutDataPR#errorInoutData</Property>
+ <UpdateItem>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="dataPath">[#current]</Property>
+ <Property name="validateData">false</Property>
+ </UpdateItem>
+ </UpdateAction>
+ <UpdateAction id="ajaxComplete">
+ <Property name="dataResolver">inoutDataPR#completeInoutData</Property>
+ <Property name="confirmMessage">纭畾瑕佺粨鏉熸祦绋嬩箞锛�</Property>
+ <UpdateItem>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="dataPath">[#current]</Property>
+ </UpdateItem>
+ </UpdateAction>
+ <AjaxAction id="ajaxPrint">
+ <Property name="service">inoutDataPR#printWeightBill</Property>
+ <Property name="executingMessage">姝ｅ湪鎵ц鎵撳嵃鈥︹��</Property>
+ <Property name="async">false</Property>
+ </AjaxAction>
+ <AjaxAction id="ajaxShipPrint">
+ <Property name="service">inoutDataPR#printShipBill</Property>
+ <Property name="executingMessage">姝ｅ湪鎵ц鎵撳嵃鈥︹��</Property>
+ <Property name="async">false</Property>
+ </AjaxAction>
+ <AjaxAction id="ajaxPrintCheck">
+ <Property name="service">inoutDataPR#printCheckBill</Property>
+ <Property name="executingMessage">姝ｅ湪鎵ц鎵撳嵃鈥︹��</Property>
+ <Property name="async">false</Property>
+ </AjaxAction>
+ <AjaxAction id="ajaxInitAdd">
+ <Property name="service">inoutDataPR#initAddData</Property>
+ </AjaxAction>
+ <AjaxAction id="ajaxGetDepot">
+ <Property name="service">depotPR#getDepot</Property>
+ </AjaxAction>
+ <AjaxAction id="ajaxGetCheck">
+ <Property name="service">checkStandardPR#listCheckItemsByFoodVariety</Property>
+ </AjaxAction>
+ <Export2ReportAction id="exportExcel">
+ <Property name="extension">xls</Property>
+ <Property name="template">dataGridMain</Property>
+ <Property name="maxSize">3000</Property>
+ <Property name="fileName">鍗曟嵁鍒楄〃</Property>
+ <Property name="showTitle">true</Property>
+ <Property name="titleName">鍗曟嵁鍒楄〃</Property>
+ <Property name="dataScope">currentPage</Property>
+ </Export2ReportAction>
+ <CustomDropDown id="ddFoodOrigin">
+ <Property name="minHeight">500</Property>
+ <Property name="assignmentMap">foodLocation=name</Property>
+ <Property name="minWidth">500</Property>
+ <Container layout="regionPadding:5">
+ <DataSet id="dsFoodOrigin">
+ <Property name="dataProvider"></Property>
+ <Property name="dataType">[dtFoodOrigin]</Property>
+ <Property name="parameter"></Property>
+ <Property name="pageSize">30</Property>
+ </DataSet>
+ <Container layout="hbox regionPadding:5">
+ <TextEditor id="key2">
+ <Property name="blankText">-- 缂栫爜鎴栬�呭悕绉� --</Property>
+ <Property name="width">200</Property>
+ </TextEditor>
+ <Button>
+ <ClientEvent name="onClick">var key = view.get("#key2.value");
+ view.get("#dsFoodOrigin").set("parameter",{key:key}).flushAsync();
+ </ClientEvent>
+ <Property name="caption">鏌ヨ</Property>
+ <Property name="iconClass">fa fa-search</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">var data = view.get("#dsFoodOrigin.data:#");
+ if(data){
+ view.get("#ddFoodOrigin").close(data.toJSON());
+ }
+ </ClientEvent>
+ <Property name="iconClass">fa fa-check</Property>
+ <Property name="caption">纭畾</Property>
+ </Button>
+ </Container>
+ <DataGrid>
+ <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsFoodOrigin.data:#");
+ if(data){
+ view.get("#ddFoodOrigin").close(data.toJSON());
+ }
+ </ClientEvent>
+ <Property name="dataSet">dsFoodOrigin</Property>
+ <Property name="readOnly">true</Property>
+ <DataColumn name="code">
+ <Property name="property">code</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="name">
+ <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
+ arg.processDefault = true;
+ </ClientEvent>
+ <Property name="property">name</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="simple">
+ <Property name="property">simple</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ </DataGrid>
+ <DataPilot layoutConstraint="bottom">
+ <Property name="dataSet">dsFoodOrigin</Property>
+ </DataPilot>
+ </Container>
+ </CustomDropDown>
+ <CustomDropDown id="ddNotice">
+ <Property name="minHeight">400</Property>
+ <Property name="assignmentMap">noticeId=id,customerId=customerId,customerName=customerName</Property>
+ <Property name="minWidth">500</Property>
+ <Property name="autoOpen">true</Property>
+ <Container layout="regionPadding:5">
+ <DataSet id="dsNotice">
+ <Property name="dataProvider">inoutNoticePR#queryNoticeByKey</Property>
+ <Property name="parameter">
+ <Entity>
+ <Property name="type">${request.getParameter('type')}</Property>
+ </Entity>
+ </Property>
+ <Property name="dataType">[dtNoticeDto]</Property>
+ </DataSet>
+ <Container layout="hbox regionPadding:5">
+ <TextEditor id="key3">
+ <Property name="blankText">-- 瀹㈡埛鍚嶇О鎴栫紪鐮� --</Property>
+ <Property name="width">200</Property>
+ </TextEditor>
+ <Button>
+ <ClientEvent name="onClick">var key = view.get("#key3.value");
+ var type = "${request.getParameter('type')}";
+ view.get("#dsNotice").set("parameter",{key: key,type:
+ type}).flushAsync();
+ </ClientEvent>
+ <Property name="caption">鏌ヨ</Property>
+ <Property name="iconClass">fa fa-search</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">var data = view.get("#dsNotice.data:#");
+ if(data){
+ view.get("#ddNotice").close(data.toJSON());
+ }
+ </ClientEvent>
+ <Property name="iconClass">fa fa-check</Property>
+ <Property name="caption">纭畾</Property>
+ </Button>
+ </Container>
+ <DataGrid>
+ <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsNotice.data:#");
+ if(data){
+ view.get("#ddNotice").close(data.toJSON());
+ }
+ </ClientEvent>
+ <Property name="dataSet">dsNotice</Property>
+ <Property name="readOnly">true</Property>
+ <DataColumn>
+ <Property name="property">customerName</Property>
+ <Property name="align">center</Property>
+ <Property name="name">customerName</Property>
+ </DataColumn>
+ <DataColumn name="name">
+ <Property name="property">name</Property>
+ </DataColumn>
+ </DataGrid>
+ </Container>
+ </CustomDropDown>
+ <YearDropDown id="yearDropDown"/>
+ <Dialog id="dialogSelfPrint">
+ <Property name="height">300</Property>
+ <Property name="width">600</Property>
+ <Property name="caption">鑷畾涔夋墦鍗�</Property>
+ <Buttons>
+ <Button>
+ <ClientEvent name="onClick">var html = view.get("#textAreaPrint.text");
+ 
+ self.get("parent").hide();
+ printBill(html);
+ </ClientEvent>
+ <Property name="caption">纭畾</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">self.get("parent").hide();
+ </ClientEvent>
+ <Property name="caption">鍙栨秷</Property>
+ </Button>
+ </Buttons>
+ <Children>
+ <TextArea id="textAreaPrint"/>
+ </Children>
+ <Tools/>
+ </Dialog>
+ <Menu id="menuEdit">
+ <MenuItem>
+ <ClientEvent name="onClick">var data = view.get("#dataGridMain.currentEntity");
+ if (!data) {
+ $alert("璇峰厛閫夋嫨鏁版嵁锛�");
+ return;
+ }
+ 
+ var transType = data.get("transType");
+ if(transType == "3"){
+ printShipWeight();
+ }else{
+ printWeight();
+ }
+ </ClientEvent>
+ <Property name="caption">鎵撳嵃杩囩鍗�</Property>
+ <Property name="iconClass">fa fa-print</Property>
+ </MenuItem>
+ <MenuItem>
+ <ClientEvent name="onClick">printCheck();</ClientEvent>
+ <Property name="caption">鎵撳嵃妫�楠屽崟</Property>
+ <Property name="iconClass">fa fa-print</Property>
+ </MenuItem>
+ <MenuItem>
+ <ClientEvent name="onClick">printPay();</ClientEvent>
+ <Property name="caption">鎵撳嵃缁撶畻鍗�</Property>
+ <Property name="iconClass">fa fa-print</Property>
+ <Property name="disabled">true</Property>
+ </MenuItem>
+ <Separator/>
+ <MenuItem>
+ <ClientEvent name="onClick">printBatchWeight();</ClientEvent>
+ <Property name="caption">鎵归噺杩囩鍗�</Property>
+ <Property name="iconClass">fa fa-print</Property>
+ </MenuItem>
+ <MenuItem>
+ <ClientEvent name="onClick">printBatchCheck();</ClientEvent>
+ <Property name="caption">鎵归噺鍖栭獙鍗�</Property>
+ <Property name="iconClass">fa fa-print</Property>
+ </MenuItem>
+ <MenuItem>
+ <ClientEvent name="onClick">view.get("#dialogSelfPrint").show();</ClientEvent>
+ <Property name="caption">鑷畾涔夋墦鍗�</Property>
+ <Property name="iconClass">fa fa-print</Property>
+ </MenuItem>
+ </Menu>
+ </View>
</ViewConfig>
diff --git a/igds-web/src/main/resources/templates/test/inWeightDefault.html b/igds-web/src/main/resources/templates/test/inWeightDefault.html
new file mode 100644
index 0000000..936b3c1
--- /dev/null
+++ b/igds-web/src/main/resources/templates/test/inWeightDefault.html
@@ -0,0 +1,109 @@
+<!DOCTYPE html>
+<html lang='zh-cn'>
+<head>
+ <meta http-equiv='Content-Type' content='text/html;charset=UTF-8'>
+ <title>鍏ュ簱杩囩鍗�</title>
+ <style>body {
+ text-align: center;
+ padding: 10px
+ }
+
+ .tit {
+ margin: 10px;
+ font-size: 24px;
+ font-family: '瀹嬩綋';
+ padding-top: 15px
+ }
+
+ .div-tit {
+ padding-top: 10px
+ }
+
+ table {
+ width: 100%;
+ border-right: 1px solid;
+ border-bottom: 1px solid;
+ font-size: 14px
+ }
+
+ table td {
+ border-left: 1px solid;
+ border-top: 1px solid;
+ height: 38px
+ }
+
+ .sp1 {
+ width: 50%;
+ float: left;
+ padding-bottom: 10px
+ }
+
+ .sp2 {
+ width: 25%;
+ float: left;
+ text-align: center
+ }</style>
+</head>
+<body><h1 class='tit'>billTitle</h1>
+<div id="print_main" class='div-tit'><span class='sp1'>瀹屾垚鏃堕棿锛�<a>completeTime</a></span><span class='sp1'>鍗曞彿锛歴erId</span>
+</div>
+<table cellspacing='0' cellpadding='0'>
+ <tr>
+ <td width='12.5%'>鍙戣揣鍗曚綅</td>
+ <td colspan='3' width='37.5%'>customerName</td>
+ <td width='12.5%'>鏀惰揣鍗曚綅</td>
+ <td colspan='3' `width`='37.5%'>deptName</td>
+ </tr>
+ <tr>
+ <td width='12.5%'>鎵胯繍浜�</td>
+ <td width='12.5%'>driverName</td>
+ <td width='12.5%'>绮鍝佺</td>
+ <td width='12.5%'>foodVariety</td>
+ <td width='12.5%'>瑁呭嵏浠撳簱</td>
+ <td width='12.5%'>depotName</td>
+ <td width='12.5%'>绮浜у湴</td>
+ <td width='12.5%'>foodLocation</td>
+ </tr>
+ <tr>
+ <td>鎵胯繍杞︾墝</td>
+ <td>plateNum</td>
+ <td>姣涢噸(KG)</td>
+ <td>fullWeight</td>
+ <td>鐨噸(KG)</td>
+ <td>emptyWeight</td>
+ <td>鍑�閲�(KG)</td>
+ <td>netWeight</td>
+ </tr>
+ <tr>
+ <td>璐ㄦ鎵ｉ噸(KG)</td>
+ <td>deCheck</td>
+ <td>璐ㄦ澧為噸(KG)</td>
+ <td>addCheck</td>
+ <td>鍊间粨鎵ｉ噸(KG)</td>
+ <td>deHandle</td>
+ <td>鍏朵粬鎵ｉ噸(KG)</td>
+ <td>deOther</td>
+ </tr>
+ <tr>
+ <td>璐ㄦ缁撴灉</td>
+ <td colspan='3'>checkStatus</td>
+ <td>鍏ュ簱閲嶉噺(KG)</td>
+ <td>recordWeight</td>
+ <td>缁撶畻閲嶉噺(KG)</td>
+ <td>settleWeight</td>
+ </tr>
+ <tr>
+ <td>澶囨敞</td>
+ <td colspan='7'>remark</td>
+ </tr>
+</table>
+<div class='div-tit'><span class='sp2'>鍙哥鍛橈細</span><span class='sp2'>鐩戠鍛橈細</span><span
+ class='sp2'>淇濈鍛橈細handleUser</span><span class='sp2'>鎵胯繍浜猴細driverName</span></div>
+</br>
+<div style="padding-top: 10px"><span></span></div>
+<div style="text-align: left;font-size: 12px"><span>娉細</span></div>
+<div style="text-align: left;font-size: 12px"><span>1.鍑�閲�=姣涢噸-鐨噸锛涜川妫�澧炴墸閲嶆牴鎹川妫�璇︾粏濉啓锛�</span></div>
+<div style="text-align: left;font-size: 12px"><span>2.鍏ュ簱閲嶉噺=鍑�閲�-鎵ｉ噸锛涚粨绠楅噸閲�=鍏ュ簱閲嶉噺+璐ㄦ澧為噸锛�</span></div>
+<div style="text-align: left;font-size: 12px"><span>3.鐧借仈锛堝瓨鏍癸級锛岀孩鑱旓紙璁拌处锛夛紝榛勮仈锛堝鎴蜂繚鐣欙級</span></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/igds-web/src/main/resources/templates/test/qualityReport01.html b/igds-web/src/main/resources/templates/test/qualityReport01.html
index ac0226e..fd793e9 100644
--- a/igds-web/src/main/resources/templates/test/qualityReport01.html
+++ b/igds-web/src/main/resources/templates/test/qualityReport01.html
@@ -72,7 +72,7 @@
<td>绛夌骇</td>
<td>foodLevel</td>
<td>鐢熶骇骞撮檺</td>
- <td>scnx</td>
+ <td>foodYear</td>
</tr>
<tr>
<td>鏍峰搧鏁伴噺</td>
diff --git a/igds-web/src/main/resources/templates/test/qualityReport02.html b/igds-web/src/main/resources/templates/test/qualityReport02.html
index 0349546..96eac79 100644
--- a/igds-web/src/main/resources/templates/test/qualityReport02.html
+++ b/igds-web/src/main/resources/templates/test/qualityReport02.html
@@ -2,7 +2,7 @@
<html lang='zh-cn'>
<head>
<meta http-equiv='Content-Type' content='text/html;charset=UTF-8'>
- <title>璐ㄦ鎶ュ憡(foodVariety)</title>
+ <title>璐ㄦ鎶ュ憡(灏忛害)</title>
<style>body {
text-align: center;
padding: 10px
@@ -72,7 +72,7 @@
<td>绛夌骇</td>
<td>foodLevel</td>
<td>鐢熶骇骞撮檺</td>
- <td>scnx</td>
+ <td>foodYear</td>
</tr>
<tr>
<td>鏍峰搧鏁伴噺</td>
diff --git a/igds-web/src/main/resources/templates/test/qualityReport03.html b/igds-web/src/main/resources/templates/test/qualityReport03.html
index c60ddce..0dad000 100644
--- a/igds-web/src/main/resources/templates/test/qualityReport03.html
+++ b/igds-web/src/main/resources/templates/test/qualityReport03.html
@@ -72,7 +72,7 @@
<td>绛夌骇</td>
<td>foodLevel</td>
<td>鐢熶骇骞撮檺</td>
- <td>scnx</td>
+ <td>foodYear</td>
</tr>
<tr>
<td>鏍峰搧鏁伴噺</td>
diff --git a/igds-web/src/main/resources/templates/test/qualityReport04.html b/igds-web/src/main/resources/templates/test/qualityReport04.html
index 764a123..bac77a2 100644
--- a/igds-web/src/main/resources/templates/test/qualityReport04.html
+++ b/igds-web/src/main/resources/templates/test/qualityReport04.html
@@ -72,7 +72,7 @@
<td>绛夌骇</td>
<td>foodLevel</td>
<td>鐢熶骇骞撮檺</td>
- <td>scnx</td>
+ <td>foodYear</td>
</tr>
<tr>
<td>鏍峰搧鏁伴噺</td>
--
Gitblit v1.9.3