修改物料管理选择包装因数据量大不显示问题；根据客户需求修改添加入库单校验生产日期规则；

wxw

2025-10-23 7fe73fec1f10f151aaf31cc1ade7b4ed5126c3d5

修改物料管理选择包装因数据量大不显示问题；根据客户需求修改添加入库单校验生产日期规则；

 HTML/views/ASNSetting/ArrivalNotice.html

@@ -175,7 +175,7 @@
                    <script type="text/html" id="toolbarDemo1">
                        {{# function GetBtn1(d){
                            var html = ''; 
                            if (d.Status == '0' && (d.Origin == '录入' || d.Origin == '采购单')) {
                            if (d.Status == '0' && (d.Origin == '录入' || d.Origin == '导入' || d.Origin == '采购单')) {
                                html += `<a class="layui-btn layui-btn-normal layui-btn-xs editClass" lay-event="edit">
                                    <i class="layui-icon layui-icon-edit"></i>编辑</a>`;
                            }

 HTML/views/BaseSetting/MaterialsForm.html

@@ -300,20 +300,21 @@
            var sel2 = false;
            function getPackagList(){
                var packagList=[];
                for (let index = 1; index < 5; index++) {
                    //获取包装下拉菜单 PackagNo
                    synData(IP + "/Basis/GetPackagList?page="+index, {}, 'get', function (res) {

                let shouldContinue = true;
                let index = 1;
                while (shouldContinue) {
                    synData(IP + "/Basis/GetPackagList?page="+index, {}, 'get', function (res, status, error) {
                        if (res.code == 0) {
                            if(res.data.length>0){
                                packagList.push(res.data)
                                packagList.push(res.data);
                                index++;						
                            }else{
                                return;
                            }
							
                                shouldContinue=false;
                            }							
                        }else {
                            return;
                            shouldContinue=false;
                        }

                    });
                }
                if(packagList.length>0){                

 Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs

@@ -410,18 +410,18 @@
                        }
                        string lot1 = detailModel.Lot1;
                        string lot2 = detailModel.Lot2;
                        if (sku.IsInspect == "0")//是否免检，0：否 1：是
                        if (sku.IsControlled == "0")//是否请验，0：是 1：否
                        {
                            //不免检物料 生产日期、有效期不能为空
                            //需要请验物料 生产日期、有效期不能为空
                            DateTime lot12;
                            DateTime lot22;
                            if (!DateTime.TryParse(detailModel.Lot1, out lot12))
                            {
                                throw new Exception("不免检物料生产日期转换失败");
                                throw new Exception("需要请验物料生产日期转换失败");
                            }
                            if (!DateTime.TryParse(detailModel.Lot2, out lot22))
                            {
                                throw new Exception("不免检物料过期日期转换失败");
                                throw new Exception("需要请验料过期日期转换失败");
                            }
                            lot1 = lot12.ToString("yyyy-MM-dd");
                            lot2 = lot22.ToString("yyyy-MM-dd");

 Wms/WMS.BLL/SysServer/MaterialsServer.cs

@@ -229,9 +229,8 @@
        /// <returns></returns>
        public async Task<List<SysPackag>> GetPackagList(int page)
        {
            int pageSize = 3000;
            int skipCount = pageSize * (page - 1);
            return await Db.Queryable<SysPackag>().Where(s => s.IsDel == "0").Skip(skipCount).Take(pageSize).ToListAsync();
            int pageSize = 1000;
            return await Db.Queryable<SysPackag>().Where(s => s.IsDel == "0").ToPageListAsync(page, pageSize);
        }

        #endregion

 Wms/Wms/Controllers/BasisController.cs

@@ -717,10 +717,10 @@
        /// </summary>
        /// <returns></returns>
        [HttpGet]
        public async Task<List<SysPackag>> GetPackagList(int page)
        public async Task<IActionResult> GetPackagList(int page)
        {
            var data = await _mate.GetPackagList(page);
            return data;
            return Ok(new { code = 0, count = data.Count, msg = "物料信息", data = data });
        }

        #endregion