修改问题

IPC-610

2025-01-02 4acb88b7afaab5b18a1c9ca8a78ce346297c382f

修改问题

 HTML/views/BaseSetting/Materials.html

@@ -106,7 +106,7 @@
                    <div class="layui-inline">
                        <!-- 物料类别 -->
                        <div class="layui-inline">
                            <label class="layui-form-label" style="width: 60px;">区域类别</label>
                            <label class="layui-form-label" style="width: 60px;">逻辑库区</label>
                            <div class="layui-input-inline">
                                <select name="CategoryNo" id="CategoryNo" lay-verify="">
                                    <option value=""></option>
@@ -358,7 +358,7 @@
                            field: 'Environment', title: '存储环境', align: 'center', templet: '#buttonEnvironment', width: 120
                        },
                        {
                            field: 'CategoryName', title: '物料类别', align: 'center', width: 120
                            field: 'CategoryName', title: '逻辑库区', align: 'center', width: 120
                        },
                        {
                            field: 'Weight', title: '理论重量', align: 'center', width: 135

 HTML/views/BaseSetting/MaterialsForm.html

@@ -23,7 +23,7 @@
                </div>
            </div>
            <div class="layui-inline">
                <label class="layui-form-label">物料类别</label>
                <label class="layui-form-label">逻辑库区</label>
                <div class="layui-input-block" style="width:182px">
                    <select name="CategoryNo" id="CategoryNo" lay-verify="required" lay-search>
                        <option value=""></option>
@@ -66,7 +66,7 @@
                <div class="layui-input-block" style="width: 182px;">
                    <select name="Type" id="Type" lay-verify="" lay-verify="" lay-search>
                        <option value=""></option>
                        <option value="0">原料</option>
                        <option value="0">原辅料</option>
                        <option value="1">包材</option>
                        <option value="2">成品</option>
                        <option value="3">耗材</option>

 HTML/views/StatisticalReport/InventoryStatistics.html

@@ -65,7 +65,7 @@
                        <div class="layui-input-inline">
                            <select name="Type" id="Type" lay-verify="" lay-verify="" lay-search>
                                <option value=""></option>
                                <option value="0">原料</option>
                                <option value="0">原辅料</option>
                                <option value="1">包材</option>
                                <option value="2">成品</option>
                                <option value="3">耗材</option>
@@ -100,6 +100,14 @@
                        <label class="layui-form-label" style="width: 60px;">所属区域</label>
                        <div class="layui-input-inline">
                            <select name="AreaNo" id="AreaNo" lay-filter="getAreaNo" lay-search>
                                <option value=""></option>
                            </select>
                        </div>
                    </div>
                    <div class="layui-inline">
                        <label class="layui-form-label" style="width: 60px;">逻辑库区</label>
                        <div class="layui-input-inline">
                            <select name="CategoryNo" id="CategoryNo" lay-filter="getCategoryNo" lay-search>
                                <option value=""></option>
                            </select>
                        </div>
@@ -429,7 +437,7 @@
            ]];
            var DetailColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//将表头数据进行url编码
            //#endregion
            function refreshTable2(SkuNo, SkuName, OwnerNo, OwnerName, LotNo, LocatNo, PalletNo, Status, InspectStatus, HouseNo, AreaNo, Type) {
            function refreshTable2(SkuNo, SkuName, OwnerNo, OwnerName, LotNo, LocatNo, PalletNo, Status, InspectStatus, HouseNo, AreaNo,CategoryNo, Type) {
                //#region 自定义表头
                var colsJson2
                var param1 = {
@@ -472,6 +480,7 @@
                        InspectStatus: InspectStatus, //质检状态
                        HouseNo: HouseNo,
                        AreaNo: AreaNo,            // 所属区域
                        CategoryNo:CategoryNo,    //逻辑库区
                        Type: Type,
                    };
                    sendData(IP + "/Statistical/GetInventoryList1", param, 'get', function (res) {
@@ -514,6 +523,7 @@
                var InspectStatus = $("#InspectStatus").val();
                var HouseNo = $("#WareHouseNo").val();                            // 所属仓库
                var AreaNo = $("#AreaNo").val();                            // 所属区域
                var CategoryNo =$("#CategoryNo").val();
                var Type = $("#Type").val();                                    // 物料类型

                if (yemianid == 0) {
@@ -522,9 +532,9 @@
                } else if (yemianid == 1) {
                    quanSkuNo = '';
                    quanLotNo = '';
                    console.log("明细");
                    console.log("明细33");
                    console.log(HouseNo);
                    refreshTable2(SkuNo, SkuName, OwnerNo, OwnerName, LotNo, LocatNo, PalletNo, Status, InspectStatus, HouseNo, AreaNo, Type);
                    refreshTable2(SkuNo, SkuName, OwnerNo, OwnerName, LotNo, LocatNo, PalletNo, Status, InspectStatus, HouseNo, AreaNo,CategoryNo, Type);
                }

            });
@@ -554,6 +564,7 @@
                var InspectStatus = $("#InspectStatus").val();
                var HouseNo = $("#WareHouseNo").val();                            // 所属仓库
                var AreaNo = $("#AreaNo").val();                            // 所属区域
                var CategoryNo = $("#CategoryNo").val();
                var Type = $("#Type").val();                                    // 物料类型
                console.log(data.index);
                yemianid = data.index
@@ -561,8 +572,8 @@
                    console.log("总单");
                    refreshTable(SkuNo, SkuName, OwnerNo, OwnerName, LotNo);
                } else if (yemianid == 1) {
                    console.log("明细");
                    refreshTable2(SkuNo, SkuName, OwnerNo, OwnerName, LotNo, LocatNo, PalletNo, Status, InspectStatus, HouseNo, AreaNo, Type);
                    console.log("明细11");
                    refreshTable2(SkuNo, SkuName, OwnerNo, OwnerName, LotNo, LocatNo, PalletNo, Status, InspectStatus, HouseNo, AreaNo,CategoryNo, Type);
                }
            });

@@ -594,7 +605,7 @@
                            }
                        });
                    } else if (yemianid == 1) {
                        console.log("明细");
                        console.log("明细22");
                        var SkuNo = $("#SkuNo").val();
                        if (SkuNo == '') {
                            SkuNo = quanSkuNo;
@@ -727,6 +738,29 @@
                    }
                });

                //获取逻辑库区下拉框
                sendData(IP + "/Sys/GetMaterialCategories?wareHouseNo=" + val, {}, 'get', function (res) {
                    console.log("ret.data:"+res.data[4].CategoryNo)
                    console.log("code:"+res.code)
                    $("#CategoryNo").empty();
                    $("#CategoryNo").append('<option value =""></option>');
                    if (res.code == 1) { //成功 
                        for (var i = 0; i < res.data.length; i++) {
                            $("#CategoryNo").append('<option value =' + res.data[i].CategoryNo + '>' + res.data[i].CategoryNo + '-' +
                                res.data[i].CategoryName + '</option>');
                        }
                        form.render('select');
                    } else {
                        layer.msg('获取区域信息失败', {
                            icon: 2,
                            time: 2000
                        }, function () {

                            form.render('select');
                        });
                    }
                });

            };

        });

 HTML/views/SystemSettings/Category.html

@@ -23,7 +23,7 @@
                <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
                    <div class="layui-form-item">
                        <div class="layui-inline">
                            <label class="layui-form-label" style="width: 60px;">类别名称</label>
                            <label class="layui-form-label" style="width: 60px;">库区名称</label>
                            <div class="layui-input-inline">
                                <input type="text" id="CategoryName" name="CategoryName" placeholder="请输入类别名称" autocomplete="off" class="layui-input">
                            </div>
@@ -128,17 +128,17 @@
                                });
                                if (res.code == 0) { //成功
                                    for (var k = 0; k < res.data.length; k++) {
                                        if (res.data[k].MenuName == "新增类别") {
                                        if (res.data[k].MenuName == "新增库区") {
                                            $(function() {
                                                $("#approvalBtn").show();
                                            });
                                        }
                                        if (res.data[k].MenuName == "删除类别") {
                                        if (res.data[k].MenuName == "删除库区") {
                                            $(function() {
                                                $(".approvalBtndel").show();
                                            });
                                        }
                                        if (res.data[k].MenuName == "编辑类别") {
                                        if (res.data[k].MenuName == "编辑库区") {
                                            console.log(1)
                                            $(function() {
                                                $(".approvalBtnupt").show();
@@ -182,10 +182,10 @@
                            title: '序号', type: 'numbers', fixed: 'left', width:65
                        }, 
                        {
                            field: 'CategoryNo', title: '类别编码', align: 'center', fixed: 'left',width:100
                            field: 'CategoryNo', title: '库区编码', align: 'center', fixed: 'left',width:100
                        }, 
                        {
                            field: 'CategoryName', title: '类别名称', align: 'center',width:100
                            field: 'CategoryName', title: '库区名称', align: 'center',width:100
                        }, 
                        {
                            field: 'AreaName', title: '绑定区域', align: 'center'
@@ -234,7 +234,7 @@
                        add: function() {
                            layer.open({
                                type: 2,
                                title: '添加类别信息',
                                title: '添加库区信息',
                                content: 'CategoryForm.html',
                                maxmin: true,
                                area: ['530px', '530px'],
@@ -326,7 +326,7 @@
                    //删除
                    if (obj.event === 'del')
                    {
                        layer.confirm('确定删除选中的类别？', function(index) {
                        layer.confirm('确定删除选中的库区？', function(index) {
                            
                            cusid = data.Id;
                            console.log(cusid);
@@ -375,7 +375,7 @@
                        cusId = data.Id;
                        layer.open({
                            type: 2,
                            title: '编辑类别信息',
                            title: '编辑库区信息',
                            content: 'CategoryForm.html?id=' + cusId,
                            maxmin: true,
                            area: ['530px', '530px'],

 HTML/views/SystemSettings/CategoryForm.html

@@ -2,7 +2,7 @@
<html>
    <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" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
@@ -11,15 +11,15 @@
    <body>
        <div class="layui-form" lay-filter="layuiadmin-app-form-list" id="layuiadmin-app-form-list" style="padding: 20px 30px 0 0;">
            <div class="layui-form-item">
                <label class="layui-form-label">类别编码</label>
                <label class="layui-form-label">库区编码</label>
                <div class="layui-input-block">
                    <input type="text" name="CategoryNo" placeholder="请输入类别编码" lay-verify="required" autocomplete="off" class="layui-input">
                    <input type="text" name="CategoryNo" placeholder="请输入库区编码" lay-verify="required" autocomplete="off" class="layui-input">
                </div>
            </div>
            <div class="layui-form-item">
                <label class="layui-form-label">类别名称</label>
                <label class="layui-form-label">库区名称</label>
                <div class="layui-input-block">
                    <input type="text" name="CategoryName" placeholder="请输入类别名称" lay-verify="required" autocomplete="off" class="layui-input">
                    <input type="text" name="CategoryName" placeholder="请输入库区名称" lay-verify="required" autocomplete="off" class="layui-input">
                </div>
            </div>
            <div class="layui-form-item" onchange="abc()">

 HTML/views/WareHouseSetting/Area.html

@@ -47,6 +47,7 @@
                                    <option value="2">原料区</option>
                                    <option value="3">包材区</option>
                                    <option value="4">空托区</option>
                                    <option value="5">耗材区</option>
                                </select>
                            </div>
                        </div>

 HTML/views/WareHouseSetting/AreaAddFrom.html

@@ -61,6 +61,7 @@
                        <option value="2">原料区</option>
                        <option value="3">包材区</option>
                        <option value="4">空托区</option>
                        <option value="5">耗材区</option>
                    </select>
                </div>
            </div>

 HTML/views/WareHouseSetting/AreaFrom.html

@@ -37,6 +37,7 @@
                        <option value="2">原料区</option>
                        <option value="3">包材区</option>
                        <option value="4">空托区</option>
                        <option value="5">耗材区</option>
                    </select>
                </div>
            </div>

 HTML/views/WareHouseSetting/Roadway.html

@@ -47,6 +47,7 @@
                                    <option value="2">原料区</option>
                                    <option value="3">包材区</option>
                                    <option value="4">空托区</option>
                                    <option value="5">耗材区</option>
                                </select>
                            </div>
                        </div>

 HTML/views/WareHouseSetting/RoadwayFrom.html

@@ -37,6 +37,8 @@
                        <option value="2">原料区</option>
                        <option value="3">包材区</option>
                        <option value="4">空托区</option>
                        <option value="5">耗材区</option>

                    </select>
                </div>
            </div>

 Wms/Model/ModelDto/DataDto/StockDetailDto.cs

@@ -208,5 +208,10 @@
        /// 物料类型
        /// </summary>
        public string Type { get; set; }
        /// <summary>
        /// 物料类型
        /// </summary>
        public string CategoryNo { get; set; }
        
    }
}

 Wms/WMS.BLL/DataServer/StockServer.cs

@@ -137,7 +137,7 @@
        /// <param name="ownerName">货主名称</param>
        /// <returns></returns>
        public List<StockDetailDto> GetInventoryList1(string skuNo, string skuName, string lotNo, string locatNo, string palletNo, 
            string status, string inspectStatus, string ownerNo, string ownerName, string houseNo, string areaNo, string type)
            string status, string inspectStatus, string ownerNo, string ownerName, string houseNo, string areaNo, string categoryNo, string type)
        {
            string str = "select detail.*,sku.Type,house.WareHouseNo + '-' + house.WareHouseName as WareHouseName," +
                "roadway.RoadwayNo + '-' + roadway.RoadwayName as RoadwayName,area.AreaNo + '-' + area.AreaName as AreaName  " +
@@ -146,6 +146,7 @@
                "left join SysWareHouse house on detail.WareHouseNo = house.WareHouseNo " +
                "left join SysStorageArea area on detail.AreaNo = area.AreaNo " +
                "left join SysMaterials as sku on detail.skuNo = sku.skuNo " +
                "left join SysMaterialCategory as cat on sku.CategoryNo = cat.CategoryNo " +
                "Where detail.IsDel = @isdel";
            //判断物料编码是否为空
            if (!string.IsNullOrEmpty(skuNo))
@@ -200,6 +201,10 @@
            {
                str += " and area.AreaNo = @areaNo";
            }
            if (!string.IsNullOrEmpty(categoryNo))
            {
                str += " and area.CategoryNo = @categoryNo";
            }
            if (!string.IsNullOrEmpty(type))
            {
                str += " and sku.Type = @type";
@@ -221,6 +226,7 @@
                ownerName = "%" + ownerName + "%",          //货主名称
                wareHouseNo = houseNo,                      
                areaNo = areaNo,                         //所属区域
                categoryNo = categoryNo,                //逻辑库区
                type = type
            });
            return stockDetailsList;

 Wms/WMS.BLL/SysServer/StorageRoadwayServer.cs

@@ -226,6 +226,9 @@
                    case "4":
                        str = "空托区";
                        break;
                    case "5":
                        str = "耗材区";
                        break;
                }
                return str;
            }

 Wms/WMS.IBLL/IDataServer/IStockServer.cs

@@ -31,7 +31,7 @@
        /// <param name="inspectStatus">质检状态</param>
        /// <returns></returns>
        List<StockDetailDto> GetInventoryList1(string skuNo, string skuName, string lotNo, string locatNo, string palletNo, 
            string status, string inspectStatus, string ownerNo, string ownerName, string houseNo, string areaNo, string type);
            string status, string inspectStatus, string ownerNo, string ownerName, string houseNo, string areaNo,string categoryNo, string type);

        #endregion
        

 Wms/Wms/Controllers/DownApiController.cs

@@ -35,7 +35,7 @@
        private readonly IPdaSoServer _pdaSoSvc;//空托出库Svc
        private readonly IPdaAsnServer _paAsnSvc;//空托跺绑定

        public DownApiController(IOptions<ApiUrlConfig> setting, IExportNoticeServer exNoticeSvc, IPalletBindServer asnPalletBindSvc, IStockCheckServer crCheckSvc, ITaskServer taskSvc, IPdaSoServer pdaSoSvc)
        public DownApiController(IOptions<ApiUrlConfig> setting, IExportNoticeServer exNoticeSvc, IPalletBindServer asnPalletBindSvc, IStockCheckServer crCheckSvc, ITaskServer taskSvc, IPdaSoServer pdaSoSvc,IPdaAsnServer paAsnSvc)
        {
            _config = setting.Value;
            _exNoticeSvc = exNoticeSvc;
@@ -43,6 +43,7 @@
            _crCheckSvc = crCheckSvc;
            _taskSvc = taskSvc;
            _pdaSoSvc = pdaSoSvc;
            _paAsnSvc = paAsnSvc;
        }

        #region WMS接口 调用下游系统接口 

 Wms/Wms/Controllers/StatisticalController.cs

@@ -71,10 +71,10 @@
        /// <returns></returns>
        [HttpGet]
        public IActionResult GetInventoryList1(string skuNo, string skuName, string lotNo, string locatNo, string palletNo, 
            string status, string inspectStatus, string ownerNo, string ownerName,string HouseNo,string AreaNo, string Type)
            string status, string inspectStatus, string ownerNo, string ownerName,string HouseNo,string AreaNo, string CategoryNo, string Type)
        {
            List<StockDetailDto> stockDetailsList = _stock.GetInventoryList1(skuNo, skuName, lotNo, locatNo, palletNo,
                status, inspectStatus, ownerNo, ownerName, HouseNo, AreaNo, Type);
                status, inspectStatus, ownerNo, ownerName, HouseNo, AreaNo, CategoryNo, Type);
            return Ok(new
            {
                data = stockDetailsList,