From 5fccb067ad7dc2dbcdacf8db642aa471488cd8f0 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 20 二月 2025 15:24:29 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/EntrustOutController.cs | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/WebAPI/Controllers/EntrustOutController.cs b/WebAPI/Controllers/EntrustOutController.cs
index 9d29217..c427c0f 100644
--- a/WebAPI/Controllers/EntrustOutController.cs
+++ b/WebAPI/Controllers/EntrustOutController.cs
@@ -460,17 +460,22 @@
websLsmain.HBillNo = lsmain[0].HBillNo;
websLsmain.HDeptID = lsmain[0].HDeptID;
//websLsmain.HEmpID = lsmain[0].HEmpID;
+ websLsmain.HKeeperID = lsmain[0].HKeeperID;
+ websLsmain.HSecManagerID = lsmain[0].HSecManagerID;
websLsmain.HRemark = lsmain[0].HRemark;
websLsmain.HMaker = lsmain[0].HMaker;
+ websLsmain.HBillerID = lsmain[0].HBillerID;
websLsmain.HWHID = lsmain[0].HWHID;
websLsmain.HMainSourceBillType = "濮斿璁㈠崟-鎶曟枡";
websLsmain.HSupID = lsmain[0].HSupID;
+ websLsmain.HBillType = "1211";//鍥哄畾鍊�
if (webserver.set_SaveEntrustOutBill_New(websLsmain, sSourceBillType, ref DBUtility.ClsPub.sErrInfo))
{
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "鐢熸垚濮斿鍑哄簱鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�";
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //鎴愬姛锛�
+ //objJsonResult.Message = "鐢熸垚濮斿鍑哄簱鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -478,8 +483,9 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "涓婁紶澶辫触锛乕webserver.set_SaveEntrustOutBill_New]" + DBUtility.ClsPub.sErrInfo;
- objJsonResult.data = websLsmain;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //澶辫触锛�
+ //objJsonResult.Message = "涓婁紶澶辫触锛乕webserver.set_SaveEntrustOutBill_New]" + DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = null;
return objJsonResult;
}
}
@@ -537,7 +543,8 @@
{
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "鐢熸垚浜у搧閫�搴撳崟鎴愬姛锛佸崟鎹彿涓猴細";
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //鎴愬姛锛�
+ //objJsonResult.Message = "鐢熸垚浜у搧閫�搴撳崟鎴愬姛锛佸崟鎹彿涓猴細";
objJsonResult.data = null;
return objJsonResult;
}
@@ -545,7 +552,8 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "涓婁紶澶辫触锛�" + DBUtility.ClsPub.sErrInfo;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //澶辫触锛�
+ //objJsonResult.Message = "涓婁紶澶辫触锛�" + DBUtility.ClsPub.sErrInfo;
objJsonResult.data = null;
return objJsonResult;
}
--
Gitblit v1.9.1