15包装打白标

yangle

2024-10-27 d4a02d4acfd1380141f9191d5057419218ef92de

15包装打白标

 WebTM/WebTM.csproj

@@ -540,6 +540,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" />
@@ -1123,6 +1124,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>

 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/ÖÊÁ¿¹ÜÀí/¹¤Ðò¼ìÑéµ¥/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/³µ¼ä¹ÜÀí/²úÏß/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 (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 @@
                        }
                    });
                }
                if (LDM == "AAA") {
                    $("#Print2").click();
                } else {
                $("#Print").click();
                }
                $("#HBarCode_White").val("");
                //子件条码数量已扫完 æ¡ç æ‰«å®ŒåŽ
                if (pcmQty == pcmQtyFlag) {

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

@@ -222,6 +222,9 @@
                                <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>删除
                                </button>
@@ -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/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/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 ã€ä»ªè¡¨ç›˜ã€‘