From befe0fec732822546837cd847fc44e54085edd19 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期日, 25 四月 2021 08:46:23 +0800
Subject: [PATCH] 新增部门基础资料单据 部门基础资料列表 新增 删除 修改 禁用 反禁用功能
---
WebTM/App_Data/MssqlReportData.cs | 235 +++
WebTM/views/生产工序管理/工序汇报单/Sc_ProcessReportList.html | 47
WebTM/views/生产工序管理/工序派工单/Sc_Add_ProcessSendWork.html | 85 -
WebTM/views/CreateControl.js | 158 ++
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html | 639 ++++++++++
WebTM/Properties/PublishProfiles/LAYUI.pubxml.user | 60
WebTM/views/生产工序管理/工序汇报单/xmlLBM_ProcessReport.aspx | 28
WebTM/views/生产工序管理/工序汇报单/xmlLBM_ProcessReport.aspx.designer.cs | 25
WebTM/views/车间管理/委外工序发出单/Cj_StationEntrustInBill.html | 46
WebTM/views/生产工序管理/工序汇报单/xmlLBM_ProcessReport.aspx.cs | 17
WebTM/views/车间管理/委外工序接收单/Cj_StationEntrustOutBill.html | 50
WebTM/views/GRInstall.js | 50
WebTM/views/grf/汇报单.grf | 712 ++++++++++++
WebTM/App_Data/ReportData.cs | 239 ++++
WebTM/views/生产工序管理/工序汇报单/HBarPlanPrint.html | 76 +
WebTM/views/生产工序管理/工序汇报单/Sc_Add_ProcessReportList.html | 479 +++++---
WebTM/views/车间管理/工序进站接收单/Cj_StationInBill.html | 205 ++
WebTM/views/index.html | 7
WebTM/views/GRUtility.js | 109 +
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | 189 +++
WebTM/views/车间管理/工序进站接收单/Cj_StationInBillList.html | 63
WebTM/WebTM.csproj | 17
22 files changed, 3,164 insertions(+), 372 deletions(-)
diff --git a/WebTM/App_Data/MssqlReportData.cs b/WebTM/App_Data/MssqlReportData.cs
new file mode 100644
index 0000000..c598472
--- /dev/null
+++ b/WebTM/App_Data/MssqlReportData.cs
@@ -0,0 +1,235 @@
+锘縰sing System;
+using System.Collections;
+using System.Data;
+using System.Data.SqlClient;
+using System.Configuration;
+using System.IO;
+using System.IO.Compression;
+
+/////////////////////////////////////////////////////////////////////////////////////////////////////////
+//class SqlReportData 浜х敓鎻愪緵缁欐姤琛ㄧ敓鎴愰渶瑕佺殑 鎴� JSON 鏁版嵁
+public class SqlReportData
+{
+ //鈽呯壒鍒彁绀衡槄锛�
+ //杩炴帴SQL Server鏁版嵁搴撶殑杩炴帴涓诧紝搴旇淇敼涓轰笌瀹為檯涓�鑷淬�傚鏋滄槸杩愯Grid++Report鏈韩鐨勪緥瀛愶紝搴旇棣栧厛闄勫姞渚嬪瓙鏁版嵁搴撳埌
+ //SQL Server2000/2005鏁版嵁搴撲笂銆�
+ //public const string SqlConnStr = "Data Source=(local);Initial Catalog=gridreport;Persist Security Info=True;User ID=sa;Password=;";
+
+ //public const string SqlConnStr = "Data Source=10.0.2.9;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
+ public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
+
+ //public string sServer;
+ //public string sDataBase;
+ //public string sUser;
+ //public string sPassword;
+ //public const string SqlConnStr="";
+ //protected void Page_Load(object sender, EventArgs e)
+ //{
+ // sServer = Pub_Class.ClsIni.ReadIni("Erp", "Server", Pub_Class.ClsPub.AppPath + @"\" + "HXErp.ini");
+ // sDataBase = Pub_Class.ClsIni.ReadIni("Erp", "DataBase", Pub_Class.ClsPub.AppPath + @"\" + "HXErp.ini");
+ // sUser = Pub_Class.ClsIni.ReadIni("Erp", "UserName", Pub_Class.ClsPub.AppPath + @"\" + "HXErp.ini");
+ // sPassword = Pub_Class.ClsIni.ReadIni("Erp", "PassWord", Pub_Class.ClsPub.AppPath + @"\" + "HXErp.ini");
+ // SqlConnStr = "Data Source=" + sServer +
+ // ";Initial Catalog=" + sDataBase +
+ // ";Persist Security Info=True;"+
+ // "User ID=" + sUser +
+ // ";Password=" + sPassword + ";";
+ //}
+
+ //瀹氫箟鍦⊿QL涓〃绀烘棩鏈熷�肩殑鍖呭洿绗﹀彿锛孉ccess鐢ㄢ��#鈥�, 鑰孧S SQl Server鐢ㄢ��'鈥濓紝涓轰簡鐢熸垚涓よ�呴兘鍙敤鐨勬煡璇QL璇彞锛屽皢鍏跺弬鏁板寲瀹氫箟鍑烘潵銆傝繖鏍峰鐞嗗彧鏄负浜嗘紨绀轰緥瀛愭柟渚�
+ public const char DateSqlBracketChar = '\'';
+
+ //鏍规嵁鏌ヨSQL,浜х敓鎻愪緵缁欐姤琛ㄧ敓鎴愰渶瑕佺殑 XML 鏁版嵁锛屽瓧娈靛�间负绌轰篃浜х敓鏁版嵁
+ public static void FullGenNodeXmlData(System.Web.UI.Page DataPage, string QuerySQL, bool ToCompress)
+ {
+ SqlConnection ReportConn = new SqlConnection(SqlConnStr);
+ SqlCommand ReportDataCommand = new SqlCommand(QuerySQL, ReportConn);
+ ReportConn.Open();
+ SqlDataReader ReportDataReader = ReportDataCommand.ExecuteReader();
+ XMLReportData.GenNodeXmlDataFromReader(DataPage, ReportDataReader, ToCompress ? ResponseDataType.ZipBinary : ResponseDataType.PlainText);
+ ReportDataReader.Close();
+ ReportConn.Close();
+ }
+
+ //鑾峰彇 Count(*) SQL 鏌ヨ鍒扮殑鏁版嵁琛屾暟銆傚弬鏁� QuerySQL 鎸囧畾鑾峰彇鎶ヨ〃鏁版嵁鐨勬煡璇QL
+ public static int BatchGetDataCount(string QuerySQL)
+ {
+ int Total = 0;
+
+ SqlConnection ReportConn = new SqlConnection(SqlConnStr);
+ SqlCommand ReportDataCommand = new SqlCommand(QuerySQL, ReportConn);
+ ReportConn.Open();
+ SqlDataReader ReportDataReader = ReportDataCommand.ExecuteReader();
+ if (ReportDataReader.Read())
+ Total = ReportDataReader.GetInt32(0);
+ ReportDataReader.Close();
+ ReportConn.Close();
+
+ return Total;
+ }
+
+ //<<protected function
+ //鏍规嵁鏌ヨSQL,浜х敓鎻愪緵缁欐姤琛ㄧ敓鎴愰渶瑕佺殑 XML 鎴� JSON 鏁版嵁
+ protected static void DoGenDetailData(System.Web.UI.Page DataPage, string QuerySQL, ResponseDataType DataType, bool IsJSON)
+ {
+ SqlConnection ReportConn = new SqlConnection(SqlConnStr);
+ SqlDataAdapter ReportDataAdapter = new SqlDataAdapter(QuerySQL, ReportConn);
+ DataSet ReportDataSet = new DataSet();
+ ReportConn.Open();
+ ReportDataAdapter.Fill(ReportDataSet);
+ ReportConn.Close();
+
+ if (IsJSON)
+ JSONReportData.GenDataSet(DataPage, ReportDataSet, DataType);
+ else
+ XMLReportData.GenDataSet(DataPage, ReportDataSet, DataType);
+ }
+ //>>protected function
+
+ //鐗瑰埆鎻愮ず锛氫互涓嬪嚱鏁颁负鍏煎浠ュ墠鐗堟湰鑰屼繚鐣欙紝璇峰嬁鍐嶇敤涔嬶紝鏃犻』鍏煎鑰冭檻鍙垹闄や箣
+ //<<淇濈暀鍓嶉潰鐗堟湰鐨勫嚱鏁帮紝鍏煎浠ュ墠鐗堟湰鎵�鍐欑▼搴�
+ //鏍规嵁鏌ヨSQL,浜х敓鎻愪緵缁欐姤琛ㄧ敓鎴愰渶瑕佺殑 XML 鏁版嵁锛岄噰鐢� Sql 鏁版嵁寮曟搸
+ public static void GenNodeXmlData(System.Web.UI.Page DataPage, string QuerySQL, bool ToCompress)
+ {
+ DoGenDetailData(DataPage, QuerySQL, ToCompress ? ResponseDataType.ZipBinary : ResponseDataType.PlainText, false);
+ }
+
+ //鏍规嵁鏌ヨSQL,浜х敓鎻愪緵缁欐姤琛ㄧ敓鎴愰渶瑕佺殑 XML 鏁版嵁锛岄噰鐢� Sql 鏁版嵁寮曟搸, 杩欓噷鍙骇鐢熸姤琛ㄥ弬鏁版暟鎹�
+ //褰撴姤琛ㄦ病鏈夋槑缁嗘椂锛岃皟鐢ㄦ湰鏂规硶鐢熸垚鏁版嵁锛屾煡璇QL搴旇鍙兘鏌ヨ鍑轰竴鏉¤褰�
+ public static void GenParameterReportData(System.Web.UI.Page DataPage, string ParameterQuerySQL)
+ {
+ DoGenDetailData(DataPage, ParameterQuerySQL, ResponseDataType.PlainText, false);
+ }
+
+ //鏍规嵁鏌ヨSQL,浜х敓鎻愪緵缁欐姤琛ㄧ敓鎴愰渶瑕佺殑 XML 鏁版嵁锛岄噰鐢� Sql 鏁版嵁寮曟搸, 鏍规嵁RecordsetQuerySQL鑾峰彇鎶ヨ〃鏄庣粏鏁版嵁锛屾牴鎹甈arameterQuerySQL鑾峰彇鎶ヨ〃鍙傛暟鏁版嵁
+ public static void GenEntireReportData(System.Web.UI.Page DataPage, string RecordsetQuerySQL, string ParameterQuerySQL, bool ToCompress)
+ {
+ SqlConnection ReportConn = new SqlConnection(SqlConnStr);
+ DataSet ReportDataSet = new DataSet();
+ ReportConn.Open();
+ SqlDataAdapter DataAdapter1 = new SqlDataAdapter(RecordsetQuerySQL, ReportConn);
+ DataAdapter1.Fill(ReportDataSet, "Detail");
+ SqlDataAdapter DataAdapter2 = new SqlDataAdapter(ParameterQuerySQL, ReportConn);
+ DataAdapter2.Fill(ReportDataSet, "Master");
+ ReportConn.Close();
+ XMLReportData.GenDataSet(DataPage, ReportDataSet, ReportDataBase.DefaultDataType);
+ }
+ //>>淇濈暀鍓嶉潰鐗堟湰鐨勫嚱鏁帮紝鍏煎浠ュ墠鐗堟湰鎵�鍐欑▼搴�
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////////////////////
+//class SqlXMLReportData 鏍规嵁SQL浜х敓鎶ヨ〃闇�瑕佺殑 XML 鏁版嵁锛岄噰鐢� Sql 鏁版嵁寮曟搸
+public class SqlXMLReportData : SqlReportData
+{
+ public static void GenOneRecordset(System.Web.UI.Page DataPage, string QuerySQL)
+ {
+ SqlReportData.DoGenDetailData(DataPage, QuerySQL, ReportDataBase.DefaultDataType, false);
+ }
+
+ public static void GenMultiRecordset(System.Web.UI.Page DataPage, ArrayList QueryList)
+ {
+ SqlConnection ReportConn = new SqlConnection(SqlConnStr);
+ DataSet ReportDataSet = new DataSet();
+
+ ReportConn.Open();
+
+ foreach (ReportQueryItem item in QueryList)
+ {
+ SqlDataAdapter DataAdapter = new SqlDataAdapter(item.QuerySQL, ReportConn);
+ DataAdapter.Fill(ReportDataSet, item.RecordsetName);
+ }
+
+ ReportConn.Close();
+
+ XMLReportData.GenDataSet(DataPage, ReportDataSet, ReportDataBase.DefaultDataType);
+ }
+
+ //鐗瑰埆鎻愮ず锛氫互涓嬪嚱鏁颁负鍏煎浠ュ墠鐗堟湰鑰屼繚鐣欙紝璇峰嬁鍐嶇敤涔嬶紝鏃犻』鍏煎鑰冭檻鍙垹闄や箣
+ //<<淇濈暀鍓嶉潰鐗堟湰鐨勫嚱鏁帮紝鍏煎浠ュ墠鐗堟湰鎵�鍐欑▼搴�
+ //浜х敓鎶ヨ〃鏄庣粏璁板綍鏁版嵁锛屾暟鎹皢琚姞杞藉埌鏄庣粏缃戞牸鐨勮褰曢泦涓�
+ public static void GenDetailData(System.Web.UI.Page DataPage, string QuerySQL)
+ {
+ GenOneRecordset(DataPage, QuerySQL);
+ }
+
+ //杩欓噷鍙骇鐢熸姤琛ㄥ弬鏁版暟鎹紝鏁版嵁鍔犺浇鍒版姤琛ㄥ弬鏁般�侀潪鏄庣粏缃戞牸涓殑閮ㄤ欢妗嗕腑
+ //褰撴姤琛ㄦ病鏈夋槑缁嗘椂锛岃皟鐢ㄦ湰鏂规硶鐢熸垚鏁版嵁锛屾煡璇QL搴旇鍙兘鏌ヨ鍑轰竴鏉¤褰�
+ public static void GenParameterData(System.Web.UI.Page DataPage, string ParameterQuerySQL)
+ {
+ GenOneRecordset(DataPage, ParameterQuerySQL);
+ }
+
+ //鏍规嵁RecordsetQuerySQL鑾峰彇鎶ヨ〃鏄庣粏鏁版嵁锛屽搴旀暟鎹姞杞藉埌鎶ヨ〃鐨勬槑缁嗙綉鏍肩殑璁板綍闆嗕腑
+ //鏍规嵁ParameterQuerySQL鑾峰彇鎶ヨ〃鍙傛暟鏁版嵁锛屽搴旀暟鎹姞杞藉埌鎶ヨ〃鍙傛暟銆侀潪鏄庣粏缃戞牸涓殑閮ㄤ欢妗嗕腑
+ public static void GenEntireData(System.Web.UI.Page DataPage, string RecordsetQuerySQL, string ParameterQuerySQL, ResponseDataType DataType)
+ {
+ ArrayList QueryList = new ArrayList();
+ QueryList.Add(new ReportQueryItem(RecordsetQuerySQL, "Detail"));
+ QueryList.Add(new ReportQueryItem(ParameterQuerySQL, "Master"));
+ GenMultiRecordset(DataPage, QueryList);
+ }
+ public static void GenEntireData(System.Web.UI.Page DataPage, string RecordsetQuerySQL, string ParameterQuerySQL)
+ {
+ GenEntireData(DataPage, RecordsetQuerySQL, ParameterQuerySQL, ReportDataBase.DefaultDataType);
+ }
+ //>>淇濈暀鍓嶉潰鐗堟湰鐨勫嚱鏁帮紝鍏煎浠ュ墠鐗堟湰鎵�鍐欑▼搴�
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////////////////////
+//class SqlJsonReportData 鏍规嵁SQL浜х敓鎶ヨ〃闇�瑕佺殑 JSON 鏁版嵁锛岄噰鐢� Sql 鏁版嵁寮曟搸
+public class SqlJsonReportData : SqlReportData
+{
+ public static void GenOneRecordset(System.Web.UI.Page DataPage, string QuerySQL)
+ {
+ SqlReportData.DoGenDetailData(DataPage, QuerySQL, ReportDataBase.DefaultDataType, true);
+ }
+
+ public static void GenMultiRecordset(System.Web.UI.Page DataPage, ArrayList QueryList)
+ {
+ SqlConnection ReportConn = new SqlConnection(SqlConnStr);
+ DataSet ReportDataSet = new DataSet();
+
+ ReportConn.Open();
+
+ foreach (ReportQueryItem item in QueryList)
+ {
+ SqlDataAdapter DataAdapter = new SqlDataAdapter(item.QuerySQL, ReportConn);
+ DataAdapter.Fill(ReportDataSet, item.RecordsetName);
+ }
+
+ ReportConn.Close();
+
+ JSONReportData.GenDataSet(DataPage, ReportDataSet, ReportDataBase.DefaultDataType);
+ }
+
+
+ //鐗瑰埆鎻愮ず锛氫互涓嬪嚱鏁颁负鍏煎浠ュ墠鐗堟湰鑰屼繚鐣欙紝璇峰嬁鍐嶇敤涔嬶紝鏃犻』鍏煎鑰冭檻鍙垹闄や箣
+ //<<淇濈暀鍓嶉潰鐗堟湰鐨勫嚱鏁帮紝鍏煎浠ュ墠鐗堟湰鎵�鍐欑▼搴�
+ //浜х敓鎶ヨ〃鏄庣粏璁板綍鏁版嵁锛屾暟鎹皢琚姞杞藉埌鏄庣粏缃戞牸鐨勮褰曢泦涓�
+ public static void GenDetailData(System.Web.UI.Page DataPage, string QuerySQL)
+ {
+ GenOneRecordset(DataPage, QuerySQL);
+ }
+
+ //杩欓噷鍙骇鐢熸姤琛ㄥ弬鏁版暟鎹紝鏁版嵁灏嗗姞杞藉埌鎶ヨ〃鍙傛暟銆侀潪鏄庣粏缃戞牸涓殑閮ㄤ欢妗嗕腑
+ //褰撴姤琛ㄦ病鏈夋槑缁嗘椂锛岃皟鐢ㄦ湰鏂规硶鐢熸垚鏁版嵁锛屾煡璇QL搴旇鍙兘鏌ヨ鍑轰竴鏉¤褰�
+ public static void GenParameterData(System.Web.UI.Page DataPage, string ParameterQuerySQL)
+ {
+ GenOneRecordset(DataPage, ParameterQuerySQL);
+ }
+
+ //鏍规嵁RecordsetQuerySQL鑾峰彇鎶ヨ〃鏄庣粏鏁版嵁锛屽搴旀暟鎹姞杞藉埌鎶ヨ〃鐨勬槑缁嗙綉鏍肩殑璁板綍闆嗕腑
+ //鏍规嵁ParameterQuerySQL鑾峰彇鎶ヨ〃鍙傛暟鏁版嵁锛屽搴旀暟鎹姞杞藉埌鎶ヨ〃鍙傛暟銆侀潪鏄庣粏缃戞牸涓殑閮ㄤ欢妗嗕腑
+ public static void GenEntireData(System.Web.UI.Page DataPage, string RecordsetQuerySQL, string ParameterQuerySQL, ResponseDataType DataType)
+ {
+ ArrayList QueryList = new ArrayList();
+ QueryList.Add(new ReportQueryItem(RecordsetQuerySQL, "Detail"));
+ QueryList.Add(new ReportQueryItem(ParameterQuerySQL, "Master"));
+ GenMultiRecordset(DataPage, QueryList);
+ }
+ public static void GenEntireData(System.Web.UI.Page DataPage, string RecordsetQuerySQL, string ParameterQuerySQL)
+ {
+ GenEntireData(DataPage, RecordsetQuerySQL, ParameterQuerySQL, ReportDataBase.DefaultDataType);
+ }
+ //>>淇濈暀鍓嶉潰鐗堟湰鐨勫嚱鏁帮紝鍏煎浠ュ墠鐗堟湰鎵�鍐欑▼搴�
+}
\ No newline at end of file
diff --git a/WebTM/App_Data/ReportData.cs b/WebTM/App_Data/ReportData.cs
new file mode 100644
index 0000000..90d9ec9
--- /dev/null
+++ b/WebTM/App_Data/ReportData.cs
@@ -0,0 +1,239 @@
+锘縰sing System;
+//using System.Collections;
+using System.Text;
+using System.Data;
+using System.Configuration;
+using System.IO;
+using System.IO.Compression;
+using System.Web;
+using System.Web.Security;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+
+/////////////////////////////////////////////////////////////////////////////////////////////////////////
+//浠ヤ笅鏋氫妇鎸囧畾鎶ヨ〃鏁版嵁鐨勬牸寮忕被鍨�
+public enum ResponseDataType
+{
+ PlainText, //鎶ヨ〃鏁版嵁涓篨ML鎴朖SON鏂囨湰锛屽湪璋冭瘯鏃跺彲浠ユ煡鐪嬫姤琛ㄦ暟鎹�傛暟鎹湭缁忓帇缂╋紝澶ф暟鎹噺鎶ヨ〃閲囩敤姝ょ鏂瑰紡涓嶅悎閫�
+ ZipBinary, //鎶ヨ〃鏁版嵁涓篨ML鎴朖SON鏂囨湰缁忚繃鍘嬬缉寰楀埌鐨勪簩杩涘埗鏁版嵁銆傛绉嶆柟寮忔暟鎹噺鏈�灏�(绾︿负鍘熷鏁版嵁鐨�1/10)锛屼絾鐢ˋjax鏂瑰紡鍔犺浇鎶ヨ〃鏁版嵁鏃朵笉鑳戒负姝ょ鏂瑰紡
+ ZipBase64, //鎶ヨ〃鏁版嵁涓哄皢 ZipBinary 鏂瑰紡寰楀埌鐨勬暟鎹啀杩涜 BASE64 缂栫爜鐨勬暟鎹�傛绉嶆柟寮忛�傚悎鐢ˋjax鏂瑰紡鍔犺浇鎶ヨ〃鏁版嵁
+};
+
+/////////////////////////////////////////////////////////////////////////////////////////////////////////
+// ReportQueryItem
+public class ReportQueryItem
+{
+ public string QuerySQL;
+ public string RecordsetName;
+
+ public ReportQueryItem(string AQuerySQL, string ARecordsetName)
+ {
+ QuerySQL = AQuerySQL;
+ RecordsetName = ARecordsetName;
+ }
+};
+
+/////////////////////////////////////////////////////////////////////////////////////////////////////////
+// ReportDataBase
+public class ReportDataBase
+{
+ //鎸囧畾鎶ヨ〃鐨勯粯璁ゆ暟鎹被鍨嬶紝渚夸簬缁熶竴瀹氫箟鏁翠釜鎶ヨ〃绯荤粺鐨勬暟鎹被鍨�
+ //鍦ㄦ姤琛ㄥ紑鍙戣皟璇曢樁娈碉紝閫氬父鎸囧畾涓� ResponseDataType.PlainText, 浠ヤ究鍦ㄦ祻瑙堝櫒涓煡鐪嬪搷搴旂殑婧愭枃浠舵椂鑳界湅鍒板彲璇荤殑鏂囨湰鏁版嵁
+ //鍦ㄩ」鐩儴缃叉椂锛岄�氬父鎸囧畾涓� ResponseDataType.ZipBinary 鎴� ResponseDataType.ZipBase64锛岃繖鏍峰彲浠ユ瀬澶у噺灏戞暟鎹噺锛屾彁渚涙姤琛ㄥ搷搴旈�熷害
+ public const ResponseDataType DefaultDataType = ResponseDataType.PlainText; //PlainText ZipBinary ZipBase64
+
+ //灏嗘姤琛╔ML鏁版嵁鏂囨湰杈撳嚭鍒癏TTP璇锋眰
+ public static void ResponseData(System.Web.UI.Page DataPage, ref string DataText, ResponseDataType DataType)
+ {
+ //鎶ヨ〃XML鏁版嵁鐨勫墠鍚庝笉鑳介檮鍔犱换浣曞叾瀹冩暟鎹紝鍚﹀垯XML鏁版嵁灏嗕笉鑳芥垚鍔熻В鏋愶紝鎵�浠ヨ皟鐢–learContent鏂规硶娓呯悊缃戦〉涓墠闈㈠浣欑殑鏁版嵁
+ DataPage.Response.ClearContent();
+
+ if (ResponseDataType.PlainText == DataType)
+ {
+ // 鎶妜ml瀵硅薄鍙戦�佺粰瀹㈡埛绔�
+ //DataPage.Response.ContentType = "text/xml";
+ DataPage.Response.Write(DataText);
+ }
+ else
+ {
+ //灏唖tring鏁版嵁杞崲涓篵yte[]锛屼互渚胯繘琛屽帇缂�
+ System.Text.UTF8Encoding converter = new System.Text.UTF8Encoding();
+ byte[] XmlBytes = converter.GetBytes(DataText);
+
+ //鍦� HTTP 澶翠俊鎭腑鍐欏叆鎶ヨ〃鏁版嵁鍘嬬缉淇℃伅
+ DataPage.Response.AppendHeader("gr_zip_type", "deflate"); //鎸囧畾鍘嬬缉鏂规硶
+ DataPage.Response.AppendHeader("gr_zip_size", XmlBytes.Length.ToString()); //鎸囧畾鏁版嵁鐨勫師濮嬮暱搴�
+ DataPage.Response.AppendHeader("gr_zip_encode", converter.HeaderName); //鎸囧畾鏁版嵁鐨勭紪鐮佹柟寮� utf-8 utf-16 ...
+
+ // 鎶婂帇缂╁悗鐨剎ml鏁版嵁鍙戦�佺粰瀹㈡埛绔�
+ if (ResponseDataType.ZipBinary == DataType)
+ {
+ DeflateStream compressedzipStream = new DeflateStream(DataPage.Response.OutputStream, CompressionMode.Compress, true);
+ compressedzipStream.Write(XmlBytes, 0, XmlBytes.Length);
+ compressedzipStream.Close();
+ }
+ else //ResponseDataType.ZipBase64
+ {
+ MemoryStream memStream = new MemoryStream();
+ DeflateStream compressedzipStream = new DeflateStream(memStream, CompressionMode.Compress, true);
+ compressedzipStream.Write(XmlBytes, 0, XmlBytes.Length);
+ compressedzipStream.Close(); //杩欏彞寰堥噸瑕侊紝杩欐牱鏁版嵁鎵嶈兘鍏ㄩ儴鍐欏叆 MemoryStream
+
+ // Read bytes from the stream.
+ memStream.Seek(0, SeekOrigin.Begin); // Set the position to the beginning of the stream.
+ int count = (int)memStream.Length;
+ byte[] byteArray = new byte[count];
+ count = memStream.Read(byteArray, 0, count);
+
+ string Base64Text = Convert.ToBase64String(byteArray);
+ DataPage.Response.Write(Base64Text);
+ }
+ }
+
+ //鎶ヨ〃XML鏁版嵁鐨勫墠鍚庝笉鑳介檮鍔犱换浣曞叾瀹冩暟鎹紝鍚﹀垯XML鏁版嵁灏嗕笉鑳芥垚鍔熻В鏋愶紝鎵�浠ヨ皟鐢‥nd鏂规硶鏀惧純缃戦〉涓悗闈笉蹇呰鐨勬暟鎹�
+ DataPage.Response.End();
+ }
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////////////////////
+//class XMLReportData 浜х敓鎶ヨ〃闇�瑕佺殑xml鏁版嵁
+public class XMLReportData
+{
+ //鏍规嵁 DataSet 浜х敓鎻愪緵缁欐姤琛ㄩ渶瑕佺殑XML鏁版嵁锛屽弬鏁癉ataType鎸囧畾鍘嬬缉缂栫爜鏁版嵁鐨勫舰寮�
+ public static void GenDataSet(System.Web.UI.Page DataPage, DataSet ReportDataSet, ResponseDataType DataType)
+ {
+ string XMLText = ReportDataSet.GetXml();
+ ReportDataBase.ResponseData(DataPage, ref XMLText, DataType);
+ }
+
+ //鏍规嵁 DataTable 浜х敓鎻愪緵缁欐姤琛ㄩ渶瑕佺殑XML鏁版嵁锛屽弬鏁癉ataType鎸囧畾鍘嬬缉缂栫爜鏁版嵁鐨勫舰寮�
+ public static void GenDataTable(System.Web.UI.Page DataPage, DataTable mydt, ResponseDataType DataType)
+ {
+ DataSet ds = new DataSet();
+ ds.Tables.Add(mydt);
+ GenDataSet(DataPage, ds, DataType);
+ }
+
+ //鏍规嵁IDataReader, 浜х敓鎻愪緵缁欐姤琛ㄩ渶瑕佺殑XML鏁版嵁锛屽叾涓殑绌哄�煎瓧娈典篃浼氫骇鐢焁ML鑺傜偣锛屽弬鏁癉ataType鎸囧畾鍘嬬缉缂栫爜鏁版嵁鐨勫舰寮�
+ public static void GenNodeXmlDataFromReader(System.Web.UI.Page DataPage, IDataReader dr, ResponseDataType DataType)
+ {
+ string XMLText = "<xml>\n";
+ while (dr.Read())
+ {
+ XMLText += "<row>";
+ for (int i = 0; i < dr.FieldCount; ++i)
+ {
+ string FldName = dr.GetName(i);
+ if (FldName == "")
+ FldName = "Fld" + i;
+ XMLText += String.Format("<{0}>{1}</{0}>", FldName, HttpUtility.HtmlEncode(dr.GetValue(i).ToString()));
+ }
+ XMLText += "</row>\n";
+ }
+ XMLText += "</xml>\n";
+
+ ReportDataBase.ResponseData(DataPage, ref XMLText, DataType);
+ }
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////////////////////
+//class JSONReportData 浜х敓鎶ヨ〃闇�瑕佺殑 JSON 鏍煎紡鏁版嵁
+public class JSONReportData
+{
+ //鏍规嵁 DataSet 浜х敓鎻愪緵缁欐姤琛ㄩ渶瑕佺殑JSON鏁版嵁锛屽弬鏁癉ataType鎸囧畾鍘嬬缉缂栫爜鏁版嵁鐨勫舰寮�
+ public static void GenDataSet(System.Web.UI.Page DataPage, DataSet ReportDataSet, ResponseDataType DataType)
+ {
+ string Out = GenDetailText(ReportDataSet);
+ ReportDataBase.ResponseData(DataPage, ref Out, DataType);
+ }
+
+ //鏍规嵁 DataTable 浜х敓鎻愪緵缁欐姤琛ㄩ渶瑕佺殑JSON鏁版嵁锛屽弬鏁癉ataType鎸囧畾鍘嬬缉缂栫爜鏁版嵁鐨勫舰寮�
+ public static void GenDataTable(System.Web.UI.Page DataPage, DataTable dt, ResponseDataType DataType)
+ {
+ DataSet ds = new DataSet();
+ ds.Tables.Add(dt);
+ GenDataSet(DataPage, ds, DataType);
+ }
+
+ //鏍规嵁 DataSet 浜х敓鎻愪緵缁欐姤琛ㄩ渶瑕佺殑JSON鏂囨湰鏁版嵁
+ public static string GenDetailText(DataSet ds)
+ {
+ StringBuilder sbJSONText = new StringBuilder("{\n");
+ foreach (DataTable dt in ds.Tables)
+ {
+ //"recordset":[
+ sbJSONText.Append('"');
+ sbJSONText.Append(dt.TableName);
+ sbJSONText.Append("\":[\n");
+ foreach (DataRow dr in dt.Rows)
+ {
+ sbJSONText.Append('{');
+ for (int i = 0; i < dt.Columns.Count; ++i)
+ {
+ if (!dr.IsNull(i))
+ {
+ string Value;
+ if (dt.Columns[i].DataType.IsArray)
+ {
+ Value = Convert.ToBase64String((byte[])dr[i]);
+ }
+ else
+ {
+ Value = dr[i].ToString();
+ PrepareValueText(ref Value);
+ }
+ sbJSONText.AppendFormat("\"{0}\":\"{1}\",", dt.Columns[i].ColumnName, Value);
+ }
+ }
+ sbJSONText.Remove(sbJSONText.Length - 1, 1); //鍘绘帀姣忕瑪璁板綍鏈�鍚庝竴涓瓧娈靛悗闈㈢殑","
+ sbJSONText.Append("},\n");
+ }
+ sbJSONText.Remove(sbJSONText.Length - 2, 1); //鍘绘帀鏈�鍚庝竴鏉¤褰曞悗闈㈢殑","
+ sbJSONText.Append("],\n");
+ }
+ sbJSONText.Remove(sbJSONText.Length - 2, 1); //鍘绘帀鏈�鍚庝竴璁板綍闆嗗悗闈㈢殑","
+ sbJSONText.Append("}");
+
+ return sbJSONText.ToString();
+ }
+
+ //濡傛灉鏁版嵁涓寘鍚湁JSON瑙勮寖涓殑鐗规畩瀛楃(" \ \r \n \t)锛屽鐗规畩瀛楃鍔� \ 缂栫爜
+ public static void PrepareValueText(ref string ValueText)
+ {
+ bool HasSpecialChar = false;
+ foreach(char ch in ValueText)
+ {
+ if (ch == '"' || ch == '\\' || ch == '\r' || ch == '\n' || ch == '\t')
+ {
+ HasSpecialChar = true;
+ break;
+ }
+ }
+ if (HasSpecialChar)
+ {
+ StringBuilder NewValueText = new StringBuilder();
+ foreach (char ch in ValueText)
+ {
+ if (ch == '"' || ch == '\\' || ch == '\r' || ch == '\n' || ch == '\t')
+ {
+ NewValueText.Append( '\\');
+ if (ch == '"' || ch == '\\')
+ NewValueText.Append( ch );
+ else if (ch == '\r')
+ NewValueText.Append( 'r' );
+ else if (ch == '\n')
+ NewValueText.Append( 'n' );
+ else if (ch == '\t')
+ NewValueText.Append( 't' );
+ }
+ else
+ {
+ NewValueText.Append( ch );
+ }
+ }
+ ValueText = NewValueText.ToString();
+ }
+ }
+}
\ No newline at end of file
diff --git a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
index daf9134..5308867 100644
--- a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
@@ -18,10 +18,10 @@
<publishTime>04/12/2021 11:31:26</publishTime>
</File>
<File Include="bin/WebTM.dll">
- <publishTime>04/25/2021 08:40:00</publishTime>
+ <publishTime>04/23/2021 17:24:02</publishTime>
</File>
<File Include="bin/WebTM.pdb">
- <publishTime>04/25/2021 08:40:00</publishTime>
+ <publishTime>04/23/2021 17:24:02</publishTime>
</File>
<File Include="layuiadmin/config.js">
<publishTime>04/12/2021 11:31:26</publishTime>
@@ -588,7 +588,7 @@
<publishTime>04/12/2021 11:31:26</publishTime>
</File>
<File Include="layuiadmin/Scripts/webConfig.js">
- <publishTime>04/21/2021 14:44:42</publishTime>
+ <publishTime>04/23/2021 10:17:29</publishTime>
</File>
<File Include="layuiadmin/style/admin.css">
<publishTime>04/12/2021 11:31:26</publishTime>
@@ -941,6 +941,18 @@
<File Include="views/component/璇存槑.txt">
<publishTime>04/12/2021 11:31:26</publishTime>
</File>
+ <File Include="views/CreateControl.js">
+ <publishTime>04/23/2021 17:23:49</publishTime>
+ </File>
+ <File Include="views/grf/姹囨姤鍗�.grf">
+ <publishTime>04/23/2021 17:05:55</publishTime>
+ </File>
+ <File Include="views/GRInstall.js">
+ <publishTime>04/23/2021 17:23:49</publishTime>
+ </File>
+ <File Include="views/GRUtility.js">
+ <publishTime>04/23/2021 17:23:49</publishTime>
+ </File>
<File Include="views/home/console.html">
<publishTime>04/12/2021 11:31:26</publishTime>
</File>
@@ -954,7 +966,7 @@
<publishTime>04/12/2021 11:31:26</publishTime>
</File>
<File Include="views/index.html">
- <publishTime>04/21/2021 17:21:41</publishTime>
+ <publishTime>04/21/2021 09:39:21</publishTime>
</File>
<File Include="views/senior/echarts/bar.html">
<publishTime>04/12/2021 11:31:26</publishTime>
@@ -1191,7 +1203,7 @@
<publishTime>04/12/2021 11:31:26</publishTime>
</File>
<File Include="views/鐢熶骇宸ュ簭绠＄悊/澧炲姞涓嶈壇璇勫鍗�/QC_Add_NoPassProdCheckBill.html">
- <publishTime>04/21/2021 08:53:05</publishTime>
+ <publishTime>04/20/2021 21:10:48</publishTime>
</File>
<File Include="views/鐢熶骇宸ュ簭绠＄悊/澧炲姞涓嶈壇璇勫鍗�/QC_NoPassProdCheckBill.html">
<publishTime>04/13/2021 10:12:44</publishTime>
@@ -1205,14 +1217,20 @@
<File Include="views/鐢熶骇宸ュ簭绠＄悊/濮斿宸ュ簭姹囨姤鍗�/Sc_StationOutBillMainList.html">
<publishTime>04/12/2021 11:31:26</publishTime>
</File>
+ <File Include="views/鐢熶骇宸ュ簭绠＄悊/宸ュ簭姹囨姤鍗�/HBarPlanPrint.html">
+ <publishTime>04/23/2021 16:56:48</publishTime>
+ </File>
<File Include="views/鐢熶骇宸ュ簭绠＄悊/宸ュ簭姹囨姤鍗�/Sc_Add_ProcessReportList.html">
- <publishTime>04/21/2021 08:53:05</publishTime>
+ <publishTime>04/23/2021 16:59:42</publishTime>
</File>
<File Include="views/鐢熶骇宸ュ簭绠＄悊/宸ュ簭姹囨姤鍗�/Sc_ProcessReport_PDA.html">
<publishTime>04/12/2021 11:31:26</publishTime>
</File>
+ <File Include="views/鐢熶骇宸ュ簭绠＄悊/宸ュ簭姹囨姤鍗�/xmlLBM_ProcessReport.aspx">
+ <publishTime>04/23/2021 16:41:10</publishTime>
+ </File>
<File Include="views/鐢熶骇宸ュ簭绠＄悊/宸ュ簭娲惧伐鍗�/Sc_Add_ProcessSendWork.html">
- <publishTime>04/21/2021 08:53:05</publishTime>
+ <publishTime>04/21/2021 16:40:38</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html">
<publishTime>04/12/2021 11:31:26</publishTime>
@@ -1230,10 +1248,10 @@
<publishTime>04/12/2021 11:31:26</publishTime>
</File>
<File Include="views/鐢熶骇宸ュ簭绠＄悊/宸ュ簭姹囨姤鍗�/Sc_ProcessReportList.html">
- <publishTime>04/12/2021 11:31:26</publishTime>
+ <publishTime>04/22/2021 17:13:32</publishTime>
</File>
<File Include="views/鐢熶骇宸ュ簭绠＄悊/宸ュ簭娲惧伐鍗�/Sc_ProcessSendWorkList.html">
- <publishTime>04/12/2021 11:31:26</publishTime>
+ <publishTime>04/09/2021 21:12:33</publishTime>
</File>
<File Include="views/鐢熶骇宸ュ簭绠＄悊/宸ュ簭璁″垝鍗�/Sc_ProcessPlanList.html">
<publishTime>04/12/2021 11:31:26</publishTime>
@@ -1254,25 +1272,37 @@
<publishTime>04/12/2021 11:31:26</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/濮斿宸ュ簭鍙戝嚭鍗�/Cj_StationEntrustInBill.html">
- <publishTime>04/21/2021 08:53:05</publishTime>
+ <publishTime>04/23/2021 11:00:09</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/濮斿宸ュ簭鍙戝嚭鍗�/Cj_StationEntrustInBillList.html">
<publishTime>04/12/2021 11:31:26</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/濮斿宸ュ簭鎺ユ敹鍗�/Cj_StationEntrustOutBill.html">
- <publishTime>04/21/2021 08:53:05</publishTime>
+ <publishTime>04/21/2021 09:39:21</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/濮斿宸ュ簭鎺ユ敹鍗�/Cj_StationEntrustOutBillList.html">
<publishTime>04/12/2021 11:31:26</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/濮斿宸ュ簭鍙戝嚭鍗�/Cj_StationEntrustInBill.html">
- <publishTime>04/21/2021 08:53:05</publishTime>
+ <publishTime>04/23/2021 11:00:09</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/濮斿宸ュ簭鍙戝嚭鍗�/Cj_StationEntrustInBillList.html">
<publishTime>04/12/2021 11:31:26</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/濮斿宸ュ簭鎺ユ敹鍗�/Cj_StationEntrustOutBillList.html">
<publishTime>04/12/2021 11:31:26</publishTime>
+ </File>
+ <File Include="views/杞﹂棿绠＄悊/宸ュ簭鍑虹珯鍙戝嚭鍗�/Cj_StationOutBill.html">
+ <publishTime>04/22/2021 20:02:50</publishTime>
+ </File>
+ <File Include="views/杞﹂棿绠＄悊/宸ュ簭鍑虹珯鍙戝嚭鍗�/Cj_StationOutBillList.html">
+ <publishTime>04/22/2021 20:02:50</publishTime>
+ </File>
+ <File Include="views/杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill.html">
+ <publishTime>04/23/2021 15:11:32</publishTime>
+ </File>
+ <File Include="views/杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBillList.html">
+ <publishTime>04/23/2021 15:22:03</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationInBill.html">
<publishTime>04/12/2021 11:31:26</publishTime>
@@ -1299,10 +1329,10 @@
<publishTime>04/12/2021 11:31:26</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBill.html">
- <publishTime>04/21/2021 08:53:05</publishTime>
+ <publishTime>04/21/2021 09:39:21</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBillList.html">
- <publishTime>04/21/2021 08:53:05</publishTime>
+ <publishTime>04/21/2021 09:39:21</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Qk_OutProcessList.html">
<publishTime>04/12/2021 11:31:26</publishTime>
@@ -1467,7 +1497,7 @@
<publishTime>04/12/2021 11:31:26</publishTime>
</File>
<File Include="Web.config">
- <publishTime>04/25/2021 08:40:07</publishTime>
+ <publishTime>04/23/2021 10:11:02</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index de18065..c27acac 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -64,6 +64,8 @@
<Content Include="layuiadmin\layui\font\iconfont.ttf" />
<Content Include="layuiadmin\layui\font\iconfont.woff" />
<None Include="Properties\PublishProfiles\JFTM.pubxml" />
+ <Content Include="views\CreateControl.js" />
+ <Content Include="views\grf\姹囨姤鍗�.grf" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
@@ -378,6 +380,8 @@
<Content Include="views\component\upload\index.html" />
<Content Include="views\component\util\index.html" />
<Content Include="views\component\璇存槑.txt" />
+ <Content Include="views\GRInstall.js" />
+ <Content Include="views\GRUtility.js" />
<Content Include="views\home\console.html" />
<Content Include="views\home\homepage1.html" />
<Content Include="views\home\homepage2.html" />
@@ -443,6 +447,10 @@
<Content Include="views\鍩虹璧勬枡\閲囪喘鍩虹璧勬枡\Gy_Supplier.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_CheckToolsFileMainList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_Mould.html" />
+ <Content Include="views\鐢熶骇宸ュ簭绠＄悊\宸ュ簭姹囨姤鍗昞HBarPlanPrint.html" />
+ <Content Include="views\鐢熶骇宸ュ簭绠＄悊\宸ュ簭姹囨姤鍗昞xmlLBM_ProcessReport.aspx" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭鍑虹珯鍙戝嚭鍗昞Cj_StationOutBill.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭鍑虹珯鍙戝嚭鍗昞Cj_StationOutBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Cj_StationInBill.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Cj_StationInBillList.html" />
<Content Include="views\楠屾敹鍏ュ簱\浜у搧鍏ュ簱\Kf_ProductInBillList.html" />
@@ -546,7 +554,16 @@
<None Include="Properties\PublishProfiles\Web.pubxml" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="App_Data\MssqlReportData.cs" />
+ <Compile Include="App_Data\ReportData.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="views\鐢熶骇宸ュ簭绠＄悊\宸ュ簭姹囨姤鍗昞xmlLBM_ProcessReport.aspx.cs">
+ <DependentUpon>xmlLBM_ProcessReport.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鐢熶骇宸ュ簭绠＄悊\宸ュ簭姹囨姤鍗昞xmlLBM_ProcessReport.aspx.designer.cs">
+ <DependentUpon>xmlLBM_ProcessReport.aspx</DependentUpon>
+ </Compile>
</ItemGroup>
<ItemGroup>
<Folder Include="views\浠撳瓨绠＄悊\璋冩嫧鍗曟牳瀵筡" />
diff --git a/WebTM/views/CreateControl.js b/WebTM/views/CreateControl.js
new file mode 100644
index 0000000..0722fcc
--- /dev/null
+++ b/WebTM/views/CreateControl.js
@@ -0,0 +1,158 @@
+锘�//1銆佸彉閲� gr_InstallPath 绛夊彿鍚庨潰鐨勫弬鏁版槸鎻掍欢瀹夎鏂囦欢鐨勬墍鍦ㄧ殑缃戠珯鐩綍锛屼竴鑸粠缃戠珯鐨勬牴鐩�
+// 褰曞紑濮嬪鍧�锛屾彃浠跺畨瑁呮枃浠朵竴瀹氳瀛樺湪浜庢寚瀹氱洰褰曚笅銆�
+//2銆乬r_Version 绛夊彿鍚庨潰鐨勫弬鏁版槸鎻掍欢瀹夎鍖呯殑鐗堟湰鍙凤紝濡傛灉鏈夋柊鐗堟湰鎻掍欢瀹夎鍖咃紝搴斾笂浼犳柊鐗�
+// 鏈彃浠跺畨瑁呮枃浠跺埌缃戠珯瀵瑰簲鐩綍锛屽苟鏇存柊杩欓噷鐨勭増鏈彿銆�
+//3銆佹洿澶氳缁嗕俊鎭鍙傝�冨府鍔╀腑鈥滄姤琛ㄦ彃浠�(WEB鎶ヨ〃)->鍦ㄦ湇鍔″櫒閮ㄧ讲鎻掍欢瀹夎鍖呪�濋儴鍒�
+var gr_InstallPath = "grinstall"; //瀹為檯椤圭洰涓簲璇ュ啓浠庢牴鐩綍瀵诲潃鐨勭洰褰曪紝濡俫r_InstallPath="/myapp/report/grinstall";
+var gr_Version = "6,0,15,0819";
+
+//浠ヤ笅娉ㄥ唽鍙蜂负鏈満寮�鍙戞祴璇曟敞鍐屽彿锛屾姤琛ㄨ闂湴鍧�涓簂ocalhost鏃跺彲浠ュ幓鎺夎瘯鐢ㄦ爣蹇�
+//璐拱娉ㄥ唽鍚庯紝璇风敤鎮ㄧ殑娉ㄥ唽鐢ㄦ埛鍚嶄笌娉ㄥ唽鍙锋浛鎹笅闈㈠彉閲忎腑鍊�
+var gr_UserName = '閿愭氮鎶ヨ〃鎻掍欢鏈満寮�鍙戞祴璇曟敞鍐�';
+var gr_SerialNo = '8PJH495VA61FLI5TG0L4KB2337F1G7AKLD6LNNA9F9T28IKRU6N33P8Z6XX4BUYB5E9NZ6INMD5T8EN47IX63VV7F9BJHB5ZJQQ6MX3J3V12C4XDHU97SXX6X3VA57KCB6';
+
+//鎶ヨ〃鎻掍欢鐩墠鍙兘鍦�32浣嶆祻瑙堝櫒涓娇鐢�
+var _gr_platform = window.navigator.platform;
+if (_gr_platform.indexOf("64") > 0)
+ alert("閿愭氮Grid++Report鎶ヨ〃鎻掍欢涓嶈兘杩愯鍦�64浣嶆祻瑙堝櫒涓紝鐩稿叧鎶ヨ〃涓庢墦鍗板姛鑳藉皢鏃犳硶姝ｅ父杩愭柊锛岃鏀圭敤32浣嶆祻瑙堝櫒锛�");
+
+//鍖哄垎娴忚鍣�(IE or not)
+var _gr_agent = navigator.userAgent.toLowerCase();
+var _gr_isIE = (_gr_agent.indexOf("msie")>0)? true : false;
+
+var gr_CodeBase;
+if( _gr_isIE )
+ gr_CodeBase = 'codebase="' + gr_InstallPath + '/grbsctl6.cab#Version=' + gr_Version + '"';
+else
+ gr_CodeBase = '';
+
+//鍒涘缓鎶ヨ〃瀵硅薄锛屾姤琛ㄥ璞℃槸涓嶅彲瑙佺殑瀵硅薄锛岃缁嗚鏌ョ湅甯姪涓殑 IGridppReport
+//Name - 鎸囧畾鎻掍欢瀵硅薄鐨処D锛屽彲浠ョ敤js浠ｇ爜 document.getElementById("%Name%") 鑾峰彇鎶ヨ〃瀵硅薄
+//EventParams - 鎸囧畾鎶ヨ〃瀵硅薄鐨勯渶瑕佸搷搴旂殑浜嬩欢锛屽锛�"<param name='OnInitialize' value=OnInitialize> <param name='OnProcessBegin' value=OnProcessBegin>"褰㈠紡锛屽彲浠ユ寚瀹氬涓簨浠�
+function CreateReport(PluginID, EventParams)
+{
+ var typeid;
+ if( _gr_isIE )
+ typeid = 'classid="clsid:396841CC-FC0F-4989-8182-EBA06AA8CA2F" ';
+ else
+ typeid = 'type="application/x-grplugin6-report" ';
+ typeid += gr_CodeBase;
+ document.write('<object id="' + PluginID + '" ' + typeid);
+ document.write(' width="0" height="0" VIEWASTEXT>');
+ if (EventParams != undefined)
+ document.write(EventParams);
+ document.write('</object>');
+
+ document.write('<script type="text/javascript">');
+ document.write(PluginID + '.Register("' + gr_UserName + '", "' + gr_SerialNo + '");');
+ document.write('</script>');
+}
+
+//鐢ㄦ洿澶氱殑鍙傛暟鍒涘缓鎶ヨ〃鎵撳嵃鏄剧ず鎻掍欢锛岃缁嗚鏌ョ湅甯姪涓殑 IGRPrintViewer
+//PluginID - 鎻掍欢鐨処D锛屽彲浠ラ�氳繃 var ReportViewer = document.getElementById("%PluginID%"); 杩欐牱鐨勬柟寮忚幏鍙栨彃浠跺紩鐢ㄥ彉閲�
+//Width - 鎻掍欢鐨勬樉绀哄搴︼紝"100%"涓烘暣涓樉绀哄尯鍩熷搴︼紝"500"琛ㄧず500涓睆骞曞儚绱犵偣
+//Height - 鎻掍欢鐨勬樉绀洪珮搴︼紝"100%"涓烘暣涓樉绀哄尯鍩熼珮搴︼紝"500"琛ㄧず500涓睆骞曞儚绱犵偣
+//ReportURL - 鑾峰彇鎶ヨ〃妯℃澘鐨刄RL
+//DataURL - 鑾峰彇鎶ヨ〃鏁版嵁鐨刄RL
+//AutoRun - 鎸囧畾鎻掍欢鍦ㄥ垱寤轰箣鍚庢槸鍚﹁嚜鍔ㄧ敓鎴愬苟灞曠幇鎶ヨ〃,鍊间负false鎴杢rue
+//ExParams - 鎸囧畾鏇村鐨勬彃浠跺睘鎬ч槓杩�,褰㈠: "<param name="%ParamName%" value="%Value%">"杩欐牱鐨勫弬鏁颁覆
+function CreatePrintViewerEx2(PluginID, Width, Height, ReportURL, DataURL, AutoRun, ExParams)
+{
+ var typeid;
+ if( _gr_isIE )
+ typeid = 'classid="clsid:ABB64AAC-D7E8-4733-B052-1B141C92F3CE" ' + gr_CodeBase;
+ else
+ typeid = 'type="application/x-grplugin6-printviewer"';
+ document.write('<object id="' + PluginID + '" ' + typeid);
+ document.write(' width="' + Width + '" height="' + Height + '">');
+ document.write('<param name="ReportURL" value="' + ReportURL + '">');
+ document.write('<param name="DataURL" value="' + DataURL + '">');
+ document.write('<param name="AutoRun" value=' + AutoRun + '>');
+ document.write('<param name="SerialNo" value="' + gr_SerialNo + '">');
+ document.write('<param name="UserName" value="' + gr_UserName + '">');
+ document.write(ExParams);
+ document.write('</object>');
+}
+
+//鐢ㄦ洿澶氱殑鍙傛暟鍒涘缓鎶ヨ〃鎵撳嵃鏄剧ず鎻掍欢锛岃缁嗚鏌ョ湅甯姪涓殑 IGRDisplayViewer
+//PluginID - 鎻掍欢鐨処D锛屽彲浠ラ�氳繃 var ReportViewer = document.getElementById("%PluginID%"); 杩欐牱鐨勬柟寮忚幏鍙栨彃浠跺紩鐢ㄥ彉閲�
+//Width - 鎻掍欢鐨勬樉绀哄搴︼紝"100%"涓烘暣涓樉绀哄尯鍩熷搴︼紝"500"琛ㄧず500涓睆骞曞儚绱犵偣
+//Height - 鎻掍欢鐨勬樉绀洪珮搴︼紝"100%"涓烘暣涓樉绀哄尯鍩熼珮搴︼紝"500"琛ㄧず500涓睆骞曞儚绱犵偣
+//ReportURL - 鑾峰彇鎶ヨ〃妯℃澘鐨刄RL
+//DataURL - 鑾峰彇鎶ヨ〃鏁版嵁鐨刄RL
+//AutoRun - 鎸囧畾鎻掍欢鍦ㄥ垱寤轰箣鍚庢槸鍚﹁嚜鍔ㄧ敓鎴愬苟灞曠幇鎶ヨ〃,鍊间负false鎴杢rue
+//ExParams - 鎸囧畾鏇村鐨勬彃浠跺睘鎬ч槓杩�,褰㈠: "<param name="%ParamName%" value="%Value%">"杩欐牱鐨勫弬鏁颁覆
+function CreateDisplayViewerEx2(PluginID, Width, Height, ReportURL, DataURL, AutoRun, ExParams)
+{
+ var typeid;
+ if( _gr_isIE )
+ typeid = 'classid="clsid:600CD6D9-EBE1-42cb-B8DF-DFB81977122E" ' + gr_CodeBase;
+ else
+ typeid = 'type="application/x-grplugin6-displayviewer"';
+ document.write('<object id="' + PluginID + '" ' + typeid);
+ document.write(' width="' + Width + '" height="' + Height + '">');
+ document.write('<param name="ReportURL" value="' + ReportURL + '">');
+ document.write('<param name="DataURL" value="' + DataURL + '">');
+ document.write('<param name="AutoRun" value=' + AutoRun + '>');
+ document.write('<param name="SerialNo" value="' + gr_SerialNo + '">');
+ document.write('<param name="UserName" value="' + gr_UserName + '">');
+ document.write(ExParams);
+ document.write('</object>');
+}
+
+//浠� ReportDesigner 涓� ID 鍒涘缓鎶ヨ〃璁捐鍣ㄦ彃浠�(Designer)锛岃缁嗚鏌ョ湅甯姪涓殑 IGRDesigner
+//Width - 鎻掍欢鐨勬樉绀哄搴︼紝"100%"涓烘暣涓樉绀哄尯鍩熷搴︼紝"500"琛ㄧず500涓睆骞曞儚绱犵偣
+//Height - 鎻掍欢鐨勬樉绀洪珮搴︼紝"100%"涓烘暣涓樉绀哄尯鍩熼珮搴︼紝"500"琛ㄧず500涓睆骞曞儚绱犵偣
+//LoadReportURL - 璇诲彇鎶ヨ〃妯℃澘鐨刄RL锛岃繍琛屾椂浠庢URL璇诲叆鎶ヨ〃妯℃澘鏁版嵁骞跺姞杞藉埌璁捐鍣ㄦ彃浠�
+//SaveReportURL - 淇濆瓨鎶ヨ〃妯℃澘鐨刄RL锛屼繚瀛樿璁″悗鐨勭粨鏋滄暟鎹紝鐢辨URL鐨勬湇鍔″湪WEB鏈嶅姟绔皢鎶ヨ〃妯℃澘鎸佷箙淇濆瓨
+//DataURL - 鑾峰彇鎶ヨ〃杩愯鏃舵暟鎹殑URL锛屽湪璁捐鍣ㄤ腑杩涘叆鎵撳嵃瑙嗗浘涓庢煡璇㈣鍥炬椂浠庢URL鑾峰彇鎶ヨ〃鏁版嵁
+//ExParams - 鎸囧畾鏇村鐨勬彃浠跺睘鎬ч槓杩�,褰㈠: "<param name="%ParamName%" value="%Value%">"杩欐牱鐨勫弬鏁颁覆
+function CreateDesignerEx(Width, Height, LoadReportURL, SaveReportURL, DataURL, ExParams)
+{
+ var typeid;
+ if( _gr_isIE )
+ typeid = 'classid="clsid:CE666189-5D7C-42ee-AAA4-E5CB375ED3C7" ' + gr_CodeBase;
+ else
+ typeid = 'type="application/x-grplugin6-designer"';
+
+
+ document.write('<object id="ReportDesigner" ' + typeid);
+ document.write(' width="' + Width + '" height="' + Height + '">');
+ document.write('<param name="LoadReportURL" value="' + LoadReportURL + '">');
+ document.write('<param name="SaveReportURL" value="' + SaveReportURL + '">');
+ document.write('<param name="DataURL" value="' + DataURL + '">');
+ document.write('<param name="SerialNo" value="' + gr_SerialNo + '">');
+ document.write('<param name="UserName" value="' + gr_UserName + '">');
+ document.write(ExParams);
+ document.write('</object>');
+}
+
+//浠� ReportViewer 涓� ID 鍒涘缓鎶ヨ〃鎵撳嵃鏄剧ず鍣ㄦ彃浠�(PrintViewer)锛屽弬鏁拌鏄庡弬鑰� CreatePrintViewerEx2
+function CreatePrintViewerEx(Width, Height, ReportURL, DataURL, AutoRun, ExParams)
+{
+ CreatePrintViewerEx2("ReportViewer", Width, Height, ReportURL, DataURL, AutoRun, ExParams)
+}
+
+//浠� ReportViewer 涓� ID 鍒涘缓鎶ヨ〃鏌ヨ鏄剧ず鍣ㄦ彃浠�(DisplayViewer)锛屽弬鏁拌鏄庡弬鑰� CreateDisplayViewerEx2
+function CreateDisplayViewerEx(Width, Height, ReportURL, DataURL, AutoRun, ExParams)
+{
+ CreateDisplayViewerEx2("ReportViewer", Width, Height, ReportURL, DataURL, AutoRun, ExParams)
+}
+
+//浠� ReportViewer 涓� ID 鍒涘缓鎶ヨ〃鎵撳嵃鏄剧ず鍣ㄦ彃浠�(PrintViewer)锛屾彃浠跺ぇ灏忎负100%鍏呮弧浣嶇疆鍖哄煙锛屾彃浠跺垱寤哄悗浼氳嚜鍔ㄨ繍琛岋紝鍙傛暟璇存槑鍙傝�� CreatePrintViewerEx2
+function CreatePrintViewer(ReportURL, DataURL)
+{
+ CreatePrintViewerEx("100%", "100%", ReportURL, DataURL, true, "");
+}
+
+//浠� ReportViewer 涓� ID 鍒涘缓鎶ヨ〃鏌ヨ鏄剧ず鍣ㄦ彃浠�(DisplayViewer)锛屾彃浠跺ぇ灏忎负100%鍏呮弧浣嶇疆鍖哄煙锛屾彃浠跺垱寤哄悗浼氳嚜鍔ㄨ繍琛岋紝鍙傛暟璇存槑鍙傝�� CreateDisplayViewerEx2
+function CreateDisplayViewer(ReportURL, DataURL)
+{
+ CreateDisplayViewerEx("100%", "100%", ReportURL, DataURL, true, "");
+}
+
+//浠� ReportDesigner 涓� ID 鍒涘缓鎶ヨ〃璁捐鍣ㄦ彃浠�(Designer)锛屾彃浠跺ぇ灏忎负100%鍏呮弧浣嶇疆鍖哄煙锛屽弬鏁拌鏄庡弬鑰� CreateDesignerEx
+function CreateDesigner(LoadReportURL, SaveReportURL, DataURL)
+{
+ CreateDesignerEx("100%", "100%", LoadReportURL, SaveReportURL, DataURL, "");
+}
\ No newline at end of file
diff --git a/WebTM/views/GRInstall.js b/WebTM/views/GRInstall.js
new file mode 100644
index 0000000..74b7a95
--- /dev/null
+++ b/WebTM/views/GRInstall.js
@@ -0,0 +1,50 @@
+锘�//鍦ㄧ綉椤典腑寮曠敤姝ゆ枃浠朵箣鍓嶏紝搴旇鍏堝紩鐢–reateControl.js
+//document.write("<script type='text/javascript' src='CreateControl.js'></script>");
+
+//鎻掑叆涓�涓姤琛ㄥ璞★紝鐢ㄦ潵鍒ゆ柇鎻掍欢鏄惁宸茬粡瀹夎锛屾垨鏄惁闇�瑕佸畨瑁呮洿鏂扮増鏈�
+//姝ゅ嚱鏁板簲璇ュ湪缃戦〉鐨�<head>涓皟鐢紝鍏蜂綋璇风湅渚嬪瓙 ReportHome.htm 涓殑鐢ㄦ硶
+function Install_InsertReport()
+{
+ var typeid;
+ if( _gr_isIE )
+ typeid = 'classid="clsid:396841CC-FC0F-4989-8182-EBA06AA8CA2F" ';
+ else
+ typeid = 'type="application/x-grplugin6-report" ';
+ typeid += gr_CodeBase;
+ document.write('<object id="_ReportOK" ' + typeid);
+ document.write(' width="0" height="0" VIEWASTEXT>');
+ document.write('</object>');
+}
+
+//鐢ㄦ潵鍒ゆ柇鎻掍欢鏄惁宸茬粡瀹夎锛屾垨鏄惁闇�瑕佸畨瑁呮洿鏂扮増鏈�傚鏋滈渶瑕佸畨瑁咃紝鍒欏湪缃戦〉涓彃鍏ュ畨瑁呯浉鍏崇殑鏂囧瓧鍐呭
+//濡傛灉鎻掍欢宸茬粡瀹夎涓斾篃涓嶈鏇存柊锛屽垯杩斿洖 true锛屽弽涔嬩负 false銆�
+//姝ゅ嚱鏁板簲璇ュ湪缃戦〉鐨�<body>寮�濮嬩綅缃璋冪敤锛屽叿浣撹鐪嬩緥瀛� ReportHome.htm 涓殑鐢ㄦ硶
+function Install_Detect()
+{
+ var _ReportOK = document.getElementById("_ReportOK");
+ if (_ReportOK.Register == undefined) //if ((_ReportOK == null) || (_ReportOK.Register == undefined))
+ {
+ document.write('<div style="width: 100%; background-color: #fff8dc; text-align: center; vertical-align: middle; line-height: 20pt; padding-bottom: 12px; padding-top: 12px;">');
+ document.write('<strong> 姝ょ綉绔欓渶瑕佸畨瑁� 閿愭氮鎶ヨ〃鎻掍欢 鎵嶈兘淇濊瘉鍏舵甯歌繍琛�<br /></strong>');
+
+ if( _gr_isIE )
+ document.write('<strong><span style="color: #ff0000"> 濡傛祻瑙堝櫒鐨勯《閮ㄦ垨搴曢儴鍑虹幇鎻愮ず鏉★紝宸﹂敭鐐瑰嚮鎻愮ず鏉″苟杩愯鍔犺浇椤癸紝鎸夋鏂瑰紡瀹夎鏈�绠�渚�</span><br /></strong>');
+
+ document.write('<a href="' + gr_InstallPath + '/grbsctl6.exe"><span style="color: #ff0000"><strong>鐐瑰嚮姝ゅ涓嬭浇閿愭氮鎶ヨ〃鎻掍欢瀹夎鍖�<br /></strong></span></a>');
+ document.write('閿愭氮鎶ヨ〃鎻掍欢瀹夎鍚庯紝<a href="#" onclick="javascript:document.location.reload();">鐐瑰嚮姝ゅ</a> 閲嶆柊鍔犺浇姝ょ綉绔�');
+ document.write('</div>');
+ return false;
+ }
+ else if ((_ReportOK.Utility.ShouldUpdatePlugin == undefined) || _ReportOK.Utility.ShouldUpdatePlugin(gr_Version) == true) //妫�鏌ユ槸鍚﹀簲璇ヤ笅杞芥柊鐗堟湰绋嬪簭
+ {
+ document.write('<div style="width: 100%; background-color: #fff8dc; text-align: center; vertical-align: middle; line-height: 20pt; padding-bottom: 12px; padding-top: 12px;">');
+ document.write('<strong> 姝ょ綉绔欓渶瑕佸崌绾у畨瑁� 閿愭氮鎶ヨ〃鎻掍欢 鎵嶈兘淇濊瘉鍏舵甯歌繍琛�<br /></strong>');
+ document.write('<a href="' + gr_InstallPath + '/grbsctl6.exe"><span style="color: #ff0000"><strong>鐐瑰嚮姝ゅ涓嬭浇閿愭氮鎶ヨ〃鎻掍欢瀹夎鍖�<br /></strong></span></a>');
+ document.write('鎻掍欢瀹夎鏃跺繀椤诲叧闂綉椤电獥鍙ｏ紝鐐瑰嚮鏈綉椤电獥鍙ｇ殑鍏抽棴鎸夐挳杩涜鍏抽棴锛屽畨瑁呭畬鎴愬悗鍐嶉噸鏂版墦寮�鏈綉椤�<br />');
+ document.write('濡傚畨瑁呬腑鍑虹幇鈥滀笉鑳芥墦寮�瑕佸啓鍏ョ殑鏂囦欢...鈥濈殑鎻愮ず鏃讹紝璇峰皢缃戦〉绐楀彛鍏抽棴锛岀劧鍚庣偣鍑烩�滈噸璇曗�濇寜閽户缁畨瑁�');
+ document.write('</div>');
+ return false;
+ }
+
+ return true;
+}
diff --git a/WebTM/views/GRUtility.js b/WebTM/views/GRUtility.js
new file mode 100644
index 0000000..78c9c20
--- /dev/null
+++ b/WebTM/views/GRUtility.js
@@ -0,0 +1,109 @@
+锘�//鐢变笁鍘熻壊鍊煎悎鎴愰鑹叉暣鏁板��
+function ColorFromRGB(red, green, blue)
+{
+ return red + green*256 + blue*256*256;
+}
+
+//鑾峰彇棰滆壊涓殑绾㈣壊鍊硷紝浼犲叆鍙傛暟涓烘暣鏁拌〃绀虹殑RGB鍊�
+function ColorGetR(intColor)
+{
+ return intColor & 255;
+}
+
+//鑾峰彇棰滆壊涓殑缁胯壊鍊硷紝浼犲叆鍙傛暟涓烘暣鏁拌〃绀虹殑RGB鍊�
+function ColorGetG(intColor)
+{
+ return (intColor>>8) & 255;
+}
+
+//鑾峰彇棰滆壊涓殑钃濊壊鍊硷紝浼犲叆鍙傛暟涓烘暣鏁拌〃绀虹殑RGB鍊�
+function ColorGetB(intColor)
+{
+ return (intColor>>16) & 255;
+}
+
+//鍒涘缓 XMLHttpRequest 瀵硅薄
+function CreateXMLHttpRequest()
+{
+ var xmlhttp;
+ if (window.XMLHttpRequest)
+ xmlhttp = new XMLHttpRequest(); // code for IE7+, Firefox, Chrome, Opera, Safari
+ else
+ xmlhttp = new ActiveXObject("Microsoft.XMLHTTP"); // code for IE6, IE5
+ return xmlhttp;
+}
+
+//鎸夊紓姝ユ柟寮忚姹傛姤琛ㄦ暟鎹紝鍦ㄥ搷搴斾簨浠朵腑灏嗘暟鎹姞杞借繘鎶ヨ〃锛岀劧鍚庢墽琛屽悗缁换鍔″嚱鏁�
+function AjaxReportRun(Report, DataUrl, RunFun)
+{
+ var xmlhttp = CreateXMLHttpRequest();
+ xmlhttp.onreadystatechange = function()
+ {
+ if (xmlhttp.readyState==4 && xmlhttp.status==200)
+ {
+ Report.LoadDataFromAjaxRequest(xmlhttp.responseText, xmlhttp.getAllResponseHeaders()); //鍔犺浇鎶ヨ〃鏁版嵁
+ RunFun(); //鏁版嵁鍔犺浇鍚庨渶瑕佹墽琛岀殑浠诲姟
+ }
+ }
+ xmlhttp.open("POST", encodeURI(DataUrl), true);
+ xmlhttp.send();
+}
+
+//鎸夊紓姝ユ柟寮忚姹傛姤琛ㄦ暟鎹紝鍦ㄥ搷搴斾簨浠朵腑灏嗘暟鎹姞杞借繘鎶ヨ〃锛屽苟鍚姩鎶ヨ〃鏌ョ湅鍣ㄧ殑杩愯
+function AjaxReportViewerStart(ReportViewer, DataUrl)
+{
+ ReportViewer.Stop(); //棣栧厛鍋滄鎶ヨ〃鐨勮繍琛�
+
+ var xmlhttp = CreateXMLHttpRequest();
+ xmlhttp.onreadystatechange = function()
+ {
+ if (xmlhttp.readyState==4 && xmlhttp.status==200)
+ {
+ ReportViewer.Report.LoadDataFromAjaxRequest(xmlhttp.responseText, xmlhttp.getAllResponseHeaders()); //鍔犺浇鎶ヨ〃鏁版嵁
+ ReportViewer.Start(); //鍚姩鎶ヨ〃杩愯
+ }
+ }
+ xmlhttp.open("POST", encodeURI(DataUrl), true);
+ xmlhttp.send();
+}
+
+//鎸夊紓姝ユ柟寮忚姹傛姤琛ㄦā鏉夸笌鎶ヨ〃鏁版嵁锛屽湪鍝嶅簲浜嬩欢涓皢妯℃澘涓庢暟鎹姞杞借繘鎶ヨ〃锛屽苟鍚姩鎶ヨ〃鏌ョ湅鍣ㄧ殑杩愯
+function AjaxReportViewerStart2(ReportViewer, ReportUrl, DataUrl, ReportUrlMethod)
+{
+ var xmlhttp = CreateXMLHttpRequest();
+ xmlhttp.onreadystatechange = function()
+ {
+ if (xmlhttp.readyState==4 && xmlhttp.status==200)
+ {
+ ReportViewer.Report.LoadFromStr(xmlhttp.responseText);
+
+ AjaxReportViewerStart(ReportViewer, DataUrl);
+ }
+ }
+ xmlhttp.open(ReportUrlMethod, encodeURI(ReportUrl), true);
+ xmlhttp.send();
+}
+
+//鎸夊紓姝ユ柟寮忚姹傛姤琛ㄦā鏉匡紝鍦ㄥ搷搴斾簨浠朵腑灏嗘ā鏉垮姞杞�
+function AjaxReportLoad(Report, ReportUrl, ReportUrlMethod)
+{
+ var xmlhttp = CreateXMLHttpRequest();
+ xmlhttp.onreadystatechange = function()
+ {
+ if (xmlhttp.readyState==4 && xmlhttp.status==200)
+ Report.LoadFromStr(xmlhttp.responseText);
+ }
+ xmlhttp.open(ReportUrlMethod, encodeURI(ReportUrl), true);
+ xmlhttp.send();
+}
+
+
+//鎸夊悓姝ユ柟寮忚姹傛姤琛ㄦ暟鎹紝鏁版嵁璇锋眰鏂规硶璋冪敤鍚庣揣鎺ョ潃璋冪敤鎶ヨ〃杞藉叆鏁版嵁鐨勬柟娉�
+//鐢� Ajax 杞藉叆瀛愭姤琛ㄦ暟鎹繀椤荤敤 HTTP 鍚屾鏁版嵁璇锋眰锛屽嵆閲囩敤鏈嚱鏁�
+function AjaxSyncLoadReportData(Report, DataUrl)
+{
+ var xmlhttp = CreateXMLHttpRequest();
+ xmlhttp.open("POST", encodeURI(DataUrl), false);
+ xmlhttp.send();
+ Report.LoadDataFromAjaxRequest(xmlhttp.responseText, xmlhttp.getAllResponseHeaders()); //鍔犺浇鎶ヨ〃鏁版嵁
+}
\ No newline at end of file
diff --git "a/WebTM/views/grf/\346\261\207\346\212\245\345\215\225.grf" "b/WebTM/views/grf/\346\261\207\346\212\245\345\215\225.grf"
new file mode 100644
index 0000000..a706b74
--- /dev/null
+++ "b/WebTM/views/grf/\346\261\207\346\212\245\345\215\225.grf"
@@ -0,0 +1,712 @@
+锘縊bject Report
+ Version='6.0.0.6'
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ Object Printer
+ Height=29.7
+ Oriention=Landscape
+ LeftMargin=1.5
+ TopMargin=0.5
+ RightMargin=1.5
+ BottomMargin=0.5
+ End
+ Object DetailGrid
+ Object Recordset
+ Items Field
+ Item
+ Name='鍗曟嵁鍙�'
+ End
+ Item
+ Name='鏃ユ湡'
+ Type=DateTime
+ Format='yyyy//MM//dd'
+ End
+ Item
+ Name='渚涘簲鍟�'
+ End
+ Item
+ Name='鐗╂枡浠ｇ爜'
+ End
+ Item
+ Name='鐗╂枡鍚嶇О'
+ End
+ Item
+ Name='瑙勬牸鍨嬪彿'
+ End
+ Item
+ Name='璁￠噺鍗曚綅'
+ End
+ Item
+ Name='鏁伴噺'
+ Type=Integer
+ End
+ Item
+ Name='鍗曚环'
+ Type=Currency
+ End
+ Item
+ Name='閲戦'
+ Type=Currency
+ End
+ Item
+ Name='鍚◣鍗曚环'
+ Type=Currency
+ End
+ Item
+ Name='浜よ揣鏃ユ湡'
+ Type=DateTime
+ Format='yyyy//MM//dd'
+ End
+ Item
+ Name='涓氬姟鍛�'
+ End
+ Item
+ Name='琛屽彿'
+ End
+ Item
+ Name='鎵规'
+ End
+ Item
+ Name='璁╂鎺ユ敹'
+ End
+ Item
+ Name='鐢熶骇鏃ユ湡'
+ End
+ Item
+ Name='鍚堟牸鏁伴噺'
+ End
+ Item
+ Name='璁″垝璺熻釜鍗曞彿'
+ End
+ Item
+ Name='閫佽揣鍗曞彿'
+ End
+ Item
+ Name='閲囪喘璁㈠崟鍙�'
+ End
+ Item
+ Name='婧愬崟鍗曞彿'
+ End
+ Item
+ Name='琛ㄥご澶囨敞'
+ End
+ Item
+ Name='棰勮鍒拌揣鏃ユ湡'
+ End
+ Item
+ Name='渚涘簲鍟嗕唬鐮�'
+ End
+ Item
+ Name='Field3'
+ End
+ Item
+ Name='琛ㄤ綋澶囨敞'
+ End
+ End
+ End
+ Items Column
+ Item
+ Name='搴忓彿'
+ Width=0.767292
+ End
+ Item
+ Name='璁″垝璺熻釜鍗曞彿'
+ Width=2.80458
+ End
+ Item
+ Name='鐗╂枡浠ｇ爜'
+ Width=3.20146
+ End
+ Item
+ Name='鐗╂枡'
+ Width=2.98979
+ End
+ Item
+ Name='瑙勬牸鍨嬪彿'
+ Width=3.01625
+ End
+ Item
+ Name='璁￠噺鍗曚綅'
+ Width=1.79917
+ End
+ Item
+ Name='鏁伴噺'
+ Width=1.98438
+ End
+ Item
+ Name='Column2'
+ Width=0.899583
+ End
+ Item
+ Name='Column3'
+ Width=1.905
+ End
+ Item
+ Name='Column4'
+ Width=2.01083
+ End
+ Item
+ Name='Column5'
+ Width=1.98438
+ End
+ Item
+ Name='Column6'
+ Width=3.20146
+ End
+ End
+ Object ColumnContent
+ Height=1.00542
+ Items ColumnContentCell
+ Item
+ Column='搴忓彿'
+ FreeCell=T
+ Items Control
+ Item
+ Type=SystemVarBox
+ Name='SystemVarBox1'
+ Dock=Fill
+ Object Font
+ Name='瀹嬩綋'
+ Weight=400
+ Charset=134
+ End
+ SystemVar=RowNo
+ End
+ End
+ End
+ Item
+ Column='璁″垝璺熻釜鍗曞彿'
+ Object Font
+ Name='瀹嬩綋'
+ Weight=400
+ Charset=134
+ End
+ WordWrap=T
+ TextAlign=MiddleCenter
+ ShrinkFontToFit=T
+ DataField='婧愬崟鍗曞彿'
+ End
+ Item
+ Column='鐗╂枡浠ｇ爜'
+ Object Font
+ Name='瀹嬩綋'
+ Weight=400
+ Charset=134
+ End
+ WordWrap=T
+ TextAlign=MiddleCenter
+ ShrinkFontToFit=T
+ DataField='鐗╂枡浠ｇ爜'
+ End
+ Item
+ Column='鐗╂枡'
+ Object Font
+ Name='瀹嬩綋'
+ Weight=400
+ Charset=134
+ End
+ WordWrap=T
+ TextAlign=MiddleCenter
+ ShrinkFontToFit=T
+ DataField='鐗╂枡鍚嶇О'
+ End
+ Item
+ Column='瑙勬牸鍨嬪彿'
+ Object Font
+ Name='瀹嬩綋'
+ Weight=400
+ Charset=134
+ End
+ WordWrap=T
+ TextAlign=MiddleCenter
+ ShrinkFontToFit=T
+ DataField='瑙勬牸鍨嬪彿'
+ End
+ Item
+ Column='璁￠噺鍗曚綅'
+ Object Font
+ Name='瀹嬩綋'
+ Weight=400
+ Charset=134
+ End
+ WordWrap=T
+ TextAlign=MiddleCenter
+ ShrinkFontToFit=T
+ DataField='鎵规'
+ End
+ Item
+ Column='鏁伴噺'
+ Object Font
+ Name='瀹嬩綋'
+ Weight=400
+ Charset=134
+ End
+ WordWrap=T
+ TextAlign=MiddleCenter
+ ShrinkFontToFit=T
+ DataField='鐢熶骇鏃ユ湡'
+ End
+ Item
+ Column='Column2'
+ FreeCell=T
+ Items Control
+ Item
+ Type=FieldBox
+ Name='FieldBox1'
+ Dock=Fill
+ Object Font
+ Name='瀹嬩綋'
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ DataField='璁￠噺鍗曚綅'
+ End
+ End
+ End
+ Item
+ Column='Column3'
+ Object Font
+ Name='瀹嬩綋'
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ DataField='鏁伴噺'
+ End
+ Item
+ Column='Column4'
+ TextAlign=MiddleCenter
+ End
+ Item
+ Column='Column5'
+ End
+ Item
+ Column='Column6'
+ Object Font
+ Name='瀹嬩綋'
+ Weight=400
+ Charset=134
+ End
+ FreeCell=T
+ Items Control
+ Item
+ Type=FieldBox
+ Name='FieldBox2'
+ Dock=Fill
+ DataField='琛ㄤ綋澶囨敞'
+ End
+ End
+ End
+ End
+ End
+ Object ColumnTitle
+ Height=1.00542
+ RepeatStyle=OnPage
+ Items ColumnTitleCell
+ Item
+ GroupTitle=F
+ Column='搴忓彿'
+ Object Font
+ Name='瀹嬩綋'
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='搴忓彿'
+ End
+ Item
+ GroupTitle=F
+ Column='璁″垝璺熻釜鍗曞彿'
+ Object Font
+ Name='瀹嬩綋'
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='璁㈠崟鍙�'
+ End
+ Item
+ GroupTitle=F
+ Column='鐗╂枡浠ｇ爜'
+ Object Font
+ Name='瀹嬩綋'
+ Weight=400
+ Charset=134
+ End
+ WordWrap=T
+ TextAlign=MiddleCenter
+ Text='鐗╂枡浠ｇ爜'
+ End
+ Item
+ GroupTitle=F
+ Column='鐗╂枡'
+ Object Font
+ Name='瀹嬩綋'
+ Weight=400
+ Charset=134
+ End
+ WordWrap=T
+ TextAlign=MiddleCenter
+ Text='鐗╂枡鍚嶇О'
+ End
+ Item
+ GroupTitle=F
+ Column='瑙勬牸鍨嬪彿'
+ Object Font
+ Name='瀹嬩綋'
+ Weight=400
+ Charset=134
+ End
+ WordWrap=T
+ TextAlign=MiddleCenter
+ Text='瑙勬牸鍨嬪彿'
+ End
+ Item
+ GroupTitle=F
+ Column='璁￠噺鍗曚綅'
+ Object Font
+ Name='瀹嬩綋'
+ Weight=400
+ Charset=134
+ End
+ WordWrap=T
+ TextAlign=MiddleCenter
+ Text='鎵规鍙�'
+ End
+ Item
+ GroupTitle=F
+ Column='鏁伴噺'
+ Object Font
+ Name='瀹嬩綋'
+ Weight=400
+ Charset=134
+ End
+ WordWrap=T
+ TextAlign=MiddleCenter
+ Text='鐢熶骇鏃ユ湡'
+ End
+ Item
+ GroupTitle=F
+ Column='Column2'
+ Object Font
+ Name='瀹嬩綋'
+ Size=82500,0
+ Weight=400
+ Charset=134
+ End
+ WordWrap=T
+ TextAlign=MiddleCenter
+ Text='璁￠噺鍗曚綅'
+ End
+ Item
+ GroupTitle=F
+ Column='Column3'
+ Object Font
+ Name='瀹嬩綋'
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='閫佽揣鏁伴噺'
+ End
+ Item
+ GroupTitle=F
+ Column='Column4'
+ Object Font
+ Name='瀹嬩綋'
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='鍖呰鏁�*瀹氶噺'
+ End
+ Item
+ GroupTitle=F
+ Column='Column5'
+ Object Font
+ Name='瀹嬩綋'
+ Weight=400
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='绛炬敹鏁伴噺'
+ End
+ Item
+ GroupTitle=F
+ Column='Column6'
+ Object Font
+ Name='瀹嬩綋'
+ Weight=400
+ Charset=134
+ End
+ WordWrap=T
+ TextAlign=MiddleCenter
+ Text='澶囨敞'
+ End
+ End
+ End
+ End
+ Items ReportHeader
+ Item
+ Name='ReportHeader1'
+ Height=5.60917
+ Items Control
+ Item
+ Type=MemoBox
+ Name='MemoBox3'
+ Left=7.59354
+ Top=1.5875
+ Width=11.6152
+ Height=0.873125
+ Object Border
+ Styles=[DrawBottom]
+ End
+ Object Font
+ Name='瀹嬩綋'
+ Size=180000,0
+ Bold=T
+ Charset=134
+ End
+ TextAlign=TopCenter
+ Text='閫� 璐� 娓� 鍗昞r\n'
+ End
+ Item
+ Type=Barcode
+ Name='Barcode1'
+ Left=21.0079
+ Top=0.608542
+ Width=3.59833
+ Height=2.80458
+ BarcodeType=QRCode
+ Text='[#鍗曟嵁鍙�#]'
+ Object Font
+ Name='瀹嬩綋'
+ Size=82500,0
+ Weight=400
+ Charset=134
+ End
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox4'
+ Left=0.396875
+ Top=0.740833
+ Width=15.0019
+ Height=0.79375
+ Object Font
+ Name='瀹嬩綋'
+ Weight=400
+ Charset=134
+ End
+ Text='渚涘簲鍟�:[#渚涘簲鍟�#]'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox6'
+ Left=0.396875
+ Top=2.51354
+ Width=14.605
+ Height=0.6
+ Object Font
+ Name='瀹嬩綋'
+ Weight=400
+ Charset=134
+ End
+ TextAlign=TopLeft
+ Text='鍘熼�佽揣鍗曞彿:[#閫佽揣鍗曞彿#]'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox7'
+ Left=0.396875
+ Top=3.09563
+ Width=8.20208
+ Height=0.6
+ Object Font
+ Name='瀹嬩綋'
+ Weight=400
+ Charset=134
+ End
+ TextAlign=TopLeft
+ Text='鍗曟嵁鍙�:[#鍗曟嵁鍙�#]'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox10'
+ Left=0.396875
+ Top=3.70417
+ Width=14.605
+ Height=0.6
+ Object Font
+ Name='瀹嬩綋'
+ Weight=400
+ Charset=134
+ End
+ TextAlign=TopLeft
+ Text='鏀惰揣鍦板潃锛氭禉姹熺渷鍙板窞甯傛姹熷尯寮�鍙戝ぇ閬撲笢娈�818鍙穃r'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox11'
+ Left=12.7
+ Top=3.09563
+ Width=6.40292
+ Height=0.6
+ Object Font
+ Name='瀹嬩綋'
+ Weight=400
+ Charset=134
+ End
+ Text='渚涘簲鍟嗙紪鐮侊細[#渚涘簲鍟嗕唬鐮�#]'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox12'
+ Left=0.396875
+ Top=4.31271
+ Width=8.20208
+ Height=0.6
+ Object Font
+ Name='瀹嬩綋'
+ Weight=400
+ Charset=134
+ End
+ TextAlign=TopLeft
+ Text='閫佽揣鏃ユ湡锛歔#鏃ユ湡#]'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox13'
+ Left=0.396875
+ Top=4.92125
+ Width=8.20208
+ Height=0.6
+ Object Font
+ Name='瀹嬩綋'
+ Weight=400
+ Charset=134
+ End
+ TextAlign=TopLeft
+ Text='鏀惰揣鑱旂郴浜猴細榛勫缓'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox14'
+ Left=12.7
+ Top=4.92125
+ Width=8.20208
+ Height=0.6
+ Object Font
+ Name='瀹嬩綋'
+ Weight=400
+ Charset=134
+ End
+ TextAlign=TopLeft
+ Text='鐢佃瘽锛�13185687491'
+ End
+ Item
+ Type=PictureBox
+ Name='PictureBox1'
+ Left=0.396875
+ Top=0.211667
+ Width=2.80458
+ Height=0.582083
+ Picture=-2055
+iVBORw0KGgoAAAANSUhEUgAAAEwAAAAbCAYAAADWHGlkAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAecSURBVGhD7Vlr
+bFRFFJ5uCxgkgcTE3/pDfxjjD02MGAx9v0tEEjX6S4yAUUGiiRA0RhRE+tjubktLy0MNAgqFBugD2/IKpQ+00G5LKWxpaUsLbdFS+6KPPZ4zc27v3b23tDUgkPAlX27v
+uefMnfl27syZU1Hd5QFPRw/0DNwCDbXtLVDXot8PDXfDpRt/Q3Pvdbbo6B/thbOtHVB77Rq4Day96obW7r/YS8dQXx+cbz8Gde3FJha3V8Ch1mr08ipnAyraPOBuu34H
+drCnQlPbTWjq7uS7O8PrHQVPYx1c6qjHN5vfbYQQ89NARCVCjruNTWiMcIF47Xu+AzjdPIg2ByzfkcMWHU8t2wMiLBlEqN2XYekwb/EO9tJRPzqGz7OR2yyYCbbwDAhL
+L2VvHSKSntN7iElmhiSxp4IITUSm8N3kEBGZIIKz+G5iCBGSDAGxLiiob2cTQECcEwIMHai42g8iLhW+zCpmi8K1zk4ciANscQ6McfnQhhQxDrDnn2ZvhSvDo2CLN/vr
+dIIITzX90gEx2+Rzatccg8QxGCEiU0HEOvhucohQ7G/U5P6PBGNMXTCcutTJPINgslPh+nSuaO7HDjlg9a5ytig8s/RHGWuLTYMAEsFAEtFGz+Kz2Vvheu+Aaj8+Vfcn
+wWUM/lDy3gWO8gqOUAiK5ndpPvF0NRDbMEJE4bIQ6+S7ySFCUeDIyT9hFCxJdsRXMPyVI/wFc8Kne8rYAjDqpbXILjsqIvBl4+uLRvzF6Fm0HS40XeQogK4ebAsHKKKt
+YnAtwraoP08kbOEIhVnRO6V93M+fIYnsqTB9wVJQMDvfTYz/LJinpRMHjoLEuGDlznxYe6gaeR7WHkbidVNBCXZ4C7btgo+SjnCUEiwQhXx+5c/K38B1edUQnHoc28TB
+hvh2XgqGIq/LP8f+dGXmKhoxfcFQ9HspWFbORTlTYtebd04NB6pKpWBPv/8bW5Rg1P4nGSfZ4ovRsVGMycABp8LAyBBblWAiIpnvJscDJ9jqnQW4djmhqqWRLWZ4vV4p
+6uxFGWzRBVvhOsYWM15Yk4OzzAmdV1rYwoJFPsyCZW5HPxd0D1GcVbKnbDTDRPg2+TdhXLC0iQVbmoyC4SbT1a5vMlIwzPf64TbgRgu3LWjEA7eGPRJsmoIty96Dfg48
+/uhHKCuQYDbMxzRMRbB3NxRKwS6160exWXGYh2E7r3y9FxauOQyvrTniwwVf6BsLYfqCUVpxDwVbzoI1dQ6yxRokWGCsvvZMRbC3NxyVgtW19LAFYCYJRv3CXEkyCtML
+IyP9jkbTFgz9/w/Bmrv62WINJZje1nQEu9CqH95lWoFxcsbGU8avkthx+okzfcFI9LskWHnzwH0RrLZN/9w1wUgEEUvHHj9i7mbE9AW7i7tkFX4aSjB9EV6WvXvqgsXp
+HZmKYG99U4SDdcDlJr1kowRzwdxFKTAvgWj34dw4vb+E+ypYQ3cNCpYGn/9SxBaAVRm7ceY4obvTtw7lDxpk0GL9PDklwTYXyMH2lJ9li1r0KXFtHByB2mEz3UgjHgn2
+8AjmhYMNx3FRdcFn+/RPcsVPp+RC6+64c1WT2p7zRhrf6YJ9eAfBXvyuWJaGOj16pj8zPhsH9ABl+sWeG2xiwQzlnZe+Ooo+aXDYXcMWgPW5NSASXPDOtjNsMaOsxS1n
+2JPv7WWLLtiq7eaqqoY5r6M40Q4YGBxgC86wmAflLBmShANwwLKsEsitbIQjf1yRAtLh13H4LPxw9Dg2lCYH3tHXxWEAZ1qapS0A/Tbuq4XkA5WQcqBinN8WnoLZCRTn
+hMWbfuUoXbD56/ZDSk65T0zK78WwOvecnF0iLBXPohyEkJk+vst+phLsOYYYA43QBEvZX2rpm3jwT/ZUIMEowT5SVgWZqENWpceHGeUe5acJRp8g1ZSIgSiETdas8KWh
+VOyjop5THqY1DI8N4KBUsU9WN2OIVO5Rf9tQZIGfMe12ha0NHKULJn3xmeZP9wEUE041NicELdnKEQpyl6T8C4VUaYSKGY+PTmVPBRKM2lHv0PwM/lF+uyp9adi+zPhZ
+Bx++ulH50RkqIF6rmOoVTEoO6Uq1Kymo4RPV8NjiTLm2kbjGWBWvEkoR6oQx7xhHANzoxZxOJp7mqqmqxOLf+CzlYC5HKMyUFVeKwf74xakY389PE8wWl272RYo43wIl
+Ja6B6G9ZzSX/CPW5ChGGs4jEkc4GB75KsaKd8OwHvqVm2gyKMBOnX9B68HhFfrz9BPsrNI5QTV9v30SasdjmyIBvfjcjCo9G/NwUQ8QYI6Rg8tkEAkSls6eCCLX206ht
+go8EY0xdsJc3gwjGc1QwrmFWDLHD40vS4Z8R3zxHK9/MoMZoXQnG9ScYB0uken0Ufq549Ro+R0L9bS8+x3bJx4ox6fDcm+b/DwaFZlj7a0SBjBAh3I+JuNDvfwALaGJY
++GkM3qz89p2vgRK3B4rdly1Zgs9vDtH2bq550b/CWvv7oKisFvbXnYaculLJzLwLcKiwEMqu6qmKhlu4WWwtqLNkVr4bcopPQdewuWSUdaLBMmaceXXsqbDvZJG1H3NL
+/kXDiLywq+SEpZ/GjIJ69AP4F1sn4ukxmV+HAAAAAElFTkSuQmCC
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox15'
+ Left=12.7
+ Top=4.33917
+ Width=8.20208
+ Height=0.6
+ Object Font
+ Name='瀹嬩綋'
+ Weight=400
+ Charset=134
+ End
+ TextAlign=TopLeft
+ Text='棰勮鍒拌揣鏃ユ湡锛歔#棰勮鍒拌揣鏃ユ湡#]'
+ End
+ End
+ RepeatOnPage=T
+ End
+ End
+ Items ReportFooter
+ Item
+ Name='ReportFooter1'
+ Height=3.41313
+ Items Control
+ Item
+ Type=ShapeBox
+ Name='ShapeBox1'
+ Left=0.132292
+ Top=0.396875
+ Width=26.4054
+ Height=1.19063
+ End
+ Item
+ Type=StaticBox
+ Name='StaticBox3'
+ Left=0.211667
+ Top=2.40771
+ Width=3.38667
+ Height=0.582083
+ Text='閫佽揣浜猴細'
+ End
+ Item
+ Type=StaticBox
+ Name='StaticBox4'
+ Left=16.4042
+ Top=2.40771
+ Width=3.20146
+ Height=0.582083
+ Text='鏀惰揣浜猴細'
+ End
+ Item
+ Type=MemoBox
+ Name='MemoBox16'
+ Left=0.211667
+ Top=0.502708
+ Width=26.1938
+ Height=0.978958
+ Object Font
+ Name='瀹嬩綋'
+ Size=120000,0
+ Weight=400
+ Charset=134
+ End
+ Text='澶囨敞锛歔#琛ㄥご澶囨敞#]'
+ End
+ End
+ RepeatOnPage=T
+ End
+ End
+End
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 9ea2304..66419b3 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -344,6 +344,13 @@
<dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBillList.html">宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛�</a></dd>
</dl>
</dd>
+ <dd>
+ <a>宸ュ簭鍑虹珯姹囨姤鍗�</a>
+ <dl class="layui-nav-child append" id="append">
+ <dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill.html">宸ュ簭鍑虹珯姹囨姤鍗�</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBillList.html">宸ュ簭鍑虹珯姹囨姤鍗曞垪琛�</a></dd>
+ </dl>
+ </dd>
</dl>
</li>
<li data-name="set" class="layui-nav-item">
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/HBarPlanPrint.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/HBarPlanPrint.html"
new file mode 100644
index 0000000..0f5a41b
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/HBarPlanPrint.html"
@@ -0,0 +1,76 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title>鎵撳嵃</title>
+ <script src="../CreateControl.js"></script>
+ <script src="../GRInstall.js"></script>
+ <script src="../GRUtility.js"></script>
+ <style type="text/css">
+ html, body {
+ margin: 0;
+ height: 100%;
+ }
+ </style>
+ <script type="text/javascript">
+
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ //鍦ㄧ綉椤靛垵濮嬪姞杞芥椂鍚戞姤琛ㄦ彁渚涙暟鎹�
+ function window_onload() {
+ var ReportViewer = document.getElementById("ReportViewer");
+ // ReportViewer.Stop();
+ var Report = ReportViewer.Report;
+ //寮�鍚姤琛ㄧ敓鎴愯繘搴︽潯鏄剧ず
+ //ReportViewer.Report.ShowProgressUI = true;
+ Report.OnPrintBegin = OnPrintBegin;
+ Report.OnPrintEnd = OnPrintEnd;
+
+ ReportViewer.Start();
+ }
+ //function OnPrintEnd() {
+ // if (PrintCount == 0) {
+ // var LCStatus = sessionStorage.getItem("LCStatus");
+ // if (LCStatus == "Print")//鎵撳嵃鐘舵��
+ // {
+ // SaveLabelPrint(sessionStorage.getItem("LabelJson"));
+ // PrintCount = 1;
+ // }
+ // }
+
+ //}
+ //function OnPrintBegin() {
+
+ //}
+ </script>
+</head>
+<body>
+ <script type="text/javascript">
+ var PrintCount = 0;
+ var params = getUrlVars();
+ var value = params[params[0]];
+ var Type = params[params[1]];
+ var OpenTmp = params[params[2]];
+ switch (Type) {
+ //case "HBarCodePrint"://鐗╂枡鏉＄爜鎵撳嵃
+ // //CreateDisplayViewerEx("100%", "100%", "../../views/grf/" + OpenTmp + ".grf", "../../views/SRM/xmlSRM_Web_BarCodeBillList.aspx?linterid=" + value, true, "");
+ // CreateDisplayViewerEx("100%", "100%", "../../views/grf/" + OpenTmp + ".grf", "xmlSRM_Web_BarCodeBillList.aspx?linterid=" + value, true, "");
+ // break;
+ case "HProcessReport"://宸ュ簭姹囨姤鍗曟墦鍗�
+ CreateDisplayViewerEx("100%", "100%", "../../views/grf/" + OpenTmp + ".grf", "xmlLBM_ProcessReport.aspx?linterid=" + value, true, "");
+ break;
+ //case "HPOOrderBill"://閲囪喘璁㈠崟鍗曟墦鍗�
+ // CreateDisplayViewerEx("100%", "100%", "../../views/grf/" + OpenTmp + ".grf", "xmlSRM_POInStockBill.aspx?linterid=" + value, true, "");
+ // break;
+ }
+ </script>
+</body>
+</html>
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProcessReportList.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProcessReportList.html"
index dff6014..74b6155 100644
--- "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProcessReportList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProcessReportList.html"
@@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8" />
- <title>鏂板娲惧伐鍗�</title>
+ <title>鏂板娲惧伐鍗�</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
@@ -21,6 +21,11 @@
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+ <button type="button" id="Closeing" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Closeing">鍏抽棴</button>
+ <button type="button" id="BackClose" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="BackClose">鍙嶅叧闂�</button>
+ <button type="button" id="Auditing" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Auditing">瀹℃牳</button>
+ <button type="button" id="BackAudit" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="BackAudit">鍙嶅鏍�</button>
+ <button type="button" id="Printing" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Printing">鎵撳嵃</button>
</div>
@@ -51,14 +56,14 @@
<div class="layui-col-xs3">
<label class="layui-form-label">浠诲姟鍗曞彿锛�</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HManagerName" id="HManagerName" autocomplete="off" disabled>
- <input id="HManagerID" name="HManagerID" type="hidden" />
+ <input class="layui-input" name="HICMOBillNo" id="HICMOBillNo" autocomplete="off" disabled>
+ <!--<input id="HICMOInterID" name="HICMOInterID" type="hidden" />-->
</div>
</div>
<div class="layui-col-xs3">
<label class="layui-form-label">杞﹂棿浠ｇ爜锛�</label>
<div class="layui-input-inline">
- <input type="text" name="HDeptNumber" id="HDeptNumber" lay-verify="HDeptID" readonly="readonly" autocomplete="off" class="layui-input">
+ <input type="text" name="HDeptNumber" id="HDeptNumber" lay-verify="HDeptID" readonly="readonly" autocomplete="off" class="layui-input">
</div>
</div>
</div>
@@ -70,133 +75,51 @@
<label class="layui-form-label">杞﹂棿锛�</label>
<div class="layui-input-inline">
<input type="text" name="HDeptName" id="HDeptName" lay-verify="HDeptName" autocomplete="off" class="layui-input">
-
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptID-BT">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- <input id="HDeptID" name="HDeptID" type="hidden" />
-
+
+ <button type="button" id="HDeptID-BT" lay-submit="" class="layui-btn" lay-filter="HDeptID-BT">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <input id="HDeptID" name="HDeptID" type="hidden" />
+
</div>
</div>
- <!--<div class="layui-col-xs1">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptID-BT">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>-->
+
<!--<div class="layui-col-xs3">
- <label class="layui-form-label"> 鍐呴儴鍗曟嵁鍙凤細</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HSupName" lay-verify="HSupName" id="HSupName" readonly="readonly" autocomplete="off">
- <input id="HSupID" name="HSupID" type="hidden" />
- </div>
- </div>-->
- <!--<div class="layui-col-xs3">
- <label class="layui-form-label"> 浜у搧浠ｇ爜锛�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HMateriaNumber" lay-verify="HMateriaNumber" id="HMateriaNumber" readonly="readonly" autocomplete="off">
-
- </div>
- </div>
- <div class="layui-col-xs3">
- <label class="layui-form-label"> 浜у搧锛�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HMateriaName" lay-verify="HMateriaName" id="HMateriaName" readonly="readonly" autocomplete="off">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HMateriaID-BT">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
- </div>-->
-
-
- </div>
- </div>
-
- <div class="layui-form-item">
- <div class="layui-row">
- <!--<div class="layui-col-xs3">
- <label class="layui-form-label"> 鍗曚綅浠ｇ爜锛�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HDHNumber" lay-verify="HDHNumber" id="HDHNumber">
- </div>
- </div>
-
- <div class="layui-col-xs3">
- <label class="layui-form-label"> 鍗曚綅锛�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HDHName" lay-verify="HDHName" id="HDHName">
-
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HUnitID-BT">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
- </div>-->
-
- <div class="layui-col-xs3">
- <label class="layui-form-label"> 瑙勬牸鍨嬪彿锛�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HDHDate" lay-verify="HDHDate" id="HDHDate">
- </div>
- </div>
-
- </div>
- </div>
-
- <div class="layui-form-item">
- <div class="layui-row">
- <!--<div class="layui-col-xs3">
- <label class="layui-form-label">宸ュ簭璁″垝鍗曞彿锛�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HStatus" id="HStatus" autocomplete="off">
- </div>
- </div>-->
+ <label class="layui-form-label"> 瑙勬牸鍨嬪彿锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HDHDate" lay-verify="HDHDate" id="HDHDate">
+ </div>
+ </div>-->
<div class="layui-col-xs3">
<label class="layui-form-label"> 璁″垝寮�宸ユ棩鏈燂細</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HPlanBeginDate" lay-verify="HPlanBeginDate" id="HPlanBeginDate" autocomplete="off">
-
+ <input class="layui-input" name="HPlanBeginDate" lay-verify="HPlanBeginDate" id="HPlanBeginDate" autocomplete="off">
+
</div>
</div>
+
<div class="layui-col-xs3">
<label class="layui-form-label"> 璁″垝瀹屽伐鏃ユ湡锛�</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HPlanEndDate" lay-verify="HPlanEndDate" id="HPlanEndDate" autocomplete="off">
-
+ <input class="layui-input" name="HPlanEndDate" lay-verify="HPlanEndDate" id="HPlanEndDate" autocomplete="off">
+
</div>
</div>
-
- </div>
- </div>
- <div class="layui-form-item">
- <div class="layui-row">
- <!--<div class="layui-col-xs3">
- <label class="layui-form-label">宸ュ簭锛�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HStatus" id="HStatus" autocomplete="off">
- </div>
- </div>-->
<div class="layui-col-xs3">
<label class="layui-form-label"> 姹囨姤鏁伴噺锛�</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HPlanQty" lay-verify="HPlanQty" id="HPlanQty" autocomplete="off">
- <!--<input id="HSupID" name="HSupID" type="hidden" />-->
+ <input class="layui-input" name="HPlanQty" lay-verify="HPlanQty" id="HPlanQty" autocomplete="off">
</div>
</div>
- <!--<div class="layui-col-xs3">
- <label class="layui-form-label"> 鎬诲伐鏃讹細</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HDeptName" lay-verify="HDeptName" id="HDeptName" readonly="readonly" autocomplete="off">
- <input id="HDeptID" name="HDeptID" type="hidden" />
- </div>
- </div>-->
-
+
</div>
</div>
<div class="layui-form-item">
<div class="layui-row">
-
- <div class="layui-col-xs6">
+
+ <div class="layui-col-xs8">
<label class="layui-form-label"> 澶� 娉細</label>
<div class="layui-input-block">
<input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
@@ -205,67 +128,80 @@
</div>
</div>
</div>
- <div class="layui-tab-item">
- <div class="layui-form-item">
- <div class="layui-row">
- <div class="layui-col-xs3">
- <label class="layui-form-label">鍒� 鍗� 浜猴細</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HMaker" id="HMaker" readonly="readonly" autocomplete="off">
- <input type="hidden" name="HEmpID" id="HEmpID" autocomplete="off" class="layui-input">
+ <div class="layui-tab-item">
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label">鍒� 鍗� 浜猴細</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HMaker" id="HMaker" readonly="readonly" autocomplete="off">
+ <input type="hidden" name="HEmpID" id="HEmpID" autocomplete="off" class="layui-input">
- </div>
- </div>
- <div class="layui-col-xs3">
- <label class="layui-form-label">瀹� 鏍� 浜猴細</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HChecker" id="HChecker" readonly="readonly" autocomplete="off">
- </div>
- </div>
- <div class="layui-col-xs3">
- <label class="layui-form-label">鍙� 鏇� 浜猴細</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HUpDater" id="HUpDater" readonly="readonly" autocomplete="off">
- </div>
- </div>
</div>
</div>
- <div class="layui-form-item">
- <div class="layui-row">
- <div class="layui-col-xs3">
- <label class="layui-form-label">鍒跺崟鏃ユ湡锛�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HMakeDate" id="HMakeDate" readonly="readonly" autocomplete="off">
- </div>
- </div>
- <div class="layui-col-xs3">
- <label class="layui-form-label">瀹℃牳鏃ユ湡锛�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HCheckDate" id="HCheckDate" readonly="readonly" autocomplete="off">
- </div>
- </div>
- <div class="layui-col-xs3">
- <label class="layui-form-label">鍙樻洿鏃ユ湡锛�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HUpDateDate" id="HUpDateDate" readonly="readonly" autocomplete="off">
- </div>
- </div>
+ <div class="layui-col-xs3">
+ <label class="layui-form-label">瀹� 鏍� 浜猴細</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HChecker" id="HChecker" readonly="readonly" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-col-xs3">
+ <label class="layui-form-label">淇敼浜猴細</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HUpDater" id="HUpDater" readonly="readonly" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-col-xs3">
+ <label class="layui-form-label">鍏抽棴浜猴細</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HCloseMan" id="HCloseMan" readonly="readonly" autocomplete="off">
</div>
</div>
</div>
-
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label">鍒跺崟鏃ユ湡锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HMakeDate" id="HMakeDate" readonly="readonly" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-col-xs3">
+ <label class="layui-form-label">瀹℃牳鏃ユ湡锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HCheckDate" id="HCheckDate" readonly="readonly" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-col-xs3">
+ <label class="layui-form-label">淇敼鏃ユ湡锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HUpDateDate" id="HUpDateDate" readonly="readonly" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-col-xs3">
+ <label class="layui-form-label">鍏抽棴鏃ユ湡锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HCloseDate" id="HCloseDate" readonly="readonly" autocomplete="off">
+ </div>
+ </div>
+ </div>
</div>
</div>
+
+ </div>
+ </div>
</div>
<blockquote class="layui-elem-quote">宸ュ簭娲惧伐鍗�</blockquote>
<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-add"><i class="layui-icon layui-icon-addition"></i>鎷嗗垎</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-del"><i class="layui-icon layui-icon-subtraction"></i>鍒犺</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-del"><i class="layui-icon layui-icon-subtraction"></i>鍒犺</button>-->
</div>
</script>
-
+
+
</form>
</div>
</div>
@@ -276,6 +212,7 @@
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script>
+
function getUrlVars() {
var vars = [], hash;
var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
@@ -291,13 +228,49 @@
var lentryid = params[params[1]];
var PlanBeginDate = params[params[2]];
var PlanEndDate = params[params[3]];
- alert(HInterID + '绗簩涓細' + lentryid);
+ alert("鐪嬬湅" + HInterID + "lentryid" + lentryid);
var date = new Date();
var day = date.getDate();
var month = date.getMonth() + 1;
var year = date.getFullYear();
var shijian = year + "-" + month + "-" + day;
- //鑾峰彇鍗曟嵁鍙�
+ var CurUserName;
+ if (typeof (lentryid) == "undefined") {
+ $('#HDeptID-BT').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#HRemark').addClass("layui-btn-disabled").attr("disabled", true);
+ $.ajax({
+ url: GetWEBURL() + "/Sc_ProcessMangement/MES_DetailSc_ProcessReportList_Json",
+ type: "GET",
+ data: { "HInterID": parseInt( HInterID) },
+ success: function (data1) {
+ if (data1.count == 1) {
+ $("#HInterID").val(data1.data[0].HInterID);//
+ $("#HBillNo").val(data1.data[0].HBillNo);//
+ $("#HDate").val(data1.data[0].HDate);
+ $("#HDeptName").val(data1.data[0].HName);
+ $("#HDeptNumber").val(data1.data[0].HNumber);
+ $("#HICMOBillNo").val(data1.data[0].HICMOBillNo);
+ $("#HRemark").val(data1.data[0].HRemark);
+ $("#HPlanQty").val(data1.data[0].HPlanQty);
+ $("#HMaker").val(data1.data[0].HMaker);
+ $("#HMakeDate").val(data1.data[0].HMakeDate);
+ $("#HChecker").val(data1.data[0].HChecker);
+ $("#HCheckDate").val(data1.data[0].HCheckDate);
+ $("#HUpDater").val(data1.data[0].HUpDater);
+ $("#HUpDateDate").val(data1.data[0].HUpDateDate);
+ $("#HCloseMan").val(data1.data[0].HCloseMan);
+ $("#HCloseDate").val(data1.data[0].HCloseDate);
+ } else {
+ layer.msg(data1.Message);
+ }
+
+ }, error: function () {
+ layer.alert("鑾峰彇鏁版嵁澶辫触!", { icon: 5 });
+ }
+ });
+ } else {
+ //鑾峰彇鍗曟嵁鍙�
$.ajax({
url: GetWEBURL() + "/api/newBill/getNewInterBillNo",
type: "GET",
@@ -313,6 +286,8 @@
layer.alert("鑾峰彇鍗曟嵁鍙峰け璐�!", { icon: 5 });
}
});
+ }
+
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -330,6 +305,8 @@
$("#HMaker").val(sessionStorage["HUserName"]);//鍒跺崟浜�
$("#HEmpID").val(sessionStorage["HEmpID"]);
+ CurUserName = sessionStorage["HUserName"];
+
//鎵ц涓�涓猯aydate瀹炰緥
laydate.render({
@@ -338,19 +315,25 @@
//鍔犺浇璁″垝鍗曚笅鎺ㄧ殑鏁版嵁
+ if (typeof (lentryid) == "undefined") {
+
+ RoadHBillSub2();
+ } else {
+
RoadHBillSub();
+ }
table.render({
elem: '#mainTable'
- //, url: GetWEBURL()+'GetNewPOInStockShowBillSub'
, toolbar: '#toolbarDemo'
- //, where: { sMsg: linterid, sMsg2: lentryid, sMsg3: lSourceBillType }
- // , where: { sMsg: '28', sMsg2: '28,5;' }
+ , limit: 1000
+ , totalRow: true
, cols: [[
- { type: 'checkbox' }
+ { type: 'checkbox', totalRowText: '鍚堣琛�' }
+ , { type: 'numbers', title: '搴忓彿' }
,{ field: 'hmainid', title: 'hmainid', sort: true, fixed: true, hide: true }
,{ field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 120 }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 170 }
- , { field: '鏁伴噺', title: '鏁伴噺', width: 100, edit: 'text', event: "inputHPlanQty" }
+ , { field: '鏁伴噺', title: '鏁伴噺', width: 100, edit: 'text', event: "inputHPlanQty", totalRow: true }
, { field: 'HDeptID ', title: 'HDeptID', width: 105 }
, { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜' }
, { field: '閮ㄩ棬', title: '閮ㄩ棬' }
@@ -362,21 +345,16 @@
, { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 160 }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 160 }
, { field: 'HprocID ', title: 'HprocID', width: 215 }
- ////, { field: 'hunitid', title: 'hunitid' }
, { field: '宸ュ簭浠ｇ爜 ', title: '宸ュ簭浠ｇ爜 ', width: 115 }
, { field: '宸ュ簭', title: '宸ュ簭' }
- ////, { field: 'hempid', title: 'hempid' }
, { field: 'HGroupID ', title: 'HGroupID', width: 100 }
, { field: '鐝粍浠ｇ爜', title: '鐝粍浠ｇ爜' }
, { field: '鐝粍鍚嶇О', title: '鐝粍鍚嶇О' }
, { field: 'HSourceID', title: 'HSourceID' }
, { field: '璧勬簮浠ｇ爜', title: '璧勬簮浠ｇ爜' }
- ////, { field: 'HCenterID', title: 'HCenterID' }
, { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮' }
, { field: 'HWorkerID ', title: 'HWorkerID' }
- ////, { field: 'hbomid', title: 'hbomid' }
, { field: '鑱屽憳浠ｇ爜', title: '鑱屽憳浠ｇ爜' }
- ////, { field: 'HRoutingInterID', title: 'HRoutingInterID' }
, { field: '鑱屽憳 ', title: '鑱屽憳' }
, { field: 'hsubid', title: 'hsubid', hide: true }
, { field: '璁″垝寮�宸ユ棩鏈�', title: '璁″垝寮�宸ユ棩鏈�' }
@@ -387,7 +365,6 @@
, { field: '鐢熶骇浠诲姟鍗曞彿', title: '鐢熶骇浠诲姟鍗曞彿' }
, { field: 'HSeOrderInterID', title: 'HSeOrderInterID' }
, { field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿' }
- ////, { field: 'hsubid', title: 'hsubid' }
, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
, { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
, { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡' }
@@ -407,12 +384,7 @@
, { field: 'HBillType', title: 'HBillType' }
, { field: 'HQtyDecimal', title: 'HQtyDecimal' }
, { field: 'HPriceDecimal', title: 'HPriceDecimal' }
-
]]
- // , data: [linterid]
- // , page: true
- , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
- //, height: 500
, done: function () {
layer.closeAll("loading");
}
@@ -454,8 +426,34 @@
}
});
};
+ //鍔犺浇鏄剧ず鏁版嵁
+ function RoadHBillSub2() {
+ $.ajax({
+ url: GetWEBURL() + '/Sc_ProcessMangement/MES_h_v_Sc_ProcessSendWorkList_Json',
+ type: "GET",
+ data: {
+ "HInterID": parseInt(HInterID)
+ },
+ success: function (result) {
+ console.log(result);
+ //$("#HBillNo").val(result.data[0].HInterID);
+ ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
+ table.reload('mainTable', {
+ data: ajaxReturnData
+ , loading: false
+ , done: function (index, res) {
+ layer.closeAll("loading");
+ }
+ });
+
+ },
+ error: function (result) {
+ console.log(result);
+ }
+ });
+ };
+ //淇濆瓨
form.on('submit(Saver)', function (data) {//淇濆瓨
- //debugger;
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
@@ -486,17 +484,144 @@
}
});
});
- function f_alert(sMsg) {
- layer.alert(sMsg, { icon: 5 });
-
- }
+
-
- form.on('submit(Exit)', function (data) {//淇濆瓨
+ form.on('submit(Exit)', function (data) {//閫�鍑�
var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
parent.layer.close(index); //鍐嶆墽琛屽叧闂�
});
+ //鍏抽棴
+ form.on('submit(Closeing)', function (data) {//
+ //debugger;
+ $.ajax(
+ {
+ type: "GET",
+ url: GetWEBURL()+"CloseProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: {
+ "HInterID": parseInt(HInterID)
+ , "IsClose": 0
+ ,"CurUserName":CurUserName
+ },
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { icon: 1 });
+ $('#').addClass("layui-btn-disabled").attr("disabled",true);
+ }
+ else {
+
+ f_alert(data.Message);
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+
+ f_alert("閿欒:" + err);
+ }
+ });
+ });
+ //鍙嶅叧闂�
+ form.on("submit(BackClose)", function (data) {
+ layer.alert("鎴戞槸鍙嶅叧闂寜閽紒");
+ $.ajax(
+ {
+ type: "GET",
+ url: GetWEBURL()+"CloseProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: {
+ "HInterID": parseInt(HInterID)
+ , "IsClose": 1
+ ,"CurUserName":CurUserName
+ },
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { icon: 1 });
+ $('#').addClass("layui-btn-disabled").attr("disabled",true);
+ }
+ else {
+
+ f_alert(data.Message);
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+
+ f_alert("閿欒:" + err);
+ }
+ });
+ });
+ //瀹℃牳Auditing
+ form.on("submit(Auditing)", function (data) {
+ layer.alert("鎴戞槸瀹℃牳鎸夐挳锛�");
+
+ $.ajax(
+ {
+ type: "GET",
+ url: GetWEBURL()+"AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: {
+ "HInterID": parseInt(HInterID)
+ , "IsAudit": 0
+ ,"CurUserName":CurUserName
+ },
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { icon: 1 });
+ $('#').addClass("layui-btn-disabled").attr("disabled",true);
+ }
+ else {
+
+ f_alert(data.Message);
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+
+ f_alert("閿欒:" + err);
+ }
+ });
+ });
+
+ //鍙嶅鏍窧ackAudit
+ form.on("submit(BackAudit)", function (data) {
+ layer.alert("鎴戞槸鍙嶅鏍告寜閽紒");
+ $.ajax(
+ {
+ type: "GET",
+ url: GetWEBURL()+"AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: {
+ "HInterID": parseInt(HInterID)
+ , "IsAudit": 1
+ ,"CurUserName":CurUserName
+ },
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { icon: 1 });
+ $('#').addClass("layui-btn-disabled").attr("disabled",true);
+ }
+ else {
+
+ f_alert(data.Message);
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+
+ f_alert("閿欒:" + err);
+ }
+ });
+
+ });
+
+ //鎵撳嵃Printing
+ form.on("submit(Printing)", function (data) {
+ layer.alert("鎴戞槸鎵撳嵃鎸夐挳锛佸崟鎹富ID鏄細" + HInterID);
+ window.open("../../views/鐢熶骇宸ュ簭绠＄悊/宸ュ簭姹囨姤鍗�/HBarPlanPrint.html?linterid=" + HInterID + "&Type=HProcessReport"+"&OpenTmp=姹囨姤鍗�");
+
+ });
+
+ function f_alert(sMsg) {
+ layer.alert(sMsg, { icon: 5 });
+
+ }
//閫夋嫨閮ㄩ棬
form.on('submit(HDeptID-BT)', function () {//閫夋嫨閮ㄩ棬
layer.open({
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_ProcessReportList.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_ProcessReportList.html"
index f67ac0c..a8aefcc 100644
--- "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_ProcessReportList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_ProcessReportList.html"
@@ -66,12 +66,12 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>-->
</div>
</script>
@@ -80,6 +80,11 @@
</div>
</div>
</div>
+ <script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="detail">鏌ョ湅</a>
+ <a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/Scripts/json2.js"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
@@ -103,17 +108,17 @@
var option = {
elem: '#mainTable'
- //, toolbar: '#toolbarDemo'
+ , toolbar: '#toolbarDemo'
,height: 'full-50'
, page: true
,cellMinWidth: 90
, cols: [[
//{ field: 'hmainid', title: 'hmainid', sort: true, width: 165 }
{ type: 'checkbox' }
+ ,{fixed: 'left', title:'鎿嶄綔', toolbar: '#barDemo', width:200}
, { field: 'hmainid ', title: 'hmainid', width: 105, sort: true, fixed: true, hide: true }
,{ field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 120 }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 170 }
-
, { field: 'HDeptID', title: '閮ㄩ棬ID', width: 115 }
, { field: '閮ㄩ棬', title: '閮ㄩ棬' }
, { field: 'HMaterID', title: 'HMaterID' }
@@ -166,7 +171,34 @@
//, { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�' }
]]
};
+ //鐩戝惉宸ュ叿鏉�
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event === 'detail') {
+ layer.msg('ID锛�' + data.hmainid + ' 鐨勬煡鐪嬫搷浣�'); //椤甸潰灞�
+ layer.open({
+ type: 2 //Page灞傜被鍨�
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅姹囨姤鍗�'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../宸ュ簭姹囨姤鍗�/Sc_Add_ProcessReportList.html?HInterID=' + data.hmainid, 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ });
+ } else if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
+ obj.del();
+ layer.close(index);
+ });
+ } else if (obj.event === 'edit') {
+ layer.alert('缂栬緫琛岋細<br>' + JSON.stringify(data))
+ }
+ });
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
var index0 = layer.load(0, { shade: false });
$.ajax({
@@ -197,6 +229,7 @@
$("#WorkCenter").val("");//鍗曟嵁鍙�
$("#btnSearch").click();
});
+
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
@@ -205,16 +238,16 @@
var HOrderProcNO = $("#HOrderProcNO").val();//璁㈠崟璺熻釜鍙�
var WorkCenter = $("#WorkCenter").val();//鍗曟嵁鍙�
if (HDate) {
- sWhere += " and HDate >= '" + HDate + "'";
+ sWhere += " and 鏃ユ湡 >= '" + HDate + "'";
}
if (HDate1) {
- sWhere += " and HDate <= '" + HDate1 + "'";
+ sWhere += " and 鏃ユ湡 <= '" + HDate1 + "'";
}
if (HOrderProcNO) {
sWhere += " and 璁㈠崟璺熻釜鍙� like '%" + HOrderProcNO + "%'";
}
if (WorkCenter) {
- sWhere += " and HBillNo like '%" + WorkCenter + "%'";
+ sWhere += " and 鍗曟嵁鍙� like '%" + WorkCenter + "%'";
}
var index = layer.load(0, { shade: false });
$.ajax({
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/xmlLBM_ProcessReport.aspx" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/xmlLBM_ProcessReport.aspx"
new file mode 100644
index 0000000..977170a
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/xmlLBM_ProcessReport.aspx"
@@ -0,0 +1,28 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_ProcessReport.aspx.cs" Inherits="WebTM.views.鐢熶骇宸ュ簭绠＄悊.宸ュ簭姹囨姤鍗�.xmlLBM_ProcessReport" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title></title>
+ <script runat="server">
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ //鈽呯壒鍒彁绀衡槄锛�
+ //涓嶅悓鐨勬暟鎹簱搴旇閫夌敤涓嶅悓鐨勬姤琛╔ML鏁版嵁鐢熸垚绫伙紝SQL Server鏁版嵁搴撶敤SqlXMLReportData锛孫racle鏁版嵁搴撶敤OracleXMLReportData
+ //OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
+
+ //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
+ //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
+ SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Sc_ProcessReportList where hmainid=" + Request.Params["linterid"]+ " order by 鐗╂枡浠ｇ爜");
+ }
+</script>
+</head>
+<body>
+ <form id="form1" runat="server">
+ <div>
+ </div>
+ </form>
+</body>
+</html>
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/xmlLBM_ProcessReport.aspx.cs" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/xmlLBM_ProcessReport.aspx.cs"
new file mode 100644
index 0000000..6d07c7d
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/xmlLBM_ProcessReport.aspx.cs"
@@ -0,0 +1,17 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace WebTM.views.鐢熶骇宸ュ簭绠＄悊.宸ュ簭姹囨姤鍗�
+{
+ public partial class xmlLBM_ProcessReport : System.Web.UI.Page
+ {
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+ }
+}
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/xmlLBM_ProcessReport.aspx.designer.cs" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/xmlLBM_ProcessReport.aspx.designer.cs"
new file mode 100644
index 0000000..c5c51e0
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/xmlLBM_ProcessReport.aspx.designer.cs"
@@ -0,0 +1,25 @@
+锘�//------------------------------------------------------------------------------
+// <auto-generated>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
+// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+
+namespace WebTM.views.鐢熶骇宸ュ簭绠＄悊.宸ュ簭姹囨姤鍗�
+{
+ public partial class xmlLBM_ProcessReport
+ {
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+ }
+}
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\264\276\345\267\245\345\215\225/Sc_Add_ProcessSendWork.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\264\276\345\267\245\345\215\225/Sc_Add_ProcessSendWork.html"
index 881a752..a72df17 100644
--- "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\264\276\345\267\245\345\215\225/Sc_Add_ProcessSendWork.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\264\276\345\267\245\345\215\225/Sc_Add_ProcessSendWork.html"
@@ -58,7 +58,7 @@
<div class="layui-col-xs3">
<label class="layui-form-label">杞﹂棿浠ｇ爜锛�</label>
<div class="layui-input-inline">
- <input type="text" name="HDeptID" id="HDeptID" lay-verify="HDeptID" readonly="readonly" autocomplete="off" class="layui-input">
+ <input type="text" name="HDeptNumber" id="HDeptNumber" lay-verify="HDeptNumber" readonly="readonly" autocomplete="off" class="layui-input">
</div>
</div>
</div>
@@ -74,62 +74,18 @@
<button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptID-BT">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
- <input id="HDeptNumber" name="HDeptNumber" type="hidden" />
+ <input id="HDeptID" name="HDeptID" type="hidden" />
</div>
</div>
- <!--<div class="layui-col-xs1">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptID-BT">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>-->
- <!--<div class="layui-col-xs3">
- <label class="layui-form-label"> 鍐呴儴鍗曟嵁鍙凤細</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HSupName" lay-verify="HSupName" id="HSupName" readonly="readonly" autocomplete="off">
- <input id="HSupID" name="HSupID" type="hidden" />
- </div>
- </div>-->
- <!--<div class="layui-col-xs3">
- <label class="layui-form-label"> 浜у搧浠ｇ爜锛�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HMateriaNumber" lay-verify="HMateriaNumber" id="HMateriaNumber" readonly="readonly" autocomplete="off">
-
- </div>
- </div>
- <div class="layui-col-xs3">
- <label class="layui-form-label"> 浜у搧锛�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HMateriaName" lay-verify="HMateriaName" id="HMateriaName" readonly="readonly" autocomplete="off">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HMateriaID-BT">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
- </div>-->
-
+
</div>
</div>
<div class="layui-form-item">
<div class="layui-row">
- <!--<div class="layui-col-xs3">
- <label class="layui-form-label"> 鍗曚綅浠ｇ爜锛�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HDHNumber" lay-verify="HDHNumber" id="HDHNumber">
- </div>
- </div>
-
- <div class="layui-col-xs3">
- <label class="layui-form-label"> 鍗曚綅锛�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HDHName" lay-verify="HDHName" id="HDHName">
-
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HUnitID-BT">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
- </div>-->
+
<div class="layui-col-xs3">
<label class="layui-form-label"> 瑙勬牸鍨嬪彿锛�</label>
@@ -143,12 +99,7 @@
<div class="layui-form-item">
<div class="layui-row">
- <!--<div class="layui-col-xs3">
- <label class="layui-form-label">宸ュ簭璁″垝鍗曞彿锛�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HStatus" id="HStatus" autocomplete="off">
- </div>
- </div>-->
+
<div class="layui-col-xs3">
<label class="layui-form-label"> 璁″垝寮�宸ユ棩鏈燂細</label>
<div class="layui-input-inline">
@@ -167,31 +118,7 @@
</div>
</div>
- <!--<div class="layui-form-item">
- <div class="layui-row">
- <div class="layui-col-xs3">
- <label class="layui-form-label">宸ュ簭锛�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HStatus" id="HStatus" autocomplete="off">
- </div>
- </div>
- <div class="layui-col-xs3">
- <label class="layui-form-label"> 鎬绘淳宸ユ暟閲忥細</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HSupName" lay-verify="HSupName" id="HSupName" readonly="readonly" autocomplete="off">
- <input id="HSupID" name="HSupID" type="hidden" />
- </div>
- </div>
- <div class="layui-col-xs3">
- <label class="layui-form-label"> 鎬诲伐鏃讹細</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HDeptName" lay-verify="HDeptName" id="HDeptName" readonly="readonly" autocomplete="off">
- <input id="HDeptID" name="HDeptID" type="hidden" />
- </div>
- </div>
-
- </div>
- </div>-->
+
<div class="layui-form-item">
<div class="layui-row">
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBill.html"
index 568d087..c72ed2e 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBill.html"
@@ -297,6 +297,8 @@
$("#HEmpID").val(sessionStorage["Czybm"]);
$("#HEmp").val(sessionStorage["HUserName"]);
$("#HMaker").val(sessionStorage["HUserName"]);
+ //娴佽浆鍗℃槸鍚︽壂鎻忔爣璁�
+ var HProcExchBillNoFlag = false;
//鑾峰彇鏈�澶у崟鎹彿
$.ajax({
@@ -355,6 +357,50 @@
"HDeptID": sessionStorage["HDeptID"],
"HDept": sessionStorage["HDept"]
});
+ $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+ $("#HBarCode").css("background-color", "#efefef4d");
+ HProcExchBillNoFlag = true;
+ layer.close(index);
+ }
+ else {
+ layer.close(index);
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+ });
+
+ //娴佹按鍙凤紙宸ュ簭鍙凤級鍥炶溅鏂规硶
+ $('#HProcNo').on('keydown', function (event) {
+ var sProcNo = $('#HProcNo').val();
+ var sBillNo = $('#HBarCode').val();
+ if (event.keyCode == 13) {
+ if (!HProcExchBillNoFlag) {
+ layer.msg("娴佽浆鍗℃病鏈夋壂鎻忥紝鎴栬�呮病鏈夋寜鍥炶溅閿紝璇锋壂鎻忔祦杞崱鎴栬�呭湪娴佽浆鍗℃枃鏈涓寜鍥炶溅閿紒");
+ return;
+ }
+ var index = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/Cj_StationInBill/txtHProcNo_KeyDown",
+ type: "GET",
+ data: { "sBillNo": sBillNo, "sProcNo": sProcNo },
+ success: function (result) {
+ if (result.count == 1) {
+ var data = result.data[0];
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "lngBillSubKey": data.hsubid,
+ "HProcName": data.宸ュ簭,
+ "HProcID": data.HProcID,
+ "HCenterName": data.宸ヤ綔涓績,
+ "HCenterID": data.HCenterID
+ });
+ $("#HProcNo").attr("readonly", "readonly");
+ $("#HProcNo").css("background-color", "#efefef4d");
layer.close(index);
}
else {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill.html"
index 18739d7..b90a557 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill.html"
@@ -78,7 +78,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">娴佹按鍙�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HProcNO" id="HProcNO" value="0">
+ <input type="text" class="layui-input" name="HProcNo" id="HProcNo">
</div>
</div>
</div>
@@ -324,12 +324,14 @@
$("#HEmpID").val(sessionStorage["Czybm"]);
$("#HEmp").val(sessionStorage["HUserName"]);
$("#HMaker").val(sessionStorage["HUserName"]);
+ //娴佽浆鍗℃槸鍚︽壂鎻忔爣璁�
+ var HProcExchBillNoFlag = false;
//鑾峰彇鏈�澶у崟鎹彿
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
- data: { "HBillType": '3791' },
+ data: { "HBillType": '3793' },
success: function (d) {
//console.log(d.data);
$("#HInterID").val(d.data[0].HInterID);
@@ -382,6 +384,50 @@
"HDeptID": sessionStorage["HDeptID"],
"HDept": sessionStorage["HDept"]
});
+ $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+ $("#HBarCode").css("background-color", "#efefef4d");
+ HProcExchBillNoFlag = true;
+ layer.close(index);
+ }
+ else {
+ layer.close(index);
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+ });
+
+ //娴佹按鍙凤紙宸ュ簭鍙凤級鍥炶溅鏂规硶
+ $('#HProcNo').on('keydown', function (event) {
+ var sProcNo = $('#HProcNo').val();
+ var sBillNo = $('#HBarCode').val();
+ if (event.keyCode == 13) {
+ if (!HProcExchBillNoFlag) {
+ layer.msg("娴佽浆鍗℃病鏈夋壂鎻忥紝鎴栬�呮病鏈夋寜鍥炶溅閿紝璇锋壂鎻忔祦杞崱鎴栬�呭湪娴佽浆鍗℃枃鏈涓寜鍥炶溅閿紒");
+ return;
+ }
+ var index = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/Cj_StationInBill/txtHProcNo_KeyDown",
+ type: "GET",
+ data: { "sBillNo": sBillNo, "sProcNo": sProcNo },
+ success: function (result) {
+ if (result.count == 1) {
+ var data = result.data[0];
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "lngBillSubKey": data.hsubid,
+ "HProcName": data.宸ュ簭,
+ "HProcID": data.HProcID,
+ "HCenterName": data.宸ヤ綔涓績,
+ "HCenterID": data.HCenterID
+ });
+ $("#HProcNo").attr("readonly", "readonly");
+ $("#HProcNo").css("background-color", "#efefef4d");
layer.close(index);
}
else {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
new file mode 100644
index 0000000..53fd57f
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
@@ -0,0 +1,639 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>宸ュ簭鍑虹珯姹囨姤鍗�</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <!--寮曠敤layui鏍峰紡鏂囦欢-->
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <!--寮曠敤layui js鏂囦欢-->
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <!--鑷畾涔夋牱寮�-->
+ <style>
+ .maintitle {
+ background-color: #1492ff;
+ color: #fff;
+ padding: 5px 10px;
+ border: none;
+ border-radius: 4px;
+ }
+
+ .title {
+ border-left: 4px solid #1492ff;
+ padding-left: 6px;
+ margin: 20px 10px 4px;
+ font-size: 16px;
+ color: #333;
+ }
+
+ .buttom_box_little {
+ width: 100px;
+ height: 36px;
+ color: #fff;
+ background-color: #1492ff;
+ border-radius: 4px;
+ border: none;
+ margin: 10px;
+ }
+ </style>
+</head>
+
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 15px;background-color: #efefef;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+ <div class="maintitle">宸ュ簭鍑虹珯姹囨姤</div>
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row">
+ <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鏉″舰鐮�</label>
+ <div class="layui-input-block" style="margin-left: 120px;width:46%;">
+ <input type="text" name="HBarCode" id="HBarCode" lay-verify="required" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="title">鍩烘湰淇℃伅</div>
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">娴佽浆鍗�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HInterID" id="HInterID">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">娴佹按鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HProcNo" id="HProcNo">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇鐝粍</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HGroupID" id="HGroupID" style="background-color:#efefef4d;width: 61%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+ </button>
+ <input type="hidden" value="0" name="HGroupID" id="HGroupID">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">褰撳墠宸ュ簭</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HProcName" id="HProcName" style="background-color:#efefef4d;width: 61%;display: inline-block;" readonly>
+ <input type="hidden" name="HProcID" id="HProcID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ヤ綔涓績</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HCenterName" id="HCenterName" style="background-color:#efefef4d;width: 61%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+ </button>
+ <input type="hidden" name="HCenterID" id="HCenterID" value="0">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">姹囨姤鏃堕棿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HStationOutTime" id="HStationOutTime" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜у搧浠ｇ爜</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 61%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鏍哥畻宸ュ簭</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HPayProcID" id="HPayProcID" style="background-color:#efefef4d;width: 61%;display: inline-block;" readonly>
+ <input type="hidden" value="0" name="HPayProcID" id="HPayProcID">
+ <input type="checkbox" name="checkboxHLastSubProc" id="checkboxHLastSubProc" title="杞笅宸ュ簭" lay-skin="primary" lay-filter="checkboxHLastSubProc">
+ <input type="hidden" value="false" name="HLastSubProc" id="HLastSubProc">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浜у搧鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HMaterID" id="HMaterID">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">璁㈠崟璺熻釜鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浠诲姟鍗�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HICMOInterID" id="HICMOInterID">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浠诲姟鍗曟暟閲�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HICMOQty" id="HICMOQty" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇璧勬簮</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 61%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+ </button>
+ <input type="hidden" value="0" name="HSourceID" id="HSourceID">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">妯＄┐鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMouldNum" id="HMouldNum" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍚堟牸鏁伴噺</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HQty" id="HQty" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鎶ュ簾鏁伴噺</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HWasterQty" id="HWasterQty" value="0" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">妫�楠屽憳</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HQCCheckName" id="HQCCheckName" style="background-color:#efefef4d;width: 61%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+ </button>
+ <input type="hidden" value="0" name="HQCCheckID" id="HQCCheckID">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">宸ユ椂</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HWorkTimes" id="HWorkTimes" value="0" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鎿嶄綔鍛�</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HEmpName" id="HEmpName" style="background-color:#efefef4d;width: 61%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+ </button>
+ <input type="hidden" value="0" name="HEmpID" id="HEmpID">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鎿嶄綔鍛�2</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HEmpName2" id="HEmpName2" style="background-color:#efefef4d;width: 61%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+ </button>
+ <input type="hidden" value="0" name="HEmpID2" id="HEmpID2">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鎿嶄綔鍛�3</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HEmpName3" id="HEmpName3" style="background-color:#efefef4d;width: 61%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+ </button>
+ <input type="hidden" value="0" name="HEmpID3" id="HEmpID3">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鎿嶄綔鍛�4</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HEmpName4" id="HEmpName4" style="background-color:#efefef4d;width: 61%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+ </button>
+ <input type="hidden" value="0" name="HEmpID4" id="HEmpID4">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鎿嶄綔鍛�5</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HEmpName5" id="HEmpName5" style="background-color:#efefef4d;width: 61%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+ </button>
+ <input type="hidden" value="0" name="HEmpID5" id="HEmpID5">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">璁惧娓呭崟</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HSourceNameList" id="HSourceNameList" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="" style="width: 85%;">
+ <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <textarea name="HRemark" id="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" class="layui-textarea"></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="title">鍏朵粬淇℃伅</div>
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">杩涚珯PNL鏁�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HPlanPieceQty" id="HPlanPieceQty" value="0" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">杩涚珯PCS鏁�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HPieceQty" id="HPieceQty" value="0" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鎶ュ簾PNL鏁�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HBadPNL" id="HBadPNL" value="0" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鎶樺集鍒�鏁�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HDSQty" id="HDSQty" value="0">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍝佽川纭浜�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" value="0" name="" id="">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">NCT鍐叉鏁�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HChongQty" id="HChongQty" value="0" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">NCT鍗曟</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="" id="">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">绉讳氦PNL鏁�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" value="0" name="HPlanQty" id="HPlanQty">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">绯绘暟</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HPriceRate" id="HPriceRate" value="0" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">濮斿宸ュ崟鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="" id="">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">涓嶈壇鏁伴噺</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" value="0" name="" id="">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇璧勬簮2</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HSourceName2" id="HSourceName2" style="background-color:#efefef4d;width: 61%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+ </button>
+ <input type="hidden" value="0" name="HSourceID2" id="HSourceID2">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇璧勬簮3</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HSourceName3" id="HSourceName3" style="background-color:#efefef4d;width: 61%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+ </button>
+ <input type="hidden" value="0" name="HSourceID3" id="HSourceID3">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇璧勬簮4</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="" id="" style="background-color:#efefef4d;width: 61%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+ </button>
+ <input type="hidden" value="0" name="" id="">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">妫�楠屽憳5</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="" id="" style="background-color:#efefef4d;width: 61%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+ </button>
+ <input type="hidden" value="0" name="" id="">
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layer-footer" style="text-align: center;">
+ <button type="button" lay-submit="" class="buttom_box_little" lay-filter="Saver">鎻愪氦</button>
+ <button type="button" class="buttom_box_little" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
+ </div>
+ <!--闅愯棌瀛楁-->
+ <input type="hidden" name="HMaker" id="HMaker">
+ <input type="hidden" name="lngBillKey" id="lngBillKey">
+ <input type="hidden" name="lngBillSubKey" id="lngBillSubKey">
+ </form>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element;
+ //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓�
+ $("#HBarCode").focus();
+ //娴佽浆鍗℃槸鍚︽壂鎻忔爣璁�
+ var HProcExchBillNoFlag = false;
+ //鍒濆鍩烘湰淇℃伅璧嬪��
+ $("#HStationOutTime").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
+ $("#HEmpID").val(sessionStorage["Czybm"]);
+ $("#HEmp").val(sessionStorage["HUserName"]);
+ $("#HMaker").val(sessionStorage["HUserName"]);
+
+ //鑾峰彇鏈�澶у崟鎹彿
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '3791' },
+ success: function (d) {
+ //console.log(d.data);
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ }
+ });
+
+ //鏉″舰鐮佸洖杞︽柟娉�
+ $('#HBarCode').on('keydown', function (event) {
+ var HBarCode = $('#HBarCode').val();
+ if (event.keyCode == 13) {
+ if (!HBarCode) {
+ layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+ return;
+ }
+ var index = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/Cj_StationEntrustInBill/txtHBarCode_KeyDown",
+ type: "GET",
+ data: { "HBarCode": HBarCode },
+ success: function (result) {
+ if (result.count == 1) {
+ var data = result.data[0];
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HICMOInterID": data.hicmointerid,
+ "HICMOBillNo": data.浠诲姟鍗曞彿,
+ "HMaterID": data.HMaterID,
+ "HMaterName": data.浜у搧,
+ "HMaterNumber": data.浜у搧浠ｇ爜,
+ "HMaterModel": data.瑙勬牸鍨嬪彿,
+ "HQty": 0,
+ "HPieceQty": data.娴佽浆鍗℃暟閲�,
+ "HPlanQty": data.娴佽浆鍗℃暟閲�,
+ "lngBillKey": data.hmainid,
+ "HProcExchBillNo": data.鍗曟嵁鍙�,
+ "HICMOQty": data.浠诲姟鍗曟暟閲�,
+ "HOrderProcNO": data.璁㈠崟璺熻釜鍙�
+ });
+ $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+ $("#HBarCode").css("background-color", "#efefef4d");
+ HProcExchBillNoFlag = true;
+ layer.close(index);
+ }
+ else {
+ layer.close(index);
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+ });
+
+ //娴佹按鍙凤紙宸ュ簭鍙凤級鍥炶溅鏂规硶
+ $('#HProcNo').on('keydown', function (event) {
+ var sProcNo = $('#HProcNo').val();
+ var sBillNo = $('#HBarCode').val();
+ if (event.keyCode == 13) {
+ if (!HProcExchBillNoFlag) {
+ layer.msg("娴佽浆鍗℃病鏈夋壂鎻忥紝鎴栬�呮病鏈夋寜鍥炶溅閿紝璇锋壂鎻忔祦杞崱鎴栬�呭湪娴佽浆鍗℃枃鏈涓寜鍥炶溅閿紒");
+ return;
+ }
+ var index = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/Cj_StationInBill/txtHProcNo_KeyDown",
+ type: "GET",
+ data: { "sBillNo": sBillNo, "sProcNo": sProcNo },
+ success: function (result) {
+ if (result.count == 1) {
+ var data = result.data[0];
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "lngBillSubKey": data.hsubid,
+ "HProcName": data.宸ュ簭,
+ "HProcID": data.HProcID,
+ "HCenterName": data.宸ヤ綔涓績,
+ "HCenterID": data.HCenterID
+ });
+ $("#HProcNo").attr("readonly", "readonly");
+ $("#HProcNo").css("background-color", "#efefef4d");
+ layer.close(index);
+ }
+ else {
+ layer.close(index);
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+ });
+
+ //鏄惁琚浆涓嬪伐搴�
+ form.on('checkbox(checkboxHLastSubProc)', function (data) {
+ $("#HLastSubProc").val(data.elem.checked);
+ });
+
+ //閫�鍑�-鍏抽棴椤甸潰鏂规硶
+ $('#Cancel').on('click', function () {
+ layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+ parent.layui.admin.events.closeThisTabs(); //鍏抽棴椤电
+ });
+ })
+
+ //鎻愪氦
+ form.on('submit(Saver)', function (data) {//鎻愪氦
+ //var tableData = data.field;
+ var oMain = data.field;
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Cj_StationOutBill/AddBill",
+ //url:"http://localhost:12761/Cj_StationEntrustOutBill/AddBill",
+ async: true,
+ data: { "oMain": oMain },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ //layer.confirm(data.Message, {
+ // icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
+ // btn2: function () {
+ // //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
+ // //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
+ // parent.location.href = "../../../views/index.html"
+ // }//鍏抽棴
+ //}, function () { window.location.reload(); });//鏂板
+ layer.close(index);
+ layer.msg("鎻愪氦鎴愬姛");
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ });
+
+ //閫夋嫨宸ュ簭
+ form.on('submit(btnSearchProc)', function () {
+ layer.msg('绂佹閫夋嫨');
+ //layer.open({
+ // type: 2
+ // , area: ['100%', '100%']
+ // , title: '浠撳簱鍒楄〃'
+ // , shade: 0.6 //閬僵閫忔槑搴�
+ // , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ // , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ // , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HWHID']
+ // , resize: false
+ // , cancel: function () {
+ // }
+ //})
+ });
+
+ //閫夋嫨渚涘簲鍟�
+ form.on('submit(btnSearchSup)', function () {
+ layer.msg('绂佹閫夋嫨');
+ });
+
+ //閫夋嫨浜у搧
+ form.on('submit(btnSearchMater)', function () {
+ layer.msg('绂佹閫夋嫨');
+ });
+
+ //浠ヤ笂涓簂ayui妯″潡
+ });
+
+ //杩斿洖宸ュ簭
+ function GetHProcValue(obj) {
+ $("#HProcName").val(obj[0].HName);
+ $("#HProcID").val(obj[0].HItemID);
+ }
+
+ </script>
+</body>
+</html>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
new file mode 100644
index 0000000..1c2fbcd
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
@@ -0,0 +1,189 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<title>宸ュ簭鍑虹珯姹囨姤鍗曞垪琛�</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span></span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage','laydate'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ var sWhere = "";
+
+ var option = {
+ elem: '#mainTable'
+ //, toolbar: '#toolbarDemo'
+ //,height: 'full-50'
+ , page: true
+ ,cellMinWidth: 90
+ , cols: [[
+ { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
+ , { field: '浠诲姟鍗�', title: '浠诲姟鍗�' }
+ , { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿' }
+ , { field: 'HProcID', title: 'HProcID', hide: true }
+ , { field: '褰撳墠宸ュ簭浠ｇ爜', title: '褰撳墠宸ュ簭浠ｇ爜' }
+ , { field: '褰撳墠宸ュ簭', title: '褰撳墠宸ュ簭' }
+ , { field: 'HMaterID', title: 'HMaterID', hide: true }
+ , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜' }
+ , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О' }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
+ , {
+ field: '鍑虹珯鏃堕棿', title: '鍑虹珯鏃堕棿', width: 105, templet: function (d) {
+ if (d.鍑虹珯鏃堕棿 == null) {
+ return "";
+ }
+ return util.toDateString(d.鍑虹珯鏃堕棿, "yyyy-MM-dd hh:mm:ss");
+ }
+ }
+ , { field: 'HEmpID', title: 'HEmpID', hide: true }
+ , { field: '鎿嶄綔鍛樹唬鐮�', title: '鎿嶄綔鍛樹唬鐮�' }
+ , { field: '鎿嶄綔鍛�', title: '鎿嶄綔鍛�' }
+ , { field: 'HSourceID', title: 'HSourceID', hide: true }
+ , { field: '鐢熶骇璧勬簮浠ｇ爜', title: '鐢熶骇璧勬簮浠ｇ爜' }
+ , { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮' }
+ , { field: 'HGroupID', title: 'HGroupID', hide: true }
+ , { field: '鐢熶骇鐝粍浠ｇ爜', title: '鐢熶骇鐝粍浠ｇ爜' }
+ , { field: '鐢熶骇鐝粍', title: '鐢熶骇鐝粍' }
+ , { field: 'LOT鏁伴噺', title: 'LOT鏁伴噺' }
+ , { field: '鎺ユ敹鏁伴噺', title: '鎺ユ敹鏁伴噺' }
+ ]]
+ };
+
+ var index = layer.load(0, { shade: false });
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ url: GetWEBURL() + '/Cj_StationOutBill/list',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.close(index);
+ } else {
+ layer.close(index);
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(index);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ $("#HBillNo").val("");
+ $("#btnSearch").click();
+ });
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ var HBillNo = $("#HBillNo").val();
+ if (HBillNo) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ }
+ $.ajax({
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+ url: GetWEBURL() + '/Cj_StationOutBill/list',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ });
+
+
+ //laydate.render({
+ // elem: '#HDate'
+ // , type: 'datetime'
+ // , trigger: 'click'
+ // , format:'yyyy-MM-dd HH:mm'
+ //});
+
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+
+
+
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
index 6480589..4d41f08 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
@@ -55,7 +55,7 @@
<div class="layui-row">
<label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鏉″舰鐮�</label>
<div class="layui-input-block" style="margin-left: 120px;width:46%;">
- <input type="text" name="" id="" lay-verify="required" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+ <input type="text" name="HBarCode" id="HBarCode" lay-verify="required" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
</div>
</div>
</div>
@@ -65,20 +65,20 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">娴佽浆鍗�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="" id="" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="" id="" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="" id="">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HInterID" id="HInterID">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">娴佹按鍙�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="" id="">
+ <input type="text" class="layui-input" name="HProcNo" id="HProcNo">
</div>
</div>
</div>
@@ -86,19 +86,23 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">娴佽浆鍗℃暟閲�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="" id="" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HPlanQty" id="HPlanQty" style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">褰撳墠宸ュ簭</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="" id="" style="background-color:#efefef4d;" readonly>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">褰撳墠宸ュ簭</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HProcName" id="HProcName" style="background-color:#efefef4d;width: 61%;display: inline-block;" readonly>
+ <input type="hidden" name="HProcID" id="HProcID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+ </button>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="" id="">
+ <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -106,27 +110,23 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ヤ綔涓績</label>
<div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" name="" id="" style="background-color:#efefef4d;width: 61%;display: inline-block;" readonly>
- <input type="hidden" name="" id="" value="0">
+ <input type="text" class="layui-input" name="HCenterName" id="HCenterName" style="background-color:#efefef4d;width: 61%;display: inline-block;" readonly>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
</button>
+ <input type="hidden" name="HCenterID" id="HCenterID" value="0">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鎺ユ敹鏁伴噺</label>
- <div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" name="" id="" style="background-color:#efefef4d;width: 61%;display: inline-block;" readonly>
- <input type="hidden" name="" id="">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchSup" id="btnSearchSup" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
- </button>
+ <label class="layui-form-label" style="width: 85px;">鎺ユ敹鏁伴噺</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HQty" id="HQty" value="0">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜у搧浠ｇ爜</label>
<div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" name="" id="" style="background-color:#efefef4d;width: 61%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 61%;display: inline-block;" readonly>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
</button>
@@ -136,22 +136,25 @@
<div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鎺ユ敹浜�</label>
- <div class="layui-input-block" style="margin-left: 104px;">
- <input type="text" class="layui-input" name="" id="" value="16" style="background-color:#efefef4d;width: 80%;display: inline-block;" readonly>
- <span>%</span>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HEmpID" id="HEmpID" style="background-color:#efefef4d;width: 61%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+ </button>
+ <input type="hidden" value="0" name="HEmpID" id="HEmpID">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">浜у搧鍚嶇О</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="" id="" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="" id="">
+ <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HMaterID" id="HMaterID">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">璁㈠崟璺熻釜鍙�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="" id="">
+ <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -159,19 +162,24 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">杩涚珯鏃堕棿</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="" id="" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HStationInTime" id="HStationInTime" style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">浠诲姟鍗�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="" id="" value="0">
+ <input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HICMOInterID" id="HICMOInterID">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鐢熶骇鐝粍</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="" id="">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇鐝粍</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HGroupID" id="HGroupID" style="background-color:#efefef4d;width: 61%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+ </button>
+ <input type="hidden" value="0" name="HGroupID" id="HGroupID">
</div>
</div>
</div>
@@ -179,13 +187,17 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">浠诲姟鍗曟暟閲�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="" id="" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HICMOQty" id="HICMOQty" style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鐢熶骇璧勬簮</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="" id="">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇璧勬簮</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 61%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+ </button>
+ <input type="hidden" value="0" name="HSourceID" id="HSourceID">
</div>
</div>
</div>
@@ -198,11 +210,56 @@
</div>
</div>
</div>
+ <div class="title">鍏朵粬淇℃伅</div>
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">1</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="" id="" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鎺ユ敹浠舵暟</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HPieceQty" id="HPieceQty" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">1</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="" id="" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">1</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="" id="">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">1</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" value="0" name="" id="">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">1</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="" id="" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" value="0" name="" id="">
+ </div>
+ </div>
+ </div>
+ </div>
<div class="layer-footer" style="text-align: center;">
<button type="button" lay-submit="" class="buttom_box_little" lay-filter="Saver">鎻愪氦</button>
<button type="button" class="buttom_box_little" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
</div>
<!--闅愯棌瀛楁-->
+ <input type="hidden" name="lngICMOEntryID" id="lngICMOEntryID">
<input type="hidden" name="lngBillKey" id="lngBillKey">
<input type="hidden" name="lngBillSubKey" id="lngBillSubKey">
<input type="hidden" name="HMaker" id="HMaker"><!--鍒跺崟浜�-->
@@ -225,9 +282,10 @@
, element = layui.element;
//杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓�
$("#HBarCode").focus();
-
+ //娴佽浆鍗℃槸鍚︽壂鎻忔爣璁�
+ var HProcExchBillNoFlag = false;
//鍒濆鍩烘湰淇℃伅璧嬪��
- $("#HStationOutTime").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
+ $("#HStationInTime").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
$("#HEmpID").val(sessionStorage["Czybm"]);
$("#HEmp").val(sessionStorage["HUserName"]);
$("#HMaker").val(sessionStorage["HUserName"]);
@@ -236,7 +294,7 @@
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
- data: { "HBillType": '3791' },
+ data: { "HBillType": '3790' },
success: function (d) {
//console.log(d.data);
$("#HInterID").val(d.data[0].HInterID);
@@ -261,34 +319,65 @@
if (result.count == 1) {
var data = result.data[0];
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HICMOBillNo": data.浠诲姟鍗曞彿,
"HICMOInterID": data.hicmointerid,
+ "lngICMOEntryID": data.lngICMOEntryID,
+ "HICMOBillNo": data.浠诲姟鍗曞彿,
"HMaterID": data.HMaterID,
"HMaterName": data.浜у搧,
"HMaterNumber": data.浜у搧浠ｇ爜,
"HMaterModel": data.瑙勬牸鍨嬪彿,
- "HQty": 0,
- "HPieceQty": data.鐢熶骇鏁伴噺,
- "HPlanQty": data.鐢熶骇鏁伴噺,
- "lngBillSubKey": data.HSubID,
- "lngBillKey": data.HMainID,
+ "HPieceQty": data.娴佽浆鍗℃暟閲�,
+ "HPlanQty": data.娴佽浆鍗℃暟閲�,
"HProcExchBillNo": data.鍗曟嵁鍙�,
"HICMOQty": data.浠诲姟鍗曟暟閲�,
+ "lngBillKey": data.hmainid,
"HOrderProcNO": data.璁㈠崟璺熻釜鍙�,
- "HStationInTime": Format(new Date(), "yyyy-MM-dd hh:mm:ss"),
- "HMoney": 0,
- //"HProcID": data.HProcID,
- //"HProcNo": data.宸ュ簭鍙�,
- //"HProcName": data.宸ュ簭,
- "HSupID": data.HSupID,
- "HSup": data.渚涘簲鍟�,
- "HSourceID": data.HSourceID,
- "HSource": data.鐢熶骇璧勬簮,
- "HGroupID": data.HGroupID,
- "HGroup": data.鐝粍,
- "HDeptID": sessionStorage["HDeptID"],
- "HDept": sessionStorage["HDept"]
+ "HQty": 0,
});
+ $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+ $("#HBarCode").css("background-color", "#efefef4d");
+ HProcExchBillNoFlag = true;
+ layer.close(index);
+ }
+ else {
+ layer.close(index);
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+ });
+
+ //娴佹按鍙凤紙宸ュ簭鍙凤級鍥炶溅鏂规硶
+ $('#HProcNo').on('keydown', function (event) {
+ var sProcNo = $('#HProcNo').val();
+ var sBillNo = $('#HBarCode').val();
+ if (event.keyCode == 13) {
+ if (!HProcExchBillNoFlag) {
+ layer.msg("娴佽浆鍗℃病鏈夋壂鎻忥紝鎴栬�呮病鏈夋寜鍥炶溅閿紝璇锋壂鎻忔祦杞崱鎴栬�呭湪娴佽浆鍗℃枃鏈涓寜鍥炶溅閿紒");
+ return;
+ }
+ var index = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/Cj_StationInBill/txtHProcNo_KeyDown",
+ type: "GET",
+ data: { "sBillNo": sBillNo, "sProcNo": sProcNo },
+ success: function (result) {
+ if (result.count == 1) {
+ var data = result.data[0];
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "lngBillSubKey": data.hsubid,
+ "HProcName": data.宸ュ簭,
+ "HProcID": data.HProcID,
+ "HCenterName": data.宸ヤ綔涓績,
+ "HCenterID": data.HCenterID
+ });
+ $("#HProcNo").attr("readonly", "readonly");
+ $("#HProcNo").css("background-color", "#efefef4d");
layer.close(index);
}
else {
@@ -318,7 +407,7 @@
var index = layer.load();
$.ajax({
type: "POST",
- url: GetWEBURL() + "/Cj_StationEntrustOutBill/AddBill",
+ url: GetWEBURL() + "/Cj_StationInBill/AddBill",
//url:"http://localhost:12761/Cj_StationEntrustOutBill/AddBill",
async: true,
data: { "oMain": oMain },
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
index 16dd14d..23150fa 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<title>濮斿宸ュ簭鎺ユ敹鍗曞垪琛�</title>
+<title>宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛�</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -73,57 +73,52 @@
, element = layui.element
, laypage = layui.laypage
, laydate = layui.laydate
+ , util = layui.util
var sWhere = "";
var option = {
elem: '#mainTable'
//, toolbar: '#toolbarDemo'
- ,height: 'full-50'
+ //,height: 'full-50'
, page: true
,cellMinWidth: 90
, cols: [[
{ field: 'hmainid', title: 'hmainid', sort: true, hide: true }
- , { field: '鏃ユ湡', title: '鏃ユ湡' }
- , { field: '璁㈠崟璺熻釜鍙�', title: '璁㈠崟璺熻釜鍙�' }
- , { field: '閫佽揣鍗曞彿', title: '閫佽揣鍗曞彿' }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
- , { field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�' }
- , { field: '娴佽浆鍗″彿', title: '娴佽浆鍗″彿' }
- , { field: 'HSupID', title: 'HSupID', hide: true }
- , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�' }
- , { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }
+ , { field: '浠诲姟鍗�', title: '浠诲姟鍗�' }
+ , { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿' }
+ , { field: 'HProcID', title: 'HProcID', hide: true }
+ , { field: '褰撳墠宸ュ簭浠ｇ爜', title: '褰撳墠宸ュ簭浠ｇ爜' }
+ , { field: '褰撳墠宸ュ簭', title: '褰撳墠宸ュ簭' }
, { field: 'HMaterID', title: 'HMaterID', hide: true }
, { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜' }
, { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О' }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
- , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅' }
- , { field: '娴佹按鍙�', title: '娴佹按鍙�' }
- , { field: 'HProcID', title: 'HProcID', hide: true }
- , { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜' }
- , { field: '宸ュ簭', title: '宸ュ簭' }
- , { field: '鎺ユ敹鍚堟牸鏁伴噺', title: '鎺ユ敹鍚堟牸鏁伴噺' }
- , { field: '鎺ユ敹涓嶅悎鏍兼暟閲�', title: '鎺ユ敹涓嶅悎鏍兼暟閲�' }
- , { field: '鍚◣鍗曚环', title: '鍚◣鍗曚环' }
- , { field: '鍚◣閲戦', title: '鍚◣閲戦' }
- , { field: '鍏宠仈閲戦', title: '鍏宠仈閲戦' }
- , { field: '鎺ユ敹鏃堕棿', title: '鎺ユ敹鏃堕棿' }
- , { field: '澶囨敞', title: '澶囨敞' }
- , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
- , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡' }
- , { field: '淇敼浜�', title: '淇敼浜�' }
- , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡' }
- , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�' }
- , { field: 'HDeptID', title: 'HDeptID', hide: true }
- , { field: '閮ㄩ棬', title: '閮ㄩ棬' }
- , { field: 'Hsubid', title: 'Hsubid', hide: true }
- , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' }
+ , {
+ field: '杩涚珯鏃堕棿', title: '杩涚珯鏃堕棿', width: 105, templet: function (d) {
+ if (d.杩涚珯鏃堕棿 == null) {
+ return "";
+ }
+ return util.toDateString(d.杩涚珯鏃堕棿, "yyyy-MM-dd hh:mm:ss");
+ }
+ }
+ , { field: 'HEmpID', title: 'HEmpID', hide: true }
+ , { field: '鎿嶄綔鍛樹唬鐮�', title: '鎿嶄綔鍛樹唬鐮�' }
+ , { field: '鎿嶄綔鍛�', title: '鎿嶄綔鍛�' }
+ , { field: 'HSourceID', title: 'HSourceID', hide: true }
+ , { field: '鐢熶骇璧勬簮浠ｇ爜', title: '鐢熶骇璧勬簮浠ｇ爜' }
+ , { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮' }
+ , { field: 'HGroupID', title: 'HGroupID', hide: true }
+ , { field: '鐢熶骇鐝粍浠ｇ爜', title: '鐢熶骇鐝粍浠ｇ爜' }
+ , { field: '鐢熶骇鐝粍', title: '鐢熶骇鐝粍' }
+ , { field: 'LOT鏁伴噺', title: 'LOT鏁伴噺' }
+ , { field: '鎺ユ敹鏁伴噺', title: '鎺ユ敹鏁伴噺' }
]]
};
var index = layer.load(0, { shade: false });
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
- url: GetWEBURL() + '/Cj_StationEntrustOutBill/list',
+ url: GetWEBURL() + '/Cj_StationInBill/list',
type: "GET",
data: { "sWhere": sWhere },
success: function (data1) {
@@ -155,7 +150,7 @@
}
$.ajax({
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
- url: GetWEBURL() + '/Cj_StationEntrustOutBill/list',
+ url: GetWEBURL() + '/Cj_StationInBill/list',
type: "GET",
data: { "sWhere": sWhere },
success: function (data1) {
--
Gitblit v1.9.1