From cd7a1182c004bfcc705f28b0a306a9855f3af059 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 22 五月 2025 21:04:24 +0800
Subject: [PATCH] 复制老的插进，然后进行 过站数量优化，和上到工序优化
---
WFormSynchronizeData_SMR/WFormReadData_SMR/ReadyDataForm.cs | 135 +++++++++++++++++++++++---------------------
1 files changed, 71 insertions(+), 64 deletions(-)
diff --git a/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadyDataForm.cs b/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadyDataForm.cs
index fb1578d..108cfe6 100644
--- a/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadyDataForm.cs
+++ b/WFormSynchronizeData_SMR/WFormReadData_SMR/ReadyDataForm.cs
@@ -23,7 +23,7 @@
{
InitializeComponent();
}
- public static int num = 0;
+ public static int num = 0;
public static int SelectTime = 0;
public static DateTime time = DateTime.Now.AddMinutes(-5);
public static decimal hqty = 2;
@@ -56,7 +56,8 @@
//鍛樺伐缂栫爜鍥炶溅
private void HEmpCode_KeyDown(object sender, KeyEventArgs e)
{
- if (e.KeyCode == Keys.Enter) {
+ if (e.KeyCode == Keys.Enter)
+ {
SelectHEmpCode(this.HEmpCode.Text);
}
}
@@ -66,7 +67,7 @@
{
try
{
- DataSet ds = oCN.RunProcReturn("select * from Gy_Employee where HNumber='" + HNumber + "' ", "Gy_Employee");
+ DataSet ds = oCN.RunProcReturn("select HName,HNumber from Gy_Employee WITH(NOLOCK) where HNumber='" + HNumber + "' ", "Gy_Employee");
if (ds.Tables[0].Rows.Count == 0)
{
MessageBox.Show("鏌ユ棤鏁版嵁!");
@@ -117,7 +118,8 @@
public static List<string> listData = new List<string>();
//鏂囨湰璇诲彇鏁版嵁
- public void Read_Txt() {
+ public void Read_Txt()
+ {
int year = DateTime.Now.Year;
string month = DateTime.Now.Month.ToString();
@@ -168,7 +170,7 @@
{
try
{
- DataSet ds = oCN.RunProcReturn("select * from Gy_Source where HNumber='" + HNumber + "' ", "Gy_Source");
+ DataSet ds = oCN.RunProcReturn("select HName,HNumber from Gy_Source WITH(NOLOCK) where HNumber='" + HNumber + "' ", "Gy_Source");
if (ds.Tables[0].Rows.Count == 0)
{
MessageBox.Show("鏌ユ棤鏁版嵁!");
@@ -188,10 +190,10 @@
}
}
- public static string AllBeginWork = "-1";
- public static string AllProcessExchange = "-1";
- public static string AllProcessExchangeHProcExchBillNo = "";
- public static string AllProcessExchangeHProcExchInterID = "";
+ public static string AllBeginWork = "-1"; //鏄惁寮�宸�
+ public static string AllProcessExchange = "-1"; //娴佽浆鍗￠」鐩彿
+ public static string AllProcessExchangeHProcExchBillNo = ""; //娴佽浆鍗″彿
+ public static string AllProcessExchangeHProcExchInterID = ""; //娴佽浆鍗′富鐮�
public void Xt_ReadText(string FileData)
{
@@ -220,7 +222,7 @@
{
string HBarCode = list[i]["HBadCodeSN"].ToString();
DateTime NowTime = DateTime.Parse(list[i]["HDate"].ToString());
- if (NowTime >= ActionTime && NowTime < EndTime && list[i]["HBadCodeSN"].ToString() != "" && listData.Contains(HBarCode)==false)
+ if (NowTime >= ActionTime && NowTime < EndTime && list[i]["HBadCodeSN"].ToString() != "" && listData.Contains(HBarCode) == false)
{
string HSourceCode = list[i]["HSouceNumber"].ToString();
string HEmpCode = this.HEmpCode.Text;
@@ -232,20 +234,21 @@
string HResult = list[i]["HResult"].ToString();
string HProcNumber = list[i]["HProcNumber"].ToString();
int HFlag = 0;
-
//DataSet ds = oCN.RunProcReturn(@"select * from Sb_EquipMentCollection_SN where HBarCode='" + HBarCode + "' and HCreateTime='" + HCreateTime + "'", "Sb_EquipMentCollection_SN");
if (true)
{
DataSet dataSet;
-
+
string HProjectNum = HBarCode.Substring(18, 8);
//閫氳繃鎴彇椤圭洰鍙� 濡傛灉绗竴鏉℃暟鎹殑椤圭洰鍙疯窡鍚庨潰鐨勪竴鏍� 灏变笉杩涜鍒ゆ柇
- if (HBarCode.Contains(AllProcessExchange)==false) {
+ if (HBarCode.Contains(AllProcessExchange) == false)
+ {
//鍒ゆ柇娴佽浆鍗℃槸鍚﹀瓨鍦�
dataSet = oCN.RunProcReturn("select HInterID,HBillNo from Sc_ProcessExchangeBillMain where HProjectNum='" + HProjectNum + "-1'", "Sc_ProcessExchangeBillMain");
- if (dataSet.Tables[0].Rows.Count > 0) {
+ if (dataSet.Tables[0].Rows.Count > 0)
+ {
AllProcessExchangeHProcExchBillNo = dataSet.Tables[0].Rows[0]["HBillNo"].ToString();
AllProcessExchangeHProcExchInterID = dataSet.Tables[0].Rows[0]["HInterID"].ToString();
AllProcessExchange = HProjectNum;
@@ -255,9 +258,10 @@
if (AllProcessExchange == HProjectNum)
{
//閫氳繃鎴彇椤圭洰鍙� 濡傛灉绗竴鏉℃暟鎹殑椤圭洰鍙疯窡鍚庨潰鐨勪竴鏍� 灏变笉杩涜鍒ゆ柇
- if (HBarCode.Contains(AllBeginWork) == false) {
+ if (HBarCode.Contains(AllBeginWork) == false)
+ {
//鍒ゆ柇褰撳墠娴佽浆鍗″搴旂殑宸ュ簭鏁版嵁鏄惁寮�宸�
- dataSet = oCN.RunProcReturn("select * from Sc_ICMOBillStatus_Tmp where HSourceBillNo='" + AllProcessExchangeHProcExchBillNo + "' and HICMOStatus<>'0'", "Sc_ICMOBillStatus_Tmp");
+ dataSet = oCN.RunProcReturn("select HICMOStatus from Sc_ICMOBillStatus_Tmp where HSourceBillNo='" + AllProcessExchangeHProcExchBillNo + "' and HICMOStatus<>'0'", "Sc_ICMOBillStatus_Tmp");
if (dataSet.Tables[0].Rows.Count > 0)
{
@@ -272,9 +276,9 @@
{
//鏂板鏉＄爜鏁版嵁
string sql = $@"insert into Sb_EquipMentCollection_SN(HSourceCode,HEmpCode,HType,HBarCode,HCount,HCreateTime,HDate,HResult,HProcNumber,HFlag)
-values('{HSourceCode}','{HEmpCode}','{HType}','{HBarCode}','{HCount}','{HCreateTime}','{HDate}','{HResult}','{HProcNumber}','{HFlag}')";
+ values('{HSourceCode}','{HEmpCode}','{HType}','{HBarCode}','{HCount}','{HCreateTime}',GETDATE(),'{HResult}','{HProcNumber}','{HFlag}')";
oCN.RunProc(sql);
- ListSelect.Items.Add("鏉＄爜:" + HBarCode + ",褰撳墠鏃ユ湡;"+DateTime.Now.ToString()+",鏃ユ湡:" + HCreateTime + ",缁撴灉:" + HResult);
+ ListSelect.Items.Add("鏉＄爜:" + HBarCode + ",褰撳墠鏃ユ湡;" + DateTime.Now.ToString() + ",鏃ユ湡:" + HCreateTime + ",缁撴灉:" + HResult);
listData.Add(HBarCode);
}
else
@@ -350,12 +354,12 @@
string HProcNumber = list[i]["HProcNumber"].ToString();
int HFlag = 0;
- DataSet ds = oCN.RunProcReturn(@"select * from Sb_EquipMentCollectionTechParam_SN where HBarCode='" + HBarCode + "' and HCreateTime='" + HCreateTime + "'", "Sb_EquipMentCollectionTechParam_SN");
+ DataSet ds = oCN.RunProcReturn(@"select HItemID from Sb_EquipMentCollectionTechParam_SN where HBarCode='" + HBarCode + "' and HCreateTime='" + HCreateTime + "'", "Sb_EquipMentCollectionTechParam_SN");
if (ds.Tables[0].Rows.Count == 0)
{
string sql = $@"insert into Sb_EquipMentCollectionTechParam_SN(HSourceCode,HEmpCode,HType,HBarCode,HCount,HCreateTime,HDate,HResult,HProcNumber,HFlag)
-values('{HSourceCode}','{HEmpCode}','{HType}','{HBarCode}','{HCount}','{HCreateTime}','{HDate}','{HResult}','{HProcNumber}','{HFlag}')";
+ values('{HSourceCode}','{HEmpCode}','{HType}','{HBarCode}','{HCount}','{HCreateTime}',GETDATE(),'{HResult}','{HProcNumber}','{HFlag}')";
oCN.RunProc(sql);
//ListSelect.Items.Add("鏉＄爜:" + HBarCode + ",鏃ユ湡:" + HCreateTime + ",缁撴灉:" + HResult);
}
@@ -368,13 +372,13 @@
}
- public static string AllSNBarcodeProcCtrl = "";
- public static string AllHProcID = "0";
- public static string AllHProName = "";
- public static double AllHQty = 0;
-
+ public static string AllSNBarcodeProcCtrl = ""; //娴佽浆鍗�+宸ュ簭鐨勬嫾鍐�
+ public static string AllHProcID = "0"; //宸ュ簭id
+ public static string AllHProName = ""; //宸ュ簭鍚嶅瓧
+ public static double AllHQty = 0; //榛樿娴佽浆鍗℃暟閲� 濡傛灉鍑虹珯鍗曟湁鏁版嵁浼氭洿鏂版垚鍑虹珯鍗曟暟閲�
+
//鏍规嵁鏉＄爜 鍒ゆ柇鏄惁淇濆瓨
- public bool Get_AllowLoadData(string HBarCode, string HProcNumber, bool flag_1,string HProcExchBillNo,string HProcExchInterID, out bool flag_2)
+ public bool Get_AllowLoadData(string HBarCode, string HProcNumber, bool flag_1, string HProcExchBillNo, string HProcExchInterID, out bool flag_2)
{
//鍒ゆ柇鏉＄爜鐨勯暱搴�
if (HBarCode.Length != 29 && HBarCode.Length != 50)
@@ -386,13 +390,13 @@
//鍒ゆ柇闀垮害鏄惁涓�29浣� 鏃犲皹杞﹂棿
if (HBarCode.Length == 29)
{
-
+
}
//鍒ゆ柇闀垮害鏄惁涓�50浣� 15杞﹂棿
else if (HBarCode.Length == 50)
{
string str1 = HBarCode.Substring(42, 8);
- DataSet ds = oCN.RunProcReturn("select HBillNo from Sc_ProcessExchangeBillMain where HProjectNum like'" + str1 + "-1%'", "Sc_ProcessExchangeBillMain");
+ DataSet ds = oCN.RunProcReturn("select HBillNo from Sc_ProcessExchangeBillMain WITH(NOLOCK) where HProjectNum like'" + str1 + "-1%'", "Sc_ProcessExchangeBillMain");
//鍒ゆ柇鏄惁鑳芥壘鍒板搴旂殑娴佽浆鍗�
if (ds.Tables[0].Rows.Count > 0)
{
@@ -415,10 +419,11 @@
DataSet ds1;
//绗竴娆℃祦杞崱+宸ュ簭鍜屽悗闈㈢殑鍋氬姣� 濡傛灉鏄悓涓�涓祦杞崱灏变笉杩涜鍒ゆ柇
- if ((HProcExchBillNo + HProcNumber) != AllSNBarcodeProcCtrl) {
-
+ if ((HProcExchBillNo + HProcNumber) != AllSNBarcodeProcCtrl)
+ {
+
//鏌ヨ宸ュ簭
- ds1 = oCN.RunProcReturn(@"SELECT HItemID,HName FROM Gy_Process WHERE HNumber='" + HProcNumber + "'", "Gy_Process");
+ ds1 = oCN.RunProcReturn(@"SELECT HItemID,HName FROM Gy_Process WITH(NOLOCK) WHERE HNumber='" + HProcNumber + "'", "Gy_Process");
if (ds1.Tables[0].Rows.Count > 0)
{
AllHProcID = ds1.Tables[0].Rows[0]["HItemID"].ToString();
@@ -426,7 +431,7 @@
}
//鏌ヨ娴佽浆鍗℃暟閲�
- ds1 = oCN.RunProcReturn(@"SELECT HQty FROM Sc_ProcessExchangeBillSub where HInterID=" + HProcExchInterID + " and HProcID=" + AllHProcID, "Sc_ProcessExchangeBillSub");
+ ds1 = oCN.RunProcReturn(@"SELECT HQty FROM Sc_ProcessExchangeBillSub WITH(NOLOCK) where HInterID=" + HProcExchInterID + " and HProcID=" + AllHProcID, "Sc_ProcessExchangeBillSub");
if (ds1.Tables[0].Rows.Count > 0)
{
AllHQty = double.Parse(ds1.Tables[0].Rows[0]["HQty"].ToString());
@@ -438,47 +443,48 @@
////绗竴娆℃祦杞崱+宸ュ簭鍜屽悗闈㈢殑鍋氬姣� 濡傛灉鏄悓涓�涓祦杞崱灏变笉杩涜鍒ゆ柇
//if ((HProcExchBillNo + HProcNumber) == AllSNBarcodeProcCtrl)
//{
- //杩囩珯鎺у埗
- //鍒ゆ柇褰撳墠宸ュ簭瀵瑰簲鐨勬潯鐮佹槸鍚︿笂閬撳伐搴忚繃绔�
- ds1 = oCN.RunProcReturn("exec h_p_Sc_SNBarcodeProcCtrl_S '" + HBarCode + "'," + AllHProcID, "h_p_Sc_SNBarcodeProcCtrl_S");
+ //杩囩珯鎺у埗
+ //鍒ゆ柇褰撳墠宸ュ簭瀵瑰簲鐨勬潯鐮佹槸鍚︿笂閬撳伐搴忚繃绔�
+ ds1 = oCN.RunProcReturn("exec h_p_Sc_SNBarcodeProcCtrl_S '" + HBarCode + "'," + AllHProcID, "h_p_Sc_SNBarcodeProcCtrl_S");
- if (ds1.Tables[0].Rows.Count == 0)
+ if (ds1.Tables[0].Rows.Count == 0)
+ {
+ //flag_1=鍙湁绗竴娆¤繘鏉ユ墠浼氬脊鍑� 閿欒淇℃伅寮瑰嚭妗� 瀹氭椂瓒呰繃2鍒嗛挓寮逛竴娆�
+ if (!flag_1 && (DateTime.Now - time).Minutes > hqty)
{
- //flag_1=鍙湁绗竴娆¤繘鏉ユ墠浼氬脊鍑� 閿欒淇℃伅寮瑰嚭妗� 瀹氭椂瓒呰繃2鍒嗛挓寮逛竴娆�
- if (!flag_1 && (DateTime.Now - time).Minutes > hqty)
- {
- time = DateTime.Now;
- MessageBox.Show("鏉＄爜:" + HBarCode + "宸ュ簭:" + AllHProName + ",宸ュ簭鎺у埗鏌ユ棤鏁版嵁!");
- }
- DBHelper.CustomWriteLog("鏉＄爜:" + HBarCode + "宸ュ簭:" + AllHProName + ",宸ュ簭鎺у埗鏌ユ棤鏁版嵁!", DateTime.Now.ToString("yyyy-MM-dd"));
-
- flag_2 = true;
- return false;
+ time = DateTime.Now;
+ MessageBox.Show("鏉＄爜:" + HBarCode + "宸ュ簭:" + AllHProName + ",宸ュ簭鎺у埗鏌ユ棤鏁版嵁!");
}
- else if (ds1.Tables[0].Rows[0]["HBack"].ToString() == "2")
+ DBHelper.CustomWriteLog("鏉＄爜:" + HBarCode + "宸ュ簭:" + AllHProName + ",宸ュ簭鎺у埗鏌ユ棤鏁版嵁!", DateTime.Now.ToString("yyyy-MM-dd"));
+
+ flag_2 = true;
+ return false;
+ }
+ else if (ds1.Tables[0].Rows[0]["HBack"].ToString() == "2")
+ {
+ //flag_1=鍙湁绗竴娆¤繘鏉ユ墠浼氬脊鍑� 閿欒淇℃伅寮瑰嚭妗� 瀹氭椂瓒呰繃2鍒嗛挓寮逛竴娆�
+ if (!flag_1 && (DateTime.Now - time).Minutes > hqty)
{
- //flag_1=鍙湁绗竴娆¤繘鏉ユ墠浼氬脊鍑� 閿欒淇℃伅寮瑰嚭妗� 瀹氭椂瓒呰繃2鍒嗛挓寮逛竴娆�
- if (!flag_1 && (DateTime.Now - time).Minutes > hqty)
- {
- time = DateTime.Now;
- MessageBox.Show("鏉＄爜:" + HBarCode + "宸ュ簭:" + AllHProcID + "," + ds1.Tables[0].Rows[0]["HBackRemark"].ToString() + "!");
- }
- DBHelper.CustomWriteLog("鏉＄爜:" + HBarCode + "宸ュ簭:" + AllHProcID + "," + ds1.Tables[0].Rows[0]["HBackRemark"].ToString() + "!", DateTime.Now.ToString("yyyy-MM-dd"));
-
- flag_2 = true;
- return false;
+ time = DateTime.Now;
+ MessageBox.Show("鏉＄爜:" + HBarCode + "宸ュ簭:" + AllHProcID + "," + ds1.Tables[0].Rows[0]["HBackRemark"].ToString() + "!");
}
+ DBHelper.CustomWriteLog("鏉＄爜:" + HBarCode + "宸ュ簭:" + AllHProcID + "," + ds1.Tables[0].Rows[0]["HBackRemark"].ToString() + "!", DateTime.Now.ToString("yyyy-MM-dd"));
+
+ flag_2 = true;
+ return false;
+ }
//}
- //鏌ヨ鍑虹珯鏁伴噺鏄惁瓒呰繃娴佽浆鍗℃暟閲�
- ds1 = oCN.RunProcReturn($@"select ({AllHQty}-sum(isnull(ou.HQty,0))-sum(isnull(ou.HBadCount,0))) HQty from Sc_StationOutBillMain ou WITH(NOLOCK)
-where ou.HProcExchInterID={HProcExchInterID} and ou.HProcID={AllHProcID}
-group by ou.HProcExchInterID,ou.HProcExchEntryID,ou.HQty", "Sc_StationOutBillMain");
+ //鏌ヨ鍑虹珯鏁伴噺鏄惁瓒呰繃娴佽浆鍗℃暟閲�
+ ds1 = oCN.RunProcReturn($@"select ({AllHQty}-sum(isnull(ou.HQty,0))-sum(isnull(ou.HBadCount,0))) HQty from Sc_StationOutBillMain ou WITH(NOLOCK)
+ where ou.HProcExchInterID={HProcExchInterID} and ou.HProcID={AllHProcID}
+ group by ou.HProcExchInterID,ou.HProcExchEntryID,ou.HQty", "Sc_StationOutBillMain");
//鑾峰彇娴佽浆鍗℃暟閲�
double hqtyOut = AllHQty;
- if (ds1.Tables[0].Rows.Count > 0) {
+ if (ds1.Tables[0].Rows.Count > 0)
+ {
hqtyOut = double.Parse(ds1.Tables[0].Rows[0][0].ToString());
}
//娴佽浆鍗℃暟閲�-鍑虹珯鍗曟暟閲忓ぇ浜�0
@@ -531,7 +537,8 @@
private void ReadyDataForm_FormClosing(object sender, FormClosingEventArgs e)
{
- if (num == 1) {
+ if (num == 1)
+ {
MessageBox.Show("褰撳墠鎸夐挳鏈殏鍋�,涓嶅厑璁稿叧闂�!");
e.Cancel = true;
}
@@ -556,7 +563,7 @@
MessageBox.Show("璇峰厛鐐瑰嚮鏆傚仠鎸夐挳!");
}
-
+
}
}
}
--
Gitblit v1.9.1