From 93da8bbb14e874c54fa47c135a6036e711e8c691 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期四, 23 十二月 2021 15:43:18 +0800
Subject: [PATCH] 设备模具打印
---
WebTM/views/基础资料/公用基础资料/xmlLBM_MouldFileMainBill.aspx.designer.cs | 26 ++
WebTM/views/基础资料/公用基础资料/xmlLBM_MouldTypeBill.aspx | 2
WebTM/views/基础资料/基础资料/Gy_StockCheckItemEdit.html | 23 +-
WebTM/views/grf/cabinet-MZJ.grf | 154 ++++++++++++++
WebTM/views/基础资料/公用基础资料/xmlLBM_EquipFileMainBill.aspx | 28 ++
WebTM/views/生产管理/报工台工序/返工/Sc_Add_MESReturnStepWorkBillList.html | 84 +++++++
WebTM/views/设备管理/设备档案/Gy_EquipFileMainList.html | 50 ++++
WebTM/views/基础资料/公用基础资料/xmlLBM_EquipFileMainBill.aspx.designer.cs | 26 ++
WebTM/views/基础资料/公用基础资料/xmlLBM_EquipFileMainBill.aspx.cs | 17 +
WebTM/views/基础资料/公用基础资料/xmlLBM_MouldFileMainBill.aspx.cs | 17 +
WebTM/views/基础资料/公用基础资料/xmlLBM_MouldFileMainBill.aspx | 28 ++
WebTM/views/基础资料/公用基础资料/HBarPlanPrint.html | 6
WebTM/views/grf/cabinet-SB.grf | 154 ++++++++++++++
WebTM/WebTM.csproj | 18 +
14 files changed, 615 insertions(+), 18 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index b106070..b196b34 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -169,6 +169,8 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鍣ㄥ叿鏀瑰埗鍏ュ簱鍗�.grf" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鍣ㄥ叿鏀瑰埗鍑哄簱鍗�.grf" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鍣ㄥ叿閲囪喘鍏ュ簱鍗�.grf" />
+ <Content Include="views\grf\cabinet-MZJ.grf" />
+ <Content Include="views\grf\cabinet-SB.grf" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
@@ -574,6 +576,7 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_EquipMent.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_WorkCenter.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Currency.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipFileMainBill.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipMaintainBill.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipMaintainPlanBill.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipTypeBill.aspx" />
@@ -581,6 +584,7 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_DepartmentList.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldDotCheckBill.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldDotCheckPlanBill.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldFileMainBill.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldMaintainBill.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldMaintainPlanBill.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldProdInStockBill.aspx" />
@@ -956,6 +960,13 @@
<Compile Include="App_Data\MssqlReportData.cs" />
<Compile Include="App_Data\ReportData.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipFileMainBill.aspx.cs">
+ <DependentUpon>xmlLBM_EquipFileMainBill.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipFileMainBill.aspx.designer.cs">
+ <DependentUpon>xmlLBM_EquipFileMainBill.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipMaintainBill.aspx.cs">
<DependentUpon>xmlLBM_EquipMaintainBill.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -1005,6 +1016,13 @@
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldDotCheckPlanBill.aspx.designer.cs">
<DependentUpon>xmlLBM_MouldDotCheckPlanBill.aspx</DependentUpon>
</Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldFileMainBill.aspx.cs">
+ <DependentUpon>xmlLBM_MouldFileMainBill.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldFileMainBill.aspx.designer.cs">
+ <DependentUpon>xmlLBM_MouldFileMainBill.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldMaintainBill.aspx.cs">
<DependentUpon>xmlLBM_MouldMaintainBill.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
diff --git a/WebTM/views/grf/cabinet-MZJ.grf b/WebTM/views/grf/cabinet-MZJ.grf
new file mode 100644
index 0000000..96d185a
--- /dev/null
+++ b/WebTM/views/grf/cabinet-MZJ.grf
@@ -0,0 +1,154 @@
+锘縊bject Report
+ Version='6.0.0.6'
+ Title='浣犵殑鎶ヨ〃鏍囬'
+ PrintAsDesignPaper=F
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ Object Printer
+ Size=256
+ Width=9.7
+ Height=6
+ LeftMargin=0.1
+ TopMargin=0
+ RightMargin=0.1
+ BottomMargin=0
+ End
+ Object DetailGrid
+ CenterView=T
+ Object Border
+ Object Pen
+ Width=1.5
+ End
+ End
+ Object Recordset
+ Items Field
+ Item
+ Name='妯℃不鍏风紪鍙�'
+ End
+ Item
+ Name='妯℃不鍏峰悕绉�'
+ End
+ Item
+ Name='鏉＄爜缂栧彿'
+ End
+ End
+ End
+ Items Column
+ Item
+ Name='鏍囩瀹藉害'
+ Width=9.7
+ FixedWidth=T
+ End
+ End
+ Object ColumnContent
+ Height=5.3975
+ Items ColumnContentCell
+ Item
+ Column='鏍囩瀹藉害'
+ FreeCell=T
+ Items Control
+ Item
+ Type=FreeGrid
+ Name='FreeGrid1'
+ Left=0.396875
+ Top=0.211667
+ Object Border
+ Styles=[DrawLeft|DrawTop|DrawRight|DrawBottom]
+ End
+ ColumnCount=2
+ RowCount=2
+ Items FreeGridColumn
+ Item[1]
+ Width=3.99521
+ FixedWidth=T
+ End
+ Item[2]
+ Width=4.6
+ FixedWidth=T
+ End
+ End
+ Items FreeGridRow
+ Item[1]
+ Height=2.5
+ End
+ Item[2]
+ Height=2.5
+ End
+ End
+ Items FreeGridCell
+ Item[1,1]
+ Object Font
+ Name='瀹嬩綋'
+ Size=142500,0
+ Bold=T
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='[#妯℃不鍏风紪鍙�#]'
+ End
+ Item[1,2]
+ FreeCell=T
+ Items Control
+ Item
+ Type=Barcode
+ Name='Barcode1'
+ Left=0.211667
+ Top=0.211667
+ Width=4.18042
+ Height=4.78896
+ BarcodeType=QRCode
+ CaptionPosition=None
+ Text='[#鏉＄爜缂栧彿#]'
+ End
+ End
+ RowSpan=2
+ End
+ Item[2,1]
+ Object Font
+ Name='瀹嬩綋'
+ Size=142500,0
+ Bold=T
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='[#妯℃不鍏峰悕绉�#]'
+ End
+ End
+ End
+ End
+ End
+ End
+ End
+ Object ColumnTitle
+ Height=0
+ Items ColumnTitleCell
+ Item
+ GroupTitle=F
+ Column='鏍囩瀹藉害'
+ TextAlign=MiddleCenter
+ PaddingLeft=0
+ PaddingRight=0
+ PaddingTop=0
+ PaddingBottom=0
+ End
+ End
+ End
+ End
+ Items ReportHeader
+ Item
+ Name='ReportHeader1'
+ Height=0.211667
+ RepeatOnPage=T
+ End
+ End
+ Items ReportFooter
+ Item
+ Name='ReportFooter1'
+ Height=0
+ End
+ End
+End
diff --git a/WebTM/views/grf/cabinet-SB.grf b/WebTM/views/grf/cabinet-SB.grf
new file mode 100644
index 0000000..0fdba41
--- /dev/null
+++ b/WebTM/views/grf/cabinet-SB.grf
@@ -0,0 +1,154 @@
+锘縊bject Report
+ Version='6.0.0.6'
+ Title='浣犵殑鎶ヨ〃鏍囬'
+ PrintAsDesignPaper=F
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ Object Printer
+ Size=256
+ Width=9.7
+ Height=6
+ LeftMargin=0.1
+ TopMargin=0
+ RightMargin=0.1
+ BottomMargin=0
+ End
+ Object DetailGrid
+ CenterView=T
+ Object Border
+ Object Pen
+ Width=1.5
+ End
+ End
+ Object Recordset
+ Items Field
+ Item
+ Name='璁惧缂栧彿'
+ End
+ Item
+ Name='璁惧鍚嶇О'
+ End
+ Item
+ Name='鏉＄爜缂栧彿'
+ End
+ End
+ End
+ Items Column
+ Item
+ Name='鏍囩瀹藉害'
+ Width=9.7
+ FixedWidth=T
+ End
+ End
+ Object ColumnContent
+ Height=5.3975
+ Items ColumnContentCell
+ Item
+ Column='鏍囩瀹藉害'
+ FreeCell=T
+ Items Control
+ Item
+ Type=FreeGrid
+ Name='FreeGrid1'
+ Left=0.396875
+ Top=0.211667
+ Object Border
+ Styles=[DrawLeft|DrawTop|DrawRight|DrawBottom]
+ End
+ ColumnCount=2
+ RowCount=2
+ Items FreeGridColumn
+ Item[1]
+ Width=3.99521
+ FixedWidth=T
+ End
+ Item[2]
+ Width=4.6
+ FixedWidth=T
+ End
+ End
+ Items FreeGridRow
+ Item[1]
+ Height=2.5
+ End
+ Item[2]
+ Height=2.5
+ End
+ End
+ Items FreeGridCell
+ Item[1,1]
+ Object Font
+ Name='瀹嬩綋'
+ Size=142500,0
+ Bold=T
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='[#璁惧缂栧彿#]'
+ End
+ Item[1,2]
+ FreeCell=T
+ Items Control
+ Item
+ Type=Barcode
+ Name='Barcode1'
+ Left=0.211667
+ Top=0.211667
+ Width=4.18042
+ Height=4.78896
+ BarcodeType=QRCode
+ CaptionPosition=None
+ Text='[#鏉＄爜缂栧彿#]'
+ End
+ End
+ RowSpan=2
+ End
+ Item[2,1]
+ Object Font
+ Name='瀹嬩綋'
+ Size=142500,0
+ Bold=T
+ Charset=134
+ End
+ TextAlign=MiddleCenter
+ Text='[#璁惧鍚嶇О#]'
+ End
+ End
+ End
+ End
+ End
+ End
+ End
+ Object ColumnTitle
+ Height=0
+ Items ColumnTitleCell
+ Item
+ GroupTitle=F
+ Column='鏍囩瀹藉害'
+ TextAlign=MiddleCenter
+ PaddingLeft=0
+ PaddingRight=0
+ PaddingTop=0
+ PaddingBottom=0
+ End
+ End
+ End
+ End
+ Items ReportHeader
+ Item
+ Name='ReportHeader1'
+ Height=0.211667
+ RepeatOnPage=T
+ End
+ End
+ Items ReportFooter
+ Item
+ Name='ReportFooter1'
+ Height=0
+ End
+ End
+End
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/HBarPlanPrint.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/HBarPlanPrint.html"
index c2d3c95..af32e3c 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/HBarPlanPrint.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/HBarPlanPrint.html"
@@ -138,6 +138,12 @@
case "HEquipType"://璁惧鍒嗙被鍗曟墦鍗�
CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_EquipTypeBill.aspx?linterid=" + value, true, "");
break;
+ case "HEquipFileMainBill"://璁惧妗ｆ鍗曟墦鍗�
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_EquipFileMainBill.aspx?linterid=" + value, true, "");
+ break;
+ case "HMouldFileMainBill"://妯″叿妗ｆ鎵撳嵃
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_MouldFileMainBill.aspx?linterid=" + value, true, "");
+ break;
}
</script>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_EquipFileMainBill.aspx" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_EquipFileMainBill.aspx"
new file mode 100644
index 0000000..fbcfba8
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_EquipFileMainBill.aspx"
@@ -0,0 +1,28 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_EquipFileMainBill.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_EquipFileMainBill" %>
+
+<!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_Gy_EquipFileMainList where hmainid=" + Request.Params["linterid"]);
+ }
+</script>
+</head>
+<body>
+ <form id="form1" runat="server">
+ <div>
+ </div>
+ </form>
+</body>
+</html>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_EquipFileMainBill.aspx.cs" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_EquipFileMainBill.aspx.cs"
new file mode 100644
index 0000000..6049be9
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_EquipFileMainBill.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_EquipFileMainBill : System.Web.UI.Page
+ {
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+ }
+}
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_EquipFileMainBill.aspx.designer.cs" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_EquipFileMainBill.aspx.designer.cs"
new file mode 100644
index 0000000..b8aa324
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_EquipFileMainBill.aspx.designer.cs"
@@ -0,0 +1,26 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+
+
+ public partial class xmlLBM_EquipFileMainBill
+ {
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+ }
+}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_MouldFileMainBill.aspx" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_MouldFileMainBill.aspx"
new file mode 100644
index 0000000..b5c6c94
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_MouldFileMainBill.aspx"
@@ -0,0 +1,28 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_MouldFileMainBill.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_MouldFileMainBill" %>
+
+<!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_Gy_MouldFileList where hmainid=" + Request.Params["linterid"]);
+ }
+</script>
+</head>
+<body>
+ <form id="form1" runat="server">
+ <div>
+ </div>
+ </form>
+</body>
+</html>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_MouldFileMainBill.aspx.cs" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_MouldFileMainBill.aspx.cs"
new file mode 100644
index 0000000..023f687
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_MouldFileMainBill.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_MouldFileMainBill : System.Web.UI.Page
+ {
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+ }
+}
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_MouldFileMainBill.aspx.designer.cs" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_MouldFileMainBill.aspx.designer.cs"
new file mode 100644
index 0000000..888651f
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_MouldFileMainBill.aspx.designer.cs"
@@ -0,0 +1,26 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+
+
+ public partial class xmlLBM_MouldFileMainBill
+ {
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+ }
+}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_MouldTypeBill.aspx" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_MouldTypeBill.aspx"
index 9e0cc78..84bcc35 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_MouldTypeBill.aspx"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_MouldTypeBill.aspx"
@@ -15,7 +15,7 @@
//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_Gy_MouldTypeList where HItemID=" + Request.Params["linterid"]+ " order by hsubid");
+ SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Gy_EquipFileMainList where hmainid=" + Request.Params["linterid"]);
}
</script>
</head>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemEdit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemEdit.html"
index a4b9eb0..0ce17de 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemEdit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemEdit.html"
@@ -72,7 +72,6 @@
<div class="layui-input-block">
<select name="HUseFlag" lay-filter="aihao" id="HUseFlag">
<option value="鏈娴�" selected="selected">鏈娴�</option>
- <option value="鏈娴�">鏈娴�</option>
<option value="宸蹭娇鐢�">宸蹭娇鐢�</option>
</select>
</div>
@@ -141,22 +140,14 @@
//#endregion
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
- laydate.render({
- elem: '#HEndDate'
-
- });
+
//淇濆瓨
form.on('submit(Saver)', function (data) {//淇濆瓨
var isEndCheck = document.getElementById("HStopflag").checked;
isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//灏嗘暟缁勫悎骞舵垚瀛楃涓�
var user = sessionStorage["HUserName"];
- if (sessionStorage["OrganizationID"] == undefined || sessionStorage["OrganizationID"] == "" || sessionStorage["OrganizationID"] == null) {
- $("#HOrgID").val(0);
- }
- else {
- $("#HOrgID").val(sessionStorage["OrganizationID"]);
- }
+
var sMainStr = JSON.stringify(data.field) + ";" + user;
if (AllowLoadData()) {
$.ajax(
@@ -215,7 +206,16 @@
function set_AddFNew() {
$("#HItemID").val("0");
$("#HOrgID").val("0");
+ if (sessionStorage["OrganizationID"] == undefined || sessionStorage["OrganizationID"] == "" || sessionStorage["OrganizationID"] == null) {
+ $("#HOrgID").val(0);
+ }
+ else {
+ $("#HOrgID").val(sessionStorage["OrganizationID"]);
+ }
$("#HNumber").val("");
+ laydate.render({
+ elem: '#HEndDate'
+ });
}
//缂栬緫
function set_EditFromGrid() {
@@ -235,6 +235,7 @@
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data[0];
$("#HNumber").val(data.HNumber);//浠ｇ爜
+ $("#HOrgID").val(data.HOrgID);//浠ｇ爜
$("#HItemID").val(data.HItemID);//浠ｇ爜ID
$("#HName").val(data.HName);//鍚嶇О
$("#HHelpCode").val(data.HHelpCode);//鍔╄浠ｇ爜
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\350\277\224\345\267\245/Sc_Add_MESReturnStepWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\350\277\224\345\267\245/Sc_Add_MESReturnStepWorkBillList.html"
index be5f3ef..240ebbd 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\350\277\224\345\267\245/Sc_Add_MESReturnStepWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\350\277\224\345\267\245/Sc_Add_MESReturnStepWorkBillList.html"
@@ -123,9 +123,10 @@
<input type="text" name="HICMOBillNo" id="HICMOBillNo" class="layui-input" value="" style="float:left;width:150px;" readonly="readonly">
<input type="hidden" name="HICMOInterID" id="HICMOInterID" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HICMOEntryID" id="HICMOEntryID" class="layui-input" value="" style="float:left;width:150px;">
- <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HICMOBillList" id="HICMOBillList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>-->
+ <input type="hidden" name="HSourceBillNo" id="HSourceBillNo" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HSourceInterID" id="HSourceInterID" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HSourceEntryID" id="HSourceEntryID" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HSourceBillType" id="HSourceBillType" class="layui-input" value="" style="float:left;width:150px;">
</div>
</div>
</div>
@@ -204,6 +205,18 @@
<input type="text" name="HWorkerName" id="HWorkerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HWorkerID" id="HWorkerID" class="layui-input" value="" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HWorkerList" id="HEmpList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">鐢熶骇璧勬簮</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HSourceName" id="HSourceName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HSourceID" id="HSourceID" class="layui-input" value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HSourceList" id="HSourceList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
@@ -422,7 +435,8 @@
$('#HPlanBeginDate').attr("disabled", true);
$('#HDeptName').attr("disabled", true);
$('#HDeptList').addClass("layui-btn-disabled").attr("disabled", true);
-
+ $('#HSourceName').attr("disabled", true);
+ $('#HSourceList').addClass("layui-btn-disabled").attr("disabled", true);
$.ajax(
{
@@ -445,11 +459,17 @@
$("#HMaterCode").val(LoadData[0].HMaterNumber); //浜у搧浠ｇ爜
$("#HMaterName").val(LoadData[0].HMaterName); //浜у搧鍚嶇О
$("#HMaterSpec").val(LoadData[0].HModel); //浜у搧瑙勬牸
+
+ $("#HSourceID").val(LoadData[0].HSourceID); //鐢熶骇璧勬簮ID
+ $("#HSourceName").val(LoadData[0].HSourceName); //鐢熶骇璧勬簮
$("#HICMOInterID").val(LoadData[0].HICMOInterID); //浠诲姟鍗曚富鍐呯爜ID
$("#HICMOEntryID").val(LoadData[0].HICMOEntryID); //浠诲姟鍗曞瓙鍐呯爜ID
$("#HICMOBillNo").val(LoadData[0].HICMOBillNo); //浠诲姟鍗曞彿
$("#HSourceBillType").val(HSourceBillType); //婧愬崟绫诲瀷
+ $("#HSourceBillNo").val(HSourceBillNo); //婧愬崟鍐呯爜
+ $("#HSourceInterID").val(HSourceInterID); //婧愬崟涓荤爜
+ $("#HSourceEntryID").val(HSourceEntryID); //婧愬崟瀛愮爜
$("#HProcID").val(LoadData[0].HProcID); //杩斿伐宸ュ簭ID
$("#HProcName").val(LoadData[0].HProcName); //杩斿伐宸ュ簭
@@ -487,7 +507,8 @@
$('#HPlanBeginDate').attr("disabled", true);
$('#HDeptName').attr("disabled", true);
$('#HDeptList').addClass("layui-btn-disabled").attr("disabled", true);
-
+ $('#HSourceName').attr("disabled", true);
+ $('#HSourceList').addClass("layui-btn-disabled").attr("disabled", true);
$.ajax({
url: GetWEBURL() + "Sc_MESReturnStepWorkBill/Sc_MESReturnStepWorkBillListCheckDetai",
type: "GET",
@@ -504,6 +525,10 @@
, "HDate": formatDate(data.鏃ユ湡)
, "HICMOInterID": data.HICMOInterID //鐢熶骇璁㈠崟涓籌D
, "HICMOBillNo": data.浠诲姟鍗� //鐢熶骇璁㈠崟
+ , "HSourceBillType": data.HSourceBillType
+ , "HSourceBillNo": data.HSourceBillNo
+ , "HSourceInterID": data.HSourceInterID
+ , "HSourceEntryID": data.HSourceEntryID
, "HProcID": data.HProcID
, "HProcName": data.杩斿伐宸ュ簭鍚嶇О
@@ -534,7 +559,8 @@
, "HCloseDate": data.鍏抽棴鏃ユ湡 //鍏抽棴鏃ユ湡
, "HDeleteMan": data.浣滃簾浜� //浣滃簾浜�
, "HDeleteDate": data.浣滃簾鏃ユ湡 //浣滃簾鏃ユ湡
-
+ , "HSourceID": data.HSourceID //璧勬簮ID
+ , "HSourceName": data.璧勬簮鍚嶇О //璧勬簮鍚嶇О
});
} else {
@@ -730,6 +756,44 @@
});
});
+ //鐢熶骇璧勬簮
+ form.on('submit(HSourceList)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '璧勬簮鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../../PublicPage/SourceInformation.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HSourceName").val(checkStatus.data[0].HName);
+ $("#HSourceID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
//鎿嶄綔鍛�
form.on('submit(HWorkerList)', function () {
//椤甸潰灞�-鑷畾涔�
@@ -868,6 +932,10 @@
layer.msg("杩斿伐鏃堕棿涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
+ if ($("#HQty").val() == '' || $("#HQty").val() == null) {
+ layer.msg("杩斿伐鏁伴噺涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
if ($("#HWorkerID").val() == '' || $("#HWorkerID").val() == null) {
layer.msg("鎿嶄綔鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
@@ -880,6 +948,10 @@
layer.msg("閮ㄩ棬涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
+ if ($("#HSourceID").val() == '' || $("#HSourceID").val() == null) {
+ layer.msg("鐢熶骇璧勬簮涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
return Result;
}
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainList.html"
index 93dbe2a..9e6562b 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainList.html"
@@ -50,6 +50,8 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btnAdd"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btnModify"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btndelete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
@@ -102,6 +104,12 @@
break;
//缂栬緫鎸夐挳
case 'btnModify': set_ShowBill();
+ break;
+ //棰勮
+ case 'btn-view': get_ViewReport();
+ break;
+ //鎵撳嵃
+ case 'btn-print': get_PrintReport();
break;
//鍒犻櫎鎸夐挳
case 'btndelete': set_DeleteBill();
@@ -416,6 +424,48 @@
}
+ //棰勮
+ function get_ViewReport() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ layer.open({
+ type: 2
+ , area: ['50%', '50%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HEquipFileMainBill', 'yes']
+ , resize: false
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+ }
+ }
+
+ //鎵撳嵃
+ function get_PrintReport() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ layer.open({
+ type: 2
+ , area: ['50%', '50%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HEquipFileMainBill', 'yes']
+ , resize: false
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+ }
+ }
+
//鍒锋柊
function get_Refresh() {
$("#HNumber").val("");
--
Gitblit v1.9.1