zgq
2021-07-23 e8232071737c1c0fcafcb474d063c341caf9fced
Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
6个文件已修改
174 ■■■■ 已修改文件
WebTM/layuiadmin/Scripts/webConfig.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/PublicPage/PartInformation.html 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/index.html 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/产量汇报单/Sc_ProductReportBillList.html 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产开工单/Sc_Add_MESBeginWorkBillList.html 149 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产开工单/Sc_MESBeginWorkBillList.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js
@@ -1,7 +1,7 @@
function GetWEBURL() {
    //var WEBURL = "http://192.168.16.80:8011/";          //办公室服务器
    //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch本地
    var WEBURL = "http://localhost:8085/API/";   //zgq本地
    //var WEBURL = "http://localhost:8085/API/";   //zgq本地
    //var WEBURL = "http://192.168.2.21:8081/lubaoWebAPI/";//王永波本地配置,请勿更改
     //var WEBURL = "http://101.37.171.70/API/";   //公司服务器
    //var WEBURL = "http://localhost:8080/API/";   //颜晓军本地配置
@@ -9,7 +9,7 @@
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨露本地配置
    //var WEBURL = "http://10.1.4.154/API/";   //江丰客户
    //var WEBURL = "http://10.1.4.155/API/";   //江丰客户NEW
    //var WEBURL = "http://47.96.97.237/API/";   //智云服务器
    var WEBURL = "http://47.96.97.237/API/";   //智云服务器
    //var WEBURL = "http://183.129.128.86:9090/API/";   //凯贝奈特客户服务器
    return WEBURL
}
WebTM/views/PublicPage/PartInformation.html
@@ -148,6 +148,7 @@
                    , { field: 'ParentID', title: 'ParentID', sort: true, hide: true }
                    , { field: 'HNumber', title: '物料代码' }
                    , { field: 'HName', title: '物料名称' }
                    , { field: 'HModel', title: '物料规格', hide: true}
                ]]
            };
WebTM/views/index.html
@@ -311,7 +311,8 @@
                                    <a>开结班管理</a>
                                    <dl class="layui-nav-child">
                                        <dd><a lay-href="生产管理/生产开工单/Sc_Add_MESBeginWorkBillList">开班单</a></dd>
                                        <dd><a lay-href="生产管理/生产开工单/Sc_MESBeginWorkBillList">开班单维护</a></dd>
                                        <dd><a lay-href="生产管理/生产开工单/Sc_MESBeginWorkBillList.html">开班单维护</a></dd>
                                        <dd><a lay-href="生产管理/停工挂起单/Sc_Add_MESStopWorkBillList.html">停工挂起单</a></dd>
                                        <dd><a lay-href="生产管理/停工挂起单/Sc_MESStopUpWorkBillList.html">停工挂起单维护</a></dd>
                                        <dd><a lay-href="生产管理/生产完工单/Sc_Add_MESEndWorkBillList.html">结班单</a></dd>
WebTM/views/Éú²ú¹ÜÀí/²úÁ¿»ã±¨µ¥/Sc_ProductReportBillList.html
@@ -25,7 +25,7 @@
                <form class="layui-form" action="" lay-filter="component-form-group">
                    <div class="layui-card-header">
                        <button type="button" class="layui-btn" lay-submit="" lay-filter="Delete"><i class="layui-icon layui-icon-add"></i>删除</button>
                        <button type="button" class="layui-btn" lay-submit="" lay-filter="AskReport"><i class="layui-icon layui-icon-add"></i>申请检验</button>
                        <button type="button" class="layui-btn" lay-submit="" lay-filter="AskReport" id="AskReport"><i class="layui-icon layui-icon-add"></i>申请检验</button>
                        <button type="button" class="layui-btn" lay-submit="" lay-filter="Exit"><i class="layui-icon layui-icon-add"></i>退出</button>
                        <span style="margin:0 30%;font-size:24px;font-weight:bold;">产量汇报</span>
                    </div>
@@ -198,7 +198,7 @@
                    , { field: 'HReportType', title: '汇报类型', width: 200 }
                ]]
            };
            var index = layer.load(0, { shade: false });
            //有源单新增
            if (Type == 2)
@@ -271,16 +271,21 @@
            //申请检验
            form.on('submit(AskReport)', function (data)
            {
                $('#AskReport').addClass("layui-btn-disabled").attr("disabled", true);
                var TabData = table.cache['mainTable'];
                if (TabData.length <= 0)
                if (TabData == undefined)
                {
                    return layer.alert("无产量汇报数据!", { icon: 5 })
                }
                if (TabData.length <= 0) {
                    return layer.alert("无产量汇报数据!", { icon: 5 })
                }
                $.ajax(
                    {
                        type: "GET",
                        url: GetWEBURL() + "/Sc_MESBeginWorkBill/SaveGetMESProductReportBillList", //方法所在页面和方法名
                        async: true,
                        async: false,
                        data: { "ScMaxWork": ScMaxWork(),"HSourceBillType": HSourceBillType, "workcode": workcode, "HSourceID": HSourceID, "HICMOInterID": (HICMOInterID == "null" ? 0 : HICMOInterID), "HICMOEntryID": (HICMOEntryID == "null" ? 0 : HICMOEntryID), "HMaker": HMaker },
                        dataType: "json",
                        success: function (data) {
WebTM/views/Éú²ú¹ÜÀí/Éú²ú¿ª¹¤µ¥/Sc_Add_MESBeginWorkBillList.html
@@ -108,7 +108,7 @@
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" disabled autocomplete="off">
                                                            <input id="HInterID" name="HInterID" type="hidden" />
                                                            <input id="HMaker" name="HMaker" type="hidden" /><!--制单人-->
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
@@ -182,8 +182,8 @@
                                                        <label class="layui-form-label">源单类型</label>
                                                        <div class="layui-input-inline">
                                                            <select name="SourceType" lay-filter="SourceType" id="SourceType">
                                                                <option value="2" selected="selected">生产任务单</option>
                                                                <option value="1">手工录入</option>
                                                                <option value="2">生产任务单</option>
                                                                <option value="1" selected="selected">手工录入</option>
                                                            </select>
                                                        </div>
                                                    </div>
@@ -422,9 +422,59 @@
                /* RoadBillSub(linterid);*/
            }
              //获取下拉选中值
            form.on('select(SourceType)', function (data) {
                Sctag = data.value;
                form.render('select');
                if (Sctag != "2")  //无源单
                {
                    $("#HMainSourceInterID").val("");
                    $("#HMainSourceEntryID").val("");
                    $("#HMainSourceBillNo").val("");
                    $("#HMainSourceBillType").val("");
                    $('#HMainSourceBillNo').attr("disabled", false);
                    $('#XDHList').addClass("layui-btn-disabled").attr("disabled", true);
                }
                else {
                    $('#HMainSourceBillNo').attr("disabled", true);
                    $('#XDHList').removeClass("layui-btn-disabled").attr("disabled", false);
                }
            });
            //无源单新增
            if (Type == 1)
            {
                //加源单类型区分(可以写不同的方法)
                $('#HMaterCode').attr("disabled", true);
                $('#HMaterList').removeClass("layui-btn-disabled").attr("disabled", false);
                $('#HMaterName').attr("disabled", true);
                $('#HMaterSpec').attr("disabled", true);
                $('#HBeginDate').attr("disabled", true);
                $('#HEmpName').attr("disabled", true);
                $('#HEmpList').removeClass("layui-btn-disabled").attr("disabled", false);
                $('#HSourceName').attr("disabled", true);
                $('#HSourceList').removeClass("layui-btn-disabled").attr("disabled", false);
                $('#HMainSourceBillNo').attr("disabled", true);
                $('#XDHList').removeClass("layui-btn-disabled").attr("disabled", false);
                $('#HGroupName').attr("disabled", true);
                $('#HGroupList').removeClass("layui-btn-disabled").attr("disabled", false);
                $('#HDeptName').attr("disabled", true);
                $('#HDeptList').removeClass("layui-btn-disabled").attr("disabled", false);
                form.render('select');
                $('#HICMOBillNo').attr("disabled", false);
                //$('#HICMOBillNo').val("0");
                $("#HProcID").val("0");            //工序ID
                $("#HMainSourceInterID").val("0"); //源单主ID
                $("#HMainSourceEntryID").val("0"); //源单子内码
                $("#HICMOInterID").val("0"); //生产订单ID
                $("#HICMOEntryID").val("0"); //生产订单子ID
            }
            //有源单新增
            if (Type == 2) {
            if (Type == 2)
            {
                //加源单类型区分(可以写不同的方法)
@@ -488,11 +538,19 @@
                    });
            }
            //编辑
            if (Type == 3)
            {
            }
            //保存提交
            form.on('submit(Saver)', function (data) {
         
                var sMainStr = JSON.stringify(data.field);
                console.log(sMainStr);
                if (!AllowLoadData())//数据验证
                {
                    return false;
@@ -551,6 +609,7 @@
                        $("#HMaterName").val(checkStatus.data[0].HName);
                        $("#HMaterCode").val(checkStatus.data[0].HNumber);
                        $("#HMaterID").val(checkStatus.data[0].HItemID);
                        $("#HMaterSpec").val(checkStatus.data[0].HModel);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
@@ -693,7 +752,7 @@
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../PublicPage/GroupInformation.html', 'yes'],
                    content: ['../../PublicPage/DeptInformation.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {
@@ -750,10 +809,6 @@
                layer.msg("操作员不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            if ($("#HMainSourceInterID").val() == '' || $("#HMainSourceInterID").val() == null) {
                layer.msg("源单单号不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            if ($("#HGroupID").val() == '' || $("#HGroupID").val() == null) {
                layer.msg("班组不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
@@ -762,12 +817,82 @@
                layer.msg("车间不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            if ($("#HICMOInterID").val() == '' || $("#HICMOInterID").val() == null) {
                layer.msg("生产订单不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            if (Type == "2") {
                if ($("#HICMOInterID").val() == '' || $("#HICMOInterID").val() == null) {
                    layer.msg("生产订单不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return Result = false;
                }
            }
            return Result;
        }
        function RoadBillMain(hID)//加载表头
        {
            //alert(hID);
            //查询检验方案单是否存在
            $.ajax({
                url: GetWEBURL() + "Sc_MESBeginWorkBill/Sc_MESBeginWorkBillListCheckDetai",
                type: "GET",
                data: {
                    "HID": hID
                },
                success: function (result) {
                    if (result.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                        var data = result.data.h_v_Sc_MESBeginWorkBillList_NEW[0];
                        form.val("component-form-group", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                            "HInterID": data.hmainid
                            ,"HBillNo": data.单据号
                            , "HDate": formatDate(data.日期)
                            , "HProcID": data.HProcID
                            , "HProcName": data.工序名称
                            , "HMaterID": data.HMaterID
                            , "HMaterCode": data.产品代码
                            , "HMaterName": data.产品名称
                            , "HMaterSpec": data.规格型号
                            , "HBeginDate": data.开工时间
                            , "HSourceID": data.HSourceID              //资源ID
                            , "HSourceName": data.资源名称             //资源名称
                            , "HEmpID": data.HEmpID                   //操作员ID
                            , "HEmpName": data.申请开工人员           //操作员
                            , "HMainSourceInterID": data.HMainSourceInterID                 //源单ID
                            , "HMainSourceEntryID": data.HMainSourceEntryID                 //源单子ID
                            , "HMainSourceBillNo": data.HMainSourceBillNo                 //源单单号
                            , "HMainSourceBillType": data.HMainSourceBillType               //源单类型
                            , "HGroupID": data.HGroupID                //班组ID
                            , "HGroupName": data.班组名称              //班组名称
                            , "HDeptID": data.HDeptID                  //部门ID
                            , "HDeptName": data.部门名称               //部门名称
                            , "HICMOInterID": data.HICMOInterID                       //生产订单主ID
                            , "HICMOEntryID": data.HICMOEntryID                        //生产订单子ID
                            , "HICMOBillNo": data.HICMOBillNo                        //生产订单
                            , "HRemark": data.备注                    //备注
                            , "HMaker": data.制单人                            //制单人
                            , "HMakeDate": data.制单日期                          //制单日期
                            , "HUpDater": data.修改人                           //修改人
                            , "HUpDateDate": data.修改日期                        //修改日期
                        });
                    } else {
                        layer.alert(result.msg, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                    }
                }, error: function () {
                    layer.alert("发生错误!", { icon: 5 });
                }
            });
        }
        function formatDate(date) {
            var d = new Date(date),
                month = '' + (d.getMonth() + 1),
                day = '' + d.getDate(),
                year = d.getFullYear();
            if (month.length < 2) month = '0' + month;
            if (day.length < 2) day = '0' + day;
            return [year, month, day].join('-');
        }
    </script>
</body>
</html>
WebTM/views/Éú²ú¹ÜÀí/Éú²ú¿ª¹¤µ¥/Sc_MESBeginWorkBillList.html
@@ -168,7 +168,7 @@
                            shift: 2,
                            area: ['100%', '100%'],
                            maxmin: true,
                            content: '../生产开工单/Sc_Add_MESBeginWorkBillList.html',
                            content: '../生产开工单/Sc_Add_MESBeginWorkBillList.html?hID=&Type=1',
                            end: function () {
                                //刷新页面,
                                location.reload();
@@ -192,7 +192,7 @@
                                , shade: 0.6 //遮罩透明度
                                , maxmin: true //允许全屏最小化
                                , anim: 0 //0-6的动画形式,-1不开启
                                , content: '../生产开工单/Sc_Add_MESBeginWorkBillList.html?hID=' + hID
                                , content: '../生产开工单/Sc_Add_MESBeginWorkBillList.html?hID=' + hID +'&Type=3'
                                , resize: false,
                                end: function () {
                                    //刷新页面,