bklLiudl
10 小时以前 4108af346376cce285499336917fd01b2435de06
修改质检请验业务流程。
3个文件已修改
1360 ■■■■ 已修改文件
HTML/views/BaseSetting/Materials.html 1127 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/QualityControl/InspectionRequest.html 225 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/BaseSetting/Materials.html
@@ -1,133 +1,141 @@
<!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>
            // 这里是需要在页面渲染之前执行的代码
            document.addEventListener("DOMContentLoaded", function() {
                //获取table默认显示数
                pageCntFirst();
            });
          </script>
    </head>
    <body id="body">
        <div class="layui-fluid" style="padding-bottom: 0;">
            <div class="layui-card">
                <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
                    <div class="layui-form-item">
                        <!-- 物料编码 -->
                        <div class="layui-inline">
                            <label class="layui-form-label" style="width: 60px;">物料编码</label>
                            <div class="layui-input-inline">
                                <input type="text" id="SkuNo" name="SkuNo" placeholder="请输入物料编码" autocomplete="off" class="layui-input">
                            </div>
                        </div>
                        <!-- 物料名称 -->
                        <div class="layui-inline">
                            <label class="layui-form-label" style="width: 60px;">物料名称</label>
                            <div class="layui-input-inline">
                                <input type="text" id="SkuName" name="SkuName" placeholder="请输入物料名称" autocomplete="off" class="layui-input">
                            </div>
                        </div>
                        <div class="layui-inline">
                            <!-- 审核状态 -->
                            <div class="layui-inline">
                                <label class="layui-form-label" style="width: 60px;">审核状态</label>
                                <div class="layui-input-inline">
                                    <select name="AuditStatusNo" id="AuditStatusNo" lay-verify="">
                                        <option value=""></option>
                                        <option value="0">待审核</option>
                                        <option value="9">已通过</option>
                                    </select>
                                </div>
                            </div>
                        </div>
                        <div class="layui-inline">
                            <!-- 类型 -->
                            <label class="layui-form-label" style="width: 60px;">类型</label>
                                <div class="layui-input-inline">
                                <select name="Type" id="Type" lay-verify="" lay-verify="" lay-search>
                                    <option value=""></option>
                                    <option value="0">原料</option>
                                    <option value="1">包材</option>
                                    <option value="2">成品</option>
                                    <option value="3">耗材</option>
                                    <option value="4">中间品</option>
                                </select>
                            </div>
                        </div>
                        <!-- 是否受控 -->
                        <div class="layui-inline">
                            <label class="layui-form-label" style="width: 60px;">是否受控</label>
                            <div class="layui-input-inline">
                                <select name="IsControlled" id="IsControlled" lay-verify="" lay-verify="" lay-search>
                                    <option value=""></option>
                                    <option value="0">受控</option>
                                    <option value="1">非受控</option>
                                </select>
                            </div>
                        </div>
                        <!-- 是否免检 -->
                        <div class="layui-inline">
                            <label class="layui-form-label" style="width: 60px;">是否免检</label>
                            <div class="layui-input-inline">
                                <select name="IsInspect" id="IsInspect" lay-verify="" lay-verify="" lay-search>
                                    <option value=""></option>
                                    <option value="0">否</option>
                                    <option value="1">是</option>
                                </select>
                            </div>
                        </div>
                        <!-- 存储环境 -->
                        <div class="layui-inline">
                            <label class="layui-form-label" style="width: 60px;">存储环境</label>
                            <div class="layui-input-inline">
                                <select name="Environment" id="Environment" lay-verify="" lay-verify="" lay-search>
                                    <option value=""></option>
                                    <option value="0">常温</option>
                                    <option value="1">低温</option>
                                    <!-- <option value="3">干燥通风</option> -->
                                </select>
                            </div>
                        </div>
                        <div class="layui-inline">
                            <!-- 物料类别 -->
                            <div class="layui-inline">
                                <label class="layui-form-label" style="width: 60px;">物料类别</label>
                                <div class="layui-input-inline">
                                    <select name="CategoryNo" id="CategoryNo" lay-verify="">
                                        <option value=""></option>
                                    </select>
                                </div>
                            </div>
                        </div>
                        <div class="layui-inline">
                            <button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit lay-filter="LAY-app-contlist-search">
                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>搜索
                            </button>
                        </div>
                        <div class="layui-inline">
                            <button class="layui-btn layui-btn-sm layuiadmin-btn-list approvalBtn" style="margin-right: 10px;" data-type="add" id="approvalBtn">
                                <i class="layui-icon layuiadmin-button-btn">&#xe654;</i>添加
                            </button>
<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>
        // 这里是需要在页面渲染之前执行的代码
        document.addEventListener("DOMContentLoaded", function () {
            //获取table默认显示数
            pageCntFirst();
        });
    </script>
</head>
<body id="body">
    <div class="layui-fluid" style="padding-bottom: 0;">
        <div class="layui-card">
            <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC"
                id="top">
                <div class="layui-form-item">
                    <!-- 物料编码 -->
                    <div class="layui-inline">
                        <label class="layui-form-label" style="width: 60px;">物料编码</label>
                        <div class="layui-input-inline">
                            <input type="text" id="SkuNo" name="SkuNo" placeholder="请输入物料编码" autocomplete="off"
                                class="layui-input">
                        </div>
                    </div>
                    <!-- 物料名称 -->
                    <div class="layui-inline">
                        <label class="layui-form-label" style="width: 60px;">物料名称</label>
                        <div class="layui-input-inline">
                            <input type="text" id="SkuName" name="SkuName" placeholder="请输入物料名称" autocomplete="off"
                                class="layui-input">
                        </div>
                    </div>
                    <div class="layui-inline">
                        <!-- 审核状态 -->
                        <div class="layui-inline">
                            <label class="layui-form-label" style="width: 60px;">审核状态</label>
                            <div class="layui-input-inline">
                                <select name="AuditStatusNo" id="AuditStatusNo" lay-verify="">
                                    <option value=""></option>
                                    <option value="0">待审核</option>
                                    <option value="9">已通过</option>
                                </select>
                            </div>
                        </div>
                    </div>
                    <div class="layui-inline">
                        <!-- 类型 -->
                        <label class="layui-form-label" style="width: 60px;">类型</label>
                        <div class="layui-input-inline">
                            <select name="Type" id="Type" lay-verify="" lay-verify="" lay-search>
                                <option value=""></option>
                                <option value="0">原料</option>
                                <option value="1">包材</option>
                                <option value="2">成品</option>
                                <option value="3">耗材</option>
                                <option value="4">中间品</option>
                            </select>
                        </div>
                    </div>
                    <!-- 是否受控  JC34 变更为 是否请验 -->
                    <div class="layui-inline">
                        <label class="layui-form-label" style="width: 60px;">是否请验</label>
                        <div class="layui-input-inline">
                            <select name="IsControlled" id="IsControlled" lay-verify="" lay-verify="" lay-search>
                                <option value=""></option>
                                <option value="0">是</option>
                                <option value="1">否</option>
                            </select>
                        </div>
                    </div>
                    <!-- 是否免检 JC34 变更为 是否受控-->
                    <div class="layui-inline">
                        <label class="layui-form-label" style="width: 60px;">是否受控</label>
                        <div class="layui-input-inline">
                            <select name="IsInspect" id="IsInspect" lay-verify="" lay-verify="" lay-search>
                                <option value=""></option>
                                <option value="0">是</option>
                                <option value="1">否</option>
                            </select>
                        </div>
                    </div>
                    <!-- 存储环境 -->
                    <div class="layui-inline">
                        <label class="layui-form-label" style="width: 60px;">存储环境</label>
                        <div class="layui-input-inline">
                            <select name="Environment" id="Environment" lay-verify="" lay-verify="" lay-search>
                                <option value=""></option>
                                <option value="0">常温</option>
                                <option value="1">低温</option>
                                <!-- <option value="3">干燥通风</option> -->
                            </select>
                        </div>
                    </div>
                    <div class="layui-inline">
                        <!-- 物料类别 -->
                        <div class="layui-inline">
                            <label class="layui-form-label" style="width: 60px;">物料类别</label>
                            <div class="layui-input-inline">
                                <select name="CategoryNo" id="CategoryNo" lay-verify="">
                                    <option value=""></option>
                                </select>
                            </div>
                        </div>
                    </div>
                    <div class="layui-inline">
                        <button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit
                            lay-filter="LAY-app-contlist-search">
                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>搜索
                        </button>
                    </div>
                    <div class="layui-inline">
                        <button class="layui-btn layui-btn-sm layuiadmin-btn-list approvalBtn"
                            style="margin-right: 10px;" data-type="add" id="approvalBtn">
                            <i class="layui-icon layuiadmin-button-btn">&#xe654;</i>添加
                        </button>
                    </div>
                </div>
            </div>
                <div id="center"></div>
            <div id="center"></div>
                <div class="layui-card-body">
                    <table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
                    <!-- 审核状态 -->
                    <!-- <script type="text/html" id="buttonAuditStatusNo">
            <div class="layui-card-body">
                <table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
                <!-- 审核状态 -->
                <!-- <script type="text/html" id="buttonAuditStatusNo">
                        {{# if(d.AuditStatusNo=='0'){ }}
                            <button class="layui-btn layui-btn-radius layui-btn-xs" style="background-color:RED;">待审核</button>
                        {{# } else if(d.AuditStatusNo=='9') { }}
@@ -136,8 +144,8 @@
                            <button class="layui-btn layui-btn-radius layui-btn-danger layui-btn-xs" style="background-color: blue;">其它</button>
                        {{# } }}
                    </script> -->
                    <!-- 类型 -->
                    <script type="text/html" id="buttonType">
                <!-- 类型 -->
                <script type="text/html" id="buttonType">
                        {{# if(d.Type=='0'){ }}
                            <p>原料</p>
                        {{# } else if(d.Type=='1') { }}
@@ -151,25 +159,25 @@
                        {{# } }}
                    </script>
                    <!-- 是否受控 -->
                    <script type="text/html" id="buttonIsControlled">
                <!-- 是否受控 -->
                <script type="text/html" id="buttonIsControlled">
                        {{# if(d.IsControlled=='0'){ }}
                            <p>受控</p>
                        {{# } else if(d.IsControlled=='1') { }}
                            <p>非受控</p>
                        {{# }  }}
                    </script>
                    <!-- 是否免检 -->
                    <script type="text/html" id="buttonIsInspect">
                <!-- 是否免检 -->
                <script type="text/html" id="buttonIsInspect">
                        {{# if(d.IsInspect=='0'){ }}
                            <p>否</p>
                        {{# } else if(d.IsInspect=='1') { }}
                            <p>是</p>
                        {{# }  }}
                    </script>
                    <!-- 是否贴标 -->
                    <script type="text/html" id="buttonIsPasteCode">
                <!-- 是否贴标 -->
                <script type="text/html" id="buttonIsPasteCode">
                        {{# if(d.IsPasteCode=='0'){ }}
                            <p>否</p>
                        {{# } else if(d.IsPasteCode=='1') { }}
@@ -177,8 +185,8 @@
                        {{# }  }}
                    </script>
                    <!-- 存储环境 -->
                    <script type="text/html" id="buttonEnvironment">
                <!-- 存储环境 -->
                <script type="text/html" id="buttonEnvironment">
                        {{# if(d.Environment=='0'){ }}
                            <p>常温</p>
                        {{# } else if(d.Environment=='1') { }}
@@ -188,7 +196,7 @@
                        {{# }  }}
                    </script>
                    <script type="text/html" id="table-content-list">
                <script type="text/html" id="table-content-list">
                        <a class="layui-btn layui-btn-normal layui-btn-xs approvalBtnupt" lay-event="edit">
                            <i class="layui-icon layui-icon-edit"></i>编辑
                        </a>
@@ -196,122 +204,74 @@
                            <i class="layui-icon layui-icon-delete"></i>删除
                        </a>
                    </script>
                </div>
            </div>
        </div>
        <script src="../../layuiadmin/layui/layui.js"></script>
        <script src="../../js/public.js"></script>
        <script src="../../js/jquery-3.5.1.min.js"></script>
        <script src="../../js/jquery.cookie.js"></script>
        <script>
            layui.config({
                base: '../../layuiadmin/' //静态资源所在路径
            }).extend({
                index: 'lib/index' //主入口模块
            }).use(['index', 'table', 'laypage', 'layer'], function() {
                var table = layui.table,
                    form = layui.form,
                    laypage = layui.laypage,
                    layer = layui.layer;
    </div>
    <script src="../../layuiadmin/layui/layui.js"></script>
    <script src="../../js/public.js"></script>
    <script src="../../js/jquery-3.5.1.min.js"></script>
    <script src="../../js/jquery.cookie.js"></script>
    <script>
        layui.config({
            base: '../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index' //主入口模块
        }).use(['index', 'table', 'laypage', 'layer'], function () {
            var table = layui.table,
                form = layui.form,
                laypage = layui.laypage,
                layer = layui.layer;
                var h1 = GetTableHeight();
                refreshTable("","","","","","","","");
                var tableIns;
                //获取类别信息
                sendData(IP + "/sys/GetMaterialCategories1",{},'get',function(res){
                    console.log(res)
                    if (res.code == 1) //成功
                    {
                        Categoryhtml = '<option value =""></option>';
                        for (var i = 0; i < res.data.length; i++) {
                            Categoryhtml = Categoryhtml + '<option value =' + res.data[i].CategoryNo + '>' + res.data[i].CategoryName + '</option>'
                        }
                        $("#CategoryNo").append(Categoryhtml);
                        form.render('select');
            var h1 = GetTableHeight();
            refreshTable("", "", "", "", "", "", "", "");
            var tableIns;
            //获取类别信息
            sendData(IP + "/sys/GetMaterialCategories1", {}, 'get', function (res) {
                console.log(res)
                if (res.code == 1) //成功
                {
                    Categoryhtml = '<option value =""></option>';
                    for (var i = 0; i < res.data.length; i++) {
                        Categoryhtml = Categoryhtml + '<option value =' + res.data[i].CategoryNo + '>' + res.data[i].CategoryName + '</option>'
                    }
                })
                function refreshTable(SkuNo,SkuName,AuditStatusNo,Type,IsControlled,IsInspect,Environment,CategoryNo) {
                    var param = {
                        SkuNo: SkuNo,
                        SkuName: SkuName,
                        AuditStatusNo: AuditStatusNo,
                        Type: Type,
                        IsControlled: IsControlled,
                        IsInspect: IsInspect,
                        Environment: Environment,
                        CategoryNo:CategoryNo
                    };
                    var url  = "/Basis/GetMateList?SkuNo="+SkuNo+"&&SkuName="+SkuName+"&&AuditStatusNo="+AuditStatusNo+"&&Type="+Type+"&&IsControlled="+IsControlled+"&&IsInspect="+IsInspect+"&&Environment="+Environment+"&CategoryNo="+CategoryNo;
                    sendData(IP + url, {}, 'get', function(res) {
                        if (res.code == 0) //成功
                        {
                            var list = res.data;
                            $.extend(infoOptions, {
                                data: list
                            });
                            infoOptions.page = {
                                curr: 1
                            }
                            tableIns = table.render(infoOptions);
                        }
                        else //不成功
                        {
                            layer.msg('获取物料列表信息失败!', {
                                icon: 2,
                                time: 2000 //2秒关闭(如果不配置,默认是3秒)
                            }, function() {});
                        }
                    });
                    sendData(IP + "/basis/GetRoleRightList", {}, "get", function (res) {
                        $(function () {
                            $(".approvalBtn").hide();
                        });
                        $(function () {
                            $(".approvalBtndel").hide();
                        });
                        $(function () {
                            $(".approvalBtnupt").hide();
                        });
                        if (res.code == 0) //成功
                        {
                            for (var k = 0; k < res.data.length; k++) {
                                if (res.data[k].MenuName == "添加物料") {
                                    $(function () {
                                        $(".approvalBtn").show();
                                    });
                                }
                                if (res.data[k].MenuName == "删除物料") {
                                    $(function () {
                                        $(".approvalBtndel").show();
                                    });
                                }
                                if (res.data[k].MenuName == "编辑物料") {
                                    $(function () {
                                        $(".approvalBtnupt").show();
                                    });
                                }
                            }
                        }
                        else //不成功
                        {
                            layer.msg(
                                "获取信息失败",
                                {
                                    icon: 2,
                                    time: 2000, //2秒关闭(如果不配置,默认是3秒)
                                },
                                function () {
                                    //回调
                                }
                            );
                        }
                    });
                    $("#CategoryNo").append(Categoryhtml);
                    form.render('select');
                }
            })
            function refreshTable(SkuNo, SkuName, AuditStatusNo, Type, IsControlled, IsInspect, Environment, CategoryNo) {
                var param = {
                    SkuNo: SkuNo,
                    SkuName: SkuName,
                    AuditStatusNo: AuditStatusNo,
                    Type: Type,
                    IsControlled: IsControlled,
                    IsInspect: IsInspect,
                    Environment: Environment,
                    CategoryNo: CategoryNo
                };
                var url = "/Basis/GetMateList?SkuNo=" + SkuNo + "&&SkuName=" + SkuName + "&&AuditStatusNo=" + AuditStatusNo + "&&Type=" + Type + "&&IsControlled=" + IsControlled + "&&IsInspect=" + IsInspect + "&&Environment=" + Environment + "&CategoryNo=" + CategoryNo;
                sendData(IP + url, {}, 'get', function (res) {
                    if (res.code == 0) //成功
                    {
                        var list = res.data;
                        $.extend(infoOptions, {
                            data: list
                        });
                        infoOptions.page = {
                            curr: 1
                        }
                        tableIns = table.render(infoOptions);
                    }
                    else //不成功
                    {
                        layer.msg('获取物料列表信息失败!', {
                            icon: 2,
                            time: 2000 //2秒关闭(如果不配置,默认是3秒)
                        }, function () { });
                    }
                });
                sendData(IP + "/basis/GetRoleRightList", {}, "get", function (res) {
                    $(function () {
                        $(".approvalBtn").hide();
@@ -356,354 +316,391 @@
                        );
                    }
                });
                var infoOptions = {
                    elem: "#LAY-app-content-list",
                    height: h1,
                    id: "LAY-app-content-list",
                    page: true,
                    limit: pageCnt,
                    limits: pageLimits,
                    even: true,
                    cellMinWidth: 80, //全局定义常规单元格的最小宽度,layui 2.2.1 新增
                    cols:
            }
            sendData(IP + "/basis/GetRoleRightList", {}, "get", function (res) {
                $(function () {
                    $(".approvalBtn").hide();
                });
                $(function () {
                    $(".approvalBtndel").hide();
                });
                $(function () {
                    $(".approvalBtnupt").hide();
                });
                if (res.code == 0) //成功
                {
                    for (var k = 0; k < res.data.length; k++) {
                        if (res.data[k].MenuName == "添加物料") {
                            $(function () {
                                $(".approvalBtn").show();
                            });
                        }
                        if (res.data[k].MenuName == "删除物料") {
                            $(function () {
                                $(".approvalBtndel").show();
                            });
                        }
                        if (res.data[k].MenuName == "编辑物料") {
                            $(function () {
                                $(".approvalBtnupt").show();
                            });
                        }
                    }
                }
                else //不成功
                {
                    layer.msg(
                        "获取信息失败",
                        {
                            icon: 2,
                            time: 2000, //2秒关闭(如果不配置,默认是3秒)
                        },
                        function () {
                            //回调
                        }
                    );
                }
            });
            var infoOptions = {
                elem: "#LAY-app-content-list",
                height: h1,
                id: "LAY-app-content-list",
                page: true,
                limit: pageCnt,
                limits: pageLimits,
                even: true,
                cellMinWidth: 80, //全局定义常规单元格的最小宽度,layui 2.2.1 新增
                cols:
                    [[
                        {
                            title: '序号',type: 'numbers',fixed: 'left',width:65
                            title: '序号', type: 'numbers', fixed: 'left', width: 65
                        },
                        {
                            field: 'SkuNo',title: '物料编码',align: 'center',fixed: 'left',width: 100
                        },
                        {
                            field: 'SkuName',title: '物料名称',align: 'center',width: 150
                        },
                        {
                            field: 'Standard',title: '物料规格',align: 'center',width: 130
                        },
                        {
                            field: 'Type',title: '类型',align: 'center',templet: '#buttonType',width: 100
                            field: 'SkuNo', title: '物料编码', align: 'center', fixed: 'left', width: 100
                        },
                        {
                            field: 'IsControlled',templet: '#buttonIsControlled',title: '是否受控',align: 'center',width: 100
                        },
                        {
                            field: 'IsInspect',title: '是否免检',align: 'center',templet: '#buttonIsInspect',width: 100
                        },
                        {
                            field: 'IsPasteCode',title: '是否贴标',align: 'center',templet: '#buttonIsPasteCode',width: 100
                        },
                        {
                            field: 'Origin',title: '来源',align: 'center',width: 200
                        },
                        {
                            field: 'UnitNo',title: '单位',align: 'center',width: 100
                            field: 'SkuName', title: '物料名称', align: 'center', width: 150
                        },
                        {
                            field: 'PackagName',title: '包装',align: 'center',width: 100
                            field: 'Standard', title: '物料规格', align: 'center', width: 130
                        },
                        {
                            field: 'Type', title: '类型', align: 'center', templet: '#buttonType', width: 100
                        },
                        {
                            field: 'Environment',title: '存储环境',align: 'center',templet: '#buttonEnvironment',width: 120
                            field: 'IsControlled', templet: '#buttonIsControlled', title: '是否受控', align: 'center', width: 100
                        },
                        {
                            field: 'CategoryName',title: '物料类别',align: 'center',width: 120
                            field: 'IsInspect', title: '是否免检', align: 'center', templet: '#buttonIsInspect', width: 100
                        },
                        {
                            field: 'Weight',title: '理论重量',align: 'center',width: 135
                        },
                        {
                            field: 'Warranty',title: '保质期(天)',align: 'center',width: 140
                        },
                        {
                            field: 'UnpackWarranty',title: '拆包效期(天)',align: 'center',width: 140
                        },
                        {
                            field: 'AdventTime',title: '临期(天)',align: 'center',width: 140
                            field: 'IsPasteCode', title: '是否贴标', align: 'center', templet: '#buttonIsPasteCode', width: 100
                        },
                        {
                            field: 'LowInventory',title: '低库存',align: 'center',width: 150
                            field: 'Origin', title: '来源', align: 'center', width: 200
                        },
                        {
                            field: 'Demo',title: '备注',align: 'center',width: 200
                            field: 'UnitNo', title: '单位', align: 'center', width: 100
                        },
                        {
                            field: 'CreateUserName',title: '创建人',align: 'center',width: 130
                            field: 'PackagName', title: '包装', align: 'center', width: 100
                        },
                        {
                            field: 'CreateTime',title: '创建日期',align: 'center',width: 170,
                            field: 'Environment', title: '存储环境', align: 'center', templet: '#buttonEnvironment', width: 120
                        },
                        {
                            field: 'CategoryName', title: '物料类别', align: 'center', width: 120
                        },
                        {
                            field: 'Weight', title: '理论重量', align: 'center', width: 135
                        },
                        {
                            field: 'Warranty', title: '保质期(天)', align: 'center', width: 140
                        },
                        {
                            field: 'UnpackWarranty', title: '拆包效期(天)', align: 'center', width: 140
                        },
                        {
                            field: 'AdventTime', title: '临期(天)', align: 'center', width: 140
                        },
                        {
                            field: 'LowInventory', title: '低库存', align: 'center', width: 150
                        },
                        {
                            field: 'Demo', title: '备注', align: 'center', width: 200
                        },
                        {
                            field: 'CreateUserName', title: '创建人', align: 'center', width: 130
                        },
                        {
                            field: 'CreateTime', title: '创建日期', align: 'center', width: 170,
                            templet: function (d) {
                                return formatDate(d.CreateTime);
                            }
                        },
                        {
                            title: '操作',fixed: 'right',align: 'center',toolbar: '#table-content-list',width: 170
                            title: '操作', fixed: 'right', align: 'center', toolbar: '#table-content-list', width: 170
                        }
                    ]],
            };
            //监听搜索
            form.on('submit(LAY-app-contlist-search)', function (data) {
                var SkuNo = data.field.SkuNo;
                var SkuName = data.field.SkuName;
                var AuditStatusNo = data.field.AuditStatusNo;
                var Type = data.field.Type;
                var IsControlled = data.field.IsControlled;
                var IsInspect = data.field.IsInspect;
                var Environment = data.field.Environment;
                var CategoryNo = data.field.CategoryNo;
                refreshTable(SkuNo, SkuName, AuditStatusNo, Type, IsControlled, IsInspect, Environment, CategoryNo);
            });
            var doing = true;
            var $ = layui.$,
                active = {
                    //新增
                    add: function () {
                        layer.open({
                            type: 2,
                            title: '添加物料信息',
                            content: 'MaterialsForm.html',
                            maxmin: true,
                            area: ['640px', '746px'],
                            btn: ['确定', '取消'],
                            yes: function (index, layero) {
                                var iframeWindow = window['layui-layer-iframe' + index],
                                    submitID = 'layuiadmin-app-form-submit',
                                    submit = layero.find('iframe').contents().find('#' + submitID);
                                //监听提交
                                iframeWindow.layui.form.on('submit(' + submitID + ')', function (
                                    data) {
                                    var field = data.field; //获取提交的字段
                                    //提交 Ajax 成功后,静态更新表格中的数据
                                    var param = {
                                        SkuNo: field.SkuNo,
                                        SkuName: field.SkuName,
                                        Standard: field.Standard,
                                        //AuditStatusNo: field.AuditStatusNo,
                                        Type: field.Type,
                                        IsControlled: field.IsControlled,
                                        IsInspect: field.IsInspect,
                                        IsPasteCode: field.IsPasteCode,
                                        Origin: field.Origin,
                                        CategoryNo: field.CategoryNo,
                                        UnitNo: field.UnitNo,
                                        PackagNo: field.PackagNo,
                                        Environment: field.Environment,
                                        Weight: Number(field.Weight),
                                        Warranty: Number(field.Warranty),
                                        UnpackWarranty: Number(field.UnpackWarranty),
                                        Price: Number(field.Price),
                                        AdventTime: Number(field.AdventTime), //临期
                                        LowInventory: Number(field.LowInventory), //低库存
                                        Demo: field.Demo
                                    };
                                    if (doing) {
                                        doing = false;
                                        sendData(IP + "/Basis/AddMate", param, 'post', function (res) {
                                            console.log(res);
                                            if (res.code == 0) { //成功
                                                layer.msg(res.msg, {
                                                    icon: 1,
                                                    time: 2000 //2秒关闭(如果不配置,默认是3秒)
                                                }, function () {
                                                    layer.close(index); //关闭弹层
                                                    refreshTable
                                                        (
                                                            $("#SkuNo").val(),
                                                            $("#SkuName").val(),
                                                            $("#AuditStatusNo").val(),
                                                            $("#Type").val(),
                                                            $("#IsControlled").val(),
                                                            $("#IsInspect").val(),
                                                            $("#Environment").val(),
                                                            $("#CategoryNo").val()
                                                        );
                                                    doing = true;
                                                });
                                            }
                                            else if (res.code == 2) {
                                                layer.msg("物料编码或名称重复,添加失败!", {
                                                    icon: 2,
                                                    time: 2000 //2秒关闭(如果不配置,默认是3秒)
                                                }, function () { doing = true; });
                                            }
                                            else //不成功
                                            {
                                                layer.msg(res.msg, {
                                                    icon: 2,
                                                    time: 2000 //2秒关闭(如果不配置,默认是3秒)
                                                }, function () { doing = true; });
                                            }
                                        });
                                    }
                                    else {
                                        console.log(123);
                                    }
                                });
                                submit.trigger('click');
                            }
                        });
                    }
                };
                //监听搜索
                form.on('submit(LAY-app-contlist-search)', function(data) {
                    var SkuNo = data.field.SkuNo;
                    var SkuName = data.field.SkuName;
                    var AuditStatusNo = data.field.AuditStatusNo;
                    var Type = data.field.Type;
                    var IsControlled = data.field.IsControlled;
                    var IsInspect = data.field.IsInspect;
                    var Environment = data.field.Environment;
                    var CategoryNo = data.field.CategoryNo;
                    refreshTable(SkuNo,SkuName,AuditStatusNo,Type,IsControlled,IsInspect,Environment,CategoryNo);
                });
                var doing = true;
                var $ = layui.$,
                    active = {
                        //新增
                        add: function() {
                            layer.open({
                                type: 2,
                                title: '添加物料信息',
                                content: 'MaterialsForm.html',
                                maxmin: true,
                                area: ['640px', '746px'],
                                btn: ['确定', '取消'],
                                yes: function(index, layero) {
                                    var iframeWindow = window['layui-layer-iframe' + index],
                                        submitID = 'layuiadmin-app-form-submit',
                                        submit = layero.find('iframe').contents().find('#' + submitID);
                                    //监听提交
                                    iframeWindow.layui.form.on('submit(' + submitID + ')', function(
                                        data) {
                                        var field = data.field; //获取提交的字段
                                        //提交 Ajax 成功后,静态更新表格中的数据
                                        var param = {
                                            SkuNo: field.SkuNo,
                                            SkuName: field.SkuName,
                                            Standard: field.Standard,
                                            //AuditStatusNo: field.AuditStatusNo,
                                            Type: field.Type,
                                            IsControlled: field.IsControlled,
                                            IsInspect: field.IsInspect,
                                            IsPasteCode: field.IsPasteCode,
                                            Origin: field.Origin,
                                            CategoryNo: field.CategoryNo,
                                            UnitNo: field.UnitNo,
                                            PackagNo: field.PackagNo,
                                            Environment: field.Environment,
                                            Weight: Number(field.Weight),
                                            Warranty: Number(field.Warranty),
                                            UnpackWarranty: Number(field.UnpackWarranty),
                                            Price: Number(field.Price),
                                            AdventTime: Number(field.AdventTime), //临期
                                            LowInventory: Number(field.LowInventory), //低库存
                                            Demo: field.Demo
                                        };
                                        if(doing)
                                        {
                                            doing = false;
                                            sendData(IP + "/Basis/AddMate", param, 'post',function(res) {
                                                console.log(res);
                                                if (res.code == 0) { //成功
                                                    layer.msg(res.msg, {
                                                        icon: 1,
                                                        time: 2000 //2秒关闭(如果不配置,默认是3秒)
                                                    }, function() {
                                                        layer.close(index); //关闭弹层
                                                        refreshTable
                                                        (
                                                            $("#SkuNo").val(),
                                                            $("#SkuName").val(),
                                                            $("#AuditStatusNo").val(),
                                                            $("#Type").val(),
                                                            $("#IsControlled").val(),
                                                            $("#IsInspect").val(),
                                                            $("#Environment").val(),
                                                            $("#CategoryNo").val()
                                                        );
                                                        doing = true;
                                                    });
                                                }
                                                else if (res.code == 2) {
                                                    layer.msg("物料编码或名称重复,添加失败!", {
                                                        icon: 2,
                                                        time: 2000 //2秒关闭(如果不配置,默认是3秒)
                                                    }, function() {doing = true;});
                                                }
                                                else //不成功
                                                {
                                                    layer.msg(res.msg, {
                                                        icon: 2,
                                                        time: 2000 //2秒关闭(如果不配置,默认是3秒)
                                                    }, function() {doing = true;});
                                                }
                                            });
                                        }
                                        else{
                                            console.log(123);
                                        }
                                    });
                                    submit.trigger('click');
                                }
                            });
                        }
                    };
                $('.layui-btn.layuiadmin-btn-list').on('click', function() {
                    var type = $(this).data('type');
                    active[type] ? active[type].call(this) : '';
                });
            $('.layui-btn.layuiadmin-btn-list').on('click', function () {
                var type = $(this).data('type');
                active[type] ? active[type].call(this) : '';
            });
                var element = layui.element;
                var houseId = 0;
                var param = {
                    Id: $.cookie('userId')
                }
                var xml = '';
                function getchiled(data, mainId) {
                    if (data)
                    {
                        var list = data.filter(item => item.ParentId == mainId);
                        if (list)
                        {
                            for (var i = 0; i < list.length; i++)
                            {
                                var id = list[i].Id;
                                //查询有无子菜单
                                var count = data.filter(item => item.ParentId == id).length;
                                if (count > 0)
                                {
                                    xml = xml + '<dd>' + '<a href="javascript:;">' + list[i].Name + '</a>' + '<dl class="layui-nav-child">';
                                    getchiled(data, id);
                                    xml = xml + '</dl></dd>';
                                }
                                else
                                {
                                    xml = xml + '<dd>' + '<a lay-href="' + list[i].Url + '">' + list[i].Name + '</a>' + '</dd>';
                                }
            var element = layui.element;
            var houseId = 0;
            var param = {
                Id: $.cookie('userId')
            }
            var xml = '';
            function getchiled(data, mainId) {
                if (data) {
                    var list = data.filter(item => item.ParentId == mainId);
                    if (list) {
                        for (var i = 0; i < list.length; i++) {
                            var id = list[i].Id;
                            //查询有无子菜单
                            var count = data.filter(item => item.ParentId == id).length;
                            if (count > 0) {
                                xml = xml + '<dd>' + '<a href="javascript:;">' + list[i].Name + '</a>' + '<dl class="layui-nav-child">';
                                getchiled(data, id);
                                xml = xml + '</dl></dd>';
                            }
                            else {
                                xml = xml + '<dd>' + '<a lay-href="' + list[i].Url + '">' + list[i].Name + '</a>' + '</dd>';
                            }
                        }
                    }
                }
                var uid = $.cookie('userId');
                table.on('tool(LAY-app-content-list)', function(obj) {
                    var data = obj.data;
                    //删除
                    if (obj.event === 'del')
                    {
                        layer.confirm('确定删除选中的物料?', function(index) {
                            cusid = data.Id;
                            var arr = [];
                            arr.push(cusid); //属性
                            var param = {
                                Ids: arr
                            };
                            if(doing)
                            {
                                doing = false;
                                sendData(IP + "/Basis/DelMate?Id="+data.Id+"", {} , 'get', function(res) {
                                    console.log(res);
                                    if (res.code == 0) { //成功
                                        layer.msg(res.msg, {
                                            icon: 1,
                                            time: 2000 //2秒关闭(如果不配置,默认是3秒)
                                        }, function() {
                                            refreshTable
                                            (
                                                $("#SkuNo").val(),
                                                $("#SkuName").val(),
                                                $("#AuditStatusNo").val(),
                                                $("#Type").val(),
                                                $("#IsControlled").val(),
                                                $("#IsInspect").val(),
                                                $("#Environment").val(),
                                                $("#CategoryNo").val()
                                            );
                                            //table.reload('LAY-app-content-list'); //数据刷新
                                            doing = true;
                                        });
                                    }
                                    else //不成功
                                    {
                                        layer.msg(res.msg, {
                                            icon: 2,
                                            time: 2000 //2秒关闭(如果不配置,默认是3秒)
                                        }, function() {doing = true;});
                                    }
                                });
                            }
                            else
                            {
                                console.log(123);
                            }
                        });
                    }
                    //编辑
                    else if (obj.event === 'edit')
                    {
                        cusId = data.Id;
                        layer.open({
                            type: 2,
                            title: '编辑物料信息',
                            content: 'MaterialsForm.html?id=' + cusId,
                            maxmin: true,
                            area: ['640px', '746px'],
                            btn: ['确定', '取消'],
                            yes: function(index, layero) {
                                var iframeWindow = window['layui-layer-iframe' + index],
                                    submitID = 'layuiadmin-app-form-edit',
                                    submit = layero.find('iframe').contents().find('#' + submitID);
                                //监听提交
                                iframeWindow.layui.form.on('submit(' + submitID + ')', function(data) {
                                    var field = data.field; //获取提交的字段
                                    //提交 Ajax 成功后,静态更新表格中的数据
                                    var param = {
                                        Id: cusId,
                                        SkuNo: field.SkuNo,
                                        SkuName: field.SkuName,
                                        Standard: field.Standard,
                                        AuditStatusNo: field.AuditStatusNo,
                                        Type: field.Type,
                                        IsControlled: field.IsControlled,
                                        IsInspect: field.IsInspect,
                                        IsPasteCode: field.IsPasteCode,
                                        Origin: field.Origin,
                                        CategoryNo: field.CategoryNo,
                                        UnitNo: field.UnitNo,
                                        PackagNo: field.PackagNo,
                                        Environment: field.Environment,
                                        Weight: Number(field.Weight),
                                        Warranty: Number(field.Warranty),
                                        UnpackWarranty: Number(field.UnpackWarranty),
                                        Price: Number(field.Price),
                                        AdventTime: Number(field.AdventTime), //临期
                                        LowInventory: Number(field.LowInventory), //低库存
                                        Demo: field.Demo
                                    };
                                    if(doing)
                                    {
                                        doing = false;
                                        sendData(IP + "/Basis/ExitMate", param, 'post',
                                        function(res) {
            }
            var uid = $.cookie('userId');
            table.on('tool(LAY-app-content-list)', function (obj) {
                var data = obj.data;
                //删除
                if (obj.event === 'del') {
                    layer.confirm('确定删除选中的物料?', function (index) {
                        cusid = data.Id;
                        var arr = [];
                        arr.push(cusid); //属性
                        var param = {
                            Ids: arr
                        };
                        if (doing) {
                            doing = false;
                            sendData(IP + "/Basis/DelMate?Id=" + data.Id + "", {}, 'get', function (res) {
                                console.log(res);
                                if (res.code == 0) { //成功
                                    layer.msg(res.msg, {
                                        icon: 1,
                                        time: 2000 //2秒关闭(如果不配置,默认是3秒)
                                    }, function () {
                                        refreshTable
                                            (
                                                $("#SkuNo").val(),
                                                $("#SkuName").val(),
                                                $("#AuditStatusNo").val(),
                                                $("#Type").val(),
                                                $("#IsControlled").val(),
                                                $("#IsInspect").val(),
                                                $("#Environment").val(),
                                                $("#CategoryNo").val()
                                            );
                                        //table.reload('LAY-app-content-list'); //数据刷新
                                        doing = true;
                                    });
                                }
                                else //不成功
                                {
                                    layer.msg(res.msg, {
                                        icon: 2,
                                        time: 2000 //2秒关闭(如果不配置,默认是3秒)
                                    }, function () { doing = true; });
                                }
                            });
                        }
                        else {
                            console.log(123);
                        }
                    });
                }
                //编辑
                else if (obj.event === 'edit') {
                    cusId = data.Id;
                    layer.open({
                        type: 2,
                        title: '编辑物料信息',
                        content: 'MaterialsForm.html?id=' + cusId,
                        maxmin: true,
                        area: ['640px', '746px'],
                        btn: ['确定', '取消'],
                        yes: function (index, layero) {
                            var iframeWindow = window['layui-layer-iframe' + index],
                                submitID = 'layuiadmin-app-form-edit',
                                submit = layero.find('iframe').contents().find('#' + submitID);
                            //监听提交
                            iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
                                var field = data.field; //获取提交的字段
                                //提交 Ajax 成功后,静态更新表格中的数据
                                var param = {
                                    Id: cusId,
                                    SkuNo: field.SkuNo,
                                    SkuName: field.SkuName,
                                    Standard: field.Standard,
                                    AuditStatusNo: field.AuditStatusNo,
                                    Type: field.Type,
                                    IsControlled: field.IsControlled,
                                    IsInspect: field.IsInspect,
                                    IsPasteCode: field.IsPasteCode,
                                    Origin: field.Origin,
                                    CategoryNo: field.CategoryNo,
                                    UnitNo: field.UnitNo,
                                    PackagNo: field.PackagNo,
                                    Environment: field.Environment,
                                    Weight: Number(field.Weight),
                                    Warranty: Number(field.Warranty),
                                    UnpackWarranty: Number(field.UnpackWarranty),
                                    Price: Number(field.Price),
                                    AdventTime: Number(field.AdventTime), //临期
                                    LowInventory: Number(field.LowInventory), //低库存
                                    Demo: field.Demo
                                };
                                if (doing) {
                                    doing = false;
                                    sendData(IP + "/Basis/ExitMate", param, 'post',
                                        function (res) {
                                            if (res.code == 0) //成功
                                            {
                                                layer.msg("修改成功", {
                                                    icon: 1,
                                                    time: 1000 //2秒关闭(如果不配置,默认是3秒)
                                                }, function() {
                                                }, function () {
                                                    layer.close(index); //关闭弹层
                                                    refreshTable
                                                        (
                                                            $("#SkuNo").val(),
                                                            $("#SkuName").val(),
                                                            $("#AuditStatusNo").val(),
                                                            $("#Type").val(),
                                                            $("#IsControlled").val(),
                                                            $("#IsInspect").val(),
                                                            $("#Environment").val(),
                                                            $("#CategoryNo").val(),
                                                        );
                                                        (
                                                            $("#SkuNo").val(),
                                                            $("#SkuName").val(),
                                                            $("#AuditStatusNo").val(),
                                                            $("#Type").val(),
                                                            $("#IsControlled").val(),
                                                            $("#IsInspect").val(),
                                                            $("#Environment").val(),
                                                            $("#CategoryNo").val(),
                                                        );
                                                    doing = true;
                                                });
                                            }
@@ -712,21 +709,21 @@
                                                layer.msg(res.msg, {
                                                    icon: 2,
                                                    time: 2000 //2秒关闭(如果不配置,默认是3秒)
                                                }, function() {doing = true;});
                                                }, function () { doing = true; });
                                            }
                                        });
                                    }
                                    else
                                    {
                                        console.log(123);
                                    }
                                });
                                submit.trigger('click');
                            }
                        });
                    }
                });
                                }
                                else {
                                    console.log(123);
                                }
                            });
                            submit.trigger('click');
                        }
                    });
                }
            });
        </script>
    </body>
</html>
        });
    </script>
</body>
</html>
HTML/views/QualityControl/InspectionRequest.html
@@ -23,12 +23,11 @@
            display: none;
        }
        /* 样式用于美化图片展示 */
        .layui-table-cell img {
            max-width: 100px;
            max-height: 100px;
        }
        /* 样式用于美化图片展示 */
        .layui-table-cell img {
            max-width: 100px;
            max-height: 100px;
        }
    </style>
    <script>
        // 这里是需要在页面渲染之前执行的代码
@@ -130,10 +129,11 @@
                    <div style="display: none;" id="UploadImageView">
                        <div  id="UploadImage" style="margin-left: 35px;margin-top: 30px;">
                            <label>上传图片:</label><button type="button" class="layui-btn" id="uploadBtn" style="margin-left: 20px;" >浏览</button>
                        <div id="UploadImage" style="margin-left: 35px;margin-top: 30px;">
                            <label>上传图片:</label><button type="button" class="layui-btn" id="uploadBtn"
                                style="margin-left: 20px;">浏览</button>
                            <button type="button" class="layui-btn" id="upload" style="margin-left: 20px;">上传</button>
                        </div>
                    </div>
@@ -311,14 +311,14 @@
            base: '../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index' //主入口模块
        }).use(['index', 'table', 'laypage', 'element', 'layer', 'laydate','upload'], function () {
        }).use(['index', 'table', 'laypage', 'element', 'layer', 'laydate', 'upload'], function () {
            var table = layui.table,
                form = layui.form,
                element = layui.element,
                laypage = layui.laypage,
                layer = layui.layer,
                laydate = layui.laydate,
                upload    = layui.upload;
                upload = layui.upload;
            var h1 = GetTableTabHeight();
            laydate.render({
                elem: '#StartTime'
@@ -404,8 +404,11 @@
                { field: 'Status', title: '执行状态', align: 'center', width: 90, templet: '#templetStatus' },
                { field: 'RequestTime', title: '请验日期', align: 'center', width: 165, templet: '#templetCompleteTime' },
                { field: 'RequestUser', title: '请验人', align: 'center', width: 165 },
                { field: 'UDF5', title: '图片', align: 'center', width: 100 ,templet: function (d) {
                    return d.image ? '<img src="' + d.image + '" alt="图片">' : '无图片';}},
                {
                    field: 'UDF5', title: '图片', align: 'center', width: 100, templet: function (d) {
                        return d.image ? '<img src="' + d.image + '" alt="图片">' : '无图片';
                    }
                },
                // { field: 'UDF2', title: '自定义2', align: 'center', width: 100 },
                // { field: 'UDF3', title: '自定义3', align: 'center', width: 100 },
                // { field: 'UDF4', title: '自定义4', align: 'center', width: 100 },
@@ -488,7 +491,7 @@
                sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
                    if (res.code == 0) { //成功 
                        for (var k = 0; k < res.data.length; k++) {
                            if (res.data[k].MenuName == "上传") {
                                $(function () {
                                    $(".shangClass").show();
@@ -535,64 +538,64 @@
                var data = obj.data;
                switch (obj.event) {
                    case "upImage":
                    layer.open({
                                type:1,
                                title: '上传图片',
                                content: $('#UploadImageView'),
                                maxmin: true,
                                area: ['350px','215px'],
                                btn: ['确定'],
                                success: function(index, layero){
                                    upload.render({
                                        elem: '#uploadBtn',
                                        url: IP + '/BllQuality/UploadImage',
                                        accept: 'images',
                                        exts:'jpg|png|gif',
                                        multiple: false,
                                        size: 1024 * 5, // 5MB
                                        auto: false,
                                        bindAction: '#upload',
                                        headers: { ToKen: $.cookie('token') },
                                        xhrFields: {
                                            withCredentials: true // 携带cookie
                                        },
                                        before: function(){
                                            this.data = {
                                                qualityId:data.Id
                                            };
                                        layer.load(1, {shade: [0.5, '#000']});
                                        },
                                        done: function(res){
                        layer.open({
                            type: 1,
                            title: '上传图片',
                            content: $('#UploadImageView'),
                            maxmin: true,
                            area: ['350px', '215px'],
                            btn: ['确定'],
                            success: function (index, layero) {
                                upload.render({
                                    elem: '#uploadBtn',
                                    url: IP + '/BllQuality/UploadImage',
                                    accept: 'images',
                                    exts: 'jpg|png|gif',
                                    multiple: false,
                                    size: 1024 * 5, // 5MB
                                    auto: false,
                                    bindAction: '#upload',
                                    headers: { ToKen: $.cookie('token') },
                                    xhrFields: {
                                        withCredentials: true // 携带cookie
                                    },
                                    before: function () {
                                        this.data = {
                                            qualityId: data.Id
                                        };
                                        layer.load(1, { shade: [0.5, '#000'] });
                                    },
                                    done: function (res) {
                                        layer.closeAll('loading');
                                        if(res.code == 0){
                                            layer.msg('上传成功', {icon: 1});
                                        if (res.code == 0) {
                                            layer.msg('上传成功', { icon: 1 });
                                            // 上传成功后的回调,如刷新表格等
                                            // table.reload('LAY-app-content-list');
                                        } else {
                                            layer.msg(res.msg || '上传失败', {icon: 2});
                                            layer.msg(res.msg || '上传失败', { icon: 2 });
                                        }
                                        },
                                        error: function(){
                                    },
                                    error: function () {
                                        layer.closeAll('loading');
                                        layer.msg('上传失败', {icon: 2});
                                        }
                                    });
                                }
                            });
                    break;
                    case "ViewImage":
                    layer.open({
                                    type:1,
                                    title: '查看图片',
                                    content: $('#ImagesShowView'),
                                    maxmin: true,
                                    area: ['650px','315px'],
                                    btn: ['确定'],
                                    success: function(index, layero){
                                        getImage(data.Id);
                                        layer.msg('上传失败', { icon: 2 });
                                    }
                                });
                    break;
                            }
                        });
                        break;
                    case "ViewImage":
                        layer.open({
                            type: 1,
                            title: '查看图片',
                            content: $('#ImagesShowView'),
                            maxmin: true,
                            area: ['650px', '315px'],
                            btn: ['确定'],
                            success: function (index, layero) {
                                getImage(data.Id);
                            }
                        });
                        break;
                    case "add":
                        layer.confirm('确定要发起请验?', function (index) {
                            var param = {
@@ -725,54 +728,54 @@
                }
            });
            function getImage(id)
                {
                    var param = {
                        Id:id
                    }
                    sendData(IP + "/BllQuality/GetImage", param, 'post', function (res) {
                        if (res.code == 0) { //成功
                            $("#ImagesShow").html('');
                            res.data.forEach(function (item) {
                                $("#ImagesShow").append('<div>'+
                                '<a href='+item+' target="_blank" class="image-item"><img src="'+ item + '"  /></a>'+
                                '<button class="layui-btn layui-btn-primary layui-btn-sm delete-btn" data-type="customCols" data_Url='+item+' >删除</button>'+
                                '</div>');
                            })
                            $('.delete-btn').on('click',  function ( ) {
                                var item = $(this);
                                var QualityId = id;
                                var imageUrl = item.attr('data_Url');
                                layer.confirm('确定删除吗?', function (index) {
                                    var param = {
                                        QualityId: QualityId,
                                        ImageUrl: imageUrl
                                    }
                                    sendData(IP + "/BllQuality/DeleteImage", param, 'post', function (res) {
                                        if (res.code == 0) { //成功
                                            layer.msg(res.msg, {
                                                icon: 1,
                                                time: 1000 //2秒关闭(如果不配置,默认是3秒)
                                            }, function () {
                                                getImage(id);
                                            });
                                            } else {
                                                layer.msg(res.msg, {
                                                    icon: 2,
                                                    time: 2000 //2秒关闭(如果不配置,默认是3秒)
                                                });
                                            }
                                    });
                                })});
                        } else { //不成功
                            $("#ImagesShow").html('');
                                res.msg, {
                                icon: 2,
                                time: 2000 //2秒关闭(如果不配置,默认是3秒)
                                }
                        }
                    })
            function getImage(id) {
                var param = {
                    Id: id
                }
                sendData(IP + "/BllQuality/GetImage", param, 'post', function (res) {
                    if (res.code == 0) { //成功
                        $("#ImagesShow").html('');
                        res.data.forEach(function (item) {
                            $("#ImagesShow").append('<div>' +
                                '<a href=' + item + ' target="_blank" class="image-item"><img src="' + item + '"  /></a>' +
                                '<button class="layui-btn layui-btn-primary layui-btn-sm delete-btn" data-type="customCols" data_Url=' + item + ' >删除</button>' +
                                '</div>');
                        })
                        $('.delete-btn').on('click', function () {
                            var item = $(this);
                            var QualityId = id;
                            var imageUrl = item.attr('data_Url');
                            layer.confirm('确定删除吗?', function (index) {
                                var param = {
                                    QualityId: QualityId,
                                    ImageUrl: imageUrl
                                }
                                sendData(IP + "/BllQuality/DeleteImage", param, 'post', function (res) {
                                    if (res.code == 0) { //成功
                                        layer.msg(res.msg, {
                                            icon: 1,
                                            time: 1000 //2秒关闭(如果不配置,默认是3秒)
                                        }, function () {
                                            getImage(id);
                                        });
                                    } else {
                                        layer.msg(res.msg, {
                                            icon: 2,
                                            time: 2000 //2秒关闭(如果不配置,默认是3秒)
                                        });
                                    }
                                });
                            })
                        });
                    } else { //不成功
                        $("#ImagesShow").html('');
                        res.msg, {
                            icon: 2,
                            time: 2000 //2秒关闭(如果不配置,默认是3秒)
                        }
                    }
                })
            }
            // 取样明细单机事件
            table.on('tool(SamplingDetails)', function (obj) {
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -531,7 +531,7 @@
                    #endregion
                    #region 质检请验
                    if ((notice.Type == "1" || notice.Type == "4" || notice.Type == "5") && sku.IsInspect != "1")
                    if ((notice.Type == "1" || notice.Type == "4" || notice.Type == "5") && sku.IsInspect != "1" && sku.IsControlled != "1")
                    {
                        var qualityRequest = Db.Queryable<BllQualityInspectionRequest>().First(m => m.IsDel == "0" && m.SkuNo == sku.SkuNo && m.LotNo == bind.LotNo && m.SupplierLot == bind.SupplierLot);
                        if (qualityRequest == null)
@@ -1047,7 +1047,7 @@
                        #endregion
                        #region 质检请验
                        if ((arrNotice.Type == "1" || arrNotice.Type == "4" || arrNotice.Type == "5") && sku.IsInspect != "1")
                        if ((arrNotice.Type == "1" || arrNotice.Type == "4" || arrNotice.Type == "5") && sku.IsInspect != "1" && sku.IsControlled != "1")
                        {
                            var qualityRequest = Db.Queryable<BllQualityInspectionRequest>().First(m => m.IsDel == "0" && m.SkuNo == sku.SkuNo && m.LotNo == bind.LotNo && m.SupplierLot == bind.SupplierLot);
                            if (qualityRequest == null)
@@ -1497,7 +1497,7 @@
                #endregion
                #region 质检请验
                if ((notice.Type == "1" || notice.Type == "4" || notice.Type == "5") && sku.IsInspect != "1")
                if ((notice.Type == "1" || notice.Type == "4" || notice.Type == "5") && sku.IsInspect != "1" && sku.IsControlled != "1")
                {
                    var qualityRequest = Db.Queryable<BllQualityInspectionRequest>().First(m => m.IsDel == "0" && m.SkuNo == sku.SkuNo && m.LotNo == bind.LotNo && m.SupplierLot == bind.SupplierLot);
                    if (qualityRequest == null)
@@ -5964,7 +5964,7 @@
                #endregion
                #region 质检请验
                if ((notice.Type == "1" || notice.Type == "4" || notice.Type == "5") && sku.IsInspect != "1")
                if ((notice.Type == "1" || notice.Type == "4" || notice.Type == "5") && sku.IsInspect != "1"  && sku.IsControlled != "1")
                {
                    var qualityRequest = Db.Queryable<BllQualityInspectionRequest>().First(m => m.IsDel == "0" && m.SkuNo == sku.SkuNo && m.LotNo == bind.LotNo && m.SupplierLot == bind.SupplierLot);
                    if (qualityRequest == null)