批量复制流转卡;
出站单模块增加一个字段,白坯发布,在pda手工去填写
8个文件已修改
1个文件已添加
323 ■■■■ 已修改文件
WebTM/WebTM.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/PublicPage/PowerInformation.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/index_QiaoYi.html 44 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/系统管理/用户管理/Xt_UserGroupList.html 32 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/系统管理/用户管理/Xt_UserList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转/MES_StationOutBill_PDA_QiaoYi.html 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html 32 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill_Copy_PL.html 174 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj
@@ -205,6 +205,7 @@
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcExchRecordBackBillList.aspx" />
    <Content Include="views\条码明细\Kf_BarCodeDetailQuery.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillListQuery.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeBill_Copy_PL.html" />
    <Content Include="views\车间管理\报表分析\Sc_WorkShopProcessWIPSumReport.html" />
    <Content Include="views\车间管理\报表分析\Sc_WorkShopProcessWIPReport.html" />
    <Content Include="views\车间管理\报表分析\Sc_EmployeePieceWorkReport.html" />
WebTM/views/PublicPage/PowerInformation.html
@@ -259,7 +259,7 @@
                    return false;
                }
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sMainSub = TagId + ';' + sSubStr + ';' + linterid;
                var sMainSub = TagId + ';' + sSubStr + ';' + linterid + ";" + HSouceBillType;
                //console.log(sMainSub);
                //return false;
                $.ajax(
@@ -295,7 +295,7 @@
                $.ajax({
                    url: GetWEBURL() + '/PublicPageMethod/PowerList',
                    type: "GET",
                    data: { "czybm": linterid, "sGnbm": sGnbm },
                    data: { "czybm": linterid, "sGnbm": sGnbm, "HSouceBillType": HSouceBillType},
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
WebTM/views/index_QiaoYi.html
@@ -1146,31 +1146,31 @@
                window.location.href = 'index_Mobile_QiaoYi.html'
            }
            $("#LAY_app_flexible").click();
           /* $("#LAY_app_flexible").click();*/
        });
        var timer;
        var dom;
        //移入时触发事件(不包含子元素)
        fouce.onmouseenter = function (event) {
            dom = $("#LAY_app_flexible").attr('class');
            //关闭定时器
            clearInterval(timer);
            if (dom == "layui-icon layui-icon-spread-left") {
                $("#LAY_app_flexible").click();
            }
        }
        //移出时触发事件(不包含子元素)
        fouce.onmouseleave = function (event) {
            dom = $("#LAY_app_flexible").attr('class');
            if (dom == "layui-icon layui-icon-shrink-right") {
                //倒计时关闭
                timer = setTimeout(function () {
                    $("#LAY_app_flexible").click();
                }, 3000);
            }
        }
        //var timer;
        //var dom;
        ////移入时触发事件(不包含子元素)
        //fouce.onmouseenter = function (event) {
        //    dom = $("#LAY_app_flexible").attr('class');
        //    //关闭定时器
        //    clearInterval(timer);
        //    if (dom == "layui-icon layui-icon-spread-left") {
        //        $("#LAY_app_flexible").click();
        //    }
        //}
        ////移出时触发事件(不包含子元素)
        //fouce.onmouseleave = function (event) {
        //    dom = $("#LAY_app_flexible").attr('class');
        //    if (dom == "layui-icon layui-icon-shrink-right") {
        //        //倒计时关闭
        //        timer = setTimeout(function () {
        //            $("#LAY_app_flexible").click();
        //        }, 3000);
        //    }
        //}
WebTM/views/ϵͳ¹ÜÀí/Óû§¹ÜÀí/Xt_UserGroupList.html
@@ -299,22 +299,22 @@
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].HGroupID;
                    //layer.open({
                    //    type: 2
                    //    , skin: 'layui-layer-rim' //加上边框
                    //    , area: ['100%', '100%']
                    //    , title: '角色权限关联'
                    //    , closeBtn: 1
                    //    , shade: 0.6 //遮罩透明度
                    //    , maxmin: true //允许全屏最小化
                    //    , anim: 0 //0-6的动画形式,-1不开启
                    //    , content: '../../PublicPage/PowerInformation.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                    //    , resize: false,
                    //    end: function () {
                    //        //刷新页面,
                    //        location.reload();
                    //    }
                    //})
                    layer.open({
                        type: 2
                        , skin: 'layui-layer-rim' //加上边框
                        , area: ['100%', '100%']
                        , title: '角色权限关联'
                        , closeBtn: 1
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式,-1不开启
                        , content: '../../PublicPage/PowerInformation.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=js'
                        , resize: false,
                        end: function () {
                            //刷新页面,
                            location.reload();
                        }
                    })
                } else {
                    layer.msg('请选择一行数据编辑!');
WebTM/views/ϵͳ¹ÜÀí/Óû§¹ÜÀí/Xt_UserList.html
@@ -349,7 +349,7 @@
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式,-1不开启
                        , content: '../../PublicPage/PowerInformation.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                        , content: '../../PublicPage/PowerInformation.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=yh'
                        , resize: false,
                        end: function () {
                            //刷新页面,
WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת/MES_StationOutBill_PDA_QiaoYi.html
@@ -168,6 +168,12 @@
                                                </td>
                                            </tr>
                                            <tr>
                                                <th>白坯发布</th>
                                                <td class="bz_td">
                                                    <input type="text" name="HmaterOutqty" class="layui-input" id="HmaterOutqty" value="0" style="border-radius: 50px; background-color: #efefef4d;" readonly>
                                                </td>
                                            </tr>
                                            <tr>
                                                <th>生产资源</th>
                                                <td class="bz_td">
                                                    <input type="text" name="HSourceName" class="layui-input" id="HSourceName" placeholder="选择生产资源" style="border-radius: 50px;">
@@ -1188,6 +1194,8 @@
                            });
                            if (data.首道工序 == "是") {
                                FirstEndHProcNo = 1;
                                $("#HmaterOutqty").attr("readonly", false);
                                $("#HmaterOutqty").css("background", "");
                            } else if (data.末道工序 == "是") {
                                FirstEndHProcNo = 2;
                            }
WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBill.html
@@ -126,7 +126,7 @@
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">产品规格</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HMaterModel2" id="HMaterModel2" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
                                                <input type="text" class="layui-input" name="HMaterModel2" id="HMaterModel2" onmouseover="this.title=this.value" style="">
                                            </div>
                                        </div>
                                        <!--<div class="layui-col-xs3 layui-inline">
@@ -200,7 +200,7 @@
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">幅宽</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HWidth" id="HWidth" style="float: left; background-color: #efefef4d; display: inline-block;" readonly>
                                                <input type="text" class="layui-input" name="HWidth" id="HWidth" style="float: left;" >
                                            </div>
                                        </div>
@@ -280,7 +280,7 @@
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">克重</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HWeight" id="HWeight" style="float: left; background-color: #efefef4d; display: inline-block;" readonly>
                                                <input type="text" class="layui-input" name="HWeight" id="HWeight" style="float: left;">
                                            </div>
                                        </div>
                                        
@@ -1790,6 +1790,30 @@
                    }
                }
                var HWidth = $('#HWidth').val();
                if (HWidth.substring(HWidth.length - 1, HWidth.length) == ".") {
                    layer.msg("幅宽的结尾不能是.!");
                    return;
                } else {
                    var ref = /^[0-9]+$/;
                    if (!ref.test(HWidth)) {
                        layer.msg("幅宽请输正确入数字!");
                        return;
                    }
                }
                var HWeight = $('#HWeight').val();
                if (HWeight.substring(HWeight.length - 1, HWeight.length) == ".") {
                    layer.msg("克重的结尾不能是.!");
                    return;
                } else {
                    var ref = /^[0-9]+$/;
                    if (!ref.test(HWeight)) {
                        layer.msg("克重请输正确入数字!");
                        return;
                    }
                }
                var HSplitNo = $('#HSplitNo').val();
                if (HSplitNo.substring(HSplitNo.length - 1, HSplitNo.length) == ".") {
                    layer.msg("拆分号的结尾不能是.!");
@@ -2080,7 +2104,7 @@
                                , "HAuxUnit": data.HAuxUnit
                                , "HAuxUnitName": data.辅助单位
                                , "HSplitNo": data.拆分号
                                , "HRemark2": data.备注2
                                , "HRemark2": data.白坯要求
                                , "HRemark3": data.底部备注
                                , "HEmpID": data.HEmpID
                                , "HEmpName": data.业务员
WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBillList.html
@@ -130,6 +130,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy"><i class="layui-icon layui-icon-form"></i>复制</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy_pl"><i class="layui-icon layui-icon-form"></i>批量复制</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_cf"><i class="layui-icon layui-icon-form"></i>拆分</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_view"><i class="layui-icon layui-icon-tips"></i>预览</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_print"><i class="layui-icon layui-icon-print"></i>打印</button>
@@ -232,8 +233,11 @@
                    case 'set_DeleteBill': set_DeleteBill();
                        break; 
                    //复制
                    case 'set_Copy': set_Copy();
                        break;
                    case 'set_Copy': set_Copy();
                        break;
                    //批量复制
                    case 'set_Copy_pl': set_Copy_pl();
                        break;
                    //拆分
                    case 'set_cf': set_cf();
                        break;
@@ -1551,6 +1555,24 @@
                }
            }
            //批量复制
            function set_Copy_pl() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length == 1) {
                    var linterid = data[0].hmainid;
                    layer.open({
                        type: 2
                        , area: ['40%', '40%']
                        , title: '工序流转卡-批量复制'
                        , shift: 0//弹出动画
                        , content: '../工序流转卡/Sc_ProcessExchangeBill_Copy_PL.html?OperationType=plfz&linterid=' + linterid
                    })
                } else {
                    layer.msg('请选择一行数据!');
                }
            }
            //拆分
            function set_cf() {
                var checkStatus = table.checkStatus('mainTable')
WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBill_Copy_PL.html
New file
@@ -0,0 +1,174 @@
<!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>
        .main-btn { /*头部主按钮*/
            padding: 0 2px; /*调整按钮左右空隙大小*/
            height: 30px;
            line-height: 30px;
        }
        .btn-title {
            font-size: 16px;
        }
        /* é˜²æ­¢ä¸‹æ‹‰æ¡†çš„下拉列表被隐藏---必须设置--- */
        .layui-table-cell {
            overflow: visible !important;
        }
        /* ä½¿å¾—下拉框与单元格刚好合适 */
        td .layui-form-select {
            margin-top: -10px;
            margin-left: -15px;
            margin-right: -15px;
        }
        .layui-form-item .layui-inline {
            margin-top: 0px;
            margin-bottom: 5px;
            margin-right: 0px;
        }
        .layui-form-label {
            width: 25%;
        }
    </style>
</head>
<body>
    <div class="layui-fluid" style="padding: 0;">
        <div class="layui-card" style="padding: 5px;">
            <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-tab-item layui-show">
                                <div class="layui-form-item" style="padding-top: 3px;">
                                    <div class="layui-row">
                                        <div class="layui-col-xs6 layui-inline">
                                            <label class="layui-form-label">复制数量</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HNumber" id="HNumber">
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                    </div>
                </form>
            </div>
        </div>
    </div>
    <script>
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index' //主入口模块
        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
            //#region å…¬å…±å˜é‡
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , laydate = layui.laydate
                , element = layui.element;
            var option = [];
            var linterid = "";
            //#endregion
            //#region è¿›å…¥é¡µé¢å³åŠ è½½
            //判断是否登录 æœªç™»å½•则跳到登录页
            //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 OperationType = params[params[0]];//操作类型
            //判断操作类型
            if (OperationType == "plfz") {//无源单新增
                linterid = params[params[1]]
            }
            else {
                layer.alert("未知操作类型!", { icon: 5 });
            }
            //#endregion
            //#region è§¦å‘事件:包括form.on(){}格式的所有点击事件、选择事件等
            form.on('submit(btnSave)', function (data) {//提交
                btnSave();
            })
            //退出
            form.on('submit(Cancel)', function () {
                //关闭弹窗
                Pub_Close(1);
            })
             //#endregion
            //#region æ­¤é¡µé¢æ‰€æœ‰çš„æ–¹æ³•
            //保存
            function btnSave() {
                var sMainSub = $("#HNumber").val() + ";" + linterid + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];
                var index = layer.load();
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "/Sc_ProcessExchangeBill/AddBill_Copy_pl",
                    async: true,
                    data: { "sMainSub": sMainSub },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) {
                            layer.close(index);
                            layer.msg(data.Message);
                            $('#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: "温馨提示" });
                    }
                });
            }
             //#endregion
            //以上为layui模块
        });
    </script>
</body>
</html>