From 49b484da5f9d4cde8e47764891a5e112b2883e5d Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期四, 01 二月 2024 09:34:18 +0800
Subject: [PATCH] 修改物料类别，调整物料信息页面
---
HTML/views/BaseSetting/CustomerFrom.html | 1 +
HTML/views/BaseSetting/Materials.html | 6 +++---
HTML/views/BaseSetting/Customer.html | 3 +++
HTML/views/BaseSetting/MaterialsForm.html | 8 ++++----
HTML/views/SystemSettings/CategoryForm.html | 4 ++--
HTML/views/SystemSettings/Category.html | 2 +-
Wms/WMS.BLL/SysServer/MaterialCategoryServer.cs | 15 +++++++++++----
7 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/HTML/views/BaseSetting/Customer.html b/HTML/views/BaseSetting/Customer.html
index 0da9d9a..b6ec76e 100644
--- a/HTML/views/BaseSetting/Customer.html
+++ b/HTML/views/BaseSetting/Customer.html
@@ -54,6 +54,7 @@
<option value=""></option>
<option value="0">瀹㈡埛</option>
<option value="1">渚涘簲鍟�</option>
+ <option value="2">璐т富</option>
</select>
</div>
</div>
@@ -187,6 +188,8 @@
return "瀹㈡埛";
} else if(d.Type ==1){
return "渚涜揣鍟�";
+ } else if(d.Type ==2){
+ return "璐т富";
}else{
return "";
}
diff --git a/HTML/views/BaseSetting/CustomerFrom.html b/HTML/views/BaseSetting/CustomerFrom.html
index a936d1b..3cd5df4 100644
--- a/HTML/views/BaseSetting/CustomerFrom.html
+++ b/HTML/views/BaseSetting/CustomerFrom.html
@@ -34,6 +34,7 @@
<option value=""></option>
<option value="0">瀹㈡埛</option>
<option value="1">渚涘簲鍟�</option>
+ <option value="2">璐т富</option>
</select>
</div>
</div>
diff --git a/HTML/views/BaseSetting/Materials.html b/HTML/views/BaseSetting/Materials.html
index 83582b5..7732a42 100644
--- a/HTML/views/BaseSetting/Materials.html
+++ b/HTML/views/BaseSetting/Materials.html
@@ -59,7 +59,7 @@
<option value="1">鍖呮潗</option>
<option value="2">鎴愬搧</option>
<option value="3">鑰楁潗</option>
- <option value="4">鍗婃垚鍝�</option>
+ <option value="4">涓棿鍝�</option>
</select>
</div>
</div>
@@ -93,7 +93,7 @@
<option value=""></option>
<option value="0">甯告俯</option>
<option value="1">浣庢俯</option>
- <option value="3">骞茬嚗閫氶</option>
+ <!-- <option value="3">骞茬嚗閫氶</option> -->
</select>
</div>
</div>
@@ -144,7 +144,7 @@
{{# } else if(d.Type=='3') { }}
<p>鑰楁潗</p>
{{# } else if(d.Type=='4') { }}
- <p>鍗婃垚鍝�</p>
+ <p>涓棿鍝�</p>
{{# } }}
</script>
diff --git a/HTML/views/BaseSetting/MaterialsForm.html b/HTML/views/BaseSetting/MaterialsForm.html
index 98c9ebe..4a9e799 100644
--- a/HTML/views/BaseSetting/MaterialsForm.html
+++ b/HTML/views/BaseSetting/MaterialsForm.html
@@ -64,7 +64,7 @@
<option value="1">鍖呮潗</option>
<option value="2">鎴愬搧</option>
<option value="3">鑰楁潗</option>
- <option value="4">鍗婃垚鍝�</option>
+ <option value="4">涓棿鍝�</option>
</select>
</div>
</div>
@@ -89,9 +89,9 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">瑙勬牸</label>
+ <label class="layui-form-label">瑙勬牸/鍨嬪彿</label>
<div class="layui-input-block" style="width: 182px;">
- <input type="text" name="Standard" placeholder="璇疯緭鍏ヨ鏍�" lay-verify="" autocomplete="off" class="layui-input">
+ <input type="text" name="Standard" placeholder="璇疯緭鍏ヨ鏍�/鍨嬪彿" lay-verify="" autocomplete="off" class="layui-input">
</div>
</div>
</div>
@@ -123,7 +123,7 @@
<option value=""></option>
<option value="0">甯告俯</option>
<option value="1">浣庢俯</option>
- <option value="3">骞茬嚗閫氶</option>
+ <!-- <option value="3">骞茬嚗閫氶</option> -->
</select>
</div>
</div>
diff --git a/HTML/views/SystemSettings/Category.html b/HTML/views/SystemSettings/Category.html
index 661dc76..25f834e 100644
--- a/HTML/views/SystemSettings/Category.html
+++ b/HTML/views/SystemSettings/Category.html
@@ -177,7 +177,7 @@
title: '搴忓彿', type: 'numbers', fixed: 'left', width:65
},
{
- field: 'CategoryNo', title: '绫诲埆缂栧彿', align: 'center', fixed: 'left',width:100
+ field: 'CategoryNo', title: '绫诲埆缂栫爜', align: 'center', fixed: 'left',width:100
},
{
field: 'CategoryName', title: '绫诲埆鍚嶇О', align: 'center',width:100
diff --git a/HTML/views/SystemSettings/CategoryForm.html b/HTML/views/SystemSettings/CategoryForm.html
index 5276263..199e6e7 100644
--- a/HTML/views/SystemSettings/CategoryForm.html
+++ b/HTML/views/SystemSettings/CategoryForm.html
@@ -11,9 +11,9 @@
<body>
<div class="layui-form" lay-filter="layuiadmin-app-form-list" id="layuiadmin-app-form-list" style="padding: 20px 30px 0 0;">
<div class="layui-form-item">
- <label class="layui-form-label">绫诲埆缂栧彿</label>
+ <label class="layui-form-label">绫诲埆缂栫爜</label>
<div class="layui-input-block">
- <input type="text" name="CategoryNo" placeholder="璇疯緭鍏ョ被鍒紪鍙�" lay-verify="required" autocomplete="off" class="layui-input">
+ <input type="text" name="CategoryNo" placeholder="璇疯緭鍏ョ被鍒紪鐮�" lay-verify="required" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-form-item">
diff --git a/Wms/WMS.BLL/SysServer/MaterialCategoryServer.cs b/Wms/WMS.BLL/SysServer/MaterialCategoryServer.cs
index 9789bf9..09f7b18 100644
--- a/Wms/WMS.BLL/SysServer/MaterialCategoryServer.cs
+++ b/Wms/WMS.BLL/SysServer/MaterialCategoryServer.cs
@@ -60,7 +60,7 @@
{
Id = a.Id,
- CategoryNo = a.CategoryNo, //绫诲埆鍙�
+ CategoryNo = a.CategoryNo, //绫诲埆缂栫爜
CategoryName = a.CategoryName, //绫诲埆鍚嶇О
AreaNo = a.AreaNo, //鍖哄煙鍙�
@@ -215,7 +215,7 @@
Db.BeginTran();
SysMaterialCategory list = new SysMaterialCategory()
{
- CategoryNo = category.CategoryNo, //绫诲埆鍙�
+ CategoryNo = category.CategoryNo, //绫诲埆缂栫爜
CategoryName = category.CategoryName, //绫诲埆鍚嶇О
AreaNo = category.AreaNo, //鍖哄煙缂栫爜
@@ -256,6 +256,8 @@
string msg = "";
//鑾峰彇绫诲埆淇℃伅
var categoryInfo = Db.Queryable<SysMaterialCategory>().First(a => a.IsDel == "0" && a.Id == category.Id);
+ //鑾峰彇绫诲埆瀵瑰簲鐗╂枡淇℃伅
+ var matelist = Db.Queryable<SysMaterials>().Where(a=>a.IsDel == "0" && a.CategoryNo == categoryInfo.CategoryNo).ToList();
//鑾峰彇鍖哄煙淇℃伅
var area = Db.Queryable<SysStorageArea>().First(a => category.AreaNo.Contains(a.AreaNo) && a.IsDel == "0");
@@ -265,16 +267,21 @@
}
Db.BeginTran();
- categoryInfo.CategoryNo = category.CategoryNo; //绫诲埆鍙�
+ categoryInfo.CategoryNo = category.CategoryNo; //绫诲埆缂栫爜
categoryInfo.CategoryName = category.CategoryName; //绫诲埆鍚嶇О
categoryInfo.AreaNo = category.AreaNo; //鍖哄煙缂栫爜
categoryInfo.Demo = category.Demo; //澶囨敞
categoryInfo.UpdateUser = category.CreateUser; //鏇存敼浜�
categoryInfo.UpdateTime = Db.GetDate(); //鏇存敼鏃堕棿
-
Db.Updateable(categoryInfo).ExecuteCommand();
+ foreach (var item in matelist)
+ {
+ item.CategoryNo = categoryInfo.CategoryNo;
+ }
+ Db.Updateable(matelist).ExecuteCommand();
+
Db.CommitTran();
msg = "缂栬緫绫诲埆淇℃伅鎴愬姛锛�";
--
Gitblit v1.8.0