From cd1171d5897e1803ab8f52920537b5bee34a075d Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期四, 13 一月 2022 19:15:59 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/DLL/ClsSb_MouldRepairWorkBill.cs | 4 +-
WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs | 63 +++++++++++++++++++++++++++++++
2 files changed, 65 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs b/WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs
index f24d16c..b60a652 100644
--- a/WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs
+++ b/WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs
@@ -20,6 +20,7 @@
private json objJsonResult = new json();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
DataSet ds;
+ DLL.ClsSb_MouldRepairWorkBill oBill = new DLL.ClsSb_MouldRepairWorkBill();
#region 鍣ㄥ叿缁翠慨娲惧伐鍗曟煡璇�
[Route("Sc_MouldRepairSendWorkBill/GetMouldRepairSendWorkBillList")]
@@ -219,5 +220,67 @@
}
#endregion
+
+ #region 鍣ㄥ叿缁翠慨娲惧伐鍗� 鍒犻櫎
+ [Route("Sc_MouldRepairSendWorkBill/MouldDeleteBill")]
+ [HttpGet]
+ public object MouldDeleteBill(long HInterID, string User, string ModRightNameDelete)
+ {
+ try
+ {
+ //鍒ゆ柇鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, User))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "娌℃湁鍒犻櫎鏉冮檺";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+
+ if (oBill.omodel.HBillStatus > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁褰撳墠澶勪簬涓嶈兘鍒犻櫎鐨勭姸鎬�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HChecker != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁褰撳墠宸插鏍�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎澶辫触";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬垹闄�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/WebAPI/DLL/ClsSb_MouldRepairWorkBill.cs b/WebAPI/DLL/ClsSb_MouldRepairWorkBill.cs
index b26a167..d277ac7 100644
--- a/WebAPI/DLL/ClsSb_MouldRepairWorkBill.cs
+++ b/WebAPI/DLL/ClsSb_MouldRepairWorkBill.cs
@@ -157,7 +157,7 @@
{
//鏌ヨ涓昏〃
DataSet Ds ;
- Ds = oCn.RunProcReturn("Select * from Sc_MouldRepairWorkBillMain Where HInterID=" + lngBillKey.ToString(), "Sc_MouldRepairWorkBillMain");
+ Ds = oCn.RunProcReturn("Select * from Sc_MouldRepairSendWorkBill Where HInterID=" + lngBillKey.ToString(), "Sc_MouldRepairSendWorkBill");
if(Ds.Tables[0].Rows.Count==0)
{
sReturn = "鍗曟嵁鏈壘鍒帮紒";
@@ -213,7 +213,7 @@
//寰幆
DataSet DsSub ;
- DsSub = oCn.RunProcReturn("Select * from Sc_MouldRepairWorkBillSub Where HInterID=" + lngBillKey.ToString() + " order by HEntryID ", "Sc_MouldRepairWorkBillSub");
+ DsSub = oCn.RunProcReturn("Select * from Sc_MouldRepairSendWorkBillSub Where HInterID=" + lngBillKey.ToString() + " order by HEntryID ", "Sc_MouldRepairSendWorkBillSub");
DetailColl.Clear();//娓呯┖
for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
{
--
Gitblit v1.9.1