From 7bb0a817a938d4f44569cc14d6ea34dbb7b1105f Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期四, 01 二月 2024 08:45:14 +0800
Subject: [PATCH] 入库单增加复核时间和复核人
---
Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
index 5609bc5..bf8b36e 100644
--- a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
@@ -39,10 +39,11 @@
try
{
sqlCount += "SELECT DISTINCT COUNT(tb1.ID) FROM BllArrivalNotice AS tb1 ";
- sqlString += "SELECT DISTINCT tb1.*,tb3.RealName as CreateUserName,tb4.RealName as UpdateUserName FROM BllArrivalNotice AS tb1 ";
+ sqlString += "SELECT DISTINCT tb1.*,tb3.RealName as CreateUserName,tb4.RealName as UpdateUserName,tb5.RealName as CheckUserName FROM BllArrivalNotice AS tb1 ";
sqlPub += "LEFT JOIN BllArrivalNoticeDetail AS tb2 ON tb1.ASNNo = tb2.ASNNo ";
sqlPub += "LEFT JOIN SysUserInfor AS tb3 ON tb1.CreateUser = tb3.Id ";
sqlPub += "LEFT JOIN SysUserInfor AS tb4 ON tb1.UpdateUser = tb4.Id ";
+ sqlPub += "LEFT JOIN SysUserInfor AS tb5 ON tb1.CheckUser = tb5.Id ";
sqlPub += $"WHERE tb1.ASNNo LIKE '%{model.ASNNo}%' AND tb2.LotNo LIKE '%{model.LotNo}%' ";
sqlPub += $"AND tb2.SkuNo LIKE '%{model.SkuNo}%' AND tb2.SkuName LIKE '%{model.SkuName}%' ";
sqlPub += $"AND tb1.CustomerName LIKE '%{model.CustomerName}%' ";
@@ -128,8 +129,34 @@
{
try
{
+ string skuType = string.Empty;
+ switch(model.Type)//0锛氬師鏂� 1锛氬寘鏉� 2锛氭垚鍝� 3锛氳�楁潗 4锛氬崐鎴愬搧
+ {
+ case "0"://鎴愬搧鍏ュ簱
+ skuType = "(2)";
+ break;
+ case "1"://閲囪喘鍏ュ簱
+ skuType = "(0,1,3)";
+ break;
+ case "2"://涓棿鍝佸叆搴�
+ skuType = "(4)";
+ break;
+ case "3"://閫�璐у叆搴�
+ skuType = "(2)";
+ break;
+ case "4"://杞﹂棿浣欐枡閫�鍥炲叆搴�
+ skuType = "(0,1,3)";
+ break;
+ case "5"://鍏跺畠鍏ュ簱
+ skuType = "(2)";
+ break;
+ case "6"://浠ｅ偍鍏ュ簱
+ skuType = "(2)";
+ break;
+ }
+
Expression<Func<SysMaterials, bool>> item = Expressionable.Create<SysMaterials>()
- .AndIF(!string.IsNullOrWhiteSpace(model.IsControlled), it => it.IsControlled == model.IsControlled)
+ .AndIF(true, it => skuType.Contains(it.Type))
.AndIF(true, it => it.IsDel == "0")
.And(it => it.SkuNo != "100099")
.AndIF(!string.IsNullOrWhiteSpace(model.SkuNo),
@@ -884,8 +911,8 @@
#endregion
notice.Status = "4";
- notice.UpdateTime = DateTime.Now;
- notice.UpdateUser = userId;
+ notice.CheckTime = DateTime.Now;
+ notice.CheckUser = userId;
Db.Updateable(notice).ExecuteCommand();
new OperationASNServer().AddLogOperationAsn("鍏ュ簱浣滀笟", "鍏ュ簱鍗曟嵁", notice.ASNNo, "澶嶆牳", $"澶嶆牳浜嗗崟鎹彿涓簕notice.ASNNo}鐨勫崟鎹俊鎭�", userId);
--
Gitblit v1.8.0