From d3473e15fd14ea84a1378f3d3841bcad16c2d9f3 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期二, 18 六月 2024 15:32:04 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/XSGL/Xs_ContractBillController.cs | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/WebAPI/Controllers/XSGL/Xs_ContractBillController.cs b/WebAPI/Controllers/XSGL/Xs_ContractBillController.cs
index 16a3e95..f77f68d 100644
--- a/WebAPI/Controllers/XSGL/Xs_ContractBillController.cs
+++ b/WebAPI/Controllers/XSGL/Xs_ContractBillController.cs
@@ -229,8 +229,8 @@
,HMaker,HMakeDate
,HContractDate,HContractName,HAddress,HSSID,HCusID,HCurID,HExRate,HEmpID,HDeptID,HExplanation,HInnerBillNo
)
- values(" + HInterID + "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + 1100 + "','" +
- 1100 + "','" + HDate + "','" + HBillNo + "','" + HBillStatus + "','" +
+ values(" + HInterID + "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + 1400 + "','" +
+ 1400 + "','" + HDate + "','" + HBillNo + "','" + HBillStatus + "','" +
HRemark + "'," + 0 + ",'" +
HMaker + "',getdate(),'" +
HContractDate + "','" + HContractName + "','" + HAddress + "'," + HSSID + "," + HCusID + "," + HCurID + "," + HExRate + "," + HEmpID + "," + HDeptID + ",'" + HExplanation + "','" + HInnerBillNo + "'" +
@@ -565,7 +565,7 @@
}
#endregion
- #region 閲囪喘璁㈠崟 瀹℃牳/鍙嶅鏍�
+ #region 閿�鍞悎鍚� 瀹℃牳/鍙嶅鏍�
/// <summary>
/// </summary>
/// <param name="HInterID">鍗曟嵁ID</param>
@@ -753,7 +753,7 @@
}
#endregion
- #region 閲囪喘璁㈠崟 鍏抽棴/鍙嶅叧闂姛鑳�
+ #region 閿�鍞悎鍚� 鍏抽棴/鍙嶅叧闂姛鑳�
[Route("Xs_ContractBill/CloseXs_ContractBill")]
[HttpGet]
public object CloseXs_ContractBill(string HInterID, int Type, string user)
@@ -900,7 +900,7 @@
}
#endregion
- #region 閲囪喘璁㈠崟 琛屽叧闂�/琛屽弽鍏抽棴锛堟湭瀹屽杽锛�
+ #region 閿�鍞悎鍚� 琛屽叧闂�/琛屽弽鍏抽棴锛堟湭瀹屽杽锛�
/// <summary>
/// </summary>
/// <param name="HInterID">鍗曟嵁ID</param>
@@ -909,8 +909,8 @@
/// <param name="IsAudit">鍏抽棴(0),鍙嶅叧闂�(1)</param>
/// <param name="CurUserName">鍏抽棴浜�</param>
/// <returns></returns>
- [Route("Xs_ContractBill/CloseRowXs_ContractBill")]
- [HttpGet]
+ //[Route("Xs_ContractBill/CloseRowXs_ContractBill")]
+ //[HttpGet]
//public object CloseRowXs_ContractBill(int HInterID, int HEntryID, int HEntryID2, int IsAudit, string CurUserName)
//{
// string ModRightNameCheck = "Xs_ContractBill_Close";
@@ -1125,7 +1125,7 @@
//}
#endregion
- #region 閲囪喘璁㈠崟 浣滃簾/鍙嶄綔搴熷姛鑳�
+ #region 閿�鍞悎鍚� 浣滃簾/鍙嶄綔搴熷姛鑳�
[Route("Xs_ContractBill/DropXs_ContractBill")]
[HttpGet]
public object DropXs_ContractBill(string HInterID, int Type, string user)
@@ -1255,4 +1255,4 @@
}
#endregion
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1