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/CJGL/Cj_StationOutBillController.cs | 110 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 96 insertions(+), 14 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
index d89d13b..cbdddbd 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -2496,12 +2496,13 @@
}
- var HBillNo = HInterID.Split(',');
+ var HInterIDs = HInterID.Split(',');
+ string[] HBillNo = new string[HInterIDs.Length];
DAL.ClsSc_StationOutBill oBill = new DAL.ClsSc_StationOutBill();
- for (int i = 0; i < HBillNo.Length; i++)
+ for (int i = 0; i < HInterIDs.Length; i++)
{
- if (HBillNo[i] == "0")
+ if (HInterIDs[i] == "0")
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -2510,7 +2511,7 @@
return objJsonResult;
}
//鏌ョ湅鏄惁宸插鏍�,鍏抽棴,浣滃簾
- if (oBill.ShowBill(long.Parse(HBillNo[i]), ref DBUtility.ClsPub.sExeReturnInfo))
+ if (oBill.ShowBill(long.Parse(HInterIDs[i]), ref DBUtility.ClsPub.sExeReturnInfo))
{
if (oBill.omodel.HChecker.Trim() != "")
{
@@ -2520,6 +2521,7 @@
objJsonResult.data = null;
return objJsonResult;
}
+ HBillNo[i] = oBill.omodel.HBillNo;
}
else
{
@@ -2532,10 +2534,32 @@
}
int j = 0;
- for (int i = 0; i < HBillNo.Length; i++)
+ for (int i = 0; i < HInterIDs.Length; i++)
{
+ //瀹℃牳鍓嶆帶鍒�
+ string sql = "exec h_p_Sc_StationOutBill_BeforeCheckCtrl " + HInterIDs[i] + ",'" + HBillNo[i] + "','" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql, "h_p_Sc_StationOutBill_BeforeCheckCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:瀹℃牳鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
//瀹℃牳
- if (Cj_StationOutBillCheckBill(long.Parse(HBillNo[i]), CurUserName, oBill.omodel.HLastSubProc, ref DBUtility.ClsPub.sExeReturnInfo))
+ if (Cj_StationOutBillCheckBill(long.Parse(HInterIDs[i]), HBillNo[i], CurUserName, oBill.omodel.HLastSubProc, ref DBUtility.ClsPub.sExeReturnInfo))
{
j += 1;
}
@@ -2566,7 +2590,7 @@
}
//瀹℃牳
- public bool Cj_StationOutBillCheckBill(Int64 lngBillKey, string CurUserName,bool HLastSubProc, ref string sReturn)
+ public bool Cj_StationOutBillCheckBill(Int64 lngBillKey, string HBillNo, string CurUserName,bool HLastSubProc, ref string sReturn)
{
try
{
@@ -2594,6 +2618,23 @@
else if (Pub_Class.ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HFstProc"]) == "鏄�")
{
}
+
+ //瀹℃牳鍚庢帶鍒�
+ string sql = "exec h_p_Sc_StationOutBill_AfterCheckCtrl " + lngBillKey + ",'" + HBillNo + "','" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql, "h_p_Sc_StationOutBill_AfterCheckCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ sReturn = "瀹℃牳杩囩▼涓嚭閿欙紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ oCN.RollBack();
+ return false;
+ }
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ sReturn = ds.Tables[0].Rows[0]["HRemark"].ToString();
+ oCN.RollBack();
+ return false;
+ }
+
sReturn = sReturn + " 瀹℃牳鍔熻兘锛�";
oCN.Commit();
return true;
@@ -2640,16 +2681,17 @@
}
- var HBillNo = HInterID.Split(',');
+ var HInterIDs = HInterID.Split(',');
+ string[] HBillNo = new string[HInterIDs.Length];
DAL.ClsSc_StationOutBill oBill = new DAL.ClsSc_StationOutBill();
//鑾峰彇绯荤粺鍙傛暟
string Ret = "";
oSystemParameter.ShowBill(ref Ret);
- for (int i = 0; i < HBillNo.Length; i++)
+ for (int i = 0; i < HInterIDs.Length; i++)
{
- if (long.Parse(HBillNo[i]) == 0)
+ if (long.Parse(HInterIDs[i]) == 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -2659,7 +2701,7 @@
}
//鏌ョ湅鏄惁宸插鏍�,鍏抽棴,浣滃簾
- if (oBill.ShowBill(long.Parse(HBillNo[i]), ref DBUtility.ClsPub.sExeReturnInfo))
+ if (oBill.ShowBill(long.Parse(HInterIDs[i]), ref DBUtility.ClsPub.sExeReturnInfo))
{
if (oBill.omodel.HChecker.Trim() == "")
{
@@ -2682,6 +2724,8 @@
return objJsonResult;
}
}
+
+ HBillNo[i] = oBill.omodel.HBillNo;
}
else
{
@@ -2694,10 +2738,31 @@
}
int j = 0;
- for (int i = 0; i < HBillNo.Length; i++)
+ for (int i = 0; i < HInterIDs.Length; i++)
{
+ //鍙嶅鏍稿墠鎺у埗
+ string sql = "exec h_p_Sc_StationOutBill_BeforeUnCheckCtrl " + HInterIDs[i] + ",'" + HBillNo[i] + "','" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql, "h_p_Sc_StationOutBill_BeforeUnCheckCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:鍙嶅鏍稿墠鍒ゆ柇澶辫触锛岃涓庣綉缁滅鐞嗕汉鍛樿仈绯�";
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ }
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
//鍙嶅鏍�
- if (Cj_StationOutBillAbandonCheckBill(long.Parse(HBillNo[i]), CurUserName, oBill.omodel.HLastSubProc, ref DBUtility.ClsPub.sExeReturnInfo))
+ if (Cj_StationOutBillAbandonCheckBill(long.Parse(HInterIDs[i]),HBillNo[i], CurUserName, oBill.omodel.HLastSubProc, ref DBUtility.ClsPub.sExeReturnInfo))
{
j += 1;
}
@@ -2728,7 +2793,7 @@
}
//鍙嶅鏍�
- public bool Cj_StationOutBillAbandonCheckBill(Int64 lngBillKey, string CurUserName, bool HLastSubProc, ref string sReturn)
+ public bool Cj_StationOutBillAbandonCheckBill(Int64 lngBillKey,string HBillNo, string CurUserName, bool HLastSubProc, ref string sReturn)
{
if (Cj_StationInBillisUse(lngBillKey, ref sReturn))
{
@@ -2761,6 +2826,23 @@
else if (Pub_Class.ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HFstProc"]) == "鏄�")
{
}
+
+ //鍙嶅鏍稿悗鎺у埗
+ string sql = "exec h_p_Sc_StationOutBill_AfterUnCheckCtrl " + lngBillKey + ",'" + HBillNo + "','" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql, "h_p_Sc_StationOutBill_AfterUnCheckCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ sReturn = "鍙嶅鏍歌繃绋嬩腑鍑洪敊锛岃涓庣綉缁滅鐞嗕汉鍛樿仈绯�";
+ oCN.RollBack();
+ return false;
+ }
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ sReturn = ds.Tables[0].Rows[0]["HRemark"].ToString();
+ oCN.RollBack();
+ return false;
+ }
+
sReturn = sReturn + "鍙嶅鏍稿姛鑳斤紒";
oCN.Commit();
return true;
--
Gitblit v1.9.1