From 0f0d1ce8057cf705bac051b7cc7108b4075659d0 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 15 八月 2024 13:38:21 +0800
Subject: [PATCH] 注塑车间数据采集
---
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.cs | 43 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.cs b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.cs
index 65990f0..a719d7c 100644
--- a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.cs
+++ b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.cs
@@ -71,7 +71,7 @@
else if (num == 1)
{
//鍒ゆ柇杩欎釜鏉＄爜涔嬪墠鐨勭姸鎬佹槸鍚︿负NG
- DataSet ds = oCN.RunProcReturn(@"select * from Sb_EquipMentCollection_SN WITH(NOLOCK) where HBarCode='" + HBadCodeSN + "' and HCreateTime<'" + dic["HCreateTime"].ToString() + "' and HResult='NG' and HProcNumber='" + dic["HProcNumber"].ToString() + "'", "Sb_EquipMentCollection_SN");
+ DataSet ds = oCN.RunProcReturn(@"select * from Sb_EquipMentCollection_SN WITH(NOLOCK) where HBarCode='" + HBadCodeSN + "' and HCreateTime<'" + dic["HCreateTime"].ToString() + "' and HResult='NG'", "Sb_EquipMentCollection_SN");
DataSet ds1 = oCN.RunProcReturn(@"select a.HSourceID,a.HProcID,* from Sc_StationOutBillMain a WITH(NOLOCK)
inner join Sc_StationOutBillSub_SN sn WITH(NOLOCK) on a.HInterID=sn.HInterID
@@ -337,8 +337,26 @@
}
else if (HResult == "NG")
{
- //鍙嶅啓宸ュ簭鍑虹珯鍗曠殑涓嶈壇鏁伴噺
- oCN.RunProc("update Sc_StationOutBillMain set HBadCount+=1 where HInterID='" + HInterID + "'");
+ ds = oCN.RunProcReturn("select * from Sc_QualityReportBillSub WITH(NOLOCK) where HBarCode='" + HBadCodeSN + "' order by HMakeDate desc", "Sc_QualityReportBillSub");
+
+ if (ds.Tables[0].Rows.Count > 0) {
+ string HBadDate = ds.Tables[0].Rows[0]["HMakeDate"].ToString();
+
+ ds = oCN.RunProcReturn("select * from Sc_SourceLineRepairBillMain WITH(NOLOCK) where HBarCode='" + HBadCodeSN + "' order by HMakeDate desc", "Sc_SourceLineRepairBillMain");
+
+ if (ds.Tables[0].Rows.Count > 0) {
+ string HRepairDate = ds.Tables[0].Rows[0]["HMakeDate"].ToString();
+
+ if (DateTime.Parse(HBadDate) < DateTime.Parse(HRepairDate)) {
+ //鍙嶅啓宸ュ簭鍑虹珯鍗曠殑涓嶈壇鏁伴噺
+ oCN.RunProc("update Sc_StationOutBillMain set HBadCount+=1 where HInterID='" + HInterID + "'");
+ }
+ }
+
+ } else {
+ //鍙嶅啓宸ュ簭鍑虹珯鍗曠殑涓嶈壇鏁伴噺
+ oCN.RunProc("update Sc_StationOutBillMain set HBadCount+=1 where HInterID='" + HInterID + "'");
+ }
}
else
{
@@ -641,7 +659,7 @@
//鍒ゆ柇闀垮害鏄惁涓�29浣�
if (HBadCodeSN.Length == 29)
{
- string str1 = HBadCodeSN.Substring(23, 3);
+ string str1 = HBadCodeSN.Substring(18, 8);
ds = oCN.RunProcReturn("select * from Sc_ProcessExchangeBillMain where HProjectNum like'" + str1 + "-1%'", "Sc_ProcessExchangeBillMain");
//鍒ゆ柇鏄惁鑳芥壘鍒板搴旂殑娴佽浆鍗�
if (ds.Tables[0].Rows.Count > 0)
@@ -651,9 +669,20 @@
}
else
{
- oCN.RollBack();
- CustomWriteLog("鏉＄爜:" + HBadCodeSN + ",娴佽浆鍗′笉瀛樺湪!", DateTime.Now.ToString("yyyy-MM-dd"));
- return 2;
+ str1 = HBadCodeSN.Substring(23, 3);
+ ds = oCN.RunProcReturn("select * from Sc_ProcessExchangeBillMain where HProjectNum like'" + str1 + "-1%'", "Sc_ProcessExchangeBillMain");
+ //鍒ゆ柇鏄惁鑳芥壘鍒板搴旂殑娴佽浆鍗�
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ string HProcExchBillNo = ds.Tables[0].Rows[0]["HBillNo"].ToString();
+ get_HBardBillSave(HBadCodeSN, HProcExchBillNo);
+ }
+ else
+ {
+ oCN.RollBack();
+ CustomWriteLog("鏉＄爜:" + HBadCodeSN + ",娴佽浆鍗′笉瀛樺湪!", DateTime.Now.ToString("yyyy-MM-dd"));
+ return 2;
+ }
}
}
else
--
Gitblit v1.9.1