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");
@@ -640,24 +640,24 @@

                        // 2. 将字符串类型的IsControlled转换为bool（根据实际取值规则调整）
                        // 比如："1"表示受控，"0"表示不受控；或"True"/"False"；或"是"/"否"
                        bool isControlled;
                        if (!bool.TryParse(material.IsControlled, out isControlled))
                        {
                            // 处理非标准格式（如"1"/"0"）
                            isControlled = material.IsControlled == "1" ||
                                           string.Equals(material.IsControlled, "是", StringComparison.OrdinalIgnoreCase);
                        }
                        //bool isControlled;
                        //if (!bool.TryParse(material.IsControlled, out isControlled))
                        //{
                        //    // 处理非标准格式（如"1"/"0"）
                        //    isControlled = material.IsControlled == "1" ||
                        //                   string.Equals(material.IsControlled, "是", StringComparison.OrdinalIgnoreCase);
                        //}

                        // 3. 根据受控状态验证日期
                        if (isControlled)
                        if (material.IsControlled=="0")
                        {
                            // 受控状态：生产日期必填
                            if (string.IsNullOrWhiteSpace(detailModel.Lot1))
                                return $"-1:物料{detailModel.SkuNo}为受控物料，生产日期不可为空;";
                                return $"-1:物料{detailModel.SkuNo}为需请验物料，生产日期不可为空;";

                            // 受控状态：过期日期必填
                            if (string.IsNullOrWhiteSpace(detailModel.Lot2))
                                return $"-1:物料{detailModel.SkuNo}为受控物料，过期日期不可为空;";
                                return $"-1:物料{detailModel.SkuNo}为需请验物料，过期日期不可为空;";

                            // 验证日期格式有效性
                            if (!DateTime.TryParse(detailModel.Lot1, out DateTime productionDate))
@@ -673,14 +673,14 @@
                        // 不受控状态：日期非必填，无需验证

                        // 原有批次相关验证（保留）
                        if (TypeLot.Contains(model.Type))
                        {
                            if (string.IsNullOrWhiteSpace(detailModel.Lot1))
                                throw new Exception("生产日期不可为空!");
                        //if (TypeLot.Contains(model.Type))
                        //{
                        //    if (string.IsNullOrWhiteSpace(detailModel.Lot1))
                        //        throw new Exception("生产日期不可为空!");

                            if (string.IsNullOrWhiteSpace(detailModel.Lot2))
                                throw new Exception("过期日期不可为空!");
                        }
                        //    if (string.IsNullOrWhiteSpace(detailModel.Lot2))
                        //        throw new Exception("过期日期不可为空!");
                        //}

                        // 验证物料和批次号是否重复
                        if (dbDetailModels.Any(m => m.SkuNo == detailModel.SkuNo

 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