From cf89cfc7e1c06a977588c2ae0185ee1b2da5ce90 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 26 一月 2024 15:18:04 +0800
Subject: [PATCH] 工序流转卡 反审核 审核 方法，增加 调用 反审核 审核 前控制 h_p_Sc_ProcessExchangeBill_BeforeUnCheckCtrl 、h_p_Sc_ProcessExchangeBill_BeforeCheckCtrl 和反审核 审核 后控制 h_p_Sc_ProcessExchangeBill_AfterUnCheckCtrl、h_p_Sc_ProcessExchangeBill_AfterCheckCtrl的 存储过程。 工序返工申请单反审核 审核方法，增加 调用 反审核 审核 前控制 h_p_Sc_ProcExchWorkBackBill_BeforeUnCheckCtrl、h_p_Sc_ProcExchWorkBackBill_BeforeCheckCtrl 和反审核 审核 后控制 h_p_Sc_ProcExchWorkBackBill_AfterUnCheckCtrl、h_p_Sc_ProcExchWorkBackBill_AfterCheckCtrl的 存储过程。 工序返工记录单反审核 审核方法，增加 调用 反审核 审核 前控制 h_p_Sc_ProcExchRecordBackBill_BeforeUnCheckCtrl 、h_p_Sc_ProcExchRecordBackBill_BeforeCheckCtrl 和反审核 审核 后控制 h_p_Sc_ProcExchRecordBackBill_AfterUnCheckCtrl、h_p_Sc_ProcExchRecordBackBill_AfterCheckCtrl的 存储过程。 工序流转卡派工单反审核审核方法，增加调用反审核 审核 前控制h_p_Sc_ProcExchSendWorkBill_BeforeUnCheckCtrl、h_p_Sc_ProcExchSendWorkBill_BeforeCheckCtrl 和反审核审核后控制h_p_Sc_ProcExchSendWorkBill_AfterUnCheckCtrl、h_p_Sc_ProcExchSendWorkBill_AfterCheckCtrl的存储过程。 工序委外派工单反审核审核方法，增加 调用反审核审核前控制h_p_WW_EntrustWorkOrderBill_BeforeUnCheckCtrl 、h_p_WW_EntrustWorkOrderBill_BeforeCheckCtrl和反审核 审核后控制h_p_WW_EntrustWorkOrderBill_AfterUnCheckCtrl、h_p_WW_EntrustWorkOrderBill_AfterCheckCtrl的存储过程。 工序进站接收单反审核审核方法，增加调用反审核审核前控制h_p_Sc_StationInBill_BeforeUnCheckCtrl 、h_p_Sc_StationInBill_BeforeCheckCtrl和反审核审核后控制h_p_Sc_StationInBill_AfterUnCheckCtrl、h_p_Sc_StationInBill_AfterCheckCtrl的存储过程。 工序出站汇报单反审核审核方法，增加调用反审核审核前控制h_p_Sc_StationOutBill_BeforeUnCheckCtrl 、h_p_Sc_StationOutBill_BeforeCheckCtrl和反审核 审核后控制h_p_Sc_StationOutBill_AfterUnCheckCtrl、h_p_Sc_StationOutBill_AfterCheckCtrl的存储过程
---
WebAPI/Controllers/Sc_MouldOtherInBillController.cs | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/WebAPI/Controllers/Sc_MouldOtherInBillController.cs b/WebAPI/Controllers/Sc_MouldOtherInBillController.cs
index e053b18..60534ae 100644
--- a/WebAPI/Controllers/Sc_MouldOtherInBillController.cs
+++ b/WebAPI/Controllers/Sc_MouldOtherInBillController.cs
@@ -120,11 +120,11 @@
string sql1 = string.Format(@"select * from h_v_Sc_MouldOtherInBillList where 搴撳瓨缁勭粐='" + Organization + "'");
if (sWhere == null || sWhere.Equals(""))
{
- return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by hmainid desc", "h_v_Sc_MouldOtherInBillList");
+ return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by 鍒跺崟鏃ユ湡 desc", "h_v_Sc_MouldOtherInBillList");
}
else
{
- string sql = sql1 + sWhere+ "order by hmainid desc";
+ string sql = sql1 + sWhere+ "order by 鍒跺崟鏃ユ湡 desc";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldOtherInBillList");
}
@@ -313,15 +313,19 @@
{
// bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ string sql = string.Format($"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' ");
+ oCn.RunProc(sql);
}
else
{
bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼鎴愬姛
+ //string sql = string.Format($"exec h_p_Sc_MouldChangeNowWHID 1,{oBill.omodel.HInterID.ToString()},' ' ");
+ string sql = string.Format($"exec h_p_Sc_MouldChangeNowWHID ");
+ oCn.RunProc(sql);
}
if (bResult)
{
- string sql = $"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' ";
- oCn.RunProc(sql);
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
@@ -398,10 +402,21 @@
objJsonResult.data = null;
return objJsonResult;
}
-
+ //鍒犻櫎鍓嶆煡鎵惧綋鍓嶅崟鎹殑鎵�鏈夊櫒鍏稩D
+ //string swhere = "";
+ //DataSet ds = oCn.RunProcReturn("select HMaterID from Sc_MouldStockBillSub where HinterID=" + HInterID, "Sc_MouldStockBillSub");
+ //for (var i = 0; i < ds.Tables[0].Rows.Count; i++)
+ //{
+ // swhere = swhere + ds.Tables[0].Rows[i]["HMaterID"].ToString() + ",";
+ //}
+ //swhere = swhere.Substring(0, swhere.Length - 1);
bool IsDete = oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
if (IsDete)
{
+ //鍒犻櫎鎴愬姛淇敼鍣ㄥ叿妗ｆ浣嶇疆
+ //string sql = string.Format($"exec h_p_Sc_MouldChangeNowWHID 0,0,'{swhere}' ");
+ string sql = string.Format($"exec h_p_Sc_MouldChangeNowWHID ");
+ oCn.RunProc(sql);
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
--
Gitblit v1.9.1