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

yusijie

2023-12-12 1de75ada0a1d3853fe50241b023ea396d792bdce

 WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBill.html

@@ -489,7 +489,7 @@
                , "HBeginDayQty": 0, "HBeginFixQty": 0, "HFixWorkDays": 0, "HTrunWorkDays": 0, "HReadyTimes": 0
                , "HICMOReadyTimes": 0, "HAutoTrunFlag": false, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
                , "HProcWorkNum": "", "HBadWHID": 0, "HBadWHName": "", "HWasterWHID": 0, "HWasterWHName": ""
                , "HWHID": 0, "HWHName": "", "HRemark": ""
                , "HWHID": 0, "HWHName": "", "HRemark": "", "HWorkTimes_S": 0
                , "HQCSchemeID_Fst": 0, "HQCSchemeNumber_Fst": "", "HQCSchemeName_Fst": ""
                , "HQCSchemeID_Proc": 0, "HQCSchemeNumber_Proc": "", "HQCSchemeName_Proc": ""
                , "HQCSchemeID_Patrol": 0, "HQCSchemeNumber_Patrol": "", "HQCSchemeName_Patrol": ""
@@ -578,6 +578,7 @@
                    //, { field: 'HAutoTrunFlag', title: '自动移转', templet: "#HAutoTrunFlag" }//chenbox
                    //, { field: 'HProcCheckNote', title: '本工序确认记录', edit: 'text' }
                    //, { field: 'HProcWorkNum', title: '程序号', edit: 'text' }
                    //, { field: 'HWorkTimes_S', title: '产品单件工时', edit: 'text' }
                    , { fixed: 'right', title: '操作', toolbar: '#barDemo' }
                ]]
                //, done: function (res, curr, count) {
@@ -841,7 +842,7 @@
                    , "HBeginDayQty": 0, "HBeginFixQty": 0, "HFixWorkDays": 0, "HTrunWorkDays": 0, "HReadyTimes": 0
                    , "HICMOReadyTimes": 0, "HAutoTrunFlag": false, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
                    , "HProcWorkNum": "", "HBadWHID": 0, "HBadWHName": "", "HWasterWHID": 0, "HWasterWHName": ""
                    , "HWHID": 0, "HWHName": "", "HRemark": ""
                    , "HWHID": 0, "HWHName": "", "HRemark": "", "HWorkTimes_S": 0
                    , "HQCSchemeID_Fst": 0, "HQCSchemeNumber_Fst": "", "HQCSchemeName_Fst": ""
                    , "HQCSchemeID_Proc": 0, "HQCSchemeNumber_Proc": "", "HQCSchemeName_Proc": ""
                    , "HQCSchemeID_Patrol": 0, "HQCSchemeNumber_Patrol": "", "HQCSchemeName_Patrol": ""
@@ -1026,13 +1027,15 @@

            //产品选择页面
            function get_checkSearchMater() {
                var HOrgID = $("#HOrgID").val();

                layer.open({
                    type: 2//弹窗类型
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['90%', '90%']//大小
                    , title: '物料表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../Baseset/基础资料/Gy_MaterialList.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -1042,13 +1045,13 @@
                        }
                        //获取数据
                        $("#HMaterID").val(checkStatus.data[0].HItemID);//物料id
                        $("#HMaterName").val(checkStatus.data[0].HName);//物料名称
                        $("#HMaterNumber").val(checkStatus.data[0].HNumber);//物料代码
                        $("#HMaterModel").val(checkStatus.data[0].HModel);//规格型号
                        $("#HMaterName").val(checkStatus.data[0].物料名称);//物料名称
                        $("#HMaterNumber").val(checkStatus.data[0].物料代码);//物料代码
                        $("#HMaterModel").val(checkStatus.data[0].规格型号);//规格型号
                        $("#HUnitID").val(checkStatus.data[0].HUnitID);//计量单位id
                        $("#HUnitName").val(checkStatus.data[0].HUnitName);//计量单位名称
                        $("#HUnitName").val(checkStatus.data[0].计量单位名称);//计量单位名称
                        if ($("#HName").val() == "") {
                            $("#HName").val(checkStatus.data[0].HNumber);
                            $("#HName").val(checkStatus.data[0].物料代码);
                        }

                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
@@ -1457,7 +1460,7 @@
                                                , "HBeginDayQty": 0, "HBeginFixQty": 0, "HFixWorkDays": 0, "HTrunWorkDays": 0, "HReadyTimes": 0
                                                , "HICMOReadyTimes": 0, "HAutoTrunFlag": false, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
                                                , "HProcWorkNum": "", "HBadWHID": 0, "HBadWHName": "", "HWasterWHID": 0, "HWasterWHName": ""
                                                , "HWHID": 0, "HWHName": "", "HRemark": ""
                                                , "HWHID": 0, "HWHName": "", "HRemark": "", "HWorkTimes_S": 0
                                                , "HQCSchemeID_Fst": 0, "HQCSchemeNumber_Fst": "", "HQCSchemeName_Fst": ""
                                                , "HQCSchemeID_Proc": 0, "HQCSchemeNumber_Proc": "", "HQCSchemeName_Proc": ""
                                                , "HQCSchemeID_Patrol": 0, "HQCSchemeNumber_Patrol": "", "HQCSchemeName_Patrol": ""
@@ -1819,7 +1822,7 @@
                                    , "HBeginDayQty": d.data[i].开工余量天数, "HBeginFixQty": d.data[i].开工余量固数, "HFixWorkDays": d.data[i].上道固定天数, "HTrunWorkDays": d.data[i].上道循环周期, "HReadyTimes": d.data[i].本道准备时间
                                    , "HICMOReadyTimes": d.data[i].换单准备时间, "HAutoTrunFlag": d.data[i].自动移转, "HTechnologyParameter": d.data[i].工艺参数, "HPicNum": d.data[i].图纸编号, "HProcCheckNote": d.data[i].本工序确认记录
                                    , "HProcWorkNum": d.data[i].程序号, "HBadWHID": d.data[i].HBadWHID, "HBadWHName": d.data[i].HBadWHName, "HWasterWHID": d.data[i].HWasterWHID, "HWasterWHName": d.data[i].HWasterWHName
                                    , "HWHID": d.data[i].HWHID, "HWHName": d.data[i].HWHName, "HRemark": d.data[i].表体备注
                                    , "HWHID": d.data[i].HWHID, "HWHName": d.data[i].HWHName, "HRemark": d.data[i].表体备注, "HWorkTimes_S": d.data[i].产品单件工时
                                    , "HQCSchemeID_Fst": d.data[i].HQCSchemeID_Fst, "HQCSchemeNumber_Fst": d.data[i].首件检验方案代码, "HQCSchemeName_Fst": d.data[i].首件检验方案
                                    , "HQCSchemeID_Proc": d.data[i].HQCSchemeID_Proc, "HQCSchemeNumber_Proc": d.data[i].转序检验方案代码, "HQCSchemeName_Proc": d.data[i].转序检验方案
                                    , "HQCSchemeID_Patrol": d.data[i].HQCSchemeID_Patrol, "HQCSchemeNumber_Patrol": d.data[i].巡检检验方案代码, "HQCSchemeName_Patrol": d.data[i].巡检检验方案