From 0d59b3fd8050b0f0766be47ed5527d96bd4bf2f7 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 07 四月 2025 09:38:43 +0800
Subject: [PATCH] 斯莫尔插件优化
---
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.cs | 180 ++++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 127 insertions(+), 53 deletions(-)
diff --git a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.cs b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.cs
index ce3725a..0e1a7c0 100644
--- a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.cs
+++ b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.cs
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
+using System.Diagnostics;
using System.Drawing;
using System.IO;
using System.Linq;
@@ -24,8 +25,11 @@
//璇诲彇鏁版嵁
private void btnReadData_Click(object sender, EventArgs e)
{
-
- DataTable list = oCN.RunProcReturn("select * from Sb_EquipMentCollection_SN WITH(NOLOCK) where HFlag=0 order by HCreateTime", "Sb_EquipMentCollection_SN").Tables[0];
+ Stopwatch timer = new Stopwatch();
+ timer.Start();
+
+ CustomWriteLog("1.璁℃椂鍣ㄥ紑濮�:"+timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
+ DataTable list = oCN.RunProcReturn("select top 150 * from Sb_EquipMentCollection_SN WITH(NOLOCK) where HFlag=0 order by HCreateTime", "Sb_EquipMentCollection_SN").Tables[0];
//寰幆闆嗗悎
for (int i = 0; i < list.Rows.Count; i++)
@@ -36,7 +40,7 @@
string HCreateTime = list.Rows[i]["HCreateTime"].ToString();
//寮�濮嬩簨鍔�
oCN.BeginTran();
-
+ CustomWriteLog("2.寰幆寮�濮�:" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
if (HResult == "OK")
{
flag=HResultOK(list.Rows[i]);
@@ -46,6 +50,7 @@
flag = HResultNG(list.Rows[i]);
}
+ CustomWriteLog("2-1.寰幆缁撴潫:" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
if (flag) {
oCN.RunProc("update Sb_EquipMentCollection_SN set HFlag=1 where HBarCode='" + HBadCodeSN + "' and HCreateTime='"+ HCreateTime + "'");
//缁撴潫浜嬪姟
@@ -53,16 +58,25 @@
}
}
+ CustomWriteLog("3.缁撴潫璁℃椂:" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
+ timer.Stop();//缁撴潫璁℃椂
}
public bool HResultOK(DataRow dic)
{
try
{
+ Stopwatch timer = new Stopwatch();
+ timer.Start();
+
+ CustomWriteLog("2.1.寮�濮媜k:" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
+
bool flag = false;
string HBadCodeSN = dic["HBarCode"].ToString();
HBadCodeSN = TM_ZH(HBadCodeSN);
int num = SNHBardCodeList(HBadCodeSN);
+
+ CustomWriteLog("2.2.鏉＄爜鐢熸垚:" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
if (num == 0)
{
@@ -74,11 +88,17 @@
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)
+ // 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
+ //left join Gy_Source s WITH(NOLOCK) on a.HSourceID=s.HItemID
+ //left join Gy_Process p WITH(NOLOCK) on a.HProcID=p.HItemID
+ //where p.HNumber='" + dic["HProcNumber"].ToString() + "' and sn.HBarCode='" + HBadCodeSN + "'", "Sc_StationOutBillSub_SN");
+
+ DataSet ds1 = oCN.RunProcReturn(@"select a.HProcID from Sc_StationOutBillMain a WITH(NOLOCK)
inner join Sc_StationOutBillSub_SN sn WITH(NOLOCK) on a.HInterID=sn.HInterID
-left join Gy_Source s WITH(NOLOCK) on a.HSourceID=s.HItemID
left join Gy_Process p WITH(NOLOCK) on a.HProcID=p.HItemID
where p.HNumber='" + dic["HProcNumber"].ToString() + "' and sn.HBarCode='" + HBadCodeSN + "'", "Sc_StationOutBillSub_SN");
+
if (ds.Tables[0].Rows.Count > 0 && ds1.Tables[0].Rows.Count == 0)
{
@@ -101,6 +121,9 @@
{
flag = false;
}
+
+ CustomWriteLog("2.5.缁撴潫璁℃椂:" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
+ timer.Stop();//缁撴潫璁℃椂
return flag;
}
@@ -156,10 +179,15 @@
{
try
{
+ Stopwatch timer = new Stopwatch();
+ timer.Start();
+ CustomWriteLog("2.1.1.鍑虹珯鍗曟柊澧炲紑濮�:" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
//鑾峰彇缁戝畾娴佽浆鍗�
DataSet ds = oCN.RunProcReturn(@"select * from Gy_BarCodeBill WITH(NOLOCK) where HBarCode='" + HBadCodeSN + "'", "Gy_BarCodeBill");
string HProcExchBillNo = ds.Tables[0].Rows[0]["HSourceBillNo"].ToString();
string HProcNumber = dic["HProcNumber"].ToString();
+
+ CustomWriteLog("2.1.2.缁戝畾娴佽浆鍗�:"+ HProcNumber+"----" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
ds = oCN.RunProcReturn("select * from Gy_Source WITH(NOLOCK) where HNumber='" + dic["HSourceCode"].ToString() + "' ", "Gy_Source");
long HSourceID = 0;
@@ -167,6 +195,8 @@
{
HSourceID = long.Parse(ds.Tables[0].Rows[0]["HItemID"].ToString());//鐢熶骇璧勬簮ID
}
+
+ CustomWriteLog("2.1.3.鑾峰彇鐢熶骇璧勬簮:" + HProcNumber + "----" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
//鏌ヨ鑱屽憳
ds = oCN.RunProcReturn("select * from Gy_Employee WITH(NOLOCK) where HNumber='" + dic["HEmpCode"].ToString() + "' ", "Gy_Employee");
@@ -177,6 +207,8 @@
HEmpIDs = long.Parse(ds.Tables[0].Rows[0]["HItemID"].ToString());//鑱屽憳ID
HEmpName = ds.Tables[0].Rows[0]["HName"].ToString();
}
+
+ CustomWriteLog("2.1.4.鏌ヨ鑱屽憳淇℃伅:" + HProcNumber + "----" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
long HDeptID = 0;
long HPRDOrgIDs = 0;
@@ -196,12 +228,16 @@
HDeptID = 0;
}
-
+ CustomWriteLog("2.1.5.鑾峰彇瀹㈡埛淇℃伅:" + HProcNumber + "----" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
+
+
ds = oCN.RunProcReturn(@"select a.HWorkShopID,b.HProcNo,b.HProcID,a.HMaterID,a.HQty,a.HInterID,HEntryID,a.HICMOInterID,a.HICMOEntryID,a.HICMOBillNo,b.HCenterID from Sc_ProcessExchangeBillMain a WITH(NOLOCK)
inner join Sc_ProcessExchangeBillSub b WITH(NOLOCK) on a.HInterID=b.HInterID
left join Gy_Process p WITH(NOLOCK) on b.HProcID=p.HItemID
where a.HBillNo='" + HProcExchBillNo + "' and p.HNumber='" + HProcNumber + "'", "Sc_ProcessExchangeBillMain");
+
+ CustomWriteLog("2.1.6.鏌ヨ娴佽浆鍗′俊鎭�:" + HProcNumber + "----" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
string sExeReturnInfo = "";
long HMainInterID = 0;
@@ -272,30 +308,36 @@
string HBillNo = "";
int HShiftsID = 0;
+ CustomWriteLog("2.1.7缁欏瓧娈佃祴鍊� :" + HProcNumber + "----" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
+
DataSet set= oCN.RunProcReturn("exec h_p_Gy_GetWorkShiftInfo " + HWorkShopID + "," + HCenterID, "h_p_Gy_GetWorkShiftInfo");
if (set.Tables[0].Rows.Count > 0) {
HShiftsID = int.Parse(set.Tables[0].Rows[0]["HInterID"].ToString());
}
- ds = oCN.RunProcReturn("exec h_p_Sc_SNBarcodeProcCtrl_S '" + HBadCodeSN + "'," + HProcID, "h_v_Gy_QualifiedRecordsList");
- if (ds.Tables[0].Rows.Count == 0)
- {
- oCN.RollBack();
- CustomWriteLog("鏉＄爜:" + HBadCodeSN + "宸ュ簭:" + HProcID + ",宸ュ簭鎺у埗鏌ユ棤鏁版嵁!", DateTime.Now.ToString("yyyy-MM-dd"));
- return false;
- }
- else if (ds.Tables[0].Rows[0]["HBack"].ToString() == "2")
- {
- oCN.RollBack();
- CustomWriteLog("鏉＄爜:" + HBadCodeSN + "宸ュ簭:" + HProcID + "," + ds.Tables[0].Rows[0]["HBackRemark"].ToString() + "!", DateTime.Now.ToString("yyyy-MM-dd"));
- return false;
- }
+ CustomWriteLog("2.1.8鑾峰彇鐝淇℃伅 :" + HProcNumber + "----" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
+
+ //ds = oCN.RunProcReturn("exec h_p_Sc_SNBarcodeProcCtrl_S '" + HBadCodeSN + "'," + HProcID, "h_v_Gy_QualifiedRecordsList");
+ //if (ds.Tables[0].Rows.Count == 0)
+ //{
+ // oCN.RollBack();
+ // CustomWriteLog("鏉＄爜:" + HBadCodeSN + "宸ュ簭:" + HProcID + ",宸ュ簭鎺у埗鏌ユ棤鏁版嵁!", DateTime.Now.ToString("yyyy-MM-dd"));
+ // return false;
+ //}
+ //else if (ds.Tables[0].Rows[0]["HBack"].ToString() == "2")
+ //{
+ // oCN.RollBack();
+ // CustomWriteLog("鏉＄爜:" + HBadCodeSN + "宸ュ簭:" + HProcID + "," + ds.Tables[0].Rows[0]["HBackRemark"].ToString() + "!", DateTime.Now.ToString("yyyy-MM-dd"));
+ // return false;
+ //}
//鍒ゆ柇褰撳墠娴佽浆鍗＄殑鍑虹珯鍗� 鏄惁鏈夋暟鎹�
ds = oCN.RunProcReturn(@"select * from Sc_StationOutBillMain a WITH(NOLOCK)
left join Gy_Process p WITH(NOLOCK) on a.HProcID=p.HItemID
where HProcExchBillNo='" + HProcExchBillNo + "' and p.HNumber='" + HProcNumber + "' and CONVERT(varchar(10),HDate,20) ='" + DateTime.Now.ToString("yyyy-MM-dd") + "'", "Sc_StationOutBillMain");
+
+ CustomWriteLog("2.1.9鑾峰彇鏄惁鏈夊嚭绔欏崟 :" + HProcNumber + "----" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
if (ds.Tables[0].Rows.Count != 0)
{
@@ -332,8 +374,11 @@
"," + HmaterOutqty + "," + HProcPriceRate + "," + HTemporaryAreaID + ","+ HShiftsID + ") ");
}
+ CustomWriteLog("2.1.10 鍑虹珯鍗曟柊澧� :" + HProcNumber + "----" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
+
if (HResult == "OK")
{
+ CustomWriteLog("2.1.11 鏉＄爜鍙嶅啓 :" + HProcNumber + "----" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
ds = oCN.RunProcReturn("select * from Sc_StationOutBillSub_SN WITH(NOLOCK) where HInterID='" + HInterID + "' order by HEntryID desc", "Sc_StationOutBillSub_SN");
string HMakeTime = dic["HCreateTime"].ToString();
@@ -343,9 +388,11 @@
CustomWriteLog("鏉＄爜:" + HBadCodeSN + "宸ュ簭:" + HProcNumber + ",鍑虹珯鏃堕棿:" + HMakeTime, "TM" + DateTime.Now.ToString("yyyy-MM-dd"));
//鍙嶅啓宸ュ簭鍑虹珯鍗曠殑鍚堟牸鏁伴噺
oCN.RunProc("update Sc_StationOutBillMain set HQty+=1 where HInterID='" + HInterID + "'");
+ CustomWriteLog("2.1.12 鏉＄爜鍙嶅啓 :" + HProcNumber + "----" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
}
else if (HResult == "NG")
{
+ CustomWriteLog("2.1.13 涓嶅悎鏍煎弽鍐� :" + HProcNumber + "----" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
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) {
@@ -358,14 +405,16 @@
if (DateTime.Parse(HBadDate) < DateTime.Parse(HRepairDate)) {
//鍙嶅啓宸ュ簭鍑虹珯鍗曠殑涓嶈壇鏁伴噺
- oCN.RunProc("update Sc_StationOutBillMain set HBadCount+=1 where HInterID='" + HInterID + "'");
+ oCN.RunProc("update Sc_StationOutBillMain set HBadCount+=1,HWasterQty_Work+=1 where HInterID='" + HInterID + "'");
}
}
} else {
//鍙嶅啓宸ュ簭鍑虹珯鍗曠殑涓嶈壇鏁伴噺
- oCN.RunProc("update Sc_StationOutBillMain set HBadCount+=1 where HInterID='" + HInterID + "'");
+ oCN.RunProc("update Sc_StationOutBillMain set HBadCount+=1,HWasterQty_Work+=1 where HInterID='" + HInterID + "'");
}
+
+ CustomWriteLog("2.1.14 涓嶅悎鏍煎弽鍐� :" + HProcNumber + "----" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
}
else
{
@@ -374,18 +423,29 @@
return false;
}
- //鏌ヨ鍑虹珯鏁伴噺鏄惁瓒呰繃娴佽浆鍗℃暟閲�
- ds = oCN.RunProcReturn($@"select (b.HQty -sum(isnull(ou.HQty,0))-sum(isnull(ou.HBadCount,0))) HQty from Sc_ProcessExchangeBillSub b WITH(NOLOCK)
-left join Sc_StationOutBillMain ou WITH(NOLOCK) on b.HInterID=ou.HProcExchInterID and b.HEntryID=ou.HProcExchEntryID
-where b.HInterID={HProcExchInterID} and b.HEntryID={HProcExchEntryID}
-group by b.HInterID,b.HEntryID,b.HQty", "Sc_ProcessExchangeBill_Out");
+ // //鏌ヨ鍑虹珯鏁伴噺鏄惁瓒呰繃娴佽浆鍗℃暟閲�
+ // ds = oCN.RunProcReturn($@"select (b.HQty -sum(isnull(ou.HQty,0))-sum(isnull(ou.HBadCount,0))) HQty from Sc_ProcessExchangeBillSub b WITH(NOLOCK)
+ //left join Sc_StationOutBillMain ou WITH(NOLOCK) on b.HInterID=ou.HProcExchInterID and b.HEntryID=ou.HProcExchEntryID
+ //where b.HInterID={HProcExchInterID} and b.HEntryID={HProcExchEntryID}
+ //group by b.HInterID,b.HEntryID,b.HQty", "Sc_ProcessExchangeBill_Out");
- if (double.Parse(ds.Tables[0].Rows[0][0].ToString()) < 0)
+ // if (double.Parse(ds.Tables[0].Rows[0][0].ToString()) < 0)
+ // {
+ // oCN.RollBack();
+ // CustomWriteLog("娴佽浆鍗�:"+ HProcExchBillNo + ",鍑虹珯鏁伴噺瓒呰繃娴佽浆鍗℃暟閲�!", DateTime.Now.ToString("yyyy-MM-dd"));
+ // return false;
+ // }
+
+ CustomWriteLog("2.1.15 鍙嶅啓缁撴潫 :" + HProcNumber + "----" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
+
+ //澧炲姞宸ュ簭鍒ゆ柇
+ if (HProcNumber == "013")
{
- oCN.RollBack();
- CustomWriteLog("娴佽浆鍗�:"+ HProcExchBillNo + ",鍑虹珯鏁伴噺瓒呰繃娴佽浆鍗℃暟閲�!", DateTime.Now.ToString("yyyy-MM-dd"));
- return false;
+ return true;
}
+
+
+ CustomWriteLog("2.1.16 宸ヨ壓鍙傛暟缁戝畾 :" + HProcNumber + "----" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
bool flag = false;
@@ -397,12 +457,17 @@
CustomWriteLog("绯荤粺鍙傛暟淇濆瓨澶辫触,鏉＄爜:" + HBadCodeSN, DateTime.Now.ToString("yyyy-MM-dd"));
return false;
}
+ CustomWriteLog("2.1.17 宸ヨ壓鍙傛暟缁戝畾缁撴潫 :" + HProcNumber + "----" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
+
//澧炲姞浜х嚎缁勮杩芥函鍗�
DataSet dataSet = oCN.RunProcReturn("exec h_p_Gy_BarCodeBillBomList '" + HProcExchBillNo + "'," + HProcID, "h_p_Gy_BarCodeBillBomList");
+ CustomWriteLog("2.1.18 浜х嚎缁勮杩芥函鍗曟煡璇� :" + HProcNumber + "----" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
+
if (dataSet.Tables[0].Rows.Count > 0)
{
+ CustomWriteLog("2.1.19 浜х嚎缁勮杩芥函鍗曟暟閲忓垽鏂� :" + HProcNumber + "----" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
//鍒ら厤浠舵暟閲忔槸鍚︾瓑浜�0
for (int i = 0; i < dataSet.Tables[0].Rows.Count; i++)
{
@@ -415,6 +480,7 @@
return false;
}
}
+ CustomWriteLog("2.1.20 浜х嚎缁勮杩芥函鍗曟暟閲忓垽鏂粨鏉� :" + HProcNumber + "----" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
//鏌ヨ鑱屽憳
@@ -425,6 +491,8 @@
HEmpIDs = long.Parse(ds.Tables[0].Rows[0]["HItemID"].ToString());//鑱屽憳ID
HMakers = ds.Tables[0].Rows[0]["HName"].ToString();
}
+
+ CustomWriteLog("2.1.21 鑱屽憳鏌ヨ :" + HProcNumber + "----" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
Int64 HInterID1 = CreateBillID("3727", ref sExeReturnInfo);
string HBillNo1 = CreateBillCode_Prod("3727", ref sExeReturnInfo, true);
@@ -437,6 +505,9 @@
,'{HBillNo1}','1','{HMakers}',getdate(),{HProcExchInterID},{HProcExchEntryID},'{HProcExchBillNo}'
,{HICMOInterID},'{HICMOBillNo}','{HBadCodeSN}',{HMaterID},0,'姹囨姤',{HPRDOrgIDs})";
oCN.RunProc(sql);
+
+ CustomWriteLog("2.1.22 淇濆瓨涓昏〃 :" + HProcNumber + "----" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
+
for (int i = 0; i < dataSet.Tables[0].Rows.Count; i++)
{
@@ -451,8 +522,11 @@
,0,0,getdate(),'{HBarCodes}','{HBadCodeSN}','') ";
oCN.RunProc(sq2);
}
- }
+ CustomWriteLog("2.1.23 淇濆瓨瀛愯〃 :" + HProcNumber + "----" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
+ }
+ CustomWriteLog("2.1.24璁℃椂鍣ㄧ粨鏉� :" + HProcNumber + "----" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
+ timer.Stop();//缁撴潫璁℃椂
return true;
}
catch (Exception e)
@@ -469,11 +543,11 @@
try
{
//鑾峰彇缁戝畾娴佽浆鍗�
- DataSet ds = oCN.RunProcReturn(@"select * from Gy_BarCodeBill WITH(NOLOCK) where HBarCode='" + HBadCodeSN + "'", "Gy_BarCodeBill");
+ DataSet ds = oCN.RunProcReturn(@"select HSourceBillNo from Gy_BarCodeBill WITH(NOLOCK) where HBarCode='" + HBadCodeSN + "'", "Gy_BarCodeBill");
string HProcExchBillNo = ds.Tables[0].Rows[0]["HSourceBillNo"].ToString();
string HProcNumber = dic["HProcNumber"].ToString();
- ds = oCN.RunProcReturn("select * from Gy_Source WITH(NOLOCK) where HNumber='" + dic["HSourceCode"].ToString() + "' ", "Gy_Source");
+ ds = oCN.RunProcReturn("select HItemID from Gy_Source WITH(NOLOCK) where HNumber='" + dic["HSourceCode"].ToString() + "' ", "Gy_Source");
long HSourceID = 0;
if (ds.Tables[0].Rows.Count != 0)
{
@@ -481,7 +555,7 @@
}
//鏌ヨ鑱屽憳
- ds = oCN.RunProcReturn("select * from Gy_Employee WITH(NOLOCK) where HNumber='" + dic["HEmpCode"].ToString() + "' ", "Gy_Employee");
+ ds = oCN.RunProcReturn("select HItemID from Gy_Employee WITH(NOLOCK) where HNumber='" + dic["HEmpCode"].ToString() + "' ", "Gy_Employee");
long HEmpIDs = 0;
if (ds.Tables[0].Rows.Count != 0)
{
@@ -523,26 +597,26 @@
long HInterID = 0;
string HBillNo = "";
- ds = oCN.RunProcReturn("exec h_p_Sc_SNBarcodeProcCtrl_S '" + HBadCodeSN + "'," + HProcID, "h_v_Gy_QualifiedRecordsList");
- if (ds.Tables[0].Rows.Count == 0)
- {
- oCN.RollBack();
- CustomWriteLog("鏉＄爜:" + HBadCodeSN + "宸ュ簭:" + HProcID + ",宸ュ簭鎺у埗鏌ユ棤鏁版嵁!", DateTime.Now.ToString("yyyy-MM-dd"));
- return false;
- }
- else if (ds.Tables[0].Rows[0]["HBack"].ToString() == "2")
- {
- oCN.RollBack();
- CustomWriteLog("鏉＄爜:" + HBadCodeSN + "宸ュ簭:" + HProcID + "," + ds.Tables[0].Rows[0]["HBackRemark"].ToString() + "!", DateTime.Now.ToString("yyyy-MM-dd"));
- return false;
- }
+ //ds = oCN.RunProcReturn("exec h_p_Sc_SNBarcodeProcCtrl_S '" + HBadCodeSN + "'," + HProcID, "h_v_Gy_QualifiedRecordsList");
+ //if (ds.Tables[0].Rows.Count == 0)
+ //{
+ // oCN.RollBack();
+ // CustomWriteLog("鏉＄爜:" + HBadCodeSN + "宸ュ簭:" + HProcID + ",宸ュ簭鎺у埗鏌ユ棤鏁版嵁!", DateTime.Now.ToString("yyyy-MM-dd"));
+ // return false;
+ //}
+ //else if (ds.Tables[0].Rows[0]["HBack"].ToString() == "2")
+ //{
+ // oCN.RollBack();
+ // CustomWriteLog("鏉＄爜:" + HBadCodeSN + "宸ュ簭:" + HProcID + "," + ds.Tables[0].Rows[0]["HBackRemark"].ToString() + "!", DateTime.Now.ToString("yyyy-MM-dd"));
+ // return false;
+ //}
- ds = oCN.RunProcReturn("select * from Sc_AssemblyBillMain WITH(NOLOCK) where HMainSourceInterID=" + HProcExchInterID + " and HMainSourceEntryID=" + HProcExchEntryID, "Sc_AssemblyBillMain");
+ ds = oCN.RunProcReturn("select HDate from Sc_AssemblyBillMain WITH(NOLOCK) where HMainSourceInterID=" + HProcExchInterID + " and HMainSourceEntryID=" + HProcExchEntryID, "Sc_AssemblyBillMain");
DateTime HDate=DateTime.Now;
//褰撲骇鍝佹病鏈夐厤浠剁殑鏃跺�� 鏌ヨ 涓嶈壇璁板綍
if (ds.Tables[0].Rows.Count == 0)
{
- ds = oCN.RunProcReturn("select * from Sc_QualityReportBillSub WITH(NOLOCK) where HProcExchInterID=" + HProcExchInterID + " and HProcExchEntryID=" + HProcExchEntryID+ " and HBarCode='" + HBadCodeSN + "'", "Sc_AssemblyBillMain");
+ ds = oCN.RunProcReturn("select HMakeDate from Sc_QualityReportBillSub WITH(NOLOCK) where HProcExchInterID=" + HProcExchInterID + " and HProcExchEntryID=" + HProcExchEntryID+ " and HBarCode='" + HBadCodeSN + "'", "Sc_AssemblyBillMain");
HDate = DateTime.Parse(ds.Tables[0].Rows[0]["HMakeDate"].ToString());
}
else {
@@ -563,7 +637,7 @@
}
//鍒ゆ柇褰撳墠娴佽浆鍗＄殑鍑虹珯鍗� 鏄惁鏈夋暟鎹�
- ds = oCN.RunProcReturn(@"select * from Sc_StationOutBillMain a WITH(NOLOCK)
+ ds = oCN.RunProcReturn(@"select HInterID,HBillNo from Sc_StationOutBillMain a WITH(NOLOCK)
left join Gy_Process p WITH(NOLOCK) on a.HProcID=p.HItemID
where HProcExchBillNo='" + HProcExchBillNo + "' and p.HNumber='" + HProcNumber + "' and CONVERT(varchar(10),HDate,20) ='" + HDate.ToString("yyyy-MM-dd") + "'", "Sc_StationOutBillMain");
@@ -575,7 +649,7 @@
if (HResult == "OK")
{
- ds = oCN.RunProcReturn("select * from Sc_StationOutBillSub_SN WITH(NOLOCK) where HInterID='" + HInterID + "' order by HEntryID desc", "Sc_StationOutBillSub_SN");
+ ds = oCN.RunProcReturn("select HInterID,HEntryID from Sc_StationOutBillSub_SN WITH(NOLOCK) where HInterID='" + HInterID + "' order by HEntryID desc", "Sc_StationOutBillSub_SN");
string HMakeTime = dic["HCreateTime"].ToString();
oCN.RunProc($@"insert into Sc_StationOutBillSub_SN(HInterID,HBillNo_bak,HEntryID,HBarCode,HBarCodeQty,HMakeTime,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney)
@@ -958,7 +1032,7 @@
}
- ds = oCN.RunProcReturn("select * from Gy_Source WITH(NOLOCK) where HNumber='" + dic["HSourceCode"].ToString() + "' ", "Gy_Source");
+ ds = oCN.RunProcReturn("select HItemID from Gy_Source WITH(NOLOCK) where HNumber='" + dic["HSourceCode"].ToString() + "' ", "Gy_Source");
long HSourceID = 0;
if (ds.Tables[0].Rows.Count != 0)
{
@@ -994,7 +1068,7 @@
,HMaterID,HUnitID,HRemark,HSourceID,HICMOInterID,HICMOEntryID,HICMOBillNo,HReportType
,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney
,HQty,HResult,HProcExchInterID,HProcExchEntryID,HProcExchBillNo,HProcID)
-values({HInterID},1,'{HBillNo}',{HEmpID},'{HBarCode}',0,'','{HMaker}','{HMakeDate}'
+values({HInterID},1,'{HBillNo}',{HEmpID},'{HBarCode}',219,'','{HMaker}','{HMakeDate}'
,{HMaterID},{ HUnitID},'',{HSourceID},{ HICMOInterID},{ HICMOEntryID},'{HICMOBillNo}',0
,0,0,'','',0,0
,1,'{HResult}',{ HProcExchInterID},{ HProcExchEntryID},'{ HProcExchBillNo}'," + HProcID + ")");
--
Gitblit v1.9.1