From c388b869f9fc019a2dadb41f25f240f4e4aaf31d Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期三, 13 三月 2024 11:48:45 +0800
Subject: [PATCH] 修改添加物料编码重复的提示消息，编辑物料编码重复时需过滤本身，修改编辑物料信息成功的提示消息，物料类别区域设为必填项，包装管理一级包装添加或编辑时不可为空，类别编码、包装编码不可更改。
---
HTML/views/BaseSetting/PackagFrom.html | 8 ++++++--
HTML/views/BaseSetting/Materials.html | 6 ++++++
HTML/views/SystemSettings/CategoryForm.html | 4 ++++
Wms/WMS.BLL/SysServer/MaterialCategoryServer.cs | 3 +--
Wms/WMS.BLL/SysServer/MaterialsServer.cs | 10 +---------
Wms/Wms/Controllers/BasisController.cs | 4 ++--
6 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/HTML/views/BaseSetting/Materials.html b/HTML/views/BaseSetting/Materials.html
index 69347f6..737e044 100644
--- a/HTML/views/BaseSetting/Materials.html
+++ b/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, {
diff --git a/HTML/views/BaseSetting/PackagFrom.html b/HTML/views/BaseSetting/PackagFrom.html
index 9a35ff7..00f81dc 100644
--- a/HTML/views/BaseSetting/PackagFrom.html
+++ b/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);
diff --git a/HTML/views/SystemSettings/CategoryForm.html b/HTML/views/SystemSettings/CategoryForm.html
index 199e6e7..dbc6bcb 100644
--- a/HTML/views/SystemSettings/CategoryForm.html
+++ b/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); //绫诲埆鍚嶇О
diff --git a/Wms/WMS.BLL/SysServer/MaterialCategoryServer.cs b/Wms/WMS.BLL/SysServer/MaterialCategoryServer.cs
index 09f7b18..78b2aef 100644
--- a/Wms/WMS.BLL/SysServer/MaterialCategoryServer.cs
+++ b/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("褰撳墠閫夋嫨鍖哄煙淇℃伅寮傚父锛岃閲嶆柊閫夋嫨鎴栬仈绯荤鐞嗗憳锛�");
}
diff --git a/Wms/WMS.BLL/SysServer/MaterialsServer.cs b/Wms/WMS.BLL/SysServer/MaterialsServer.cs
index eb05ab5..6492fb9 100644
--- a/Wms/WMS.BLL/SysServer/MaterialsServer.cs
+++ b/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;
diff --git a/Wms/Wms/Controllers/BasisController.cs b/Wms/Wms/Controllers/BasisController.cs
index 6025132..a737dda 100644
--- a/Wms/Wms/Controllers/BasisController.cs
+++ b/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)
--
Gitblit v1.8.0