From 81c2a1c9635bdfb714d9a04b4bb08be6e060e99c Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 16 十二月 2024 09:49:06 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/DLL/ClsSc_MESBeginWorkBill.cs | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/WebAPI/DLL/ClsSc_MESBeginWorkBill.cs b/WebAPI/DLL/ClsSc_MESBeginWorkBill.cs
index 5a2de6c..fd3f142 100644
--- a/WebAPI/DLL/ClsSc_MESBeginWorkBill.cs
+++ b/WebAPI/DLL/ClsSc_MESBeginWorkBill.cs
@@ -67,6 +67,8 @@
try
{
DataSet Ds = oCn.RunProcReturn("Exec h_p_Sc_MESBeginWorkBill_AfterSaveCtrl " + HInterID.ToString() + "," + HICMOInterID.ToString() + "," + HICMOEntryID.ToString() + ",'" + HICMOBillNo + "'," + OperationType.ToString(), "h_p_Sc_MESBeginWorkBill_AfterSaveCtrl");
+ LogService.Write("寮�宸�:2.6.1");
+
if (Ds == null || Ds.Tables[0].Rows.Count == 0)
{
sReturn = "淇濆瓨鍚庡垽鏂け璐ワ紒";
@@ -74,9 +76,12 @@
}
else
{
+ LogService.Write("寮�宸�:2.6.2"+ Ds.Tables[0].Rows[0]["HBack"]);
if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HBack"]) == 1)
{
+ LogService.Write("寮�宸�:2.6.3");
sReturn = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
+ LogService.Write("寮�宸�:2.6.4");
return false;
}
}
@@ -253,6 +258,7 @@
{
try
{
+ LogService.Write("寮�宸�:2.2");
DataSet ds;
//寰楀埌mainid
omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
@@ -263,7 +269,7 @@
{
return false;
}
-
+ LogService.Write("寮�宸�:2.3");
//涓昏〃
oCn.RunProc("Insert Into Sc_MESBeginWorkBillMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
@@ -314,7 +320,7 @@
oCn.RunProc(subSql);
}
-
+ LogService.Write("寮�宸�:2.4");
//鍐嶆楠岃瘉 淇濆瓨鏄惁 鍚堢悊
ds = oCn.RunProcReturn("exec h_p_JIT_MESBeginWorkBill_SaveCtrl @HInterId=" + omodel.HInterID + "", "h_p_JIT_MESBeginWorkBill_SaveCtrl");
if (ds == null || ds.Tables[0].Rows.Count <= 0)
@@ -329,13 +335,7 @@
oCn.RollBack();
return false;
}
-
- //淇濆瓨鍚庢帶鍒�
- if (!AfterSave(omodel.HInterID, omodel.HICMOInterID, omodel.HICMOEntryID, omodel.HICMOBillNo, 1, ref sReturn))
- {
- oCn.RollBack();
- return false;
- }
+ LogService.Write("寮�宸�:2.5");
//鑾峰彇鏈�杩戠殑涓婃ā鍗� 鎶婂伐鍗曡窡妯″叿杩涜缁戝畾
ds = oCn.RunProcReturn(@"select HICMOInterID,HICMOEntryID,HSourceInterID,HSourceEntryID,HSourceID from Sc_ICMOBillStatus_Tmp where HInterID=" + omodel.HMainSourceInterID.ToString(), "Sc_ICMOBillStatus_Tmp");
@@ -364,7 +364,14 @@
}
}
}
-
+ LogService.Write("寮�宸�:2.6 " + omodel.HInterID + "," + omodel.HICMOInterID + ", " + omodel.HICMOEntryID + ", " + omodel.HICMOBillNo + ", 1");
+ //淇濆瓨鍚庢帶鍒�
+ if (!AfterSave(omodel.HInterID, omodel.HICMOInterID, omodel.HICMOEntryID, omodel.HICMOBillNo, 1, ref sReturn))
+ {
+ oCn.RollBack();
+ return false;
+ }
+ LogService.Write("寮�宸�:2.7");
sReturn = omodel.HInterID.ToString();
oCn.Commit();
return true;
--
Gitblit v1.9.1