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

wtt

2024-10-28 07cf94734c36d4eae6ddbc4dd338bf5af81a2193

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

 WebTM/WebTM.csproj

@@ -554,6 +554,7 @@
    <Content Include="views\车间管理\产线\MES_AssemblyTraceabilityList.html" />
    <Content Include="views\车间管理\产线\MES_ProductionLinePackaging.html" />
    <Content Include="views\车间管理\产线\MES_ProductionLinePackagingList.html" />
    <Content Include="views\车间管理\产线\MES_WhiteLabelGeneration.html" />
    <Content Include="views\车间管理\产线\ProcessWIPReport.html" />
    <Content Include="views\车间管理\产线\RetrospectionCustomerReport.html" />
    <Content Include="views\车间管理\产线\Sc_GroupOrderBill.html" />
@@ -1142,6 +1143,7 @@
    <Content Include="views\grf\送货单%28标签纸%29.grf" />
    <Content Include="views\grf\送货单.grf" />
    <Content Include="views\grf\取样卡.grf" />
    <Content Include="views\grf\15白标打印.grf" />
    <None Include="Web.Debug.config">
      <DependentUpon>Web.config</DependentUpon>
    </None>

 WebTM/views/Baseset/»ù´¡×ÊÁÏ/Sc_ProcessExchangeBillListView.html

@@ -13,12 +13,12 @@
    <div class="layui-fluid">
        <div class="layui-card">
            <div class="layui-card-body" style="padding: 15px;">
                <form class="layui-form" action="" lay-filter="component-form-group">
                <form class="layui-form" action="" lay-filter="component-form-group" onsubmit="return false;">
                    <div class="layui-form-item">
                        <div class="layui-inline">
                            <label class="layui-form-label">过滤列</label>
                            <div class="layui-input-inline">
                                <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="请输入过滤列" class="layui-input">
                                <input type="text" class="layui-input" name="Value" id="Value" lay-verify="Value" placeholder="请输入过滤列" autocomplete="off">
                            </div>
                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">快速查询</button>
                            <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">返回</button>
@@ -35,7 +35,7 @@
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script>
        //引用的单据及模块：工序流转卡。
        layui.use(['table', 'form', 'layer'], function () {
      layui.use(['table', 'form', 'layer'], function () {
            var table = layui.table
                , form = layui.form
                , layer = layui.layer;

 WebTM/views/IpadIndex.html

@@ -30,6 +30,7 @@
        var HSourceID1 = "";        //生产资源ID1
        var HSourceName1 = "";      //生产资源1
        var HSourceInterID = "";   //源单主内码
        var HProcExchInterID = "";   //流转卡id
        var HSourceEntryID = "";   //源单子内码
        var HSourceBillNo = "";    //源单单号
        var HSourceBillType = "";  //源单类型
@@ -206,6 +207,7 @@
                                html1 += '<h1 style="display:none;"><span>单据类型：</span><span id="ty' + (i + 1) + '">' + LoadData1[i].HBillType + '</span></h1>';
                                //HSourceInterID实际取值：Sc_ICMOBillStatus_Tmp  HInterID（单据主ID）
                                html1 += '<h1 style="display:none;"><span>源单主内码：</span><span id="sm' + (i + 1) + '">' + LoadData1[i].HSourceInterID + '</span></h1>';
                                html1 += '<h1 style="display:none;"><span>流转卡主ID：</span><span id="lzk' + (i + 1) + '">' + LoadData1[i].HProcExchInterID + '</span></h1>';
                                html1 += '<h1 style="display:none;"><span>源单子内码：</span><span id="sb' + (i + 1) + '">' + LoadData1[i].HSourceEntryID + '</span></h1>';
                                html1 += '<h1 style="display:none;"><span>源单单号：</span><span id="sw' + (i + 1) + '">' + LoadData1[i].HSourceBillNo + '</span></h1>';
                                html1 += '<h1 style="display:none;"><span>源单类型：</span><span id="st' + (i + 1) + '">' + LoadData1[i].HSourceBillType + '</span></h1>';
@@ -439,6 +441,7 @@
            workcode = $("#wk" + i + "").html(); //通过样式ID获取html内容(工单号)
            HBillType = $("#ty" + i + "").html(); //通过样式ID获取html内容(单据类型)
            HSourceInterID = $("#sm" + i + "").html(); //通过样式ID获取html内容(源单主内码)
            HProcExchInterID = $("#lzk" + i + "").html(); //流转卡ID
            HSourceEntryID = $("#sb" + i + "").html(); //通过样式ID获取html内容(源单子内吗)
            HSourceBillNo = $("#sw" + i + "").html(); //通过样式ID获取html内容(源单单号)
            HSourceBillType = $("#st" + i + "").html(); //通过样式ID获取html内容(源单类型)
@@ -955,7 +958,7 @@
                , shade: 0.6
                , maxmin: false
                , anim: 0
                , content: ['质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=2&linterid=' + HSourceInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HICMOEntryID, 'yes']
                , content: ['质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=2&linterid=' + HProcExchInterID  + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HICMOEntryID, 'yes']
                , resize: false
                , cancel: function () {
                }
@@ -978,7 +981,7 @@
                , shade: 0.6
                , maxmin: false
                , anim: 0
                , content: ['质量管理/工序检验单/QC_ProcessCheckBill.html?OperationType=2&linterid=' + HSourceInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HICMOEntryID, 'yes']
                , content: ['质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckOtherill.html?OperationType=2&linterid=' + HProcExchInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HICMOEntryID, 'yes']
                , resize: false
                , cancel: function () {


 WebTM/views/grf/15°×±ê´òÓ¡.grf

New file
@@ -0,0 +1,766 @@
{
    "Version":"6.8.9.1",
    "Font":{
        "Name":"宋体",
        "Size":105000,
        "Weight":400,
        "Charset":134
    },
    "Printer":{
        "Size":256,
        "Width":10,
        "Height":15,
        "LeftMargin":0,
        "TopMargin":0,
        "RightMargin":0,
        "BottomMargin":0,
        "PrintOffsetY":1
    },
    "DetailGrid":{
        "Recordset":{
            "Field":[
                {
                    "Name":"PartNo"
                },
                {
                    "Name":"Index"
                },
                {
                    "Name":"Quatity"
                },
                {
                    "Name":"MS-Level"
                },
                {
                    "Name":"Addinfo"
                },
                {
                    "Name":"ManPartNo"
                },
                {
                    "Name":"PartDescription"
                },
                {
                    "Name":"ManDate"
                },
                {
                    "Name":"ExpiryDate"
                },
                {
                    "Name":"ManLoc"
                },
                {
                    "Name":"1Batch"
                },
                {
                    "Name":"2Batch"
                },
                {
                    "Name":"SupplierName"
                },
                {
                    "Name":"SupplierID"
                },
                {
                    "Name":"Purchase"
                },
                {
                    "Name":"SupplierData"
                },
                {
                    "Name":"PackageID"
                },
                {
                    "Name":"ShippingNote"
                },
                {
                    "Name":"HBarCode_White"
                }
            ]
        },
        "ColumnContent":{
        },
        "ColumnTitle":{
        }
    },
    "Parameter":[
        {
            "Name":"MFGPartNumber",
            "Format":"MFGPartNumber"
        }
    ],
    "ReportHeader":[
        {
            "Name":"ReportHeader1",
            "Height":14.7902,
            "Control":[
                {
                    "Type":"FreeGrid",
                    "Name":"FreeGrid2",
                    "Left":-0.449792,
                    "Top":-0.3175,
                    "Border":{
                        "Styles":"[DrawLeft|DrawTop|DrawRight|DrawBottom]"
                    },
                    "ColumnCount":7,
                    "RowCount":2,
                    "FreeGridColumn":[
                        {
                            "index":1,
                            "Width":0.873125
                        },
                        {
                            "index":2,
                            "Width":0.608542
                        },
                        {
                            "index":3,
                            "Width":1.00542
                        },
                        {
                            "index":4,
                            "Width":1.19063
                        },
                        {
                            "index":5,
                            "Width":1.48167
                        },
                        {
                            "index":6,
                            "Width":1.50813
                        },
                        {
                            "index":7,
                            "Width":3.75708
                        }
                    ],
                    "FreeGridRow":[
                        {
                            "index":1,
                            "Height":1.85208
                        },
                        {
                            "index":2,
                            "Height":13.4144
                        }
                    ],
                    "FreeGridCell":[
                        {
                            "row":1,
                            "col":1,
                            "FreeCell":true,
                            "Control":[
                                {
                                    "Type":"Barcode",
                                    "Name":"Barcode3",
                                    "Left":5.21229,
                                    "Top":0.555625,
                                    "Width":5.00063,
                                    "Height":4.84188,
                                    "BarcodeType":"DataMatrix",
                                    "Direction":"TopToBottom",
                                    "CaptionPosition":"None",
                                    "Text":"[#HBarCode_White#]"
                                },
                                {
                                    "Type":"MemoBox",
                                    "Name":"MemoBox1",
                                    "Left":3.99521,
                                    "Top":0.820208,
                                    "Width":0.608542,
                                    "Height":2.83104,
                                    "Font":{
                                        "Name":"Arial",
                                        "Size":90000,
                                        "Weight":400
                                    },
                                    "TextAlign":"TopLeft",
                                    "TextOrientation":"U2DR2L1",
                                    "Text":"Supplier-name:"
                                },
                                {
                                    "Type":"MemoBox",
                                    "Name":"MemoBox2",
                                    "Left":3.04271,
                                    "Top":0.820208,
                                    "Width":0.608542,
                                    "Height":2.38125,
                                    "Font":{
                                        "Name":"Arial",
                                        "Size":90000,
                                        "Weight":400
                                    },
                                    "TextAlign":"TopLeft",
                                    "TextOrientation":"U2DR2L1",
                                    "Text":"Supplier ID:"
                                },
                                {
                                    "Type":"MemoBox",
                                    "Name":"MemoBox3",
                                    "Left":2.11667,
                                    "Top":0.820208,
                                    "Width":0.608542,
                                    "Height":1.79917,
                                    "Font":{
                                        "Name":"Arial",
                                        "Size":90000,
                                        "Weight":400
                                    },
                                    "TextAlign":"TopLeft",
                                    "TextOrientation":"U2DR2L1",
                                    "Text":"Purchase:"
                                },
                                {
                                    "Type":"MemoBox",
                                    "Name":"MemoBox4",
                                    "Left":1.21708,
                                    "Top":0.820208,
                                    "Width":0.608542,
                                    "Height":2.83104,
                                    "Font":{
                                        "Name":"Arial",
                                        "Size":90000,
                                        "Weight":400
                                    },
                                    "TextAlign":"TopLeft",
                                    "TextOrientation":"U2DR2L1",
                                    "Text":"Supplier Data:"
                                },
                                {
                                    "Type":"MemoBox",
                                    "Name":"MemoBox5",
                                    "Left":9.55146,
                                    "Top":5.76792,
                                    "Width":0.608542,
                                    "Height":1.79917,
                                    "Font":{
                                        "Name":"Arial",
                                        "Size":90000,
                                        "Weight":400
                                    },
                                    "TextAlign":"TopLeft",
                                    "TextOrientation":"U2DR2L1",
                                    "Text":"PartNo.:"
                                },
                                {
                                    "Type":"MemoBox",
                                    "Name":"MemoBox6",
                                    "Left":7.77875,
                                    "Top":5.76792,
                                    "Width":0.608542,
                                    "Height":2.64583,
                                    "Font":{
                                        "Name":"Arial",
                                        "Size":90000,
                                        "Weight":400
                                    },
                                    "TextAlign":"TopLeft",
                                    "TextOrientation":"U2DR2L1",
                                    "Text":"Man.part No.:"
                                },
                                {
                                    "Type":"MemoBox",
                                    "Name":"MemoBox7",
                                    "Left":8.96938,
                                    "Top":5.76792,
                                    "Width":0.608542,
                                    "Height":1.79917,
                                    "Font":{
                                        "Name":"Arial",
                                        "Size":90000,
                                        "Weight":400
                                    },
                                    "TextAlign":"TopLeft",
                                    "TextOrientation":"U2DR2L1",
                                    "Text":"Quatity:"
                                },
                                {
                                    "Type":"MemoBox",
                                    "Name":"MemoBox8",
                                    "Left":8.36083,
                                    "Top":5.76792,
                                    "Width":0.608542,
                                    "Height":2.03729,
                                    "Font":{
                                        "Name":"Arial",
                                        "Size":90000,
                                        "Weight":400
                                    },
                                    "TextAlign":"TopLeft",
                                    "TextOrientation":"U2DR2L1",
                                    "Text":"Add.info:"
                                },
                                {
                                    "Type":"MemoBox",
                                    "Name":"MemoBox9",
                                    "Left":7.19667,
                                    "Top":5.74146,
                                    "Width":0.582083,
                                    "Height":2.06375,
                                    "Font":{
                                        "Name":"Arial",
                                        "Size":90000,
                                        "Weight":400
                                    },
                                    "TextAlign":"TopLeft",
                                    "TextOrientation":"U2DR2L1",
                                    "Text":"Man. Date:"
                                },
                                {
                                    "Type":"MemoBox",
                                    "Name":"MemoBox10",
                                    "Left":6.61458,
                                    "Top":5.74146,
                                    "Width":0.608542,
                                    "Height":1.71979,
                                    "Font":{
                                        "Name":"Arial",
                                        "Size":90000,
                                        "Weight":400
                                    },
                                    "TextAlign":"TopLeft",
                                    "TextOrientation":"U2DR2L1",
                                    "Text":"Man.Loc:"
                                },
                                {
                                    "Type":"MemoBox",
                                    "Name":"MemoBox11",
                                    "Left":5.97958,
                                    "Top":5.74146,
                                    "Width":0.608542,
                                    "Height":1.71979,
                                    "Font":{
                                        "Name":"Arial",
                                        "Size":90000,
                                        "Weight":400
                                    },
                                    "TextAlign":"TopLeft",
                                    "TextOrientation":"U2DR2L1",
                                    "Text":"1.Batch:"
                                },
                                {
                                    "Type":"MemoBox",
                                    "Name":"MemoBox12",
                                    "Left":5.3975,
                                    "Top":5.74146,
                                    "Width":0.608542,
                                    "Height":1.71979,
                                    "Font":{
                                        "Name":"Arial",
                                        "Size":90000,
                                        "Weight":400
                                    },
                                    "TextAlign":"TopLeft",
                                    "TextOrientation":"U2DR2L1",
                                    "Text":"2.Batch:"
                                },
                                {
                                    "Type":"MemoBox",
                                    "Name":"MemoBox13",
                                    "Left":3.04271,
                                    "Top":5.63563,
                                    "Width":0.608542,
                                    "Height":2.32833,
                                    "Font":{
                                        "Name":"Arial",
                                        "Size":90000,
                                        "Weight":400
                                    },
                                    "TextAlign":"TopLeft",
                                    "TextOrientation":"U2DR2L1",
                                    "Text":"Package-ID:"
                                },
                                {
                                    "Type":"MemoBox",
                                    "Name":"MemoBox14",
                                    "Left":2.11667,
                                    "Top":5.63563,
                                    "Width":0.608542,
                                    "Height":2.8575,
                                    "Font":{
                                        "Name":"Arial",
                                        "Size":90000,
                                        "Weight":400
                                    },
                                    "TextAlign":"TopLeft",
                                    "TextOrientation":"U2DR2L1",
                                    "Text":"Shipping Note:"
                                },
                                {
                                    "Type":"MemoBox",
                                    "Name":"MemoBox15",
                                    "Left":9.02229,
                                    "Top":10.3452,
                                    "Width":0.608542,
                                    "Height":1.77271,
                                    "Font":{
                                        "Name":"Arial",
                                        "Size":90000,
                                        "Weight":400
                                    },
                                    "TextAlign":"TopLeft",
                                    "TextOrientation":"U2DR2L1",
                                    "Text":"MS-Level:"
                                },
                                {
                                    "Type":"MemoBox",
                                    "Name":"MemoBox16",
                                    "Left":9.57792,
                                    "Top":10.3452,
                                    "Width":0.608542,
                                    "Height":1.37583,
                                    "Font":{
                                        "Name":"Arial",
                                        "Size":90000,
                                        "Weight":400
                                    },
                                    "TextAlign":"TopLeft",
                                    "TextOrientation":"U2DR2L1",
                                    "Text":"Index:"
                                },
                                {
                                    "Type":"MemoBox",
                                    "Name":"MemoBox17",
                                    "Left":7.80521,
                                    "Top":10.3452,
                                    "Width":0.608542,
                                    "Height":3.51896,
                                    "Font":{
                                        "Name":"Arial",
                                        "Size":90000,
                                        "Weight":400
                                    },
                                    "TextAlign":"TopLeft",
                                    "TextOrientation":"U2DR2L1",
                                    "Text":"Part description:"
                                },
                                {
                                    "Type":"MemoBox",
                                    "Name":"MemoBox18",
                                    "Left":7.19667,
                                    "Top":10.3452,
                                    "Width":0.608542,
                                    "Height":2.54,
                                    "Font":{
                                        "Name":"Arial",
                                        "Size":90000,
                                        "Weight":400
                                    },
                                    "TextAlign":"TopLeft",
                                    "TextOrientation":"U2DR2L1",
                                    "Text":"Expiry Date:"
                                },
                                {
                                    "Type":"MemoBox",
                                    "Name":"MemoBox19",
                                    "Left":1.16417,
                                    "Top":12.5413,
                                    "Width":0.608542,
                                    "Height":1.27,
                                    "Font":{
                                        "Name":"Arial",
                                        "Size":142500,
                                        "Bold":true
                                    },
                                    "TextAlign":"TopLeft",
                                    "TextOrientation":"U2DR2L1",
                                    "Text":"RoHS"
                                },
                                {
                                    "Type":"FieldBox",
                                    "Name":"FieldBox1",
                                    "Left":3.99521,
                                    "Top":3.20146,
                                    "Width":0.608542,
                                    "Height":3.46604,
                                    "Font":{
                                        "Name":"Arial",
                                        "Size":90000,
                                        "Weight":400
                                    },
                                    "TextAlign":"TopLeft",
                                    "TextOrientation":"U2DR2L1",
                                    "DataField":"SupplierName"
                                },
                                {
                                    "Type":"FieldBox",
                                    "Name":"FieldBox2",
                                    "Left":3.04271,
                                    "Top":2.80458,
                                    "Width":0.608542,
                                    "Height":2.24896,
                                    "Font":{
                                        "Name":"Arial",
                                        "Size":90000,
                                        "Weight":400
                                    },
                                    "TextAlign":"TopLeft",
                                    "TextOrientation":"U2DR2L1",
                                    "DataField":"SupplierID"
                                },
                                {
                                    "Type":"FieldBox",
                                    "Name":"FieldBox3",
                                    "Left":2.11667,
                                    "Top":2.56646,
                                    "Width":0.608542,
                                    "Height":2.24896,
                                    "Font":{
                                        "Name":"Arial",
                                        "Size":90000,
                                        "Weight":400
                                    },
                                    "TextAlign":"TopLeft",
                                    "TextOrientation":"U2DR2L1",
                                    "DataField":"Purchase"
                                },
                                {
                                    "Type":"FieldBox",
                                    "Name":"FieldBox4",
                                    "Left":1.21708,
                                    "Top":3.06917,
                                    "Width":0.608542,
                                    "Height":2.46063,
                                    "Font":{
                                        "Name":"Arial",
                                        "Size":90000,
                                        "Weight":400
                                    },
                                    "TextAlign":"TopLeft",
                                    "TextOrientation":"U2DR2L1",
                                    "DataField":"SupplierData"
                                },
                                {
                                    "Type":"FieldBox",
                                    "Name":"FieldBox5",
                                    "Left":2.11667,
                                    "Top":7.96396,
                                    "Width":0.608542,
                                    "Height":4.445,
                                    "Font":{
                                        "Name":"Arial",
                                        "Size":90000,
                                        "Weight":400
                                    },
                                    "TextAlign":"TopLeft",
                                    "TextOrientation":"U2DR2L1",
                                    "DataField":"ShippingNote"
                                },
                                {
                                    "Type":"FieldBox",
                                    "Name":"FieldBox6",
                                    "Left":3.06917,
                                    "Top":7.62,
                                    "Width":0.608542,
                                    "Height":3.62479,
                                    "Font":{
                                        "Name":"Arial",
                                        "Size":90000,
                                        "Weight":400
                                    },
                                    "TextAlign":"TopLeft",
                                    "TextOrientation":"U2DR2L1",
                                    "DataField":"PackageID"
                                },
                                {
                                    "Type":"FieldBox",
                                    "Name":"FieldBox7",
                                    "Left":5.3975,
                                    "Top":7.11729,
                                    "Width":0.608542,
                                    "Height":2.24896,
                                    "Font":{
                                        "Name":"Arial",
                                        "Size":90000,
                                        "Weight":400
                                    },
                                    "TextAlign":"TopLeft",
                                    "TextOrientation":"U2DR2L1",
                                    "DataField":"2Batch"
                                },
                                {
                                    "Type":"FieldBox",
                                    "Name":"FieldBox8",
                                    "Left":5.97958,
                                    "Top":7.11729,
                                    "Width":0.582083,
                                    "Height":2.27542,
                                    "Font":{
                                        "Name":"Arial",
                                        "Size":90000,
                                        "Weight":400
                                    },
                                    "TextAlign":"TopLeft",
                                    "TextOrientation":"U2DR2L1",
                                    "DataField":"1Batch"
                                },
                                {
                                    "Type":"FieldBox",
                                    "Name":"FieldBox9",
                                    "Left":6.61458,
                                    "Top":7.19667,
                                    "Width":0.582083,
                                    "Height":2.91042,
                                    "Font":{
                                        "Name":"Arial",
                                        "Size":90000,
                                        "Weight":400
                                    },
                                    "TextAlign":"TopLeft",
                                    "TextOrientation":"U2DR2L1",
                                    "DataField":"ManLoc"
                                },
                                {
                                    "Type":"FieldBox",
                                    "Name":"FieldBox10",
                                    "Left":7.19667,
                                    "Top":7.59354,
                                    "Width":0.582083,
                                    "Height":2.24896,
                                    "Font":{
                                        "Name":"Arial",
                                        "Size":90000,
                                        "Weight":400
                                    },
                                    "TextAlign":"TopLeft",
                                    "TextOrientation":"U2DR2L1",
                                    "DataField":"ManDate"
                                },
                                {
                                    "Type":"FieldBox",
                                    "Name":"FieldBox11",
                                    "Left":7.77875,
                                    "Top":7.99042,
                                    "Width":0.582083,
                                    "Height":2.24896,
                                    "Font":{
                                        "Name":"Arial",
                                        "Size":90000,
                                        "Weight":400
                                    },
                                    "TextAlign":"TopLeft",
                                    "TextOrientation":"U2DR2L1",
                                    "DataField":"ManPartNo"
                                },
                                {
                                    "Type":"FieldBox",
                                    "Name":"FieldBox12",
                                    "Left":8.36083,
                                    "Top":7.19667,
                                    "Width":0.582083,
                                    "Height":2.24896,
                                    "Font":{
                                        "Name":"Arial",
                                        "Size":90000,
                                        "Weight":400
                                    },
                                    "TextAlign":"TopLeft",
                                    "TextOrientation":"U2DR2L1",
                                    "DataField":"Addinfo"
                                },
                                {
                                    "Type":"FieldBox",
                                    "Name":"FieldBox14",
                                    "Left":9.55146,
                                    "Top":7.19667,
                                    "Width":0.582083,
                                    "Height":3.25438,
                                    "Font":{
                                        "Name":"Arial",
                                        "Size":90000,
                                        "Bold":true
                                    },
                                    "TextAlign":"TopLeft",
                                    "TextOrientation":"U2DR2L1",
                                    "DataField":"PartNo"
                                },
                                {
                                    "Type":"FieldBox",
                                    "Name":"FieldBox15",
                                    "Left":9.57792,
                                    "Top":11.4035,
                                    "Width":0.582083,
                                    "Height":2.24896,
                                    "Font":{
                                        "Name":"Arial",
                                        "Size":90000,
                                        "Weight":400
                                    },
                                    "TextAlign":"TopLeft",
                                    "TextOrientation":"U2DR2L1",
                                    "DataField":"Index"
                                },
                                {
                                    "Type":"FieldBox",
                                    "Name":"FieldBox16",
                                    "Left":9.02229,
                                    "Top":12.0121,
                                    "Width":0.582083,
                                    "Height":2.24896,
                                    "Font":{
                                        "Name":"Arial",
                                        "Size":90000,
                                        "Weight":400
                                    },
                                    "TextAlign":"TopLeft",
                                    "TextOrientation":"U2DR2L1",
                                    "DataField":"MS-Level"
                                },
                                {
                                    "Type":"FieldBox",
                                    "Name":"FieldBox17",
                                    "Left":7.80521,
                                    "Top":12.991,
                                    "Width":0.582083,
                                    "Height":2.24896,
                                    "Font":{
                                        "Name":"Arial",
                                        "Size":90000,
                                        "Weight":400
                                    },
                                    "TextAlign":"TopLeft",
                                    "TextOrientation":"U2DR2L1",
                                    "DataField":"PartDescription"
                                },
                                {
                                    "Type":"FieldBox",
                                    "Name":"FieldBox18",
                                    "Left":7.19667,
                                    "Top":12.3825,
                                    "Width":0.582083,
                                    "Height":2.24896,
                                    "Font":{
                                        "Name":"Arial",
                                        "Size":90000,
                                        "Weight":400
                                    },
                                    "TextAlign":"TopLeft",
                                    "TextOrientation":"U2DR2L1",
                                    "DataField":"ExpiryDate"
                                },
                                {
                                    "Type":"FieldBox",
                                    "Name":"FieldBox19",
                                    "Left":8.94292,
                                    "Top":7.01146,
                                    "Width":0.582083,
                                    "Height":1.98438,
                                    "Font":{
                                        "Name":"Arial",
                                        "Size":90000,
                                        "Bold":true
                                    },
                                    "TextAlign":"TopLeft",
                                    "TextOrientation":"U2DR2L1",
                                    "DataField":"Quatity"
                                }
                            ],
                            "ColSpan":7,
                            "RowSpan":2
                        }
                    ]
                }
            ]
        }
    ]
}

 WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Gy_BadReason.html

@@ -186,7 +186,7 @@
            var option = [];
            var HModName = "Gy_BadReason";
            //不需要显示的字段 å¯æ‰©å±•
            var titleData = ["HItemID"];
            var titleData = ["HItemID","默认工序"];
            //#endregion



 WebTM/views/Éú²ú¹ÜÀí/Òì³£·´À¡µ¥/OA_ErrMsgBackHandleBillMain.html

@@ -321,6 +321,16 @@
                                                                </div>
                                                            </div>
                                                        </div>
                                                        <div class="layui-inline">
                                                            <label class="layui-form-label">处理原因:</label>
                                                            <div class="layui-input-inline">
                                                                <input type="text" name="HBadReasonName" id="HBadReasonName" class="layui-input" value="" style="float:left;width:150px;" disabled>
                                                                <input type="hidden" name="HBadReasonID" id="HBadReasonID" class="layui-input" value="0" style="float:left;width:150px;">
                                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HBadReasonList" id="HBadReasonList" style="width:40px;">
                                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                                </button>
                                                            </div>
                                                        </div>
                                                    </div>
                                                </div>
                                            <div class="layui-tab-item">
@@ -666,6 +676,8 @@
                                , "HHandleEmpName": data[0]["处理人"]
                                , "HHandleNote": data[0]["处理内容"]
                                , "HHandleDate": data[0]["处理完成时间"]
                                , "HBadReasonID": data[0]["HBadReasonID"]
                                , "HBadReasonName": data[0]["处理原因"]
                             

                                , "HMainSourceInterID": data[0]["源单ID"]                 //源单ID
@@ -1147,6 +1159,45 @@
                });
            });

            //处理原因
            form.on('submit(HBadReasonList)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '处理原因',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../基础资料/生产基础资料/Gy_DisposeWayList.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {

                        //按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HBadReasonName").val(checkStatus.data[0].处理方案名称);
                        $("#HBadReasonID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {

                    },
                    success: function (layero, index) {

                    }
                });
            });


            //处理人
            form.on('submit(HHandleEmpList)', function () {
                //页面层-自定义

 WebTM/views/É豸¹ÜÀí/É豸¹¤ÒÕ²ÎÊý¶©µ¥µã¼ì±í/SB_EquipICMOTechParamBillEdit.html

@@ -1577,7 +1577,7 @@
            form.on('submit(btn_Cancel)', function () {
                layer.confirm('您确定要退出吗？', { icon: 3, title: '提示' }, function (index) {
                    //操作类型（OperationType=1新增、OperationType=2编辑）
                    if (OperationType == 2) {
                    if (OperationType == 2 || OperationType == 1) {
                        Pub_Close(1);
                    }
                    else {

 WebTM/views/ÖÊÁ¿¹ÜÀí/¹¤Ðò¼ìÑéµ¥/QC_ProcessCheckBill.html

@@ -2362,10 +2362,10 @@
                }
                if (HQty > 0) {
                    document.querySelectorAll("[name='HCheckerResult']")[0].removeAttribute('checked'); //删除选择属性                   
                    $("input:radio[name=HCheckerResult][value=" + false + "]").attr("checked", "true"); //添加选择属性
                    $("input:radio[name=HCheckerResult][value=" + false + "]").prop("checked", "true"); //添加选择属性
                } else {
                    document.querySelectorAll("[name='HCheckerResult']")[1].removeAttribute('checked'); //删除选择属性
                    $("input:radio[name=HCheckerResult][value=" + true + "]").attr("checked", "true"); //添加选择属性
                    $("input:radio[name=HCheckerResult][value=" + true + "]").prop("checked", "true"); //添加选择属性
                }
                form.render('radio');
            }

 WebTM/views/ÖÊÁ¿¹ÜÀí/¼ìÑéÈ¡Ñù»¹Ñùµ¥/QC_Add_BackSampleCheckBill.html

@@ -301,7 +301,8 @@
                //初始化制单人和制单时间
                $("#HMaker").val(sessionStorage["HUserName"]);
                $("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));

                $("#HEmp").val(sessionStorage["HEmpID"]); //根据登录用户带出操作员ID
                $("#HEmpName").val(sessionStorage["HEmpName"]); //根据登录用户带出操作员
                //初始化日期
                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));


 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_BadProductsReport.html

@@ -49,7 +49,16 @@
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
                                    </div>
                                </div>                               
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">工序名称</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" lay-verify="HProcName" name="HProcName" id="HProcName" value="" style="background-color: #efefef4d; width: 65%; display: inline-block;" readonly>
                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProc" id="btnHProc" style="padding: 0 10px;float: right;margin-right: 3px;">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                        </button>
                                    </div>
                                </div>
                                <div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">物料编码</label>
@@ -79,7 +88,7 @@
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">                                   
                                <div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">是否量产</label>
                                        <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
@@ -266,7 +275,6 @@
                    if (data1.count == 1) {
                        var data = [];//列字段数据
                        var col = [];
                        var totalArray = ["数量", "关联数量", "未关联数量", "打印条码数量", "未打印条码数量", "实收数量", "金额"];
                        //给空的数组赋值
                        for (var key in data1.list) {
                            data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
@@ -278,9 +286,7 @@
                            if ($.inArray(data[i].name, titleData) > -1) {
                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                            }
                            else if ($.inArray(data[i].name, totalArray) > -1) { //计算列
                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
                            } else if (data[i].name == '单据号') {//添加超链接
                            else if (data[i].name == '单据号') {//添加超链接
                                col.push({
                                    field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '单据号', templet: function (d) {
                                        return '<span style="color: blue;">' + d.单据号 + '</span>'
@@ -347,6 +353,7 @@
            var HMaterName = $("#HMaterName").val();//物料名称
            var HBatchNo = $("#HBatchNo").val();//批次号
            var HProjectNum = $("#HProjectNum").val();//项目号
            var HProcName = $("#HProcName").val();//工序名称

            sWhere = {
                HBeginDate: HBeginDate
@@ -358,6 +365,7 @@
                , HMaterName: HMaterName
                , HBatchNo: HBatchNo
                , HProjectNum: HProjectNum
                , HProcName: HProcName
            }
            set_InitGrid();
            get_Display(JSON.stringify(sWhere));
@@ -375,6 +383,7 @@
            $("#HMaterName").val("");//物料名称
            $("#HBatchNo").val("");//批次号
            $("#HProjectNum").val("");//项目号
            $("#HProcName").val("");//工序名称
            form.render('select');

            sWhere = "";
@@ -456,6 +465,43 @@
        }


        //工序
        form.on('submit(btnHProc)', function () {
            //页面层-自定义
            layer.open({
                type: 2,
                skin: 'layui-layer-rim', //加上边框
                title: '工序列表',
                closeBtn: 1,
                shift: 2,
                area: ['90%', '90%'],
                maxmin: true,
                content: ['../../基础资料/生产基础资料/Gy_Process.html', 'yes'],
                btn: ['确定', '取消']
                , btn1: function (index, layero) {

                    //按钮【按钮一】的回调
                    var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                    if (checkStatus.data.length === 0) {
                        return layer.msg('请选择数据');
                    }
                    $("#HProcName").val(checkStatus.data[0].工序名称);
                    layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                }
                , btn2: function (index, layero) {
                    //按钮【按钮二】的回调
                    //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                },
                end: function () {

                },
                success: function (layero, index) {

                }
            });
        });


        //隐藏列设置
        function get_HideColumn() {

 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_InspectionFormReport.html

@@ -185,16 +185,32 @@
                                </div>
                            </div>
                        </div>
                        <div>
                        <div class="layui-tab layui-tab-card">
                            <table class="" id="mainTable" lay-filter="mainTable"></table>
                            <div id="histogram_Avg" style="width:99.5%;height:calc(100vh);margin-top:5px;">
                            <ul class="layui-tab-title">
                                <li class="layui-this">x̄管制图</li>
                                <li>R管制图</li>
                                <li>检测值</li>
                            </ul>
                            <div class="layui-tab-content">
                                <div class="layui-tab-item layui-show">
                                    <!--x̄管制图-->
                                    <div id="histogram_Avg" style="width: 99.5%; height: calc(100vh);">

                            </div>
                            <div id="histogram_Diff" style="width:99.5%;height:calc(100vh);margin-top:15px;">
                                    </div>
                                </div>
                                <div class="layui-tab-item layui-show">
                                    <!--R管制图-->
                                    <div id="histogram_Diff" style="width: 99.5%; height: calc(100vh);">

                            </div>
                            <div id="histogram_SJZ" style="width:99.5%;height:calc(100vh);margin-top:15px;">
                                    </div>
                                </div>
                                <div class="layui-tab-item layui-show">
                                    <!--检测值-->
                                    <div id="histogram_SJZ" style="width: 99.5%; height: calc(100vh);">

                                    </div>
                                </div>
                            </div>
                        </div>
                        <script type="text/html" id="toolbarDemo">
@@ -446,6 +462,7 @@
                var x_AVG = 0;
                var x_SUM = 0;
                var x_PPK = 0;
                var x_CPK = 0;
                var numCount = 0
                var c4 = [0.7979, 0.8862, 0.9213, 0.9400, 0.9515, 0.9594, 0.9650, 0.9693, 0.9727, 0.9754, 0.9776, 0.9794, 0.9810, 0.9823, 0.9835, 0.9845, 0.9854, 0.9862, 0.9869, 0.9876, 0.9882, 0.9887, 0.9892, 0.9896];

@@ -467,7 +484,7 @@
                }

                x_PPK = Math.sqrt(calc(x_SUM, (numCount - 1), "/"));

                x_CPK = Math.sqrt(calc(x_SUM, numCount, "/"));
                var limit = $("#limit").val();
                if (parseInt(limit) >= 9) {
                    $("#HCenterline_S").val(x_PPK.toFixed(4));
@@ -477,21 +494,53 @@
                if (limit == 1) {
                    $("#HControlUpperLimit_X").val(calc(x_AVG, calc(x_PPK, 3, "*"), "+"))
                    $("#HControlLowerLimit_X").val(calc(x_AVG, calc(x_PPK, 3, "*"), "-"))
                }

                //上限
                if ($("#HUpLimit").val() != "" && $("#HDownLimit").val() == "") {
                    var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), calc(calc(3, x_PPK, "*"), c4[option.data.length - 4], "/"), "/");
                    $("#HPPK").val(HUpLimit.toFixed(4));
                }
                //下限
                else if ($("#HDownLimit").val() != "" && $("#HUpLimit").val() == "") {
                    var HDownLimit = calc(calc(x_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), calc(calc(3, x_PPK, "*"), c4[option.data.length - 4], "/"), "/");
                    $("#HPPK").val(HDownLimit.toFixed(4));
                    //计算样本量为1 çš„ ppk
                    var min = calc(calc(x_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), calc(3, x_PPK, "*"), "/");
                    var max = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), calc(3, x_PPK, "*"), "/");
                    var DataHCPK = min > max ? max : min;
                    $("#HPPK").val(DataHCPK);

                    //计算样本量为1 çš„ cpk
                  
                    var cpkSum = 0;
                    var CPK_U = 0;
                    var CPK_N = 0;
                    for (var i = 1; i < option.cols[0].length; i++) {
                        for (var j = 0; j < option.data.length - 3; j++) {
                            if (i == 1) {
                                CPK_U = option.data[j][option.cols[0][i].field];
                            } else {
                                CPK_N = option.data[j][option.cols[0][i].field];
                                var data_un = CPK_U > CPK_N ? calc(CPK_U, CPK_N, "-") : calc(CPK_N, CPK_U, "-");
                                cpkSum = calc(cpkSum, data_un, "+");
                                CPK_U = CPK_N;
                            }
                        }
                    }
                    cpkSum = calc(cpkSum, option.cols[0].length - 2, "/");
                    var HAVG_CPK = calc(cpkSum, 1.128, "/");

                    min = calc(calc(x_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), calc(3, HAVG_CPK, "*"), "/");
                    max = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), calc(3, HAVG_CPK, "*"), "/");
                    DataHCPK = min > max ? max : min;

                    $("#HCPK").val(DataHCPK);
                } else {
                    var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), calc(calc(3, x_PPK, "*"), c4[option.data.length - 4], "/"), "/");
                    var HDownLimit = (x_AVG - calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+")) / ((3 * x_PPK) / c4[option.data.length - 4]);
                    $("#HPPK").val(HUpLimit > HDownLimit ? HDownLimit.toFixed(4) : HUpLimit.toFixed(4));
                    //上限
                    if ($("#HUpLimit").val() != "" && $("#HDownLimit").val() == "") {
                        var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), calc(calc(3, x_PPK, "*"), c4[option.data.length - 4], "/"), "/");
                        $("#HPPK").val(HUpLimit.toFixed(4));
                    }
                    //下限
                    else if ($("#HDownLimit").val() != "" && $("#HUpLimit").val() == "") {
                        var HDownLimit = calc(calc(x_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), calc(calc(3, x_PPK, "*"), c4[option.data.length - 4], "/"), "/");
                        $("#HPPK").val(HDownLimit.toFixed(4));
                    } else {
                        var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), calc(calc(3, x_PPK, "*"), c4[option.data.length - 4], "/"), "/");
                        var HDownLimit = (x_AVG - calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+")) / ((3 * x_PPK) / c4[option.data.length - 4]);
                        $("#HPPK").val(HUpLimit > HDownLimit ? HDownLimit.toFixed(4) : HUpLimit.toFixed(4));
                    }
                }
            }

@@ -535,30 +584,32 @@
                    $("#HControlUpperLimit_X").val(calc(x_AVG, calc(A2[$("#limit").val() - 1], s_AVG, "*"), "+"))
                    $("#HControlLowerLimit_X").val(calc(x_AVG, calc(A2[$("#limit").val() - 1], s_AVG, "*"), "-"))
                }
              
      
           
                //差值 æŽ§åˆ¶ä¸Šé™ æŽ§åˆ¶ä¸‹é™
                $("#HControlUpperLimit_S").val(calc(D4[$("#limit").val() - 1], s_AVG, "*"));
                $("#HControlLowerLimit_S").val(calc(D3[$("#limit").val() - 1], s_AVG, "*"))
                $("#HControlLowerLimit_S").val(calc(D3[$("#limit").val() - 1], s_AVG, "*"));
                var limit = $("#limit").val();

                //上限
                if ($("#HUpLimit").val() != "" && $("#HDownLimit").val() == "") {
                    var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), (3 * s_CPK), "/");
                    $("#HCPK").val(HUpLimit.toFixed(4));
                }
                //下限
                else if ($("#HDownLimit").val() != "" && $("#HUpLimit").val() == "") {
                    var HDownLimit = calc(calc(x_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), (3 * s_CPK), "/");
                    $("#HCPK").val(HDownLimit.toFixed(4));
                }  else {
                    var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), (3 * s_CPK), "/");
                    var HDownLimit = calc(calc(x_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), (3 * s_CPK), "/");
                    if (s_CPK == 0) {
                        $("#HCPK").val(0);
                    } else {
                        $("#HCPK").val(HUpLimit > HDownLimit ? HDownLimit.toFixed(4) : HUpLimit.toFixed(4));
                if (limit > 1) {
                    //上限
                    if ($("#HUpLimit").val() != "" && $("#HDownLimit").val() == "") {
                        var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), (3 * s_CPK), "/");
                        $("#HCPK").val(HUpLimit.toFixed(4));
                    }
                    //下限
                    else if ($("#HDownLimit").val() != "" && $("#HUpLimit").val() == "") {
                        var HDownLimit = calc(calc(x_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), (3 * s_CPK), "/");
                        $("#HCPK").val(HDownLimit.toFixed(4));
                    } else {
                        var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), (3 * s_CPK), "/");
                        var HDownLimit = calc(calc(x_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), (3 * s_CPK), "/");
                        if (s_CPK == 0) {
                            $("#HCPK").val(0);
                        } else {
                            $("#HCPK").val(HUpLimit > HDownLimit ? HDownLimit.toFixed(4) : HUpLimit.toFixed(4));
                        }

                    }
                }
            }

@@ -971,7 +1022,7 @@
                //Type 2 æ ¹æ®é€‰ä¸­çš„物料去查询数据
                var sWheres = "";
                if (Type == 1) {
                    sWheres = " and æ£€éªŒé¡¹ç›®ä»£ç ='" + $("#HQCCheckItemNumber").val() + "'";
                    sWheres = " and æ£€éªŒé¡¹ç›®ä»£ç ='" + $("#HQCCheckItemNumber").val() + "' and ç‰©æ–™ä»£ç ='" + $("#HMaterNumber").val() + "'";
                }
                if (Type == 2) {
                    sWheres = " and ç‰©æ–™ä»£ç ='" + $("#HMaterNumber").val() + "'";

 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_QualityMonthSumReport.html

@@ -69,7 +69,7 @@
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                <div class="layui-inline" style="display:none">
                                    <label class="layui-form-label" style="width: 85px;">项目号</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <select name="HProject" id="HProject" class=" ForFilteringSchemes" lay-verify="HProject">
@@ -704,13 +704,13 @@

                //柱状图绑定数据
                var H_X = ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'];//X轴标题
                var HAverage = [];      //y轴：质量门逃逸率
                var HAverage = [];      //X轴：质量门逃逸率
                var HTarget = [];       //y轴：上限值
                for (let i = 0; i < option.data.length; i++) {
                    //获取质量门逃逸率行数值
                    if (option.data[i].项目 == '质量门逃逸率') {
                        for (let j = 1; j <= 12; j++) {
                            HAverage.push(option.data[i][j + "月"]);
                            HAverage.push((option.data[i][j + "月"]).replace('%', ''));
                        }
                    }
                    //获取上限值行数值
@@ -737,19 +737,25 @@
                        top: 'bottom',  // å°†å›¾ä¾‹æ”¾ç½®åœ¨å›¾è¡¨çš„下方
                        left: 'center'  // æˆ–者 'right'，根据需要调整水平位置
                    },
                    //toolbox: {                            //工具栏
                    //    show: true,
                    //    orient: 'vertical',
                    //    left: 'right',
                    //    top: 'center',
                    //    feature: {
                    //        mark: { show: true },
                    //        dataView: { show: true, readOnly: false },
                    //        magicType: { show: true, type: ['line', 'bar', 'stack'] },
                    //        restore: { show: true },
                    //        saveAsImage: { show: true }
                    //    }
                    //},
                    tooltip: {
                        trigger: 'axis',
                        axisPointer: {
                            type: 'shadow'
                        },
                        formatter: function (params) {
                            let tooltipHtml = params[0].axisValue + '<br>'; // X轴数值

                            params.forEach(function (item) {
                                if (item.seriesType === 'line') {
                                    let valueToShow = parseFloat(item.value); // å°†å­—符串转换为数值
                                    tooltipHtml += item.seriesName + ': ' + valueToShow.toFixed(3) + '%' + '<br>'; // æŠ˜çº¿å›¾æ•°æ®æ ¼å¼åŒ–为百分比
                                }
                            });

                            return tooltipHtml;
                        }

                    },
                    grid:
                    {
                        left: '5%',
@@ -774,11 +780,7 @@
                                            temp += '\n' + value.slice(i);
                                        }
                                    }

                                    return temp;

                                    // ä½¿ç”¨ '\n' å®žçŽ°æ¢è¡Œ
                                    //return value.length > 5 ? value.slice(0, 5) + '\n' + value.slice(5) : value;
                                },
                                width: 30 // è®¾ç½®åˆ»åº¦æ ‡ç­¾çš„宽度，超过这个宽度会自动换行
                            }
@@ -786,16 +788,23 @@
                    ],
                    yAxis: [                                //设置y轴数据类型
                        {
                            type: 'value'
                            type: 'value',
                            name: '上限值',
                            axisLabel: {
                                formatter: '{value}'
                            }
                        }
                    ],
                    series: [                               //设置y轴数据
                        {
                            name: '质量门逃逸率',
                            type: 'line',
                            barWidth: 30,
                            barWidth: 10,
                            barGap: 0,
                            label: labelOption,
                            label: {
                                show: true,
                                formatter: '{c}%'
                            },
                            emphasis: {
                                focus: 'series'
                            },

 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_QualityStatisticsDailyReport.html

@@ -64,7 +64,7 @@
                                </div>                            
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">组织</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 125px;">
                                    <div class="layui-input-block" style="margin-left: 120px; width: 140px;">
                                        <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
                                            <!--动态渲染年份-->
                                        </select>
@@ -99,6 +99,30 @@
                                            <select name="HDivisionName" id="HDivisionName" class=" ForFilteringSchemes" lay-verify="HDivisionName">
                                                <!--动态渲染组织-->
                                            </select>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">判断结果</label>
                                        <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                            <select name="HResult" id="HResult" lay-verify="HResult">
                                                <option value="">请选择</option>
                                                <option value="报废">报废</option>
                                                <option value="返工">返工</option>
                                                <option value="特采">特采</option>
                                                <option value="放行">放行</option>
                                                <option value="工废">工废</option>
                                                <option value="料废">料废</option>
                                                <option value="样件保留">样件保留</option>
                                            </select>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">工序名称</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" lay-verify="HProcName" name="HProcName" id="HProcName" value="" style="background-color: #efefef4d; width: 65%; display: inline-block;" readonly>
                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProc" id="btnHProc" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                            </button>
                                        </div>
                                    </div>
                                </div>
@@ -257,6 +281,43 @@
            })
        }

        //工序
        form.on('submit(btnHProc)', function () {
            //页面层-自定义
            layer.open({
                type: 2,
                skin: 'layui-layer-rim', //加上边框
                title: '工序列表',
                closeBtn: 1,
                shift: 2,
                area: ['90%', '90%'],
                maxmin: true,
                content: ['../../基础资料/生产基础资料/Gy_Process.html', 'yes'],
                btn: ['确定', '取消']
                , btn1: function (index, layero) {

                    //按钮【按钮一】的回调
                    var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                    if (checkStatus.data.length === 0) {
                        return layer.msg('请选择数据');
                    }
                    $("#HProcName").val(checkStatus.data[0].工序名称);
                    layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                }
                , btn2: function (index, layero) {
                    //按钮【按钮二】的回调
                    //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                },
                end: function () {

                },
                success: function (layero, index) {

                }
            });
        });

        function set_InitGrid() {

            var columns = [];
@@ -338,6 +399,8 @@
            var HProject = $("#HProject").val();//项目号
            var HBatchWork = $("#HBatchWork").val();//是否量产
            var HDivisionName = $("#HDivisionName").val();//事业部
            var HResult = $("#HResult").val();//判定结果
            var HProcName = $("#HProcName").val();//工序名称
            sWhere = {
                HYear: HYear
                , HMonth: HMonth
@@ -346,6 +409,8 @@
                , HProject: HProject
                , HBatchWork: HBatchWork
                , HDivisionName: HDivisionName
                , HResult: HResult
                , HProcName: HProcName
            }
            set_InitGrid();
            get_Display(JSON.stringify(sWhere));
@@ -358,7 +423,9 @@
            $("#HProcExchBillNo").val("");
            $("#HProject").val("");
            $("#HBatchWork").val("0");
            $("#HDivisionName").val("0");           
            $("#HDivisionName").val("0");
            $("#HBatchWork").val("");
            $("#HDivisionName").val("");
            form.render('select');

            sWhere = "";

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

@@ -53,6 +53,7 @@
                                <select name="LDM" lay-verify="required" id="LDM">
                                    <option value="DU3" selected>DU3</option>
                                    <option value="QDR">QDR</option>
                                    <option value="AAA">15车间</option>
                                    <option value="其他">其他</option>
                                </select>
                            </div>
@@ -605,16 +606,30 @@
                        return;
                    }

                    if (LDM == "AAA" && SubBarcode.length != 50) {
                        playSound();
                        layer.alert("子件条码长度不为50位!", { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                        return;
                    }

                    if (SubBarcode.match(/[^\x00-\xff]/g) != null) {
                        playSound();
                        layer.alert("必须是半角字符!", { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                        return;
                    }

                    if (LDM != "其他" && BBM != "其他" && reg.test(SubBarcode)) {
                        playSound();
                        layer.alert("请查看子件条码大写是否正确!", { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                        return;
                    if (SubBarcode.length == 50) {
                        if (LDM != "其他" && reg.test(SubBarcode)) {
                            playSound();
                            layer.alert("请查看子件条码大写是否正确!", { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                            return;
                        }
                    } else {
                        if (LDM != "其他" && BBM != "其他" && reg.test(SubBarcode)) {
                            playSound();
                            layer.alert("请查看子件条码大写是否正确!", { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                            return;
                        }
                    }

                    if (LDM != "其他" && BBM != "其他" && SubBarcode.indexOf(BBM) == -1) {
@@ -953,7 +968,11 @@
                        }
                    });
                }
                $("#Print").click();
                if (LDM == "AAA") {
                    $("#Print2").click();
                } else {
                    $("#Print").click();
                }
                $("#HBarCode_White").val("");
                //子件条码数量已扫完 æ¡ç æ‰«å®ŒåŽ
                if (pcmQty == pcmQtyFlag) {

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

@@ -21,7 +21,7 @@
        <div class="layui-col-md12">
            <div class="layui-card" style="padding: 1px">
                <div class="layui-card-body" style="padding: 1px;">
                    <form class="layui-form" action="" lay-filter="component-form-group">
                    <form class="layui-form" action="" lay-filter="component-form-group"  >
                        <div class="layui-collapse">
                            <div class="layui-colla-item">
                                <div class="layui-colla-title layui-inline">
@@ -221,6 +221,9 @@
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="Print1" id="Print1">
                                    <i class="layui-icon layui-icon-file"></i>普菲特打印
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="WhiteSave" id="WhiteSave">
                                    <i class="layui-icon layui-icon-file"></i>白标生成
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="BtnDel" id="BtnDel">
                                    <i class="layui-icon layui-icon-file"></i>删除
@@ -576,6 +579,28 @@

            //});

            //白标生成保存
            form.on('submit(WhiteSave)', function (obj) {//退出
                var checkStatus = table.checkStatus("mainTable"); //获取选中行状态
                if (checkStatus.data.length == 1) {
                    var HBarCode_Pack = checkStatus.data[0].唯一条码;
                    layer.open({                //使用 layer的open打开弹出 å±‚ 
                        type: 2                         //表示弹出层的内容是一个 iframe
                        , area: ['100%', '100%']
                        , title: '白标打印'  //设置弹出层的名字和变量
                        , closeBtn: 1//显示关闭按钮
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化                       
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../../车间管理/产线/MES_WhiteLabelGeneration.html?OperationType=1&HBarCode_Pack=' + HBarCode_Pack //设置 iframe çš„ URL，URL ä¸­åŒ…含了查询参数，来调用所需要的值
                        , resize: false,  //是否允许用户调整弹出大小

                    })
                } else {
                    layer.msg("请选择一行进行白标生成!");
                }
            });


            form.on('submit(Print)', function (obj) {//退出
                var checkStatus = table.checkStatus("mainTable"); //获取选中行状态

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

New file
@@ -0,0 +1,278 @@
<!DOCTYPE html>
<html>
<head>
    <meta charset="utf-8" />
    <title>白标生成</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/grwebapp.js"></script>
    <style>
        .layui-form-item .layui-inline {
            margin-top: 5px;
            margin-bottom: 5px;
            margin-right: 0px;
        }

        .layui-form-label {
            width: 25%;
        }
    </style>
</head>
<body>

    <div class="layui-fluid" style="padding: 0;">
        <div class="layui-card" style="padding: 15px;">
            <div class="layui-card-body" style="padding: 1px;">
                <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
                    <div class="layui-card-header">
                        <div class="layui-btn-group">
                            <button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">保存</button>
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">退出</button>
                        </div>
                    </div>
                    <div class="layui-form-item" style="padding-top: 10px;">
                        <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
                            <ul class="layui-tab-title">
                                <li class="layui-this">基本信息</li>
                            </ul>
                            <div class="layui-tab-content">
                                <div class="layui-tab-item layui-show">
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">内部项目号</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="ProjectNo" id="ProjectNo" lay-verify="ProjectNo" value=""  autocomplete="off" placeholder="" class="layui-input">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">Ordering-Code</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="OrderingCode" id="OrderingCode" lay-verify="OrderingCode" value=""  autocomplete="off" placeholder="" class="layui-input">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">图纸版本号</label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="DrawVersionNumber" id="DrawVersionNumber" value=""  autocomplete="off">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">客户订单号</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="CustomerOrderNumber" id="CustomerOrderNumber" value=""  lay-verify="CustomerOrderNumber" autocomplete="off" placeholder="" class="layui-input">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">运单号</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="WaybillNumber" id="WaybillNumber" value=""  lay-verify="WaybillNumber" autocomplete="off" placeholder="" class="layui-input">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">备注</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HRemark" id="HRemark" lay-verify="HRemark" value=""  autocomplete="off" placeholder="" class="layui-input">
                                                <input type="text" name="HBarCode_Pack" id="HBarCode_Pack" value="" hidden>
                                                <input type="text" name="HBillType" id="HBillType"  value=""  hidden>
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                    </div>
                </form>
            </div>
        </div>
    </div>

    <script>
        //#region æŠ˜å æ³¨é‡Š
        //#endregion
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index' //主入口模块
        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {

            //#region å…¬ç”¨å˜é‡
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element;
            var sWhere = "";
            var date = new Date();
            var day = date.getDate();
            var month = date.getMonth() + 1;
            var year = date.getFullYear();
            var shijian = year + "-" + month + "-" + day;
            //#endregion


            //#region è¿›å…¥é¡µé¢å³åŠ è½½

            //判断是否登录 æœªç™»å½•åˆ™è·³åˆ°ç™»å½•é¡µ
            get_LoginIs();

            //获取页面跳转参数
            var params = get_UrlVars();
            if (typeof (params[params[0]]) == "undefined") {
                var OperationType = 1;//操作类型
            } else {
                var OperationType = params[params[0]];//操作类型
                var linterid = params[params[1]];//源单id
                $("#HBarCode_Pack").val(linterid);
            }
        
            //#endregion


            //#region è§¦å‘事件：包括form.on(){}格式的所有点击事件、选择事件等

            //退出按钮
            form.on('submit(Cancel)', function () {
                Pub_Close(1);
            })

            //保存按钮
            form.on('submit(set_SaveBill)', function (data) {
                set_SaveBill(data);
            });

            //#endregion


            //#region æœ¬é¡µé¢æ‰€æœ‰è¢«è°ƒç”¨çš„方法

            //#region åˆ¤æ–­æ˜¯å¦ç™»å½• æœªç™»å½•åˆ™è·³åˆ°ç™»å½•é¡µ
            function get_LoginIs() {
                if (sessionStorage.login != "login") {
                    layer.confirm("登录失效，请重新登录！", {
                        icon: 4, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['重新登录']
                    }, function () { window.location.href = "../../user/login.html"; });
                }
            }
            //#endregion
         
            //#region ä¿å­˜æ–¹æ³•
            function set_SaveBill(data) {

                var sMainStr = JSON.stringify(data.field);
                if ($("#ProjectNo").val()=="") {
                    layer.msg("内部项目号不能为空！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#OrderingCode").val()=="") {
                    layer.msg("Ordering-Code不能为空！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#DrawVersionNumber").val() == "") {
                    layer.msg("图纸版本号不能为空！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#CustomerOrderNumber").val() == "") {
                    layer.msg("客户订单号不能为空！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#WaybillNumber").val() == "") {
                    layer.msg("运单号不能为空！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
               
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "Cj_StationOutBill_Detail/MES_WhiteLabelGeneration", //方法所在页面和方法名
                    async: true,
                    data: { "oMain": sMainStr },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            layer.msg(data.Message, { icon: 1 });
                            $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
                            Print();
                        }
                        else {
                            layer.alert(data.Message, { icon: 5 });
                        }
                        layer.closeAll("loading");
                    },
                    error: function (err) {
                        layer.alert("错误:" + err, { icon: 5 });
                        console.log("Reason" + sMainStr);
                    }
                });
            }
            //#endregion


            //打印按钮

            function Print() {
                //打开打印模板
                var linterid = $("#HBarCode_Pack").val();
         
                var sWhere = "exec h_p_Cj_SMRPrintSelect '" + 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({ "HBarCode_White": data.data[0]["HBarCode_White"], "PartNo": data.data[0]["PartNo"], "Index": data.data[0]["Index"], "MS-Level": data.data[0]["MS-Level"], "Addinfo": data.data[0]["Addinfo"], "ManPartNo": data.data[0]["ManPartNo"], "PartDescription": data.data[0]["PartDescription"], "ManDate": data.data[0]["ManDate"], "ExpiryDate": data.data[0]["ExpiryDate"], "ManLoc": data.data[0]["ManLoc"], "1Batch": data.data[0]["1Batch"], "2Batch": data.data[0]["2Batch"], "SupplierName": data.data[0]["SupplierName"], "SupplierID": data.data[0]["SupplierID"], "Purchase": data.data[0]["Purchase"], "SupplierData": data.data[0]["SupplierData"], "PackageID": data.data[0]["PackageID"], "ShippingNote": data.data[0]["ShippingNote"]}
                                );

                                var Customer = {
                                    "Table": dataPrint
                                }

                                var report1 = urlAddRandomNo("../../grf/15白标打印.grf");

                                var args = {
                                    type: "print",
                                    showOptionDlg: false, //如果不显示打印对话框而直接打印，将此行注释去掉即可
                                    report: report1,
                                    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 });
                    }
                })
            }
            //#endregion


            //以上是layui模块
        });
    </script>
</body>
</html>

 WebTM/views/³µ¼ä¹ÜÀí/Æô¶¯µã¼ìµ¥/Sc_WorkBeginDotCheckBill.html

@@ -295,7 +295,7 @@
    <!--删除-->
    <script type="text/html" id="barDemo">
        <a class="layui-btn layui-btn-xs" lay-event="edit">查看</a>
        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
        <!--<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>-->
    </script>
    <!--行下拉选择(结果)-->
    <script type="text/html" id="HCheckResult">
@@ -425,6 +425,7 @@
                get_InitGrid();
                //获取报工台跳转数据
                RoadBillEdit(HMaterID, HProcID, HSourceID, SCOrder);
                Get_HNowMould(HSourceID);
                //禁用组织选项
                $('#HOrgID').attr("disabled", true);
            }
@@ -1394,6 +1395,36 @@
            }
            //#endregion

            //#region  èŽ·å–最近的一次上模单赋值
            function Get_HNowMould(HSourceID)
            {
                $.ajax({
                    url: GetWEBURL() + "/Sc_WorkBeginDotCheckBill/Sc_WorkBeginDotCheckBill_HMould",
                    type: "GET",
                    async: false,
                    data: {  "HSourceID": HSourceID, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        var tableSub = result.data;
                        //子表  èµ‹å€¼
                       
                        for (var i = 0; i < option.data.length; i++) {
                            if (option.data[i]["HDotCheckType"] == "模具") {
                                option.data[i]["HRelationName"] = tableSub[0]["模具名称"];
                                option.data[i]["HRelationID"] = tableSub[0]["HMouldID"] == null ? "0" : tableSub[0]["HMouldID"];
                            }
                        }                       
                        var tables = option.data;
                        option.data = option.data;
                        table.render(option);
                        for (var i = 0; i < tables.length; i++) {
                            $('#HDotCheckType' + (i + 1)).find("option[value='" + tables[i]["HDotCheckType"] + "']").attr("selected", true);
                        }
                        form.render('select');
                    }
                })
            }
            //#endregion

            //#endregion

        });

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

@@ -354,6 +354,8 @@
    var HEmpName = ""; //操作员
    var HManagerName = ""; //负责人
    var HGroupName = ""; //班组
    var HSourceID = 0; //生产资源id
    var HSourceName = ""; //生产资源

    var edit = function (data) {
        HBillType = data[0].HBillType;
@@ -367,6 +369,7 @@
        HICMOInterID = data[0].HICMOInterID;//生产订单主内码
        HICMOEntryID = data[0].HICMOEntryID;//生产订单子内码
        HSourceID = data[0].HSourceID;//生产资源id
        HSourceName = data[0].HSourceName;//生产资源 
        HEmpName = data[0].HEmpName;//操作员
        HManagerName = data[0].HManagerName;//负责人
        HGroupName = data[0].HGroupName;//班组
@@ -406,6 +409,8 @@
        $("#HEmpName").text(HEmpName);//操作员
        $("#HManagerName").text(HManagerName);//负责人
        $("#HGroupName").text(HGroupName);//班组
        $("#HSourceID").val(HSourceID);//生产资源id
        $("#HSourceName").val(HSourceName);//生产资源
        //#endregion

        //#region ã€ä»ªè¡¨ç›˜ã€‘

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò½øÕ¾½ÓÊÕµ¥/Cj_StationInBill.html

@@ -554,7 +554,7 @@
            //#region é€€å‡ºæŒ‰é’®
            form.on('submit(Cancel)', function () {
                layer.confirm('您确定要退出吗？', { icon: 3, title: '提示' }, function (index) {
                    if (OperationType == 1) {
                    if (OperationType == 1) {                        
                        Pub_Close(closeType);
                    } else if (OperationType == 3) {
                        Pub_Close(1);