MES-WEB-LayUI.git

parent: d08aa5c9 | 补丁 | 提交 | ignore whitespace

yangle

2023-11-13 2b3793d712e0685e218d684a8ecafed3bfcf462b

返修台优化
配件更换功能优化
单品过站完善

6个文件已修改

	WebTM/views/生产管理/生产任务单/Sc_ICMOBillEdit_NoTable.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/产线组装追溯/Cj_AssemblyTraceability.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/单品过站/Cj_CollectionOfSingleProductDefects.html	99 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/单品过站/Cj_ProcessItemBGA.html	188 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/单品过站/Cj_ProcessItemBGA_PJGH.html	279 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/单品过站/Cj_ProcessItemStationPlatform.html	384 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillEdit_NoTable.html

@@ -248,7 +248,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">è®¡åå¼å®å·¥æ</label>
                                            <label class="layui-form-label" style="width: 85px;">è®¡åå®å·¥æ</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="date" class="layui-input" lay-verify="HPlanEndDate" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 80px;">
                                            </div>

 WebTM/views/³µ¼ä¹ÜÀí/²úÏß×é×°×·ËÝ/Cj_AssemblyTraceability.html

@@ -31,7 +31,7 @@
                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
                    <div style="padding: 10px;">
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">ä¿å</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">éåº</button>
                        <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">éåº</button>-->
                    </div>
                    <div class="layui-tab" lay-filter="tab-POStockInBill">
                        <ul class="layui-tab-title" lay-filter="tab-all">

 WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾/Cj_CollectionOfSingleProductDefects.html

@@ -138,6 +138,7 @@
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HProcExchBillNo" lay-verify="HProcExchBillNo" id="HProcExchBillNo" value="" style="background-color:#efefef4d;">
                                                <input type="hidden" class="layui-input" name="HProcExchInterID" lay-verify="HProcExchInterID" id="HProcExchInterID" value="0">
                                                <input type="hidden" class="layui-input" name="HProcExchEntryID" lay-verify="HProcExchEntryID" id="HProcExchEntryID" value="0">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -277,84 +278,10 @@
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">æ¶é´åä½</label>
                                            <div class="layui-input-block" style="margin-left: 120px;width: 184px;">
                                                <select name="HMainTimeUnit" lay-verify="HMainTimeUnit" id="HMainTimeUnit">
                                                    <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" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HMaterTexture" lay-verify="HMaterTexture" id="HMaterTexture" value="" onmouseover="this.title=this.value">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">å¾å·çæ¬</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" lay-verify="HPicNumVer" name="HPicNumVer" id="HPicNumVer">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">æ»è£å¾å·</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HPicNumAssemble" id="HPicNumAssemble" onmouseover="this.title=this.value">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">å·¥èºè·¯çº¿å¤§ç±»</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="hidden" class="layui-input" lay-verify="HRoutingGroupID" name="HRoutingGroupID" id="HRoutingGroupID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="text" class="layui-input" lay-verify="HRoutingGroupIDName" name="HRoutingGroupIDName" id="HRoutingGroupIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnRoutingGroup" id="btnRoutingGroup" 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-inline">
                                            <label class="layui-form-label" style="width: 85px;">æåç¼å·</label>
                                            <div class="layui-input-block" style="margin-left: 115px;">
                                                <input type="text" class="layui-input" name="HProductNum" lay-verify="HProductNum" id="HProductNum" value="" onmouseover="this.title=this.value">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">çæ¬</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HVerNum" lay-verify="HVerNum" id="HVerNum" value="" onmouseover="this.title=this.value">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <div class="layui-input-block" style="margin-left: 185px;">
                                                <input type="checkbox" name="checkboxIsProNo" id="checkboxIsProNo" lay-skin="primary" lay-filter="checkboxIsProNo" title="è½¬å·¥åº">
                                                <input type="hidden" value="1" name="IsProNo" id="IsProNo" lay-verify="IsProNo">
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                    </div>

                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                    <script type="text/html" id="toolbarDemo">
                        <div class="layui-btn-container">
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>å¢å ä¸è¡</button>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>å¤å¶ä¸è¡</button>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_up"><i class="layui-icon layui-icon-form"></i>ä¸ä¸è¡</button>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_under"><i class="layui-icon layui-icon-form"></i>ä¸ä¸è¡</button>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Refresh"><i class="layui-icon layui-icon-form"></i>å·æ°æµæ°´å·</button>
                        </div>
                    </script>
                </form>
            </div>
        </div>
@@ -394,9 +321,7 @@
        $("#hmakedate").val(Format(new Date(), "yyyy-MM-dd"));
     
        //å¤ææ¯å¦æ°å¢
        if (linterid == null || linterid == 0) {
            //$("#HIDDEN").hide();
            OperationType = 1;
        if (OperationType == 1) {

            $.ajax({
                url: GetWEBURL() + "/Web/GetMAXNum",
@@ -411,21 +336,6 @@
            });
            //åå§åçé¢
            set_ClearBill();
        } else if (OperationType == 2) {
            //ç¦ç¨ç»ç»éé¡¹
            //$("#HOrgID").attr("disabled", true);
            RoadBillMain(linterid);
            $.ajax({
                url: GetWEBURL() + "/Web/GetMAXNum",
                type: "GET",
                async: false,
                data: { "HBillType": '3717' },
                success: function (d) {
                    $("#HInterID").val(d.data[0].HInterID);
                    $("#HBillNo").val(d.data[0].HBillNo);
                    $("#HBillNo_bak").val(d.data[0].HBillNo);
                }
            });
        }


@@ -469,7 +379,7 @@
        //æ°å¢
        form.on('submit(set_AddNew)', function () {
            layer.confirm('æ°å¢åé¡µé¢æ°æ®å°æ¶å¤±ï¼', { icon: 3, title: 'æç¤º' }, function (index) {
                location.replace('Cj_CollectionOfSingleProductDefects.html?OperationType=1&linterid=0');
                location.replace('Cj_CollectionOfSingleProductDefects.html?OperationType=1&linterid=' + linterid);
            });
        });

@@ -560,6 +470,7 @@
                        $("#HICMOEntryID").val(data1.data[0]["HICMOEntryID"]);
                        $("#HProcExchBillNo").val(data1.data[0]["å·¥åºæµè½¬å¡"]);
                        $("#HProcExchInterID").val(data1.data[0]["HSourceInterID"]);
                        $("#HProcExchEntryID").val(data1.data[0]["HProcExchEntryID"]);
                        $("#HMaterNumber").val(data1.data[0]["ç©æç¼ç "]);
                        $("#HMaterID").val(data1.data[0]["HMaterID"]);
                        $("#HMaterName").val(data1.data[0]["ç©æåç§°"]);
@@ -699,7 +610,7 @@

            var sMainStr = JSON.stringify(data.field);

            var sMainSub = sMainStr + ';' + HResult + ";" + sessionStorage["HUserName"] ;
            var sMainSub = sMainStr + ';' + HResult + ";" + sessionStorage["HUserName"] +";"+ linterid ;

            var index = layer.load();
            $.ajax({

 WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾/Cj_ProcessItemBGA.html

@@ -29,9 +29,9 @@
            <div class="layui-card-body" style="padding: 1px;">
                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
                    <div style="padding: 2px; ">
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnAdd" id="btnSave">æå°</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnAdd" id="btnSave">æ°å¢</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnCancel" id="btnEdit">éåº</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnPrint" id="btnPrint">æå°</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnAdd" id="btnAdd">æ°å¢</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnCancel" id="btnCancel">éåº</button>
                    </div>
                    <div class="layui-tab" lay-filter="tab-POStockInBill" style="width: 49.5%; float: left; background-color: white;height:430px;">
                        <ul class="layui-tab-title" lay-filter="tab-all">
@@ -165,7 +165,7 @@
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 85px;">æ¡å½¢ç </label>
                                                <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
                                                    <input type="text" class="layui-input" lay-verify="HBarCode" name="HBarCode" id="HBarCode">
                                                    <input type="text" class="layui-input" lay-verify="HBarCodeSN" name="HBarCodeSN" id="HBarCodeSN">
                                                </div>
                                            </div>
                                        </div>
@@ -239,7 +239,7 @@
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 85px;">äº§åSN</label>
                                                <div class="layui-input-block" style="margin-left: 120px;">
                                                    <input type="text" class="layui-input" lay-verify="HMaterSN" name="HMaterSN" id="HMaterSN" style="background-color:#efefef4d;" readonly>
                                                    <input type="text" class="layui-input" lay-verify="HBarCode" name="HBarCode" id="HBarCode" style="background-color:#efefef4d;" readonly>
                                                </div>
                                            </div>
                                        </div>
@@ -255,6 +255,8 @@
                                                    <input type="hidden" name="HCreator" id="HCreator" lay-verify="HCreator">
                                                    <input type="hidden" name="HCreateDate" id="HCreateDate" lay-verify="HCreateDate">

                                                    <input type="hidden" name="HProcExchInterID" id="HProcExchInterID" lay-verify="HProcExchInterID" value="0">
                                                    <input type="hidden" name="HProcExchEntryID" id="HProcExchEntryID" lay-verify="HProcExchEntryID" value="0">
                                                    <input type="hidden" name="HSourceInterID" id="HSourceInterID" lay-verify="HSourceInterID" value="0">
                                                    <input type="hidden" name="HSourceEntryID" id="HSourceEntryID" lay-verify="HSourceEntryID" value="0">
                                                    <input type="hidden" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" value="">
@@ -329,7 +331,7 @@
                , laydate = layui.laydate
                , tree = layui.tree
            var titleData = ["HInterID", "HEntryID", "HBadReasonID", "HSourceInterID","HSourceEntryID"];//åè¡¨ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

            var hpj =0;
            //#endregion

            //#region è¿å¥é¡µé¢å³å è½½
@@ -340,8 +342,8 @@
            //#region è§¦åäºä»¶ï¼åæ¬form.on(){}æ ¼å¼çææç¹å»äºä»¶ãéæ©äºä»¶ç

            //æ¡å½¢ç åè½¦æ¹æ³
            $('#HBarCode').on('keydown', function (event) {
                var HBarCode = $('#HBarCode').val();
            $('#HBarCodeSN').on('keydown', function (event) {
                var HBarCode = $('#HBarCodeSN').val();
                if (event.keyCode == 13) {
                    if (!HBarCode) {
                        layer.msg("æ¡å½¢ç ä¸è½ä¸ºç©ºï¼")
@@ -362,18 +364,33 @@
                get_checkSearchChangeMater();
            });

            //åè¡¨è¡åäºä»¶
            table.on('tool(mainTable)', function (obj) {
                set_GridDelete(obj);   //è¡åå é¤
            });

            // NGä¿å
            form.on('submit(NGSave)', function (data) {
                get_Save(data,"NG");
            });

            // OKä¿å
            form.on('submit(OKSave)', function (data) {
                get_Save(data,"OK");
            });

            //#endregion

            //#region æ¤é¡µé¢ææçæ¹æ³
            //åå§åçé¢
            function set_ClearBill() {
                $('#btnAdd').addClass("layui-btn-disabled").attr("disabled", true);
                //åå§ååæ®
                createBillNo();
                var mychart1 = echarts.init(document.getElementById('mychart1'));
            
                get_Display();
                get_Histogram1(mychart1);//æ±ç¶å¾1
                get_UsreList();
                get_Display();
            }

            // çæåæ®å·
@@ -505,14 +522,9 @@

            //æ¥è¯¢åè¡¨æ°æ®
            function get_Display() {
                var HSourceInterID = $("#HSourceInterID").val();
                var HSourceEntryID = $("#HSourceEntryID").val();
                var HBarCode = $("#HBarCode").val();
                var sWhere = "";
                if (HSourceInterID != 0 && HSourceEntryID != 0) {
                    sWhere = " and HSourceInterID=" + HSourceInterID + " and HSourceEntryID=" + HSourceEntryID;
                } else {
                    sWhere = " and HSourceInterID=0 and HSourceEntryID=0 ";
                }
                sWhere = " and SNç ='" + HBarCode + "'";
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + "/Cj_SingleStation/ProcessItemRepair",
@@ -548,15 +560,6 @@
                            }
                            col.push({ fixed: 'right', title: 'æä½', toolbar: '#barDemo' });

                            if (data1.data.length != 0) {
                                $("#HBadReasonID").val(data1.data[0]["HBadReasonID"]);
                                $("#HBadReasonName").val(data1.data[0]["ä¸è¯åå "]);
                            //$("#HBadTypeID").val();
                            //$("#HBadTypeName").val();
                            //$("#HBadResultID").val();
                            //$("#HBadResultName").val();
                            }
                          
                            var option = {
                                elem: '#mainTable'
                                //, toolbar: '#toolbarDemo'
@@ -599,10 +602,12 @@
                            $("#HDeptID").val(data1.data[0]["HDeptID"]);
                            $("#HDeptName").val(data1.data[0]["è½¦é´"]);
                            $("#HProName").val(data1.data[0]["å·¥åº"]);
                            $("#HProcess").val(data1.data[0]["HProcID"]);
                            $("#HSourceID").val(data1.data[0]["HSourceID"]);
                            $("#HSourceName").val(data1.data[0]["çäº§èµæº"]);
                            $("#HEmpID").val(data1.data[0]["HEmpID"]);
                            $("#HEmpName").val(data1.data[0]["è´¨æ£å"]);
                            $("#HCreator").val(data1.data[0]["è´¨æ£å"]);
                            //$("#HGroupID").val(data1.data[0]["HGroupID"]);
                            //$("#HGroupName").val(data1.data[0]["çäº§çç»"]);
                            layer.close(ajaxLoad);
@@ -626,7 +631,7 @@
                var index = layer.load();
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/Cj_SingleStation/HBardCodeList",
                    url: GetWEBURL() + "/Cj_SingleStation/HFBardCodeList",
                    async: false,
                    data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
                    dataType: "json",
@@ -638,6 +643,7 @@
                            $("#HICMOEntryID").val(data1.data[0]["HICMOEntryID"]);
                            $("#HProcExchBillNo").val(data1.data[0]["å·¥åºæµè½¬å¡"]);
                            $("#HProcExchInterID").val(data1.data[0]["HSourceInterID"]);
                            $("#HProcExchEntryID").val(data1.data[0]["HProcExchEntryID"]);
                            $("#HUnitID").val(data1.data[0]["HUnitID"]);
                            $("#HUnitName").val(data1.data[0]["åä½"]);
                            $("#HOrgName").val(data1.data[0]["ç»ç»"]);
@@ -646,21 +652,63 @@
                            $("#HMaterID").val(data1.data[0]["HMaterID"]);
                            $("#HMaterName").val(data1.data[0]["ç©æåç§°"]);
                            $("#HMaterModel").val(data1.data[0]["è§æ ¼åå·"]);
                            $("#HMaterSN").val(data1.data[0]["æ¡ç "]);
                            $("#HBarCode").val(data1.data[0]["æ¡ç "]);
                            $("#HBadReasonID").val(data1.data[0]["HBadReasonID"]);
                            $("#HBadReasonName").val(data1.data[0]["ä¸è¯åå "]);
                            if (data1.data.length != 0) {
                               
                                //$("#HBadTypeID").val();
                                //$("#HBadTypeName").val();
                                //$("#HBadResultID").val();
                                //$("#HBadResultName").val();
                            }

                            //æ¥è¯¢è¿ä¿®è®°å½
                            get_Display();
                        }
                        else {
                            layer.close(index);
                            layer.msg(data1.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                        }
                        $("#HBarCode").val("");
                        $("#HBarCodeSN").val("");
                    },
                    error: function (err) {
                        layer.close(index);
                        layer.msg("éè¯¯:" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    }
                });
            }

            //å é¤æ¹æ³
            function set_GridDelete(obj) {
                if (obj.event === 'del') {
                    layer.confirm('ççå é¤è¡åï¼', function (index) {
                        var HInterID = obj.data.HInterID;
                        var HEntryID = obj.data.HEntryID;

                        var ajaxLoad = layer.load();
                        $.ajax({
                            url: GetWEBURL() + "/Cj_SingleStation/ProcessItemRepairDel",
                            type: "GET",
                            async: false,
                            data: { "HInterID": HInterID, "HEntryID": HEntryID, "user": sessionStorage["HUserName"],"HBill":"ZB" },
                            success: function (result) {
                                if (result.count == 1) {
                                    layer.msg("å é¤æåï¼");
                                    layer.close(ajaxLoad);
                                    //æ¥è¯¢è¿ä¿®è®°å½
                                    get_Display();
                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                    layer.close(ajaxLoad);
                                }
                            }, error: function () {
                                layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                                layer.close(ajaxLoad);
                            }
                        })
                    });
                }
            }

            //ä¸è¯åå éæ©é¡µé¢
@@ -692,36 +740,43 @@
                })
            }


            //æ¢éä»¶é¡µé¢
            function get_checkSearchChangeMater() {
                var HMaterSN = $("#HMaterSN").val();
                if (HMaterSN == "") {
                var HBarCode = $("#HBarCode").val();
                if (HBarCode == "") {
                    return layer.msg("è¯·åæ«æ¡ç !");
                }

                if (hpj == 0) {
                    return layer.msg("è¯·åä¿åè¿ä¿®è®°å½!");
                }

                var HInterID = $("#HInterID").val();
                var HBillNo = $("#HBillNo").val();
                //var HEmpName = $("#HEmpName").val();
                //var HProdMac = $("#HProdMac").val();
                //var HSourceInterID = $("#HSourceInterID").val();
                //var HSourceEntryID = $("#HSourceEntryID").val();
                //var HSourceBillNo = $("#HSourceBillNo").val();
                //var HSourceBillType = $("#HSourceBillType").val();
                //var HBarCode = $("#HBarCode").val();
                var HEmpName = $("#HEmpName").val();
                var HProdMac = $("#HProdMac").val();
                var HSourceInterID = $("#HSourceInterID").val();
                var HSourceEntryID = $("#HSourceEntryID").val();
                var HSourceBillNo = $("#HSourceBillNo").val();
                var HSourceBillType = $("#HSourceBillType").val();
                var HProcExchBillNo = $("#HProcExchBillNo").val();
                var HProcess = $("#HProcess").val();

                var dataParams = {
                    'OperationType': 1
                    , 'HMaterSN': HMaterSN
                    , 'HInterID': HInterID
                    , 'HBillNo': HBillNo
                    //, 'HEmpName': HEmpName
                    //, 'HProdMac': HProdMac
                    //, 'HSourceInterID': HSourceInterID
                    //, 'HSourceEntryID': HSourceEntryID
                    //, 'HSourceBillNo': HSourceBillNo
                    //, 'HSourceBillType': HSourceBillType
                    //, 'HBarCode': HBarCode
                    //, 'subMaterList_Temp': $("#subMaterList_Temp").val()
                    , 'HMaterSN': HBarCode
                    , 'HEmpName': HEmpName
                    , 'HProdMac': HProdMac
                    , 'HSourceInterID': HSourceInterID
                    , 'HSourceEntryID': HSourceEntryID
                    , 'HSourceBillNo': HSourceBillNo
                    , 'HSourceBillType': HSourceBillType
                    , 'HBarCode': HBarCode
                    , 'HProcExchBillNo': HProcExchBillNo
                    , 'HProcess': HProcess
                    , 'subMaterList_Temp': $("#subMaterList_Temp").val()
                }
                var datajson = JSON.stringify(dataParams);
                url = encodeURI('../../è½¦é´ç®¡ç/ååè¿ç«/Cj_ProcessItemBGA_PJGH.html?OperationType=1&datajson=' + datajson);
@@ -743,6 +798,43 @@
                })
            }

            //ä¿å
            function get_Save(data, HResult) {
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache["mainTable"]);
                var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"] + ";" + HResult;

                var index = layer.load();
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "/Cj_SingleStation/HFXAddRepairBill",
                    async: false,
                    data: { "sMainSub": sMainSub },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) {
                            $('#NGSave').addClass("layui-btn-disabled").attr("disabled", true);
                            $('#OKSave').addClass("layui-btn-disabled").attr("disabled", true);
                            $('#btnAdd').removeClass("layui-btn-disabled").attr("disabled", false);
                            layer.close(index);
                            layer.msg("æäº¤æå");
                            hpj = 1;
                            get_Display();
                            var mychart1 = echarts.init(document.getElementById('mychart1'));
                            get_Histogram1(mychart1);//æ±ç¶å¾1
                        }
                        else {
                            layer.close(index);
                            layer.msg(data.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                        }
                    },
                    error: function (err) {
                        layer.close(index);
                        layer.msg("éè¯¯:" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    }
                });
            }

            //#endregion

        });

 WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾/Cj_ProcessItemBGA_PJGH.html

@@ -85,6 +85,26 @@
                                                <input type="text" class="layui-input" name="HRemark" id="HRemark" lay-verify="HRemark" placeholder="è¯·è¾å¥åå®¹" onmouseover="this.title=this.value" style=" width: 500px;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
                                                <input type="hidden" name="HSourceInterID" id="HSourceInterID" lay-verify="HSourceInterID" value="0">
                                                <input type="hidden" name="HSourceEntryID" id="HSourceEntryID" lay-verify="HSourceEntryID" value="0">
                                                <input type="hidden" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" value="">
                                                <input type="hidden" name="HSourceBillType" id="HSourceBillType" lay-verify="HSourceBillType" value="">
                                                <input type="hidden" name="HRelationQty" id="HRelationQty" lay-verify="HRelationQty" value="0">
                                                <input type="hidden" name="HRelationMoney" id="HRelationMoney" lay-verify="HRelationMoney" value="0">

                                                <input type="hidden" name="HMaterID" id="HMaterID" lay-verify="HMaterID" value="0">
                                                <input type="hidden" name="HMaterNumber" id="HMaterNumber" lay-verify="HMaterNumber" value="">
                                                <input type="hidden" name="HMaterName" id="HMaterName" lay-verify="HMaterName" value="">
                                                <input type="hidden" name="HUnitID" id="HUnitID" lay-verify="HUnitID" value="0">
                                                <input type="hidden" name="HQty" id="HQty" lay-verify="HQty" value="0">
                                                <input type="hidden" name="HSupID" id="HSupID" lay-verify="HSupID" value="0">
                                                <input type="hidden" name="HBatchNo" id="HBatchNo" lay-verify="HBatchNo">
                                                <input type="hidden" name="HProcExchBillNo" id="HProcExchBillNo" lay-verify="HProcExchBillNo">
                                                <input type="hidden" name="HProcess" id="HProcess" lay-verify="HProcess">
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
@@ -152,6 +172,7 @@
        //å®ä¹å¨å±åé

        var HModName = "Cj_CollectionOfSingleProductDefects";
        var option2 = [];
        //#endregion

        //#region è¿å¥é¡µé¢å³å è½½
@@ -173,6 +194,8 @@
            $("#HInterID").val(datajson.HInterID);
            $("#HBillNo").val(datajson.HBillNo);
            $("#HBillNo_bak").val(datajson.HBillNo);
            $("#HProcExchBillNo").val(datajson.HProcExchBillNo);
            $("#HProcess").val(datajson.HProcess);
            //åå§åçé¢
            set_ClearBill();
        }
@@ -184,20 +207,25 @@
        //#region è§¦åäºä»¶ï¼åæ¬form.on(){}æ ¼å¼çææç¹å»äºä»¶ãéæ©äºä»¶ç

        //æ¡å½¢ç åè½¦æ¹æ³
        $('#HBarCodeSN').on('keydown', function (event) {
            var HBarCode = $('#HBarCodeSN').val();
        $('#HBarCode').on('keydown', function (event) {
            var HBarCode = $('#HBarCode').val();
            if (event.keyCode == 13) {
                if (!HBarCode) {
                    layer.msg("æ¡å½¢ç ä¸è½ä¸ºç©ºï¼")
                    return;
                }
                txtHBarCode_KeyDown(HBarCode);
                get_Accessory(HBarCode);
            }
        });

        //éæ©ä¸è¯åå 
        form.on('submit(btnHBadReason)', function () {
            btnHBadReason();
        //éä»¶æ´æ¢è®°å½åè¡¨è¡åäºä»¶
        table.on('tool(mainTable1)', function (obj) {
            set_GridDelete1(obj);   //è¡åå é¤
        });

        //ç©ææ¸ååè¡¨è¡åäºä»¶
        table.on('tool(mainTable2)', function (obj) {
            set_GridDelete2(obj);   //è¡åå é¤
        });

        //éæ©è´¨æ£å
@@ -212,18 +240,6 @@
            });
        });

        //ä¿åæäº¤
        form.on('submit(btnSave_BL)', function (data) {//æäº¤
            if (AllowLoadData(data)) {
                set_AddNew(data, "ä¸è¯");
            }
        });

        form.on('submit(btnSave_BF)', function (data) {//æäº¤
            if (AllowLoadData(data)) {
                set_AddNew(data, "æ¥åº");
            }
        });

        //éåº
        form.on('submit(btnEdit)', function (data) {
@@ -241,10 +257,14 @@

        //åå§åçé¢
        function set_ClearBill() {
            //åæ è·³è½¬å°éä»¶ææ¬æ¡ä¸
            $("#HBarCode").focus();
            //æ¥è¯¢ç»å®ç¨æ·
            get_Display();
            //æ¥è¯¢æ¡ç ç»å®çè¿ä¿®è®°å½
            get_RepairRecord();
            //æ¥è¯¢ç©ææ¸åæ°æ®
            get_BomList($("#HProcExchBillNo").val());
        }

        //æ¥è¯¢
@@ -277,66 +297,53 @@
            });
        }

        //æ¡ç åè½¦æ¥è¯¢
        function txtHBarCode_KeyDown(HBarCode) {

        //æ¡ç åè½¦æ¥è¯¢æ´æ¢éä»¶
        var KNum = 0;
        function get_Accessory(HBarCode) {
            var index = layer.load();
            $.ajax({
                type: "GET",
                url: GetWEBURL() + "/Cj_SingleStation/HBardCodeList",
                async: true,
                url: GetWEBURL() + "/Cj_SingleStation/HBardCodeAccessoryList",
                async: false,
                data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
                dataType: "json",
                success: function (data1) {
                    if (data1.count == 1) {
                        layer.close(index);
                        $("#HICMOBillNo").val(data1.data[0]["çäº§è®¢å"]);
                        $("#HICMOInterID").val(data1.data[0]["HICMOInterID"]);
                        $("#HProcExchBillNo").val(data1.data[0]["å·¥åºæµè½¬å¡"]);
                        $("#HProcExchInterID").val(data1.data[0]["HSourceInterID"]);
                        $("#HMaterNumber").val(data1.data[0]["ç©æç¼ç "]);
                        $("#HMaterID").val(data1.data[0]["HMaterID"]);
                        $("#HMaterName").val(data1.data[0]["ç©æåç§°"]);
                        $("#HModel").val(data1.data[0]["è§æ ¼åå·"]);
                        $("#HBarCode").val(data1.data[0]["æ¡ç "]);

                        for (var i = 0; i < option2.data.length; i++) {
                            if (data1.data[0]["HMaterNumber"] == option2.data[i]["éä»¶ä»£ç "] && option2.data[i]["HBatchNo"] == data1.data[0]["HBatchNo"] && option2.data[i]["HBatchNo"] != "") {
                                return layer.msg("å½åæ¹æ¬¡å·²æ«å¥,è¯·ä¸è¦éå¤æ«å¥!");
                            }
                            if (data1.data[0]["HMaterNumber"] == option2.data[i]["éä»¶ä»£ç "] && option2.data[i]["HBatchNo"] != data1.data[0]["HBatchNo"] && option2.data[i]["HBatchNo"] != "") {
                                layer.confirm('æ¯å¦è¦æ¿æ¢å½åæ¹æ¬¡', function (index) {
                                    layer.close(index);
                                    $('#HProcName').val(HBarCode);
                                    option2.data[i]["HBatchNo"] = data1.data[0]["HBatchNo"];
                                    option2.data[i]["HBarCode"] = HBarCode;
                                    table.render(option2);
                                    //ä¿åéä»¶æ´æ¹è®°å½
                                    set_AddNew();
                                });
                                break;
                            }
                            KNum += 1;
                        }
                      
                        $('#HBarCode').val("");


                    }
                    else {
                        layer.close(index);
                        layer.msg(data1.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    }
                    $("#HBarCodeSN").val("");
                },
                error: function (err) {
                    layer.close(index);
                    layer.msg("éè¯¯:" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                }
            });
        }

        //ä¸è¯åå éæ©é¡µé¢
        function btnHBadReason() {
            layer.open({
                type: 2//å¼¹çªç±»å
                , skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
                , area: ['90%', '90%']//å¤§å°
                , title: 'ä¸è¯åå åè¡¨'//æ é¢
                , shift: 2//å¼¹åºå¨ç»
                , content: ['../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_BadReason.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('è¯·éæ©æ°æ®');
                    }
                    //è·åæ°æ®
                    $("#HBadReasonID").val(checkStatus.data[0].HItemID);
                    $("#HBadReasonName").val(checkStatus.data[0].ä¸è¯åå åç§°);

                    layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
                }
            })
        }

        //è´¨æ£åéæ©é¡µé¢
@@ -366,20 +373,21 @@

        //æ¥è¯¢æ¡ç ç»å®çè¿ä¿®è®°å½
        function get_RepairRecord() {
            var sWhere = " and HBarCodeSN='" + $("#HMaterSN").val() + "' and HBarCode is not null";
            var index = layer.load();
            $.ajax({
                type: "GET",
                url: GetWEBURL() + "/Cj_SingleStation/Sc_SourceLineRepairBillSub_MaterList",
                async: false,
                data: { "sWhere": " and HSourceBillNo='" + $("#HMaterSN").val() + "'", "user": sessionStorage["HUserName"] },
                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                dataType: "json",
                success: function (data1) {
                    if (data1.count == 1) {
                        layer.close(index);

                        var option = {
                            elem: '#mainTable'
                            , toolbar: '#toolbarDemo'
                            elem: '#mainTable1'
                            //, toolbar: '#toolbarDemo'
                            , page: false
                            , totalRow: true
                            , data: data1.data
@@ -429,7 +437,140 @@
            });
        }

        //éä»¶è®°å½å é¤æ¹æ³
        function set_GridDelete1(obj) {
            if (obj.event === 'del') {
                layer.confirm('ççå é¤è¡åï¼', function (index) {
                    var HInterID = obj.data.HInterID;
                    var HEntryID = obj.data.HEntryID;

                    var ajaxLoad = layer.load();
                    $.ajax({
                        url: GetWEBURL() + "/Cj_SingleStation/ProcessItemRepairDel",
                        type: "GET",
                        async: false,
                        data: { "HInterID": HInterID, "HEntryID": HEntryID, "user": sessionStorage["HUserName"], "HBill": "PJ"},
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg("å é¤æåï¼");
                                layer.close(ajaxLoad);
                                //æ¥è¯¢æ¡ç ç»å®çè¿ä¿®è®°å½
                                get_RepairRecord();
                            } else {
                                layer.alert(result.code + result.Message, { icon: 5 });
                                layer.close(ajaxLoad);
                            }
                        }, error: function () {
                            layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                            layer.close(ajaxLoad);
                        }
                    })
                });
            }
        }

        //ç©ææ¸åå é¤æ¹æ³
        function set_GridDelete2(obj) {
            if (obj.event === 'del2') {
                layer.confirm('ççå é¤è¡åï¼', function (index) {
                    var HInterID = obj.data.BomHInterID;
                    var HEntryID = obj.data.BomHEntryID;

                    var ajaxLoad = layer.load();
                    $.ajax({
                        url: GetWEBURL() + "/Cj_SingleStation/DelBomTempList",
                        type: "GET",
                        async: false,
                        data: { "HInterID": HInterID, "HEntryID": HEntryID, "user": sessionStorage["HUserName"]},
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg("å é¤æåï¼");
                                layer.close(ajaxLoad);
                                //æ¥è¯¢æ¸å
                                get_BomList($("#HProcExchBillNo").val());
                            } else {
                                layer.alert(result.code + result.Message, { icon: 5 });
                                layer.close(ajaxLoad);
                            }
                        }, error: function () {
                            layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                            layer.close(ajaxLoad);
                        }
                    })
                });
            }
        }

        //æµè½¬å¡æ¥è¯¢å³é®ä»¶æ¸å
        function get_BomList(HBarCode) {
            var index = layer.load();
            $.ajax({
                type: "GET",
                url: GetWEBURL() + "/Cj_SingleStation/HBardCodeBomList",
                async: false,
                data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
                dataType: "json",
                success: function (data1) {
                    if (data1.count == 1) {
                        layer.close(index);

                        $("#HMaterNumber").val(data1.data[0]["HMainMaterNumber"]);
                        $("#HMaterID").val(data1.data[0]["HMainMaterID"]);
                        $("#HMaterName").val(data1.data[0]["HMainMaterName"]);
                        //$("#HProcExchInterID").val(data1.data[0]["HProcExchInterID"]);
                        //$("#HProcExchEntryID").val(data1.data[0]["HProcExchEntryID"]);
                        //$("#HProcExchBillNo").val(data1.data[0]["HProcExchBillNo"]);
                        //$("#HICMOBillNo").val(data1.data[0]["HICMOBillNo"]);
                        //$("#HICMOInterID").val(data1.data[0]["HICMOInterID"]);
                        //$("#HICMOEntryID").val(data1.data[0]["HICMOEntryID"]);
                        //$("#HProcNo").val(data1.data[0]["HProcNo"]);
                        //$("#HPieceQty").val(data1.data[0]["HPieceQty"]);
                        //$("#HICMOQty").val(data1.data[0]["HICMOQty"]);

                        option2 = {
                            elem: '#mainTable2'
                            //, toolbar: '#toolbarDemo'
                            , async: true
                            , page: false
                            //, totalRow: true
                            , cellMinWidth: 120
                            , data: data1.data
                            , height: 185
                            , cols: [[
                                { type: 'numbers', title: 'åºå·' }
                                , { field: 'æ¥æ', title: 'æ¥æ' }
                                , { field: 'éä»¶ä»£ç ', title: 'éä»¶ä»£ç ' }
                                , { field: 'éä»¶åç§°', title: 'éä»¶åç§°' }
                                , { field: 'éä»¶è§æ ¼', title: 'éä»¶è§æ ¼' }
                                , { field: 'éä»¶æ°é', title: 'éä»¶æ°é' }
                                , { field: 'HBatchNo', title: 'å½åæ¹æ¬¡' }
                                , { field: 'BomHInterID', title: 'BomHInterID', hide: true }
                                , { field: 'BomHEntryID', title: 'BomHEntryID', hide: true }
                                , { field: 'HICMOInterID', title: 'HICMOInterID', hide: true }
                                , { field: 'HICMOEntryID', title: 'HICMOEntryID', hide: true }
                                , { field: 'HICMOBillNo', title: 'HICMOBillNo', hide: true }
                                , { field: 'HProcExchInterID', title: 'HProcExchInterID', hide: true }
                                , { field: 'HProcExchEntryID', title: 'HProcExchEntryID', hide: true }
                                , { field: 'HProcExchBillNo', title: 'HProcExchBillNo', hide: true }
                                , { field: 'HMaterID', title: 'HMaterID', hide: true }
                                , { field: 'HBarCode', title: 'HBarCode', hide: true }
                                , { fixed: 'right', title: 'æä½', toolbar: '#barDemo2' }
                            ]]
                        }
                        table.render(option2)
                    }
                    else {
                        layer.close(index);
                        layer.msg(data1.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    }
                    $("#HBarCodeSN").val("");
                },
                error: function (err) {
                    layer.close(index);
                    layer.msg("éè¯¯:" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                }
            });
        }

        //è·ååæ°
        function getUrlVars() {
@@ -444,24 +585,28 @@
        }

        //ä¿åHMaker
        function set_AddNew(data, HResult) {
        function set_AddNew() {
            var data1 = { "field": { "HInterID": $("#HInterID").val(), "HBillNo": $("#HBillNo").val(), "HProcExchBillNo": $("#HProcExchBillNo").val(), "HProcExchInterID": $("#HProcExchInterID").val(), "HProcExchEntryID": $("#HProcExchEntryID").val(), "HProcess": $("#HProcess").val() } };

            var sMainStr = JSON.stringify(data.field);

            var sMainSub = sMainStr + ';' + HResult + ";" + sessionStorage["HUserName"];
            var HResult = "éä»¶";
            var sMainStr = JSON.stringify(data1.field);
            var sSubStr = JSON.stringify(table.cache["mainTable2"][KNum]);
            var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"] + ";" + HResult;

            var index = layer.load();
            $.ajax({
                type: "POST",
                url: GetWEBURL() + "/Cj_SingleStation/ProcessBLSave",
                url: GetWEBURL() + "/Cj_SingleStation/HFXAddRepairBill",
                async: false,
                data: { "sMainSub": sMainSub },
                dataType: "json",
                success: function (data) {
                    if (data.count == 1) {
                        $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
                        //$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
                        layer.close(index);
                        layer.msg("æäº¤æå");
                        //æ¥è¯¢æ´æ¢è®°å½
                        get_RepairRecord();
                    }
                    else {
                        layer.close(index);

 WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾/Cj_ProcessItemStationPlatform.html

@@ -30,7 +30,7 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">æ¡å½¢ç :</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HBarCode" lay-verify="HBarCode" placeholder="è¯·é®å¥ååè½¦" id="HBarCode" style="width: 500px;">
                                                <input type="text" class="layui-input" name="HBarCodeSN" lay-verify="HBarCodeSN" placeholder="è¯·é®å¥ååè½¦" id="HBarCodeSN" style="width: 500px;">
                                            </div>
                                        </div>
                                    </div>
@@ -57,6 +57,7 @@
                                            <label class="layui-form-label" style="width: 85px;">äº§åç¼ç </label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -112,6 +113,7 @@
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HProcExchBillNo" lay-verify="HProcExchBillNo" id="HProcExchBillNo" value="" style="background-color:#efefef4d;">
                                                <input type="hidden" class="layui-input" name="HProcExchInterID" lay-verify="HProcExchInterID" id="HProcExchInterID" value="0">
                                                <input type="hidden" class="layui-input" name="HProcExchEntryID" lay-verify="HProcExchEntryID" id="HProcExchEntryID" value="0">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -119,6 +121,7 @@
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HICMOBillNo" lay-verify="HICMOBillNo" id="HICMOBillNo" value="" style="background-color:#efefef4d;">
                                                <input type="hidden" class="layui-input" name="HICMOInterID" lay-verify="HICMOInterID" id="HICMOInterID" value="0">
                                                <input type="hidden" class="layui-input" name="HICMOEntryID" lay-verify="HICMOEntryID" id="HICMOEntryID" value="0">
                                            </div>
                                        </div>
                                    </div>
@@ -133,7 +136,7 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">äº§åSN</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HBarCode" lay-verify="HBarCode" id="HBarCode" value="" style="background-color:#efefef4d;display: inline-block;" readonly>
                                                <input type="text" class="layui-input" name="HBarCode_P" lay-verify="HBarCode_P" id="HBarCode_P" value="" style="background-color:#efefef4d;display: inline-block;" readonly>
                                            </div>
                                        </div>
                                    </div>
@@ -228,10 +231,15 @@
                        <ul class="layui-tab-title">
                            <li class="layui-this">ä¸è¯è®°å½</li>
                        </ul>
                        <div class="layui-tab-content">
                        <div class="layui-tab-content" style="background-color: white;">
                            <div class="layui-row" style="margin-bottom: 5px;">
                                <div class="layui-inline">
                                    <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="BadReport" id="BadReport">ä¸è¯æ±æ¥</button>
                                </div>
                            </div>
                            <div class="layui-tab-item layui-show">
                                <!--ä¸è¯è®°å½-->
                                <table class="layui-hide" id="mainTable2" lay-filter="mainTable2"></table>
                                <table class="layui-hide" id="mainTable3" lay-filter="mainTable3"></table>
                            </div>
                        </div>
                    </div>
@@ -239,7 +247,7 @@
                        <ul class="layui-tab-title">
                            <li class="layui-this">åæ ¼è®°å½</li>
                        </ul>
                        <div class="layui-tab-content">
                        <div class="layui-tab-content" style="background-color: white;">
                            <div class="layui-tab-item layui-show">
                                <!--åæ ¼è®°å½-->
                                <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
@@ -259,12 +267,20 @@
                        </div>
                    </script>
                    <input type="hidden" id="HProdOrgID" name="HProdOrgID" value="0" />
                    <input type="hidden" name="HPieceQty" id="HPieceQty" value="0">
                    <input type="hidden" name="HICMOQty" id="HICMOQty" value="0">
                </form>
            </div>
        </div>
    </div>
</body>
</html>
<script type="text/html" id="barDemo2">
    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del2">å é¤</a>
</script>
<script type="text/html" id="barDem03">
    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del3">å é¤</a>
</script>
<script>

    layui.config({
@@ -284,7 +300,10 @@

        //å®ä¹å¨å±åé

        var HModName = "Cj_CollectionOfSingleProductDefects";
        var HModName = "Cj_ProcessItemStationPlatform";
        var option = [];
        var option2 = [];
        var option3 = [];
        //#endregion

        //#region è¿å¥é¡µé¢å³å è½½
@@ -304,10 +323,16 @@
        //æ¡å½¢ç åè½¦æ¹æ³
        $('#HBarCodeSN').on('keydown', function (event) {
            var HBarCode = $('#HBarCodeSN').val();
            var HBardCodeProcExchBillNo = $('#HBardCodeProcExchBillNo').val();
            if (event.keyCode == 13) {
                if (!HBarCode) {
                    layer.msg("æ¡å½¢ç ä¸è½ä¸ºç©ºï¼")
                if (!HBardCodeProcExchBillNo) {
                    layer.msg("è¯·åæ«æµè½¬å¡ï¼")
                    return;
                } else {
                    if (!HBarCode) {
                        layer.msg("æ¡å½¢ç ä¸è½ä¸ºç©ºï¼")
                        return;
                    }
                }
                txtHBarCode_KeyDown(HBarCode);
            }
@@ -322,9 +347,39 @@
                    return;
                }
                get_BomList(HBarCode);
                if (option.data != 0) {
                    //ä¿åå°ä¸´æ¶è¡¨
                    get_AddBomTempList();
                }
                //æ¥è¯¢ä¸è¯è®°å½
                get_BadRecords(HBarCode);
                //æ¥è¯¢åæ ¼è®°å½
                get_HGRecords(HBarCode);
            }
        });

        //éä»¶åè½¦æ¹æ³
        $('#HBardCodeMater').on('keydown', function (event) {
            var HBarCode = $('#HBardCodeMater').val();
            var HBardCodeProcExchBillNo = $('#HBardCodeProcExchBillNo').val();
            if (event.keyCode == 13) {
                if (!HBardCodeProcExchBillNo) {
                    layer.msg("è¯·åæ«æµè½¬å¡ï¼")
                    return;
                } else {
                    if (!HBarCode) {
                        layer.msg("éä»¶ä¸è½ä¸ºç©ºï¼")
                        return;
                    }
                }
                get_Accessory(HBarCode);
            }
        });

        //ä¸è¯æ±æ¥
        form.on('submit(BadReport)', function () {
            BadReport();
        });

        //éæ©è´¨æ£å
        form.on('submit(btnHEmp)', function () {
@@ -374,8 +429,26 @@

        //åå§åçé¢
        function set_ClearBill() {
            //è¿å¥é¡µé¢é»è®¤åæ å¨æµè½¬å¡ä¸
            $("#HBardCodeProcExchBillNo").focus();
            createBillNo();
            get_Display();
            get_CriticalPartsList();//å³é®ä»¶æ¸å
            get_CriticalPartsList();//å³é®ä»¶æ¸å ä¸è¯è®°å½  åæ ¼è®°å½
          
        }

        // çæåæ®å·
        function createBillNo() {
            $.ajax({
                url: GetWEBURL() + "/Web/GetMAXNum",
                async: false,
                type: "GET",
                data: { "HBillType": '3791' },
                success: function (d) {
                    $("#HInterID").val(d.data[0].HInterID);
                    $("#HBillNo").val(d.data[0].HBillNo);
                }
            });
        }

        //æ¥è¯¢
@@ -417,10 +490,9 @@
            });
        }


        //å³é®ä»¶æ¸å
        function get_CriticalPartsList() {
            var option = {
            option= {
                elem: '#mainTable2'
                //, toolbar: '#toolbarDemo'
                , async: true
@@ -432,41 +504,153 @@
                , cols: [[
                    { type: 'numbers', title: 'åºå·' }
                    , { field: 'æ¥æ', title: 'æ¥æ' }
                    , { field: 'éä»¶ä»£ç ', title: 'éä»¶ä»£ç ' }
                    , { field: 'éä»¶åç§°', title: 'éä»¶åç§°' }
                    , { field: 'éä»¶è§æ ¼', title: 'éä»¶è§æ ¼' }
                    , { field: 'éä»¶æ°é', title: 'éä»¶æ°é' }
                    , { field: 'å½åæ¹æ¬¡', title: 'å½åæ¹æ¬¡' }
                    , { field: 'HBillNo_bak', title: 'HBillNo_bak', hide: true }
                    , { field: 'HBatchNo', title: 'å½åæ¹æ¬¡' }
                    , { field: 'HICMOInterID', title: 'HICMOInterID', hide: true }
                    , { field: 'HICMOEntryID', title: 'HICMOEntryID', hide: true }
                    , { field: 'HICMOBillNo', title: 'HICMOBillNo', hide: true }
                    , { field: 'HProcExchInterID', title: 'HProcExchInterID', hide: true }
                    , { field: 'HProcExchEntryID', title: 'HProcExchEntryID', hide: true }
                    , { field: 'HProcExchBillNo', title: 'HProcExchBillNo', hide: true }
                    , { field: 'HMaterID', title: 'HMaterID', hide: true }
                    , { field: 'HBarCode', title: 'HBarCode', hide: true }
                ]]
            }

            option2 = {
                elem: '#mainTable3'
                //, toolbar: '#toolbarDemo'
                , async: true
                , page: false
                //, totalRow: true
                , cellMinWidth: 120
                , data: []
                , height: 325
                , cols: [[
                    { type: 'numbers', title: 'åºå·' }
                    , { field: 'æ¥æ', title: 'æ¥æ' }
                    , { field: 'HName', title: 'äº§ååç§°' }
                    , { field: 'HNumber', title: 'äº§åä»£ç ' }
                    , { field: 'HBarCode', title: 'SNç ' }
                    , { field: 'ä¸è¯åå ', title: 'ä¸è¯åå ' }
                    , { field: 'HBatchNo', title: 'ä¸è¯ç±»å' }
                    , { fixed: 'right', title: 'æä½', toolbar: '#barDemo2' }
                ]]
            }

            option3 = {
                elem: '#mainTable'
                //, toolbar: '#toolbarDemo'
                , async: true
                , page: false
                //, totalRow: true
                , cellMinWidth: 120
                , data: []
                , height: 370
                , cols: [[
                    { type: 'numbers', title: 'åºå·' }
                    , { field: 'hmainid', title: 'hmainid', hide: true }
                    , { field: 'hsubid', title: 'hsubid', hide: true }
                    , { field: 'æ¥æ', title: 'æ¥æ' }
                    , { field: 'äº§ååç§°', title: 'äº§ååç§°' }
                    , { field: 'äº§åæ¡ç ', title: 'SNç ' }
                    , { field: 'éä»¶æ¡ç ', title: 'éä»¶SNç ' }
                    , { field: 'ä»»å¡åå·', title: 'è®¢åå·' }
                    , { field: 'HICMOInterID', title: 'HICMOInterID', hide: true }
                    , { field: 'HICMOEntryID', title: 'HICMOEntryID', hide: true }
                    , { field: 'HICMOBillNo', title: 'HICMOBillNo', hide: true }
                    , { field: 'HProcExchInterID', title: 'HProcExchInterID', hide: true }
                    , { field: 'HProcExchEntryID', title: 'HProcExchEntryID', hide: true }
                    , { field: 'HProcExchBillNo', title: 'HProcExchBillNo', hide: true }
                    , { field: 'HMaterID', title: 'HMaterID', hide: true }
                    , { field: 'HBarCode', title: 'HBarCode', hide: true }
                    , { fixed: 'right', title: 'æä½', toolbar: '#barDem03' }
                ]]
            }

            table.render(option);
            table.render(option2);
            table.render(option3);

        }

        //æ¥è¯¢ä¸è¯è®°å½
        function get_BadRecords(HBarCode) {
            var ajaxLoad = layer.load();
            //è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
            $.ajax({
                url: GetWEBURL() + '/Cj_SingleStation/BadRecordsList',
                type: "GET",
                data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.count == 1) {
                        option2.data = data1.data;
                        table.render(option2);
                        layer.close(ajaxLoad);
                    } else {
                        layer.close(ajaxLoad);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(ajaxLoad);
                    layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                }

            });
        }

        //æ¥è¯¢åæ ¼è®°å½
        function get_HGRecords(HBarCode) {
            var ajaxLoad = layer.load();
            //è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
            $.ajax({
                url: GetWEBURL() + '/Cj_SingleStation/HGRecordsList',
                type: "GET",
                data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.count == 1) {
                        option3.data = data1.data;
                        table.render(option3);
                        layer.close(ajaxLoad);
                    } else {
                        layer.close(ajaxLoad);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(ajaxLoad);
                    layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                }

            });
        }
        
        //æ¡ç åè½¦æ¥è¯¢
        function txtHBarCode_KeyDown(HBarCode) {

            var index = layer.load();
            $.ajax({
                type: "GET",
                url: GetWEBURL() + "/Cj_SingleStation/HBardCodeList",
                async: true,
                url: GetWEBURL() + "/Cj_SingleStation/HBardCodeAccessoryList",
                async: false,
                data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"]},
                dataType: "json",
                success: function (data1) {
                    if (data1.count == 1) {
                        layer.close(index);
                        $("#HICMOBillNo").val(data1.data[0]["çäº§è®¢å"]);
                        $("#HICMOInterID").val(data1.data[0]["HICMOInterID"]);
                        $("#HProcExchBillNo").val(data1.data[0]["å·¥åºæµè½¬å¡"]);
                        $("#HProcExchInterID").val(data1.data[0]["HSourceInterID"]);
                        $("#HMaterNumber").val(data1.data[0]["ç©æç¼ç "]);
                        $("#HMaterID").val(data1.data[0]["HMaterID"]);
                        $("#HMaterName").val(data1.data[0]["ç©æåç§°"]);
                        $("#HModel").val(data1.data[0]["è§æ ¼åå·"]);
                        $("#HBarCode").val(data1.data[0]["æ¡ç "]);
                        var HProcExchBillNo = $("#HProcExchBillNo").val();
                        //if (data1.data[0]["HSourceBillNo"] != HProcExchBillNo) {
                        //    return layer.msg("æ«ç éè¯¯,è¯·éæ°æ«!");
                        //} else {
                        //    $("#HBarCode_P").val(HBarCode);
                        //    layer.msg("æ«ç æå!");
                        //}

                        $("#HBarCode_P").val(HBarCode);
                        //ä¿åæ°æ®
                        set_AddAssemblyBill();
                    }
                    else {
                        layer.close(index);
@@ -487,28 +671,124 @@
            $.ajax({
                type: "GET",
                url: GetWEBURL() + "/Cj_SingleStation/HBardCodeBomList",
                async: true,
                async: false,
                data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
                dataType: "json",
                success: function (data1) {
                    if (data1.count == 1) {
                        layer.close(index);
                        $("#HICMOBillNo").val(data1.data[0]["çäº§è®¢å"]);
                        $("#HICMOInterID").val(data1.data[0]["HICMOInterID"]);
                        $("#HProcExchBillNo").val(data1.data[0]["å·¥åºæµè½¬å¡"]);
                        $("#HProcExchInterID").val(data1.data[0]["HSourceInterID"]);
                        $("#HMaterNumber").val(data1.data[0]["ç©æç¼ç "]);
                        $("#HMaterID").val(data1.data[0]["HMaterID"]);
                        $("#HMaterName").val(data1.data[0]["ç©æåç§°"]);
                        $("#HModel").val(data1.data[0]["è§æ ¼åå·"]);
                        $("#HBarCode").val(data1.data[0]["æ¡ç "]);

                        $("#HBardCodeProcExchBillNo").attr("readonly", "readonly");//æµè½¬å¡åªè¯»
                        $("#HBardCodeProcExchBillNo").css("background-color", "#efefef4d");//æµè½¬å¡ç°è²
                        //åæ è·³è½¬å°éä»¶ææ¬æ¡ä¸
                        $("#HBardCodeMater").focus();

                        $("#HMaterNumber").val(data1.data[0]["HMainMaterNumber"]);
                        $("#HMaterID").val(data1.data[0]["HMainMaterID"]);
                        $("#HMaterName").val(data1.data[0]["HMainMaterName"]);
                        $("#HMaterModel").val(data1.data[0]["HMainModel"]);
                        $("#HProcExchInterID").val(data1.data[0]["HProcExchInterID"]);
                        $("#HProcExchEntryID").val(data1.data[0]["HProcExchEntryID"]);
                        $("#HProcExchBillNo").val(data1.data[0]["HProcExchBillNo"]);
                        $("#HICMOBillNo").val(data1.data[0]["HICMOBillNo"]);
                        $("#HICMOInterID").val(data1.data[0]["HICMOInterID"]);
                        $("#HICMOEntryID").val(data1.data[0]["HICMOEntryID"]);
                        $("#HProcNo").val(data1.data[0]["HProcNo"]);
                        $("#HPieceQty").val(data1.data[0]["HPieceQty"]);
                        $("#HICMOQty").val(data1.data[0]["HICMOQty"]);

                        option.data = data1.data;
                        table.render(option)
                    }
                    else {
                        layer.close(index);
                        layer.msg(data1.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    }
                    $("#HBarCodeSN").val("");
                },
                error: function (err) {
                    layer.close(index);
                    layer.msg("éè¯¯:" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                }
            });
        }

        //éä»¶æ¥è¯¢æ°æ®
        var KNum = 0;
        function get_Accessory(HBarCode) {
            var index = layer.load();
            $.ajax({
                type: "GET",
                url: GetWEBURL() + "/Cj_SingleStation/HBardCodeAccessoryList",
                async: false,
                data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
                dataType: "json",
                success: function (data1) {
                    if (data1.count == 1) {
                        layer.close(index);
                        
                        for (var i = 0; i < option.data.length; i++) {
                            if (data1.data[0]["HMaterNumber"] == option.data[i]["éä»¶ä»£ç "] && option.data[i]["HBatchNo"] == data1.data[0]["HBatchNo"] && option.data[i]["HBatchNo"] != "") {
                                return layer.msg("å½åæ¹æ¬¡å·²æ«å¥,è¯·ä¸è¦éå¤æ«å¥!");
                            }
                            if (data1.data[0]["HMaterNumber"] == option.data[i]["éä»¶ä»£ç "] && option.data[i]["HBatchNo"] != data1.data[0]["HBatchNo"] && option.data[i]["HBatchNo"] != "") {
                                layer.confirm('æ¯å¦è¦æ¿æ¢å½åæ¹æ¬¡', function (index) {
                                    layer.close(index);
                                    option.data[i]["HBatchNo"] = data1.data[0]["HBatchNo"];
                                    option.data[i]["HBarCode"] = HBarCode;
                                    table.render(option);
                                });
                                break;
                            }
                            if (data1.data[0]["HMaterNumber"] == option.data[i]["éä»¶ä»£ç "]) {
                                option.data[i]["HBatchNo"] = data1.data[0]["HBatchNo"];
                                option.data[i]["HBarCode"] = HBarCode;
                                KNum += 1;
                                table.render(option);

                                if (KNum == option.data.length) {
                                    layer.msg("æ¹æ¬¡å·²å¨é¨å¹é!");
                                }
                                break;
                            }
                           
                        }
                        $('#HBardCodeMater').val("");
                    }
                    else {
                        layer.close(index);
                        layer.msg(data1.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    }
                    $("#HBarCodeSN").val("");
                },
                error: function (err) {
                    layer.close(index);
                    layer.msg("éè¯¯:" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                }
            });
        }

        //ä¿åéä»¶å°äº§çº¿ç»è£åä¸´æ¶è¡¨
        function get_AddBomTempList() {
            var HInterID = $("#HInterID").val();
            var HBillNo = $("#HBillNo").val();
            var sSubStr = JSON.stringify(table.cache["mainTable2"]);
            var sMainSub = sSubStr + ';' + HInterID + ';' + HBillNo + ";" + sessionStorage["HUserName"] + ";" + "3791" + ";" + sessionStorage["OrganizationID"];
            var index = layer.load();
            $.ajax({
                type: "POST",
                url: GetWEBURL() + "/Cj_SingleStation/AddBomTempList",
                async: false,
                data: { "sMainSub": sMainSub },
                dataType: "json",
                success: function (data) {
                    if (data.count == 1) {
                        layer.close(index);
                    }
                    else {
                        layer.close(index);
                        layer.msg(data.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    }
                },
                error: function (err) {
                    layer.close(index);
@@ -541,7 +821,6 @@
                }
            })
        }


         //æä½åéæ©é¡µé¢
        function btnHEmp2() {
@@ -672,26 +951,49 @@
            })
        }

        //ä¸è¯æ±æ¥
        function BadReport() {
            var HBarCode_P = $("#HBarCode_P").val();

            if (HBarCode_P != "") {
                layer.open({
                    type: 2//å¼¹çªç±»å
                    , skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
                    , area: ['100%', '100%']//å¤§å°
                    , title: 'å·¥åºä¸è¯æ±æ¥'//æ é¢
                    , shift: 2//å¼¹åºå¨ç»
                    , content: ['../../è½¦é´ç®¡ç/ååè¿ç«/Cj_CollectionOfSingleProductDefects.html?OperationType=1&linterid=' + $("#HInterID").val(), 'yes']
                })
            }
            else {
                layer.msg("è¯·åä¿åä¸æ¬¡åæ ¼æ¡ç !")
            }
        }
    
        //ä¿åHMaker
        function set_AddNew(data, HResult) {
        //ä¿åäº§çº¿ç»è£ä¸»åè¡¨ å·¥åºåºç«åä¸»åè¡¨
        function set_AddAssemblyBill() {
            var data = { "field": { "HInterID": $("#HInterID").val(), "HBillNo": $("#HBillNo").val(), "HProcID": $("#HProcID").val(), "HMaterID": $("#HMaterID").val(), "HGroupID": $("#HGroupID").val(), "HSourceID": $("#HSourceID").val(), "HICMOInterID": $("#HICMOInterID").val(), "HICMOEntryID": $("#HICMOEntryID").val(), "HICMOBillNo": $("#HICMOBillNo").val(), "HBarCode_P": $("#HBarCode_P").val(), "HProdOrgID": sessionStorage["OrganizationID"], "HEmpID2": $("#HEmpID2").val(), "HEmpID": $("#HEmpID").val(), "HProcExchBillNo": $("#HProcExchBillNo").val(), "HProcExchInterID": $("#HProcExchInterID").val(), "HProcExchEntryID": $("#HProcExchEntryID").val(), "HPieceQty": $("#HPieceQty").val(), "HICMOQty": $("#HICMOQty").val(), "HDeptID": $("#HDeptID").val(), "HProcNo": $("#HProcNo").val()} };

            var sMainStr = JSON.stringify(data.field);

            var sMainSub = sMainStr + ';' + HResult + ";" + sessionStorage["HUserName"] ;
            var sSubStr = JSON.stringify(table.cache["mainTable2"]);
            var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"] ;

            var index = layer.load();
            $.ajax({
                type: "POST",
                url: GetWEBURL() + "/Cj_SingleStation/ProcessBLSave",
                url: GetWEBURL() + "/Cj_SingleStation/AddAssemblyBillList",
                async: false,
                data: { "sMainSub": sMainSub },
                dataType: "json",
                success: function (data) {
                    if (data.count == 1) {
                        $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
                        //$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
                        layer.close(index);
                        layer.msg("æäº¤æå");
                        //ä¿åå°ä¸´æ¶è¡¨
                        get_AddBomTempList();
                        get_BomList($("#HBardCodeProcExchBillNo").val());
                        get_BadRecords($("#HBardCodeProcExchBillNo").val());
                    }
                    else {
                        layer.close(index);

			@@ -248,7 +248,7 @@
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">è®¡åå¼å®å·¥æ</label>
			<label class="layui-form-label" style="width: 85px;">è®¡åå®å·¥æ</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="date" class="layui-input" lay-verify="HPlanEndDate" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 80px;">
			</div>

			@@ -31,7 +31,7 @@
			<form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
			<div style="padding: 10px;">
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">ä¿å</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">éåº</button>
			<!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">éåº</button>-->
			</div>
			<div class="layui-tab" lay-filter="tab-POStockInBill">
			<ul class="layui-tab-title" lay-filter="tab-all">

			@@ -138,6 +138,7 @@
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HProcExchBillNo" lay-verify="HProcExchBillNo" id="HProcExchBillNo" value="" style="background-color:#efefef4d;">
			<input type="hidden" class="layui-input" name="HProcExchInterID" lay-verify="HProcExchInterID" id="HProcExchInterID" value="0">
			<input type="hidden" class="layui-input" name="HProcExchEntryID" lay-verify="HProcExchEntryID" id="HProcExchEntryID" value="0">
			</div>
			</div>
			<div class="layui-inline">
			@@ -277,84 +278,10 @@
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label">æ¶é´åä½</label>
			<div class="layui-input-block" style="margin-left: 120px;width: 184px;">
			<select name="HMainTimeUnit" lay-verify="HMainTimeUnit" id="HMainTimeUnit">
			<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" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HMaterTexture" lay-verify="HMaterTexture" id="HMaterTexture" value="" onmouseover="this.title=this.value">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">å¾å·çæ¬</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" lay-verify="HPicNumVer" name="HPicNumVer" id="HPicNumVer">
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">æ»è£å¾å·</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HPicNumAssemble" id="HPicNumAssemble" onmouseover="this.title=this.value">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">å·¥èºè·¯çº¿å¤§ç±»</label>
			<div class="layui-input-block" style="margin-left: 77px;">
			<input type="hidden" class="layui-input" lay-verify="HRoutingGroupID" name="HRoutingGroupID" id="HRoutingGroupID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<input type="text" class="layui-input" lay-verify="HRoutingGroupIDName" name="HRoutingGroupIDName" id="HRoutingGroupIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnRoutingGroup" id="btnRoutingGroup" 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-inline">
			<label class="layui-form-label" style="width: 85px;">æåç¼å·</label>
			<div class="layui-input-block" style="margin-left: 115px;">
			<input type="text" class="layui-input" name="HProductNum" lay-verify="HProductNum" id="HProductNum" value="" onmouseover="this.title=this.value">
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">çæ¬</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HVerNum" lay-verify="HVerNum" id="HVerNum" value="" onmouseover="this.title=this.value">
			</div>
			</div>
			<div class="layui-inline">
			<div class="layui-input-block" style="margin-left: 185px;">
			<input type="checkbox" name="checkboxIsProNo" id="checkboxIsProNo" lay-skin="primary" lay-filter="checkboxIsProNo" title="è½¬å·¥åº">
			<input type="hidden" value="1" name="IsProNo" id="IsProNo" lay-verify="IsProNo">
			</div>
			</div>
			</div>
			</div>
			</div>
			</div>
			</div>

			<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>å¢å ä¸è¡</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>å¤å¶ä¸è¡</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_up"><i class="layui-icon layui-icon-form"></i>ä¸ä¸è¡</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_under"><i class="layui-icon layui-icon-form"></i>ä¸ä¸è¡</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Refresh"><i class="layui-icon layui-icon-form"></i>å·æ°æµæ°´å·</button>
			</div>
			</script>
			</form>
			</div>
			</div>
			@@ -394,9 +321,7 @@
			$("#hmakedate").val(Format(new Date(), "yyyy-MM-dd"));

			//å¤ææ¯å¦æ°å¢
			if (linterid == null \|\| linterid == 0) {
			//$("#HIDDEN").hide();
			OperationType = 1;
			if (OperationType == 1) {

			$.ajax({
			url: GetWEBURL() + "/Web/GetMAXNum",
			@@ -411,21 +336,6 @@
			});
			//åå§åçé¢
			set_ClearBill();
			} else if (OperationType == 2) {
			//ç¦ç¨ç»ç»éé¡¹
			//$("#HOrgID").attr("disabled", true);
			RoadBillMain(linterid);
			$.ajax({
			url: GetWEBURL() + "/Web/GetMAXNum",
			type: "GET",
			async: false,
			data: { "HBillType": '3717' },
			success: function (d) {
			$("#HInterID").val(d.data[0].HInterID);
			$("#HBillNo").val(d.data[0].HBillNo);
			$("#HBillNo_bak").val(d.data[0].HBillNo);
			}
			});
			}


			@@ -469,7 +379,7 @@
			//æ°å¢
			form.on('submit(set_AddNew)', function () {
			layer.confirm('æ°å¢åé¡µé¢æ°æ®å°æ¶å¤±ï¼', { icon: 3, title: 'æç¤º' }, function (index) {
			location.replace('Cj_CollectionOfSingleProductDefects.html?OperationType=1&linterid=0');
			location.replace('Cj_CollectionOfSingleProductDefects.html?OperationType=1&linterid=' + linterid);
			});
			});

			@@ -560,6 +470,7 @@
			$("#HICMOEntryID").val(data1.data[0]["HICMOEntryID"]);
			$("#HProcExchBillNo").val(data1.data[0]["å·¥åºæµè½¬å¡"]);
			$("#HProcExchInterID").val(data1.data[0]["HSourceInterID"]);
			$("#HProcExchEntryID").val(data1.data[0]["HProcExchEntryID"]);
			$("#HMaterNumber").val(data1.data[0]["ç©æç¼ç "]);
			$("#HMaterID").val(data1.data[0]["HMaterID"]);
			$("#HMaterName").val(data1.data[0]["ç©æåç§°"]);
			@@ -699,7 +610,7 @@

			var sMainStr = JSON.stringify(data.field);

			var sMainSub = sMainStr + ';' + HResult + ";" + sessionStorage["HUserName"] ;
			var sMainSub = sMainStr + ';' + HResult + ";" + sessionStorage["HUserName"] +";"+ linterid ;

			var index = layer.load();
			$.ajax({

			@@ -29,9 +29,9 @@
			<div class="layui-card-body" style="padding: 1px;">
			<form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
			<div style="padding: 2px; ">
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnAdd" id="btnSave">æå°</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnAdd" id="btnSave">æ°å¢</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnCancel" id="btnEdit">éåº</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnPrint" id="btnPrint">æå°</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnAdd" id="btnAdd">æ°å¢</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnCancel" id="btnCancel">éåº</button>
			</div>
			<div class="layui-tab" lay-filter="tab-POStockInBill" style="width: 49.5%; float: left; background-color: white;height:430px;">
			<ul class="layui-tab-title" lay-filter="tab-all">
			@@ -165,7 +165,7 @@
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">æ¡å½¢ç </label>
			<div class="layui-input-block" style="margin-left: 120px; width: 501px;">
			<input type="text" class="layui-input" lay-verify="HBarCode" name="HBarCode" id="HBarCode">
			<input type="text" class="layui-input" lay-verify="HBarCodeSN" name="HBarCodeSN" id="HBarCodeSN">
			</div>
			</div>
			</div>
			@@ -239,7 +239,7 @@
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">äº§åSN</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" lay-verify="HMaterSN" name="HMaterSN" id="HMaterSN" style="background-color:#efefef4d;" readonly>
			<input type="text" class="layui-input" lay-verify="HBarCode" name="HBarCode" id="HBarCode" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			</div>
			@@ -255,6 +255,8 @@
			<input type="hidden" name="HCreator" id="HCreator" lay-verify="HCreator">
			<input type="hidden" name="HCreateDate" id="HCreateDate" lay-verify="HCreateDate">

			<input type="hidden" name="HProcExchInterID" id="HProcExchInterID" lay-verify="HProcExchInterID" value="0">
			<input type="hidden" name="HProcExchEntryID" id="HProcExchEntryID" lay-verify="HProcExchEntryID" value="0">
			<input type="hidden" name="HSourceInterID" id="HSourceInterID" lay-verify="HSourceInterID" value="0">
			<input type="hidden" name="HSourceEntryID" id="HSourceEntryID" lay-verify="HSourceEntryID" value="0">
			<input type="hidden" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" value="">
			@@ -329,7 +331,7 @@
			, laydate = layui.laydate
			, tree = layui.tree
			var titleData = ["HInterID", "HEntryID", "HBadReasonID", "HSourceInterID","HSourceEntryID"];//åè¡¨ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

			var hpj =0;
			//#endregion

			//#region è¿å¥é¡µé¢å³å è½½
			@@ -340,8 +342,8 @@
			//#region è§¦åäºä»¶ï¼åæ¬form.on(){}æ ¼å¼çææç¹å»äºä»¶ãéæ©äºä»¶ç

			//æ¡å½¢ç åè½¦æ¹æ³
			$('#HBarCode').on('keydown', function (event) {
			var HBarCode = $('#HBarCode').val();
			$('#HBarCodeSN').on('keydown', function (event) {
			var HBarCode = $('#HBarCodeSN').val();
			if (event.keyCode == 13) {
			if (!HBarCode) {
			layer.msg("æ¡å½¢ç ä¸è½ä¸ºç©ºï¼")
			@@ -362,18 +364,33 @@
			get_checkSearchChangeMater();
			});

			//åè¡¨è¡åäºä»¶
			table.on('tool(mainTable)', function (obj) {
			set_GridDelete(obj); //è¡åå é¤
			});

			// NGä¿å
			form.on('submit(NGSave)', function (data) {
			get_Save(data,"NG");
			});

			// OKä¿å
			form.on('submit(OKSave)', function (data) {
			get_Save(data,"OK");
			});

			//#endregion

			//#region æ¤é¡µé¢ææçæ¹æ³
			//åå§åçé¢
			function set_ClearBill() {
			$('#btnAdd').addClass("layui-btn-disabled").attr("disabled", true);
			//åå§ååæ®
			createBillNo();
			var mychart1 = echarts.init(document.getElementById('mychart1'));

			get_Display();
			get_Histogram1(mychart1);//æ±ç¶å¾1
			get_UsreList();
			get_Display();
			}

			// çæåæ®å·
			@@ -505,14 +522,9 @@

			//æ¥è¯¢åè¡¨æ°æ®
			function get_Display() {
			var HSourceInterID = $("#HSourceInterID").val();
			var HSourceEntryID = $("#HSourceEntryID").val();
			var HBarCode = $("#HBarCode").val();
			var sWhere = "";
			if (HSourceInterID != 0 && HSourceEntryID != 0) {
			sWhere = " and HSourceInterID=" + HSourceInterID + " and HSourceEntryID=" + HSourceEntryID;
			} else {
			sWhere = " and HSourceInterID=0 and HSourceEntryID=0 ";
			}
			sWhere = " and SNç ='" + HBarCode + "'";
			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + "/Cj_SingleStation/ProcessItemRepair",
			@@ -548,15 +560,6 @@
			}
			col.push({ fixed: 'right', title: 'æä½', toolbar: '#barDemo' });

			if (data1.data.length != 0) {
			$("#HBadReasonID").val(data1.data[0]["HBadReasonID"]);
			$("#HBadReasonName").val(data1.data[0]["ä¸è¯åå "]);
			//$("#HBadTypeID").val();
			//$("#HBadTypeName").val();
			//$("#HBadResultID").val();
			//$("#HBadResultName").val();
			}

			var option = {
			elem: '#mainTable'
			//, toolbar: '#toolbarDemo'
			@@ -599,10 +602,12 @@
			$("#HDeptID").val(data1.data[0]["HDeptID"]);
			$("#HDeptName").val(data1.data[0]["è½¦é´"]);
			$("#HProName").val(data1.data[0]["å·¥åº"]);
			$("#HProcess").val(data1.data[0]["HProcID"]);
			$("#HSourceID").val(data1.data[0]["HSourceID"]);
			$("#HSourceName").val(data1.data[0]["çäº§èµæº"]);
			$("#HEmpID").val(data1.data[0]["HEmpID"]);
			$("#HEmpName").val(data1.data[0]["è´¨æ£å"]);
			$("#HCreator").val(data1.data[0]["è´¨æ£å"]);
			//$("#HGroupID").val(data1.data[0]["HGroupID"]);
			//$("#HGroupName").val(data1.data[0]["çäº§çç»"]);
			layer.close(ajaxLoad);
			@@ -626,7 +631,7 @@
			var index = layer.load();
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Cj_SingleStation/HBardCodeList",
			url: GetWEBURL() + "/Cj_SingleStation/HFBardCodeList",
			async: false,
			data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
			dataType: "json",
			@@ -638,6 +643,7 @@
			$("#HICMOEntryID").val(data1.data[0]["HICMOEntryID"]);
			$("#HProcExchBillNo").val(data1.data[0]["å·¥åºæµè½¬å¡"]);
			$("#HProcExchInterID").val(data1.data[0]["HSourceInterID"]);
			$("#HProcExchEntryID").val(data1.data[0]["HProcExchEntryID"]);
			$("#HUnitID").val(data1.data[0]["HUnitID"]);
			$("#HUnitName").val(data1.data[0]["åä½"]);
			$("#HOrgName").val(data1.data[0]["ç»ç»"]);
			@@ -646,21 +652,63 @@
			$("#HMaterID").val(data1.data[0]["HMaterID"]);
			$("#HMaterName").val(data1.data[0]["ç©æåç§°"]);
			$("#HMaterModel").val(data1.data[0]["è§æ ¼åå·"]);
			$("#HMaterSN").val(data1.data[0]["æ¡ç "]);
			$("#HBarCode").val(data1.data[0]["æ¡ç "]);
			$("#HBadReasonID").val(data1.data[0]["HBadReasonID"]);
			$("#HBadReasonName").val(data1.data[0]["ä¸è¯åå "]);
			if (data1.data.length != 0) {

			//$("#HBadTypeID").val();
			//$("#HBadTypeName").val();
			//$("#HBadResultID").val();
			//$("#HBadResultName").val();
			}

			//æ¥è¯¢è¿ä¿®è®°å½
			get_Display();
			}
			else {
			layer.close(index);
			layer.msg(data1.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			$("#HBarCode").val("");
			$("#HBarCodeSN").val("");
			},
			error: function (err) {
			layer.close(index);
			layer.msg("éè¯¯:" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			});
			}

			//å é¤æ¹æ³
			function set_GridDelete(obj) {
			if (obj.event === 'del') {
			layer.confirm('ççå é¤è¡åï¼', function (index) {
			var HInterID = obj.data.HInterID;
			var HEntryID = obj.data.HEntryID;

			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + "/Cj_SingleStation/ProcessItemRepairDel",
			type: "GET",
			async: false,
			data: { "HInterID": HInterID, "HEntryID": HEntryID, "user": sessionStorage["HUserName"],"HBill":"ZB" },
			success: function (result) {
			if (result.count == 1) {
			layer.msg("å é¤æåï¼");
			layer.close(ajaxLoad);
			//æ¥è¯¢è¿ä¿®è®°å½
			get_Display();
			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			layer.close(ajaxLoad);
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			layer.close(ajaxLoad);
			}
			})
			});
			}
			}

			//ä¸è¯åå éæ©é¡µé¢
			@@ -692,36 +740,43 @@
			})
			}


			//æ¢éä»¶é¡µé¢
			function get_checkSearchChangeMater() {
			var HMaterSN = $("#HMaterSN").val();
			if (HMaterSN == "") {
			var HBarCode = $("#HBarCode").val();
			if (HBarCode == "") {
			return layer.msg("è¯·åæ«æ¡ç !");
			}

			if (hpj == 0) {
			return layer.msg("è¯·åä¿åè¿ä¿®è®°å½!");
			}

			var HInterID = $("#HInterID").val();
			var HBillNo = $("#HBillNo").val();
			//var HEmpName = $("#HEmpName").val();
			//var HProdMac = $("#HProdMac").val();
			//var HSourceInterID = $("#HSourceInterID").val();
			//var HSourceEntryID = $("#HSourceEntryID").val();
			//var HSourceBillNo = $("#HSourceBillNo").val();
			//var HSourceBillType = $("#HSourceBillType").val();
			//var HBarCode = $("#HBarCode").val();
			var HEmpName = $("#HEmpName").val();
			var HProdMac = $("#HProdMac").val();
			var HSourceInterID = $("#HSourceInterID").val();
			var HSourceEntryID = $("#HSourceEntryID").val();
			var HSourceBillNo = $("#HSourceBillNo").val();
			var HSourceBillType = $("#HSourceBillType").val();
			var HProcExchBillNo = $("#HProcExchBillNo").val();
			var HProcess = $("#HProcess").val();

			var dataParams = {
			'OperationType': 1
			, 'HMaterSN': HMaterSN
			, 'HInterID': HInterID
			, 'HBillNo': HBillNo
			//, 'HEmpName': HEmpName
			//, 'HProdMac': HProdMac
			//, 'HSourceInterID': HSourceInterID
			//, 'HSourceEntryID': HSourceEntryID
			//, 'HSourceBillNo': HSourceBillNo
			//, 'HSourceBillType': HSourceBillType
			//, 'HBarCode': HBarCode
			//, 'subMaterList_Temp': $("#subMaterList_Temp").val()
			, 'HMaterSN': HBarCode
			, 'HEmpName': HEmpName
			, 'HProdMac': HProdMac
			, 'HSourceInterID': HSourceInterID
			, 'HSourceEntryID': HSourceEntryID
			, 'HSourceBillNo': HSourceBillNo
			, 'HSourceBillType': HSourceBillType
			, 'HBarCode': HBarCode
			, 'HProcExchBillNo': HProcExchBillNo
			, 'HProcess': HProcess
			, 'subMaterList_Temp': $("#subMaterList_Temp").val()
			}
			var datajson = JSON.stringify(dataParams);
			url = encodeURI('../../è½¦é´ç®¡ç/ååè¿ç«/Cj_ProcessItemBGA_PJGH.html?OperationType=1&datajson=' + datajson);
			@@ -743,6 +798,43 @@
			})
			}

			//ä¿å
			function get_Save(data, HResult) {
			var sMainStr = JSON.stringify(data.field);
			var sSubStr = JSON.stringify(table.cache["mainTable"]);
			var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"] + ";" + HResult;

			var index = layer.load();
			$.ajax({
			type: "POST",
			url: GetWEBURL() + "/Cj_SingleStation/HFXAddRepairBill",
			async: false,
			data: { "sMainSub": sMainSub },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) {
			$('#NGSave').addClass("layui-btn-disabled").attr("disabled", true);
			$('#OKSave').addClass("layui-btn-disabled").attr("disabled", true);
			$('#btnAdd').removeClass("layui-btn-disabled").attr("disabled", false);
			layer.close(index);
			layer.msg("æäº¤æå");
			hpj = 1;
			get_Display();
			var mychart1 = echarts.init(document.getElementById('mychart1'));
			get_Histogram1(mychart1);//æ±ç¶å¾1
			}
			else {
			layer.close(index);
			layer.msg(data.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			},
			error: function (err) {
			layer.close(index);
			layer.msg("éè¯¯:" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			});
			}

			//#endregion

			});

			@@ -85,6 +85,26 @@
			<input type="text" class="layui-input" name="HRemark" id="HRemark" lay-verify="HRemark" placeholder="è¯·è¾å¥åå®¹" onmouseover="this.title=this.value" style=" width: 500px;">
			</div>
			</div>
			<div class="layui-inline">
			<div class="layui-input-block" style="margin-left: 120px; width: 501px;">
			<input type="hidden" name="HSourceInterID" id="HSourceInterID" lay-verify="HSourceInterID" value="0">
			<input type="hidden" name="HSourceEntryID" id="HSourceEntryID" lay-verify="HSourceEntryID" value="0">
			<input type="hidden" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" value="">
			<input type="hidden" name="HSourceBillType" id="HSourceBillType" lay-verify="HSourceBillType" value="">
			<input type="hidden" name="HRelationQty" id="HRelationQty" lay-verify="HRelationQty" value="0">
			<input type="hidden" name="HRelationMoney" id="HRelationMoney" lay-verify="HRelationMoney" value="0">

			<input type="hidden" name="HMaterID" id="HMaterID" lay-verify="HMaterID" value="0">
			<input type="hidden" name="HMaterNumber" id="HMaterNumber" lay-verify="HMaterNumber" value="">
			<input type="hidden" name="HMaterName" id="HMaterName" lay-verify="HMaterName" value="">
			<input type="hidden" name="HUnitID" id="HUnitID" lay-verify="HUnitID" value="0">
			<input type="hidden" name="HQty" id="HQty" lay-verify="HQty" value="0">
			<input type="hidden" name="HSupID" id="HSupID" lay-verify="HSupID" value="0">
			<input type="hidden" name="HBatchNo" id="HBatchNo" lay-verify="HBatchNo">
			<input type="hidden" name="HProcExchBillNo" id="HProcExchBillNo" lay-verify="HProcExchBillNo">
			<input type="hidden" name="HProcess" id="HProcess" lay-verify="HProcess">
			</div>
			</div>
			</div>
			</div>
			</div>
			@@ -152,6 +172,7 @@
			//å®ä¹å¨å±åé

			var HModName = "Cj_CollectionOfSingleProductDefects";
			var option2 = [];
			//#endregion

			//#region è¿å¥é¡µé¢å³å è½½
			@@ -173,6 +194,8 @@
			$("#HInterID").val(datajson.HInterID);
			$("#HBillNo").val(datajson.HBillNo);
			$("#HBillNo_bak").val(datajson.HBillNo);
			$("#HProcExchBillNo").val(datajson.HProcExchBillNo);
			$("#HProcess").val(datajson.HProcess);
			//åå§åçé¢
			set_ClearBill();
			}
			@@ -184,20 +207,25 @@
			//#region è§¦åäºä»¶ï¼åæ¬form.on(){}æ ¼å¼çææç¹å»äºä»¶ãéæ©äºä»¶ç

			//æ¡å½¢ç åè½¦æ¹æ³
			$('#HBarCodeSN').on('keydown', function (event) {
			var HBarCode = $('#HBarCodeSN').val();
			$('#HBarCode').on('keydown', function (event) {
			var HBarCode = $('#HBarCode').val();
			if (event.keyCode == 13) {
			if (!HBarCode) {
			layer.msg("æ¡å½¢ç ä¸è½ä¸ºç©ºï¼")
			return;
			}
			txtHBarCode_KeyDown(HBarCode);
			get_Accessory(HBarCode);
			}
			});

			//éæ©ä¸è¯åå
			form.on('submit(btnHBadReason)', function () {
			btnHBadReason();
			//éä»¶æ´æ¢è®°å½åè¡¨è¡åäºä»¶
			table.on('tool(mainTable1)', function (obj) {
			set_GridDelete1(obj); //è¡åå é¤
			});

			//ç©ææ¸ååè¡¨è¡åäºä»¶
			table.on('tool(mainTable2)', function (obj) {
			set_GridDelete2(obj); //è¡åå é¤
			});

			//éæ©è´¨æ£å
			@@ -212,18 +240,6 @@
			});
			});

			//ä¿åæäº¤
			form.on('submit(btnSave_BL)', function (data) {//æäº¤
			if (AllowLoadData(data)) {
			set_AddNew(data, "ä¸è¯");
			}
			});

			form.on('submit(btnSave_BF)', function (data) {//æäº¤
			if (AllowLoadData(data)) {
			set_AddNew(data, "æ¥åº");
			}
			});

			//éåº
			form.on('submit(btnEdit)', function (data) {
			@@ -241,10 +257,14 @@

			//åå§åçé¢
			function set_ClearBill() {
			//åæ è·³è½¬å°éä»¶ææ¬æ¡ä¸
			$("#HBarCode").focus();
			//æ¥è¯¢ç»å®ç¨æ·
			get_Display();
			//æ¥è¯¢æ¡ç ç»å®çè¿ä¿®è®°å½
			get_RepairRecord();
			//æ¥è¯¢ç©ææ¸åæ°æ®
			get_BomList($("#HProcExchBillNo").val());
			}

			//æ¥è¯¢
			@@ -277,66 +297,53 @@
			});
			}

			//æ¡ç åè½¦æ¥è¯¢
			function txtHBarCode_KeyDown(HBarCode) {

			//æ¡ç åè½¦æ¥è¯¢æ´æ¢éä»¶
			var KNum = 0;
			function get_Accessory(HBarCode) {
			var index = layer.load();
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Cj_SingleStation/HBardCodeList",
			async: true,
			url: GetWEBURL() + "/Cj_SingleStation/HBardCodeAccessoryList",
			async: false,
			data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
			dataType: "json",
			success: function (data1) {
			if (data1.count == 1) {
			layer.close(index);
			$("#HICMOBillNo").val(data1.data[0]["çäº§è®¢å"]);
			$("#HICMOInterID").val(data1.data[0]["HICMOInterID"]);
			$("#HProcExchBillNo").val(data1.data[0]["å·¥åºæµè½¬å¡"]);
			$("#HProcExchInterID").val(data1.data[0]["HSourceInterID"]);
			$("#HMaterNumber").val(data1.data[0]["ç©æç¼ç "]);
			$("#HMaterID").val(data1.data[0]["HMaterID"]);
			$("#HMaterName").val(data1.data[0]["ç©æåç§°"]);
			$("#HModel").val(data1.data[0]["è§æ ¼åå·"]);
			$("#HBarCode").val(data1.data[0]["æ¡ç "]);

			for (var i = 0; i < option2.data.length; i++) {
			if (data1.data[0]["HMaterNumber"] == option2.data[i]["éä»¶ä»£ç "] && option2.data[i]["HBatchNo"] == data1.data[0]["HBatchNo"] && option2.data[i]["HBatchNo"] != "") {
			return layer.msg("å½åæ¹æ¬¡å·²æ«å¥,è¯·ä¸è¦éå¤æ«å¥!");
			}
			if (data1.data[0]["HMaterNumber"] == option2.data[i]["éä»¶ä»£ç "] && option2.data[i]["HBatchNo"] != data1.data[0]["HBatchNo"] && option2.data[i]["HBatchNo"] != "") {
			layer.confirm('æ¯å¦è¦æ¿æ¢å½åæ¹æ¬¡', function (index) {
			layer.close(index);
			$('#HProcName').val(HBarCode);
			option2.data[i]["HBatchNo"] = data1.data[0]["HBatchNo"];
			option2.data[i]["HBarCode"] = HBarCode;
			table.render(option2);
			//ä¿åéä»¶æ´æ¹è®°å½
			set_AddNew();
			});
			break;
			}
			KNum += 1;
			}

			$('#HBarCode').val("");


			}
			else {
			layer.close(index);
			layer.msg(data1.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			$("#HBarCodeSN").val("");
			},
			error: function (err) {
			layer.close(index);
			layer.msg("éè¯¯:" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			});
			}

			//ä¸è¯åå éæ©é¡µé¢
			function btnHBadReason() {
			layer.open({
			type: 2//å¼¹çªç±»å
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['90%', '90%']//å¤§å°
			, title: 'ä¸è¯åå åè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_BadReason.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('è¯·éæ©æ°æ®');
			}
			//è·åæ°æ®
			$("#HBadReasonID").val(checkStatus.data[0].HItemID);
			$("#HBadReasonName").val(checkStatus.data[0].ä¸è¯åå åç§°);

			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			})
			}

			//è´¨æ£åéæ©é¡µé¢
			@@ -366,20 +373,21 @@

			//æ¥è¯¢æ¡ç ç»å®çè¿ä¿®è®°å½
			function get_RepairRecord() {
			var sWhere = " and HBarCodeSN='" + $("#HMaterSN").val() + "' and HBarCode is not null";
			var index = layer.load();
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Cj_SingleStation/Sc_SourceLineRepairBillSub_MaterList",
			async: false,
			data: { "sWhere": " and HSourceBillNo='" + $("#HMaterSN").val() + "'", "user": sessionStorage["HUserName"] },
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			dataType: "json",
			success: function (data1) {
			if (data1.count == 1) {
			layer.close(index);

			var option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			elem: '#mainTable1'
			//, toolbar: '#toolbarDemo'
			, page: false
			, totalRow: true
			, data: data1.data
			@@ -429,7 +437,140 @@
			});
			}

			//éä»¶è®°å½å é¤æ¹æ³
			function set_GridDelete1(obj) {
			if (obj.event === 'del') {
			layer.confirm('ççå é¤è¡åï¼', function (index) {
			var HInterID = obj.data.HInterID;
			var HEntryID = obj.data.HEntryID;

			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + "/Cj_SingleStation/ProcessItemRepairDel",
			type: "GET",
			async: false,
			data: { "HInterID": HInterID, "HEntryID": HEntryID, "user": sessionStorage["HUserName"], "HBill": "PJ"},
			success: function (result) {
			if (result.count == 1) {
			layer.msg("å é¤æåï¼");
			layer.close(ajaxLoad);
			//æ¥è¯¢æ¡ç ç»å®çè¿ä¿®è®°å½
			get_RepairRecord();
			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			layer.close(ajaxLoad);
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			layer.close(ajaxLoad);
			}
			})
			});
			}
			}

			//ç©ææ¸åå é¤æ¹æ³
			function set_GridDelete2(obj) {
			if (obj.event === 'del2') {
			layer.confirm('ççå é¤è¡åï¼', function (index) {
			var HInterID = obj.data.BomHInterID;
			var HEntryID = obj.data.BomHEntryID;

			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + "/Cj_SingleStation/DelBomTempList",
			type: "GET",
			async: false,
			data: { "HInterID": HInterID, "HEntryID": HEntryID, "user": sessionStorage["HUserName"]},
			success: function (result) {
			if (result.count == 1) {
			layer.msg("å é¤æåï¼");
			layer.close(ajaxLoad);
			//æ¥è¯¢æ¸å
			get_BomList($("#HProcExchBillNo").val());
			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			layer.close(ajaxLoad);
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			layer.close(ajaxLoad);
			}
			})
			});
			}
			}

			//æµè½¬å¡æ¥è¯¢å³é®ä»¶æ¸å
			function get_BomList(HBarCode) {
			var index = layer.load();
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Cj_SingleStation/HBardCodeBomList",
			async: false,
			data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
			dataType: "json",
			success: function (data1) {
			if (data1.count == 1) {
			layer.close(index);

			$("#HMaterNumber").val(data1.data[0]["HMainMaterNumber"]);
			$("#HMaterID").val(data1.data[0]["HMainMaterID"]);
			$("#HMaterName").val(data1.data[0]["HMainMaterName"]);
			//$("#HProcExchInterID").val(data1.data[0]["HProcExchInterID"]);
			//$("#HProcExchEntryID").val(data1.data[0]["HProcExchEntryID"]);
			//$("#HProcExchBillNo").val(data1.data[0]["HProcExchBillNo"]);
			//$("#HICMOBillNo").val(data1.data[0]["HICMOBillNo"]);
			//$("#HICMOInterID").val(data1.data[0]["HICMOInterID"]);
			//$("#HICMOEntryID").val(data1.data[0]["HICMOEntryID"]);
			//$("#HProcNo").val(data1.data[0]["HProcNo"]);
			//$("#HPieceQty").val(data1.data[0]["HPieceQty"]);
			//$("#HICMOQty").val(data1.data[0]["HICMOQty"]);

			option2 = {
			elem: '#mainTable2'
			//, toolbar: '#toolbarDemo'
			, async: true
			, page: false
			//, totalRow: true
			, cellMinWidth: 120
			, data: data1.data
			, height: 185
			, cols: [[
			{ type: 'numbers', title: 'åºå·' }
			, { field: 'æ¥æ', title: 'æ¥æ' }
			, { field: 'éä»¶ä»£ç ', title: 'éä»¶ä»£ç ' }
			, { field: 'éä»¶åç§°', title: 'éä»¶åç§°' }
			, { field: 'éä»¶è§æ ¼', title: 'éä»¶è§æ ¼' }
			, { field: 'éä»¶æ°é', title: 'éä»¶æ°é' }
			, { field: 'HBatchNo', title: 'å½åæ¹æ¬¡' }
			, { field: 'BomHInterID', title: 'BomHInterID', hide: true }
			, { field: 'BomHEntryID', title: 'BomHEntryID', hide: true }
			, { field: 'HICMOInterID', title: 'HICMOInterID', hide: true }
			, { field: 'HICMOEntryID', title: 'HICMOEntryID', hide: true }
			, { field: 'HICMOBillNo', title: 'HICMOBillNo', hide: true }
			, { field: 'HProcExchInterID', title: 'HProcExchInterID', hide: true }
			, { field: 'HProcExchEntryID', title: 'HProcExchEntryID', hide: true }
			, { field: 'HProcExchBillNo', title: 'HProcExchBillNo', hide: true }
			, { field: 'HMaterID', title: 'HMaterID', hide: true }
			, { field: 'HBarCode', title: 'HBarCode', hide: true }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo2' }
			]]
			}
			table.render(option2)
			}
			else {
			layer.close(index);
			layer.msg(data1.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			$("#HBarCodeSN").val("");
			},
			error: function (err) {
			layer.close(index);
			layer.msg("éè¯¯:" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			});
			}

			//è·ååæ°
			function getUrlVars() {
			@@ -444,24 +585,28 @@
			}

			//ä¿åHMaker
			function set_AddNew(data, HResult) {
			function set_AddNew() {
			var data1 = { "field": { "HInterID": $("#HInterID").val(), "HBillNo": $("#HBillNo").val(), "HProcExchBillNo": $("#HProcExchBillNo").val(), "HProcExchInterID": $("#HProcExchInterID").val(), "HProcExchEntryID": $("#HProcExchEntryID").val(), "HProcess": $("#HProcess").val() } };

			var sMainStr = JSON.stringify(data.field);

			var sMainSub = sMainStr + ';' + HResult + ";" + sessionStorage["HUserName"];
			var HResult = "éä»¶";
			var sMainStr = JSON.stringify(data1.field);
			var sSubStr = JSON.stringify(table.cache["mainTable2"][KNum]);
			var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"] + ";" + HResult;

			var index = layer.load();
			$.ajax({
			type: "POST",
			url: GetWEBURL() + "/Cj_SingleStation/ProcessBLSave",
			url: GetWEBURL() + "/Cj_SingleStation/HFXAddRepairBill",
			async: false,
			data: { "sMainSub": sMainSub },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) {
			$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
			//$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
			layer.close(index);
			layer.msg("æäº¤æå");
			//æ¥è¯¢æ´æ¢è®°å½
			get_RepairRecord();
			}
			else {
			layer.close(index);

			@@ -30,7 +30,7 @@
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">æ¡å½¢ç :</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HBarCode" lay-verify="HBarCode" placeholder="è¯·é®å¥ååè½¦" id="HBarCode" style="width: 500px;">
			<input type="text" class="layui-input" name="HBarCodeSN" lay-verify="HBarCodeSN" placeholder="è¯·é®å¥ååè½¦" id="HBarCodeSN" style="width: 500px;">
			</div>
			</div>
			</div>
			@@ -57,6 +57,7 @@
			<label class="layui-form-label" style="width: 85px;">äº§åç¼ç </label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;" readonly>
			<input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID">
			</div>
			</div>
			<div class="layui-inline">
			@@ -112,6 +113,7 @@
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HProcExchBillNo" lay-verify="HProcExchBillNo" id="HProcExchBillNo" value="" style="background-color:#efefef4d;">
			<input type="hidden" class="layui-input" name="HProcExchInterID" lay-verify="HProcExchInterID" id="HProcExchInterID" value="0">
			<input type="hidden" class="layui-input" name="HProcExchEntryID" lay-verify="HProcExchEntryID" id="HProcExchEntryID" value="0">
			</div>
			</div>
			<div class="layui-inline">
			@@ -119,6 +121,7 @@
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HICMOBillNo" lay-verify="HICMOBillNo" id="HICMOBillNo" value="" style="background-color:#efefef4d;">
			<input type="hidden" class="layui-input" name="HICMOInterID" lay-verify="HICMOInterID" id="HICMOInterID" value="0">
			<input type="hidden" class="layui-input" name="HICMOEntryID" lay-verify="HICMOEntryID" id="HICMOEntryID" value="0">
			</div>
			</div>
			</div>
			@@ -133,7 +136,7 @@
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">äº§åSN</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HBarCode" lay-verify="HBarCode" id="HBarCode" value="" style="background-color:#efefef4d;display: inline-block;" readonly>
			<input type="text" class="layui-input" name="HBarCode_P" lay-verify="HBarCode_P" id="HBarCode_P" value="" style="background-color:#efefef4d;display: inline-block;" readonly>
			</div>
			</div>
			</div>
			@@ -228,10 +231,15 @@
			<ul class="layui-tab-title">
			<li class="layui-this">ä¸è¯è®°å½</li>
			</ul>
			<div class="layui-tab-content">
			<div class="layui-tab-content" style="background-color: white;">
			<div class="layui-row" style="margin-bottom: 5px;">
			<div class="layui-inline">
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="BadReport" id="BadReport">ä¸è¯æ±æ¥</button>
			</div>
			</div>
			<div class="layui-tab-item layui-show">
			<!--ä¸è¯è®°å½-->
			<table class="layui-hide" id="mainTable2" lay-filter="mainTable2"></table>
			<table class="layui-hide" id="mainTable3" lay-filter="mainTable3"></table>
			</div>
			</div>
			</div>
			@@ -239,7 +247,7 @@
			<ul class="layui-tab-title">
			<li class="layui-this">åæ ¼è®°å½</li>
			</ul>
			<div class="layui-tab-content">
			<div class="layui-tab-content" style="background-color: white;">
			<div class="layui-tab-item layui-show">
			<!--åæ ¼è®°å½-->
			<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
			@@ -259,12 +267,20 @@
			</div>
			</script>
			<input type="hidden" id="HProdOrgID" name="HProdOrgID" value="0" />
			<input type="hidden" name="HPieceQty" id="HPieceQty" value="0">
			<input type="hidden" name="HICMOQty" id="HICMOQty" value="0">
			</form>
			</div>
			</div>
			</div>
			</body>
			</html>
			<script type="text/html" id="barDemo2">
			<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del2">å é¤</a>
			</script>
			<script type="text/html" id="barDem03">
			<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del3">å é¤</a>
			</script>
			<script>

			layui.config({
			@@ -284,7 +300,10 @@

			//å®ä¹å¨å±åé

			var HModName = "Cj_CollectionOfSingleProductDefects";
			var HModName = "Cj_ProcessItemStationPlatform";
			var option = [];
			var option2 = [];
			var option3 = [];
			//#endregion

			//#region è¿å¥é¡µé¢å³å è½½
			@@ -304,10 +323,16 @@
			//æ¡å½¢ç åè½¦æ¹æ³
			$('#HBarCodeSN').on('keydown', function (event) {
			var HBarCode = $('#HBarCodeSN').val();
			var HBardCodeProcExchBillNo = $('#HBardCodeProcExchBillNo').val();
			if (event.keyCode == 13) {
			if (!HBarCode) {
			layer.msg("æ¡å½¢ç ä¸è½ä¸ºç©ºï¼")
			if (!HBardCodeProcExchBillNo) {
			layer.msg("è¯·åæ«æµè½¬å¡ï¼")
			return;
			} else {
			if (!HBarCode) {
			layer.msg("æ¡å½¢ç ä¸è½ä¸ºç©ºï¼")
			return;
			}
			}
			txtHBarCode_KeyDown(HBarCode);
			}
			@@ -322,9 +347,39 @@
			return;
			}
			get_BomList(HBarCode);
			if (option.data != 0) {
			//ä¿åå°ä¸´æ¶è¡¨
			get_AddBomTempList();
			}
			//æ¥è¯¢ä¸è¯è®°å½
			get_BadRecords(HBarCode);
			//æ¥è¯¢åæ ¼è®°å½
			get_HGRecords(HBarCode);
			}
			});

			//éä»¶åè½¦æ¹æ³
			$('#HBardCodeMater').on('keydown', function (event) {
			var HBarCode = $('#HBardCodeMater').val();
			var HBardCodeProcExchBillNo = $('#HBardCodeProcExchBillNo').val();
			if (event.keyCode == 13) {
			if (!HBardCodeProcExchBillNo) {
			layer.msg("è¯·åæ«æµè½¬å¡ï¼")
			return;
			} else {
			if (!HBarCode) {
			layer.msg("éä»¶ä¸è½ä¸ºç©ºï¼")
			return;
			}
			}
			get_Accessory(HBarCode);
			}
			});

			//ä¸è¯æ±æ¥
			form.on('submit(BadReport)', function () {
			BadReport();
			});

			//éæ©è´¨æ£å
			form.on('submit(btnHEmp)', function () {
			@@ -374,8 +429,26 @@

			//åå§åçé¢
			function set_ClearBill() {
			//è¿å¥é¡µé¢é»è®¤åæ å¨æµè½¬å¡ä¸
			$("#HBardCodeProcExchBillNo").focus();
			createBillNo();
			get_Display();
			get_CriticalPartsList();//å³é®ä»¶æ¸å
			get_CriticalPartsList();//å³é®ä»¶æ¸å ä¸è¯è®°å½ åæ ¼è®°å½

			}

			// çæåæ®å·
			function createBillNo() {
			$.ajax({
			url: GetWEBURL() + "/Web/GetMAXNum",
			async: false,
			type: "GET",
			data: { "HBillType": '3791' },
			success: function (d) {
			$("#HInterID").val(d.data[0].HInterID);
			$("#HBillNo").val(d.data[0].HBillNo);
			}
			});
			}

			//æ¥è¯¢
			@@ -417,10 +490,9 @@
			});
			}


			//å³é®ä»¶æ¸å
			function get_CriticalPartsList() {
			var option = {
			option= {
			elem: '#mainTable2'
			//, toolbar: '#toolbarDemo'
			, async: true
			@@ -432,41 +504,153 @@
			, cols: [[
			{ type: 'numbers', title: 'åºå·' }
			, { field: 'æ¥æ', title: 'æ¥æ' }
			, { field: 'éä»¶ä»£ç ', title: 'éä»¶ä»£ç ' }
			, { field: 'éä»¶åç§°', title: 'éä»¶åç§°' }
			, { field: 'éä»¶è§æ ¼', title: 'éä»¶è§æ ¼' }
			, { field: 'éä»¶æ°é', title: 'éä»¶æ°é' }
			, { field: 'å½åæ¹æ¬¡', title: 'å½åæ¹æ¬¡' }
			, { field: 'HBillNo_bak', title: 'HBillNo_bak', hide: true }
			, { field: 'HBatchNo', title: 'å½åæ¹æ¬¡' }
			, { field: 'HICMOInterID', title: 'HICMOInterID', hide: true }
			, { field: 'HICMOEntryID', title: 'HICMOEntryID', hide: true }
			, { field: 'HICMOBillNo', title: 'HICMOBillNo', hide: true }
			, { field: 'HProcExchInterID', title: 'HProcExchInterID', hide: true }
			, { field: 'HProcExchEntryID', title: 'HProcExchEntryID', hide: true }
			, { field: 'HProcExchBillNo', title: 'HProcExchBillNo', hide: true }
			, { field: 'HMaterID', title: 'HMaterID', hide: true }
			, { field: 'HBarCode', title: 'HBarCode', hide: true }
			]]
			}

			option2 = {
			elem: '#mainTable3'
			//, toolbar: '#toolbarDemo'
			, async: true
			, page: false
			//, totalRow: true
			, cellMinWidth: 120
			, data: []
			, height: 325
			, cols: [[
			{ type: 'numbers', title: 'åºå·' }
			, { field: 'æ¥æ', title: 'æ¥æ' }
			, { field: 'HName', title: 'äº§ååç§°' }
			, { field: 'HNumber', title: 'äº§åä»£ç ' }
			, { field: 'HBarCode', title: 'SNç ' }
			, { field: 'ä¸è¯åå ', title: 'ä¸è¯åå ' }
			, { field: 'HBatchNo', title: 'ä¸è¯ç±»å' }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo2' }
			]]
			}

			option3 = {
			elem: '#mainTable'
			//, toolbar: '#toolbarDemo'
			, async: true
			, page: false
			//, totalRow: true
			, cellMinWidth: 120
			, data: []
			, height: 370
			, cols: [[
			{ type: 'numbers', title: 'åºå·' }
			, { field: 'hmainid', title: 'hmainid', hide: true }
			, { field: 'hsubid', title: 'hsubid', hide: true }
			, { field: 'æ¥æ', title: 'æ¥æ' }
			, { field: 'äº§ååç§°', title: 'äº§ååç§°' }
			, { field: 'äº§åæ¡ç ', title: 'SNç ' }
			, { field: 'éä»¶æ¡ç ', title: 'éä»¶SNç ' }
			, { field: 'ä»»å¡åå·', title: 'è®¢åå·' }
			, { field: 'HICMOInterID', title: 'HICMOInterID', hide: true }
			, { field: 'HICMOEntryID', title: 'HICMOEntryID', hide: true }
			, { field: 'HICMOBillNo', title: 'HICMOBillNo', hide: true }
			, { field: 'HProcExchInterID', title: 'HProcExchInterID', hide: true }
			, { field: 'HProcExchEntryID', title: 'HProcExchEntryID', hide: true }
			, { field: 'HProcExchBillNo', title: 'HProcExchBillNo', hide: true }
			, { field: 'HMaterID', title: 'HMaterID', hide: true }
			, { field: 'HBarCode', title: 'HBarCode', hide: true }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDem03' }
			]]
			}

			table.render(option);
			table.render(option2);
			table.render(option3);

			}

			//æ¥è¯¢ä¸è¯è®°å½
			function get_BadRecords(HBarCode) {
			var ajaxLoad = layer.load();
			//è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
			$.ajax({
			url: GetWEBURL() + '/Cj_SingleStation/BadRecordsList',
			type: "GET",
			data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.count == 1) {
			option2.data = data1.data;
			table.render(option2);
			layer.close(ajaxLoad);
			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}

			});
			}

			//æ¥è¯¢åæ ¼è®°å½
			function get_HGRecords(HBarCode) {
			var ajaxLoad = layer.load();
			//è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
			$.ajax({
			url: GetWEBURL() + '/Cj_SingleStation/HGRecordsList',
			type: "GET",
			data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.count == 1) {
			option3.data = data1.data;
			table.render(option3);
			layer.close(ajaxLoad);
			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}

			});
			}

			//æ¡ç åè½¦æ¥è¯¢
			function txtHBarCode_KeyDown(HBarCode) {

			var index = layer.load();
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Cj_SingleStation/HBardCodeList",
			async: true,
			url: GetWEBURL() + "/Cj_SingleStation/HBardCodeAccessoryList",
			async: false,
			data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"]},
			dataType: "json",
			success: function (data1) {
			if (data1.count == 1) {
			layer.close(index);
			$("#HICMOBillNo").val(data1.data[0]["çäº§è®¢å"]);
			$("#HICMOInterID").val(data1.data[0]["HICMOInterID"]);
			$("#HProcExchBillNo").val(data1.data[0]["å·¥åºæµè½¬å¡"]);
			$("#HProcExchInterID").val(data1.data[0]["HSourceInterID"]);
			$("#HMaterNumber").val(data1.data[0]["ç©æç¼ç "]);
			$("#HMaterID").val(data1.data[0]["HMaterID"]);
			$("#HMaterName").val(data1.data[0]["ç©æåç§°"]);
			$("#HModel").val(data1.data[0]["è§æ ¼åå·"]);
			$("#HBarCode").val(data1.data[0]["æ¡ç "]);
			var HProcExchBillNo = $("#HProcExchBillNo").val();
			//if (data1.data[0]["HSourceBillNo"] != HProcExchBillNo) {
			// return layer.msg("æ«ç éè¯¯,è¯·éæ°æ«!");
			//} else {
			// $("#HBarCode_P").val(HBarCode);
			// layer.msg("æ«ç æå!");
			//}

			$("#HBarCode_P").val(HBarCode);
			//ä¿åæ°æ®
			set_AddAssemblyBill();
			}
			else {
			layer.close(index);
			@@ -487,28 +671,124 @@
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Cj_SingleStation/HBardCodeBomList",
			async: true,
			async: false,
			data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
			dataType: "json",
			success: function (data1) {
			if (data1.count == 1) {
			layer.close(index);
			$("#HICMOBillNo").val(data1.data[0]["çäº§è®¢å"]);
			$("#HICMOInterID").val(data1.data[0]["HICMOInterID"]);
			$("#HProcExchBillNo").val(data1.data[0]["å·¥åºæµè½¬å¡"]);
			$("#HProcExchInterID").val(data1.data[0]["HSourceInterID"]);
			$("#HMaterNumber").val(data1.data[0]["ç©æç¼ç "]);
			$("#HMaterID").val(data1.data[0]["HMaterID"]);
			$("#HMaterName").val(data1.data[0]["ç©æåç§°"]);
			$("#HModel").val(data1.data[0]["è§æ ¼åå·"]);
			$("#HBarCode").val(data1.data[0]["æ¡ç "]);

			$("#HBardCodeProcExchBillNo").attr("readonly", "readonly");//æµè½¬å¡åªè¯»
			$("#HBardCodeProcExchBillNo").css("background-color", "#efefef4d");//æµè½¬å¡ç°è²
			//åæ è·³è½¬å°éä»¶ææ¬æ¡ä¸
			$("#HBardCodeMater").focus();

			$("#HMaterNumber").val(data1.data[0]["HMainMaterNumber"]);
			$("#HMaterID").val(data1.data[0]["HMainMaterID"]);
			$("#HMaterName").val(data1.data[0]["HMainMaterName"]);
			$("#HMaterModel").val(data1.data[0]["HMainModel"]);
			$("#HProcExchInterID").val(data1.data[0]["HProcExchInterID"]);
			$("#HProcExchEntryID").val(data1.data[0]["HProcExchEntryID"]);
			$("#HProcExchBillNo").val(data1.data[0]["HProcExchBillNo"]);
			$("#HICMOBillNo").val(data1.data[0]["HICMOBillNo"]);
			$("#HICMOInterID").val(data1.data[0]["HICMOInterID"]);
			$("#HICMOEntryID").val(data1.data[0]["HICMOEntryID"]);
			$("#HProcNo").val(data1.data[0]["HProcNo"]);
			$("#HPieceQty").val(data1.data[0]["HPieceQty"]);
			$("#HICMOQty").val(data1.data[0]["HICMOQty"]);

			option.data = data1.data;
			table.render(option)
			}
			else {
			layer.close(index);
			layer.msg(data1.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			$("#HBarCodeSN").val("");
			},
			error: function (err) {
			layer.close(index);
			layer.msg("éè¯¯:" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			});
			}

			//éä»¶æ¥è¯¢æ°æ®
			var KNum = 0;
			function get_Accessory(HBarCode) {
			var index = layer.load();
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Cj_SingleStation/HBardCodeAccessoryList",
			async: false,
			data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
			dataType: "json",
			success: function (data1) {
			if (data1.count == 1) {
			layer.close(index);

			for (var i = 0; i < option.data.length; i++) {
			if (data1.data[0]["HMaterNumber"] == option.data[i]["éä»¶ä»£ç "] && option.data[i]["HBatchNo"] == data1.data[0]["HBatchNo"] && option.data[i]["HBatchNo"] != "") {
			return layer.msg("å½åæ¹æ¬¡å·²æ«å¥,è¯·ä¸è¦éå¤æ«å¥!");
			}
			if (data1.data[0]["HMaterNumber"] == option.data[i]["éä»¶ä»£ç "] && option.data[i]["HBatchNo"] != data1.data[0]["HBatchNo"] && option.data[i]["HBatchNo"] != "") {
			layer.confirm('æ¯å¦è¦æ¿æ¢å½åæ¹æ¬¡', function (index) {
			layer.close(index);
			option.data[i]["HBatchNo"] = data1.data[0]["HBatchNo"];
			option.data[i]["HBarCode"] = HBarCode;
			table.render(option);
			});
			break;
			}
			if (data1.data[0]["HMaterNumber"] == option.data[i]["éä»¶ä»£ç "]) {
			option.data[i]["HBatchNo"] = data1.data[0]["HBatchNo"];
			option.data[i]["HBarCode"] = HBarCode;
			KNum += 1;
			table.render(option);

			if (KNum == option.data.length) {
			layer.msg("æ¹æ¬¡å·²å¨é¨å¹é!");
			}
			break;
			}

			}
			$('#HBardCodeMater').val("");
			}
			else {
			layer.close(index);
			layer.msg(data1.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			$("#HBarCodeSN").val("");
			},
			error: function (err) {
			layer.close(index);
			layer.msg("éè¯¯:" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			});
			}

			//ä¿åéä»¶å°äº§çº¿ç»è£åä¸´æ¶è¡¨
			function get_AddBomTempList() {
			var HInterID = $("#HInterID").val();
			var HBillNo = $("#HBillNo").val();
			var sSubStr = JSON.stringify(table.cache["mainTable2"]);
			var sMainSub = sSubStr + ';' + HInterID + ';' + HBillNo + ";" + sessionStorage["HUserName"] + ";" + "3791" + ";" + sessionStorage["OrganizationID"];
			var index = layer.load();
			$.ajax({
			type: "POST",
			url: GetWEBURL() + "/Cj_SingleStation/AddBomTempList",
			async: false,
			data: { "sMainSub": sMainSub },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) {
			layer.close(index);
			}
			else {
			layer.close(index);
			layer.msg(data.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			},
			error: function (err) {
			layer.close(index);
			@@ -541,7 +821,6 @@
			}
			})
			}


			//æä½åéæ©é¡µé¢
			function btnHEmp2() {
			@@ -672,26 +951,49 @@
			})
			}

			//ä¸è¯æ±æ¥
			function BadReport() {
			var HBarCode_P = $("#HBarCode_P").val();

			if (HBarCode_P != "") {
			layer.open({
			type: 2//å¼¹çªç±»å
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['100%', '100%']//å¤§å°
			, title: 'å·¥åºä¸è¯æ±æ¥'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../è½¦é´ç®¡ç/ååè¿ç«/Cj_CollectionOfSingleProductDefects.html?OperationType=1&linterid=' + $("#HInterID").val(), 'yes']
			})
			}
			else {
			layer.msg("è¯·åä¿åä¸æ¬¡åæ ¼æ¡ç !")
			}
			}

			//ä¿åHMaker
			function set_AddNew(data, HResult) {
			//ä¿åäº§çº¿ç»è£ä¸»åè¡¨ å·¥åºåºç«åä¸»åè¡¨
			function set_AddAssemblyBill() {
			var data = { "field": { "HInterID": $("#HInterID").val(), "HBillNo": $("#HBillNo").val(), "HProcID": $("#HProcID").val(), "HMaterID": $("#HMaterID").val(), "HGroupID": $("#HGroupID").val(), "HSourceID": $("#HSourceID").val(), "HICMOInterID": $("#HICMOInterID").val(), "HICMOEntryID": $("#HICMOEntryID").val(), "HICMOBillNo": $("#HICMOBillNo").val(), "HBarCode_P": $("#HBarCode_P").val(), "HProdOrgID": sessionStorage["OrganizationID"], "HEmpID2": $("#HEmpID2").val(), "HEmpID": $("#HEmpID").val(), "HProcExchBillNo": $("#HProcExchBillNo").val(), "HProcExchInterID": $("#HProcExchInterID").val(), "HProcExchEntryID": $("#HProcExchEntryID").val(), "HPieceQty": $("#HPieceQty").val(), "HICMOQty": $("#HICMOQty").val(), "HDeptID": $("#HDeptID").val(), "HProcNo": $("#HProcNo").val()} };

			var sMainStr = JSON.stringify(data.field);

			var sMainSub = sMainStr + ';' + HResult + ";" + sessionStorage["HUserName"] ;
			var sSubStr = JSON.stringify(table.cache["mainTable2"]);
			var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"] ;

			var index = layer.load();
			$.ajax({
			type: "POST",
			url: GetWEBURL() + "/Cj_SingleStation/ProcessBLSave",
			url: GetWEBURL() + "/Cj_SingleStation/AddAssemblyBillList",
			async: false,
			data: { "sMainSub": sMainSub },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) {
			$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
			//$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
			layer.close(index);
			layer.msg("æäº¤æå");
			//ä¿åå°ä¸´æ¶è¡¨
			get_AddBomTempList();
			get_BomList($("#HBardCodeProcExchBillNo").val());
			get_BadRecords($("#HBardCodeProcExchBillNo").val());
			}
			else {
			layer.close(index);