From 7ff74f599084561338eef1230db5aa45f74565f8 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 15 四月 2024 18:03:33 +0800
Subject: [PATCH] 1.ERP订单关闭增加单据id 2.MES工单关闭增加源单id关联
---
VueWebCoreApi/Tools/AppLableBarCode.cs | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/VueWebCoreApi/Tools/AppLableBarCode.cs b/VueWebCoreApi/Tools/AppLableBarCode.cs
index c13021a..874f1c9 100644
--- a/VueWebCoreApi/Tools/AppLableBarCode.cs
+++ b/VueWebCoreApi/Tools/AppLableBarCode.cs
@@ -24,17 +24,25 @@
{
string sql, year = "", month = "", day = "", fdate = "", q = "", cunm2 = "", Encode = "", cunm = "";
int digit2 = 0, value2 = 0, digit3 = 0, digitdiff = 0;
+ decimal labcum = 0;
bool stf;
List<object> list = new List<object>();
List<string> listdt = new List<string>();
List<AppLabCode> lab = new List<AppLabCode>();
var dynamicParams = new DynamicParameters();
//鑾峰彇鏍囩涓暟:杩涗竴娉�
- decimal labcum = Math.Ceiling(decimal.Parse(qty) / decimal.Parse(onelabqty));
+ if (qty == "0" && onelabqty == "0")
+ {
+ labcum = 1;
+ }
+ else
+ {
+ labcum = Math.Ceiling(decimal.Parse(qty) / decimal.Parse(onelabqty));
+ }
try
{
- sql = @"select prefix,filingdate,incbit,value from TCodeRules where rightcode=@rightcode";
- dynamicParams.Add("@rightcode", rightcode);
+ sql = @"select prefix,filingdate,incbit,value from TCodeRules where menucode=@menucode";
+ dynamicParams.Add("@menucode", rightcode);
var data = DapperHelper.selectdata(sql, dynamicParams);
if (data.Rows.Count > 0)
{
@@ -60,23 +68,23 @@
break;
}
//鏇存柊瑙勫垯琛ㄤ綅鏁板強娴佹按鍙�
- sql = @"update TCodeRules set incbit=@incbit,value=@cunm2 where rightcode=@rightcode";
+ sql = @"update TCodeRules set incbit=@incbit,value=@cunm2 where menucode=@menucode";
dynamicParams.Add("@incbit", cunm.Length);
dynamicParams.Add("@cunm2", cunm);
- dynamicParams.Add("@rightcode", rightcode);
+ dynamicParams.Add("@menucode", rightcode);
list.Add(new { str = sql, parm = dynamicParams });
stf = DapperHelper.DoTransaction(list);
if (stf)
{
mes.code = "200";
- mes.Message = "鎴愬姛!";
+ mes.message = "鎴愬姛!";
mes.data = lab;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "澶辫触!";
+ mes.message = "澶辫触!";
mes.data = null;
}
}
@@ -85,7 +93,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏈缃紪鐮佽鍒�,鐢熸垚鍗曞彿澶辫触,璇疯缃紪鐮佷负銆�" + rightcode + "銆戠殑缂栫爜瑙勫垯!";
+ mes.message = "鏈缃紪鐮佽鍒�,鐢熸垚鍗曞彿澶辫触,璇疯缃紪鐮佷负銆�" + rightcode + "銆戠殑缂栫爜瑙勫垯!";
mes.data = null;
}
}
@@ -93,7 +101,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
--
Gitblit v1.9.3