修改添加物料编码重复的提示消息，编辑物料编码重复时需过滤本身，修改编辑物料信息成功的提示消息，物料类别区域设为必填项，包装管理一级包装添加或编辑时不可...

yuyou_x

2024-03-13 c388b869f9fc019a2dadb41f25f240f4e4aaf31d

修改添加物料编码重复的提示消息，编辑物料编码重复时需过滤本身，修改编辑物料信息成功的提示消息，物料类别区域设为必填项，包装管理一级包装添加或编辑时不可为空，类别编码、包装编码不可更改。

 HTML/views/BaseSetting/Materials.html

@@ -467,6 +467,12 @@
                                                        doing = true;
                                                    });
                                                }
                                                else if (res.code == 2) {
                                                    layer.msg("物料编码或名称重复，添加失败！", {
                                                        icon: 2,
                                                        time: 2000 //2秒关闭（如果不配置，默认是3秒）
                                                    }, function() {doing = true;});
                                                }
                                                else //不成功
                                                {
                                                    layer.msg(res.msg, {

 HTML/views/BaseSetting/PackagFrom.html

@@ -59,10 +59,10 @@
                <div class="layui-inline">
                    <label class="layui-form-label" style="width: auto;">一级包装</label>
                    <div class="layui-input-inline">
                        <input type="number" name="OnelevelNum" placeholder="请输入数量" autocomplete="off" class="layui-input" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')">
                        <input type="number" name="OnelevelNum" lay-verify="required" placeholder="请输入数量" autocomplete="off" class="layui-input" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')">
                    </div>
                    <div class="layui-input-inline" style="float: left;left: 40px;">
                        <input type="text" name="OnelevelUnit" placeholder="请输入单位描述" autocomplete="off" class="layui-input">
                        <input type="text" name="OnelevelUnit" lay-verify="required" placeholder="请输入单位描述" autocomplete="off" class="layui-input">
                    </div>
                </div>
            </div>
@@ -153,6 +153,10 @@
                        console.log(res);
                        //console.log(res.data.IsValid == 0);
                        if (res.code == 0) { //成功
                            //包装编码
                            if (res.data.SkuNo != "") {
                                $("input[name='PackCode']").attr("disabled", "disabled")
                            }
                            //页面赋值
                            $("input[name='PackCode']").val(res.data.PackagNo);
                            $("input[name='PackDescribe']").val(res.data.PackagName);

 HTML/views/SystemSettings/CategoryForm.html

@@ -89,6 +89,10 @@
                        {
                            var str = res.data.AreaNo;
                            arr = str.split(',');
                            //包装编码
                            if (res.data.SkuNo != "") {
                                $("input[name='CategoryNo']").attr("disabled", "disabled")
                            }
                            // console.log(arr)
                            $("input[name='CategoryNo']").val(res.data.CategoryNo); //类别号
                            $("input[name='CategoryName']").val(res.data.CategoryName); //类别名称

 Wms/WMS.BLL/SysServer/MaterialCategoryServer.cs

@@ -202,12 +202,11 @@
                var categoryInfo = Db.Queryable<SysMaterialCategory>().First(a => a.IsDel == "0" && a.CategoryNo == category.CategoryNo);
                //获取区域信息
                var area = Db.Queryable<SysStorageArea>().Where(a => category.AreaNo.Contains(a.AreaNo) && a.IsDel == "0").ToList();

                if (categoryInfo != null)
                {
                    throw new Exception("当前类别信息已被创建，请重新填写信息！");
                }
                if (area == null)
                if (area.Count == 0)
                {
                    throw new Exception("当前选择区域信息异常，请重新选择或联系管理员！");
                }

 Wms/WMS.BLL/SysServer/MaterialsServer.cs

@@ -150,7 +150,7 @@

                if (count > 0)
                {
                    throw new Exception("物料编码重复");
                    return 2;
                }


@@ -209,14 +209,6 @@
            //捕获异常
            try
            {

                int count = GetMateByNo(matedto.SkuNo);

                if (count > 0)
                {
                    throw new Exception("物料编码重复");
                }

                if (matedto.AdventTime > 365 && matedto.AdventTime < 30)
                {
                    return 2;

 Wms/Wms/Controllers/BasisController.cs

@@ -1366,7 +1366,7 @@
                //判断是否编辑成功
                if (i == 0)
                {
                    return Ok(new { data = i, code = 1, msg = "失败" });
                    return Ok(new { data = i, code = 1, msg = "修改失败" });
                }
                else if (i == 2)
                {
@@ -1379,7 +1379,7 @@
                else
                {
                    await _operation.InsertOperation("基础信息", "物料管理", matedto.SkuNo, "修改", "编辑物料信息 物料号：" + matedto.SkuNo, uid);
                    return Ok(new { data = i, code = 0, msg = "成功" });
                    return Ok(new { data = i, code = 0, msg = "修改成功" });
                }
            }
            catch (Exception ex)