yangle
2024-05-23 c23f30741bb2d3f01b12d78cffd52dfdf19c37f4
报工平台优化
6个文件已修改
109 ■■■■ 已修改文件
WebTM/layuiadmin/PlateBinding.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产停工单/Sc_Add_MESStopWorkBillList.html 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产完工单/Sc_Add_MESEndWorkBillList.html 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/质量汇报单/Sc_QualityReportBill.html 58 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill_CodingReport.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill_CurrentWork.html 45 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/PlateBinding.js
@@ -32,7 +32,7 @@
                }
                //公用部分 ======End========                
            } else {
                layer.alert(result.msg, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                layer.alert(result.Message, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
            }
        }, error: function () {
            layer.alert("发生错误!", { icon: 5 });
WebTM/views/Éú²ú¹ÜÀí/Éú²úÍ£¹¤µ¥/Sc_Add_MESStopWorkBillList.html
@@ -618,6 +618,7 @@
            //保存提交
            form.on('submit(Saver)', function (data) {
                var index = layer.load();
                var sMainStr = JSON.stringify(data.field);
                var sMainSub = sMainStr + ';' + sessionStorage["HUserName"] + ';' + refSav;
                if (!AllowLoadData())//数据验证
WebTM/views/Éú²ú¹ÜÀí/Éú²úÍ깤µ¥/Sc_Add_MESEndWorkBillList.html
@@ -786,6 +786,7 @@
            //保存提交
            form.on('submit(Saver)', function (data) {
                var index = layer.load();
                var sMainStr = JSON.stringify(data.field);
                var sMainSub = sMainStr + ';' + sessionStorage["HUserName"] + ';' + refSav;
                if (!AllowLoadData())//数据验证
WebTM/views/Éú²ú¹ÜÀí/ÖÊÁ¿»ã±¨µ¥/Sc_QualityReportBill.html
@@ -14,6 +14,7 @@
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/PlateBinding.js"></script>
    <style>
        .main-btn { /*头部主按钮*/
            padding: 0 2px; /*调整按钮左右空隙大小*/
@@ -132,7 +133,7 @@
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">流转卡数量</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="" id="" style="background-color:#efefef4d;" readonly>
                                                <input type="text" class="layui-input" name="HQty" id="HQty" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
@@ -374,6 +375,9 @@
            //var linterid = 11880;
            //var HSouceBillType = 3722;
            get_Display_UserList();
            get_ConfigFileInfo_EquipFile();
            //判断操作类型
            if (OperationType == 1) {//无源单新增
                var ajaxLoad = layer.load();
@@ -409,7 +413,7 @@
                        layer.close(ajaxLoad);
                    }
                });
                if (HSouceBillType == 3722 || HSouceBillType == 4610) {
                if (HSouceBillType == 3722 || HSouceBillType == 4610 || HSouceBillType == 3772) {
                    $("#HSourceBillType").val(HSouceBillType);
                    //根据源单id获取源单信息
                    GetICMOBillValue(linterid);
@@ -579,7 +583,7 @@
                $.ajax({
                    url: GetWEBURL() + '/Sc_QualityReportBill/set_SaveBill',
                    type: "GET",
                    data: { "HInterID": $("#HInterID").val(), "HChecker": sessionStorage["HUserName"] },
                    data: { "HInterID": $("#HInterID").val(), "HBillNo": $("#HBillNo").val(), "HChecker": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) {
                            $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
@@ -629,6 +633,14 @@
                            $("#HMaterID").val(data.HMaterID);
                            $("#HMaterModel").val(data.HMaterModel);
                            $("#HICMOEntryID").val(data.HICMOEntryID);
                            if (HSouceBillType == "3772") {
                                $("#HQty").val(data.HDatePlanQty);
                                $("#HProcExchBillNo").val(data.HSourceBillNo);
                                $("#HProcExchInterID").val(data.HSourceInterID);
                                $("#HProcExchEntryID").val(data.HSourceEntryID);
                            }
                        } else {
                            layer.alert(result.Message, { icon: 5 });
                        }
@@ -641,6 +653,46 @@
            }
            //#endregion
            //查询用户关联信息
            function get_Display_UserList() {
                var sWhere = " and ç¼–码='" + sessionStorage["Czybm"] + "'";
                var ajaxLoad = layer.load();
                //进入页面显示的缓存列表
                $.ajax({
                    url: GetWEBURL() + '/Cj_SingleStation/Cj_CollectionOfSingleProductDefectsUserList',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            $("#HCheckManID").val(data1.data[0]["HEmpID"]);
                            $("#HCheckManName").val(data1.data[0]["质检员"]);
                            $("#HGroupID").val(data1.data[0]["HGroupID"]);
                            $("#HGroupName").val(data1.data[0]["生产班组"]);
                            layer.close(ajaxLoad);
                            //layer.alert("查询成功", { icon: 1 });
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#region æ ¹æ®å¹³æ¿ç»‘定,自动带出基础资料信息
            function get_ConfigFileInfo_EquipFile() {
                var objdata = get_ConfigFileInfo();
                $("#HProcID").val(objdata.HProcID); //工序ID
                $("#HProcNo").val(objdata.HProcName); //工序名称
                $("#HSourceID").val(objdata.HSourceID); //生产资源ID
                $("#HSourceName").val(objdata.HSourceName); //生产资源名称
            }
        //#endregion
            //#region é€‰æ‹©ç”Ÿäº§èµ„源方法
            function get_checkSource() {
                layer.open({
WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBill_CodingReport.html
@@ -2,7 +2,7 @@
<html>
<head>
    <meta charset="utf-8" />
    <title>当前工单(扫码汇报)</title>
    <title>当前工单(赋码)</title>
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBill_CurrentWork.html
@@ -15,6 +15,7 @@
    <script src="../../../layuiadmin/HideButton.js"></script>
    <script src="../../../layuiadmin/soulTable.slim.js"></script>
    <script src="../../../layuiadmin/echarts.min.js"></script>
    <script src="../../../layuiadmin/PlateBinding.js"></script>
</head>
<body>
    <div class="layui-fluid">
@@ -199,7 +200,7 @@
                                    <div style="margin-left:25%;">
                                        <dl>
                                            <dd>
                                                <h2><span>部门<span style="margin-left:10px;" id="HDepName"></span></span></h2>
                                                <h2><span>部门:<span style="margin-left:10px;" id="HDepName"></span></span></h2>
                                                <h3><span>班组:<span style="margin-left:10px;" id="HGroupName"></span></span></h3>
                                                <h3><span>操作员:<span style="margin-left:10px;" id="HEmpName"></span></span></h3>
                                                <h3><span>负责人:<span style="margin-left:10px;" id="HManagerName"></span></span></h3>
@@ -310,11 +311,11 @@
        //初始化界面
        set_ClearBill();
        $("#HEquipName").text(HEquipName);//设备名称
        $("#HEquipCode").text(HEquipCode);//设备编号
        $("#HEmpName").text(HEmpName);//操作员
        $("#HManagerName").text(HManagerName);//负责人
        $("#HGroupName").text(HGroupName);//班组
        //$("#HEquipName").text(HEquipName);//设备名称
        //$("#HEquipCode").text(HEquipCode);//设备编号
        //$("#HEmpName").text(HEmpName);//操作员
        //$("#HManagerName").text(HManagerName);//负责人
        //$("#HGroupName").text(HGroupName);//班组
        //#endregion
        //#region ã€ä»ªè¡¨ç›˜ã€‘
@@ -712,6 +713,7 @@
            $('#Add').addClass("layui-btn-disabled").attr("disabled", true);//新增按钮禁用
            get_Display_OutBillList();
            get_Display_UserList();
            get_ConfigFileInfo_EquipFile();
            MaxBillNO();
            //查询
            get_FastQuery();
@@ -852,16 +854,16 @@
                        $("#HDeptID").val(data1.data[0]["HDeptID"]);
                        $("#HDeptName").val(data1.data[0]["车间"]);
                        $("#HProcName").val(data1.data[0]["工序"]);
                        $("#HProcID").val(data1.data[0]["HProcID"]);
                        $("#HSourceID").val(data1.data[0]["HSourceID"]);
                        $("#HSourceName").val(data1.data[0]["生产资源"]);
                        //$("#HProcName").val(data1.data[0]["工序"]);
                        //$("#HProcID").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]["质检员"]);
                        $("#HGroupID").val(data1.data[0]["HGroupID"]);
                        $("#HGroupName").val(data1.data[0]["生产班组"]);
                        $("#HCenterID").val(data1.data[0]["HWorkCenterID"]);
                        $("#HCenterName").val(data1.data[0]["工作中心"]);
                        //$("#HCenterID").val(data1.data[0]["HWorkCenterID"]);
                        //$("#HCenterName").val(data1.data[0]["工作中心"]);
                        layer.close(ajaxLoad);
                        //layer.alert("查询成功", { icon: 1 });
@@ -876,6 +878,23 @@
            });
        }
        //#region æ ¹æ®å¹³æ¿ç»‘定,自动带出基础资料信息
        function get_ConfigFileInfo_EquipFile() {
            var objdata = get_ConfigFileInfo();
            $("#HProcID").val(objdata.HProcID); //工序ID
            $("#HProcName").val(objdata.HProcName); //工序名称
            //$("#HEquipID").val(objdata.HEquipID); //设备ID
            $("#HEquipCode").text(objdata.HEquipName); //设备名称
            $("#HSourceID").val(objdata.HSourceID); //生产资源ID
            $("#HSourceName").val(objdata.HSourceName); //生产资源名称
            //$("#HGroupID").val(objdata.HGroupID); //班组ID
            //$("#HGroupName").val(objdata.HGroupName); //班组名称
            $("#HCenterID").val(objdata.HWorkCenterID); //工作中心ID
            $("#HCenterName").val(objdata.HWorkCenterName); //工作中心名称
        }
        //#endregion
        //查询当前用户今天的出站单的数据
        function get_Display_OutBillList() {
@@ -912,7 +931,7 @@
                type: "GET",
                url: GetWEBURL() + "/Cj_StationOutBill_CurrentWork/SNHBardCodeList",
                async: false,
                data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"] },
                data: { "HBarCode": HBarCode, "HProcID": $("#HProcID").val(), "HOrgID": sessionStorage["OrganizationID"] },
                dataType: "json",
                success: function (data1) {
                    if (data1.count == 1) {