From 1c6d93e7299e068b85e1c945ed9b14d0f9795b40 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期一, 13 十月 2025 09:21:24 +0800
Subject: [PATCH] 智云MES测试记录20250923
---
WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs
index 6a3b827..eb99273 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs
@@ -24,7 +24,7 @@
/// <returns></returns>
[Route("Sb_EquipMaintainPlanBill/GetEquipMaintainPlanBillList")]
[HttpGet]
- public object GetEquipMaintainPlanBillList(string sWhere,string user)
+ public object GetEquipMaintainPlanBillList(string sWhere, string user)
{
try
{
@@ -278,6 +278,25 @@
}
else
{
+ string s = "";
+ if (BillOld.ShowBill(oBill.omodel.HInterID, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹湁璇紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (BillOld.omodel.HChecker != "" && BillOld.omodel.HChecker != null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽淇敼锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
}
if (bResult)
@@ -315,7 +334,7 @@
/// <returns></returns>
[Route("Sb_EquipMaintainPlanBill/DeltetEquipMaintainPlanBillList")]
[HttpGet]
- public object DeltetEquipMaintainPlanBillList(string HInterID,string user)
+ public object DeltetEquipMaintainPlanBillList(string HInterID, string user)
{
if (!DBUtility.ClsPub.Security_Log("Sb_EquipMaintainPlanBill_Delete", 1, false, user))
{
@@ -509,7 +528,7 @@
[HttpGet]
public object Sb_EquipMaintainPlanBill_PlanList(string HInterID, string HDate)
{
- DataSet ds,ds1;
+ DataSet ds, ds1;
try
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
@@ -690,7 +709,7 @@
objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
- }
+ }
}
oCN.Commit();//鎻愪氦浜嬪姟
@@ -785,7 +804,7 @@
objJsonResult.Message = "鍏抽棴澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
- }
+ }
}
else
{
@@ -851,6 +870,5 @@
#endregion
#endregion
-
}
}
\ No newline at end of file
--
Gitblit v1.9.1