yangle
2022-09-06 8b2aacd9782c5a11c10eb959ebe2793a832af334
Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
3个文件已修改
1个文件已添加
285 ■■■■■ 已修改文件
WebTM/WebTM.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/PublicPage/GroupInformation.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeIssue.html 223 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeIssueBillList.html 59 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj
@@ -995,6 +995,7 @@
    <Content Include="views\车间管理\工序出站汇报单\Sc_StationOutBill_Mul_PDA.html" />
    <Content Include="views\车间管理\工序出站汇报单\Sc_StationOutBill_Mul.html" />
    <Content Include="views\车间管理\工序出站汇报单\Cj_StationOutBillList.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeIssue.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeBill.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeIssueBillList.html" />
    <Content Include="views\车间管理\工序进站接收单\Cj_StationInBill.html" />
WebTM/views/PublicPage/GroupInformation.html
@@ -134,8 +134,6 @@
            //        });
            //    }
            //});
            var option = {
                elem: '#mainTable'
                //, toolbar: '#toolbarDemo'
WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeIssue.html
New file
@@ -0,0 +1,223 @@
<!DOCTYPE html>
<html>
<head>
    <meta charset="utf-8" />
    <title>工序流转卡</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <style>
    </style>
</head>
<body>
    <div class="layui-fluid" style="padding: 0;">
        <div class="layui-card" style="padding: 15px;">
            <div class="layui-card-body" style="padding: 1px;">
                <form class="layui-form" lay-filter="component-form-group" action="">
                    <div class="layui-card-header">
                        <div class="layui-btn-group">
                            <button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btnSave">确认</button>
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">退出</button>
                        </div>
                    </div>
                    <div class="layui-tab" lay-filter="tab-POStockInBill">
                        <div class="layui-tab-content">
                            <div class="layui-form-item" style="padding-top: 10px;">
                                <div class="layui-row">
                                    <div class="layui-col-xs12 layui-inline">
                                        <label class="layui-form-label">班组</label>
                                        <div class="layui-input-inline">
                                            <input type="text" class="layui-input" name="HGroupName" id="HGroupName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
                                            <input type="hidden" name="HGroupID" id="HGroupID" value="0">
                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHGroup" id="btnSearchHGroup" style="width: 40px;">
                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                            </button>
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-row">
                                    <div class="layui-col-xs12 layui-inline">
                                        <label class="layui-form-label">生产资源</label>
                                        <div class="layui-input-inline">
                                            <input type="text" class="layui-input" name="HSourceName" id="HSourceName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
                                            <input type="hidden" name="HSourceID" id="HSourceID" value="0">
                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHSource" id="btnSearchHSource" style="width: 40px;">
                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                            </button>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                    </div>
                    <script type="text/html" id="toolbarDemo">
                    </script>
                    <input id="HItemID" name="HItemID" type="hidden" />
                </form>
            </div>
        </div>
    </div>
    <script type="text/html" id="barDemo">
        <!--<a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>-->
        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
    </script>
    <!--行下拉选择(是否委外)-->
    <script type="text/html" id="isEntrust">
        <select name="isEntrust" lay-filter="isEntrust" id="isEntrust{{d.LAY_TABLE_INDEX+1}}">
            <option value="false">否</option>
            <option value="true">是</option>
        </select>
    </script>
    <script>
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index' //主入口模块
        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , laydate = layui.laydate
                , element = layui.element;
            //判断是否登录 æœªç™»å½•则跳到登录页
            //if (sessionStorage.login != "login") {
            //    layer.confirm("登录失效,请重新登录!", {
            //        icon: 4, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['重新登录']
            //    }, function () { window.location.href = "../../user/login.html"; });
            //}
            //获取页面跳转参数
            var params = get_UrlVars();
            var linterid = params[params[0]];//源单id
            $("#HItemID").val(linterid);
            //#region è¿›å…¥é¡µé¢å³åŠ è½½
            form.on('submit(btnSearchHSource)', function () {//生产资源
                layer.open({
                    type: 2
                    , area: ['80%', '80%']
                    , title: '生产资源'
                    , shade: 0.6 //遮罩透明度
                    //, maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../基础资料/生产基础资料/Gy_Source.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('请选择数据');
                        }
                        $("#HSourceName").val(checkStatus.data[0].生产资源名称);
                        $("#HSourceID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {
                    },
                    success: function (layero, index) {
                    }
                })
            });
            form.on('submit(btnSearchHGroup)', function () {//班组
                layer.open({
                    type: 2
                    , area: ['80%', '80%']
                    , title: '班组'
                    , shade: 0.6 //遮罩透明度
                    //, maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../PublicPage/GroupInformation.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('请选择数据');
                        }
                        $("#HGroupName").val(checkStatus.data[0].HName);
                        $("#HGroupID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {
                    },
                    success: function (layero, index) {
                    }
                })
            });
            //保存提交
            form.on('submit(btnSave)', function (data) {//提交
                var HGroupID = $("#HGroupID").val();
                var HSourceID = $("#HSourceID").val();
                if (HGroupID == 0 || HSourceID == 0) {
                    layer.msg("请选择班组和生产资源", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                var index = layer.load();
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/LEMS/MES_Sc_ProcessExchangeIssue",
                    async: true,
                    data: { "HGroupID": HGroupID, "HSourceID": HSourceID, "HEntryId": $("#HItemID").val() },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) {
                            layer.close(index);
                            layer.msg("提交成功");
                            $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//保存按钮禁用
                        }
                        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: "温馨提示" });
                    }
                });
            });
            //退出
            form.on('submit(Cancel)', function () {
                Pub_Close(1);
            })
            //以上为layui模块
        });
        //定义全局变量HMainMaterID
        var subProcName, subProcNumber, subProcID,
            subWorkCenterName, subWorkCenterNumber, subWorkCenterID,
            subSupName, subSupNumber, subSupID,
            HReasonName, ReasonID, EmpName,
            ZRProcName, QRName;
    </script>
</body>
</html>
WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeIssueBillList.html
@@ -92,6 +92,7 @@
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Issue"><i class="layui-icon layui-icon-file-b"></i>下达</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-file-b"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_StationOut"><i class="layui-icon layui-icon-form"></i>工序出站汇报单</button>-->
@@ -152,6 +153,9 @@
                        break;
                    //编辑
                    case 'set_ShowBill': set_ShowBill();
                        break;
                    //下达
                    case 'set_Issue': set_Issue();
                        break;
                    //删除
                    case 'set_DeleteBill': set_DeleteBill();
@@ -292,7 +296,9 @@
                    , limits: [50, 500, 5000, 20000]
                    , cols: [[
                        { type: 'checkbox', fixed: 'left' }
                        , { field: 'hmainid', title: 'hmainid', width: 90, hide: true}
                        , { field: 'hmainid', title: 'hmainid', width: 90, hide: true }
                        , { field: 'HEntryID', title: 'HEntryID', width: 90, hide: true }
                        , { field: '下达状态', title: '下达状态' }
                        , { field: '打印次数', title: '打印次数' }
                        , { field: '类型', title: '类型' }
                        , {
@@ -305,10 +311,10 @@
                        }
                        , { field: '订单跟踪号', title: '订单跟踪号', width: 120 }
                        , { field: '单据号', title: '单据号', width: 190 }
                        , { field: 'hicmointerid', title: 'hicmointerid', width: 80, hide: true}
                        , { field: 'hicmointerid', title: 'hicmointerid', width: 80, hide: true }
                        , { field: '任务单号', title: '任务单号', width: 140 }
                        , { field: 'HWorkShopID', title: 'HWorkShopID', width: 80, hide: true}
                        , { field: 'HDeptID', title: 'HDeptID', width: 80, hide: true}
                        , { field: 'HWorkShopID', title: 'HWorkShopID', width: 80, hide: true }
                        , { field: 'HDeptID', title: 'HDeptID', width: 80, hide: true }
                        , { field: '生产车间代码', title: '生产车间代码', width: 115 }
                        , { field: '生产车间', title: '生产车间' }
                        , { field: '流水号', title: '流水号' }
@@ -317,17 +323,17 @@
                        , { field: '工序名称', title: '工序名称' }
                        , { field: '流转卡数量', title: '流转卡数量', width: 100 }
                        , { field: '委外标记', title: '委外标记' }
                        , { field: 'HMaterID', title: 'HMaterID', width: 80, hide: true}
                        , { field: 'HMaterID', title: 'HMaterID', width: 80, hide: true }
                        , { field: '子件代码', title: '子件代码' }
                        , { field: '子件名称', title: '子件名称' }
                        , { field: '子件规格', title: '子件规格' }
                        , { field: '批号', title: '批号' }
                        , { field: '原料批次号', title: '原料批次号' }
                        , { field: 'HMaterID2', title: 'HMaterID2', width: 80, hide: true}
                        , { field: 'HMaterID2', title: 'HMaterID2', width: 80, hide: true }
                        , { field: '产品代码', title: '产品代码' }
                        , { field: '产品名称', title: '产品名称' }
                        , { field: '规格型号', title: '规格型号' }
                        , { field: 'HUnitID', title: 'HUnitID', width: 80, hide: true}
                        , { field: 'HUnitID', title: 'HUnitID', width: 80, hide: true }
                        , { field: '单位代码', title: '单位代码' }
                        , { field: '单位', title: '单位' }
                        , { field: '设备模具代码', title: '设备模具代码' }
@@ -349,8 +355,8 @@
                        , { field: '关闭日期', title: '关闭日期' }
                        , { field: '作废人', title: '作废人' }
                        , { field: '作废日期', title: '作废日期' }
                        , { field: 'HBillType', title: 'HBillType', width: 80, hide: true}
                        , { field: 'hsubid', title: 'hsubid', width: 80, hide: true}
                        , { field: 'HBillType', title: 'HBillType', width: 80, hide: true }
                        , { field: 'hsubid', title: 'hsubid', width: 80, hide: true }
                        , { field: '拆分数量', title: '拆分数量' }
                        , { field: '源单客户编码', title: '源单客户编码', width: 80 }
                        , { field: '包装标识', title: '包装标识', width: 80 }
@@ -363,10 +369,10 @@
            function get_Display(sWhere) {
                sWhere += " and HPRDORGID=" + sessionStorage["OrganizationID"] + " ";
                var ajaxLoad = layer.load();
                $.ajax({
                $.ajax({
                    url: GetWEBURL() + '/LEMS/MES_Sc_ProcessExchangeIssueBillList_Json',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
@@ -381,7 +387,7 @@
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
                });
                DisPlay_HideColumn();
            }
@@ -501,7 +507,7 @@
                $.ajax({
                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                    type: "GET",
                    data: { "HModName": HModName+"_Sec", "user": sessionStorage["HUserName"] },
                    data: { "HModName": HModName + "_Sec", "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.data.length != 0) {
@@ -613,6 +619,31 @@
            }
            //#endregion
            //#region ä¸‹è¾¾
            function set_Issue() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 0) {
                    layer.msg('请选择需要下达的数据!');
                    return;
                }
                var linterid = "";
                for (var i = 0; i < data.length; i++) {
                    linterid += data[i].hmainid + "-" + data[i].HEntryID + ",";
                }
                linterid = linterid.substring(0, linterid.length - 1);
                //if (AllowLoadData(sSubStr) != false) {//非空验证
                layer.open({
                    type: 2
                    //, area: ['30%', '40%']
                    , area: ['100%', '100%']
                    , title: '工序列表-下达'
                    , shift: 0//弹出动画
                    , content: '../工序流转卡/Sc_ProcessExchangeIssue.html?linterid=' + linterid
                })
            }
            //#endregion
            //删除
            function set_DeleteBill() {
                var checkStatus = table.checkStatus('mainTable')
@@ -711,7 +742,7 @@
                            , content: '../../车间管理/工序出站汇报单/Cj_StationOutBill.html?OperationType=2&HBillNo=' + HBillNo + '&HProcNo=' + HProcNo
                        })
                    }
                } else {
                    layer.msg('请选择一行数据下推!');
                }