From b9e07918f687f7b51e165d659c4a1595916406ff Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期二, 24 三月 2026 12:26:20 +0800
Subject: [PATCH] 斯末尔单品过站优化，增加自动开工功能，自动完工，华舟数采优化
---
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.cs | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.cs b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.cs
index a1e254d..4700b53 100644
--- a/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.cs
+++ b/WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.cs
@@ -441,22 +441,28 @@
CustomWriteLog("2.1.15 鍙嶅啓缁撴潫 :" + HProcNumber + "----" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
// ===== 鍒ゆ柇鏄惁鑷姩瀹屽伐 =====
- DataSet dsMainFinal = oCN.RunProcReturn($"select HQty, HBadCount from Sc_StationOutBillMain where HInterID={HInterID}", "temp");
+ DataSet dsMainFinal = oCN.RunProcReturn($"select HQty, HBadCount from Sc_StationOutBillMain where HInterID={HInterID}", "Sc_StationOutBillMain");
+ CustomWriteLog("2.1.15 鍙嶅啓缁撴潫 :" + HProcNumber + "----" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd"));
if (dsMainFinal.Tables[0].Rows.Count > 0)
{
double total = double.Parse(dsMainFinal.Tables[0].Rows[0]["HQty"].ToString())
+ double.Parse(dsMainFinal.Tables[0].Rows[0]["HBadCount"].ToString());
+ CustomWriteLog($"銆愬畬宸ュ崟瑙﹀彂銆戝嚭绔欏崟ID:{HInterID}, 鍚堣鏁伴噺:{total} | 璁″垝鏁伴噺:{planQty} | 鏄惁婊¤冻瀹屽伐鏉′欢:{total == planQty}", DateTime.Now.ToString("yyyy-MM-dd"));
+
if (total == planQty) // planQty 闇�鍦ㄥ墠闈粠娴佽浆鍗¤幏鍙�
{
- string savePointName = "SP_" + HInterID + "_" + Guid.NewGuid().ToString("N").Substring(0, 8); // 鍞竴淇濆瓨鐐瑰悕
- oCN.RunProc($"SAVE TRANSACTION {savePointName}"); // 璁剧疆淇濆瓨鐐�
+
+ CustomWriteLog($"銆愬畬宸ュ崟瑙﹀彂銆戝嚭绔欏崟ID:{HInterID},", DateTime.Now.ToString("yyyy-MM-dd"));
+
+
+ string paramLog = $"BillType:3772, HProcExchInterID:{HProcExchInterID}, HProcExchEntryID:{HProcExchEntryID}, HProcExchBillNo:{HProcExchBillNo}, HMaker:{HMaker}, Type:3772";
+ CustomWriteLog($"銆愬畬宸ュ崟鎵ц銆戝嚭绔欏崟ID:{HInterID}, 璋冪敤SaveMESEndWorkFrom_ZD鏂规硶 | 鍏ュ弬:{paramLog}", DateTime.Now.ToString("yyyy-MM-dd"));
+
bool completeFlag = SaveMESEndWorkFrom_ZD("3772", HProcExchInterID, HProcExchEntryID, HProcExchBillNo, HMaker, "3772");
if (!completeFlag)
{
- // 瀹屽伐鍗曞け璐ワ紝鍥炴粴鍒颁繚瀛樼偣锛屼粎鎾ら攢瀹屽伐鍗曠浉鍏虫搷浣�
- oCN.RunProc($"ROLLBACK TRANSACTION {savePointName}");
- CustomWriteLog("鐢熸垚瀹屽伐鍗曞け璐ヤ絾鍑虹珯鍗曞凡淇濆瓨,鏉＄爜:" + HBadCodeSN, DateTime.Now.ToString("yyyy-MM-dd"));
+ CustomWriteLog($"銆愬畬宸ュ崟鎵ц銆戝嚭绔欏崟ID:{HInterID}, 瀹屽伐鍗曠敓鎴愬け璐ワ紒 | 鏉＄爜:{HBadCodeSN}", DateTime.Now.ToString("yyyy-MM-dd"));
}
}
}
@@ -1172,7 +1178,7 @@
oCN.RunProc(" Update Sc_MESEndWorkBillMain set HBillStatus='2',HChecker='" + user + "',HCheckDate=getdate() Where HInterID=" + HInterID.ToString());
//鏍规嵁寮�宸ュ崟鍐呯爜 鍙栧埌鐢熶骇鐘舵�佷复鏃惰〃涓诲唴鐮侊紝鐒跺悗鏇存柊鐢熶骇鐘舵�佷复鏃惰〃鐘舵�佷负锛氬緟鐢熶骇 浠诲姟鍗曠姸鎬�(0寰呯敓浜э紝1鐢熶骇涓紝2鎸傝捣锛�3宸插畬宸�)
- oCN.RunProc("exec h_p_JIT_MESBeginWorkBill_BeginWork @HInterId=" + HInterID + ",@flag='瀹屽伐'");
+ oCN.RunProc(" Update Sc_ICMOBillStatus_Tmp set hicmostatus='3',HEndDate=getdate() Where HInterID=" + HMainSourceInterID.ToString());
//淇濆瓨鍚�
ds =oCN.RunProcReturn("exec h_p_Sc_MESEndWorkBill_AfterSaveCtrl " + HInterID.ToString() + "," + HICMOInterID.ToString() + "," + HICMOEntryID.ToString() + ",'" + HICMOBillNo + "'," + 1, "h_p_Sc_MESEndWorkBill_AfterSaveCtrl");
--
Gitblit v1.9.1