From 01b5ef474e1a5d8dc682b64312f23bdbb0fdf3a7 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 12 四月 2023 16:26:48 +0800
Subject: [PATCH] 1.采购到货接口修改 2.停用设备过滤
---
VueWebApi/DLL/DAL/SystemSettingDAL.cs | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/VueWebApi/DLL/DAL/SystemSettingDAL.cs b/VueWebApi/DLL/DAL/SystemSettingDAL.cs
index 98c0291..fb3e107 100644
--- a/VueWebApi/DLL/DAL/SystemSettingDAL.cs
+++ b/VueWebApi/DLL/DAL/SystemSettingDAL.cs
@@ -43,9 +43,9 @@
//search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select A.right_code,A.right_name,B.prefix,B.filingdate,B.incbit from TRight A
+ var sql = @"select A.right_code,A.right_name,B.prefix,B.filingdate,B.incbit,A.Type from TRight A
left join T_CodeRules B on A.right_code=B.rightcode
- where A.parent_id<>'0' and A.is_delete<>'1' " + search + "";
+ where A.parent_id<>'0' and A.is_delete<>'1' and A.is_rcode<>'N' " + search + "";
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -71,15 +71,25 @@
var dynamicParams = new DynamicParameters();
try
{
- sql = @"select rightcode from T_CodeRules where rightcode=@rightcode";
+ sql = @"select rightcode,value from T_CodeRules where rightcode=@rightcode";
dynamicParams.Add("@rightcode", rightcode);
var data = DapperHelper.selectdata(sql, dynamicParams);
if (data.Rows.Count > 0)
{
- sql = @"update T_CodeRules set prefix=@prefix,filingdate=@filingdate,incbit=@incbit,lm_user=@lm_user,lm_date=@CreateDate where rightcode=@rightcode";
+ string value = data.Rows[0]["value"].ToString();
+ if (decimal.Parse(incbit) > value.Length)
+ {
+ decimal cnum = decimal.Parse(incbit) - value.Length;
+ for (int i = 0; i < cnum; i++)
+ {
+ value = "0" + value;
+ }
+ }
+ sql = @"update T_CodeRules set prefix=@prefix,filingdate=@filingdate,incbit=@incbit,value=@value,lm_user=@lm_user,lm_date=@CreateDate where rightcode=@rightcode";
dynamicParams.Add("@prefix", prefix);
dynamicParams.Add("@filingdate", filingdate);
dynamicParams.Add("@incbit", incbit);
+ dynamicParams.Add("@value", value);
dynamicParams.Add("@lm_user", lm_user);
dynamicParams.Add("@CreateDate", DateTime.Now.ToString());
dynamicParams.Add("@rightcode", rightcode);
--
Gitblit v1.9.3