From ac5dd87b0afd35c20a1c871435fb2d7665591ca9 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 10 六月 2025 13:48:27 +0800
Subject: [PATCH] 客户标签；生产资源保存控制；模具领用出库类型判断；设备点检记录子表赋值
---
WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_CustTagBarCodeList_Select.aspx | 30 +++
WebTM/views/生产管理/客户标签/Sc_CustomerTagBarCodeList.html | 128 +++++++++++++++
WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_CustTagBarCodeList_Select.aspx.cs | 17 ++
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdOutBillEdit.html | 2
WebTM/views/基础资料/生产基础资料/Gy_Source.html | 2
WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_CustTagBarCodeList.aspx.cs | 17 ++
WebTM/views/设备管理/Sb_EquipDotCheckBillEdit.html | 6
WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_CustTagBarCodeList.aspx | 30 +++
WebTM/views/基础资料/公用基础资料/HBarPlanPrint.html | 8 +
WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_CustTagBarCodeList.aspx.designer.cs | 26 +++
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 119 +++++++++++++-
WebTM/WebTM.csproj | 16 ++
WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_CustTagBarCodeList_Select.aspx.designer.cs | 26 +++
13 files changed, 408 insertions(+), 19 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 7dcdb00..9250933 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -470,6 +470,8 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_WorkCenter_Excel.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_UnitConvertRateList.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_StockPlaceList.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_CustTagBarCodeList_Select.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_CustTagBarCodeList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HPayMentBill.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HPOOrderBillByID.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HPOStockInBillByID.aspx" />
@@ -2540,6 +2542,20 @@
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_StockPlaceList.aspx.designer.cs">
<DependentUpon>xmlLBM_Gy_StockPlaceList.aspx</DependentUpon>
</Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_CustTagBarCodeList_Select.aspx.cs">
+ <DependentUpon>xmlLBM_Sc_CustTagBarCodeList_Select.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_CustTagBarCodeList_Select.aspx.designer.cs">
+ <DependentUpon>xmlLBM_Sc_CustTagBarCodeList_Select.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_CustTagBarCodeList.aspx.cs">
+ <DependentUpon>xmlLBM_Sc_CustTagBarCodeList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_CustTagBarCodeList.aspx.designer.cs">
+ <DependentUpon>xmlLBM_Sc_CustTagBarCodeList.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_CardChangeType.aspx.cs">
<DependentUpon>xmlLBM_HGy_CardChangeType.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
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 b272bd5..53dcd84 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"
@@ -333,6 +333,14 @@
case "Kf_ProductReceiveMaterialBillList": //鐢熶骇棰嗘枡鍗�
CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Kf_ProductReceiveMaterialBillList.aspx?linterid=" + value, true, "");
break;
+ case "HCustTag": //瀹㈡埛鏍囩
+ var ListTrue = value.split('@');
+ if (ListTrue.length > 1) {
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Sc_CustTagBarCodeList.aspx?linterid=" + ListTrue[0] + "&entryid=" + ListTrue[1], true, "");
+ } else {
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Sc_CustTagBarCodeList_Select.aspx?linterid=" + ListTrue[0], true, "");
+ }
+ break;
}
</script>
</body>
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_Sc_CustTagBarCodeList.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_Sc_CustTagBarCodeList.aspx"
new file mode 100644
index 0000000..8ba5120
--- /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_Sc_CustTagBarCodeList.aspx"
@@ -0,0 +1,30 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_Sc_CustTagBarCodeList.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_Sc_CustTagBarCodeList" %>
+
+<!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渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
+
+ //SqlXMLReportData.GenEntireData(this, "select * from h_v_Sc_CustomerTagBarCodeList where HSourceInterID = " + Request.Params["linterid"] + " and HSourceEntryID =" + Request.Params["entryid"] + ")","select 1");
+
+ //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
+ SqlXMLReportData.GenEntireData(this, "select * from h_v_Sc_CustomerTagBarCodeList where HSourceInterID =" + Request.Params["linterid"] + " and HSourceEntryID =" + Request.Params["entryid"] + " order by 娴佹按鍙�", "select 1");
+
+ }
+ </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_Sc_CustTagBarCodeList.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_Sc_CustTagBarCodeList.aspx.cs"
new file mode 100644
index 0000000..36048e6
--- /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_Sc_CustTagBarCodeList.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_Sc_CustTagBarCodeList : 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_Sc_CustTagBarCodeList.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_Sc_CustTagBarCodeList.aspx.designer.cs"
new file mode 100644
index 0000000..27c1210
--- /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_Sc_CustTagBarCodeList.aspx.designer.cs"
@@ -0,0 +1,26 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+
+
+ public partial class xmlLBM_Sc_CustTagBarCodeList
+ {
+
+ /// <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_Sc_CustTagBarCodeList_Select.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_Sc_CustTagBarCodeList_Select.aspx"
new file mode 100644
index 0000000..a57dd62
--- /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_Sc_CustTagBarCodeList_Select.aspx"
@@ -0,0 +1,30 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_Sc_CustTagBarCodeList_Select.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_Sc_CustTagBarCodeList_Select" %>
+
+<!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渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
+
+ //SqlXMLReportData.GenEntireData(this, "select * from h_v_Sc_CustomerTagBarCodeList where HSourceInterID = " + Request.Params["linterid"] + " and HSourceEntryID =" + Request.Params["entryid"] + ")","select 1");
+
+ //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
+ SqlXMLReportData.GenEntireData(this, "select * from h_v_Sc_CustomerTagBarCodeList where HItemID in (" + Request.Params["linterid"] + ") order by 娴佹按鍙�", "select 1");
+
+ }
+ </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_Sc_CustTagBarCodeList_Select.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_Sc_CustTagBarCodeList_Select.aspx.cs"
new file mode 100644
index 0000000..b86e77f
--- /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_Sc_CustTagBarCodeList_Select.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_Sc_CustTagBarCodeList_Select : 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_Sc_CustTagBarCodeList_Select.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_Sc_CustTagBarCodeList_Select.aspx.designer.cs"
new file mode 100644
index 0000000..1485afa
--- /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_Sc_CustTagBarCodeList_Select.aspx.designer.cs"
@@ -0,0 +1,26 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+
+
+ public partial class xmlLBM_Sc_CustTagBarCodeList_Select
+ {
+
+ /// <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/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
index 8f84f25..40b37da 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
@@ -701,7 +701,7 @@
if (Htype != "") {
Htype = decodeURI(Htype);
- sWhere += " and 绫诲瀷 = '" + Htype + "'";
+ //sWhere += " and 绫诲瀷 = '" + Htype + "'";
}
if (HNumber) {
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.html"
index 16fc55b..f5803dd 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.html"
@@ -421,7 +421,7 @@
if (OperationType == 1) {//鏃犳簮鏂板
set_AddFNew();
}
- if(OperationType == 2) {
+ else if(OperationType == 2) {
set_EditFromGrid(linterid);
get_MAXNum();
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\242\346\210\267\346\240\207\347\255\276/Sc_CustomerTagBarCodeList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\242\346\210\267\346\240\207\347\255\276/Sc_CustomerTagBarCodeList.html"
index f847926..b37d585 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\242\346\210\267\346\240\207\347\255\276/Sc_CustomerTagBarCodeList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\242\346\210\267\346\240\207\347\255\276/Sc_CustomerTagBarCodeList.html"
@@ -162,6 +162,8 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get-printCustTag-Auto" id="printCustTagAuto"><i class="layui-icon layui-icon-print"></i>瀹㈡埛鏍囩涓�閿墦鍗�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get-printCustTag" id="printCustTag"><i class="layui-icon layui-icon-print"></i>瀹㈡埛鏍囩鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>闅愯棌鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
@@ -315,7 +317,7 @@
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
- , height: 'full-50'
+ , height: 'full-150'
//, page: true
, cellMinWidth: 90
, limit: 50
@@ -503,7 +505,13 @@
break;
//閫�鍑烘寜閽�
case 'get_Exit': Pub_Close(2);
- break;
+ break;
+ //瀹㈡埛鏍囩涓�閿墦鍗�
+ case 'get-printCustTag-Auto': get_PrintCustTag_Auto();//涓�閿墦鍗板鎴锋爣绛�
+ break;
+ //瀹㈡埛鏍囩鎵撳嵃
+ case 'get-printCustTag': get_PrintCustTag();//鎵撳嵃瀹㈡埛鏍囩
+ break
//闅愯棌鍒楄缃�
case 'HideColumn':
get_HideColumn();
@@ -888,6 +896,122 @@
}
//#endregion
+ //娣诲悍瀹㈡埛鏍囩涓�閿墦鍗�
+ var time;
+ var num = 0;
+
+ function get_PrintCustTag_Auto() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ if (checkStatus.data.length > 0) {
+ //閫昏緫鍒犻櫎鏂规硶
+ layer.confirm("纭瑕佹壒閲忔墦鍗板悧?", { title: "纭" }, function (index) {
+ time = setInterval(function () {
+ dy_PL(data);
+ }, 2500);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨鏁版嵁鎵撳嵃锛�');
+ }
+ }
+
+ function dy_PL(rest) {
+ var HItemID = rest[num].HItemID.toString();
+ var sWhere = "select a.*,isnull(c.HName,'') HTemplateName from h_v_Sc_CustomerTagBarCodeList a with(nolock) left join Gy_MateNumRelation_Sec b with(nolock) on a.HCustID = b.HCusID and a.HMaterID = b.HMaterID left join SRM_OpenTmp c with(nolock) on isnull(b.HTemplateID,0) = c.HItemID where a.HItemID in(" + HItemID + ") "
+
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "sWhere": sWhere },
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ if (data.data[0].HTemplateName == "" || data.data[0].HTemplateName == undefined || data.data[0].HTemplateName == null) {
+ num = 0;
+ clearInterval(time);
+
+ layer.alert("娌℃湁鍖归厤鍒版墦鍗版ā鏉匡紝璇锋墜鍔ㄩ�夋嫨妯℃澘杩涜鎵撳嵃")
+ } else {
+ if (data.data.length != 0) {
+ var dataPrint = [];
+ for (var i = 0; i < data.data.length; i++) {
+ dataPrint.push(data.data[i])
+ }
+
+ var Customer = {
+ "Table": dataPrint
+ }
+
+ var args = {
+ type: "print",//鎵撳嵃妯″紡
+ //type: "preview",//棰勮妯″紡
+ showOptionDlg: false, //濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
+ report: urlAddRandomNo("../../grf/娉曞緥鏍囩.grf"),
+ data: Customer
+ };
+
+ console.log(data.data[0].鐢熶骇璁㈠崟鍙� + " === " + data.data[0].娴佹按鍙�);
+ //var args = {
+ // report: urlAddRandomNo("../../grf/cs10.grf"),
+ // data: Customer
+ //};
+ webapp_ws_ajax_run(args);
+
+ if (rest.length <= num + 1) {
+ num = 0;
+ clearInterval(time);
+ } else {
+ num++;
+ }
+
+ } else {
+ layer.msg("鏌ユ棤鏁版嵁!");
+ }
+ }
+ }
+ else {
+ layer.msg(data.Message, { icon: 5 });
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.msg("閿欒:" + err, { icon: 5 });
+ }
+ })
+ }
+
+ //瀹㈡埛鏍囩鎵撳嵃
+ function get_PrintCustTag() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ var HItemIDArr = [];
+
+ if (checkStatus.data.length > 0) {
+ for (var i = 0; i < data.length; i++) {
+ HItemIDArr.push(data[i].HItemID.toString());
+ }
+
+ layer.open({
+ type: 2
+ , area: ['50%', '50%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + HItemIDArr.toString() + '&MyMsg=' + HItemIDArr.toString() + '&Type=HCustTag', 'yes']
+ , resize: false
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨鏁版嵁鎵撳嵃锛�');
+ }
+ }
+
//#region 銆愯繃婊ゆ柟妗堛��
//鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index 82d1058..9baf253 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -308,7 +308,9 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get-view" id="view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get-print" id="print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get-printTK" id="printTK"><i class="layui-icon layui-icon-print"></i>鎵撳嵃杩芥函鐮�</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get-printCustTag" id="printCustTag"><i class="layui-icon layui-icon-print"></i>瀹㈡埛鏍囩涓�閿墦鍗�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get-printCustTag-Auto" id="printCustTagAuto"><i class="layui-icon layui-icon-print"></i>瀹㈡埛鏍囩涓�閿墦鍗�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get-printCustTag" id="printCustTag"><i class="layui-icon layui-icon-print"></i>瀹㈡埛鏍囩鎵撳嵃</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get-saveCustTag" id="saveCustTag"><i class="layui-icon layui-icon-print"></i>閲嶆柊鐢熸垚瀹㈡埛鏍囩</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_export" id="export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-FirstPieceCheck" id="btn-FirstPieceCheck">棣栨</button>
@@ -587,8 +589,14 @@
case 'get-printTK': get_PrintReportTK();//鎵撳嵃杩芥函鐮�
break;
//瀹㈡埛鏍囩涓�閿墦鍗�
- case 'get-printCustTag': get_PrintCustTag();//涓�閿墦鍗板鎴锋爣绛�
+ case 'get-printCustTag-Auto': get_PrintCustTag_Auto();//涓�閿墦鍗板鎴锋爣绛�
break;
+ //瀹㈡埛鏍囩鎵撳嵃
+ case 'get-printCustTag': get_PrintCustTag();//鎵撳嵃瀹㈡埛鏍囩
+ break
+ //閲嶆柊鐢熸垚瀹㈡埛鏍囩
+ case 'get-saveCustTag': get_SaveCustTag();//閲嶆柊鐢熸垚瀹㈡埛鏍囩
+ break;
//鍒锋柊
case 'get_Refresh': get_Refresh();
break;
@@ -2373,7 +2381,7 @@
var time;
var num = 0;
- function get_PrintCustTag() {
+ function get_PrintCustTag_Auto() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
var hmainid = "";
@@ -2392,11 +2400,16 @@
if (data1.count == 1) {
//鎵撳嵃鏂规硶
layer.confirm("纭瑕佹壒閲忔墦鍗板悧?", { title: "纭" }, function (index) {
- time = setInterval(function () {
- dy_PL(hmainid, hentryid);
- }, 2500);
- //鍏抽棴褰撳墠frame
- layer.close(index);
+ if (data1.data[0].妯℃澘鍚嶇О == "" || data1.data[0].妯℃澘鍚嶇О == undefined || data1.data[0].妯℃澘鍚嶇О == null) {
+ layer.msg("娌℃湁鍖归厤鍒板搴旂殑鎵撳嵃妯℃澘锛岃鍒板鎴峰搴旂墿鏂欐ā鍧楃淮鎶わ紝鎴栨墜鍔ㄩ�夋嫨鎵撳嵃妯℃澘杩涜鎵撳嵃");
+ layer.close(index);
+ } else {
+ time = setInterval(function () {
+ dy_PL(hmainid, hentryid, data1.data[0].妯℃澘鍚嶇О);
+ }, 2500);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ }
})
} else {
layer.alert(data1.Message, { icon: 5 });
@@ -2411,8 +2424,8 @@
}
}
- function dy_PL(HICMOInterID, HICMOEntryID) {
- var sWhere = "select top 2 * from h_v_Sc_CustomerTagBarCodeList where HSourceInterID = " + HICMOInterID + " and HSourceEntryID = " + HICMOEntryID
+ function dy_PL(HICMOInterID, HICMOEntryID, HTemplateName) {
+ var sWhere = "select * from h_v_Sc_CustomerTagBarCodeList where HSourceInterID = " + HICMOInterID + " and HSourceEntryID = " + HICMOEntryID
var rest = [];
$.ajax({
type: "GET",
@@ -2437,10 +2450,10 @@
type: "print",//鎵撳嵃妯″紡
//type: "preview",//棰勮妯″紡
showOptionDlg: false, //濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
- report: urlAddRandomNo("../../grf/娉曞緥鏍囩.grf"),
+ report: urlAddRandomNo("../../grf/" + HTemplateName + ".grf"),
data: Customer
};
-
+ console.log(data.data[0].鐢熶骇璁㈠崟鍙� + " === " + data.data[0].娴佹按鍙�);
webapp_ws_ajax_run(args);
if (rest.length <= num + 1) {
@@ -2464,6 +2477,88 @@
})
}
+ //瀹㈡埛鏍囩鎵撳嵃
+ function get_PrintCustTag() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ var hmainid = "";
+ var hentryid = "";
+ var HMainID_EntryID = "";
+
+ if (checkStatus.data.length == 1) {
+ hmainid = data[0].hmainid;
+ hentryid = data[0].HEntryID;
+ HMainID_EntryID = hmainid + '@' + hentryid
+
+ layer.open({
+ type: 2
+ , area: ['50%', '50%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + HMainID_EntryID + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HCustTag', 'yes']
+ , resize: false
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+ }
+ }
+
+ //閲嶆柊鐢熸垚瀹㈡埛鏍囩
+ function get_SaveCustTag() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ var hmainid = "";
+ var hentryid = "";
+
+ if (checkStatus.data.length == 1) {
+ hmainid = data[0].hmainid;
+ hentryid = data[0].HEntryID;
+
+ layer.prompt({
+ formType: 2
+ , area: ['400px', '50px'] //鑷畾涔夋枃鏈煙瀹介珮
+ , title: '璇疯緭鍏ヨ捣濮嬫祦姘村彿'
+ }, function (value, index) {
+ $.ajax({
+ url: GetWEBURL() + '/Sc_CustomerTagBarCode/ReSave',
+ type: "GET",
+ async: false,
+ data: { "HICMOInterID": hmainid, "HICMOEntryID": hentryid, "HSerialNum": value},
+ success: function (data1) {
+ if (data1.count == 1) {
+ //鎵撳嵃鏂规硶
+ layer.confirm("纭瑕佹壒閲忔墦鍗板悧?", { title: "纭" }, function (index) {
+ if (data1.data[0].妯℃澘鍚嶇О == "" || data1.data[0].妯℃澘鍚嶇О == undefined || data1.data[0].妯℃澘鍚嶇О == null) {
+ layer.msg("娌℃湁鍖归厤鍒板搴旂殑鎵撳嵃妯℃澘锛岃鍒板鎴峰搴旂墿鏂欐ā鍧楃淮鎶わ紝鎴栨墜鍔ㄩ�夋嫨鎵撳嵃妯℃澘杩涜鎵撳嵃");
+ layer.close(index);
+ } else {
+ time = setInterval(function () {
+ dy_PL(hmainid, hentryid, data1.data[0].妯℃澘鍚嶇О);
+ }, 2500);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ }
+ })
+ } else {
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ layer.close(index);
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛岃鍗曠敓鎴愶紒');
+ }
+ }
+
//#region 瀵煎嚭Execel
function get_Export() {
var ModRightNameCheck = "Sc_ICMOBillList_ExportExcel";
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
index c0b2452..9141a73 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
@@ -589,9 +589,9 @@
buttonArr = [];//娓呯┖鏁扮粍
for (var i = 0; i < DJData.data.length; i++) {
var checkrow = {
- "HDotCheckItemID": DJData.data[i].HDotCheckItemID, "HDotCheckCode": DJData.data[i].HDotCheckCode, "HDotCheckItem": DJData.data[i].HDotCheckItem,
- "HDotCheckPart": DJData.data[i].HDotCheckPart, "HManagerID": DJData.data[i].HManagerID, "HManagerCode": DJData.data[i].HManagerCode,
- "HManagerName": DJData.data[i].HManagerName, "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y"
+ "HDotCheckItemID": DJData.data[i].HDotCheckItemID, "HDotCheckCode": DJData.data[i].鐐规椤圭洰浠ｇ爜, "HDotCheckItem": DJData.data[i].鐐规椤圭洰,
+ "HDotCheckPart": DJData.data[i].鐐规閮ㄤ綅, "HManagerID": DJData.data[i].璐熻矗浜篒D, "HManagerCode": DJData.data[i].璐熻矗浜轰唬鐮�,
+ "HManagerName": DJData.data[i].璐熻矗浜哄悕绉�, "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y"
};
buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
}
--
Gitblit v1.9.1