From 34e3301ff24f10100dae8c9b4b98cafef1b6a653 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期日, 25 六月 2023 21:17:51 +0800
Subject: [PATCH] 出入库流程优化-入库详单优化
---
igds-inout/src/main/java/com/ld/igds/inout/view/InoutList.view.xml | 115 --------
igds-core/src/main/java/com/ld/igds/check/CheckStandardPR.java | 12 -
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java | 27 -
igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml | 410 +++++++++++++++------------------
igds-inout/src/main/java/com/ld/igds/inout/view/InoutList.js | 41 +++
igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.js | 81 ++++++
igds-inout/src/main/java/com/ld/igds/inout/view/InoutDataPR.java | 2
7 files changed, 321 insertions(+), 367 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/check/CheckStandardPR.java b/igds-core/src/main/java/com/ld/igds/check/CheckStandardPR.java
index df6ea4f..7ecff07 100644
--- a/igds-core/src/main/java/com/ld/igds/check/CheckStandardPR.java
+++ b/igds-core/src/main/java/com/ld/igds/check/CheckStandardPR.java
@@ -88,18 +88,6 @@
}
-// /*=============== 鍖栭獙鎶ヨ〃鎵撳嵃鐩稿叧 ===============*/
-// /**
-// * checkStandardPR#pageReportCheckData 鍒嗛〉鑾峰彇鍑哄叆搴撶殑鍖栭獙鍗曟嵁鎶ヨ〃淇℃伅
-// *
-// * @param page
-// * @param param
-// */
-// @DataProvider
-// public void pageReportCheckData(Page<ReportInoutCheckData> page, Map<String, Object> param) {
-// jdbcInoutCheckService.pageReportCheckData(page, param);
-// }
-
/**
* checkStandardPR#getQuery 鏍规嵁鎶ヨ〃绫诲瀷锛岃幏鍙栭粯璁ゆ煡璇俊鎭紝姣斿琛ㄥご淇℃伅绛�
*
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
index 5ed72b9..b51056e 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
@@ -383,7 +383,7 @@
public String addInoutData(InoutData data) throws Exception {
if (data.getSettleWeight() <= 0.0) {
- return "琛ュ崟鏁版嵁瑕佹眰缁撶畻閲嶉噺蹇呴』澶т簬0";
+ return "绯荤粺锛氳ˉ鍗曟暟鎹姹傜粨绠楅噸閲忓繀椤诲ぇ浜�0";
}
// 琛ュ崟鏁版嵁鐩存帴鍒扮粨鏋滅姸鎬�
@@ -415,30 +415,19 @@
data.setCheckUser(loginUser);
}
- // 淇濆瓨妫�娴嬮」鐩�
- if (InoutConstant.TYPE_IN.equals(data.getType())) {
+ if (InoutConstant.TYPE_IN.equals(data.getType())) {
if (null == data.getFullWeightTime()) {
data.setFullWeightTime(DateUtil.getNewByMinute(new Date(), -50));
}
if (null == data.getEmptyWeightTime()) {
- data.setEmptyWeightTime(DateUtil
- .getNewByMinute(new Date(), -10));
+ data.setEmptyWeightTime(DateUtil.getNewByMinute(new Date(), -10));
}
- // 鍏堟墽琛屽寲楠屼俊鎭繚瀛�
- CheckUpdateResult checkResult = checkStandardManager
- .updateCheckItems(data.getCheckId(), data.getCompanyId(),
- data.getCheckItems());
- if (null != checkResult) {
- // if (null == data.getWet())data.setWet(checkResult.getWet());
- // if (null ==
- // data.getImpurity())data.setImpurity(checkResult.getImpurity());
- }
+ data = this.updateCheckItems(data);
} else {
if (null == data.getEmptyWeightTime()) {
- data.setEmptyWeightTime(DateUtil
- .getNewByMinute(new Date(), -50));
+ data.setEmptyWeightTime(DateUtil.getNewByMinute(new Date(), -50));
}
if (null == data.getFullWeightTime()) {
data.setFullWeightTime(DateUtil.getNewByMinute(new Date(), -10));
@@ -446,9 +435,7 @@
}
// 娣诲姞琛ュ崟鏁版嵁
- String msg = inoutService.insertData(data);
-
- return msg;
+ return inoutService.insertData(data);
}
/**
@@ -474,7 +461,7 @@
if (InoutConstant.TYPE_IN.equals(data.getType())) {
data = updateCheckItems(data);
}
-
+
return inoutService.updateData(data);
}
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutDataPR.java b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutDataPR.java
index f7e5585..2df2f72 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutDataPR.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutDataPR.java
@@ -204,9 +204,7 @@
InoutData data = new InoutData();
data.setCompanyId(user.getCompanyId());
data.setRegisterTime(new Date());
- data.setCompleteTime(new Date());
data.setType(type);
- data.setIntelCard("0000");
data.setRegisterUser(user.getCname());
data.setDeptId(ContextUtil.subDeptId(user));
data.setCheckUser(user.getCname());
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
new file mode 100644
index 0000000..812ecc5
--- /dev/null
+++ b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.js
@@ -0,0 +1,81 @@
+
+/**
+ * 鎵撳嵃鍑哄簱杩囩鍗�
+ */
+printBill = function(htmlStr) {
+ var LODOP = CLODOP;
+ LODOP.PRINT_INIT("绉伴噸鍗�");
+ LODOP.SET_PRINT_PAGESIZE(1,2100,1400, "A4");
+ LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", htmlStr);
+ LODOP.PREVIEW();
+};
+
+print5016Bill = 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("鎵撳嵃妯＄増鏈畾涔夆�︹��");
+};
+
+//鎵撳嵃绉伴噸鍗�
+printWeight = function(){
+ var data = view.get("#dsMain.data");
+ if(!data) return;
+ var companyId = data.get("companyId");
+ console.log(companyId);
+ view.get("#ajaxPrint").set("parameter",data).execute(function(result){
+ if(companyId && companyId == "5016"){
+ print5016Bill(result);
+ }else {
+ printBill(result);
+ }
+ });
+};
+
+
+
+/**
+ * 鑷姩璁＄畻
+ * @param name
+ */
+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 deHandle = curData.get("deHandle"), deCheck = curData.get("deCheck"), dePackage = curData.get("dePackage"), addCheck = curData.get("addCheck");
+
+ var deSum = Number(deHandle) + Number(deCheck) + Number(dePackage);
+
+
+ /** 鍏ュ簱閲嶉噺 = 鍑�閲� - 鎬绘墸閲� */
+ recordWeight = Number(netWeight) - Number(deSum);
+
+ /** 缁撶畻閲嶉噺 = 鍑�閲� - 鎬绘墸閲� + 澧為噸 */
+ settleWeight = Number(netWeight) - Number(deSum) + Number(addCheck);
+
+ curData.set("netWeight",netWeight);
+ curData.set("settleWeight",settleWeight);
+ curData.set("recordWeight",recordWeight);
+};
\ No newline at end of file
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 0292986..41b1093 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
@@ -4,11 +4,7 @@
<Context/>
<Model>
<DataType name="dtMain" parent="dtInoutRecord">
- <ClientEvent name="onDataChange">if(arg.property =="depotId"){
- autoByDepot(arg.newValue);
-}
-
-if(arg.property =="foodVariety"){
+ <ClientEvent name="onDataChange">if(arg.property =="foodVariety"){
var entity = arg.entity;
entity.reset("checkItems");
}</ClientEvent>
@@ -32,10 +28,9 @@
<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="dataProvider">checkStandardPR#listCheckItemsByParam</Property>
<Property name="dataType">[dtCheckItems]</Property>
</Reference>
</DataType>
@@ -117,19 +112,6 @@
<View layout="padding:5;regionPadding:5">
<ClientEvent name="onReady">var TYPE = "${request.getParameter('type')}";

-//绫诲瀷鍒囨崲
-if("OUT" == TYPE){
- view.get("#columnDeSum").set("visible",false);
- //view.get("#label1").set("text","娉細鍑哄簱姘村垎澧為噸璁板叆缁撶畻閲嶉噺");
- 
- view.get("#dataGridCheckItem").set("visible",false);
- 
- view.get("#deWet").set("label","姘村垎澧為噸");
-}else{
- view.get("#deWet").set("label","姘村垎鎵ｉ噸");
- view.get("#dataGridCheckItem").set("visible",true);
-}
-
/**
* 鍒锋柊椤甸潰
*/
@@ -137,11 +119,8 @@
view.get("#btnSave").set("disabled",false);
view.get("#btnPrintWeigh").set("disabled",true);
view.get("#btnPrintCheck").set("disabled",true);
- 
view.get("#dsMain").set("parameter",TYPE).flushAsync();
};
-
-
flush();

/**
@@ -158,7 +137,6 @@
$alert("鏁版嵁楠岃瘉澶辫触锛屻�愬熀纭�淇℃伅銆�-缁撶畻閲嶉噺蹇呴』澶т簬0锛�");
return;
}
- 
view.get("#uaSave").execute(function(result){
if(result){
$alert("淇濆瓨澶辫触锛�"+result);
@@ -169,61 +147,7 @@
$alert("淇濆瓨鎴愬姛锛屽彲浠ヨ繘琛屾墦鍗板拰閲嶆柊鎻愭柊琛ㄥ崟锛�");
}
});
-}
-
-/**
- * 鎵撳嵃鍑哄簱杩囩鍗�
- */
-printBill = function(htmlStr) {
- var LODOP = CLODOP;
- LODOP.PRINT_INIT("绉伴噸鍗�");
- LODOP.SET_PRINT_PAGESIZE(1,2100,1400, "A4");
- //LODOP.SET_PRINT_PAGESIZE(1, 0, '90mm', "A4");
- LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", htmlStr);
- LODOP.PREVIEW();
-};
-
-print5016Bill = 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("鎵撳嵃妯＄増鏈畾涔夆�︹��");
-};
-
-//鎵撳嵃绉伴噸鍗�
-printWeight = function(){
- var data = view.get("#dsMain.data");
- if(!data) return;
- var companyId = data.get("companyId");
- console.log(companyId);
- view.get("#ajaxPrint").set("parameter",data).execute(function(result){
- if(companyId && companyId == "5016"){
- print5016Bill(result);
- }else {
- printBill(result);
- }
- });
-};
-
-//鏍规嵁浠撳簱鑷姩鍥炲～绮鍝佺锛岀櫥璁帮紝浜у湴鏂�
-autoByDepot = function(depotId){
- view.get("#ajaxGetDepot").set("parameter",depotId).execute(function(result){
- if(result){
- //console.log(result);
- var data = view.get("#dsMain.data:#");
- data.set("foodLocation",result.foodLocation);
- data.set("foodLevel",result.foodLevel);
- data.set("foodVariety",result.foodVariety);
- data.set("foodYear",result.foodYear);
- }
- });
-};</ClientEvent>
+}</ClientEvent>
<ClientEvent name="onCreate">
/**
* 鑷姩璁＄畻锛屽綋鍓嶉〉闈笉鑷姩鍏宠仈鎵︽牱璁板綍锛屽叏閮ㄧ敱鎵嬪姩涓哄噯
@@ -372,12 +296,12 @@
<Button id="btnSave" layoutConstraint="left">
<ClientEvent name="onClick">save();</ClientEvent>
<Property name="caption">鏁版嵁鎻愪氦</Property>
- <Property name="exClassName">btn-default</Property>
+ <Property name="exClassName">btn-normal</Property>
<Property name="iconClass">fa fa-plus</Property>
</Button>
<Button id="btnPrintCheck" layoutConstraint="left">
<ClientEvent name="onClick">printCheck();</ClientEvent>
- <Property name="caption">鎵撳嵃鎶芥牱鍗�</Property>
+ <Property name="caption">鎵撳嵃璐ㄦ鍗�</Property>
<Property name="exClassName">btn-default</Property>
<Property name="iconClass">fa fa-print</Property>
<Property name="tip">淇濆瓨鏁版嵁鍚庡彲鐢�</Property>
@@ -405,7 +329,7 @@
<Property name="width">150</Property>
<Property name="name">tabCommon</Property>
<Container>
- <FieldSet layout="regionPadding:10" layoutConstraint="padding:10">
+ <FieldSet layout="regionPadding:5" layoutConstraint="padding:10">
<Property name="caption">鍩烘湰淇℃伅</Property>
<Buttons/>
<Children>
@@ -434,6 +358,13 @@
<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>
@@ -472,12 +403,6 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">foodLocation</Property>
- <Property name="property">foodLocation</Property>
- <Property name="trigger">ddFoodOrigin</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
<Property name="name">foodLevel</Property>
<Property name="property">foodLevel</Property>
<Editor/>
@@ -489,28 +414,26 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">noticeName</Property>
- <Property name="property">noticeName</Property>
- <Property name="trigger">ddNotice</Property>
- <Property name="editable">false</Property>
- <Property name="label">鍏ュ簱閫氱煡鍗�</Property>
+ <Property name="name">registerTime</Property>
+ <Property name="property">registerTime</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">registerTime</Property>
- <Property name="property">registerTime</Property>
+ <Property name="name">foodLocation</Property>
+ <Property name="property">foodLocation</Property>
+ <Property name="trigger">ddDicArea</Property>
<Editor/>
</AutoFormElement>
</AutoForm>
</Children>
</FieldSet>
- <FieldSet layout="regionPadding:10" layoutConstraint="padding:10">
+ <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="cols">*,50,*,50,*,50</Property>
<Property name="labelAlign">right</Property>
<Property name="labelWidth">100</Property>
<Property name="labelSeparator">锛�</Property>
@@ -524,6 +447,17 @@
<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">fullWeightUser</Property>
+ <Property name="property">fullWeightUser</Property>
+ <Property name="label">绉伴噸浜�</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);
@@ -534,50 +468,14 @@
<Editor/>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">netWeight</Property>
- <Property name="property">netWeight</Property>
- <Property name="readOnly">true</Property>
+ <Property name="name">fullWeightTime</Property>
+ <Property name="property">fullWeightTime</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>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">completeTime</Property>
+ <Property name="property">completeTime</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
@@ -586,6 +484,7 @@
deAutoByWeight(prop);</ClientEvent>
<Property name="name">deHandle</Property>
<Property name="property">deHandle</Property>
+ <Property name="label">鐜板満鎵ｉ噸</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
@@ -598,8 +497,39 @@
<Editor/>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">deSum</Property>
- <Property name="property">deSum</Property>
+ <Property name="name">deOtherInfo</Property>
+ <Property name="property">deOtherInfo</Property>
+ <Property name="label">鍏朵粬鍘熷洜</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">deCheck</Property>
+ <Property name="property">deCheck</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">addCheck</Property>
+ <Property name="property">addCheck</Property>
+ <Editor/>
+ </AutoFormElement>
+ <Label layoutConstraint="colSpan:2">
+ <Property name="style">
+ <Property name="color">blue</Property>
+ <Property name="padding-left">80px</Property>
+ </Property>
+ <Property name="text">璇存槑锛氳川妫�澧炴墸閲嶈鏌ョ湅璐ㄦ淇℃伅鏍忎綅璇︾粏</Property>
+ </Label>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">netWeight</Property>
+ <Property name="property">netWeight</Property>
<Property name="readOnly">true</Property>
<Editor/>
</AutoFormElement>
@@ -610,45 +540,88 @@
<Editor/>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">completeTime</Property>
- <Property name="property">completeTime</Property>
+ <Property name="name">recordWeight</Property>
+ <Property name="property">recordWeight</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>
- <Label layoutConstraint="colSpan:6">
- <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:10" layoutConstraint="padding:10">
- <Property name="caption">澶囨敞璇存槑</Property>
+ <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="cols">*,*,*</Property>
<Property name="labelAlign">right</Property>
<Property name="labelSeparator">锛�</Property>
<Property name="labelWidth">100</Property>
- <AutoFormElement layoutConstraint="colSpan:2">
+ <AutoFormElement>
+ <Property name="name">jjlx</Property>
+ <Property name="property">jjlx</Property>
+ <Editor>
+ <RadioGroup>
+ <RadioButton>
+ <Property name="text">绉伴噸鍏ュ簱</Property>
+ <Property name="value">0</Property>
+ </RadioButton>
+ <RadioButton>
+ <Property name="value">1</Property>
+ <Property name="text">鏍囧噯鍖呭叆搴�</Property>
+ </RadioButton>
+ </RadioGroup>
+ </Editor>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bzw</Property>
+ <Property name="property">bzw</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="value">9</Property>
+ <Property name="text">鍏朵粬</Property>
+ </RadioButton>
+ </RadioGroup>
+ </Editor>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dbz</Property>
+ <Property name="property">dbz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bzbjs</Property>
+ <Property name="property">bzbjs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dePackage</Property>
+ <Property name="property">dePackage</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">price</Property>
+ <Property name="property">price</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:3">
<Property name="name">remarks</Property>
<Property name="property">remarks</Property>
<Property name="editorType">TextArea</Property>
- <Property name="showLabel">false</Property>
<Editor/>
</AutoFormElement>
</AutoForm>
@@ -664,7 +637,7 @@
<Container layout="padding:10">
<AutoForm>
<Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*,*,*</Property>
+ <Property name="cols">*,*,*</Property>
<Property name="labelAlign">right</Property>
<Property name="labelWidth">100</Property>
<Property name="labelSeparator">锛�</Property>
@@ -705,19 +678,14 @@
<Property name="label">鍖栭獙缁撴灉</Property>
<Editor/>
</AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">checkTime</Property>
+ <Property name="property">checkTime</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>
@@ -752,53 +720,68 @@
</Container>
</ControlTab>
</TabControl>
- <CustomDropDown id="ddFoodOrigin">
+ <YearDropDown id="yearDropDown"/>
+ <UpdateAction id="uaSave">
+ <Property name="dataResolver">inoutDataPR#saveInoutData</Property>
+ <Property name="confirmMessage">纭畾瑕佹彁浜や箞锛�</Property>
+ <UpdateItem>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="dataPath">[#current]</Property>
+ <Property name="validateData">false</Property>
+ </UpdateItem>
+ </UpdateAction>
+ <AjaxAction id="ajaxPrint">
+ <Property name="service">inoutDataPR#printWeightBill</Property>
+ <Property name="executingMessage">姝ｅ湪鎵ц鎵撳嵃鈥︹��</Property>
+ <Property name="async">false</Property>
+ </AjaxAction>
+ <CustomDropDown id="ddDicArea">
<Property name="minHeight">500</Property>
- <Property name="assignmentMap">foodLocation=name</Property>
<Property name="minWidth">500</Property>
+ <Property name="assignmentMap">foodLocation=name,foodLocationId=code</Property>
<Container layout="regionPadding:5">
- <DataSet id="dsFoodOrigin">
- <Property name="dataProvider">dicTriggerPR#pagFoodLocationData</Property>
- <Property name="dataType">[dtFoodOrigin]</Property>
+ <DataSet id="dsDicArea">
+ <Property name="dataProvider">dicAreaPR#pageList</Property>
<Property name="parameter"></Property>
- <Property name="pageSize">30</Property>
+ <Property name="dataType">[dtArea]</Property>
+ <Property name="pageSize">1000</Property>
</DataSet>
<Container layout="hbox regionPadding:5">
<TextEditor id="key2">
- <Property name="blankText"> -- 缂栫爜鎴栬�呭悕绉� --</Property>
+ <Property name="blankText"> -鍚嶇О鎴栫畝鎷硷紝鍖椾含甯� bjs -</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>
+view.get("#dsDicArea").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:#");
+ <ClientEvent name="onClick">var data = view.get("#dsDicArea.data:#");
if(data){
- view.get("#ddFoodOrigin").close(data.toJSON());
+ view.get("#ddDicArea").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:#");
+ <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsDicArea.data:#");
if(data){
- view.get("#ddFoodOrigin").close(data.toJSON());
+ view.get("#ddDicArea").close(data.toJSON());
}</ClientEvent>
- <Property name="dataSet">dsFoodOrigin</Property>
+ <Property name="dataSet">dsDicArea</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="code">
+ <Property name="property">code</Property>
<Property name="readOnly">true</Property>
<Property name="align">center</Property>
</DataColumn>
@@ -809,13 +792,13 @@
</DataColumn>
</DataGrid>
<DataPilot layoutConstraint="bottom">
- <Property name="dataSet">dsFoodOrigin</Property>
+ <Property name="dataSet">dsDicArea</Property>
</DataPilot>
</Container>
</CustomDropDown>
<CustomDropDown id="ddNotice">
<Property name="minHeight">400</Property>
- <Property name="assignmentMap">noticeId=id,noticeName=name,customerId=customerId,customerName=customerName</Property>
+ <Property name="assignmentMap">noticeId=id,customerName=customerName</Property>
<Property name="minWidth">500</Property>
<Property name="autoOpen">true</Property>
<Container layout="regionPadding:5">
@@ -836,18 +819,14 @@
<Button>
<ClientEvent name="onClick">var key = view.get("#key3.value");
var type = "${request.getParameter('type')}";
-//var customerId = view.get("#dataGridMain.currentEntity").get("customerId");
-//var depotId = view.get("#dataGridMain.currentEntity").get("depotId");
-//var foodVariety = view.get("#dataGridMain.currentEntity").get("foodVariety");
-//view.get("#dsNotice").set("parameter",{key:key,type:type,customerId:customerId,depotId:depotId,foodVariety:foodVariety}).flushAsync();
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("#dsCustomer.data:#");
+ <ClientEvent name="onClick">var data = view.get("#dsNotice.data:#");
if(data){
- view.get("#ddCustomer").close(data.toJSON());
+ view.get("#ddNotice").close(data.toJSON());
}</ClientEvent>
<Property name="iconClass">fa fa-check</Property>
<Property name="caption">纭畾</Property>
@@ -860,39 +839,16 @@
}</ClientEvent>
<Property name="dataSet">dsNotice</Property>
<Property name="readOnly">true</Property>
- <DataColumn name="name">
- <Property name="property">name</Property>
- </DataColumn>
<DataColumn>
<Property name="property">customerName</Property>
<Property name="align">center</Property>
<Property name="name">customerName</Property>
</DataColumn>
- <DataColumn name="id">
- <Property name="property">id</Property>
- <Property name="align">center</Property>
- <Property name="visible">false</Property>
+ <DataColumn name="name">
+ <Property name="property">name</Property>
</DataColumn>
</DataGrid>
</Container>
</CustomDropDown>
- <YearDropDown id="yearDropDown"/>
- <UpdateAction id="uaSave">
- <Property name="dataResolver">inoutDataPR#saveInoutData</Property>
- <Property name="confirmMessage">纭畾瑕佹彁浜や箞锛�</Property>
- <UpdateItem>
- <Property name="dataSet">dsMain</Property>
- <Property name="dataPath">[#current]</Property>
- <Property name="validateData">false</Property>
- </UpdateItem>
- </UpdateAction>
- <AjaxAction id="ajaxGetDepot">
- <Property name="service">depotPR#getDepot</Property>
- </AjaxAction>
- <AjaxAction id="ajaxPrint">
- <Property name="service">inoutDataPR#printWeightBill</Property>
- <Property name="executingMessage">姝ｅ湪鎵ц鎵撳嵃鈥︹��</Property>
- <Property name="async">false</Property>
- </AjaxAction>
</View>
</ViewConfig>
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutList.js b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutList.js
index 393ca23..b92b4da 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutList.js
+++ b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutList.js
@@ -86,4 +86,45 @@
//鎵撳嵃缁撶畻鍗�
printPay = function(){
$alert("鎵撳嵃妯＄増鏈畾涔夆�︹��");
+};
+
+
+/**
+ * 鑷姩璁＄畻
+ * @param name
+ */
+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 deHandle = curData.get("deHandle"), deCheck = curData.get("deCheck"), dePackage = curData.get("dePackage"), addCheck = curData.get("addCheck");
+
+ var deSum = Number(deHandle) + Number(deCheck) + Number(dePackage);
+
+
+ /** 鍏ュ簱閲嶉噺 = 鍑�閲� - 鎬绘墸閲� */
+ recordWeight = Number(netWeight) - Number(deSum);
+
+ /** 缁撶畻閲嶉噺 = 鍑�閲� - 鎬绘墸閲� + 澧為噸 */
+ settleWeight = Number(netWeight) - Number(deSum) + Number(addCheck);
+
+ curData.set("netWeight",netWeight);
+ curData.set("settleWeight",settleWeight);
+ curData.set("recordWeight",recordWeight);
};
\ No newline at end of file
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutList.view.xml b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutList.view.xml
index 29a11fe..fa9fff5 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutList.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutList.view.xml
@@ -222,7 +222,6 @@
edit = function(){
var data = view.get("#dataGridMain.currentEntity");
if(!data) return;
- 
if ("RECORD" == data.get("progress")) {
view.get("#btnOK").set("visible",true);
}else{
@@ -334,110 +333,6 @@
});
};
</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 = 0;
- 
- var impurity = 0;
- 
- 
- var deBase = 0, multiple = 0;
- var checkItems = curData.get("checkItems");
-
- /** 鎬绘墸閲嶏紝涓嶅惈澧為噸*/
- 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("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">
@@ -861,7 +756,7 @@
var id = self.getDom().id;
var prop = id.substring(2,id.length);
deAutoByWeight(prop);
- </ClientEvent>
+</ClientEvent>
<Property name="name">fullWeight</Property>
<Property name="property">fullWeight</Property>
<Editor/>
@@ -902,11 +797,19 @@
<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">deCheck</Property>
<Property name="property">deCheck</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">addCheck</Property>
<Property name="property">addCheck</Property>
<Editor/>
--
Gitblit v1.9.3