From a88c2dbb327d3a3a0b9a9bcc91ce4f31450159ba Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 05 一月 2024 16:58:23 +0800
Subject: [PATCH] 自动同步 定时保存 优化
---
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.cs | 68 ++++++++++++++++-----------------
1 files changed, 33 insertions(+), 35 deletions(-)
diff --git a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.cs b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.cs
index e896c25..a9d2443 100644
--- a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.cs
+++ b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.cs
@@ -104,9 +104,9 @@
}
catch (Exception e)
{
+ oCN.RollBack();
string HBadCodeSN = dic["HBarCode"].ToString();
CustomWriteLog("鏉＄爜:" + HBadCodeSN + ",閿欒鍘熷洜:" + e.Message, DateTime.Now.ToString("yyyy-MM-dd"));
- oCN.RollBack();
return false;
}
}
@@ -121,7 +121,7 @@
HBadCodeSN = TM_ZH(HBadCodeSN);
num = SNHBardCodeList(HBadCodeSN);
- if (num == 0)
+ if (num == 0 || num == 1)
{
flag = getOutBillAdd(dic, HBadCodeSN, "NG");
@@ -133,13 +133,6 @@
oCN.RunProc("update Gy_BarCodeBill set HStatus='涓嶈壇',HRemark='" + dic["HType"].ToString() + "' where HBarCode='" + HBadCodeSN + "'");
}
}
- else if (num == 1)
- {
- //鏉＄爜瀛樺湪 鐢熸垚涓嶈壇姹囨姤鍗�
- flag = getBadBillAdd(dic);
- //鍙嶅啓鏉＄爜鐘舵��
- oCN.RunProc("update Gy_BarCodeBill set HStatus='涓嶈壇',HRemark='" + dic["HType"].ToString() + "' where HBarCode='" + HBadCodeSN + "'");
- }
else if (num == 2)
{
flag = false;
@@ -148,10 +141,10 @@
}
catch (Exception e)
{
- string HBadCodeSN = dic["HBarCode"].ToString();
- CustomWriteLog("鏉＄爜:" + HBadCodeSN + ",閿欒鍘熷洜:"+e.Message, DateTime.Now.ToString("yyyy-MM-dd"));
//鍥炴粴浜嬪姟
oCN.RollBack();
+ string HBadCodeSN = dic["HBarCode"].ToString();
+ CustomWriteLog("鏉＄爜:" + HBadCodeSN + ",閿欒鍘熷洜:"+e.Message, DateTime.Now.ToString("yyyy-MM-dd"));
return false;
}
}
@@ -333,20 +326,21 @@
}
else
{
- CustomWriteLog("缁撴灉涓嶄负OK鎴朜G!", DateTime.Now.ToString("yyyy-MM-dd"));
oCN.RollBack();
+ CustomWriteLog("缁撴灉涓嶄负OK鎴朜G!", DateTime.Now.ToString("yyyy-MM-dd"));
return false;
}
bool flag = false;
- //flag = AddXt_XtRoutBill(HInterID, HBillNo, HBadCodeSN);
+ flag = AddXt_XtRoutBill(HInterID, HBillNo, HBadCodeSN);
- //if (!flag) {
- // CustomWriteLog("绯荤粺鍙傛暟淇濆瓨澶辫触,鏉＄爜:" + HBadCodeSN , DateTime.Now.ToString("yyyy-MM-dd"));
- // oCN.RollBack();
- // return false;
- //}
+ if (!flag)
+ {
+ oCN.RollBack();
+ CustomWriteLog("绯荤粺鍙傛暟淇濆瓨澶辫触,鏉＄爜:" + HBadCodeSN, DateTime.Now.ToString("yyyy-MM-dd"));
+ return false;
+ }
//澧炲姞浜х嚎缁勮杩芥函鍗�
DataSet dataSet = oCN.RunProcReturn("exec h_p_Gy_BarCodeBillBomList '" + HProcExchBillNo + "'," + HProcID, "h_p_Gy_BarCodeBillBomList");
@@ -359,8 +353,8 @@
double SYHQty = double.Parse(dataSet.Tables[0].Rows[i]["閰嶄欢鏁伴噺"].ToString());
string HMaterNamePJ = dataSet.Tables[0].Rows[i]["閰嶄欢浠ｇ爜"].ToString();
if (SYHQty == 0) {
- CustomWriteLog("閰嶄欢浠ｇ爜:" + HMaterNamePJ + ",鏁伴噺涓�0!", DateTime.Now.ToString("yyyy-MM-dd"));
oCN.RollBack();
+ CustomWriteLog("閰嶄欢浠ｇ爜:" + HMaterNamePJ + ",鏁伴噺涓�0!", DateTime.Now.ToString("yyyy-MM-dd"));
return false;
}
}
@@ -406,8 +400,8 @@
}
catch (Exception e)
{
- CustomWriteLog(e.Message, DateTime.Now.ToString("yyyy-MM-dd"));
oCN.RollBack();
+ CustomWriteLog(e.Message, DateTime.Now.ToString("yyyy-MM-dd"));
return false;
}
}
@@ -492,8 +486,8 @@
if (ds.Tables[0].Rows.Count == 0)
{
- CustomWriteLog("鏉＄爜:" + HBadCodeSN + ",鏃犺繑淇褰�", DateTime.Now.ToString("yyyy-MM-dd"));
oCN.RollBack();
+ CustomWriteLog("鏉＄爜:" + HBadCodeSN + ",鏃犺繑淇褰�", DateTime.Now.ToString("yyyy-MM-dd"));
return false;
}
@@ -523,8 +517,8 @@
}
else
{
- CustomWriteLog("缁撴灉涓嶄负OK!", DateTime.Now.ToString("yyyy-MM-dd"));
oCN.RollBack();
+ CustomWriteLog("缁撴灉涓嶄负OK!", DateTime.Now.ToString("yyyy-MM-dd"));
return false;
}
@@ -532,14 +526,15 @@
}
catch (Exception e)
{
- CustomWriteLog(e.Message, DateTime.Now.ToString("yyyy-MM-dd"));
oCN.RollBack();
+ CustomWriteLog(e.Message, DateTime.Now.ToString("yyyy-MM-dd"));
return false;
}
}
//淇濆瓨绯荤粺鍙傛暟鍒板嚭绔欏崟
public bool AddXt_XtRoutBill(long HInterID, string HBillNo,string HBadCodeSN) {
+ string sql = "";
try
{
@@ -550,9 +545,10 @@
string HProcExchBillNo = ds.Tables[0].Rows[0]["HProcExchBillNo"].ToString();
ds = oCN.RunProcReturn(@"select s.HItemID HMouldID,t.HItemID HTechParamID,HCount,HCreateTime from Sb_EquipMentCollectionTechParam_SN a WITH(NOLOCK)
-left join Gy_Source s WITH(NOLOCK) on a.HSourceCode=s.HNumber
-left join Gy_TechnologyParameter t WITH(NOLOCK) on a.HType=t.HNumber
+inner join Gy_Source s WITH(NOLOCK) on a.HSourceCode=s.HNumber
+inner join Gy_TechnologyParameter t WITH(NOLOCK) on a.HType=t.HName
where a.HFlag=0 and a.HBarCode='" + HBadCodeSN + "'", "Sb_EquipMentCollectionTechParam_SN");
+ //娉�:褰撳墠鍙湁涓�閬撳伐搴忔湁鍙傛暟 濡傛灉鏈夊閬撳伐搴忕殑璇� 闇�瑕佸鍔� 宸ュ簭鐨勮繃婊�
if (ds.Tables[0].Rows.Count != 0) {
@@ -563,20 +559,22 @@
string HCount = ds.Tables[0].Rows[i]["HCount"].ToString();
string HGetTime = ds.Tables[0].Rows[i]["HCreateTime"].ToString();
- DataSet dataSet = oCN.RunProcReturn("select * from Sc_StationOutBillSub_TechParam WITH(NOLOCK) where HInterID=" + HInterID + " and HBillNo_bak='" + HBillNo + "' and HBarCode='" + HBadCodeSN + "'", "Sc_StationOutBillSub_TechParam");
+ DataSet dataSet = oCN.RunProcReturn("select * from Sc_StationOutBillSub_TechParam WITH(NOLOCK) where HInterID=" + HInterID + " and HBillNo_bak='" + HBillNo + "'", "Sc_StationOutBillSub_TechParam");
- oCN.RunProc("insert into Sc_StationOutBillSub_TechParam(HInterID,HBillNo_bak,HEntryID ,HSourceInterID,HSourceEntryID,HSourceBillNo,HTechParamID,HRelValue,HGetTime,HBarCode,HMouldID)" +
- $"values({HInterID},'{HBillNo}',{(dataSet.Tables[0].Rows.Count + 1)},{HProcExchInterID},{HProcExchEntryID},'{HProcExchBillNo}',{HTechParamID},{HCount},'{HGetTime}','{HBadCodeSN}',{HMouldID})");
+ sql = "insert into Sc_StationOutBillSub_TechParam(HInterID,HBillNo_bak,HEntryID ,HSourceInterID,HSourceEntryID,HSourceBillNo,HTechParamID,HRelValue,HGetTime,HBarCode,HMouldID)" +
+ $"values({HInterID},'{HBillNo}',{(dataSet.Tables[0].Rows.Count + 1)},{HProcExchInterID},{HProcExchEntryID},'{HProcExchBillNo}',{HTechParamID},{HCount},'{HGetTime}','{HBadCodeSN}',{HMouldID})";
+ oCN.RunProc(sql);
}
+ oCN.RunProc("update Sb_EquipMentCollectionTechParam_SN set HFlag=1 where HBarCode='" + HBadCodeSN + "'");
}
return true;
}
catch (Exception e)
{
- CustomWriteLog("宸ヨ壓鍙傛暟淇濆瓨:" + e.Message, DateTime.Now.ToString("yyyy-MM-dd"));
oCN.RollBack();
+ CustomWriteLog("宸ヨ壓鍙傛暟淇濆瓨:" + sql + e.Message, DateTime.Now.ToString("yyyy-MM-dd"));
return false;
}
}
@@ -603,15 +601,15 @@
}
else
{
- CustomWriteLog("鏉＄爜:" + HBadCodeSN + ",娴佽浆鍗′笉瀛樺湪!", DateTime.Now.ToString("yyyy-MM-dd"));
oCN.RollBack();
+ CustomWriteLog("鏉＄爜:" + HBadCodeSN + ",娴佽浆鍗′笉瀛樺湪!", DateTime.Now.ToString("yyyy-MM-dd"));
return 2;
}
}
else
{
- CustomWriteLog("鏉＄爜:" + HBadCodeSN + ",闀垮害涓嶇瓑浜�29浣�!", DateTime.Now.ToString("yyyy-MM-dd"));
oCN.RollBack();
+ CustomWriteLog("鏉＄爜:" + HBadCodeSN + ",闀垮害涓嶇瓑浜�29浣�!", DateTime.Now.ToString("yyyy-MM-dd"));
return 2;
}
}
@@ -623,8 +621,8 @@
}
catch (Exception e)
{
- CustomWriteLog("鏉＄爜:" + HBadCodeSN + "," + e.Message, DateTime.Now.ToString("yyyy-MM-dd"));
oCN.RollBack();
+ CustomWriteLog("鏉＄爜:" + HBadCodeSN + "," + e.Message, DateTime.Now.ToString("yyyy-MM-dd"));
return 2;
}
}
@@ -645,8 +643,8 @@
//鍒ゆ柇娴佽浆鍗′笉鑳戒负绌�
if (HBarCode.Trim() == "")
{
- CustomWriteLog("鏉＄爜:" + HBarCode + ",娴佽浆鍗′笉鑳戒负绌�!", DateTime.Now.ToString("yyyy-MM-dd"));
oCN.RollBack();
+ CustomWriteLog("鏉＄爜:" + HBarCode + ",娴佽浆鍗′笉鑳戒负绌�!", DateTime.Now.ToString("yyyy-MM-dd"));
}
//鏃ユ湡鑾峰彇鏂瑰紡
@@ -715,8 +713,8 @@
}
catch (Exception e)
{
- CustomWriteLog("鏉＄爜:" + HBarCode + "," + e.Message, DateTime.Now.ToString("yyyy-MM-dd"));
oCN.RollBack();
+ CustomWriteLog("鏉＄爜:" + HBarCode + "," + e.Message, DateTime.Now.ToString("yyyy-MM-dd"));
}
}
@@ -872,8 +870,8 @@
}
catch (Exception e)
{
- CustomWriteLog("鎶ラ敊鍘熷洜:" + e.Message + "!", DateTime.Now.ToString("yyyy-MM-dd"));
oCN.RollBack();
+ CustomWriteLog("鎶ラ敊鍘熷洜:" + e.Message + "!", DateTime.Now.ToString("yyyy-MM-dd"));
return false;
}
}
--
Gitblit v1.9.1