From 6428622684b73f474eacd95cbaff5b613d3687fe Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期一, 09 三月 2026 22:52:27 +0800
Subject: [PATCH] 优化模具寿命趋势入 解决模具保养记录编辑报错，优化华舟检验单扫码获取方法
---
WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs
index 8941308..6865cad 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs
@@ -379,6 +379,24 @@
}
else
{
+ string s = "";
+ if (oBill.ShowBill(oBill.omodel.HInterID, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹湁璇紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (oBill.omodel.HChecker != "" && oBill.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)
@@ -386,7 +404,6 @@
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
- //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
objJsonResult.data = 1;
return objJsonResult;
}
@@ -409,6 +426,7 @@
}
}
#endregion
+
#region [璁惧淇濆吇璁″垝琛ㄥ垹闄ゅ姛鑳絔
/// <summary>
/// 妯″叿缁翠慨鍗曞垹闄ゅ姛鑳�
@@ -524,6 +542,7 @@
return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
}
#endregion
+
#region[璁惧淇濆吇璁″垝琛ㄧ紪杈戞椂鑾峰彇琛ㄤ綋鏁版嵁锛堜繚鍏诲瓙琛ㄣ�侀厤浠跺瓙琛級]
[Route("Sb_EquipMaintainBill/Sb_EquipMaintainBillListProjectDetai")]
[HttpGet]
@@ -691,8 +710,7 @@
DBUtility.ClsPub.CurUserName = oItem.HMaker; //鍒跺崟浜�
oItem.HBillType = "3901";
oItem.HBillSubType = "3901";
-
- //oItem.HInterID =0;
+
//oItem.HBillNo = "";
oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡
oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
--
Gitblit v1.9.1