From 075ff1b3437600b9574933b41176850c032542c6 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 16 八月 2024 08:36:05 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs b/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs
index 8a23c05..5e2bf01 100644
--- a/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs
+++ b/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs
@@ -477,7 +477,7 @@
if (oBill.omodel.HInterID == 0)
{
// bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
- bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
//閮ㄩ棬,鍙戠幇浜�,璐熻矗浜�,璁惧
_ = SendDingDingAsync(oBill.omodel.HDeptID, oBill.omodel.HEmpID, oBill.omodel.HManagerID, oBill.omodel.HEquipID,2);
}
@@ -819,7 +819,10 @@
if (oBill.omodel.HInterID == 0)
{
// bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
- 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);
}
@@ -1323,8 +1326,8 @@
objJsonResult.data = null;
return objJsonResult;
}
- //寰楀埌淇℃伅
- ds = oCN.RunProcReturn("select top 1 * from h_v_Gy_EquipFileBillList where HBarCode= '" + HBarCode + "'", "Gy_EquipFileBillMain");
+ //寰楀埌淇℃伅鏈�鏂扮殑
+ ds = oCN.RunProcReturn("select * from h_v_Gy_EquipFileBillList where HBarCode= '" + HBarCode + "' order by 鏁呴殰鐧昏鍗旾D desc", "Gy_EquipFileBillMain");
//鍐欏叆淇℃伅
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
@@ -1334,6 +1337,14 @@
objJsonResult.data = null;
return objJsonResult;
}
+ if ( ds.Tables[0].Rows.Count > 1)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "璇ヨ澶囧嚭鐜板涓晠闅滅櫥璁板崟,璇锋墜鍔ㄩ�夌潃";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
--
Gitblit v1.9.1