MES-WEB-LayUI.git

parent: 185a4aca | 补丁 | 提交 | ignore whitespace

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

wtt

2025-12-15 a853c96fb287ea5e9edaa39e0c63f6d9de04f9d1

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

4个文件已修改

3个文件已添加

	WebTM/WebTM.csproj	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/公用基础资料/HBarPlanPrint.html	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/公用基础资料/xmlLBM_HGy_BarCodeBill_MiddleBox.aspx	29 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/公用基础资料/xmlLBM_HGy_BarCodeBill_MiddleBox.aspx.cs	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/公用基础资料/xmlLBM_HGy_BarCodeBill_MiddleBox.aspx.designer.cs	26 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具管理/Gy_BarCodeBillList.html	45 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_UnbindList.html	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| 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_HGy_BarCodeBill_MiddleBox.aspx" />
    <Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\xmlLBM_Sc_ProcessExchangeBillList_stock.aspx" />
    <Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\xmlzuotuo_xiaowei.aspx" />
    <Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\xmlLBM_HGy_BarCodeBill_XinDa.aspx" />
@@ -2693,6 +2694,13 @@
    <Compile Include="App_Data\MssqlReportData.cs" />
    <Compile Include="App_Data\ReportData.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Compile Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx.cs">
      <DependentUpon>xmlLBM_HGy_BarCodeBill_MiddleBox.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx.designer.cs">
      <DependentUpon>xmlLBM_HGy_BarCodeBill_MiddleBox.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\xmlLBM_Sc_ProcessExchangeBillList_stock.aspx.cs">
      <DependentUpon>xmlLBM_Sc_ProcessExchangeBillList_stock.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>

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

@@ -170,6 +170,9 @@
            case "HGy_BarCodeBill_JiaNan_BarCode_Pack"://æ¡ç æå°_è¿¦å
                CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_HGy_BarCodeBill.aspx?linterid=" + value, true, "");
                break;
            case "HGy_BarCodeBill_MiddleBox"://ä¸ç®±æ¡ç æå°ï¼å°å«ï¼
                CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_HGy_BarCodeBill_MiddleBox.aspx?linterid=" + value, true, "");
                break;
            case "HIcmoBill"://çäº§è®¢åæå°
                CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Sc_ICMOBillList.aspx?linterid=" + value, true, "");
                break;

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

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

<!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_IF_BarCodeBillList where hmainid in(" + Request.Params["linterid"]+ ") order by hmainid desc");
            SqlXMLReportData.GenOneRecordset(this, "exec h_p_Gy_GetCaseCodeInfo '" + Request.Params["linterid"]+ "'");
        }
</script>
</head>
<body>
    <form id="form1" runat="server">
        <div>
        </div>
    </form>
</body>
</html>

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

        //}
    }
}

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

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

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


    public partial class xmlLBM_HGy_BarCodeBill_MiddleBox
    {

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

 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£ÖÎ¾ß¹ÜÀí/Gy_BarCodeBillList.html

@@ -230,6 +230,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-reload" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>å·æ°</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-view" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>é¢è§</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>æå°</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print-zx" lay-event="btn-print-zx"><i class="layui-icon layui-icon-print"></i>ä¸ç®±æ ç¾æå°</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Drop" id="set_Drop"><i class="layui-icon layui-icon-radio"></i>ä½åº</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_DeDrop" id="set_DeDrop"><i class="layui-icon layui-icon-radio"></i>åä½åº</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Delete" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
@@ -375,6 +376,9 @@
                                }
                            }
                        });
                        break;
                    case 'btn-print-zx':
                        PrintZX();
                        break;
                    //å·æ°
                    case 'btn-reload':
@@ -818,6 +822,47 @@
            }
            //#endregion

            //#region
            function PrintZX() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                var ModRightName = 'Gy_BarCodeBillList_Print';
                $.ajax({
                    url: GetWEBURL() + '/Gy_BarCodeBillList/GetBarCodeBillPermission',
                    type: "GET",
                    async: false,
                    data: { "user": sessionStorage["HUserName"] },
                    success: function (res) {
                        if (res.data == 1) {
                            if (checkStatus.data.length > 0) {
                                var rows = '';
                                for (var i = 0; i < data.length; i++) {
                                    rows += data[i].ä¸ç®±ç .toString() + ',';
                                }
                                rows = rows.substring(rows.length - 1, 0);
                                layer.open({
                                    type: 2
                                    , area: ['40%', '80%']
                                    , title: 'æå°æ¨¡çéæ©'
                                    , shade: 0.6 //é®ç½©éæåº¦
                                    , maxmin: false //åè®¸å¨å±æå°å
                                    , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
                                    , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + rows + '&MyMsg=' + rows + '&Type=HGy_BarCodeBill_MiddleBox', 'yes']
                                    , resize: false
                                })
                            }
                            else {
                                layer.msg(get_MessageError('[0000-1-016]è¯·éæ©æ°æ®æå°ï¼', sessionStorage["HTranSlate"]));
                            }
                        }
                        else {
                            layer.alert(get_MessageError("æ æå°æé!", sessionStorage["HTranSlate"]), { icon: 5 });
                        }
                    }
                });
            }
            //#endregion

            //#endregion
            //è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
            function get_Display(sWhere) {

 WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾_Ð¡ÎÀ/Cj_ProcessItemStationPlatform_UnbindList.html

@@ -500,16 +500,19 @@
                    sWhere += " and " + ColName2 + " " + com2;
                }
                if (HICMOBillNo) {
                    sWhere += " and çäº§è®¢åå· like '%" + HICMOBillNo + "%'";
                    sWhere += " and å·¥åç¼å· like '%" + HICMOBillNo + "%'";
                }

                if (HBarcode_SN) {
                    sWhere += " and DSN like '%" + HBarcode_SN + "%'";
                }
                if (HBarcode_ZB) {
                    sWhere += "and  ç®¡å¶åºå· like 'P%' and ç®¡å¶åºå· like '%XXX' and ç®¡å¶åºå·='" + HBarcode_ZB+"'";
                    sWhere += "and  æ æ¿ç  like '%" + HBarcode_ZB + "%'";

                }
                if (HBarcode_ZX) {
                    sWhere += "and ç®¡å¶åºå· like 'MZXH%' and ç®¡å¶åºå·='" + HBarcode_ZX+"'";
                    sWhere += "and  ä¸ç®±ç  like '%" + HBarcode_ZX + "%'";

                }

                get_Display(sWhere);
@@ -550,7 +553,7 @@
                            item[itemobj] = "";
                        }
                        if (item[itemobj].length > 0) {  // åè®¾åæ®µåä¸ºfield
                            item[itemobj] = item[itemobj].toString().replaceALL(/[\r\n]+/g, '');  // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
                            item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, '').replace(/[\r\n]+/g, '').replace(/[\r\n]+/g, '');  // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
                        }
                    }
                });

			@@ -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_HGy_BarCodeBill_MiddleBox.aspx" />
			<Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\xmlLBM_Sc_ProcessExchangeBillList_stock.aspx" />
			<Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\xmlzuotuo_xiaowei.aspx" />
			<Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\xmlLBM_HGy_BarCodeBill_XinDa.aspx" />
			@@ -2693,6 +2694,13 @@
			<Compile Include="App_Data\MssqlReportData.cs" />
			<Compile Include="App_Data\ReportData.cs" />
			<Compile Include="Properties\AssemblyInfo.cs" />
			<Compile Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx.cs">
			<DependentUpon>xmlLBM_HGy_BarCodeBill_MiddleBox.aspx</DependentUpon>
			<SubType>ASPXCodeBehind</SubType>
			</Compile>
			<Compile Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx.designer.cs">
			<DependentUpon>xmlLBM_HGy_BarCodeBill_MiddleBox.aspx</DependentUpon>
			</Compile>
			<Compile Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\xmlLBM_Sc_ProcessExchangeBillList_stock.aspx.cs">
			<DependentUpon>xmlLBM_Sc_ProcessExchangeBillList_stock.aspx</DependentUpon>
			<SubType>ASPXCodeBehind</SubType>

			@@ -170,6 +170,9 @@
			case "HGy_BarCodeBill_JiaNan_BarCode_Pack"://æ¡ç æå°_è¿¦å
			CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_HGy_BarCodeBill.aspx?linterid=" + value, true, "");
			break;
			case "HGy_BarCodeBill_MiddleBox"://ä¸ç®±æ¡ç æå°ï¼å°å«ï¼
			CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_HGy_BarCodeBill_MiddleBox.aspx?linterid=" + value, true, "");
			break;
			case "HIcmoBill"://çäº§è®¢åæå°
			CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Sc_ICMOBillList.aspx?linterid=" + value, true, "");
			break;

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

			<!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_IF_BarCodeBillList where hmainid in(" + Request.Params["linterid"]+ ") order by hmainid desc");
			SqlXMLReportData.GenOneRecordset(this, "exec h_p_Gy_GetCaseCodeInfo '" + 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 xmlLBM_HGy_BarCodeBill_MiddleBox : 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_HGy_BarCodeBill_MiddleBox
			{

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

			@@ -230,6 +230,7 @@
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-reload" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-view" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>é¢è§</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>æå°</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print-zx" lay-event="btn-print-zx"><i class="layui-icon layui-icon-print"></i>ä¸ç®±æ ç¾æå°</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Drop" id="set_Drop"><i class="layui-icon layui-icon-radio"></i>ä½åº</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_DeDrop" id="set_DeDrop"><i class="layui-icon layui-icon-radio"></i>åä½åº</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Delete" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
			@@ -375,6 +376,9 @@
			}
			}
			});
			break;
			case 'btn-print-zx':
			PrintZX();
			break;
			//å·æ°
			case 'btn-reload':
			@@ -818,6 +822,47 @@
			}
			//#endregion

			//#region
			function PrintZX() {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			var ModRightName = 'Gy_BarCodeBillList_Print';
			$.ajax({
			url: GetWEBURL() + '/Gy_BarCodeBillList/GetBarCodeBillPermission',
			type: "GET",
			async: false,
			data: { "user": sessionStorage["HUserName"] },
			success: function (res) {
			if (res.data == 1) {
			if (checkStatus.data.length > 0) {
			var rows = '';
			for (var i = 0; i < data.length; i++) {
			rows += data[i].ä¸ç®±ç .toString() + ',';
			}
			rows = rows.substring(rows.length - 1, 0);
			layer.open({
			type: 2
			, area: ['40%', '80%']
			, title: 'æå°æ¨¡çéæ©'
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: false //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + rows + '&MyMsg=' + rows + '&Type=HGy_BarCodeBill_MiddleBox', 'yes']
			, resize: false
			})
			}
			else {
			layer.msg(get_MessageError('[0000-1-016]è¯·éæ©æ°æ®æå°ï¼', sessionStorage["HTranSlate"]));
			}
			}
			else {
			layer.alert(get_MessageError("æ æå°æé!", sessionStorage["HTranSlate"]), { icon: 5 });
			}
			}
			});
			}
			//#endregion

			//#endregion
			//è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
			function get_Display(sWhere) {

			@@ -500,16 +500,19 @@
			sWhere += " and " + ColName2 + " " + com2;
			}
			if (HICMOBillNo) {
			sWhere += " and çäº§è®¢åå· like '%" + HICMOBillNo + "%'";
			sWhere += " and å·¥åç¼å· like '%" + HICMOBillNo + "%'";
			}

			if (HBarcode_SN) {
			sWhere += " and DSN like '%" + HBarcode_SN + "%'";
			}
			if (HBarcode_ZB) {
			sWhere += "and ç®¡å¶åºå· like 'P%' and ç®¡å¶åºå· like '%XXX' and ç®¡å¶åºå·='" + HBarcode_ZB+"'";
			sWhere += "and æ æ¿ç like '%" + HBarcode_ZB + "%'";

			}
			if (HBarcode_ZX) {
			sWhere += "and ç®¡å¶åºå· like 'MZXH%' and ç®¡å¶åºå·='" + HBarcode_ZX+"'";
			sWhere += "and ä¸ç®±ç like '%" + HBarcode_ZX + "%'";

			}

			get_Display(sWhere);
			@@ -550,7 +553,7 @@
			item[itemobj] = "";
			}
			if (item[itemobj].length > 0) { // åè®¾åæ®µåä¸ºfield
			item[itemobj] = item[itemobj].toString().replaceALL(/[\r\n]+/g, ''); // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, '').replace(/[\r\n]+/g, '').replace(/[\r\n]+/g, ''); // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			}
			}
			});