From 0cf6c137b9217f2f34c8f5bd105929a9f396491c Mon Sep 17 00:00:00 2001
From: 杨乐 <yang.le.192@qq.com>
Date: 星期四, 24 二月 2022 17:22:23 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/DLL/ClsSc_MESReturnStepWorkBill.cs | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/WebAPI/DLL/ClsSc_MESReturnStepWorkBill.cs b/WebAPI/DLL/ClsSc_MESReturnStepWorkBill.cs
index 14b7936..aca74cd 100644
--- a/WebAPI/DLL/ClsSc_MESReturnStepWorkBill.cs
+++ b/WebAPI/DLL/ClsSc_MESReturnStepWorkBill.cs
@@ -146,11 +146,10 @@
",getdate(),getdate(),'杩斿伐璁″垝','"+omodel.HICMOInterID + "','"+omodel.HSourceEntryID+"','"+omodel.HSourceBillNo+"'" +
",'"+omodel.HSourceBillType+"','0','0','"+omodel.HProcID+"'" +
"from Sc_ICMOBillStatus_Tmp where HSourceBillNo='"+omodel.HSourceBillNo.ToString()+"'" +
- " and HSourceInterID='"+omodel.HICMOInterID+"' and HSourceEntryID='"+omodel.HSourceEntryID.ToString()+"'" +
- " and HSourceID='"+omodel.HSourceID.ToString()+"'");
- //Log.LogInfo(sql1);
+ " and HSourceInterID='"+omodel.HSourceInterID+"' and HSourceEntryID='"+omodel.HMainSourceEntryID.ToString()+"'" +
+ " and HSourceID='"+omodel.HSourceID.ToString()+"' and HProcID='"+omodel.HProcID.ToString()+"'");
oCn.RunProc(sql1);
- sReturn = omodel.HInterID.ToString();
+ sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
oCn.Commit();
return true;
}
--
Gitblit v1.9.1