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 | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
index 7c4d873..07728a3 100644
--- a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
+++ b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
@@ -536,7 +536,7 @@
foreach (Gy_RoutingBillSub oSub in DetailColl)
{
i++;
- if (oSystemParameter.omodel.WMS_CampanyName != "榫欏北姹介厤" && oSystemParameter.omodel.WMS_CampanyName != "娣诲悍绉戞妧" && oSystemParameter.omodel.WMS_CampanyName != "瀹濆伐")
+ if (oSystemParameter.omodel.WMS_CampanyName != "榫欏北姹介厤" && oSystemParameter.omodel.WMS_CampanyName != "娣诲悍绉戞妧" && oSystemParameter.omodel.WMS_CampanyName != "瀹濆伐" && oSystemParameter.omodel.WMS_CampanyName != "涓夊崌")
{
if (oSub.HWorkQty <= 0)
{
@@ -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