From 0b8efdbce56a9df6eb2ec48dbc75b433e8c14256 Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期三, 15 四月 2026 17:04:11 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs b/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs
index 1d59420..70dfc78 100644
--- a/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs
+++ b/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs
@@ -1068,9 +1068,7 @@
{
// bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
- //鍙嶅啓缁翠慨璁板綍鍗曞叧闂�
- string sql = "Update Sb_EquipRepairWorkBillMain set HCloseMan='鍏宠仈楠屾敹鍗曡嚜鍔ㄥ叧闂�',HCloseDate=GETDATE(),HBillStatus=3,HCloseType = 1 Where HInterID=" + oBill.omodel.HMainSourceInterID.ToString();
- ds = oCN.RunProcReturn(sql, "Sb_EquipRepairWorkBillMain");
+
//閮ㄩ棬,鍙戠幇浜�,璐熻矗浜�,璁惧
_ = SendDingDingAsync(oBill.omodel.HDeptID, oBill.omodel.HEmpID, oBill.omodel.HManagerID, oBill.omodel.HEquipID, 3);
}
@@ -1083,7 +1081,6 @@
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
- //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
objJsonResult.data = 1;
return objJsonResult;
}
@@ -1291,6 +1288,7 @@
ListModels oListModels = new ListModels();
try
{
+ string errRef = "";
if (!DBUtility.ClsPub.Security_Log("Sb_EquipConkBookBill_Edit", 1, false, msg4))
{
objJsonResult.code = "0";
@@ -1336,6 +1334,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 +1387,6 @@
//oItemSub.HManagerID = 0; //璐熻矗浜篒D
//oItemSub.HMoney = 0; //缁翠慨璐圭敤
oBill.DetailColl.Add(oItemSub);
-
}
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
@@ -1551,19 +1560,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}", "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.code = "1";
+ objJsonResult.count = 1;
objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
--
Gitblit v1.9.1