parent: 6d5c3dee | 补丁 | 提交 | ignore whitespace
bklLiudl
2024-07-11 452ec2a2e75264515a9b315d1965db3069433d82 
采购单据
7个文件已修改
620 ■■■■■ 已修改文件
HTML/views/ASNSetting/ArrivalNotice.html 437 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/ASNSetting/ProcurePlanNotice.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/BaseSetting/Customer.html 78 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/WMS.BLL/BllAsnServer/ProcurePlanServer.cs 71 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/WMS.Entity/BllAsnEntity/BllProcurePlanNotice.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/WMS.IBLL/IBllAsnServer/IProcurePlanServer.cs 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/Wms/Controllers/BllAsnController.cs 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 HTML/views/ASNSetting/ArrivalNotice.html


@@ -17,13 +17,16 @@


            height: auto;


            line-height: 23px;


        }


        .layui-table-tool-panel{




        .layui-table-tool-panel {


            top: auto;


            bottom: 29px;


        }


        .layui-table-tool{




        .layui-table-tool {


            padding-left: 5px;


        }




        /* 表格下拉小箭头隐藏 */


        .layui-table-grid-down {


            display: none;


@@ -31,14 +34,14 @@


    </style>


    <script>


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


        document.addEventListener("DOMContentLoaded", function() {


        document.addEventListener("DOMContentLoaded", function () {


            //获取table默认显示数


            pageCntFirst();


            console.log(pageCnt)


            //判断是否开启table列表列宽调整功能。


            GetIsSetColW();


        });


      </script>


    </script>


</head>




<body id="body">


@@ -49,8 +52,8 @@


                    <div class="layui-inline">


                        <label class="layui-form-label">入库单号</label>


                        <div class="layui-input-inline">


                            <input type="text" id="ASNNo" name="ASNNo" placeholder="入库单号"


                                autocomplete="off" class="layui-input">


                            <input type="text" id="ASNNo" name="ASNNo" placeholder="入库单号" autocomplete="off"


                                class="layui-input">


                        </div>


                    </div>


                    <div class="layui-inline">


@@ -120,15 +123,15 @@


                    <div class="layui-inline">


                        <label class="layui-form-label" style="width: 90px;">上游系统单号</label>


                        <div class="layui-input-inline">


                            <input type="text" id="OrderCode" name="OrderCode" placeholder="上游系统单号"


                                autocomplete="off" class="layui-input">


                            <input type="text" id="OrderCode" name="OrderCode" placeholder="上游系统单号" autocomplete="off"


                                class="layui-input">


                        </div>


                    </div>


                    <div class="layui-inline">


                        <label class="layui-form-label">客户名称</label>


                        <div class="layui-input-inline">


                            <input type="text" id="CustomerName" name="CustomerName" placeholder="客户名称" autocomplete="off"


                            class="layui-input">


                            <input type="text" id="CustomerName" name="CustomerName" placeholder="客户名称"


                                autocomplete="off" class="layui-input">


                        </div>


                    </div>


                    <div class="layui-inline">


@@ -149,27 +152,28 @@


                        <label class="layui-form-label">撤销原因</label>


                        <div class="layui-input-inline">


                            <textarea id="Reason" name="Reason" placeholder="请输入内容" class="layui-textarea"></textarea>


							 




                        </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" id="divEditDemo" style="display: none; padding-top: 10px;">


                        <label class="layui-form-label">备注</label>


                        <div class="layui-input-inline" style="width: 300px;height: 100%;">


                            <textarea placeholder="请输入内容" id="NoticeDemo" name="NoticeDemo" class="layui-textarea"></textarea>


                            <textarea placeholder="请输入内容" id="NoticeDemo" name="NoticeDemo"


                                class="layui-textarea"></textarea>


                        </div>


                    </div>


                </div>


            </div>




            <div id="center">	


            <div id="center">


            </div>




            <div class="layui-card-body">


@@ -314,7 +318,7 @@


                            <i class="layui-icon">&#xe654;</i>添加


                        </button>


                    </script>


 




                    <script type="text/html" id="toolbarDemoList">


                        {{# function GetBtn2(d){ 


                            console.log(d);


@@ -425,14 +429,14 @@


        }).extend({


            index: 'lib/index' //主入口模块


        }).use(['index', 'table', 'laypage', 'layer', 'laydate'], function () {


 




            var doing = true;


			




            var table = layui.table,


                form = layui.form,


                laypage = layui.laypage,


                layer = layui.layer;


			




            laydate = layui.laydate;




            laydate.render({


@@ -443,62 +447,62 @@


                elem: '#EndTime'


                , format: 'yyyy-MM-dd' //可任意组合


            });


			




            var h1 = GetTableTopHeight();


            var h2 = GetTableBottomHeight();




			




            refreshTable();


            refreshTablemx("单号");	


            refreshTablemx("单号");


            //渲染总单    


            //#region 自定义表头


            var TotalColsArr = [[


                        {field: '',title: '序号',type:'numbers',width: 50,align: 'center',fixed: 'left', "disabled": true},


                        {field: 'ASNNo',title: '入库单号',align: 'center',fixed: 'left',sort: true,width: 180, "disabled": true},


                        {field: 'Status',title: '执行状态',align: 'center',templet: '#buttonTpl'},


                        {field: 'Origin',title: '来源',align: 'center',width: 80},


                        {field: 'CustomerName',title: '客户名称',align: 'center'},


                        {field: 'Type',title: '单据类型',align: 'center',templet: '#templetType'},


                        {field: 'OrderCode',title: '上游系统单号',align: 'center',width: 180},


                        {field: 'CompleteTime',title: '完成时间',align: 'center',templet: '#templetCompleteTime'},


                        {field: 'Demo',title: '备注',align: 'center',width: 180},


                        {field: 'CreateUserName',title: '创建人',align: 'center',width: 110},


                        {field: 'CreateTime',title: '创建时间',align: 'center',templet: '#templetCreateTime'},


                        {field: 'UpdateUserName',title: '修改人',align: 'center',width: 110},


                        {field: 'UpdateTime',title: '修改时间',align: 'center',templet: '#templetUpdateTime'}, 


                        {field: 'CheckUserName',title: '复核人',align: 'center',width: 110},


                        {field: 'CheckTime',title: '复核时间',align: 'center',templet: '#templetCheckTime'}, 


                        {field: 'caozuo',title: '操作',fixed: 'right',width: 280,align: 'center',toolbar: '#toolbarDemo1', "disabled": true}


                    ]];


            var TotalColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//将表头数据进行url编码


                { field: '', title: '序号', type: 'numbers', width: 50, align: 'center', fixed: 'left', "disabled": true },


                { field: 'ASNNo', title: '入库单号', align: 'center', fixed: 'left', sort: true, width: 180, "disabled": true },


                { field: 'Status', title: '执行状态', align: 'center', templet: '#buttonTpl' },


                { field: 'Origin', title: '来源', align: 'center', width: 80 },


                { field: 'CustomerName', title: '客户名称', align: 'center' },


                { field: 'Type', title: '单据类型', align: 'center', templet: '#templetType' },


                { field: 'OrderCode', title: '上游系统单号', align: 'center', width: 180 },


                { field: 'CompleteTime', title: '完成时间', align: 'center', templet: '#templetCompleteTime' },


                { field: 'Demo', title: '备注', align: 'center', width: 180 },


                { field: 'CreateUserName', title: '创建人', align: 'center', width: 110 },


                { field: 'CreateTime', title: '创建时间', align: 'center', templet: '#templetCreateTime' },


                { field: 'UpdateUserName', title: '修改人', align: 'center', width: 110 },


                { field: 'UpdateTime', title: '修改时间', align: 'center', templet: '#templetUpdateTime' },


                { field: 'CheckUserName', title: '复核人', align: 'center', width: 110 },


                { field: 'CheckTime', title: '复核时间', align: 'center', templet: '#templetCheckTime' },


                { field: 'caozuo', title: '操作', fixed: 'right', width: 280, align: 'center', toolbar: '#toolbarDemo1', "disabled": true }


            ]];


            var TotalColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//将表头数据进行url编码


            //#endregion


            function refreshTable() {


				




                //#region 自定义表头


                var colsJson


                var param1={


                    Href:'BllAsn/GetArrivalNoticeList'


                var param1 = {


                    Href: 'BllAsn/GetArrivalNoticeList'


                };


                sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function(res) {


                    if (res.code == 0){							


                        if(res.data=='' || res.data==undefined || res.data==null){


                            colsJson=TotalColsArr							


                        }else{


                            colsJson= eval(res.data);


                sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function (res) {


                    if (res.code == 0) {


                        if (res.data == '' || res.data == undefined || res.data == null) {


                            colsJson = TotalColsArr


                        } else {


                            colsJson = eval(res.data);


                        }


                    }else{


                        colsJson=TotalColsArr


                    } else {


                        colsJson = TotalColsArr


                    }


                    var param = {


                        ASNNo: $("#ASNNo").val(),


                        Type: $("#Type").val(),


                        Status: $("#Status").val(),


                        OrderCode:$("#OrderCode").val(),


                        OrderCode: $("#OrderCode").val(),


                        CustomerName: $("#CustomerName").val(),


                        LotNo: $("#LotNo").val(),


                        SkuNo: $("#SkuNo").val(),


                        SkuName: $("#SkuName").val(),


                        StartTime:$("#StartTime").val(),


                        StartTime: $("#StartTime").val(),


                        EndTime: $("#EndTime").val()


                    };


                    table.render({


@@ -508,17 +512,19 @@


                        height: h1,


                        id: 'LAY-app-content-list',


                        where: param,


                        parseData: FnParseData,


                        contentType: 'application/json',


                        headers:{ToKen:$.cookie('token')},


                        headers: { ToKen: $.cookie('token') },


                        page: true,


                        even: true,


                        limit: pageCnt,


                        limits: pageLimits,


                        cellMinWidth: 60, //全局定义常规单元格的最小宽度，layui 2.2.1 新增


                        done: function(res) {


                            setRight();		


                        done: function (res) {


                            console.log(res);


                            setRight();


                            //自定义列宽


                            SetTableColW('LAY-app-content-list','BllAsn/GetArrivalNoticeList',TotalColsSysArr);				


                            SetTableColW('LAY-app-content-list', 'BllAsn/GetArrivalNoticeList', TotalColsSysArr);


                        },


                        cols: colsJson


                    });


@@ -527,64 +533,64 @@


            }




            // 入库单table单机事件


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


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


                refreshTablemx(obj.data.ASNNo);


            });


            //渲染明细


            //渲染明细


            //#region 自定义表头


            var DetailColsArr = [[


                        {field: '',title: '序号',type:'numbers',width: 50,align: 'center',fixed: 'left', "disabled": true},


                        {field: 'ASNNo',title: '入库单号',align: 'center',fixed: 'left',sort: true,width: 180, "disabled": true},


                        {field: 'SkuNo',title: '物料编码',align: 'center',width: 100}, 


                        {field: 'SkuName',title: '物料名称',align: 'center',width: 200}, 


                        {field: 'Standard',title: '物料规格',align: 'center',width: 130}, 


                        {field: 'LotNo',title: '批次号',align: 'center',width: 100},


                        {field: 'SupplierLot',title: '供货批次',align: 'center',width: 100}, 


                        {field: 'Qty',title: '数量',align: 'center',width: 70}, 


                        {field: 'FactQty',title: '已组数量',align: 'center',width: 90}, 


                        {field: 'CompleteQty',title: '完成数量',align: 'center',width: 90}, 


                        {field: 'CompleteTime',title: '完成时间',align: 'center', width: 160,templet: '#templetCompleteTime2'},


                        {field: 'IsSampling',title: '是否取样',align: 'center',width: 90,templet: '#templetIsSampling'},


                        {field: 'InspectStatus',title: '质检状态',align: 'center',width: 90,templet: '#templetInspectStatus'},


                        {field: 'UnitName',title: '计量单位',align: 'center',width: 90},


                        // {field: 'Price',title: '单价',align: 'center',width: 65},


                        // {field: 'Money',title: '金额',align: 'center',width: 65},


                        {field: 'LotText',title: '批次描述',align: 'center',width: 120},


                        {field: 'PackagName',title: '包装名称',align: 'center',width: 110,}, 


                        {field: 'IsBale',title: '是否裹包',align: 'center',width: 150}, 


                        {field: 'IsBelt',title: '是否打带',align: 'center',width: 150},


                        {field: 'UDF1',title: '自定义列1',align: 'center',width: 140}, 


                        {field: 'UDF2',title: '自定义列2',align: 'center',width: 140}, 


                        {field: 'UDF3',title: '自定义列3',align: 'center',width: 140}, 


                        {field: 'UDF4',title: '自定义列4',align: 'center',width: 140}, 


                        {field: 'UDF5',title: '自定义列5',align: 'center',width: 140,templet:'#templetUDF5'}, 


                        {field: 'CreateUserName',title: '创建人',align: 'center',width: 100},


                        {field: 'CreateTime',title: '创建时间',align: 'center',width: 160,templet: '#templetCreateTime2'},


                        {field: 'UpdateUserName',title: '修改人',align: 'center',width: 150,},


                        {field: 'UpdateTime',title: '修改时间',align: 'center',width: 150,templet: '#templetUpdateTime3'},  


                        {field: 'caozuo',title: '操作',fixed: 'right',width: 150,align: 'left',toolbar: '#toolbarDemoList', "disabled": true}


                    ]];


            var DetailColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//将表头数据进行url编码


                { field: '', title: '序号', type: 'numbers', width: 50, align: 'center', fixed: 'left', "disabled": true },


                { field: 'ASNNo', title: '入库单号', align: 'center', fixed: 'left', sort: true, width: 180, "disabled": true },


                { field: 'SkuNo', title: '物料编码', align: 'center', width: 100 },


                { field: 'SkuName', title: '物料名称', align: 'center', width: 200 },


                { field: 'Standard', title: '物料规格', align: 'center', width: 130 },


                { field: 'LotNo', title: '批次号', align: 'center', width: 100 },


                { field: 'SupplierLot', title: '供货批次', align: 'center', width: 100 },


                { field: 'Qty', title: '数量', align: 'center', width: 70 },


                { field: 'FactQty', title: '已组数量', align: 'center', width: 90 },


                { field: 'CompleteQty', title: '完成数量', align: 'center', width: 90 },


                { field: 'CompleteTime', title: '完成时间', align: 'center', width: 160, templet: '#templetCompleteTime2' },


                { field: 'IsSampling', title: '是否取样', align: 'center', width: 90, templet: '#templetIsSampling' },


                { field: 'InspectStatus', title: '质检状态', align: 'center', width: 90, templet: '#templetInspectStatus' },


                { field: 'UnitName', title: '计量单位', align: 'center', width: 90 },


                // {field: 'Price',title: '单价',align: 'center',width: 65},


                // {field: 'Money',title: '金额',align: 'center',width: 65},


                { field: 'LotText', title: '批次描述', align: 'center', width: 120 },


                { field: 'PackagName', title: '包装名称', align: 'center', width: 110, },


                { field: 'IsBale', title: '是否裹包', align: 'center', width: 150 },


                { field: 'IsBelt', title: '是否打带', align: 'center', width: 150 },


                { field: 'UDF1', title: '自定义列1', align: 'center', width: 140 },


                { field: 'UDF2', title: '自定义列2', align: 'center', width: 140 },


                { field: 'UDF3', title: '自定义列3', align: 'center', width: 140 },


                { field: 'UDF4', title: '自定义列4', align: 'center', width: 140 },


                { field: 'UDF5', title: '自定义列5', align: 'center', width: 140, templet: '#templetUDF5' },


                { field: 'CreateUserName', title: '创建人', align: 'center', width: 100 },


                { field: 'CreateTime', title: '创建时间', align: 'center', width: 160, templet: '#templetCreateTime2' },


                { field: 'UpdateUserName', title: '修改人', align: 'center', width: 150, },


                { field: 'UpdateTime', title: '修改时间', align: 'center', width: 150, templet: '#templetUpdateTime3' },


                { field: 'caozuo', title: '操作', fixed: 'right', width: 150, align: 'left', toolbar: '#toolbarDemoList', "disabled": true }


            ]];


            var DetailColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//将表头数据进行url编码


            //#endregion


            function refreshTablemx(asnNo) {


				




                //#region 自定义表头


                var colsJson2


                var param1={


                    Href:'BllAsn/GetArrivalNoticeDetailList'


                var param1 = {


                    Href: 'BllAsn/GetArrivalNoticeDetailList'


                };


                sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function(res) {


                    if (res.code == 0){							


                        if(res.data=='' || res.data==undefined || res.data==null){


                            colsJson2=DetailColsArr						


                        }else{


                            colsJson2= eval(res.data);


                sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function (res) {


                    if (res.code == 0) {


                        if (res.data == '' || res.data == undefined || res.data == null) {


                            colsJson2 = DetailColsArr


                        } else {


                            colsJson2 = eval(res.data);


                        }


                    }else{


                        colsJson2=DetailColsArr


                    }	


                    } else {


                        colsJson2 = DetailColsArr


                    }


                    var param = {


                        ASNNo:asnNo


                        ASNNo: asnNo


                    };


                    table.render({


                        elem: '#LAY-app-content-list2',


@@ -594,53 +600,52 @@


                        id: 'LAY-app-content-list2',


                        where: param,


                        contentType: 'application/json',


                        toolbar:'#toolbarDemo',


                        defaultToolbar:  [], //'filter','print', 'exports'


                        headers:{ToKen:$.cookie('token')},


                        toolbar: '#toolbarDemo',


                        defaultToolbar: [], //'filter','print', 'exports'


                        headers: { ToKen: $.cookie('token') },


                        page: true,


                        limit: pageCnt,


                        limits: pageLimits,


                        cellMinWidth: 60, //全局定义常规单元格的最小宽度，layui 2.2.1 新增


                        done: function() {


                        done: function () {


                            setRight()


                            //自定义列宽


                            SetTableColW('LAY-app-content-list2','BllAsn/GetArrivalNoticeDetailList',DetailColsSysArr);	


                        },						


                            SetTableColW('LAY-app-content-list2', 'BllAsn/GetArrivalNoticeDetailList', DetailColsSysArr);


                        },


                        cols: colsJson2


                    });


                });


                //#endregion


            }




            function setRight()


            {


                $(function() {


            function setRight() {


                $(function () {


                    $(".addClass").hide();


                    $(".editClass").hide();


                    $(".delClass").hide(); 


                    $(".delClass").hide();


                    // $(".cheXiaoClass").hide(); 


                    $(".clossClass").hide(); 


                    $(".clossClass").hide();


                    $(".editDemoClass").hide();//备注


                    $(".checkClass").hide(); //复核


                    $(".addLabelClass").hide(); //复核


					




                });


                sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {


                sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {


                    if (res.code == 200) { //成功 


                        for (var k = 0; k < res.data.length; k++) {


                            if (res.data[k].MenuName == "添加入库单") {


                                $(function() {


                                $(function () {


                                    $(".addClass").show();


                                });


                            }


                            if (res.data[k].MenuName == "编辑入库单") {


                                $(function() {


                                $(function () {


                                    $(".editClass").show();


                                });


                            }


                            if (res.data[k].MenuName == "删除入库单") {


                                $(function() {


                                    $(".delClass").show(); 


                                $(function () {


                                    $(".delClass").show();


                                });


                            }


                            // if (res.data[k].MenuName == "撤销入库单") {


@@ -649,23 +654,23 @@


                            //     });


                            // }


                            if (res.data[k].MenuName == "关闭入库单") {


                                $(function() {


                                    $(".clossClass").show(); 


                                $(function () {


                                    $(".clossClass").show();


                                });


                            }


                            if (res.data[k].MenuName == "维护入库单备注") {


                                $(function() {


                                    $(".editDemoClass").show(); 


                                $(function () {


                                    $(".editDemoClass").show();


                                });


                            }


                            if (res.data[k].MenuName == "复核入库单") {


                                $(function() {


                                    $(".checkClass").show(); 


                                $(function () {


                                    $(".checkClass").show();


                                });


                            }


                            if (res.data[k].MenuName == "生成标签") {


                                $(function() {


                                    $(".addLabelClass").show(); 


                                $(function () {


                                    $(".addLabelClass").show();


                                });


                            }


                        }


@@ -673,7 +678,7 @@


                        layer.msg('获取权限信息失败', {


                            icon: 2,


                            time: 2000 //2秒关闭（如果不配置，默认是3秒）


                        }, function() {});


                        }, function () { });


                    }


                });


            }


@@ -681,11 +686,11 @@


            // 页面监控，点击查询加载入库总单


            form.on('submit(LAY-app-contlist-search)', function (data) {


                refreshTable();


                refreshTablemx("单号");	


                refreshTablemx("单号");


            });


			 


            table.on('toolbar(LAY-app-content-list2)', function(obj){ 


                if (obj.event == "add") { 




            table.on('toolbar(LAY-app-content-list2)', function (obj) {


                if (obj.event == "add") {


                    layer.open({


                        type: 2,


                        title: '添加入库单据',


@@ -695,14 +700,13 @@


                    });


                }


            });


			 






            var ImportId = 0;


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


                var data = obj.data;


                switch(obj.event)


                {


                    case "edit" :


                switch (obj.event) {


                    case "edit":


                        // 代码区域


                        var id = data.ASNNo;


                        layer.open({


@@ -713,11 +717,11 @@


                            area: ['70%', '90%']


                        });


                        break;


                    case "del" :


                        layer.confirm('确定删除此单据吗？', function(index) { 	


                    case "del":


                        layer.confirm('确定删除此单据吗？', function (index) {


                            // 代码区域


                            var param = {


                                ASNNo:data.ASNNo,


                                ASNNo: data.ASNNo,


                            };


                            sendData(IP + "/BllAsn/DelArrivalNotice", param, 'post', function (res) {


                                if (res.code == 0) { //成功


@@ -726,7 +730,7 @@


                                        time: 2000 //2秒关闭（如果不配置，默认是3秒）


                                    }, function () {


                                        refreshTable();


                                        refreshTablemx("单号");	


                                        refreshTablemx("单号");


                                        doing = true


                                    });


                                } else { //不成功


@@ -736,14 +740,14 @@


                                    }, function () { doing = true });


                                }


                            });


                        });			


                        });


                        break;


                    case "closs" :


                    case "closs":


                        // 代码区域


                        layer.confirm('确定关闭此单据吗？', function(index) { 	


                        layer.confirm('确定关闭此单据吗？', function (index) {


                            // 代码区域


                            var param = {


                                Id:data.Id,


                                Id: data.Id,


                            };


                            sendData(IP + "/UpApi/CloseAsn", param, 'post', function (res) {


                                if (res.code == 0) { //成功


@@ -764,12 +768,12 @@


                        });




                        break;


                    case "check" :


                    case "check":


                        // 代码区域


                        layer.confirm('确定复核此单据吗？', function(index) { 	


                        layer.confirm('确定复核此单据吗？', function (index) {


                            // 代码区域


                            var param = {


                                Id:data.Id,


                                Id: data.Id,


                            };


                            sendData(IP + "/UpApi/FinishAsn", param, 'post', function (res) {


                                if (res.code == 0) { //成功


@@ -788,111 +792,110 @@


                                }


                            });


                        });


						




                        break;


                    case "chexiao" :


                    case "chexiao":


                        layer.open({


                            type: 1,


                            title: '撤销申请',


                            content: $('#divReason'),


                            maxmin: true,


                            area: ['300px','265px'],


                            area: ['300px', '265px'],


                            btn: ['确定', '取消'],


                            yes: function(index, layero) {


                            yes: function (index, layero) {


                                var pa = $('#Reason').val();


                                if (doing== true) {


                                    doing= false;


								


                                if (doing == true) {


                                    doing = false;




                                    var param = {


                                        Id: data.Id, 


                                        Id: data.Id,


                                        Reason: pa,


                                    };


                                    console.log(param);


                                    sendData(IP + "/BllAsn/CancelOrder", param, 'get', function(res) {


                                    sendData(IP + "/BllAsn/CancelOrder", param, 'get', function (res) {


                                        console.log(res);


                                        if (res.code == 0) { //成功


                                            layer.msg(res.msg, {


                                                icon: 1,


                                                time: 3000 //1秒关闭（如果不配置，默认是3秒）


                                            }, function() {


                                            }, function () {


                                                refreshTable();


                                                doing= true;


                                                doing = true;


                                            });


                                        } else { //不成功


                                            layer.msg(res.msg, {


                                                icon: 2,


                                                time: 3000 //2秒关闭（如果不配置，默认是3秒）


                                            }, function() {


                                            }, function () {


                                                refreshTable();


                                                doing= true;


                                                doing = true;


                                            });


                                        }


                                        layer.close(index);


                                    });


                                }else{


                                } else {


                                    layer.msg("请勿重复点击", {


                                        icon: 2,


                                        time: 2000 //2秒关闭（如果不配置，默认是3秒）


                                    });


                                }


								




                            }


                        }); 	


						


                        });




                        break;


                    case "editDemo" :


                    case "editDemo":


                        $('#NoticeDemo').val(data.Demo);


                        layer.open({


                            type: 1,


                            title: '维护备注',


                            content: $('#divEditDemo'),


                            maxmin: false,


                            area: ['420px','260px'],


                            area: ['420px', '260px'],


                            btn: ['确定', '取消'],


                            yes: function(index, layero) {


                            yes: function (index, layero) {


                                var demo = $('#NoticeDemo').val();


                                var param = {


                                    id: data.Id,


                                    demo: demo,


                                };


                                sendData(IP + "/BllAsn/EditNoticeDemo", param, 'get', function(res) {


                                sendData(IP + "/BllAsn/EditNoticeDemo", param, 'get', function (res) {


                                    if (res.code == 0) { //成功


                                        refreshTable();


                                        layer.msg(res.msg, {


                                            icon: 1,


                                            time: 1500 //1秒关闭（如果不配置，默认是3秒）


                                        }, function() {


											


                                        }, function () {




                                        });


                                    } else { //不成功


                                        layer.msg(res.msg, {


                                            icon: 2,


                                            time: 3000 //2秒关闭（如果不配置，默认是3秒）


                                        }, function() {


                                        }, function () {


                                            refreshTable();


                                        });


                                    }


                                    layer.close(index);


                                });


                            }


                        }); 


                        });


                        break;


                    default:break;


                    default: break;


                }


            });


            //明细表操作栏事件


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


                var data = obj.data;


                var id = data.Id;


                switch(obj.event)


                {


                    case "del" :


                        layer.confirm('确定删除入库单明细吗？', function(index) { 	


                switch (obj.event) {


                    case "del":


                        layer.confirm('确定删除入库单明细吗？', function (index) {


                            // 代码区域


                            var param = {


                                ASNNo:data.ASNNo,


                                Id:data.Id,


                            }; 


                                ASNNo: data.ASNNo,


                                Id: data.Id,


                            };


                            sendData(IP + "/BllAsn/DelArrivalNoticeDetail", param, 'post', function (res) {


                                if (res.code == 0) { //成功


                                    layer.msg(res.msg, {


@@ -910,11 +913,11 @@


                                    }, function () { doing = true });


                                }


                            });


                        });	


                        });




                        break;


                    case "Addlabel" :


                        if(data.Qty<=0){


                    case "Addlabel":


                        if (data.Qty <= 0) {


                            layer.msg("请先输入到货数量!", {


                                icon: 2,


                                time: 2000 //2秒关闭（如果不配置，默认是3秒）


@@ -924,41 +927,41 @@


                        layer.open({


                            type: 2,


                            title: '生成标签',


                            content: 'LabelPrintSelect.html?Id='+id+'&SupplierLot='+data.SupplierLot,


                            content: 'LabelPrintSelect.html?Id=' + id + '&SupplierLot=' + data.SupplierLot,


                            maxmin: true,


                            area: ['480px', '615px'],


                            btn: ['确定','取消'],


                            yes: function(index, layero){


                                var iframeWindow = window['layui-layer-iframe'+ index]


                                ,submitID = 'layuiadmin-app-form-edit'


                                ,submit = layero.find('iframe').contents().find('#'+ submitID);


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


                                iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {


                                    var field = data.field; //获取提交的字段


                                    console.log(field);


                                    //提交 Ajax 成功后，静态更新表格中的数据


                                    //"&Level="+field.level+"&Type="+field.type+"&BoxType="+field.boxType+"&Qty="+field.qty+


                                    var str = "Id="+id+"&IsReset="+field.reset+"&ArriveQty="+field.arriveQty+"&ProductionTime="+field.productionTime+"&ExpirationTime="+field.expirationTime+"&StoreTime="+field.storeTime+"&SupplierLot="+field.SupplierLot;


									


                                    var str = "Id=" + id + "&IsReset=" + field.reset + "&ArriveQty=" + field.arriveQty + "&ProductionTime=" + field.productionTime + "&ExpirationTime=" + field.expirationTime + "&StoreTime=" + field.storeTime + "&SupplierLot=" + field.SupplierLot;




                                    layer.open({


                                        type: 2,


                                        title: '生成标签',


                                        content: 'LabelPrint.html?'+str,


                                        content: 'LabelPrint.html?' + str,


                                        maxmin: true,


                                        area: ['660px', '660px'],


                                        btn: ['取消'],


										






                                    });


                                });  


                                });


                                submit.trigger('click');


                            }




                        });




                        break;


                    case "Addlabel2" :


                        if(data.Qty<=0){


                    case "Addlabel2":


                        if (data.Qty <= 0) {


                            layer.msg("请先输入到货数量!", {


                                icon: 2,


                                time: 2000 //2秒关闭（如果不配置，默认是3秒）


@@ -968,61 +971,61 @@


                        layer.open({


                            type: 2,


                            title: '生成标签',


                            content: 'LabelPrintSelect.html?Id='+id+'&Type=4',


                            content: 'LabelPrintSelect.html?Id=' + id + '&Type=4',


                            maxmin: true,


                            area: ['480px', '615px'],


                            btn: ['确定','取消'],


                            yes: function(index, layero){


                                var iframeWindow = window['layui-layer-iframe'+ index]


                                ,submitID = 'layuiadmin-app-form-edit'


                                ,submit = layero.find('iframe').contents().find('#'+ submitID);


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


                                iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {


                                    var field = data.field; //获取提交的字段


                                    console.log(field);


                                    //提交 Ajax 成功后，静态更新表格中的数据


                                    //"&Level="+field.level+"&Type="+field.type+"&BoxType="+field.boxType+"&Qty="+field.qty+


                                    var str = "Id="+id+"&IsReset="+field.reset+"&ArriveQty="+field.arriveQty+"&ProductionTime="+field.productionTime+"&ExpirationTime="+field.expirationTime+"&StoreTime="+field.storeTime;


									


                                    var str = "Id=" + id + "&IsReset=" + field.reset + "&ArriveQty=" + field.arriveQty + "&ProductionTime=" + field.productionTime + "&ExpirationTime=" + field.expirationTime + "&StoreTime=" + field.storeTime;




                                    layer.open({


                                        type: 2,


                                        title: '生成标签',


                                        content: 'LabelPrint.html?'+str,


                                        content: 'LabelPrint.html?' + str,


                                        maxmin: true,


                                        area: ['660px', '660px'],


                                        btn: ['取消'],


										






                                    });


                                });  


                                });


                                submit.trigger('click');


                            }




                        });




                        break;


                    default:break;


                    default: break;


                }


            });




            //#region 自定义表头


            //自定义表头            


            active = {


                customCols: function(){


                customCols: function () {


                    layer.open({


                        type: 2,


                        title: '自定义列',


                        content: '../SystemSettings/HeaderSetting.html?Href=BllAsn/GetArrivalNoticeList&ColsSysArr='+TotalColsSysArr,


                        content: '../SystemSettings/HeaderSetting.html?Href=BllAsn/GetArrivalNoticeList&ColsSysArr=' + TotalColsSysArr,


                        maxmin: false,


                        resize: false,


                        area: ['970px', '650px']


                    });


                },


                customCols2: function(){


                customCols2: function () {


                    layer.open({


                        type: 2,


                        title: '自定义列',


                        content: '../SystemSettings/HeaderSetting.html?Href=BllAsn/GetArrivalNoticeDetailList&ColsSysArr='+DetailColsSysArr,


                        content: '../SystemSettings/HeaderSetting.html?Href=BllAsn/GetArrivalNoticeDetailList&ColsSysArr=' + DetailColsSysArr,


                        maxmin: false,


                        resize: false,


                        area: ['970px', '650px']


@@ -1030,7 +1033,7 @@


                }




            };


            $('.layui-btn').on('click', function() {


            $('.layui-btn').on('click', function () {


                var type = $(this).data('type');


                active[type] ? active[type].call(this) : '';


            });




 HTML/views/ASNSetting/ProcurePlanNotice.html


@@ -331,6 +331,7 @@


                        height: h1,


                        id: 'LAY-app-content-list',


                        where: param,


                        parseData: FnParseData,


                        contentType: 'application/json',


                        headers: { ToKen: $.cookie('token') },


                        page: true,


@@ -339,6 +340,7 @@


                        limits: pageLimits,


                        cellMinWidth: 60, //全局定义常规单元格的最小宽度，layui 2.2.1 新增


                        done: function (res) {


                            console.log(res);


                            setRight();


                            //自定义列宽


                            SetTableColW('LAY-app-content-list', 'BllAsn/GetProcurePlanNoticeList', TotalColsSysArr);




 HTML/views/BaseSetting/Customer.html


@@ -12,12 +12,12 @@


    <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">


    <script>


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


        document.addEventListener("DOMContentLoaded", function() {


			


        document.addEventListener("DOMContentLoaded", function () {




            //获取table默认显示数


            pageCntFirst();


        });


      </script>


    </script>


</head>




<body>


@@ -28,9 +28,8 @@


                    <div class="layui-inline">


                        <label class="layui-form-label" style="width: 56px;">客户编码</label>


                        <div class="layui-input-inline">


                            <input type="text" id="CustomerNo" name="CustomerNo" placeholder="客户编码"


                                autocomplete="off" class="layui-input"


                                onkeyup="this.value=this.value.replace(/[, ]/g,'')">


                            <input type="text" id="CustomerNo" name="CustomerNo" placeholder="客户编码" autocomplete="off"


                                class="layui-input" onkeyup="this.value=this.value.replace(/[, ]/g,'')">


                        </div>


                    </div>


                    <div class="layui-inline">


@@ -108,11 +107,11 @@


                laypage = layui.laypage,


                layer = layui.layer;




			 




            refreshTable();




            function refreshTable() {


				 




                var no = $("#CustomerNo").val();


                var name = $("#CustomerName").val();


                var type = parseInt($("#CustomerType").val());


@@ -125,7 +124,7 @@


                    LinkMan: linkman,


                    Phone: phone,


                    Type: type


                }; 


                };


                table.render({


                    elem: '#LAY-app-content-list',


                    url: IP + "/Basis/GetCustomerList",


@@ -135,7 +134,7 @@


                    where: param,


                    parseData: FnParseData,


                    contentType: 'application/json',


                    headers:{ToKen:$.cookie('token')},


                    headers: { ToKen: $.cookie('token') },


                    page: true,


                    limit: pageCnt,


                    limits: pageLimits,


@@ -144,13 +143,14 @@


                    // response:{


                    //     statusCode: 0 


                    // },


                    done: function () {


                        $(function() {


                    done: function (ref) {


                        console.log(ref);


                        $(function () {


                            $(".editClass").hide();


                            $(".delClass").hide();


                            $(".addClass").hide();


                        });


                        sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {


                        sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {


                            if (res.code == 200) { //成功 


                                for (var k = 0; k < res.data.length; k++) {


                                    if (res.data[k].MenuName == "编辑客户") {


@@ -167,13 +167,13 @@


                                layer.msg('获取权限信息失败', {


                                    icon: 2,


                                    time: 2000 //2秒关闭（如果不配置，默认是3秒）


                                }, function() {});


                                }, function () { });


                            }


                        }); 


                        });


                    },


					 




                    cols: [


                        [{ 


                        [{


                            title: '序号',


                            type: 'numbers',


                            width: 65,


@@ -195,13 +195,13 @@


                            width: 100,


                            align: 'center',


                            templet: function (d) {


                                if (d.Type ==0) {


                                if (d.Type == 0) {


                                    return "客户";


                                } else if(d.Type ==1){


                                } else if (d.Type == 1) {


                                    return "供货商";


                                } else if(d.Type ==2){


                                } else if (d.Type == 2) {


                                    return "货主";


                                }else{


                                } else {


                                    return "";


                                }


                            },


@@ -223,12 +223,12 @@


                        }, {


                            field: 'BankAccount',


                            title: '银行卡号',


                            width: 120, 


                            width: 120,


                            align: 'center'


                        }, {


                            field: 'CreditRating',


                            title: '信用等级',


                            width: 90, 


                            width: 90,


                            align: 'center'


                        }, {


                            field: 'Demo',


@@ -246,7 +246,7 @@


                            width: 160,


                            templet: function (d) {


                                return formatDate(d.CreateTime);


                            }, 


                            },


                        }, {


                            field: 'UpdateUserName',


                            title: '修改人',


@@ -259,7 +259,7 @@


                            width: 160,


                            templet: function (d) {


                                return formatDate(d.UpdateTime);


                            }, 


                            },


                        }, {


                            title: '操作',


                            fixed: 'right',


@@ -270,13 +270,13 @@


                    ],


                });


            }


			




            //监听搜索


            form.on('submit(LAY-app-contlist-search)', function (data) {


				 




                refreshTable();


            });


			




            var doing = true;


            active = {


                batchdel: function () {


@@ -294,7 +294,7 @@


                            var msg = [];


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


                                msg.push(checkData[i].Id)


                            } 


                            }


                            var param = {


                                Ids: msg,


                            };


@@ -339,15 +339,15 @@


                                    var field = data.field; //获取提交的字段


                                    console.log(field);


                                    //提交 Ajax 成功后，静态更新表格中的数据


                                    var param = { 


                                    var param = {


                                        CustomerNo: field.CustomerNo,


                                        CustomerName: field.CustomerName,


                                        Address: field.Address,


                                        LinkMan: field.LinkMan,


                                        Phone: field.Phone,


                                        Type: parseInt(field.Type),


                                        BankAccount:field.BankAccount,


                                        CreditRating:field.CreditRating,


                                        BankAccount: field.BankAccount,


                                        CreditRating: field.CreditRating,


                                        Demo: field.Demo,


                                    };


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


@@ -358,11 +358,11 @@


                                                    icon: 1,


                                                    time: 2000 //2秒关闭（如果不配置，默认是3秒）


                                                }, function () {


                                                    refreshTable(); 


                                                    refreshTable();


                                                    layer.close(index); //关闭弹层


                                                    doing = true;


                                                });


                                            } else if(res.code == 1){


                                            } else if (res.code == 1) {


                                                layer.msg(res.msg, {


                                                    icon: 2,


                                                    time: 2000 //2秒关闭（如果不配置，默认是3秒）


@@ -386,8 +386,8 @@


                var type = $(this).data('type');


                active[type] ? active[type].call(this) : '';


            });


			


			








            var cusid = "0";


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


@@ -450,8 +450,8 @@


                                        LinkMan: field.LinkMan,


                                        Phone: field.Phone,


                                        Type: parseInt(field.Type),


                                        BankAccount:field.BankAccount,


                                        CreditRating:field.CreditRating,


                                        BankAccount: field.BankAccount,


                                        CreditRating: field.CreditRating,


                                        Demo: field.Demo,


                                    };


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


@@ -466,7 +466,7 @@


                                                    layer.close(index); //关闭弹层


                                                    doing = true;


                                                });


                                            } else if(res.code == 1){


                                            } else if (res.code == 1) {


                                                layer.msg(res.msg, {


                                                    icon: 2,


                                                    time: 2000 //2秒关闭（如果不配置，默认是3秒）




 Wms/WMS.BLL/BllAsnServer/ProcurePlanServer.cs


@@ -5,6 +5,7 @@


using System;


using System.Collections.Generic;


using System.Text;


using System.Threading.Tasks;


using WMS.BLL.LogServer;


using WMS.DAL;


using WMS.Entity.BllAsnEntity;


@@ -30,52 +31,32 @@


        /// <param name="model"></param>


        /// <param name="count"></param>


        /// <returns></returns>


        public List<ProcurePlanNoticeDto> GetProcurePlanNoticeList(ProcurePlanNoticeVm model, out int count)


        public async Task<List<ProcurePlanNoticeDto>> GetProcurePlanNoticeList(ProcurePlanNoticeVm model, RefAsync<int> count)


        {


            string sqlString = string.Empty;


            string sqlCount = string.Empty;


            string sqlPub = string.Empty;


            try


            {


                sqlCount += "SELECT DISTINCT COUNT(tb1.ID) FROM BllProcurePlanNotice AS tb1 ";


                sqlString += "SELECT DISTINCT tb1.*,tb3.RealName as CreateUserName,tb4.RealName as UpdateUserName FROM BllProcurePlanNotice AS tb1 ";


                sqlPub += "LEFT JOIN BllProcurePlanNoticeDetail AS tb2 ON tb1.Id = tb2.ParentId ";


                sqlPub += "LEFT JOIN SysUserInfor AS tb3 ON tb1.CreateUser = tb3.Id ";


                sqlPub += "LEFT JOIN SysUserInfor AS tb4 ON tb1.UpdateUser = tb4.Id ";


                sqlPub += $"WHERE tb1.IsDel = '0' ";


                sqlPub += $"AND tb2.SkuNo LIKE '%{model.SkuNo}%' AND tb2.SkuName LIKE '%{model.SkuName}%' ";


                sqlPub += $"AND tb2.CustomerName  LIKE '%{model.CustomerName}%' ";


                if (!string.IsNullOrEmpty(model.Status))


                {


                    sqlPub += $"AND tb1.Status = '{model.Status}' ";


                }


                if (!string.IsNullOrEmpty(model.StartTime))


                {


                    sqlPub += $"AND tb1.CreateTime >= '{model.StartTime}' ";


                }


                if (!string.IsNullOrEmpty(model.EndTime))


                {


                    sqlPub += $"AND tb1.CreateTime <= '{model.EndTime}' ";


                }


                sqlCount += sqlPub;


                sqlPub += " order by tb1.Id desc ";


                if (model.Page == 0)


                {


                    model.Page = 1;


                }


                sqlString += sqlPub + $" offset {((model.Page - 1) * model.Limit)} rows fetch next {model.Limit} rows only;";




                var com = new Common();


                count = com.GetRowCount(sqlCount);




                var modelList = Db.Ado.SqlQuery<ProcurePlanNoticeDto>(sqlString);




                return modelList;


            }


            catch (Exception ex)


            {


                throw ex;


            }


            var modelList = await Db.Queryable<BllProcurePlanNotice>()


                .LeftJoin<BllProcurePlanNoticeDetail>((tb1, tb2) => tb1.Id == tb2.ParentId)


                .LeftJoin<SysUserInfor>((tb1, tb2, tb3) => tb1.CreateUser == tb3.Id)


                .LeftJoin<SysUserInfor>((tb1, tb2, tb3, tb4) => tb1.UpdateUser == tb4.Id)


                .WhereIF(!string.IsNullOrWhiteSpace(model.Status), tb1 => tb1.Status == model.Status)


                .WhereIF(!string.IsNullOrWhiteSpace(model.StartTime), tb1 => tb1.CreateTime >= Convert.ToDateTime(model.StartTime))


                .WhereIF(!string.IsNullOrWhiteSpace(model.EndTime), tb1 => tb1.CreateTime <= Convert.ToDateTime(model.EndTime).AddDays(1))


                .WhereIF(!string.IsNullOrWhiteSpace(model.SkuName), (tb1,tb2) => tb2.SkuName.Contains(model.SkuName))


                .Where(tb1 => tb1.IsDel == "0")


                .OrderByDescending(tb1 => tb1.Id)


                .Distinct()


                .Select((tb1, tb2, tb3, tb4) => new ProcurePlanNoticeDto() {


                    Id = tb1.Id,


                    Status = tb1.Status,


                    OrderCode = tb1.OrderCode,


                    UserName = tb1.UserName,


                    CompleteTime = tb1.CompleteTime,


                    CreateTime = tb1.CreateTime,


                    CreateUserName = tb3.RealName,


                    UpdateTime = tb1.UpdateTime.ToString(),


                    UpdateUserName = tb4.RealName


                }).ToPageListAsync(model.Page, model.Limit, count);


             


            return modelList;


        }


        /// <summary>


        /// 获取采购单明细信息




 Wms/WMS.Entity/BllAsnEntity/BllProcurePlanNotice.cs


@@ -24,6 +24,11 @@


        public DateTime? CompleteTime { get; set; }




        /// <summary>


        /// 制单人


        /// </summary>


        public string UserName { get; set; }




        /// <summary>


        /// 上游系统单号


        /// </summary>


        public string OrderCode { get; set; }




 Wms/WMS.IBLL/IBllAsnServer/IProcurePlanServer.cs


@@ -1,9 +1,11 @@


using Model.InterFaceModel;


using Model.ModelDto.BllAsnDto;


using Model.ModelVm.BllAsnVm;


using SqlSugar;


using System;


using System.Collections.Generic;


using System.Text;


using System.Threading.Tasks;




namespace WMS.IBLL.IBllAsnServer


{


@@ -15,7 +17,7 @@


        /// <param name="model"></param>


        /// <param name="count"></param>


        /// <returns></returns>


        public List<ProcurePlanNoticeDto> GetProcurePlanNoticeList(ProcurePlanNoticeVm model, out int count);


        Task <List<ProcurePlanNoticeDto>> GetProcurePlanNoticeList(ProcurePlanNoticeVm model, RefAsync<int> count);




        /// <summary>


        /// 获取采购单明细信息




 Wms/Wms/Controllers/BllAsnController.cs


@@ -9,12 +9,17 @@


using WMS.IBLL.IBllAsnServer;


using WMS.IBLL.ILogServer;


using Model.ModelVm.BllAsnVm;


using Utility;


using Model.ModelDto.BllAsnDto;


using System.Threading.Tasks;


using SqlSugar;




namespace Wms.Controllers


{


    [Route("api/[controller]/[action]")]


    [ApiController]


    [Authorize]


    


    public class BllAsnController : ControllerBase


    {


        #region 依赖注入


@@ -1164,20 +1169,14 @@


        /// 获取采购单信息


        /// </summary>


        /// <param name="model">查询条件</param>


        /// <returns>入库单信息</returns>


        /// <returns>采购单信息</returns>


        [HttpPost]


        public IActionResult GetProcurePlanNoticeList(ProcurePlanNoticeVm model)


        [ServiceFilter(typeof(ApiResponseActionFilter))]


        public async Task<SqlSugarPagedList<ProcurePlanNoticeDto>>  GetProcurePlanNoticeList(ProcurePlanNoticeVm model)


        {


            try


            {


                var models = _procurePlanSvc.GetProcurePlanNoticeList(model, out int count);




                return Ok(new { code = 0, count, msg = "入库单信息", data = models });


            }


            catch (Exception e)


            {


                return Ok(new { code = 1, msg = e.Message });


            }


            RefAsync<int> count = new RefAsync<int>();


            var bolls = await _procurePlanSvc.GetProcurePlanNoticeList(model, count);


            return new SqlSugarPagedList<ProcurePlanNoticeDto>() { Items = bolls, Total = count };


        }


        /// <summary>


        /// 获取采购单明细信息