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

yusijie

2024-01-16 4c57c18db819292c1c6e29fec84ad5788a1c58a8

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

 WebTM/Properties/PublishProfiles/JFTM.pubxml.user

Diff too large

 WebTM/Vlog/webapi20240115.txt

New file
@@ -0,0 +1,35 @@
2024/1/15 15:52:47 æ‰“印sql:select * from h_v_IF_POInStockBillList where cast( hmainid as bigint)*POWER(10,8)+hsubid in(100016479000000000) order by hmainid desc

2024/1/15 15:52:47 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;

2024/1/15 15:52:47 ReportDataSet:0

2024/1/15 15:52:55 æ‰“印sql:select * from h_v_IF_POInStockBillList where cast( hmainid as bigint)*POWER(10,8)+hsubid in(100016479000000000) order by hmainid desc

2024/1/15 15:52:55 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;

2024/1/15 15:52:55 ReportDataSet:0

2024/1/15 15:53:08 æ‰“印sql:select * from h_v_IF_POInStockBillList where cast( hmainid as bigint)*POWER(10,8)+hsubid in(100016479000000000,100015491000000000) order by hmainid desc

2024/1/15 15:53:08 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;

2024/1/15 15:53:08 ReportDataSet:0

2024/1/15 15:53:29 æ‰“印sql:select * from h_v_IF_POOrderBillList where  cast( hmainid as bigint)*POWER(10,8)+hsubid  in(47500100249) order by hmainid desc

2024/1/15 15:53:29 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;

2024/1/15 15:53:29 ReportDataSet:1

2024/1/15 15:53:45 æ‰“印sql:select * from h_v_IF_POOrderBillList where  cast( hmainid as bigint)*POWER(10,8)+hsubid  in(47500100249) order by hmainid desc

2024/1/15 15:53:45 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;

2024/1/15 15:53:45 ReportDataSet:1

2024/1/15 15:54:46 æ‰“印sql:select * from h_v_IF_POOrderBillList where  cast( hmainid as bigint)*POWER(10,8)+hsubid  in(47500100249) order by hmainid desc

2024/1/15 15:54:46 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;

2024/1/15 15:54:46 ReportDataSet:1

 WebTM/Vlog/webapi20240116.txt

New file
@@ -0,0 +1,29 @@
2024/1/16 8:47:13 æ‰“印sql:select * from h_v_IF_POOrderBillList where  cast( hmainid as bigint)*POWER(10,8)+hsubid  in(47500100249) order by hmainid desc

2024/1/16 8:47:13 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;

2024/1/16 8:47:13 ReportDataSet:1

2024/1/16 9:24:38 æ‰“印sql:select max(单据号)单据号,max(部门)部门,max(日期)日期,物料代码,max(物料名称)物料名称,规格型号,sum(数量)数量,max(计量单位)计量单位,max(供应商)供应商 from h_v_IF_POInStockBackBillList where hmainid=100002 group by ç‰©æ–™ä»£ç ,规格型号 order by å•æ®å·

2024/1/16 9:24:38 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;

2024/1/16 9:24:38 ReportDataSet:1

2024/1/16 9:27:52 æ‰“印sql:select max(单据号)单据号,max(部门)部门,max(日期)日期,物料代码,max(物料名称)物料名称,规格型号,sum(数量)数量,max(计量单位)计量单位,max(供应商)供应商 from h_v_IF_POInStockBackBillList where hmainid=1515 group by ç‰©æ–™ä»£ç ,规格型号 order by å•æ®å·

2024/1/16 9:27:52 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;

2024/1/16 9:27:52 ReportDataSet:1

2024/1/16 9:28:03 æ‰“印sql:select max(单据号)单据号,max(部门)部门,max(日期)日期,物料代码,max(物料名称)物料名称,规格型号,sum(数量)数量,max(计量单位)计量单位,max(供应商)供应商 from h_v_IF_POInStockBackBillList where hmainid=1515 group by ç‰©æ–™ä»£ç ,规格型号 order by å•æ®å·

2024/1/16 9:28:03 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;

2024/1/16 9:28:03 ReportDataSet:1

2024/1/16 9:37:14 æ‰“印sql:select max(单据号)单据号,max(部门)部门,max(日期)日期,物料代码,max(物料名称)物料名称,规格型号,sum(数量)数量,max(计量单位)计量单位,max(供应商)供应商 from h_v_IF_POInStockBackBillList where hmainid=100002 group by ç‰©æ–™ä»£ç ,规格型号 order by å•æ®å·

2024/1/16 9:37:15 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;

2024/1/16 9:37:15 ReportDataSet:1

 WebTM/WebTM.csproj

@@ -307,6 +307,7 @@
    <Content Include="views\基础资料\公用基础资料\HBarPlanPrint_GXPG.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Kf_SellOutBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Kf_SellOutBillList_BarCodeNote.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HPOInStockBackBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ICMOChangeBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeArrangement.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Kf_MateOutBillList.aspx" />
@@ -650,6 +651,7 @@
    <Content Include="views\grf\不良类型.grf" />
    <Content Include="views\grf\异常类型.grf" />
    <Content Include="views\grf\生产订单领料状态报表.grf" />
    <Content Include="views\grf\退料通知单.grf" />
    <None Include="Web.Debug.config">
      <DependentUpon>Web.config</DependentUpon>
    </None>
@@ -1747,6 +1749,13 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Kf_SellOutBillList_BarCodeNote.aspx.designer.cs">
      <DependentUpon>xmlLBM_Kf_SellOutBillList_BarCodeNote.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HPOInStockBackBill.aspx.cs">
      <DependentUpon>xmlLBM_HPOInStockBackBill.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HPOInStockBackBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_HPOInStockBackBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ICMOChangeBillList.aspx.cs">
      <DependentUpon>xmlLBM_Sc_ICMOChangeBillList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>

 WebTM/WebTM.csproj.user

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>D:\网站发布\后端代码\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\乔一计量单位列表\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>

 WebTM/views/grf/ÍËÁÏ֪ͨµ¥.grf

New file
@@ -0,0 +1,412 @@
{
    "Version":"6.8.2.2",
    "Font":{
        "Name":"宋体",
        "Size":105000,
        "Weight":400,
        "Charset":134
    },
    "Printer":{
        "Oriention":"Landscape",
        "LeftMargin":1.5,
        "TopMargin":0.5,
        "RightMargin":1.5,
        "BottomMargin":0.5
    },
    "DetailGrid":{
        "Recordset":{
            "Field":[
                {
                    "Name":"日期",
                    "Type":"DateTime",
                    "Format":"yyyy//MM//dd"
                },
                {
                    "Name":"供应商"
                },
                {
                    "Name":"物料代码"
                },
                {
                    "Name":"物料名称"
                },
                {
                    "Name":"规格型号"
                },
                {
                    "Name":"计量单位"
                },
                {
                    "Name":"单价",
                    "Type":"Currency"
                },
                {
                    "Name":"金额",
                    "Type":"Currency"
                },
                {
                    "Name":"含税单价",
                    "Type":"Currency"
                },
                {
                    "Name":"业务员"
                },
                {
                    "Name":"订单数量",
                    "Type":"Integer",
                    "Format":"0.####"
                },
                {
                    "Name":"数量"
                },
                {
                    "Name":"单据号"
                },
                {
                    "Name":"源单单号"
                },
                {
                    "Name":"交货日期",
                    "Type":"DateTime"
                },
                {
                    "Name":"部门"
                }
            ]
        },
        "Column":[
            {
                "Name":"序号",
                "Width":0.7673
            },
            {
                "Name":"计划跟踪号",
                "Width":2.8046
            },
            {
                "Name":"物料",
                "Width":3.4131
            },
            {
                "Name":"规格型号",
                "Width":3.4131
            },
            {
                "Name":"Column2",
                "Width":2.1696
            },
            {
                "Name":"Column3",
                "Width":2.5665
            },
            {
                "Name":"Column4",
                "Width":2.43417
            },
            {
                "Name":"Column5",
                "Width":3.81
            },
            {
                "Name":"Column6",
                "Width":2.80458
            },
            {
                "Name":"Column7",
                "Width":2.6458
            }
        ],
        "ColumnContent":{
            "Height":1.00542,
            "ColumnContentCell":[
                {
                    "Column":"序号",
                    "FreeCell":true,
                    "Control":[
                        {
                            "Type":"SystemVarBox",
                            "Name":"SystemVarBox1",
                            "Dock":"Fill",
                            "Font":{
                                "Name":"宋体",
                                "Weight":400,
                                "Charset":134
                            },
                            "TextAlign":"MiddleCenter",
                            "SystemVar":"RowNo"
                        }
                    ]
                },
                {
                    "Column":"计划跟踪号",
                    "Font":{
                        "Name":"宋体",
                        "Weight":400,
                        "Charset":134
                    },
                    "TextAlign":"MiddleCenter",
                    "DataField":"单据号"
                },
                {
                    "Column":"物料",
                    "Font":{
                        "Name":"宋体",
                        "Weight":400,
                        "Charset":134
                    },
                    "TextAlign":"MiddleCenter",
                    "DataField":"物料代码"
                },
                {
                    "Column":"规格型号",
                    "Font":{
                        "Name":"宋体",
                        "Weight":400,
                        "Charset":134
                    },
                    "TextAlign":"MiddleCenter",
                    "DataField":"物料名称"
                },
                {
                    "Column":"Column2",
                    "Font":{
                        "Name":"宋体",
                        "Weight":400,
                        "Charset":134
                    },
                    "TextAlign":"MiddleCenter",
                    "DataField":"数量"
                },
                {
                    "Column":"Column3",
                    "Font":{
                        "Name":"宋体",
                        "Weight":400,
                        "Charset":134
                    },
                    "TextAlign":"MiddleCenter",
                    "DataField":"计量单位"
                },
                {
                    "Column":"Column4",
                    "Font":{
                        "Name":"宋体",
                        "Weight":400,
                        "Charset":134
                    },
                    "TextAlign":"MiddleCenter",
                    "DataField":"部门"
                },
                {
                    "Column":"Column5",
                    "Font":{
                        "Name":"宋体",
                        "Weight":400,
                        "Charset":134
                    },
                    "TextAlign":"MiddleCenter",
                    "DataField":"日期"
                },
                {
                    "Column":"Column6",
                    "Font":{
                        "Name":"宋体",
                        "Weight":400,
                        "Charset":134
                    },
                    "TextAlign":"MiddleCenter",
                    "DataField":"供应商"
                },
                {
                    "Column":"Column7",
                    "Font":{
                        "Name":"宋体",
                        "Weight":400,
                        "Charset":134
                    },
                    "TextAlign":"MiddleCenter",
                    "DataField":"源单单号"
                }
            ]
        },
        "ColumnTitle":{
            "Height":0.79375,
            "RepeatStyle":"OnPage",
            "ColumnTitleCell":[
                {
                    "GroupTitle":false,
                    "Column":"序号",
                    "Font":{
                        "Name":"宋体",
                        "Weight":400,
                        "Charset":134
                    },
                    "TextAlign":"MiddleCenter",
                    "Text":"序号"
                },
                {
                    "GroupTitle":false,
                    "Column":"计划跟踪号",
                    "Font":{
                        "Name":"宋体",
                        "Weight":400,
                        "Charset":134
                    },
                    "TextAlign":"MiddleCenter",
                    "Text":"退料通知单号"
                },
                {
                    "GroupTitle":false,
                    "Column":"物料",
                    "Font":{
                        "Name":"宋体",
                        "Weight":400,
                        "Charset":134
                    },
                    "TextAlign":"MiddleCenter",
                    "Text":"物料代码"
                },
                {
                    "GroupTitle":false,
                    "Column":"规格型号",
                    "Font":{
                        "Name":"宋体",
                        "Weight":400,
                        "Charset":134
                    },
                    "TextAlign":"MiddleCenter",
                    "Text":"物料名称"
                },
                {
                    "GroupTitle":false,
                    "Column":"Column2",
                    "Font":{
                        "Name":"宋体",
                        "Weight":400,
                        "Charset":134
                    },
                    "TextAlign":"MiddleCenter",
                    "Text":"数量"
                },
                {
                    "GroupTitle":false,
                    "Column":"Column3",
                    "Font":{
                        "Name":"宋体",
                        "Weight":400,
                        "Charset":134
                    },
                    "TextAlign":"MiddleCenter",
                    "Text":"单位"
                },
                {
                    "GroupTitle":false,
                    "Column":"Column4",
                    "Font":{
                        "Name":"宋体",
                        "Weight":400,
                        "Charset":134
                    },
                    "TextAlign":"MiddleCenter",
                    "Text":"部门"
                },
                {
                    "GroupTitle":false,
                    "Column":"Column5",
                    "Font":{
                        "Name":"宋体",
                        "Weight":400,
                        "Charset":134
                    },
                    "TextAlign":"MiddleCenter",
                    "Text":"日期"
                },
                {
                    "GroupTitle":false,
                    "Column":"Column6",
                    "Font":{
                        "Name":"宋体",
                        "Weight":400,
                        "Charset":134
                    },
                    "TextAlign":"MiddleCenter",
                    "Text":"供应商"
                },
                {
                    "GroupTitle":false,
                    "Column":"Column7",
                    "Font":{
                        "Name":"宋体",
                        "Weight":400,
                        "Charset":134
                    },
                    "TextAlign":"MiddleCenter",
                    "Text":"采购订单号"
                }
            ]
        },
        "Group":[
            {
                "Name":"Group1",
                "GroupHeader":{
                    "Height":0
                },
                "GroupFooter":{
                    "Height":0
                }
            }
        ]
    },
    "ReportHeader":[
        {
            "Name":"ReportHeader1",
            "Height":3.81,
            "Control":[
                {
                    "Type":"MemoBox",
                    "Name":"MemoBox1",
                    "Left":7.59,
                    "Top":1.59,
                    "Width":11.62,
                    "Height":0.87,
                    "Border":{
                        "Styles":"[DrawBottom]"
                    },
                    "Font":{
                        "Name":"宋体",
                        "Size":180000,
                        "Bold":true,
                        "Charset":134
                    },
                    "TextAlign":"TopCenter",
                    "Text":"退   æ–™   é€š   çŸ¥    å•\r\n"
                },
                {
                    "Type":"Barcode",
                    "Name":"Barcode2",
                    "Left":21.59,
                    "Top":0.79,
                    "Width":3.59833,
                    "Height":2.80458,
                    "BarcodeType":"QRCode",
                    "CaptionPosition":"None",
                    "Text":"[#单据号#]",
                    "Font":{
                        "Name":"宋体",
                        "Size":82500,
                        "Weight":400,
                        "Charset":134
                    }
                }
            ],
            "RepeatOnPage":true
        }
    ],
    "ReportFooter":[
        {
            "Name":"ReportFooter1",
            "Height":4.78896,
            "RepeatOnPage":true
        }
    ]
}

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

@@ -235,6 +235,9 @@
            case "Sc_ICMOChangeBillList": //生产订单变更单
                CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Sc_ICMOChangeBillList.aspx?linterid=" + value, true, "");
                break;
            case "HPOInStockBackBill": //退料通知单
                CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_HPOInStockBackBill.aspx?linterid=" + value, true, "");
                break;
        }
    </script>
</body>

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

New file
@@ -0,0 +1,28 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_HPOInStockBackBill.aspx.cs" Inherits="WebTM.views.基础资料.公用基础资料.xmlLBM_MouldRepairOutStockBill" %>

<!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 max(单据号)单据号,max(部门)部门,max(日期)日期,物料代码,max(物料名称)物料名称,规格型号,sum(数量)数量,max(计量单位)计量单位,max(供应商)供应商 from h_v_IF_POInStockBackBillList where hmainid=" + Request.Params["linterid"]+ " group by ç‰©æ–™ä»£ç ,规格型号 order by å•æ®å·");
    }
</script>
</head>
<body>
    <form id="form1" runat="server">
        <div>
        </div>
    </form>
</body>
</html>

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

        }
    }
}

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

New file
@@ -0,0 +1,26 @@
//------------------------------------------------------------------------------
// <自动生成>
//     æ­¤ä»£ç ç”±å·¥å…·ç”Ÿæˆã€‚
//
//     å¯¹æ­¤æ–‡ä»¶çš„更改可能导致不正确的行为，如果
//     é‡æ–°ç”Ÿæˆä»£ç ï¼Œåˆ™æ‰€åšæ›´æ”¹å°†ä¸¢å¤±ã€‚
// </自动生成>
//------------------------------------------------------------------------------

namespace WebTM.views.基础资料.公用基础资料
{


    public partial class xmlLBM_HPOInStockBackBill
    {

        /// <summary>
        /// form1 æŽ§ä»¶ã€‚
        /// </summary>
        /// <remarks>
        /// è‡ªåŠ¨ç”Ÿæˆçš„字段。
        /// è‹¥è¦è¿›è¡Œä¿®æ”¹ï¼Œè¯·å°†å­—段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
    }
}

 WebTM/views/²É¹º¹ÜÀí/ÊÕÁÏ֪ͨµ¥/Add_Edit_Cg_POInStockBillList.html

@@ -157,8 +157,16 @@
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">选单号</label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="Box2" id="Box2" autocomplete="off">
                                                <input type="text" name="" id="" class="layui-input" value="" style="float:left;width:150px;">
                                                
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="XDHList" id="XDHList" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
                                            </div>
                                            <!--<label class="layui-form-label">选单号</label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="Box2" id="Box2" autocomplete="off">
                                            </div>-->
                                        </div>

                                    </div>
@@ -356,7 +364,8 @@
            var rowdata = [{
                "HMaterID": 0, "物料代码": "", "物料名称": "", "规格型号": "", "HUnitID": 0, "计量单位": "", "HWHID": 0, "收料仓库": "",
                "HSPID": 0, "收料仓位": "", "HSecUnitID": 0, "辅助单位": "", "HQty": "0", "HRemark": ""
                , "HPrice": "0", "HTaxPrice": "0", "HMoney": "0", "HDiscountRate": "0", "HTaxRate": "0", "HTaxMoney": "0"
                , "HPrice": "0", "HTaxPrice": "0", "HMoney": "0", "HDiscountRate": "0", "HTaxRate": "0", "HTaxMoney": "0",
                "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0
            }];

            // åˆå§‹åŒ–ç•Œ
@@ -369,8 +378,9 @@
                //新增行表格数据
                var NewRow = {
                    "HMaterID": 0, "物料代码": "", "物料名称": "", "规格型号": "", "HUnitID": 0, "计量单位": "", "HWHID": 0, "收料仓库": "",
                    "HSPID": 0, "收料仓位": "", "HSecUnitID": data.HSecUnitID, "辅助单位":data.辅助单位, "HQty": "0", "HRemark": ""
                    , "HPrice": "0", "HTaxPrice": "0", "HMoney": "0", "HDiscountRate": "0", "HTaxRate": "0", "HTaxMoney": "0"
                    "HSPID": 0, "收料仓位": "", "HSecUnitID": data.HSecUnitID, "辅助单位": data.辅助单位, "HQty": "0", "HRemark": ""
                    , "HPrice": "0", "HTaxPrice": "0", "HMoney": "0", "HDiscountRate": "0", "HTaxRate": "0", "HTaxMoney": "0",
                    "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
                };
                switch (obj.event) {
                    case 'btn-AddLine':
@@ -495,7 +505,7 @@
                            , HPrice: HPrice
                            , HMoney: HMoney
                        });
                       /* table.render(option);*/
                        /* table.render(option);*/
                        break;
                    case "HPrice":                                         //单价
                        //数据格式校验
@@ -505,7 +515,7 @@
                            obj.update({
                                HPrice: oldText
                            });
                           /* table.render(option);*/
                            /* table.render(option);*/

                            layer.msg("单价请输入大于0的数字!");
                            return;
@@ -514,7 +524,7 @@

                        //数据校验合格，重算记录
                        var HQty = obj.data.HQty * 1;                   //数量
                        var HPrice = value * 1;               
                        var HPrice = value * 1;
                        var HMoney = HQty * HPrice;                     //金额=数量*单价


@@ -584,6 +594,10 @@
                    , cols: [[ //子表
                        { type: 'checkbox', totalRowText: '合计行' }
                        , { type: 'numbers', title: '序号', width: 100, totalRow: true }
                        , { type: 'HSourceBillNo', title: '源单号', width: 100, hide: true }//源单号
                        , { field: 'HSourceBillType', title: '源单类型', width: 100, hide: true }//源单类型
                        , { type: 'HSourceInterID', title: '源单主内码', width: 100, hide: true }//源单主内码
                        , { field: 'HSourceEntryID', title: '源单子内码', width: 100, hide: true }//源单子内码
                        , { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true }
                        , { field: '物料代码', title: '物料代码', width: 150, edit: 'text', event: "HMaterID" }//f7
                        , { field: '物料名称', title: '物料名称', width: 150, }
@@ -608,7 +622,7 @@
                    ]]
                }

                option.data = rowdata;
                option.data = [];
                table.render(option);
            }

@@ -666,7 +680,11 @@
                                    {
                                        "HMaterID": data.HMaterID, "物料代码": data.物料代码, "物料名称": data.物料名称, "规格型号": data.规格型号, "HUnitID": data.HUnitID, "计量单位": data.计量单位, "HWHID": data.HWHID, "收料仓库": data.收料仓库,
                                        "HSPID": data.HSPID, "收料仓位": data.仓位名称, "HSecUnitID": data.HSecUnitID, "辅助单位": data.辅助单位, "HQty": data.数量, "HRemark": data.表体备注
                                        , "HPrice": data.单价, "HTaxPrice": data.含税单价, "HMoney": data.金额, "HDiscountRate": data.折扣率, "HTaxRate": data.税率, "HTaxMoney": data.税额
                                        , "HPrice": data.单价, "HTaxPrice": data.含税单价, "HMoney": data.金额, "HDiscountRate": data.折扣率, "HTaxRate": data.税率, "HTaxMoney": data.税额,
                                        "HSourceBillNo": data.源单单号,    //源单号
                                        "HSourceBillType": data.源单类型,   //源单类型
                                        "HSourceInterID": data.源单主内码,   //源单主内码
                                        "HSourceEntryID": data.源单子内码     //源单子内码
                                    }
                                )
                            }
@@ -746,6 +764,24 @@
                        table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
                        num.push(table.cache["mainTable"][i])
                    }
                }

                checkDuplicateData(num);
                const duplicateRows = checkDuplicateData(num);
                if (duplicateRows.length > 0) {
                    let message = '表格中存在重复数据，重复行数为：';

                    for (let i = 0; i < duplicateRows.length; i++) {
                        const { row1, row2 } = duplicateRows[i];
                        message += `第${row1}行与第${row2}行相同`;

                        if (i !== duplicateRows.length - 1) {
                            message += '，';
                        }
                    }

                    message += '，请删除其中一行';
                    layer.alert(message);
                }

                var sMainStr = JSON.stringify(data.field);
@@ -1112,6 +1148,80 @@
                })
            }

            //表头信息选择单据弹窗
            form.on('submit(XDHList)', function () {

                //页面层-自定义
                layer.open({
                    type: 2
                    , skin: "layui-layer-rim" //加上边框
                    , title: "采购入库单列表"  //标题
                    , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                    , shift: 2 //弹出动画
                    , area: ["90%", "90%"] //窗体大小
                    , maxmin: true //设置最大最小按钮是否显示
                    , content: ["../../采购管理/采购订单/Cg_POOrderBillList.html", "yes"]
                    , btn: ["确定", "取消"]
                    , btn1: function (index, laero) {
                        //按钮一  çš„回调
                        var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据

                        if (checkStatus.data.length == 0) {
                            return layer.msg("请至少选择一条数据!");
                        }
                        layer.alert("你已选择" + checkStatus.data.length + "条数据");
                        //获取收料通知单代码
                        var ProcessNumber = [];
                        for (var i = 0; i < checkStatus.data.length; i++) {
                            ProcessNumber.push(checkStatus.data[i]);
                        }

                        //获取当前位置所在行数
                        var NowNum = 0;
                        NowNum = option.data.length;

                        var j = 0;
                        for (var i = 0; i < ProcessNumber.length; i++) {
                            option.data.push({
                                "HMaterID": checkStatus.data[j].HMaterID, "物料代码": checkStatus.data[j].物料代码, "物料名称": checkStatus.data[j].物料名称, "规格型号": checkStatus.data[j].规格型号,
                                "HUnitID": checkStatus.data[j].HUnitID, "计量单位": checkStatus.data[j].计量单位, 
                                "HQty": checkStatus.data[j].数量, "HPrice": checkStatus.data[j].单价,
                                "HMoney": checkStatus.data[j].金额, "HTaxPrice": checkStatus.data[j].含税单价,  "HTaxRate": checkStatus.data[j].税率, "HTaxMoney": checkStatus.data[j].税额,
                                "HSourceBillNo": checkStatus.data[j].单据号, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
                            })
                            j++;
                        }
                        table.render(option);
                        layer.close(index);//关闭弹窗
                    }

                });
            });

             //判断所选着与表格是否有重复数据
            function checkDuplicateData(data) {
                const duplicates = [];

                for (let i = 0; i < data.length; i++) {
                    const currentItem = data[i];
                    let isDuplicate = false;

                    for (let j = i + 1; j < data.length; j++) {
                        const compareItem = data[j];
                        //主子id
                        if (currentItem.HSourceInterID === compareItem.HSourceInterID && currentItem.HSourceEntryID === compareItem.HSourceEntryID) {
                            isDuplicate = true;
                            duplicates.push({ row1: i + 1, row2: j + 1 }); // è®°å½•é‡å¤æ•°æ®æ‰€åœ¨è¡Œæ•°
                        }
                    }
                    if (isDuplicate && !duplicates.some(item => item.row1 === i + 1)) {
                        duplicates.push({ row1: i + 1, row2: -1 }); // è®°å½•é‡å¤æ•°æ®æ‰€åœ¨è¡Œæ•°ï¼Œ-1 è¡¨ç¤ºæœªæ‰¾åˆ°ä¸Žå½“前行重复的行
                    }
                }
                return duplicates;
            }


            //#region æ ¹æ®ç‰©æ–™ID获取物料详细信息
            function getMaterialByMaterID(HMaterID) {

 WebTM/views/²É¹º¹ÜÀí/ÊÕÁÏ֪ͨµ¥/Cg_POInStockBillList.html

@@ -213,7 +213,7 @@
                //直接执行列表筛选 åŠ è½½æ•°æ®åˆ°ç½‘æ ¼
                get_FastQuery(1)
                //查询
                get_Display(sWhere);
               //get_Display(sWhere);
                //隐藏勾选字段
                DisPlay_HideColumn();

@@ -385,13 +385,17 @@
                        var checkStatus = table.checkStatus('mainTable')
                            , data = checkStatus.data;
                        if (checkStatus.data.length === 1) {
                            var InterID = data[0].hmainid.toString();
                            var HInterID = data[0].hmainid.toString();
                            var HsupId = data[0].hsubid;
                            var HQty = data[0].数量;
                            var HSourceInterID = data[0].源单主内码;
                            var HSourceEntryID = data[0].源单子内码;
                            //逻辑删除方法
                            layer.confirm("确认要删除吗，删除后不能恢复", { title: "删除确认" }, function (index) {
                                $.ajax({
                                    type: "GET",
                                    url: GetWEBURL() + "Cg_POInStockBill/DeltetPOInStockBill", //方法所在页面和方法名
                                    data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
                                    data: { "HInterID": HInterID, "HsupId": HsupId, "HQty": HQty, "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "user": sessionStorage["HUserName"] },
                                    success: function (result) {
                                        if (result.count == 1) {
                                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -654,6 +658,7 @@
                if (HMangerID) {
                    sWhere += " and ä¸»ç®¡ like '%" + HMangerID + "%'";
                }
                sWhere += " and å…³é—­äºº =''";
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }

 WebTM/views/²É¹º¹ÜÀí/ÍËÁÏ֪ͨµ¥/Cg_POInStockBackBillList.html

@@ -146,6 +146,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose" id="DeClose"><i class="layui-icon layui-icon-radio"></i>反关闭</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Drop" id="Drop"><i class="layui-icon layui-icon-radio"></i>作废</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeDrop" id="DeDrop"><i class="layui-icon layui-icon-radio"></i>反作废</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print" id="print"><i class="layui-icon layui-icon-print"></i>打印</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" 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="get_Exit" id="Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
@@ -414,6 +415,10 @@
                    //退出按钮
                    case 'get_Exit': Pub_Close(2);
                        break;
                    //打印
                    case 'btn-print':
                        get_PrintReport();
                        break;
                    //列设置
                    case 'set_HideColumn': get_HideColumn();
                        break;
@@ -557,6 +562,34 @@
            }
            //#endregion

            //#region æ‰“印
            function get_PrintReport() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;

                if (checkStatus.data.length === 0) {
                    return layer.msg('请选择数据打印！');
                }
                else {
                    var hmainid = [];

                    for (var i = 0; i < checkStatus.data.length; i++) {
                        hmainid.push((data[i].hmainid * (10 ** 8)) + data[i].hsubid)
                    }

                    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=HPOInStockBackBill', 'yes']
                        , resize: false
                    })
                }
            }
            //#endregion
           
            //#region åˆ·æ–°
            function get_Refresh() {

 WebTM/views/ÑéÊÕÈë¿â/Í⹺Èë¿â/Add_Edit_Kf_POStockInBillList.html

@@ -162,8 +162,16 @@
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">选单号</label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="Box2" id="Box2" autocomplete="off">
                                                <input type="text" name="" id="" class="layui-input" value="" style="float:left;width:150px;">
                                                
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="XDHList" id="XDHList" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
                                            </div>
                                            <!--<label class="layui-form-label">选单号</label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="Box2" id="Box2" autocomplete="off">
                                            </div>-->
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">负责人</label>
@@ -249,7 +257,7 @@
                                                <input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                        <div class="layui-inline" >
                                            <label class="layui-form-label" style="width: 85px;">关闭日期</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
@@ -394,7 +402,8 @@
                "HMaterID": 0, "物料代码": "", "物料名称": "", "规格型号": "", "HAuxPropID": 0, "物料辅助属性": "", "HUnitID": 0, "计量单位": "", "HQtyMust": "", "HQty": "", "HRemark": "",
                "HPrice": "0", "HMoney": "0", "HOrderPrice": "0", "HWHID": 0, "收料仓库": "",
                "HSPID": 0, "仓位名称": "", "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
                "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": ""
                "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
                "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0, 
            }];
            // åˆå§‹åŒ–ç•Œ
            set_InitGrid();
@@ -408,7 +417,8 @@
                    "HMaterID": 0, "物料代码": "", "物料名称": "", "规格型号": "", "HAuxPropID": 0, "物料辅助属性": "", "HUnitID": 0, "计量单位": "", "HQtyMust": "", "HQty": "", "HRemark": "",
                    "HPrice": "0", "HMoney": "0", "HOrderPrice": "0", "HWHID": 0, "收料仓库": "",
                    "HSPID": 0, "仓位名称": "", "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
                    "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": ""
                    "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
                    "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
                };
                switch (obj.event) {
                    case 'btn-AddLine':
@@ -670,7 +680,7 @@
            }



            //子表

            function set_InitGrid() {
                option = {
@@ -682,6 +692,10 @@
                    , cols: [[ //子表
                        { type: 'checkbox', totalRowText: '合计行' }
                        , { type: 'numbers', title: '序号', width: 100, totalRow: true }
                        , { type: 'HSourceBillNo', title: '源单号', width: 100, hide: true }//源单号
                        , { field: 'HSourceBillType', title: '源单类型', width: 100, hide: true }//源单类型
                        , { type: 'HSourceInterID', title: '源单主内码', width: 100, hide: true }//源单主内码
                        , { field: 'HSourceEntryID', title: '源单子内码', width: 100, hide: true }//源单子内码
                        , { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true }
                        , { field: '物料代码', title: '物料代码', width: 150, edit: 'text', event: "HMaterID" }//f7
                        , { field: '物料名称', title: '物料名称', width: 150, }
@@ -705,7 +719,7 @@
                    ]]
                }

                option.data = rowdata;
                option.data = [];
                table.render(option);
            }

@@ -743,7 +757,7 @@
                                , "HManagerID": data.HManagerID
                                , "HManagerName": data.负责人
                                , "HExRate": data.汇率
                                , "Box2": ""
                                //, "Box2": ""
                                , "HRemark": data.表头备注
                                , "HMaker": data.制单人
                                , "HChecker": data.审核人
@@ -763,7 +777,11 @@
                                    {
                                        "HMaterID": subdata[i].HMaterID, "物料代码": subdata[i].物料代码, "物料名称": subdata[i].物料名称, "规格型号": subdata[i].规格型号, "HAuxPropID": subdata[i].HAuxPropID, "物料辅助属性": subdata[i].物料辅助属性, "HUnitID": subdata[i].HUnitID, "计量单位": subdata[i].计量单位,
                                        "HQtyMust": subdata[i].应收数量, "HQty": subdata[i].实收数量, "HRemark": subdata[i].表体备注, "HPrice": subdata[i].单价, "HMoney": subdata[i].金额, "HOrderPrice": subdata[i].采购金额, "HWHID": subdata[i].HWHID, "收料仓库": subdata[i].收料仓库, "HSPID": subdata[i].HSPID, "仓位名称": subdata[i].仓位名称,
                                        "HBatchNo": subdata[i].批次
                                        "HBatchNo": subdata[i].批次,
                                        "HSourceBillNo": subdata[i].源单单号,    //源单号
                                        "HSourceBillType": subdata[i].源单类型,   //源单类型
                                        "HSourceInterID": subdata[i].源单主内码,   //源单主内码
                                        "HSourceEntryID": subdata[i].源单子内码     //源单子内码
                                    }
                                )
                            }
@@ -826,6 +844,7 @@
                    return;
                }


                var num = [];
                for (var i = 0; i < table.cache["mainTable"].length; i++) {
                    if (table.cache["mainTable"][i] != "") {
@@ -833,6 +852,25 @@
                        num.push(table.cache["mainTable"][i])
                    }
                }

                checkDuplicateData(num);
                const duplicateRows = checkDuplicateData(num);
                if (duplicateRows.length > 0) {
                    let message = '表格中存在重复数据，重复行数为：';

                    for (let i = 0; i < duplicateRows.length; i++) {
                        const { row1, row2 } = duplicateRows[i];
                        message += `第${row1}行与第${row2}行相同`;

                        if (i !== duplicateRows.length - 1) {
                            message += '，';
                        }
                    }

                    message += '，请删除其中一行';
                    layer.alert(message);
                } 
                

                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(num);
@@ -1059,7 +1097,8 @@
                                                "HMaterID": 0, "物料代码": "", "物料名称": "", "规格型号": "", "HAuxPropID": 0, "物料辅助属性": "", "HUnitID": 0, "计量单位": "", "HQtyMust": "", "HQty": "", "HRemark": "",
                                                "HPrice": "0", "HMoney": "0", "HOrderPrice": "0", "HWHID": 0, "收料仓库": "",
                                                "HSPID": 0, "仓位名称": "", "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
                                                "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": ""
                                                "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
                                                "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
                                            };

                                            table.cache["mainTable"].push(NewRow);
@@ -1191,8 +1230,87 @@
                    }
                })
            }
                 

            //行内事件
            table.on('tool(mainTable)', function (obj) {
                set_GridDelete(obj);   //行内删除
                set_GridCellCheck(obj); //行内快捷键筛选

            });
            //表头信息选择单据弹窗
            form.on('submit(XDHList)', function () {

                //页面层-自定义
                layer.open({
                    type: 2
                    , skin: "layui-layer-rim" //加上边框
                    , title: "收料通知单列表"  //标题
                    , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                    , shift: 2 //弹出动画
                    , area: ["90%", "90%"] //窗体大小
                    , maxmin: true //设置最大最小按钮是否显示
                    , content: ["../../采购管理/收料通知单/Cg_POInStockBillList.html", "yes"]
                    , btn: ["确定", "取消"]
                    , btn1: function (index, laero) {
                        //按钮一  çš„回调
                        var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据

                        if (checkStatus.data.length == 0) {
                            return layer.msg("请至少选择一条数据!");
                        }
                        layer.alert("你已选择" + checkStatus.data.length + "条数据");
                        //获取收料通知单代码
                        var ProcessNumber = [];
                        for (var i = 0; i < checkStatus.data.length; i++) {
                            ProcessNumber.push(checkStatus.data[i]);
                        }

                        //获取当前位置所在行数
                        var NowNum = 0;
                        NowNum = option.data.length;

                        
                        var j = 0;
                        for (var i = 0; i < ProcessNumber.length; i++) {
                            option.data.push({
                                "HMaterID": checkStatus.data[j].HMaterID, "物料代码": checkStatus.data[j].物料代码, "物料名称": checkStatus.data[j].物料名称, "规格型号": checkStatus.data[j].规格型号,
                                "HAuxPropID": 0, "物料辅助属性": "", "HUnitID": checkStatus.data[j].HUnitID, "计量单位": checkStatus.data[j].计量单位, "HQtyMust": "", "HQty": checkStatus.data[j].数量, "HRemark": "",
                                "HPrice": checkStatus.data[j].单价, "HMoney": checkStatus.data[j].金额, "HOrderPrice": "0", "HWHID": checkStatus.data[j].HWHID, "收料仓库": checkStatus.data[j].收料仓库,
                                "HSPID": checkStatus.data[j].HSPID, "仓位名称": checkStatus.data[j].仓位名称, "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
                                "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
                                "HSourceBillNo": checkStatus.data[j].单据号, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
                            })
                            j++;
                        }
                        table.render(option);
                        layer.close(index);//关闭弹窗
                    }
                       
                });
            });
            //判断所选着与表格是否有重复数据
            function checkDuplicateData(data) {
                const duplicates = [];

                for (let i = 0; i < data.length; i++) {
                    const currentItem = data[i];
                    let isDuplicate = false;

                    for (let j = i + 1; j < data.length; j++) {
                        const compareItem = data[j];

                        if (currentItem.HSourceInterID === compareItem.HSourceInterID && currentItem.HSourceEntryID === compareItem.HSourceEntryID) {
                            isDuplicate = true;
                            duplicates.push({ row1: i + 1, row2: j + 1 }); // è®°å½•é‡å¤æ•°æ®æ‰€åœ¨è¡Œæ•°
                        }
                    }
                    if (isDuplicate && !duplicates.some(item => item.row1 === i + 1)) {
                        duplicates.push({ row1: i + 1, row2: -1 }); // è®°å½•é‡å¤æ•°æ®æ‰€åœ¨è¡Œæ•°ï¼Œ-1 è¡¨ç¤ºæœªæ‰¾åˆ°ä¸Žå½“前行重复的行
                    }
                }
                return duplicates;
            }
            //行内删除
            function set_GridDelete(obj) {
                var data = obj.data;

 WebTM/views/ÑéÊÕÈë¿â/Í⹺Èë¿â/Kf_POStockInBackBillList.html

@@ -559,7 +559,7 @@
                    layer.msg('请选择一行数据审核！');
                }
            }
            //#endregion
            //#endregionz

            //#region æ¡ç æ˜Žç»†
            function get_BarCodeDetail() {

 WebTM/views/ÑéÊÕÈë¿â/Í⹺Èë¿â/Kf_POStockInBillList.html

@@ -490,6 +490,7 @@
                //if (HOrgID) {
                //    sWhere += " and HUSEORGID = '" + HOrgID + "'";
                //}
                sWhere += " and å…³é—­äºº =''";
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
@@ -518,20 +519,23 @@
                get_Display(sWhere);
            }
            //#endregion

            //删除
            function set_DeleteBill() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var InterID = data[0].hmainid.toString();
                    var Hmainid = data[0].hmainid.toString();
                    var HsupId = data[0].hsubid;
                    var HQty = data[0].实收数量;
                    var HSourceInterID = data[0].源单主内码;
                    var HSourceEntryID = data[0].源单子内码;
                    //逻辑删除方法
                    layer.confirm("确认要删除吗，删除后不能恢复", { title: "删除确认" }, function (index) {
                        var wait = layer.load();
                        $.ajax({
                            type: "GET",
                            url: GetWEBURL() + "/Kf_POStockInBill/DeltetKf_POStockInBill", //方法所在页面和方法名
                            data: { "HInterID": InterID },
                            data: { "Hmainid": Hmainid, "HsupId": HsupId, "HQty": HQty, "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "user": sessionStorage["HUserName"] },
                            success: function (result) {
                                if (result.count == 1) {
                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {