Merge branch 'yyk'

yuyou_x

2024-01-31 7d5e208f291c57e8d4c49c0c965cc6c736f9b31a

 Wms/Wms/Controllers/BasisController.cs

@@ -1189,7 +1189,7 @@
            }
            catch (Exception ex)
            {
                return Ok(new { data = "", code = 1, msg = "编辑功能异常："+ ex.Message });
                return Ok(new { data = "", code = 1, msg = "编辑功能异常：" + ex.Message });
            }
        }

@@ -1232,11 +1232,12 @@
        /// <param name="isControlled">是否受控</param>
        /// <param name="isInspect">是否免检</param>
        /// <param name="environment">存储环境</param>
        /// <param name="categoryNo">类别编码</param>
        /// <returns></returns>
        [HttpGet]
        public IActionResult GetMateList(string skuNo, string skuName, string auditStatusNo, string type, string isControlled, string isInspect, string environment)
        public IActionResult GetMateList(string skuNo, string skuName, string auditStatusNo, string type, string isControlled, string isInspect, string environment, string categoryNo)
        {
            List<MaterialsDto> matedto = _mate.GetMateList(skuNo, skuName, auditStatusNo, type, isControlled, isInspect, environment);
            List<MaterialsDto> matedto = _mate.GetMateList(skuNo, skuName, auditStatusNo, type, isControlled, isInspect, environment, categoryNo);
            return Ok(new
            {
                data = matedto,
@@ -1282,28 +1283,10 @@
                matedto.CreateUser = uid;
                //新增
                int i = await _mate.AddMate(matedto);
                //判断是否新增成功
                if (i == 0)
                {
                    return Ok(new { data = i, code = 1, msg = "失败" });
                }
                else if (i == 2)
                {
                    return Ok(new { data = i, code = 2, msg = "临期天数不可大于365及小于30" });
                }
                else if (i == 3)
                {
                    return Ok(new { data = i, code = 3, msg = "失物料号必须唯一败" });
                }
                //else if (i == 4)
                //{
                //    return Ok(new { data = i, code = 4, msg = "低库存不可高于1000" });
                //}
                else
                {
                    await _operation.InsertOperation("基础信息", "物料管理", matedto.SkuNo, "添加", "添加物料信息 物料号：" + matedto.SkuNo, uid);
                    return Ok(new { data = i, code = 0, msg = "成功" });
                }

                await _operation.InsertOperation("基础信息", "物料管理", matedto.SkuNo, "添加", "添加物料信息 物料号：" + matedto.SkuNo, uid);
                return Ok(new { data = i, code = 0, msg = "成功" });

            }
            catch (Exception ex)
            {