石药百克生物制药
parent: 4b4db960 | 补丁 | 提交 | show whitespace
bklLiudl
14 小时以前 4108af346376cce285499336917fd01b2435de06 
修改质检请验业务流程。
3个文件已修改
98 ■■■■■ 已修改文件
HTML/views/BaseSetting/Materials.html 73 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/QualityControl/InspectionRequest.html 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 HTML/views/BaseSetting/Materials.html


@@ -1,11 +1,13 @@


<!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">


    <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>


@@ -17,23 +19,27 @@


            });


          </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 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">


                            <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">


                            <input type="text" id="SkuName" name="SkuName" placeholder="请输入物料名称" autocomplete="off"


                                class="layui-input">


                            </div>


                        </div>


                        <div class="layui-inline">


@@ -63,25 +69,25 @@


                                </select>


                            </div>


                        </div>


                        <!-- 是否受控 -->


                    <!-- 是否受控  JC34 变更为 是否请验 -->


                        <div class="layui-inline">


                            <label class="layui-form-label" style="width: 60px;">是否受控</label>


                        <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>


                                <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>


                        <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>


                                <option value="0">是</option>


                                <option value="1">否</option>


                                </select>


                            </div>


                        </div>


@@ -109,12 +115,14 @@


                            </div>


                        </div>


                        <div class="layui-inline">


                            <button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit lay-filter="LAY-app-contlist-search">


                        <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">


                        <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>


@@ -499,8 +507,7 @@


                                            LowInventory: Number(field.LowInventory), //低库存


                                            Demo: field.Demo


                                        };


                                        if(doing)


                                        {


                                    if (doing) {


                                            doing = false;


                                            sendData(IP + "/Basis/AddMate", param, 'post',function(res) {


                                                console.log(res);


@@ -562,24 +569,19 @@


                }


                var xml = '';


                function getchiled(data, mainId) {


                    if (data)


                    {


                if (data) {


                        var list = data.filter(item => item.ParentId == mainId);


                        if (list)


                        {


                            for (var i = 0; i < list.length; i++)


                            {


                    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)


                                {


                            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


                                {


                            else {


                                    xml = xml + '<dd>' + '<a lay-href="' + list[i].Url + '">' + list[i].Name + '</a>' + '</dd>';


                                }


                            }


@@ -590,8 +592,7 @@


                table.on('tool(LAY-app-content-list)', function(obj) {


                    var data = obj.data;


                    //删除


                    if (obj.event === 'del')


                    {


                if (obj.event === 'del') {


                        layer.confirm('确定删除选中的物料？', function(index) {


                            cusid = data.Id;


                            var arr = [];


@@ -599,8 +600,7 @@


                            var param = {


                                Ids: arr


                            };


                            if(doing)


                            {


                        if (doing) {


                                doing = false;


                                sendData(IP + "/Basis/DelMate?Id="+data.Id+"", {} , 'get', function(res) {


                                    console.log(res);


@@ -633,15 +633,13 @@


                                    }


                                });


                            }


                            else


                            {


                        else {


                                console.log(123);


                            }


                        });


                    } 


                    //编辑


                    else if (obj.event === 'edit')


                    {


                else if (obj.event === 'edit') {


                        cusId = data.Id;


                        layer.open({


                            type: 2,


@@ -681,8 +679,7 @@


                                        LowInventory: Number(field.LowInventory), //低库存


                                        Demo: field.Demo


                                    };


                                    if(doing)


                                    {


                                if (doing) {


                                        doing = false;


                                        sendData(IP + "/Basis/ExitMate", param, 'post',


                                        function(res) {


@@ -716,8 +713,7 @@


                                            }


                                        });


                                    }


                                    else


                                    {


                                else {


                                        console.log(123);


                                    }


                                });


@@ -729,4 +725,5 @@


            });


        </script>


    </body>




</html>




 HTML/views/QualityControl/InspectionRequest.html


@@ -28,7 +28,6 @@


            max-width: 100px;


            max-height: 100px;


        }


    


    </style>


    <script>


        // 这里是需要在页面渲染之前执行的代码


@@ -131,7 +130,8 @@


                    <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>


                            <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>


@@ -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 },


@@ -725,8 +728,7 @@


                }


            });




            function getImage(id)


                {	


            function getImage(id) {


                    var param = {


                        Id:id


                    }


@@ -763,7 +765,8 @@


                                                });


                                            }


                                    });


                                })});


                            })


                        });


                        } else { //不成功


                            $("#ImagesShow").html('');


                                res.msg, {




 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)