From 568964ed2142255dcd8296de697d4cb5cbe62754 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期三, 11 八月 2021 22:10:44 +0800
Subject: [PATCH] nothing
---
CLOUDWEB/WebService1.asmx.cs | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/CLOUDWEB/WebService1.asmx.cs b/CLOUDWEB/WebService1.asmx.cs
index d890b32..4730c7b 100644
--- a/CLOUDWEB/WebService1.asmx.cs
+++ b/CLOUDWEB/WebService1.asmx.cs
@@ -4956,7 +4956,7 @@
//鐢熸垚鐢熶骇姹囨姤鍗�
[WebMethod]
- public bool set_SaveICMOProductReportBill_Layui(Model.ClsSc_ICMOReportBillMain oMain, string sHSourceType, ref string sErrMsg)
+ public bool set_SaveICMOProductReportBill_Layui(Model.ClsSc_ICMOReportBillMain oMain, string workcode, int HSourceID, string sHSourceType, ref string sErrMsg)
{
//鑾峰彇绯荤粺鍙傛暟
Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
@@ -4972,7 +4972,7 @@
}
if (oSystemParameter.omodel.Sc_ICMOReportBill_ERPMode.ToUpper() == "CLOUD") //鍒ゆ柇鍚屾妯″紡鏄噾铦禖LOUD
{
- if (set_SaveICMOProductReportBill_CLD_Layui(oMain, sHSourceType, oSystemParameter.omodel, ref sErrMsg) == true)
+ if (set_SaveICMOProductReportBill_CLD_Layui(oMain, workcode,HSourceID, sHSourceType, oSystemParameter.omodel, ref sErrMsg) == true)
{
//"淇濆瓨鎴愬姛锛�";
return true;
@@ -4994,11 +4994,11 @@
//鐢熸垚鐢熶骇姹囨姤鍗�
[WebMethod]
- public bool set_SaveICMOProductReportBill_CLD_Layui(Model.ClsSc_ICMOReportBillMain oMain, string sHSourceType, Pub_Class.ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg)
+ public bool set_SaveICMOProductReportBill_CLD_Layui(Model.ClsSc_ICMOReportBillMain oMain,string workcode,int HSourceID, string sHSourceType, Pub_Class.ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg)
{
//if (sHSourceType == "3710") //婧愬崟锛氱敓浜ц鍗�
//{
- if (SaveICMOProductReportBill_ICMO_CLD_Layui(oMain, sHSourceType, oSystemParameterMain, ref sErrMsg))
+ if (SaveICMOProductReportBill_ICMO_CLD_Layui(oMain, workcode, HSourceID, sHSourceType, oSystemParameterMain, ref sErrMsg))
{
//"淇濆瓨鎴愬姛锛�";
sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo + "锛�" + sErrMsg;
@@ -5024,7 +5024,7 @@
/// <param name="oMain"></param>
/// <param name="sErrMsg"></param>
/// <returns></returns>
- public bool SaveICMOProductReportBill_ICMO_CLD_Layui(Model.ClsSc_ICMOReportBillMain oMain, string sHSourceType, Pub_Class.ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg)
+ public bool SaveICMOProductReportBill_ICMO_CLD_Layui(Model.ClsSc_ICMOReportBillMain oMain,string workcode,int HSourceID, string sHSourceType, Pub_Class.ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg)
{
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN(); //寤虹珛涓�涓� 浜嬪姟锛�
try
@@ -5062,6 +5062,25 @@
//鍐欏叆WMS鐢熶骇姹囨姤鍗�
oCn.BeginTran();
+ //鏍规嵁鍗曞彿銆佽祫婧怚D銆佽鍗曚富ID銆佽鍗曞瓙ID銆佸埗鍗曚汉杩囨护浜ч噺姹囨姤鎶ユ鐢宠鎻愪氦鏁版嵁
+ string sql = string.Format(@"update Sc_ICMOBillWorkQtyStatus_Tmp set
+ HICMOReportInterID ='" + oMain.HInterID + "', HICMOReportBillNo='" + oMain.HBillNo + "' from Sc_ICMOBillWorkQtyStatus_Tmp a where a.HICMOBillNo='" + workcode + "' and a.HSourceID='" + HSourceID + "' and HICMOInterID='" + oMain.HMainSourceInterID + "' and a.HICMOEntryID='" + oMain.HMainSourceEntryID + "' and a.HMaker='" + oMain.HMaker + "' and HRelationInterID='0'");
+ oCn.RunProc(sql);
+
+ //鏍规嵁鐢熶骇璁㈠崟鍙锋煡璇㈢敓浜ц鍗曡〃锛屾嬁鍒扮粍缁囥�佽溅闂�
+ DataSet ds0 = oCn.RunProcReturn("select HPRDORGID,HDeptID from Sc_ICMOBillMain with(nolock) where HBillNo='" + workcode + "'", "Sc_ICMOBillMain");
+
+ //鏌ヨ浜ч噺姹囨姤涓存椂琛�
+ DataSet ds = oCn.RunProcReturn("select top 1 * from Sc_ICMOBillWorkQtyStatus_Tmp with(nolock) where HICMOReportInterID='" + oMain.HInterID + "' and HICMOReportBillNo='" + oMain.HBillNo + "'", "Sc_ICMOBillWorkQtyStatus_Tmp");
+ if (ds.Tables[0].Rows.Count <= 0)
+ {
+ sErrMsg = "褰撳墠鍗曟嵁鏃犱骇閲忔眹鎶ヨ褰曪紒";
+ oCn.RollBack();
+ return false;
+ }
+ oMain.HGroupID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HGroupID"]);
+ oMain.HDeptID = DBUtility.ClsPub.isLong(ds0.Tables[0].Rows[0]["HDeptID"]);
+ oMain.HPRDORGID = DBUtility.ClsPub.isLong(ds0.Tables[0].Rows[0]["HPRDORGID"]);
//鎻掑叆瀛愯〃
oCn.RunProc("exec h_p_Sc_ICMOReportBillSub_Insert_WorkQty " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "','" + sHSourceType + "'");
//鎻掑叆涓昏〃
@@ -5258,17 +5277,17 @@
if (bLogin)
{
var result = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Save",
- new object[] { "PRD_MORPT", sJson },null,30000); //璋冪敤淇濆瓨鏂瑰紡
+ new object[] { "PRD_MORPT", sJson }); //璋冪敤淇濆瓨鏂瑰紡
if (oSystemParameterMain.Sc_ICMOReportBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
{
string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
- new object[] { "PRD_MORPT", sJson2 }, null, 30000); //鎻愪氦鍗曟嵁
+ new object[] { "PRD_MORPT", sJson2 }); //鎻愪氦鍗曟嵁
string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
- new object[] { "PRD_MORPT", sJson3 }, null, 30000); //瀹℃牳鍗曟嵁
+ new object[] { "PRD_MORPT", sJson3 }); //瀹℃牳鍗曟嵁
HReturn = result.ToString() + "," + result2.ToString() + "," + result3.ToString();
--
Gitblit v1.9.1