parent: d58fd090 | 补丁 | 提交 | ignore whitespace
bklLiudl
2024-09-02 9885a8a2f98104f5ee63dd5ab8023095a1d8b9f6 
功能测试
11个文件已修改
461 ■■■■■ 已修改文件
HTML/views/ASNSetting/BindBoxInfo.html 312 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/ASNSetting/PalletBind.html 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/QualityControl/InspectionRequest.html 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/QualityControl/QualityChangeLog.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/Model/InterFaceModel/AsnModels.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/WMS.BLL/BllQualityServer/InspectionRequestServer.cs 80 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/WMS.Entity/BllAsnEntity/BllBoxInfo.cs 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/Wms/Controllers/BllAsnController.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 HTML/views/ASNSetting/BindBoxInfo.html


@@ -1,40 +1,45 @@


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


    </head>


    <body>


        <div class="layui-fluid" style="padding-bottom: 0;">




            <div class="layui-card">


                <div class="layui-form layui-card-header layuiadmin-card-header-auto">


                    <div class="layui-form-item" style="margin-bottom: 0px;">


						


                        <div class="layui-inline zongdan" >


                            <label class="layui-form-label" style="width: 60px;">支码</label>


                            <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">


                                <input type="text" id="BoxNo3"  name="BoxNo3" placeholder="支码" autocomplete="off" class="layui-input">


                            </div>


                        </div>


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


</head>




                        <div class="layui-inline sousuo">


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


<body>


    <div class="layui-fluid" style="padding-bottom: 0;">




        <div class="layui-card">


            <div class="layui-form layui-card-header layuiadmin-card-header-auto">


                <div class="layui-form-item" style="margin-bottom: 0px;">




                    <div class="layui-inline zongdan">


                        <label class="layui-form-label" style="width: 60px;">支码</label>


                        <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">


                            <input type="text" id="BoxNo3" name="BoxNo3" placeholder="支码" autocomplete="off"


                                class="layui-input">


                        </div>


                    </div>


                </div>




                    <div class="layui-inline sousuo">


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


            </div>


        </div>




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


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




                <table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>


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


            <table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>


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


                    {{# function GetBoxInfoBtn(d){


                        var html = '';


                        if(d.Status=='0'){


@@ -51,133 +56,132 @@


                    }}


                    {{ GetBoxInfoBtn(d) }}


                </script>


                 


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


                var $ = layui.$,


                    form = layui.form,


                    layer = layui.layer;


                var boxNo = getQueryString('BoxNo');


                var bindNo = getQueryString('BindNo');


                if (!boxNo)


                {


                    boxNo = "";


                }


                else


                {


                    var param = {


                        boxNo: boxNo,


                    };


                   


                    console.log(getQueryString('BoxNo'))


                    console.log(boxNo)


                    refreshTable();


                    function refreshTable() {


                        var param={							


                            BoxNo:getQueryString('BoxNo'),


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


                            BindNo:getQueryString('BindNo')


                        }


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


                            console.log(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() {});


                            }


                        });


                    }


                }


                // 表单需要的变量


                var infoOptions = {


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


                    height: 'full-98',


                    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'


                        },


                        {


                            field: 'SkuNo', title: '物料号', align: 'center',hide:true


                        },


                        {


                            field: 'SkuName', title: '物料名称', align: 'center',hide:true


                        },


                        {


                            field: 'PalletNo', title: '托盘条码', align: 'center', width: 110,


                        },


                        {


                            field: 'BoxNo', title: '箱码', align: 'center', width: 100,hide:true


                        }, 


                        {


                            field: 'BoxNo2', title: '盒码', align: 'center', width: 100,hide:true


                        }, 


                        {


                            field: 'BoxNo3', title: '支码', align: 'center', width: 220,


                        }, 


                        {


                            field: 'Status', title: '箱支状态', align: 'center',width: 110, templet: '#BoxStatus',


                        },


                        {


                            field: 'LotNo', title: '批次', align: 'center',width: 160,


                        },


                        {


                            field: 'LotText', title: '批次描述', align: 'center',


                        },


                        {


                            field: 'Qty', title: '数量', width: 90, align: 'center',


                        },


                        {


                            field: 'FullQty', title: '整箱数量', width: 100, align: 'center',


                        },


                    ]]


    </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 $ = layui.$,


                form = layui.form,


                layer = layui.layer;


            var boxNo = getQueryString('BoxNo');


            var bindNo = getQueryString('BindNo');


            if (!boxNo) {


                boxNo = "";


            }


            else {


                var param = {


                    boxNo: boxNo,


                };


                




                //监听搜索


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


                    refreshTable();


                });




                //获取浏览器参数


                function getQueryString(name) {


                    var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");


                    var r = window.location.search.substr(1).match(reg);


                    if (r != null) return unescape(r[2]);


                    return null;


                console.log(getQueryString('BoxNo'))


                console.log(boxNo)


                refreshTable();


                function refreshTable() {


                    var param = {


                        BoxNo: getQueryString('BoxNo'),


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


                        BindNo: getQueryString('BindNo')


                    }


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


                        console.log(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 () { });


                        }


                    });


                }


            })


        </script>


    </body>


</html>


            }


            // 表单需要的变量


            var infoOptions = {


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


                height: 'full-98',


                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'


                        },


                        {


                            field: 'SkuNo', title: '物料号', align: 'center', hide: true


                        },


                        {


                            field: 'SkuName', title: '物料名称', align: 'center', hide: true


                        },


                        {


                            field: 'PalletNo', title: '托盘条码', align: 'center',


                        },


                        {


                            field: 'BoxNo', title: '箱码', align: 'center', hide: false


                        },


                        {


                            field: 'BoxNo2', title: '盒码', align: 'center', width: 100, hide: true


                        },


                        {


                            field: 'BoxNo3', title: '支码', align: 'center',


                        },


                        {


                            field: 'Status', title: '箱支状态', align: 'center', width: 110, templet: '#BoxStatus',


                        },


                        {


                            field: 'LotNo', title: '批次', align: 'center', width: 160,


                        },


                        {


                            field: 'LotText', title: '批次描述', align: 'center', hide: true


                        },


                        {


                            field: 'Qty', title: '数量', width: 90, align: 'center',


                        },


                        {


                            field: 'FullQty', title: '整箱数量', width: 100, align: 'center',


                        },


                    ]]


            };






            //监听搜索


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


                refreshTable();


            });




            //获取浏览器参数


            function getQueryString(name) {


                var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");


                var r = window.location.search.substr(1).match(reg);


                if (r != null) return unescape(r[2]);


                return null;


            }


        })


    </script>


</body>




</html>




 HTML/views/ASNSetting/PalletBind.html


@@ -534,11 +534,11 @@


            var DetailColsArr = [[


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


                { field: 'PalletNo', title: '托盘号', align: 'center', width: 95 },


                { field: 'PalletNo2', title: '托盘编号LV2', align: 'center', width: 120 },


                { field: 'PalletNo3', title: '托盘编号LV3', align: 'center', width: 120 },


                // { field: 'PalletNo2', title: '托盘编号LV2', align: 'center', width: 120 },


                // { field: 'PalletNo3', title: '托盘编号LV3', align: 'center', width: 120 },


                { field: 'BoxNo', title: '箱号', align: 'center', width: 220 },


                { field: 'BoxNo2', title: '盒号', align: 'center', width: 220 },


                { field: 'BoxNo3', title: '支号', align: 'center', width: 220 },


                // { field: 'BoxNo2', title: '盒号', align: 'center', width: 220 },


                // { field: 'BoxNo3', title: '支号', align: 'center', width: 220 },


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


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


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




 HTML/views/QualityControl/InspectionRequest.html


@@ -379,18 +379,18 @@


                { 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: 'UDF1', title: '自定义1', align: 'center', width: 100 },


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


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


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


                { field: 'UDF5', title: '自定义5', align: 'center', width: 100 },


                // { field: 'UDF1', title: '自定义1', align: 'center', width: 100 },


                // { field: 'UDF2', title: '自定义2', align: 'center', width: 100 },


                // { field: 'UDF3', title: '自定义3', align: 'center', width: 100 },


                // { field: 'UDF4', title: '自定义4', align: 'center', width: 100 },


                // { field: 'UDF5', title: '自定义5', align: 'center', width: 100 },




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


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


                { field: 'UpdateTime', title: '完成日期', align: 'center', width: 165, templet: '#templetUpdateTime' },


                { field: 'UpdateUserName', title: '关单人', align: 'center', width: 165 },




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


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


            ]];


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


            //#endregion


@@ -542,7 +542,7 @@


                        break;


                    case "edit":


                        $("#PickingArea").val('')


                        form.render('select');						


                        form.render('select');


                        layer.open({


                            type: 1,


                            title: '确认出库口',


@@ -675,11 +675,11 @@


                { field: 'BoxNo2', title: '盒号', align: 'center', width: 220 },


                { field: 'BoxNo3', title: '支号', align: 'center', width: 220 },


                { field: 'CompleteQty', title: '取样数量', align: 'center', width: 105, },


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


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


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


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


                { field: 'UDF5', title: '自定义5', align: 'center', width: 100 },


                // { field: 'UDF1', title: '自定义1', align: 'center', width: 100 },


                // { field: 'UDF2', title: '自定义2', align: 'center', width: 100 },


                // { field: 'UDF3', title: '自定义3', align: 'center', width: 100 },


                // { field: 'UDF4', title: '自定义4', align: 'center', width: 100 },


                // { field: 'UDF5', title: '自定义5', align: 'center', width: 100 },




                { field: 'CreateTime', title: '取样日期', align: 'center', width: 165, templet: '#templetCreateTime' },


                { field: 'CreateUserName', title: '取样人', align: 'center', width: 165 },




 HTML/views/QualityControl/QualityChangeLog.html


@@ -3,7 +3,7 @@




<head>


    <meta charset="utf-8">


    <title>质检信息录入</title>


    <title>质检变更记录</title>


    <meta name="renderer" content="webkit">


    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">


    <meta name="viewport"




 Wms/Model/InterFaceModel/AsnModels.cs


@@ -29,6 +29,11 @@


        public string Origin { get; set; }




        /// <summary>


        /// 制单人


        /// </summary>


        public string Username { get; set; }




        /// <summary>


        /// 单据明细


        /// </summary>


        public List<AsnDetail> AsnDetails { get; set; }




 Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs


@@ -94,8 +94,8 @@


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


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


                .LeftJoin<SysMaterials>((tb1, tb2, tb3, tb4,tb5) => tb1.SkuNo == tb5.SkuNo && tb5.IsDel == "0")


                .LeftJoin<SysUnit>((tb1, tb2, tb3, tb4, tb5,tb6) => tb5.UnitNo == tb6.UnitNo)


                .LeftJoin<SysPackag>((tb1, tb2, tb3, tb4, tb5, tb6,tb7) => tb1.PackagNo == tb7.PackagNo)


                .LeftJoin<SysUnit>((tb1, tb2, tb3, tb4, tb5,tb6) => tb5.UnitNo == tb6.UnitNo && tb6.IsDel == "0")


                .LeftJoin<SysPackag>((tb1, tb2, tb3, tb4, tb5, tb6,tb7) => tb1.PackagNo == tb7.PackagNo && tb7.IsDel == "0")


                .Select((tb1, tb2, tb3, tb4, tb5,tb6, tb7) => new ArrivalNoticeDetailDto()


                 {


                     Id = tb1.Id,


@@ -1214,6 +1214,7 @@


                    CustomerNo = model.Customer,


                    CustomerName = CustomerModel.CustomerName,


                    OrderCode = model.OrderCode,


                    UserName = model.Username


                };




                // 入库明细表信息




 Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs


@@ -505,8 +505,8 @@


                        InspectStatus = a.InspectStatus,




                        Origin = a.Origin,


                        QtyCount = a.QtyCount,


                        QtyOrd = a.QtyOrd,


                        QtyCount = (int)a.QtyCount,


                        QtyOrd = (int)a.QtyOrd,






                        CreateUserName = b.RealName,




 Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs


@@ -33,7 +33,7 @@




        #region 接口方法




        //JC23绑定物料托盘即增加库存


        //JC26绑定物料托盘即增加库存


        public void BindPalletStock(BoxPalletBindVm model, int userId)


        {


            try


@@ -267,7 +267,7 @@


                        InspectQty = 0,


                        ASNNo = bind.ASNNo,


                        ASNDetailNo = bind.ASNDetailNo,


                        WareHouseNo = "",//所属仓库


                        WareHouseNo = "W01",//所属仓库


                        RoadwayNo = "",//所属巷道


                        AreaNo = "",//所属区域


                        LocatNo = "",//储位地址


@@ -446,8 +446,8 @@


                                Standard = box.Standard,


                                PackageStandard = box.PackageStandard,


                                StoreTime = box.StoreTime,


                                QtyCount = (int)box.QtyCount,


                                QtyOrd = (int)box.QtyOrd,


                                QtyCount = box.QtyCount,


                                QtyOrd = box.QtyOrd,


                                CreateUser = userId,


                                CreateTime = comTime,


                            };


@@ -637,7 +637,7 @@


                    .LeftJoin<SysUserInfor>((a, b, c) => a.CreateUser == c.Id)


                    .LeftJoin<SysUserInfor>((a, b, c, d) => a.UpdateUser == d.Id)


                    .LeftJoin<SysStorageLocat>((a, b, c, d, e) => a.LocatNo == e.LocatNo)


                    .LeftJoin<SysWareHouse>((a, b, c, d, e,f) => e.WareHouseNo == f.WareHouseNo)


                    .LeftJoin<SysWareHouse>((a, b, c, d, e,f) => a.WareHouseNo == f.WareHouseNo)


                    //.LeftJoin<BllBoxInfo>((a, b, c, d, e, f) => a.Id == e.BindNo)


                    .Select((a, b, c, d,e,f) => new PalletBindDto()


                    {


@@ -1375,7 +1375,7 @@


                   .AndIF(!string.IsNullOrWhiteSpace(layer), m => m.Layer == int.Parse(layer))


                   .AndIF(!string.IsNullOrWhiteSpace(locateNo), m => m.LocatNo.Contains(locateNo))


                   .And(m => m.IsDel == "0" && m.Status == "0" && m.Flag == "0" && m.WareHouseNo == houseNo)


                   .And(m => m.AreaNo == categoryAreaNo)


                   .And(m => categoryAreaNo.Contains(m.AreaNo))


                   .ToExpression();//注意 这一句 不能少


                var total = 0;


                var list = Db.Queryable<SysStorageLocat>().Where(item).OrderByDescending(a => a.Depth).OrderBy(a => a.Column)


@@ -1949,6 +1949,8 @@


                                Db.Updateable(bindModel).ExecuteCommand();


                                asnNo = stockModel.ASNNo;


                            }






                        }


                    }


                    foreach (DataStockDetail stockModel in stockDetail)




 Wms/WMS.BLL/BllQualityServer/InspectionRequestServer.cs


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


using Newtonsoft.Json;


using SqlSugar;


using System;


using System.Collections;


using System.Collections.Generic;


using System.Linq;


using System.Linq.Expressions;


@@ -204,41 +205,56 @@


                Db.Insertable(exTask).ExecuteCommand();






                // 调用Limes接口发起请验


                var jsonData = JsonConvert.SerializeObject(QcNoModel);


                string response = "";


                try


                {


                    var time1 = DateTime.Now;//发送时间 .ToString("yyyy-MM-dd HH:mm:ss")


                    response = HttpHelper.DoPost(url, jsonData, "上传ERP取样消耗量过账", "ERP");


                    var time2 = DateTime.Now;//返回时间 .ToString("yyyy-MM-dd HH:mm:ss")


                List<string> list1 = new List<string>();


                list1.Add(taskNo);


                //更改任务的发送返回时间//


                var time1 = DateTime.Now;//发送时间 .ToString("yyyy-MM-dd HH:mm:ss")


                var time2 = DateTime.Now;//返回时间 .ToString("yyyy-MM-dd HH:mm:ss")


                new TaskServer().EditTaskIssueOk(list1, time1, time2);




                    ////解析返回数据 


                    var limesModel = JsonConvert.DeserializeObject<LimesModel>(response);


                    List<string> list1 = new List<string>();


                    list1.Add(taskNo);


                    if (limesModel.Success == 0)


                    {


                        //更改任务的发送返回时间//


                        new TaskServer().EditTaskIssueOk(list1, time1, time2);


                // 更新请验单信息


                data.Status = "2";


                data.UpdateTime = time;


                data.UpdateUser = userId;




                        // 更新请验单信息


                        data.Status = "2";


                        data.UpdateTime = time;


                        data.UpdateUser = userId;


                Db.Updateable(data).ExecuteCommand();




                        Db.Updateable(data).ExecuteCommand();


                    }


                    if (limesModel.Success == -1)


                    {


                        new TaskServer().EditTaskIssueNo(list1, time1, time2, limesModel.Message);


                        throw new Exception(limesModel.Message);


                    }


                }


                catch (Exception ex)


                {


                    throw new Exception(ex.Message);


                }




                // 调用ERP接口回传取样消耗


                //var jsonData = JsonConvert.SerializeObject(QcNoModel);


                //string response = "";


                //try


                //{


                //    var time1 = DateTime.Now;//发送时间 .ToString("yyyy-MM-dd HH:mm:ss")


                //    response = HttpHelper.DoPost(url, jsonData, "上传ERP取样消耗量过账", "ERP");


                //    var time2 = DateTime.Now;//返回时间 .ToString("yyyy-MM-dd HH:mm:ss")




                //    ////解析返回数据 


                //    var limesModel = JsonConvert.DeserializeObject<LimesModel>(response);


                //    List<string> list1 = new List<string>();


                //    list1.Add(taskNo);


                //    if (limesModel.Success == 0)


                //    {


                //        //更改任务的发送返回时间//


                //        new TaskServer().EditTaskIssueOk(list1, time1, time2);




                //        // 更新请验单信息


                //        data.Status = "2";


                //        data.UpdateTime = time;


                //        data.UpdateUser = userId;




                //        Db.Updateable(data).ExecuteCommand();


                //    }


                //    if (limesModel.Success == -1)


                //    {


                //        new TaskServer().EditTaskIssueNo(list1, time1, time2, limesModel.Message);


                //        throw new Exception(limesModel.Message);


                //    }


                //}


                //catch (Exception ex)


                //{


                //    throw new Exception(ex.Message);


                //}




                //添加操作日志记录


                var k = new OperationCrServer().AddLogOperationCr("质量管理", "质检请验", model.Code, "关单", $"关闭了{model.Code}请验单!", userId);




 Wms/WMS.Entity/BllAsnEntity/BllBoxInfo.cs


@@ -220,14 +220,14 @@


        /// Default:


        /// Nullable:True


        /// </summary>           


        public int QtyCount { get; set; }


        public int? QtyCount { get; set; }




        /// <summary>


        /// Desc:第几件


        /// Default:


        /// Nullable:True


        /// </summary>           


        public int QtyOrd { get; set; }


        public int? QtyOrd { get; set; }




    }


}




 Wms/Wms/Controllers/BllAsnController.cs


@@ -513,7 +513,8 @@


        {


            try


            {


                var models = _PalletBindSvc.GetLocateList("W01", model.RoadwayNo, model.Row, model.Column, model.Layer, model.LocateNo, model.StockDetailId, model.Page, model.Limit, out int count);


                var models = _PalletBindSvc.GetLocateList("W01", model.RoadwayNo, model.Row, model.Column, model.Layer, model.LocateNo, 


                    model.StockDetailId, model.Page, model.Limit, out int count);




                return Ok(new { code = 0, count, msg = "获取指定储位信息", data = models });


            }