MES-WEB-LayUI.git

parent: ef2dfcb5 | 补丁 | 提交 | ignore whitespace

yangle

2024-06-18 6382949674c90e0c7ff2e128eaa3135024c2a273

白标跳转页面打印
报工出站增加字段
上料防错增加条码数量显示

3个文件已添加

5个文件已修改

	WebTM/WebTM.csproj	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/WMS扫码模块/上料防错单/Sc_MaterToSourceBill_PDA.html	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/公用基础资料/HBarPlanPrint.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/公用基础资料/xmlSRM_Web_BarCodeBillList.aspx	26 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/公用基础资料/xmlSRM_Web_BarCodeBillList.aspx.cs	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/公用基础资料/xmlSRM_Web_BarCodeBillList.aspx.designer.cs	26 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/产线/MES_ProductionLinePackagingList.html	69 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill_CurrentWork.html	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/WebTM.csproj

@@ -336,6 +336,7 @@
    <Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_MaintainLev.html" />
    <Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_PreventErrMould.html" />
    <Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\xmlLBM_Xs_SeOrderBill_StockInCodeNote.aspx" />
    <Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\xmlSRM_Web_BarCodeBillList.aspx" />
    <Content Include="views\åºç¡èµæ\åºç¡èµæ\Gy_DotCheckItemMethodEdit.html" />
    <Content Include="views\åºç¡èµæ\åºç¡èµæ\Gy_DotCheckItemClassEdit.html" />
    <Content Include="views\åºç¡èµæ\åºç¡èµæ\Gy_DotCheckItemMethodList.html" />
@@ -2140,6 +2141,13 @@
    <Compile Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\xmlLYS_ReceiveOtherBillMainList.aspx.designer.cs">
      <DependentUpon>xmlLYS_ReceiveOtherBillMainList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\xmlSRM_Web_BarCodeBillList.aspx.cs">
      <DependentUpon>xmlSRM_Web_BarCodeBillList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\xmlSRM_Web_BarCodeBillList.aspx.designer.cs">
      <DependentUpon>xmlSRM_Web_BarCodeBillList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\xmlPM_WorkTaskBillMyList.aspx.cs">
      <DependentUpon>xmlPM_WorkTaskBillMyList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>

 WebTM/views/WMSÉ¨ÂëÄ£¿é/ÉÏÁÏ·À´íµ¥/Sc_MaterToSourceBill_PDA.html

@@ -1066,6 +1066,7 @@
                                , { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 100 }
                                , { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 100 }
                                , { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 100 }
                                , { field: 'æ¡ç æ°é', title: 'æ¡ç æ°é', width: 100 }
                                , { field: 'åºåæ°é', title: 'åºåæ°é', width: 100 }
                            ]];
                            listOption.data = data;

 WebTM/views/»ù´¡×ÊÁÏ/¹«ÓÃ»ù´¡×ÊÁÏ/HBarPlanPrint.html

@@ -281,6 +281,10 @@
            case "Xs_SeOrderBill_StockInCodeNote": //éå®è®¢å å¥åºç å
                CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Xs_SeOrderBill_StockInCodeNote.aspx?linterid=" + value, true, "");
                break;
            case "HBarCodePrint"://ç©ææ¡ç æå°
                //CreateDisplayViewerEx("100%", "100%", "../../views/grf/" + OpenTmp + ".grf", "../../views/SRM/xmlSRM_Web_BarCodeBillList.aspx?linterid=" + value, true, "");
                CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlSRM_Web_BarCodeBillList.aspx?linterid=" + value, true, "");
                break;
        }
    </script>
</body>

 WebTM/views/»ù´¡×ÊÁÏ/¹«ÓÃ»ù´¡×ÊÁÏ/xmlSRM_Web_BarCodeBillList.aspx

New file
@@ -0,0 +1,26 @@
ï»¿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlSRM_Web_BarCodeBillList.aspx.cs" Inherits="WebTM.views.åºç¡èµæ.å¬ç¨åºç¡èµæ.xmlSRM_Web_BarCodeBillList" %>

<!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)
         {
             //âç¹å«æç¤ºâï¼
             //ä¸åçæ°æ®åºåºè¯¥éç¨ä¸åçæ¥è¡¨XMLæ°æ®çæç±»ï¼SQL Serveræ°æ®åºç¨SqlXMLReportDataï¼Oracleæ°æ®åºç¨OracleXMLReportData
             //OledbXMLReportDataéåäºAccessçæ¬å°æ°æ®åºï¼ä¸ºäºæ¼ç¤ºæ¹ä¾¿ï¼è¿éä»Grid++ReportçAccessä¾åæ°æ®åºä¸è·åæ¥è¡¨æ°æ®

             SqlXMLReportData.GenOneRecordset(this, "select  a.HBarCode_White HBarCode_White,temp.HSupPartName HSupPartName,temp.HSupBarCodeNumber MFGPartNumber,temp.HCountryType CountryofOrigin,(select REPLACE(item, 'Q', '') from split(a.HBarCode_White, ':') where id = 6) Quantity, temp.HGrossWeight GrossWeight, temp.HPARTNAME PartName , (select item from split(a.HBarCode_White, ':') where id = 2) ContentLabelID , temp.HSupNumber Supplier, REPLACE(convert(varchar(10), GETDATE(), 20), '-', '') + ' ' + convert(varchar(5), GETDATE(), 24) MFGDate , REPLACE(convert(varchar(10), GETDATE(), 20), '-', '') SupplierLotCode , (select REPLACE(item, 'P', '') from split(a.HBarCode_White, ':') where id = 4) BBM   from Sc_PackUnionBillMain a left join  Gy_Material m on a.HMaterID = m.HItemID left join Sc_PackUnionBillBarCode_temp temp on m.HNumber = temp.HMaterNumber where a.HInterID in(" + Request.Params["linterid"] + ")");
         }
     </script>
</head>
<body>
    <form id="form1" runat="server">
        <div>
        </div>
    </form>
</body>
</html>

 WebTM/views/»ù´¡×ÊÁÏ/¹«ÓÃ»ù´¡×ÊÁÏ/xmlSRM_Web_BarCodeBillList.aspx.cs

New file
@@ -0,0 +1,17 @@
ï»¿using 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 xmlSRM_Web_BarCodeBillList : System.Web.UI.Page
    {
        protected void Page_Load(object sender, EventArgs e)
        {

        }
    }
}

 WebTM/views/»ù´¡×ÊÁÏ/¹«ÓÃ»ù´¡×ÊÁÏ/xmlSRM_Web_BarCodeBillList.aspx.designer.cs

New file
@@ -0,0 +1,26 @@
ï»¿//------------------------------------------------------------------------------
// <èªå¨çæ>
//     æ¤ä»£ç ç±å·¥å·çæã
//
//     å¯¹æ¤æä»¶çæ´æ¹å¯è½å¯¼è´ä¸æ£ç¡®çè¡ä¸ºï¼å¦æ
//     éæ°çæä»£ç ï¼åæåæ´æ¹å°ä¸¢å¤±ã
// </èªå¨çæ>
//------------------------------------------------------------------------------

namespace WebTM.views.åºç¡èµæ.å¬ç¨åºç¡èµæ
{


    public partial class xmlSRM_Web_BarCodeBillList
    {

        /// <summary>
        /// form1 æ§ä»¶ã
        /// </summary>
        /// <remarks>
        /// èªå¨çæçåæ®µã
        /// è¥è¦è¿è¡ä¿®æ¹ï¼è¯·å°åæ®µå£°æä»è®¾è®¡å¨æä»¶ç§»å°ä»£ç éèæä»¶ã
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
    }
}

 WebTM/views/³µ¼ä¹ÜÀí/²úÏß/MES_ProductionLinePackagingList.html

@@ -375,7 +375,8 @@
                //æ æ³¨éä¸æ ·å¼
                obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click');
            });
            //æå°æé®
 
            //æå°
            //form.on('submit(Print)', function (obj) {//éåº
            //    var checkStatus = table.checkStatus("mainTable"); //è·åéä¸è¡ç¶æ
            //    var linterid = checkStatus.data[0].HInterID;
@@ -388,7 +389,7 @@
            //    //window.open("../../views/BaseSet/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());


            //    var sWhere = "select * from h_v_SRM_BarCodeBillList where HItemID in(" + linterid + ") order by ç©æä»£ç ";
            //    var sWhere = "select  a.HBarCode_White HBarCode_White,temp.HSupPartName HSupPartName,temp.HSupBarCodeNumber MFGPartNumber,temp.HCountryType CountryofOrigin,(select REPLACE(item, 'Q', '') from split(a.HBarCode_White, ':') where id = 6) Quantity, temp.HGrossWeight GrossWeight, temp.HPARTNAME PartName , (select item from split(a.HBarCode_White, ':') where id = 2) ContentLabelID , temp.HSupNumber Supplier, REPLACE(convert(varchar(10), GETDATE(), 20), '-', '') + ' ' + convert(varchar(5), GETDATE(), 24) MFGDate , REPLACE(convert(varchar(10), GETDATE(), 20), '-', '') SupplierLotCode , (select REPLACE(item, 'P', '') from split(a.HBarCode_White, ':') where id = 4) BBM   from Sc_PackUnionBillMain a left join  Gy_Material m on a.HMaterID = m.HItemID left join Sc_PackUnionBillBarCode_temp temp on m.HNumber = temp.HMaterNumber where a.HInterID=" + linterid;

            //    $.ajax({
            //        type: "GET",
@@ -400,7 +401,8 @@

            //                if (data.data.length != 0) {
            //                    var dataPrint = [];
            //                    dataPrint.push({ "äº§ååç§°": data.data[0]["äº§ååç§°"], "æ¡ç ç¼å·": data.data[0]["æ¡ç ç¼å·"], "æ°é": data.data[0]["æ°é"], "æ¥æ": data.data[0]["æ¥æ"], "çäº§ä»»å¡å": data.data[0]["çäº§ä»»å¡å"], "æµè½¬å¡ç¼å·": data.data[0]["æµè½¬å¡ç¼å·"], "èªå®ä¹åæ®µ": data.data[0]["èªå®ä¹åæ®µ"], "é¡¹ç®ç¼å·": data.data[0]["é¡¹ç®ç¼å·"] }
            //                    dataPrint.push(data.data[0]
            //                        //{ "äº§ååç§°": data.data[0]["äº§ååç§°"], "æ¡ç ç¼å·": data.data[0]["æ¡ç ç¼å·"], "æ°é": data.data[0]["æ°é"], "æ¥æ": data.data[0]["æ¥æ"], "çäº§ä»»å¡å": data.data[0]["çäº§ä»»å¡å"], "æµè½¬å¡ç¼å·": data.data[0]["æµè½¬å¡ç¼å·"], "èªå®ä¹åæ®µ": data.data[0]["èªå®ä¹åæ®µ"], "é¡¹ç®ç¼å·": data.data[0]["é¡¹ç®ç¼å·"] }
            //                    );

            //                    var Customer = {
@@ -410,7 +412,7 @@
            //                    var args = {
            //                        type: "print",
            //                        showOptionDlg: false, //å¦æä¸æ¾ç¤ºæå°å¯¹è¯æ¡èç´æ¥æå°ï¼å°æ¤è¡æ³¨éå»æå³å¯
            //                        report: urlAddRandomNo("../../views/grf/åè£åç©ææ è¯å¡(ç½é¡µç).grf"),
            //                        report: urlAddRandomNo("../../grf/ç½æ æå°.grf"),
            //                        data: Customer
            //                    };
            //                    //var args = {
@@ -432,8 +434,9 @@
            //            layer.msg("éè¯¯:" + err, { icon: 5 });
            //        }
            //    })
              

            //});


            form.on('submit(Print)', function (obj) {//éåº
                var checkStatus = table.checkStatus("mainTable"); //è·åéä¸è¡ç¶æ
@@ -441,58 +444,10 @@
                ////æå¼æå°æ¨¡æ¿
                ////var linterid = $("#HInterID").val();
                ////var linterid = "28973";
                //var Type = "HBarCodePrint";
                //var OpenTmp = "åè£åç©ææ è¯å¡(ç½é¡µç)";
                ////var ReportViewer = document.getElementById("ReportViewer");
                //window.open("../../views/BaseSet/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());


                var sWhere = "select  a.HBarCode_White HBarCode_White,temp.HSupPartName HSupPartName,temp.HSupBarCodeNumber MFGPartNumber,temp.HCountryType CountryofOrigin,(select REPLACE(item, 'Q', '') from split(a.HBarCode_White, ':') where id = 6) Quantity, temp.HGrossWeight GrossWeight, temp.HPARTNAME PartName , (select item from split(a.HBarCode_White, ':') where id = 2) ContentLabelID , temp.HSupNumber Supplier, REPLACE(convert(varchar(10), GETDATE(), 20), '-', '') + ' ' + convert(varchar(5), GETDATE(), 24) MFGDate , REPLACE(convert(varchar(10), GETDATE(), 20), '-', '') SupplierLotCode , (select REPLACE(item, 'P', '') from split(a.HBarCode_White, ':') where id = 4) BBM   from Sc_PackUnionBillMain a left join  Gy_Material m on a.HMaterID = m.HItemID left join Sc_PackUnionBillBarCode_temp temp on m.HNumber = temp.HMaterNumber where a.HInterID=" + linterid;

                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
                    async: true,
                    data: { "sWhere": sWhere },
                    success: function (data) {
                        if (data.count == 1) { // è¯´æéªè¯æåäºï¼

                            if (data.data.length != 0) {
                                var dataPrint = [];
                                dataPrint.push(data.data[0]
                                    //{ "äº§ååç§°": data.data[0]["äº§ååç§°"], "æ¡ç ç¼å·": data.data[0]["æ¡ç ç¼å·"], "æ°é": data.data[0]["æ°é"], "æ¥æ": data.data[0]["æ¥æ"], "çäº§ä»»å¡å": data.data[0]["çäº§ä»»å¡å"], "æµè½¬å¡ç¼å·": data.data[0]["æµè½¬å¡ç¼å·"], "èªå®ä¹åæ®µ": data.data[0]["èªå®ä¹åæ®µ"], "é¡¹ç®ç¼å·": data.data[0]["é¡¹ç®ç¼å·"] }
                                );

                                var Customer = {
                                    "Table": dataPrint
                                }

                                var args = {
                                    type: "print",
                                    showOptionDlg: false, //å¦æä¸æ¾ç¤ºæå°å¯¹è¯æ¡èç´æ¥æå°ï¼å°æ¤è¡æ³¨éå»æå³å¯
                                    report: urlAddRandomNo("../../grf/ç½æ æå°.grf"),
                                    data: Customer
                                };
                                //var args = {
                                //    report: urlAddRandomNo("../../views/grf/åè£åç©ææ è¯å¡(ç½é¡µç).grf"),
                                //    data: Customer
                                //};
                                webapp_ws_ajax_run(args);
                            } else {
                                layer.msg("æ¥æ æ°æ®!");
                            }

                        }
                        else {
                            layer.msg(data.Message, { icon: 5 });
                        }
                        layer.closeAll("loading");
                    },
                    error: function (err) {
                        layer.msg("éè¯¯:" + err, { icon: 5 });
                    }
                })

                var Type = "HBarCodePrint";
                var OpenTmp = "ç½æ æå°";
                //var ReportViewer = document.getElementById("ReportViewer");
                window.open("../../åºç¡èµæ/å¬ç¨åºç¡èµæ/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
            });

            //æå°æé®

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBill_CurrentWork.html

@@ -124,6 +124,12 @@
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 65px;">å·¥æ¶</label>
                                            <div class="layui-input-block" style="margin-left: 95px;">
                                                <input type="text" class="layui-input" name="HWorkTimes" id="HWorkTimes" value="0" style="width: 150px;">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-bottom: 15px;">
                                        <div class="layui-inline">
@@ -193,6 +199,14 @@
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-bottom: 15px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 65px;">ç©´å·</label>
                                            <div class="layui-input-block" style="margin-left: 95px;">
                                                <input type="text" class="layui-input" name="HMouldNum" id="HMouldNum" style="width: 150px;" >
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                            <div id="center" style="width: 100%; height: calc(40vh); margin-top: 1%;">

			@@ -336,6 +336,7 @@
			<Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_MaintainLev.html" />
			<Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_PreventErrMould.html" />
			<Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\xmlLBM_Xs_SeOrderBill_StockInCodeNote.aspx" />
			<Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\xmlSRM_Web_BarCodeBillList.aspx" />
			<Content Include="views\åºç¡èµæ\åºç¡èµæ\Gy_DotCheckItemMethodEdit.html" />
			<Content Include="views\åºç¡èµæ\åºç¡èµæ\Gy_DotCheckItemClassEdit.html" />
			<Content Include="views\åºç¡èµæ\åºç¡èµæ\Gy_DotCheckItemMethodList.html" />
			@@ -2140,6 +2141,13 @@
			<Compile Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\xmlLYS_ReceiveOtherBillMainList.aspx.designer.cs">
			<DependentUpon>xmlLYS_ReceiveOtherBillMainList.aspx</DependentUpon>
			</Compile>
			<Compile Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\xmlSRM_Web_BarCodeBillList.aspx.cs">
			<DependentUpon>xmlSRM_Web_BarCodeBillList.aspx</DependentUpon>
			<SubType>ASPXCodeBehind</SubType>
			</Compile>
			<Compile Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\xmlSRM_Web_BarCodeBillList.aspx.designer.cs">
			<DependentUpon>xmlSRM_Web_BarCodeBillList.aspx</DependentUpon>
			</Compile>
			<Compile Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\xmlPM_WorkTaskBillMyList.aspx.cs">
			<DependentUpon>xmlPM_WorkTaskBillMyList.aspx</DependentUpon>
			<SubType>ASPXCodeBehind</SubType>

			@@ -1066,6 +1066,7 @@
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 100 }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 100 }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 100 }
			, { field: 'æ¡ç æ°é', title: 'æ¡ç æ°é', width: 100 }
			, { field: 'åºåæ°é', title: 'åºåæ°é', width: 100 }
			]];
			listOption.data = data;

			@@ -281,6 +281,10 @@
			case "Xs_SeOrderBill_StockInCodeNote": //éå®è®¢å å¥åºç å
			CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Xs_SeOrderBill_StockInCodeNote.aspx?linterid=" + value, true, "");
			break;
			case "HBarCodePrint"://ç©ææ¡ç æå°
			//CreateDisplayViewerEx("100%", "100%", "../../views/grf/" + OpenTmp + ".grf", "../../views/SRM/xmlSRM_Web_BarCodeBillList.aspx?linterid=" + value, true, "");
			CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlSRM_Web_BarCodeBillList.aspx?linterid=" + value, true, "");
			break;
			}
			</script>
			</body>

New file
			@@ -0,0 +1,26 @@
			ï»¿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlSRM_Web_BarCodeBillList.aspx.cs" Inherits="WebTM.views.åºç¡èµæ.å¬ç¨åºç¡èµæ.xmlSRM_Web_BarCodeBillList" %>

			<!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)
			{
			//âç¹å«æç¤ºâï¼
			//ä¸åçæ°æ®åºåºè¯¥éç¨ä¸åçæ¥è¡¨XMLæ°æ®çæç±»ï¼SQL Serveræ°æ®åºç¨SqlXMLReportDataï¼Oracleæ°æ®åºç¨OracleXMLReportData
			//OledbXMLReportDataéåäºAccessçæ¬å°æ°æ®åºï¼ä¸ºäºæ¼ç¤ºæ¹ä¾¿ï¼è¿éä»Grid++ReportçAccessä¾åæ°æ®åºä¸è·åæ¥è¡¨æ°æ®

			SqlXMLReportData.GenOneRecordset(this, "select a.HBarCode_White HBarCode_White,temp.HSupPartName HSupPartName,temp.HSupBarCodeNumber MFGPartNumber,temp.HCountryType CountryofOrigin,(select REPLACE(item, 'Q', '') from split(a.HBarCode_White, ':') where id = 6) Quantity, temp.HGrossWeight GrossWeight, temp.HPARTNAME PartName , (select item from split(a.HBarCode_White, ':') where id = 2) ContentLabelID , temp.HSupNumber Supplier, REPLACE(convert(varchar(10), GETDATE(), 20), '-', '') + ' ' + convert(varchar(5), GETDATE(), 24) MFGDate , REPLACE(convert(varchar(10), GETDATE(), 20), '-', '') SupplierLotCode , (select REPLACE(item, 'P', '') from split(a.HBarCode_White, ':') where id = 4) BBM from Sc_PackUnionBillMain a left join Gy_Material m on a.HMaterID = m.HItemID left join Sc_PackUnionBillBarCode_temp temp on m.HNumber = temp.HMaterNumber where a.HInterID in(" + Request.Params["linterid"] + ")");
			}
			</script>
			</head>
			<body>
			<form id="form1" runat="server">
			<div>
			</div>
			</form>
			</body>
			</html>

New file
			@@ -0,0 +1,17 @@
			ï»¿using 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 xmlSRM_Web_BarCodeBillList : System.Web.UI.Page
			{
			protected void Page_Load(object sender, EventArgs e)
			{

			}
			}
			}

New file
			@@ -0,0 +1,26 @@
			ï»¿//------------------------------------------------------------------------------
			// <èªå¨çæ>
			// æ¤ä»£ç ç±å·¥å·çæã
			//
			// å¯¹æ¤æä»¶çæ´æ¹å¯è½å¯¼è´ä¸æ£ç¡®çè¡ä¸ºï¼å¦æ
			// éæ°çæä»£ç ï¼åæåæ´æ¹å°ä¸¢å¤±ã
			// </èªå¨çæ>
			//------------------------------------------------------------------------------

			namespace WebTM.views.åºç¡èµæ.å¬ç¨åºç¡èµæ
			{


			public partial class xmlSRM_Web_BarCodeBillList
			{

			/// <summary>
			/// form1 æ§ä»¶ã
			/// </summary>
			/// <remarks>
			/// èªå¨çæçåæ®µã
			/// è¥è¦è¿è¡ä¿®æ¹ï¼è¯·å°åæ®µå£°æä»è®¾è®¡å¨æä»¶ç§»å°ä»£ç éèæä»¶ã
			/// </remarks>
			protected global::System.Web.UI.HtmlControls.HtmlForm form1;
			}
			}

			@@ -375,7 +375,8 @@
			//æ æ³¨éä¸æ ·å¼
			obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click');
			});
			//æå°æé®

			//æå°
			//form.on('submit(Print)', function (obj) {//éåº
			// var checkStatus = table.checkStatus("mainTable"); //è·åéä¸è¡ç¶æ
			// var linterid = checkStatus.data[0].HInterID;
			@@ -388,7 +389,7 @@
			// //window.open("../../views/BaseSet/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());


			// var sWhere = "select * from h_v_SRM_BarCodeBillList where HItemID in(" + linterid + ") order by ç©æä»£ç ";
			// var sWhere = "select a.HBarCode_White HBarCode_White,temp.HSupPartName HSupPartName,temp.HSupBarCodeNumber MFGPartNumber,temp.HCountryType CountryofOrigin,(select REPLACE(item, 'Q', '') from split(a.HBarCode_White, ':') where id = 6) Quantity, temp.HGrossWeight GrossWeight, temp.HPARTNAME PartName , (select item from split(a.HBarCode_White, ':') where id = 2) ContentLabelID , temp.HSupNumber Supplier, REPLACE(convert(varchar(10), GETDATE(), 20), '-', '') + ' ' + convert(varchar(5), GETDATE(), 24) MFGDate , REPLACE(convert(varchar(10), GETDATE(), 20), '-', '') SupplierLotCode , (select REPLACE(item, 'P', '') from split(a.HBarCode_White, ':') where id = 4) BBM from Sc_PackUnionBillMain a left join Gy_Material m on a.HMaterID = m.HItemID left join Sc_PackUnionBillBarCode_temp temp on m.HNumber = temp.HMaterNumber where a.HInterID=" + linterid;

			// $.ajax({
			// type: "GET",
			@@ -400,7 +401,8 @@

			// if (data.data.length != 0) {
			// var dataPrint = [];
			// dataPrint.push({ "äº§ååç§°": data.data[0]["äº§ååç§°"], "æ¡ç ç¼å·": data.data[0]["æ¡ç ç¼å·"], "æ°é": data.data[0]["æ°é"], "æ¥æ": data.data[0]["æ¥æ"], "çäº§ä»»å¡å": data.data[0]["çäº§ä»»å¡å"], "æµè½¬å¡ç¼å·": data.data[0]["æµè½¬å¡ç¼å·"], "èªå®ä¹åæ®µ": data.data[0]["èªå®ä¹åæ®µ"], "é¡¹ç®ç¼å·": data.data[0]["é¡¹ç®ç¼å·"] }
			// dataPrint.push(data.data[0]
			// //{ "äº§ååç§°": data.data[0]["äº§ååç§°"], "æ¡ç ç¼å·": data.data[0]["æ¡ç ç¼å·"], "æ°é": data.data[0]["æ°é"], "æ¥æ": data.data[0]["æ¥æ"], "çäº§ä»»å¡å": data.data[0]["çäº§ä»»å¡å"], "æµè½¬å¡ç¼å·": data.data[0]["æµè½¬å¡ç¼å·"], "èªå®ä¹åæ®µ": data.data[0]["èªå®ä¹åæ®µ"], "é¡¹ç®ç¼å·": data.data[0]["é¡¹ç®ç¼å·"] }
			// );

			// var Customer = {
			@@ -410,7 +412,7 @@
			// var args = {
			// type: "print",
			// showOptionDlg: false, //å¦æä¸æ¾ç¤ºæå°å¯¹è¯æ¡èç´æ¥æå°ï¼å°æ¤è¡æ³¨éå»æå³å¯
			// report: urlAddRandomNo("../../views/grf/åè£åç©ææ è¯å¡(ç½é¡µç).grf"),
			// report: urlAddRandomNo("../../grf/ç½æ æå°.grf"),
			// data: Customer
			// };
			// //var args = {
			@@ -432,8 +434,9 @@
			// layer.msg("éè¯¯:" + err, { icon: 5 });
			// }
			// })


			//});


			form.on('submit(Print)', function (obj) {//éåº
			var checkStatus = table.checkStatus("mainTable"); //è·åéä¸è¡ç¶æ
			@@ -441,58 +444,10 @@
			////æå¼æå°æ¨¡æ¿
			////var linterid = $("#HInterID").val();
			////var linterid = "28973";
			//var Type = "HBarCodePrint";
			//var OpenTmp = "åè£åç©ææ è¯å¡(ç½é¡µç)";
			////var ReportViewer = document.getElementById("ReportViewer");
			//window.open("../../views/BaseSet/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());


			var sWhere = "select a.HBarCode_White HBarCode_White,temp.HSupPartName HSupPartName,temp.HSupBarCodeNumber MFGPartNumber,temp.HCountryType CountryofOrigin,(select REPLACE(item, 'Q', '') from split(a.HBarCode_White, ':') where id = 6) Quantity, temp.HGrossWeight GrossWeight, temp.HPARTNAME PartName , (select item from split(a.HBarCode_White, ':') where id = 2) ContentLabelID , temp.HSupNumber Supplier, REPLACE(convert(varchar(10), GETDATE(), 20), '-', '') + ' ' + convert(varchar(5), GETDATE(), 24) MFGDate , REPLACE(convert(varchar(10), GETDATE(), 20), '-', '') SupplierLotCode , (select REPLACE(item, 'P', '') from split(a.HBarCode_White, ':') where id = 4) BBM from Sc_PackUnionBillMain a left join Gy_Material m on a.HMaterID = m.HItemID left join Sc_PackUnionBillBarCode_temp temp on m.HNumber = temp.HMaterNumber where a.HInterID=" + linterid;

			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			async: true,
			data: { "sWhere": sWhere },
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼

			if (data.data.length != 0) {
			var dataPrint = [];
			dataPrint.push(data.data[0]
			//{ "äº§ååç§°": data.data[0]["äº§ååç§°"], "æ¡ç ç¼å·": data.data[0]["æ¡ç ç¼å·"], "æ°é": data.data[0]["æ°é"], "æ¥æ": data.data[0]["æ¥æ"], "çäº§ä»»å¡å": data.data[0]["çäº§ä»»å¡å"], "æµè½¬å¡ç¼å·": data.data[0]["æµè½¬å¡ç¼å·"], "èªå®ä¹åæ®µ": data.data[0]["èªå®ä¹åæ®µ"], "é¡¹ç®ç¼å·": data.data[0]["é¡¹ç®ç¼å·"] }
			);

			var Customer = {
			"Table": dataPrint
			}

			var args = {
			type: "print",
			showOptionDlg: false, //å¦æä¸æ¾ç¤ºæå°å¯¹è¯æ¡èç´æ¥æå°ï¼å°æ¤è¡æ³¨éå»æå³å¯
			report: urlAddRandomNo("../../grf/ç½æ æå°.grf"),
			data: Customer
			};
			//var args = {
			// report: urlAddRandomNo("../../views/grf/åè£åç©ææ è¯å¡(ç½é¡µç).grf"),
			// data: Customer
			//};
			webapp_ws_ajax_run(args);
			} else {
			layer.msg("æ¥æ æ°æ®!");
			}

			}
			else {
			layer.msg(data.Message, { icon: 5 });
			}
			layer.closeAll("loading");
			},
			error: function (err) {
			layer.msg("éè¯¯:" + err, { icon: 5 });
			}
			})

			var Type = "HBarCodePrint";
			var OpenTmp = "ç½æ æå°";
			//var ReportViewer = document.getElementById("ReportViewer");
			window.open("../../åºç¡èµæ/å¬ç¨åºç¡èµæ/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
			});

			//æå°æé®

			@@ -124,6 +124,12 @@
			</button>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 65px;">å·¥æ¶</label>
			<div class="layui-input-block" style="margin-left: 95px;">
			<input type="text" class="layui-input" name="HWorkTimes" id="HWorkTimes" value="0" style="width: 150px;">
			</div>
			</div>
			</div>
			<div class="layui-row" style="margin-bottom: 15px;">
			<div class="layui-inline">
			@@ -193,6 +199,14 @@
			</div>
			</div>
			</div>
			<div class="layui-row" style="margin-bottom: 15px;">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 65px;">ç©´å·</label>
			<div class="layui-input-block" style="margin-left: 95px;">
			<input type="text" class="layui-input" name="HMouldNum" id="HMouldNum" style="width: 150px;" >
			</div>
			</div>
			</div>
			</div>
			</div>
			<div id="center" style="width: 100%; height: calc(40vh); margin-top: 1%;">