YL
2021-07-20 395c583bb843753ba18a8777684ec471c4803211
报工平台、开工、停工、完工提交保存
6个文件已修改
257 ■■■■ 已修改文件
WebTM/layuiadmin/Scripts/webConfig.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/IpadIndex.html 76 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/产量汇报单/Sc_ProductReportBillList.html 146 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产停工单/Sc_Add_MESStopWorkBillList.html 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产完工单/Sc_Add_MESEndWorkBillList.html 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产开工单/Sc_Add_MESBeginWorkBillList.html 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js
@@ -1,12 +1,12 @@
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/";   //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/lubao";   //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨露本地配置
    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/";   //智云服务器
WebTM/views/IpadIndex.html
@@ -54,7 +54,6 @@
            var mychart2 = echarts.init(document.getElementById('mychart2'));
            element.on('tab(TabTest)', function (data) {
                console.log(data);
                Mychart(mychart1, mychart2);
                mychart1.resize();
                mychart2.resize();
@@ -144,6 +143,7 @@
                            data: { "HSourceID": HSourceID },
                            dataType: "json",//数据类型可以为 text xml json  script  jsonp
                            success: function (data) {
                                var LoadData1 = data.data.h_p_JIT_GetWorkBillListInfoBySource;
                                var LoadData2 = data.data.h_p_JIT_GetWorkBillListInfoBySource1;
                                if (LoadData1.length > 0)  //工单列表数据
@@ -155,7 +155,8 @@
                                        html1 += '<div class="cns" id="bs' + (i + 1) + '" onclick="CheckBtom(this,' + (i + 1)+ ')">';
                                        html1 += '<dl>';
                                        html1 += '<dd class="tcenter">';
                                        html1 += '<h1 style="display:none;"><span>单据状态:</span><span id="ty' + (i + 1) + '">' + LoadData1[i].HBillType + '</span></h1>';
                                        html1 += '<h1 style="display:none;"><span>单据类型:</span><span id="ty' + (i + 1) + '">' + LoadData1[i].HBillType + '</span></h1>';
                                        //HSourceInterID实际取值:Sc_ICMOBillStatus_Tmp  HInterID(单据主ID)
                                        html1 += '<h1 style="display:none;"><span>源单主内码:</span><span id="sm' + (i + 1) + '">' + LoadData1[i].HSourceInterID + '</span></h1>';
                                        html1 += '<h1 style="display:none;"><span>源单子内码:</span><span id="sb' + (i + 1) + '">' + LoadData1[i].HSourceEntryID + '</span></h1>';
                                        html1 += '<h1 style="display:none;"><span>源单单号:</span><span id="sw' + (i + 1) + '">' + LoadData1[i].HSourceBillNo + '</span></h1>';
@@ -531,7 +532,11 @@
                layer.alert("请选择工单列表", {icon: 5 });
                return false;
            }
            if (WorkStaus(HSourceID1, workcode, HSourceInterID, "开工"))
            {
                layer.alert("单据状态不满足开工条件!", { icon: 5 });
                return false;
            }
            layer.open({
                type: 2,
                skin: 'layui-layer-rim', //加上边框
@@ -603,6 +608,11 @@
                layer.alert("请选择工单列表", { icon: 5 });
                return false;
            }
            if (WorkStaus(HSourceID1, workcode, HSourceInterID, "完工"))
            {
                layer.alert("单据状态不满足完工条件!", { icon: 5 });
                return false;
            }
            layer.open({
                type: 2,
                skin: 'layui-layer-rim', //加上边框
@@ -636,6 +646,11 @@
        function OpenStop(event, obj) {
            if (wktag == 0) {
                layer.alert("请选择工单列表", { icon: 5 });
                return false;
            }
            if (WorkStaus(HSourceID1, workcode, HSourceInterID, "停工"))
            {
                layer.alert("单据状态不满足停工条件!", { icon: 5 });
                return false;
            }
            layer.open({
@@ -682,7 +697,7 @@
                shift: 2,
                area: ['100%', '100%'],
                maxmin: true,
                content: '生产管理/产量汇报/Sc_ProductReportBillList.html?hID=&Type=2',
                content: '生产管理/产量汇报单/Sc_ProductReportBillList.html?hID=&Type=2',
                end: function () {
                },
@@ -701,7 +716,56 @@
                },
            });
        }
        //单据状态验证
        function WorkStaus(HSourceID1, workcode,HSourceInterID,btn)
        {
            var flag = false;
            var sWhere = "";
            switch (btn) {
                case "开工":
                    sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID+"' and hicmostatus not in('0')";   //开工状态
                    break;
                case "完工":
                    sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID +"' and hicmostatus not in('1','2')";   //完工状态
                    break;
                case "停工":
                    sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID +"' and hicmostatus not in('1')";   //停工挂起状态
                    break;
                case "汇报":
                    html1 = '';
                    break;
                case "报检申请":
                    break;
                default:
            }
            $.ajax({
                url: GetWEBURL() + "/Sc_MESBeginWorkBill/GetMESBeginWorkBillStaus",
                type: "GET",
                data: { "sWhere": sWhere},
                dataType: "json",//数据类型可以为 text xml json  script  jsonp
                async: false,
                success: function (data) {
                    if (data.count > 0)
                    {
                        flag = true;
                    }
                    else {
                        flag =false;
                    }
                },
                error: function (err)
                {
                    flag = false;
                }
            });
            console.log(flag);
            return flag;
        }
    </script>
</head>
@@ -741,7 +805,7 @@
                <div class="layui-tab layui-tab-card" lay-filter="TabTest">
                    <ul class="layui-tab-title">
                        <li class="layui-this">工单列表</li>
                        <li>效率/不良分析</li>
                        <li style="pointer-events: none; background-color:rgb(0 0 0 / 10%);">效率/不良分析</li>
                    </ul>
                    <div class="layui-tab-content content3">
                        <div class="layui-tab-item layui-show">
WebTM/views/Éú²ú¹ÜÀí/²úÁ¿»ã±¨µ¥/Sc_ProductReportBillList.html
@@ -22,15 +22,16 @@
    <div class="layui-fluid">
        <div class="layui-col-md12">
            <div class="layui-card" style="padding: 1px">
                <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="Exit"><i class="layui-icon layui-icon-add"></i>退出</button>
                    <span style="margin:0 30%;font-size:24px;font-weight:bold;">产量汇报</span>
                </div>
                <div class="layui-card-body" style="padding: 1px;">
                    <form class="layui-form" action="" lay-filter="component-form-group">
                <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="Exit"><i class="layui-icon layui-icon-add"></i>退出</button>
                        <span style="margin:0 30%;font-size:24px;font-weight:bold;">产量汇报</span>
                    </div>
                    <div class="layui-card-body" style="padding: 1px;">
                        <div class="layui-collapse">
                            <div class="layui-colla-item">
                                <div class="layui-colla-title layui-inline">
@@ -63,7 +64,7 @@
                                        <input type="text" class="layui-input" name="Part" id="Part" style="width:190px;">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
@@ -103,8 +104,8 @@
                            </div>
                        </script>
                    </form>
                </div>
                    </div>
                </form>
            </div>
        </div>
    </div>
@@ -193,7 +194,7 @@
            var index = layer.load(0, { shade: false });
            //有源单新增
            if (Type != 2)
            if (Type == 2)
            {
                sWhere = " where a.HSourceID='" + HSourceID + "' and a.HICMOBillNo='" + workcode + "'";
                //进入页面显示的缓存列表
@@ -257,6 +258,47 @@
                }
            })
            //申请检验
            form.on('submit(AskReport)', function (data)
            {
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                //if (!AllowLoadData(sSubStr))//数据验证
                //{
                //    return false;
                //}
                $.ajax(
                    {
                        type: "POST",
                        url: GetWEBURL() + "/Sc_ICMOReportBill/SaveGetICMOReportBillList", //方法所在页面和方法名
                        async: true,
                        data: { "msg": sMainSub },
                        dataType: "json",
                        success: function (data) {
                            if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
                                    layer.close(layer.index);
                                    window.parent.location.reload();
                                });
                            }
                            else {
                               layer.alert(data.Message, { icon: 5 })
                            }
                        },
                        error: function (err) {
                            layer.alert(data.Message, { icon: 5 })
                        }
                    });
            })
            //退出
            //删除按钮
            form.on('submit(Exit)', function (data) {
                var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
                parent.layer.close(index); //再执行关闭
            })
            //重置按钮
            form.on('submit(btnReSearch)', function (data) {
                $("#HDate").val("");//开始日期
@@ -267,46 +309,48 @@
            });
            //查询按钮
            form.on('submit(btnSearch)', function (data) {
                var HDate = $("#HDate").val();//开始日期
                var HDate1 = $("#HDate1").val();//结束日期
                var HBillNo = $("#HBillNo").val(); //单据号
                var Part = $("#Part").val();       //物料信息
                var Source = $("#Source").val();  //资源
                if (HDate) {
                    sWhere += " and CONVERT(varchar(100),a.HDate, 23) >= '" + HDate + "'";
                }
                if (HDate1) {
                    sWhere += " and CONVERT(varchar(100),a.HDate, 23) <= '" + HDate1 + "'";
                }
                if (HBillNo) {
                    sWhere += " and a.HBillNo like '%" + HBillNo + "%'";
                }
                if (Part) {
                    sWhere += " and concat(m.HNumber,m.HName,m.HModel) like '%" + Part + "%'";
                }
                if (Source) {
                    sWhere += " and s.HName like '%" + Dept + "%'";
                }
                $.ajax({
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                    url: GetWEBURL() + '/Sc_ICMOReportBill/list',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
                            table.render(option);
                            layer.alert("查询成功", { icon: 1 });
                        } else {
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
            if (Type == 2) {
                form.on('submit(btnSearch)', function (data) {
                    var HDate = $("#HDate").val();//开始日期
                    var HDate1 = $("#HDate1").val();//结束日期
                    var HBillNo = $("#HBillNo").val(); //单据号
                    var Part = $("#Part").val();       //物料信息
                    var Source = $("#Source").val();  //资源
                    if (HDate) {
                        sWhere += " and CONVERT(varchar(100),a.HDate, 23) >= '" + HDate + "'";
                    }
                    if (HDate1) {
                        sWhere += " and CONVERT(varchar(100),a.HDate, 23) <= '" + HDate1 + "'";
                    }
                    if (HBillNo) {
                        sWhere += " and a.HBillNo like '%" + HBillNo + "%'";
                    }
                    if (Part) {
                        sWhere += " and concat(m.HNumber,m.HName,m.HModel) like '%" + Part + "%'";
                    }
                    if (Source) {
                        sWhere += " and s.HName like '%" + Dept + "%'";
                    }
                    $.ajax({
                        //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                        url: GetWEBURL() + '/Sc_ICMOReportBill/DeltetICMOReportBill',
                        type: "GET",
                        data: { "sWhere": sWhere },
                        success: function (data1) {
                            if (data1.count == 1) {
                                option.data = data1.data;
                                table.render(option);
                                layer.alert("查询成功", { icon: 1 });
                            } else {
                                layer.alert(data1.code + data1.Message, { icon: 5 });
                            }
                        }, error: function () {
                            layer.alert("接口请求失败!", { icon: 5 });
                        }
                    });
                    sWhere = "";//调用接口后清空sWhere缓存
                });
                sWhere = "";//调用接口后清空sWhere缓存
            });
            }
            //以上是layui模块
        });
WebTM/views/Éú²ú¹ÜÀí/Éú²úÍ£¹¤µ¥/Sc_Add_MESStopWorkBillList.html
@@ -164,7 +164,7 @@
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">生产订单:</label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HICMOBillNo " lay-verify="HICMOBillNo " id="HICMOBillNo " autocomplete="off">
                                                            <input class="layui-input" name="HICMOBillNo" lay-verify="HICMOBillNo" id="HICMOBillNo" autocomplete="off">
                                                            <input id="HICMOInterID" name="HICMOInterID" type="hidden" />
                                                            <input id="HICMOEntryID" name="HICMOEntryID" type="hidden" />
                                                        </div>
@@ -469,7 +469,7 @@
                        success: function (data) {
                            if (data.count == 1)// è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            {
                                var LoadData = data.data.h_p_JIT_GetSourceInfoByUser;
                                var LoadData = data.data.h_p_JIT_GetInfoByICMOStatusInterID;
                                $("#HProcID").val(LoadData[0].HProcID); //当前工序ID
                                $("#HProcName").val(LoadData[0].HProcName); //当前工序
                                $("#HMaterID").val(LoadData[0].HMaterID); //产品ID
@@ -478,8 +478,8 @@
                                $("#HMaterSpec").val(LoadData[0].HModel); //产品规格
                                $("#HSourceID").val(LoadData[0].HSourceID); //生产资源ID
                                $("#HSourceName").val(LoadData[0].HSourceName); //生产资源
                                $("#HMainSourceBillNo").val(LoadData[0].HSourceBillNo); //源单单号
                                $("#HMainSourceInterID").val(LoadData[0].HSourceInterID); //源单主内码
                                $("#HMainSourceBillNo").val(LoadData[0].HICMOBillNo); //源单单号(暂时取值订单编号)
                                $("#HMainSourceInterID").val(LoadData[0].HSourceInterID); //源单主内码(取值HInterID)
                                $("#HMainSourceEntryID").val(LoadData[0].HSourceEntryID); //源单子内码(源单行号)
                                $("#HMainSourceBillType").val(HSourceBillType); //源单类型
                                $("#HDeptID").val(LoadData[0].HDeptID); //车间ID
WebTM/views/Éú²ú¹ÜÀí/Éú²úÍ깤µ¥/Sc_Add_MESEndWorkBillList.html
@@ -211,7 +211,7 @@
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">生产订单:</label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HICMOBillNo " lay-verify="HICMOBillNo " id="HICMOBillNo " autocomplete="off">
                                                            <input class="layui-input" name="HICMOBillNo" lay-verify="HICMOBillNo" id="HICMOBillNo" autocomplete="off">
                                                            <input id="HICMOInterID" name="HICMOInterID" type="hidden" />
                                                            <input id="HICMOEntryID" name="HICMOEntryID" type="hidden" />
                                                        </div>
@@ -444,7 +444,7 @@
                        success: function (data) {
                            if (data.count == 1)// è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            {
                                var LoadData = data.data.h_p_JIT_GetSourceInfoByUser;
                                var LoadData = data.data.h_p_JIT_GetInfoByICMOStatusInterID;
                                $("#HProcID").val(LoadData[0].HProcID); //当前工序ID
                                $("#HProcName").val(LoadData[0].HProcName); //当前工序
                                $("#HMaterID").val(LoadData[0].HMaterID); //产品ID
@@ -453,8 +453,8 @@
                                $("#HMaterSpec").val(LoadData[0].HModel); //产品规格
                                $("#HSourceID").val(LoadData[0].HSourceID); //生产资源ID
                                $("#HSourceName").val(LoadData[0].HSourceName); //生产资源
                                $("#HMainSourceBillNo").val(LoadData[0].HSourceBillNo); //源单单号
                                $("#HMainSourceInterID").val(LoadData[0].HSourceInterID); //源单主内码
                                $("#HMainSourceBillNo").val(LoadData[0].HICMOBillNo); //源单单号(暂时取值订单编号)
                                $("#HMainSourceInterID").val(LoadData[0].HSourceInterID); //源单主内码(取值HInterID)
                                $("#HMainSourceEntryID").val(LoadData[0].HSourceEntryID); //源单子内码(源单行号)
                                $("#HMainSourceBillType").val(HSourceBillType); //源单类型
                                $("#HDeptID").val(LoadData[0].HDeptID); //车间ID
WebTM/views/Éú²ú¹ÜÀí/Éú²ú¿ª¹¤µ¥/Sc_Add_MESBeginWorkBillList.html
@@ -86,7 +86,7 @@
                        <div class="layui-card-header">
                            <div class="layui-btn-group">
                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">保存</button>
                                <button type="button" id="Saver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">保存</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">退出</button>
                            </div>
@@ -182,7 +182,7 @@
                                                        <label class="layui-form-label">源单类型</label>
                                                        <div class="layui-input-inline">
                                                            <select name="SourceType" lay-filter="SourceType" id="SourceType">
                                                                <option value="0" selected="selected">生产任务单</option>
                                                                <option value="2" selected="selected">生产任务单</option>
                                                                <option value="1">手工录入</option>
                                                            </select>
                                                        </div>
@@ -229,7 +229,7 @@
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">生产订单:</label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HICMOBillNo " lay-verify="HICMOBillNo " id="HICMOBillNo " autocomplete="off">
                                                            <input class="layui-input" name="HICMOBillNo" lay-verify="HICMOBillNo" id="HICMOBillNo" autocomplete="off">
                                                            <input id="HICMOInterID" name="HICMOInterID" type="hidden" />
                                                            <input id="HICMOEntryID" name="HICMOEntryID" type="hidden" />
                                                        </div>
@@ -458,7 +458,7 @@
                        success: function (data) {
                            if (data.count == 1)// è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            {
                                var LoadData = data.data.h_p_JIT_GetSourceInfoByUser;
                                var LoadData = data.data.h_p_JIT_GetInfoByICMOStatusInterID;
                                $("#HProcID").val(LoadData[0].HProcID); //当前工序ID
                                $("#HProcName").val(LoadData[0].HProcName); //当前工序
                                $("#HMaterID").val(LoadData[0].HMaterID); //产品ID
@@ -467,8 +467,8 @@
                                $("#HMaterSpec").val(LoadData[0].HModel); //产品规格
                                $("#HSourceID").val(LoadData[0].HSourceID); //生产资源ID
                                $("#HSourceName").val(LoadData[0].HSourceName); //生产资源
                                $("#HMainSourceBillNo").val(LoadData[0].HSourceBillNo); //源单单号
                                $("#HMainSourceInterID").val(LoadData[0].HSourceInterID); //源单主内码
                                $("#HMainSourceBillNo").val(LoadData[0].HICMOBillNo); //源单单号(暂时取值订单编号)
                                $("#HMainSourceInterID").val(LoadData[0].HSourceInterID); //源单主内码(取值HInterID)
                                $("#HMainSourceEntryID").val(LoadData[0].HSourceEntryID); //源单子内码(源单行号)
                                $("#HMainSourceBillType").val(HSourceBillType); //源单类型
                                $("#HDeptID").val(LoadData[0].HDeptID); //车间ID
@@ -491,6 +491,7 @@
            //保存提交
            form.on('submit(Saver)', function (data) {
                alert("aa");
                var sMainStr = JSON.stringify(data.field);
                if (!AllowLoadData())//数据验证
                {
@@ -498,7 +499,7 @@
                }
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "/Sc_ICMOReportBill/SaveGetICMOReportBillList", //方法所在页面和方法名
                    url: GetWEBURL() + "/Sc_MESBeginWorkBill/SaveGetMESBeginWorkFrom", //方法所在页面和方法名
                    async: true,
                    data: { "msg": sMainStr },
                    dataType: "json",