修改物料管理显示和编辑

wxw

9 天以前 e1937ea7d68c72e61095538d5fec4e7d795f78c9

修改物料管理显示和编辑

 HTML/views/BaseSetting/Materials.html

@@ -339,15 +339,7 @@
                        {
                            title: '操作', fixed: 'right', align: 'center', toolbar: '#table-content-list', width: 170
                        }
                    ]],parseData: function(res) { // 数据解析回调
    console.log('原始返回数据:', res);
    return {
      "code": res.code, // 解析接口状态
      "msg": res.msg, // 解析提示文本
      "count": res.count, // 解析数据长度
      "data": res.data // 解析数据列表
    };
  },
                    ]]
                });
                
            }

 HTML/views/BaseSetting/MaterialsForm.html

@@ -295,26 +295,37 @@
            //     }

            // });

            getPackagList();
            var sel2 = false;
            function getPackagList(){
                var packagList=[];
                for (let index = 1; index < 5; index++) {
            //获取包装下拉菜单 PackagNo
            synData(IP + "/Basis/GetPackagList", {}, 'get', function (res) {
                if (res.code == 0) //成功
                {
                    for (var i = 0; i < res.data.length; i++) {
                        $("#PackagNo").append('<option value =' + res.data[i].PackagNo + '>' + res.data[i].PackagName + '</option>');
                    synData(IP + "/Basis/GetPackagList?page="+index, {}, 'get', function (res) {
                        if (res.code == 0) {
                            if(res.data.length>0){
                                packagList.push(res.data)
                            }else{
                                return;
                            }
							
                        }else {
                            return;
                        }

                    });
                }
                if(packagList.length>0){				
                    for (var i = 0; i < packagList.length; i++) {
                        var itemList=packagList[i];
                        for(var j = 0; j < itemList.length; j++){
                            $("#PackagNo").append('<option value =' + itemList[j].PackagNo + '>' + itemList[j].PackagName + '</option>');
                        }						
                    }
                    form.render('select');
                    sel2 = true;
                }
                else //不成功
                {
                    layer.msg(res.msg, {
                        icon: 2,
                        time: 2000 //2秒关闭（如果不配置，默认是3秒）
                    }, function () { sel2 = true; });
                }

            });

            var id = getQueryString('id');
            if (!id) {
@@ -377,6 +388,28 @@

            }
            form.render('select');
            }
            //获取包装下拉菜单 PackagNo
            // synData(IP + "/Basis/GetPackagList", {}, 'get', function (res) {
            //     if (res.code == 0) //成功
            //     {
            //         for (var i = 0; i < res.data.length; i++) {
            //             $("#PackagNo").append('<option value =' + res.data[i].PackagNo + '>' + res.data[i].PackagName + '</option>');
            //         }
            //         form.render('select');
            //         sel2 = true;
            //     }
            //     else //不成功
            //     {
            //         layer.msg(res.msg, {
            //             icon: 2,
            //             time: 2000 //2秒关闭（如果不配置，默认是3秒）
            //         }, function () { sel2 = true; });
            //     }

            // });

			
        });

        //获取浏览器参数

 Wms/Model/InterFaceModel/HttpModel.cs

@@ -698,6 +698,7 @@
            /// 地址
            /// </summary>
            public string Address { get; set; }
            public string streetAddress { get; set; }
            /// <summary>
            /// 联系人
            /// </summary>

 Wms/WMS.BLL/SysServer/MaterialsServer.cs

@@ -61,7 +61,7 @@
        {
            Expression<Func<SysMaterials, bool>> item = Expressionable.Create<SysMaterials>()
             .AndIF(!string.IsNullOrWhiteSpace(model.SkuNo), it => it.SkuNo.Contains(model.SkuNo.Trim()))
             .AndIF(!string.IsNullOrWhiteSpace(model.SkuName), it => it.SkuNo.Contains(model.SkuName.Trim()))
             .AndIF(!string.IsNullOrWhiteSpace(model.SkuName), it => it.SkuName.Contains(model.SkuName.Trim()))
             .AndIF(!string.IsNullOrWhiteSpace(model.AuditStatusNo), it => it.AuditStatusNo == model.AuditStatusNo)
             .AndIF(!string.IsNullOrWhiteSpace(model.Type), it => it.Type == model.Type)
             .AndIF(!string.IsNullOrWhiteSpace(model.IsControlled), it => it.IsControlled == model.IsControlled)
@@ -80,6 +80,7 @@
               .LeftJoin<SysMaterialCategory>((a, b, c, d) => a.CategoryNo == d.CategoryNo && d.IsDel == "0")
               .Select((a, b, c, d) => new MaterialsDto()
               {
                   Id = a.Id,
                   SkuNo = a.SkuNo,
                   SkuName = a.SkuName,
                   Standard = a.Standard,
@@ -226,9 +227,11 @@
        /// 获取包装信息列表
        /// </summary>
        /// <returns></returns>
        public async Task<List<SysPackag>> GetPackagList()
        public async Task<List<SysPackag>> GetPackagList(int page)
        {
            return await Db.Queryable<SysPackag>().Where(s => s.IsDel == "0").ToListAsync();
            int pageSize = 3000;
            int skipCount = pageSize * (page - 1);
            return await Db.Queryable<SysPackag>().Where(s => s.IsDel == "0").Skip(skipCount).Take(pageSize).ToListAsync();
        }

        #endregion

 Wms/WMS.IBLL/ISysServer/IMaterialsServer.cs

@@ -83,7 +83,7 @@
        /// 获取包装信息列表
        /// </summary>
        /// <returns></returns>
        Task<List<SysPackag>> GetPackagList();
        Task<List<SysPackag>> GetPackagList(int page);

        #endregion


 Wms/Wms/Controllers/BasisController.cs

@@ -717,9 +717,10 @@
        /// </summary>
        /// <returns></returns>
        [HttpGet]
        public async Task<List<SysPackag>> GetPackagList()
        public async Task<List<SysPackag>> GetPackagList(int page)
        {
            return await _mate.GetPackagList();
            var data = await _mate.GetPackagList(page);
            return data;
        }

        #endregion