MES-WEB-LayUI.git

parent: 7c6d6395 | 补丁 | 提交 | show whitespace

llj

5 天以前 a8bfa0587bde2b16c87964720263ba3a0754e1f6

新增小卫组托打印模板

3个文件已修改

3个文件已添加

	WebTM/WebTM.csproj	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/layuiadmin/Scripts/webConfig.js	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/Baseset/HBarPlanPrint.html	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/公用基础资料/xmlLBM_xiaoweizutuo.aspx	29 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/公用基础资料/xmlLBM_xiaoweizutuo.aspx.cs	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/公用基础资料/xmlLBM_xiaoweizutuo.aspx.designer.cs	26 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/WebTM.csproj

@@ -472,6 +472,7 @@
    <Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_MaterialPackingRelation_Edit.html" />
    <Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_ItemMoney.html" />
    <Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Cg_ContractTransportBillList.html" />
    <Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\xmlLBM_xiaoweizutuo.aspx" />
    <Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx" />
    <Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\xmlLBM_Sc_ProcessExchangeBillList_stock.aspx" />
    <Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\xmlzuotuo_xiaowei.aspx" />
@@ -2699,6 +2700,13 @@
    <Compile Include="App_Data\MssqlReportData.cs" />
    <Compile Include="App_Data\ReportData.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Compile Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\xmlLBM_xiaoweizutuo.aspx.cs">
      <DependentUpon>xmlLBM_xiaoweizutuo.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\xmlLBM_xiaoweizutuo.aspx.designer.cs">
      <DependentUpon>xmlLBM_xiaoweizutuo.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx.cs">
      <DependentUpon>xmlLBM_HGy_BarCodeBill_MiddleBox.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -7,8 +7,7 @@
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //æ¨ä¹æ¬å°éç½®
   /*  var WEBURL = "http://localhost:8082/API/";    //æè´ºæ¬å°éç½®*/
    //var WEBURL = "http://localhost:8082/API/";    //å¼ çå¹¿æ¬å°éç½®
<<<<<<< HEAD
    var WEBURL = "http://localhost:8080/API/";    //çä»ªæ¬å°éç½®
   /* var WEBURL = "http://localhost:8080/API/";    //çä»ªæ¬å°éç½®*/
    //var WEBURL = "http://localhost:81/API/"    //ç¿æ¶æ¶æ¬å°éç½®

    //var WEBURL = "http://localhost:8080/API/";    //çä»ªæ¬å°éç½®
@@ -16,15 +15,14 @@
    //var WEBURL = "http://localhost:81/API/"    //ç¿æ¶æ¶æ¬å°éç½®
    //var WEBURL = "http://localhost:81/API/"    //ç¿æ¶æ¶æ¬å°éç½®
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //æ¨ä¹æ¬å°éç½®
=======
    var WEBURL = "http://localhost:81/API/"    //ç¿æ¶æ¶æ¬å°éç½®

    /*var WEBURL = "http://localhost:81/API/"    //ç¿æ¶æ¶æ¬å°éç½®*/
   /* var WEBURL = "http://localhost:8080/API/";    //çä»ªæ¬å°éç½®*/
  //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //æ¨ä¹æ¬å°éç½®
>>>>>>> 2ed130171719a0848e8356d28055eb1bdf649d01
    //var WEBURL = "http://47.96.97.237/API/";          //æºäºæå¡å¨
    /*var WEBURL = "http://localhost:8082/LuBaoAPI/";*/  //ä½ææ°æ¬å°éç½®
    //var WEBURL = "http://localhost:81/API/";            // ééå²æ¬å°éç½®*/
     //var WEBURL = "http://localhost:8082/LuBaoAPI/";  //ææä¿æ¬å°éç½®
     var WEBURL = "http://localhost:8082/LuBaoAPI/";  //ææä¿æ¬å°éç½®
    //var WEBURL = "http://localhost:8088/ARAPI/";      //ä½ææ°æ¬å°éç½®(å®ç)
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";  //å¥¥é¦
    //var WEBURL = "http://10.1.4.155/API/";            //æ±ä¸°å®¢æ·NEW

 WebTM/views/Baseset/HBarPlanPrint.html

@@ -70,6 +70,9 @@
            case "HDepartMent"://é¨é¨åºç¡èµææå°
                CreateDisplayViewerEx("100%", "100%", "../grf/" + OpenTmp + ".grf", "xmlLBM_Gy_Department_Edit.aspx?linterid=" + value, true, "");
                break;
            case "HGy_BarCodeBill_xiaowei"://é¨é¨åºç¡èµææå°
                CreateDisplayViewerEx("100%", "100%", "../grf/" + OpenTmp + ".grf", "xmlLBM_xiaoweizutuo.aspx?linterid=" + value, true, "");
                break;
            //case "HPOOrderBill"://éè´è®¢ååæå°
            //    CreateDisplayViewerEx("100%", "100%", "../../views/grf/" + OpenTmp + ".grf", "xmlSRM_POInStockBill.aspx?linterid=" + value, true, "");
            //    break;

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

New file
@@ -0,0 +1,29 @@
ï»¿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_xiaoweizutuo.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)
    {
        //âç¹å«æç¤ºâï¼
        //ä¸åçæ°æ®åºåºè¯¥éç¨ä¸åçæ¥è¡¨XMLæ°æ®çæç±»ï¼SQL Serveræ°æ®åºç¨SqlXMLReportDataï¼Oracleæ°æ®åºç¨OracleXMLReportData
        //OledbXMLReportDataéåäºAccessçæ¬å°æ°æ®åºï¼ä¸ºäºæ¼ç¤ºæ¹ä¾¿ï¼è¿éä»Grid++ReportçAccessä¾åæ°æ®åºä¸è·åæ¥è¡¨æ°æ®

        //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"]);
        SqlXMLReportData.GenEntireData(this, "select a.HInterID,HBarCode_Pack æ æ¿ç ,HBarCode ä¸ç®±ç ,b.hnumber ç©æä»£ç ,b.hname ç©æåç§° from Sc_PackUnionBillsub a left join Gy_Material b on a.HMaterID = b. hitemid  where HBarCode_Pack in (" + Request.Params["linterid"] + ") ", "select 1");
    }
</script>
</head>
<body>
    <form id="form1" runat="server">
        <div>
        </div>
    </form>
</body>
</html>

 WebTM/views/»ù´¡×ÊÁÏ/¹«ÓÃ»ù´¡×ÊÁÏ/xmlLBM_xiaoweizutuo.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 xmlLBM_xiaoweizutuo : System.Web.UI.Page
    {
        protected void Page_Load(object sender, EventArgs e)
        {

        }
    }
}

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

New file
@@ -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;
    }
}

			@@ -472,6 +472,7 @@
			<Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_MaterialPackingRelation_Edit.html" />
			<Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_ItemMoney.html" />
			<Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Cg_ContractTransportBillList.html" />
			<Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\xmlLBM_xiaoweizutuo.aspx" />
			<Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx" />
			<Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\xmlLBM_Sc_ProcessExchangeBillList_stock.aspx" />
			<Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\xmlzuotuo_xiaowei.aspx" />
			@@ -2699,6 +2700,13 @@
			<Compile Include="App_Data\MssqlReportData.cs" />
			<Compile Include="App_Data\ReportData.cs" />
			<Compile Include="Properties\AssemblyInfo.cs" />
			<Compile Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\xmlLBM_xiaoweizutuo.aspx.cs">
			<DependentUpon>xmlLBM_xiaoweizutuo.aspx</DependentUpon>
			<SubType>ASPXCodeBehind</SubType>
			</Compile>
			<Compile Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\xmlLBM_xiaoweizutuo.aspx.designer.cs">
			<DependentUpon>xmlLBM_xiaoweizutuo.aspx</DependentUpon>
			</Compile>
			<Compile Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx.cs">
			<DependentUpon>xmlLBM_HGy_BarCodeBill_MiddleBox.aspx</DependentUpon>
			<SubType>ASPXCodeBehind</SubType>

			@@ -7,8 +7,7 @@
			//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //æ¨ä¹æ¬å°éç½®
			/* var WEBURL = "http://localhost:8082/API/"; //æè´ºæ¬å°éç½®*/
			//var WEBURL = "http://localhost:8082/API/"; //å¼ çå¹¿æ¬å°éç½®
			<<<<<<< HEAD
			var WEBURL = "http://localhost:8080/API/"; //çä»ªæ¬å°éç½®
			/* var WEBURL = "http://localhost:8080/API/"; //çä»ªæ¬å°éç½®*/
			//var WEBURL = "http://localhost:81/API/" //ç¿æ¶æ¶æ¬å°éç½®

			//var WEBURL = "http://localhost:8080/API/"; //çä»ªæ¬å°éç½®
			@@ -16,15 +15,14 @@
			//var WEBURL = "http://localhost:81/API/" //ç¿æ¶æ¶æ¬å°éç½®
			//var WEBURL = "http://localhost:81/API/" //ç¿æ¶æ¶æ¬å°éç½®
			//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //æ¨ä¹æ¬å°éç½®
			=======
			var WEBURL = "http://localhost:81/API/" //ç¿æ¶æ¶æ¬å°éç½®

			/var WEBURL = "http://localhost:81/API/" //ç¿æ¶æ¶æ¬å°éç½®/
			/* var WEBURL = "http://localhost:8080/API/"; //çä»ªæ¬å°éç½®*/
			//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //æ¨ä¹æ¬å°éç½®
			>>>>>>> 2ed130171719a0848e8356d28055eb1bdf649d01
			//var WEBURL = "http://47.96.97.237/API/"; //æºäºæå¡å¨
			/var WEBURL = "http://localhost:8082/LuBaoAPI/";/ //ä½ææ°æ¬å°éç½®
			//var WEBURL = "http://localhost:81/API/"; // ééå²æ¬å°éç½®*/
			//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //ææä¿æ¬å°éç½®
			var WEBURL = "http://localhost:8082/LuBaoAPI/"; //ææä¿æ¬å°éç½®
			//var WEBURL = "http://localhost:8088/ARAPI/"; //ä½ææ°æ¬å°éç½®(å®ç)
			//var WEBURL = "http://61.164.86.218:8099/ABAPI/"; //å¥¥é¦
			//var WEBURL = "http://10.1.4.155/API/"; //æ±ä¸°å®¢æ·NEW

			@@ -70,6 +70,9 @@
			case "HDepartMent"://é¨é¨åºç¡èµææå°
			CreateDisplayViewerEx("100%", "100%", "../grf/" + OpenTmp + ".grf", "xmlLBM_Gy_Department_Edit.aspx?linterid=" + value, true, "");
			break;
			case "HGy_BarCodeBill_xiaowei"://é¨é¨åºç¡èµææå°
			CreateDisplayViewerEx("100%", "100%", "../grf/" + OpenTmp + ".grf", "xmlLBM_xiaoweizutuo.aspx?linterid=" + value, true, "");
			break;
			//case "HPOOrderBill"://éè´è®¢ååæå°
			// CreateDisplayViewerEx("100%", "100%", "../../views/grf/" + OpenTmp + ".grf", "xmlSRM_POInStockBill.aspx?linterid=" + value, true, "");
			// break;

New file
			@@ -0,0 +1,29 @@
			ï»¿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_xiaoweizutuo.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)
			{
			//âç¹å«æç¤ºâï¼
			//ä¸åçæ°æ®åºåºè¯¥éç¨ä¸åçæ¥è¡¨XMLæ°æ®çæç±»ï¼SQL Serveræ°æ®åºç¨SqlXMLReportDataï¼Oracleæ°æ®åºç¨OracleXMLReportData
			//OledbXMLReportDataéåäºAccessçæ¬å°æ°æ®åºï¼ä¸ºäºæ¼ç¤ºæ¹ä¾¿ï¼è¿éä»Grid++ReportçAccessä¾åæ°æ®åºä¸è·åæ¥è¡¨æ°æ®

			//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"]);
			SqlXMLReportData.GenEntireData(this, "select a.HInterID,HBarCode_Pack æ æ¿ç ,HBarCode ä¸ç®±ç ,b.hnumber ç©æä»£ç ,b.hname ç©æåç§° from Sc_PackUnionBillsub a left join Gy_Material b on a.HMaterID = b. hitemid where HBarCode_Pack in (" + Request.Params["linterid"] + ") ", "select 1");
			}
			</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 xmlLBM_xiaoweizutuo : System.Web.UI.Page
			{
			protected void Page_Load(object sender, EventArgs e)
			{

			}
			}
			}

New file
			@@ -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;
			}
			}