From 7d5e208f291c57e8d4c49c0c965cc6c736f9b31a Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期三, 31 一月 2024 17:31:32 +0800
Subject: [PATCH] Merge branch 'yyk'
---
Wms/WMS.DAL/SysInfrastructure/MaterialsRepository.cs | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/Wms/WMS.DAL/SysInfrastructure/MaterialsRepository.cs b/Wms/WMS.DAL/SysInfrastructure/MaterialsRepository.cs
index 7cc9e16..73e37c6 100644
--- a/Wms/WMS.DAL/SysInfrastructure/MaterialsRepository.cs
+++ b/Wms/WMS.DAL/SysInfrastructure/MaterialsRepository.cs
@@ -31,10 +31,11 @@
/// <param name="isControlled">鏄惁鍙楁帶</param>
/// <param name="isInspect">鏄惁鍏嶆</param>
/// <param name="environment">瀛樺偍鐜</param>
+ /// <param name="categoryNo">绫诲埆缂栫爜</param>
/// <returns></returns>
- public List<MaterialsDto> GetMateList(string skuNo, string skuName, string auditStatusNo, string type, string isControlled, string isInspect, string environment)
+ public List<MaterialsDto> GetMateList(string skuNo, string skuName, string auditStatusNo, string type, string isControlled, string isInspect, string environment, string categoryNo)
{
- string str = "select mate.*,user1.RealName CreateUserName,pack.PackagName PackagName,unit.UnitName UnitName from SysMaterials mate left join SysUserInfor user1 on mate.CreateUser = user1.Id left join SysPackag pack on mate.PackagNo = pack.PackagNo left join SysUnit unit on mate.UnitNo = unit.UnitNo where mate.IsDel = @isdel";
+ string str = "select mate.*,user1.RealName CreateUserName,pack.PackagName PackagName,unit.UnitName UnitName,matec.CategoryName from SysMaterials mate left join SysUserInfor user1 on mate.CreateUser = user1.Id left join SysPackag pack on mate.PackagNo = pack.PackagNo left join SysUnit unit on mate.UnitNo = unit.UnitNo left join SysMaterialCategory matec on mate.CategoryNo = matec.CategoryNo where mate.IsDel = @isdel";
//鍒ゆ柇鐗╂枡缂栫爜
if (!string.IsNullOrEmpty(skuNo))
{
@@ -70,6 +71,11 @@
{
str += " and mate.Environment = @environment";
}
+ //鍒ゆ柇鐗╂枡绫诲埆鏄惁涓虹┖
+ if (!string.IsNullOrWhiteSpace(categoryNo))
+ {
+ str += " and mate.CategoryNo = @categoryNo";
+ }
List<MaterialsDto> matedto = Db.Ado.SqlQuery<MaterialsDto>(str, new
{
isdel = "0", //鏄惁鍒犻櫎
@@ -80,6 +86,7 @@
iscontrolled = isControlled,// 鏄惁鍙楁帶
isinspect = isInspect,// 鏄惁鍏嶆
environment = environment,// 瀛樺偍鐜
+ categoryNo = categoryNo, //鐗╂枡绫诲埆
});
return matedto;
}
@@ -122,7 +129,7 @@
/// <returns></returns>
public async Task<int> AddMate(SysMaterials mate)
{
- string str = "insert into SysMaterials values(@skuno, @skuname, @standard, @auditstatusno, @type, @iscontrolled, @isinspect, @origin, @unitno, @packagno, @environment, @weight, @warranty, @price,null,null, @demo, @isdel, @createTime, @createUser, null, null,@adventtime,@lowinventory)";
+ string str = "insert into SysMaterials values(@skuno, @skuname, @standard, @auditstatusno, @type, @iscontrolled, @isinspect, @origin, @unitno, @packagno, @environment, @weight, @warranty, @price,null,null,null,null,null,null,null,null,null,null,null, @demo, @isdel, @createTime, @createUser, null, null,@adventtime,@lowinventory,@categoryNo)";
mate.CreateTime = Db.GetDate();
int i = await Db.Ado.ExecuteCommandAsync(str, new
{
@@ -145,7 +152,8 @@
createtime = Db.GetDate(), //鍒涘缓鏃堕棿
createUser = mate.CreateUser, //鍒涘缓浜�
adventtime = mate.AdventTime, //涓存湡
- lowinventory = mate.LowInventory //浣庡簱瀛�
+ lowinventory = mate.LowInventory, //浣庡簱瀛�
+ categoryNo = mate.CategoryNo, //绫诲埆缂栫爜
});
return i;
}
@@ -176,7 +184,7 @@
public async Task<int> ExitMate(SysMaterials mate)
{
- string str = "update SysMaterials set SkuName = @skuname, Standard = @standard, AuditStatusNo = @auditstatusno, Type = @type, IsControlled = @iscontrolled, IsInspect = @isinspect, UnitNo = @unitno, PackagNo = @packagno, Environment = @environment, Weight = @weight, Warranty = @warranty, Price = @price, Demo = @demo, UpdateTime = @updatetime, UpdateUser = @updateuser,AdventTime = @adventtime,LowInventory = @lowinventory where Id = @id";
+ string str = "update SysMaterials set SkuName = @skuname, Standard = @standard, AuditStatusNo = @auditstatusno, Type = @type, IsControlled = @iscontrolled, IsInspect = @isinspect, UnitNo = @unitno, PackagNo = @packagno, Environment = @environment, Weight = @weight, Warranty = @warranty, Price = @price, Demo = @demo, UpdateTime = @updatetime, UpdateUser = @updateuser,AdventTime = @adventtime,LowInventory = @lowinventory,CategoryNo = @categoryNo where Id = @id";
int i = await Db.Ado.ExecuteCommandAsync(str, new
{
skuname = mate.SkuName, //鐗╂枡鍚嶇О
@@ -196,6 +204,7 @@
updateuser = mate.UpdateUser, //鏇存敼浜�
adventtime = mate.AdventTime, //涓存湡
lowinventory = mate.LowInventory, //浣庡簱瀛�
+ categoryNo = mate.CategoryNo, //绫诲埆缂栫爜
id = mate.Id //id
});
return i;
--
Gitblit v1.8.0