From c7d5c83fdb0d29fa2846f299e9adf6db37ab1848 Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期四, 06 一月 2022 14:42:41 +0800
Subject: [PATCH] 销售出库、直接调拨单模块生成单据时，增加根据组织判断生单时是否审核单据控制
---
CLOUDWEB/WebService1.asmx.cs | 99 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 70 insertions(+), 29 deletions(-)
diff --git a/CLOUDWEB/WebService1.asmx.cs b/CLOUDWEB/WebService1.asmx.cs
index ed3a28e..98e1db7 100644
--- a/CLOUDWEB/WebService1.asmx.cs
+++ b/CLOUDWEB/WebService1.asmx.cs
@@ -5326,7 +5326,8 @@
return false;
}
try
- {
+ {
+ string sJson_CheckFlag = ""; //鐢熸垚鍗曟嵁鏄惁瀹℃牳鏍囧織
//鏍规嵁TMP琛� 杩斿洖 瀛愯〃淇℃伅
Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveMaterOutBill_CLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveMaterOutBill_CLD");
if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
@@ -5337,6 +5338,8 @@
}
else
{
+ sJson_CheckFlag = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCheckFlag"]);
+
string sJson_StockStyle = "";
if (oSystemParameterMain.WMS_CampanyName == "闊╃數") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
{
@@ -5498,15 +5501,22 @@
if (oSystemParameterMain.Kf_MoveStockBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
{
- string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
- var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
- new object[] { "STK_TransferDirect", sJson2 });
+ if (sJson_CheckFlag == "N") //閫掑姞鏄惁瀹℃牳锛孨涓轰笉瀹℃牳
+ {
+ HReturn = result.ToString();
+ }
+ else
+ {
+ string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
+ new object[] { "STK_TransferDirect", sJson2 });
- string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
- var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
- new object[] { "STK_TransferDirect", sJson3 });
+ string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
+ new object[] { "STK_TransferDirect", sJson3 });
- HReturn = result.ToString() + "," + result2.ToString() + "," + result3.ToString();
+ HReturn = result.ToString() + "," + result2.ToString() + "," + result3.ToString();
+ }
}
else
{
@@ -5587,6 +5597,7 @@
try
{
+ string sJson_CheckFlag = ""; //鐢熸垚鍗曟嵁鏄惁瀹℃牳鏍囧織
//鏍规嵁TMP琛� 杩斿洖 瀛愯〃淇℃伅
Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveSellOutBill_CLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveSellOutBill_CLD");
if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
@@ -5597,6 +5608,8 @@
}
else
{
+ sJson_CheckFlag = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCheckFlag"]);
+
string sJson_StockStyle = "";
if (oSystemParameterMain.WMS_CampanyName == "闊╃數") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
{
@@ -5785,15 +5798,22 @@
if (oSystemParameterMain.Kf_MoveStockBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
{
- string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
- var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
- new object[] { "STK_TransferDirect", sJson2 });
+ if (sJson_CheckFlag == "N") //閫掑姞鏄惁瀹℃牳锛孨涓轰笉瀹℃牳
+ {
+ HReturn = result.ToString();
+ }
+ else
+ {
+ string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
+ new object[] { "STK_TransferDirect", sJson2 });
- string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
- var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
- new object[] { "STK_TransferDirect", sJson3 });
+ string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
+ new object[] { "STK_TransferDirect", sJson3 });
- HReturn = result.ToString() + "," + result2.ToString() + "," + result3.ToString();
+ HReturn = result.ToString() + "," + result2.ToString() + "," + result3.ToString();
+ }
}
else
{
@@ -6106,6 +6126,7 @@
}
try
{
+ string sJson_CheckFlag = ""; //鐢熸垚鍗曟嵁鏄惁瀹℃牳鏍囧織
//鏍规嵁TMP琛� 杩斿洖 瀛愯〃淇℃伅
DataSet Ds;
Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_MoveStockRequest_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_MoveStockRequest_CLD_New");
@@ -6117,6 +6138,8 @@
}
else
{
+ sJson_CheckFlag = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCheckFlag"]);
+
string sJson_StockStyle = "";
if (oSystemParameterMain.WMS_CampanyName == "闊╃數") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
{
@@ -6315,15 +6338,22 @@
if (oSystemParameterMain.Kf_MoveStockBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
{
- string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
- var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
- new object[] { "STK_TransferDirect", sJson2 });
+ if (sJson_CheckFlag == "N") //閫掑姞鏄惁瀹℃牳锛孨涓轰笉瀹℃牳
+ {
+ HReturn = result.ToString();
+ }
+ else
+ {
+ string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
+ new object[] { "STK_TransferDirect", sJson2 });
- string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
- var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
- new object[] { "STK_TransferDirect", sJson3 });
+ string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
+ new object[] { "STK_TransferDirect", sJson3 });
- HReturn = result.ToString() + "," + result2.ToString() + "," + result3.ToString();
+ HReturn = result.ToString() + "," + result2.ToString() + "," + result3.ToString();
+ }
}
else
{
@@ -11168,6 +11198,7 @@
try
{
+ string sJson_CheckFlag = ""; //鐢熸垚鍗曟嵁鏄惁瀹℃牳鏍囧織
//鏍规嵁TMP琛� 杩斿洖 瀛愯〃淇℃伅
Ds = oCn.RunProcReturn("exec h_p_Kf_GetSellOutBill_CLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetSellOutBill_CLD");
if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
@@ -11177,6 +11208,8 @@
}
else
{
+ sJson_CheckFlag = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCheckFlag"]);
+
string sJson_Custom = "";
if (oSystemParameterMain.WMS_CampanyName == "闊╃數") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
{
@@ -11201,6 +11234,7 @@
{
sJson_Custom = "";
}
+
string sJson_Main = "{\"Creator\":\"\",\"NeedUpDateFields\":[]," +
"\"Model\":{ " +
//\"FID\":" + oMain.HInterID.ToString() + "," +
@@ -11383,15 +11417,22 @@
//
if (oSystemParameterMain.Kf_SellOutBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
{
- string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
- var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
- new object[] { "SAL_OUTSTOCK", sJson2 });
+ if (sJson_CheckFlag == "N") //閫掑姞鏄惁瀹℃牳锛孨涓轰笉瀹℃牳
+ {
+ HReturn = result.ToString();
+ }
+ else
+ {
+ string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
+ new object[] { "SAL_OUTSTOCK", sJson2 });
- string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
- var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
- new object[] { "SAL_OUTSTOCK", sJson3 });
+ string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
+ new object[] { "SAL_OUTSTOCK", sJson3 });
- HReturn = result.ToString() + "," + result2.ToString() + "," + result3.ToString();
+ HReturn = result.ToString() + "," + result2.ToString() + "," + result3.ToString();
+ }
}
else
{
--
Gitblit v1.9.1