From 86cc59ad7c6b8b930fccca8dae50062e7b5ba100 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 18 十月 2023 13:35:58 +0800
Subject: [PATCH] 乔一 报表打印

---
 WebTM/views/车间管理/报表分析/Sc_WorkShopProcessWIPSumReport.html |    6 +++++-
 WebTM/views/grf/工序在制报表.grf                                |   28 ++++++++++++++--------------
 WebTM/views/车间管理/报表分析/Kf_MateOutSumReport_QiaoYi.html     |    3 +++
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git "a/WebTM/views/grf/\345\267\245\345\272\217\345\234\250\345\210\266\346\212\245\350\241\250.grf" "b/WebTM/views/grf/\345\267\245\345\272\217\345\234\250\345\210\266\346\212\245\350\241\250.grf"
index 546bafa..6494dbf 100644
--- "a/WebTM/views/grf/\345\267\245\345\272\217\345\234\250\345\210\266\346\212\245\350\241\250.grf"
+++ "b/WebTM/views/grf/\345\267\245\345\272\217\345\234\250\345\210\266\346\212\245\350\241\250.grf"
@@ -1,5 +1,5 @@
 锘縶
-	"Version":"6.0.0.6",
+	"Version":"6.5.0.0",
 	"Title":"1a.绠�鍗曡〃鏍�",
 	"Author":"閿愭氮鎶ヨ〃杞欢",
 	"Description":"婕旂ず涓�涓渶鍩烘湰鐨勫垪琛ㄦ姤琛ㄣ��",
@@ -19,16 +19,14 @@
 		"Recordset":{
 			"Field":[
 				{
-					"Name":"鏃ユ湡",
+					"Name":"鍗曟嵁鏃ユ湡",
 					"Type":"DateTime"
 				},
 				{
-					"Name":"鐗╂枡浠g爜",
-					"DBFieldName":"HMaterNumber"
+					"Name":"浜у搧缂栫爜"
 				},
 				{
-					"Name":"鐗╂枡鍚嶇О",
-					"DBFieldName":"HMaterName"
+					"Name":"浜у搧鍚嶇О"
 				},
 				{
 					"Name":"鐢ㄩ噺锛堚�帮級",
@@ -39,14 +37,16 @@
 					"DBFieldName":"HQty"
 				},
 				{
-					"Name":"鍗曚綅",
-					"DBFieldName":"HUnitName"
+					"Name":"鍗曚綅"
 				},
 				{
-					"Name":"鏌撴枡鎬婚噺锛堝叕鏂わ級锛�"
+					"Name":"鏌撴枡鎬婚噺"
 				},
 				{
-					"Name":"鍔╁墏鎬婚噺锛堝叕鏂わ級锛�"
+					"Name":"鍔╁墏鎬婚噺"
+				},
+				{
+					"Name":"鏃ユ湡"
 				}
 			]
 		},
@@ -78,12 +78,12 @@
 				{
 					"Column":"Column1",
 					"TextAlign":"MiddleCenter",
-					"DataField":"鐗╂枡浠g爜"
+					"DataField":"浜у搧缂栫爜"
 				},
 				{
 					"Column":"Column2",
 					"TextAlign":"MiddleCenter",
-					"DataField":"鐗╂枡鍚嶇О"
+					"DataField":"浜у搧鍚嶇О"
 				},
 				{
 					"Column":"Column3",
@@ -174,7 +174,7 @@
 					"Top":1.79917,
 					"Width":7.19667,
 					"Height":0.608542,
-					"Text":"[#鏌撴枡鎬婚噺锛堝叕鏂わ級锛�#]"
+					"Text":"鏌撴枡鎬婚噺锛堝叕鏂わ級锛歔#鏌撴枡鎬婚噺#]"
 				},
 				{
 					"Type":"MemoBox",
@@ -183,7 +183,7 @@
 					"Top":1.79917,
 					"Width":8.20208,
 					"Height":0.608542,
-					"Text":"[#鍔╁墏鎬婚噺锛堝叕鏂わ級锛�#]"
+					"Text":"鍔╁墏鎬婚噺锛堝叕鏂わ級锛歔#鍔╁墏鎬婚噺#]"
 				}
 			]
 		}
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_MateOutSumReport_QiaoYi.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_MateOutSumReport_QiaoYi.html"
index 4b03ac1..2ca2a7c 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_MateOutSumReport_QiaoYi.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_MateOutSumReport_QiaoYi.html"
@@ -517,6 +517,9 @@
                             if (option.data.length != 0) {
                                 var dataPrint = [];
                                 for (var i = 0; i < option.data.length; i++) {
+                                    option.data[i]["鏃ユ湡"] = $("#HBeginDate").val() + "-"+$("#HEndDate").val();
+                                    option.data[i]["鏌撴枡鎬婚噺"] = $("#HSumRLQty").val();
+                                    option.data[i]["鍔╁墏鎬婚噺"] = $("#HSumZJQty").val();
                                     dataPrint.push(option.data[i])
                                 }
 
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_WorkShopProcessWIPSumReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_WorkShopProcessWIPSumReport.html"
index 5c47b2d..42f46b7 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_WorkShopProcessWIPSumReport.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_WorkShopProcessWIPSumReport.html"
@@ -401,13 +401,17 @@
                             if (option.data.length != 0) {
                                 var dataPrint = [];
                                 for (var i = 0; i < option.data.length; i++) {
+                                    option.data[i]["鏃ユ湡"] = "2320-12-11";
+                                    option.data[i]["鏌撴枡鎬婚噺"] = "11237";
+                                    option.data[i]["鍔╁墏鎬婚噺"] = "1321414";
                                     dataPrint.push(option.data[i])
                                 }
 
                                 var Customer = {
-                                    "Table": dataPrint
+                                    "Table": dataPrint,
                                 }
 
+
                                 var args = {
                                     type: "preview",
                                     //showOptionDlg: false, //濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�

--
Gitblit v1.9.1