From 00d55bbca9d742d466438fed4b21271a23779896 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期二, 20 七月 2021 15:57:54 +0800
Subject: [PATCH] 修改了其他出库单提交方法
---
WebAPI/Controllers/OtherOutBillController.cs | 15 +++++++
WebAPI/WebServer.cs | 61 ++++++------------------------
WebAPI/DLL/Model.zip | 0
WebAPI/DLL/Model.dll | 0
4 files changed, 27 insertions(+), 49 deletions(-)
diff --git a/WebAPI/Controllers/OtherOutBillController.cs b/WebAPI/Controllers/OtherOutBillController.cs
index dbae805..dcbb69c 100644
--- a/WebAPI/Controllers/OtherOutBillController.cs
+++ b/WebAPI/Controllers/OtherOutBillController.cs
@@ -350,7 +350,20 @@
lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
string sSourceBillType = lsmain[0].HBillType;
- if (webserver.set_SaveOtherOutBill_New(lsmain[0], sSourceBillType, ref DBUtility.ClsPub.sErrInfo))
+
+ WebAPI.WebS.ClsKf_OtherOutBillMain websLsmain = new WebS.ClsKf_OtherOutBillMain();
+ websLsmain.HInterID = lsmain[0].HInterID;
+ websLsmain.HDate = lsmain[0].HDate;
+ websLsmain.HBillNo = lsmain[0].HBillNo;
+ websLsmain.HDeptID = lsmain[0].HDeptID;
+ websLsmain.HEmpID = lsmain[0].HEmpID;
+ websLsmain.HRemark = lsmain[0].HRemark;
+ websLsmain.HMaker = lsmain[0].HMaker;
+ websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;
+ websLsmain.HOWNERID = lsmain[0].HSTOCKORGID;
+
+ WebS.ClsXt_SystemParameterMain oSystemParameterMain = new WebS.ClsXt_SystemParameterMain();
+ if (webserver.set_SaveOtherOutBill_New(websLsmain, sSourceBillType, oSystemParameterMain, ref DBUtility.ClsPub.sErrInfo))
{
objJsonResult.code = "0";
objJsonResult.count = 1;
diff --git a/WebAPI/DLL/Model.dll b/WebAPI/DLL/Model.dll
index 4954d5f..0cb6e7a 100644
--- a/WebAPI/DLL/Model.dll
+++ b/WebAPI/DLL/Model.dll
Binary files differ
diff --git a/WebAPI/DLL/Model.zip b/WebAPI/DLL/Model.zip
index a03c930..725e4fb 100644
--- a/WebAPI/DLL/Model.zip
+++ b/WebAPI/DLL/Model.zip
Binary files differ
diff --git a/WebAPI/WebServer.cs b/WebAPI/WebServer.cs
index 08b8421..4285e6e 100644
--- a/WebAPI/WebServer.cs
+++ b/WebAPI/WebServer.cs
@@ -7511,55 +7511,20 @@
//鐢熸垚鍏朵粬鍑哄簱鍗�
- public bool set_SaveOtherOutBill_New(Model.ClsKf_OtherOutBillMain oMain, string sHSourceType, ref string sErrMsg)
+ public bool set_SaveOtherOutBill_New(WebAPI.WebS.ClsKf_OtherOutBillMain oMain, string sHSourceType, WebS.ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg)
{
- //鑾峰彇绯荤粺鍙傛暟
- Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
- if (oSystemParameter.ShowBill(ref sErrMsg) == false)
- {
- sErrMsg = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
- return false;
- }
- //
- if (oSystemParameter.omodel.Kf_OtherOutBill_ERPMode.ToUpper() == "WISE") //鍒ゆ柇鍚屾妯″紡鏄噾铦禬ISE
- {
- if (SaveOtherOutBill_K3(oMain, sHSourceType, oSystemParameter.omodel, ref sErrMsg))
- {
- //"淇濆瓨鎴愬姛锛�";
- sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo;
- return true;
- }
- else
- {
- //"淇濆瓨澶辫触锛�";
- sErrMsg = sErrMsg;
- return false;
- }
- }
- if (oSystemParameter.omodel.Kf_OtherOutBill_ERPMode.ToUpper() == "CLOUD") //鍒ゆ柇鍚屾妯″紡鏄噾铦禖LOUD
- {
- //涓婁紶鍓嶅繀濉」鍒ゆ柇
- //if (oMain.HDeptID == 0)
- //{
- // sErrMsg = "閮ㄩ棬娌℃湁閫夋嫨锛�";
- // return false;
- //}
- ////鍚屾鐢熸垚CLOUD鍗曟嵁
- //if (set_SaveOtherOutBill_CLD(oMain, sHSourceType, oSystemParameter.omodel, ref sErrMsg) == true)
- //{
- // //"淇濆瓨鎴愬姛锛�";
- // return true;
- //}
- //else
- //{
- //"淇濆瓨澶辫触锛�";
- return false;
- //}
- }
-
- sErrMsg = "淇濆瓨鍏朵粬鍑哄簱鍗曞け璐ワ紒" + sErrMsg;
- return false;
- }
+ WebS.WebService1 oWebs = new WebS.WebService1();//set_SaveOtherInBill_CLD_New
+ if (oWebs.set_SaveOtherOutBill_CLD_New(oMain, sHSourceType, oSystemParameterMain, ref sErrMsg))
+ {
+ sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo;
+ return true;
+ }
+ else
+ {
+ sErrMsg = "鍗曟嵁鍙凤細" + oMain.HBillNo + ", 鍗曟嵁ID锛�" + oMain.HInterID + ";" + sErrMsg;
+ return false;
+ }
+ }
--
Gitblit v1.9.1