yangle
2023-04-03 ee7101021837c33d361f93657647a1f7a7b19dc9
生产订单 审核功能
进站pda 扫码自动带出工序
3个文件已修改
113 ■■■■ 已修改文件
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html 74 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转/MES_StationInBill_PDA.html 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillList.html
@@ -159,6 +159,8 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew_NT"><i class="layui-icon layui-icon-file-b"></i>新增(无列表)</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Edit_NT"><i class="layui-icon layui-icon-form"></i>编辑(无列表)</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill"><i class="layui-icon layui-icon-form"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck"><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_Excel"><i class="layui-icon layui-icon-file-b"></i>Excel导入</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
@@ -255,6 +257,12 @@
                        break;
                    //编辑(无列表)
                    case 'set_Edit_NT': set_Edit_NT();
                        break;
                    //审核
                    case 'set_CheckBill': set_CheckBill();
                        break;
                    //反审核
                    case 'set_AbandonCheck': set_AbandonCheck();
                        break;
                    //删除
                    case 'set_DeleteBill': set_DeleteBill();
@@ -1024,6 +1032,72 @@
                })
            }
            //审核
            function set_CheckBill() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (data.length == 1) {
                    layer.confirm("确认要审核吗?", function (index) {
                        var wait = layer.load();
                        var HInterID = data[0].hmainid;
                        $.ajax({
                            url: GetWEBURL() + '/Sc_ICMOBill/CheckSc_ICMOReportBill',
                            type: "GET",
                            data: { "HInterID": HInterID, "Type": 1, "user": sessionStorage["HUserName"] },
                            success: function (result) {
                                if (result.count == 1) {
                                    get_FastQuery();
                                    layer.msg(result.Message, { icon: 1 });
                                    layer.close(wait);
                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                    layer.close(wait);
                                }
                            }, error: function () {
                                layer.alert("接口请求失败!", { icon: 5 });
                                layer.close(wait);
                            }
                        });
                    })
                } else {
                    layer.msg("请选择一条数据!");
                }
            }
            //反审核
            function set_AbandonCheck() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (data.length == 1) {
                    layer.confirm("确认要反审核吗?", function (index) {
                        var wait = layer.load();
                        var HInterID = data[0].hmainid;
                        $.ajax({
                            url: GetWEBURL() + '/Sc_ICMOBill/CheckSc_ICMOReportBill',
                            type: "GET",
                            data: { "HInterID": HInterID, "Type": 2, "user": sessionStorage["HUserName"] },
                            success: function (result) {
                                if (result.count == 1) {
                                    get_FastQuery();
                                    layer.msg(result.Message, { icon: 1 });
                                    layer.close(wait);
                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                    layer.close(wait);
                                }
                            }, error: function () {
                                layer.alert("接口请求失败!", { icon: 5 });
                                layer.close(wait);
                            }
                        });
                    })
                } else {
                    layer.msg("请选择一条数据!");
                }
            }
            //列明显示下拉框
            function ColFilter() {
                var Organization = '<option  value="0" selected="selected" ></option>';
WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillList.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>工艺路线列表</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
@@ -9,11 +9,10 @@
    <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>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/scripts/jquery-1.4.1.min.js"></script>
    <script src="../../../layuiadmin/pubcustom.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
</head>
<body>
    <div class="layui-fluid">
@@ -123,6 +122,7 @@
            </div>
        </div>
    </div>
    <script>
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
@@ -204,11 +204,11 @@
            //重置按钮
            form.on('submit(btnReSearch)', function (data) {
                set_ClearQuery();
            });
            //#endregion
            //#region æ­¤é¡µé¢æ‰€æœ‰çš„æ–¹æ³•
            //获取组织
@@ -251,11 +251,11 @@
                    , height: 'full-50'
                    , page: true
                    , cellMinWidth: 90
                    , limit:50
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    , cols: [[
                        { type: 'checkbox', fixed: 'left' }
                    /*    { field: 'hmainid', title: 'hmainid', width: 110 }*/
                        /*    { field: 'hmainid', title: 'hmainid', width: 110 }*/
                        , { field: '单据号', title: '单据号', sort: true, width: 165 }
                        , { field: '单据类型', title: '单据类型' }
                        , { field: '工艺名称', title: '工艺名称', width: 170 }
@@ -428,7 +428,7 @@
                else {
                    HOrgID = $("#HOrgID").val();//组织
                }
                if (HOrderProcNO) {
                    sWhere += " and å•据类型 like '%" + HOrderProcNO + "%'";
                }
@@ -476,7 +476,7 @@
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].HItemID;
                    //var linteridSub = data[0].hsubid;
                    //if (AllowLoadData(sSubStr) != false) {//非空验证
                    layer.open({
                        type: 2
WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת/MES_StationInBill_PDA.html
@@ -998,12 +998,13 @@
                                        "HCenterName": data.工作中心,
                                        "HCenterID": data.HCenterID,
                                    });
                                    HProcExchBillNoFlag = true;
                                    break;
                                case "GXLX":
                                    form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                        "HICMOInterID": data.hicmointerid,
                                        "lngICMOEntryID": data.lngICMOEntryID,
                                        "lngICMOEntryID": data.HICMOEntryID,
                                        "HICMOBillNo": data.任务单号,
                                        "HMaterID": data.HMaterID,
                                        "HMaterName": data.产品,
@@ -1017,8 +1018,20 @@
                                        "HICMOQty": data.任务单数量,
                                        "HOrderProcNO": data.订单跟踪号,
                                        "HPRDOrg": data.组织,
                                        "HPRDOrgID": data.组织
                                        "HPRDOrgID": data.组织,
                                        "HQty": data.流转卡数量,
                                    });
                                    if (data.排序号 == "乔一") {
                                        if (data.HProcID == "") {
                                            layer.msg("用户未绑定当前工序,需重新选择工序!")
                                        } else {
                                            $("#HProcNo").val(data.工序号);
                                            txtHProcNo_KeyDown(data.单据号, data.工序号);
                                        }
                                    }
                                    //$("#HBarCode").attr("readonly", "readonly");//条形码只读
                                    //$("#HBarCode").css("background-color", "#efefef4d");
                                    HProcExchBillNoFlag = true;