From 32c0daf9a78039004bb6c39d578f7734f13d54b1 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期二, 10 十月 2023 10:54:47 +0800
Subject: [PATCH] 1.工单派发校验工价，工价未提前设置或设置部分，如果开关关闭时,不校验是否未设置 或者未设置全，工价复制表中都会写入，没有设置的工价就默认0 如果开关打开就必须要设置工价
---
VueWebApi/DLL/DAL/ProductModelDAL.cs | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/VueWebApi/DLL/DAL/ProductModelDAL.cs b/VueWebApi/DLL/DAL/ProductModelDAL.cs
index 77b8ca9..3868313 100644
--- a/VueWebApi/DLL/DAL/ProductModelDAL.cs
+++ b/VueWebApi/DLL/DAL/ProductModelDAL.cs
@@ -462,7 +462,7 @@
if (stocktypecode != "" && stocktypecode != null)
{
search0+= " where code = @stocktypecode";
- search += " and CTE.code <>@stocktypecode and CTE.iparent_id<>@stocktypecode and CTE.dict_type='CHLX' ";
+ search += " and CTE.iparent_id<>'' and CTE.dict_type='CHLX'";
dynamicParams.Add("@stocktypecode", stocktypecode);
}
if (materialtypecode != "" && materialtypecode != null)
@@ -568,7 +568,7 @@
#endregion
#region[瀛樿揣妗ｆ鏂板缂栬緫]
- public static ToMessage AddUpdateInventoryFile(string materialid, string materialcode, string materialname, string materialspec, string uomcode, string warehousecode, string stocktypecode, string materialtypecode, string minstockqty, string maxstockqty,string is_batchno,string is_fifo,string is_incheck,string is_outcheck, string username, string operType)
+ public static ToMessage AddUpdateInventoryFile(string materialid, string materialcode, string materialname, string materialspec, string uomcode, string warehousecode, string stocktypecode, string minstockqty, string maxstockqty,string is_batchno,string is_fifo,string is_incheck,string is_outcheck, string username, string operType)
{
var dynamicParams = new DynamicParameters();
try
@@ -594,7 +594,7 @@
dynamicParams.Add("@uomcode", uomcode);
dynamicParams.Add("@warehousecode", warehousecode);
dynamicParams.Add("@stocktypecode", stocktypecode);
- dynamicParams.Add("@materialtypecode", materialtypecode);
+ dynamicParams.Add("@materialtypecode", "");
dynamicParams.Add("@minstockqty", minstockqty);
dynamicParams.Add("@maxstockqty", maxstockqty);
dynamicParams.Add("@username", username);
@@ -630,7 +630,7 @@
dynamicParams.Add("@uomcode", uomcode);
dynamicParams.Add("@warehousecode", warehousecode);
dynamicParams.Add("@stocktypecode", stocktypecode);
- dynamicParams.Add("@materialtypecode", materialtypecode);
+ dynamicParams.Add("@materialtypecode", "");
dynamicParams.Add("@minstockqty", minstockqty);
dynamicParams.Add("@maxstockqty", maxstockqty);
dynamicParams.Add("@username", username);
@@ -2471,7 +2471,7 @@
try
{
list.Clear();
- //褰撳墠宸ュ簭鏄惁鍏宠仈宸ヨ壓璺嚎
+ //鏌ヨ鑺傛媿宸ヤ环琛�,褰撳墠浜у搧銆佸伐鑹鸿矾绾裤�佸伐搴忋�佽澶囨槸鍚﹁缃妭鎷嶅伐浠�
sql = @"select * from TPrteEqp_Stad
where materiel_code=@partcode and route_code=@routecode and step_code=@stepcode and eqp_code=@eqpcode";
dynamicParams.Add("@partcode", partcode);
@@ -2524,6 +2524,7 @@
}
});
}
+
bool aa = DapperHelper.DoTransaction(list);
if (aa)
{
--
Gitblit v1.9.3