From ce58bfdb73054fa181e0731d60f4c2e74798cabb Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期一, 13 十月 2025 09:23:38 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
index 0087c46..07728a3 100644
--- a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
+++ b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
@@ -1822,7 +1822,7 @@
{
for(int i=0;i< dsMain.Tables[0].Rows.Count; i++)
{
- string HMaterNumber = DBUtility.ClsPub.isStrNull(dsMain.Tables[0].Rows[0]["浜у搧浠ｇ爜"]);
+ string HMaterNumber = DBUtility.ClsPub.isStrNull(dsMain.Tables[0].Rows[i]["浜у搧浠ｇ爜"]);
if (!oMaterHlp.GetInfoByNumber(HMaterNumber))
{
string sMsg = "鐗╂枡銆�" + HMaterNumber + "銆戜笉瀛樺湪锛�";
@@ -1910,14 +1910,14 @@
DataSet dsSub = oCN.RunProcReturn("select * from diyipi_WorkQty where 浜у搧浠ｇ爜 = '" + HMaterNumber + "' order by 宸ュ簭搴忓彿", "diyipi_WorkQty");
for(int j = 0; j < dsSub.Tables[0].Rows.Count; j++)
{
- string HProcNumber = DBUtility.ClsPub.isStrNull(dsSub.Tables[0].Rows[j]["宸ュ簭浠ｇ爜"]);
+ string HProcName = DBUtility.ClsPub.isStrNull(dsSub.Tables[0].Rows[j]["宸ュ簭"]);
//寰楀埌宸ュ簭鍐呯爜
- if (!oProcHlp.GetInfoByNumber(HProcNumber))
+ if (!oProcHlp.GetInfoByName(HProcName))
{
- string sMsg = "宸ュ簭銆�" + HProcNumber + "銆戜笉瀛樺湪锛�";
+ string sMsg = "宸ュ簭銆�" + HProcName + "銆戜笉瀛樺湪锛�";
if (finalErrMsg.Contains(sMsg) == false)
{
- finalErrMsg = finalErrMsg + "宸ュ簭銆�" + HProcNumber + "銆戜笉瀛樺湪锛乗r\n";
+ finalErrMsg = finalErrMsg + "宸ュ簭銆�" + HProcName + "銆戜笉瀛樺湪锛乗r\n";
}
continue;
}
@@ -1948,10 +1948,10 @@
//寰楀埌鐢熶骇璧勬簮鍐呯爜
if (!oSourceHlp.GetInfoByNumber(sHNumberSourceList[t]))
{
- string sMsg = "鐢熶骇璧勬簮銆�" + HProcNumber + "銆戜笉瀛樺湪锛�";
+ string sMsg = "鐢熶骇璧勬簮銆�" + sHNumberSourceList[t] + "銆戜笉瀛樺湪锛�";
if (finalErrMsg.Contains(sMsg) == false)
{
- finalErrMsg = finalErrMsg + "鐢熶骇璧勬簮銆�" + HProcNumber + "銆戜笉瀛樺湪锛乗r\n";
+ finalErrMsg = finalErrMsg + "鐢熶骇璧勬簮銆�" + sHNumberSourceList[t] + "銆戜笉瀛樺湪锛乗r\n";
}
continue;
}
@@ -2013,10 +2013,10 @@
/// <param name="HInterID">鍗曟嵁ID</param>
/// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
/// <param name="CurUserName">瀹℃牳浜�</param>
- /// <returns></returns>Gy_RoutingBill/CheckGy_RoutingBill
+ /// <returns></returns>Gy_RoutingBill/AuditGy_RoutingBill
[Route("Gy_RoutingBill/AuditGy_RoutingBill")]
[HttpGet]
- public object AuditGy_RoutingBill(string HInterID, int IsAudit, string CurUserName)
+ public object AuditGy_RoutingBill(long HInterID, int IsAudit, string CurUserName)
{
try
{
@@ -2330,7 +2330,7 @@
/// <returns></returns>
[Route("Gy_RoutingBill/DeleteGy_RoutingBill")]
[HttpGet]
- public object DeleteOA_AndengFlowRuleBill(int HInterID, int IsAudit, string CurUserName)
+ public object DeleteOA_AndengFlowRuleBill(long HInterID, int IsAudit, string CurUserName)
{
string ModRightNameCheck = "Gy_RoutingBill_Delete";
DBUtility.ClsPub.CurUserName = CurUserName;
--
Gitblit v1.9.1