From fd991e354648eacbf449b4b3fceafedfbaa4201f Mon Sep 17 00:00:00 2001
From: dytyqx <1342948614@qq.com>
Date: 星期一, 09 三月 2026 11:03:55 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs b/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs
index 48ddcde..a0fc1e4 100644
--- a/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs
+++ b/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs
@@ -1083,7 +1083,6 @@
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
- //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
objJsonResult.data = 1;
return objJsonResult;
}
@@ -1291,6 +1290,7 @@
ListModels oListModels = new ListModels();
try
{
+ string errRef = "";
if (!DBUtility.ClsPub.Security_Log("Sb_EquipConkBookBill_Edit", 1, false, msg4))
{
objJsonResult.code = "0";
@@ -1336,6 +1336,18 @@
//oItem.HRepairID = 0; //缁翠慨椤圭洰(Gy_Repair)
//oItem.HRemark = ""; //澶囨敞
//oItem.HMainSourceInterID = oItem.HInterID;
+ if (oSystemParameter.ShowBill(ref errRef))
+ {
+ // if (oSystemParameter.omodel.WMS_CampanyName == "鍗庤垷")
+ // {
+ // oItem.HRepairManID = oItem.HEmpID;
+ // }
+ // else
+ // {
+ oItem.HRepairManID = 0;
+ // }
+ }
+
//oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
@@ -1377,7 +1389,6 @@
//oItemSub.HManagerID = 0; //璐熻矗浜篒D
//oItemSub.HMoney = 0; //缁翠慨璐圭敤
oBill.DetailColl.Add(oItemSub);
-
}
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
@@ -1551,19 +1562,20 @@
}
bool IsDete = oBill.DeleteBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Sb_EquipConkBookBill_AfterDelCtrl", user, ref DBUtility.ClsPub.sExeReturnInfo);
- if (IsDete)
+
+ var oDelDs = oCN.RunProcReturn($"exec h_p_Sb_EquipConkBookBill_AfterDelCtrl {lngBillKey},{oBill.omodel.HBillNo}, {user}, {oBill.omodel.HEquipID}", "h_p_Sb_EquipConkBookBill_AfterDelCtrl");
+ if (!IsDete || oDelDs == null)
{
objJsonResult.code = "0";
- objJsonResult.count = 1;
+ objJsonResult.count = 0;
objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
}
else
{
-
objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.count = 1;
objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
@@ -1719,6 +1731,7 @@
//oItemSub.HCloseMan = ""; //琛屽叧闂�
oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
+
//oItemSub.HRemark = ""; //澶囨敞
//oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
//oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
--
Gitblit v1.9.1