From c3b14901031d985ef750027d4952264369a1d7b0 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 02 三月 2026 10:26:21 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/品质管理/工序检验单/QC_ProcessCheckBillController.cs | 1205 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 1,055 insertions(+), 150 deletions(-)
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillController.cs"
index 6852cbf..f61c2e8 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillController.cs"
@@ -8,6 +8,7 @@
using System.Data.SqlClient;
using System.Web.Http;
using WebAPI.Models;
+using SyntacticSugar.constant;
namespace WebAPI.Controllers
{
@@ -22,58 +23,7 @@
public DAL.ClsQC_ProcessCheckBill BillOld = new DAL.ClsQC_ProcessCheckBill();
DataSet ds;
//鑾峰彇绯荤粺鍙傛暟
- Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
-
- //#region 宸ュ簭妫�楠屽崟鍒楄〃
- //[Route("QC_ProcessCheckBill/QC_ProcessCheckBillList")]
- //[HttpGet]
- //public object QC_ProcessCheckBillList(string sWhere, string user)
- //{
- // try
- // {
- // List<object> columnNameList = new List<object>();
-
- // string sql1 = "select * from h_v_QC_ProcessCheckBill where 1 = 1 ";
- // string sql = sql1 + sWhere + " order by hmainid desc";
- // ds = oCN.RunProcReturn(sql, "h_v_QC_ProcessCheckBill");
-
- // //娣诲姞鍒楀悕
- // foreach (DataColumn col in ds.Tables[0].Columns)
- // {
- // Type dataType = col.DataType;
- // string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
- // columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
- // }
-
- // if (ds.Tables[0].Rows.Count > 0)
- // {
- // objJsonResult.code = "1";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "Sucess锛�";
- // objJsonResult.list = columnNameList;
- // objJsonResult.data = ds.Tables[0];
- // return objJsonResult;
- // }
- // else
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁鏌ヨ鍒版暟鎹�";
- // objJsonResult.list = columnNameList;
- // objJsonResult.data = ds.Tables[0];
- // return objJsonResult;
- // }
- // }
- // catch (Exception e)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "Exception锛�" + e.ToString();
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- //}
- //#endregion
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
#region 宸ュ簭妫�楠屽崟鍒楄〃
[Route("QC_ProcessCheckBill/QC_ProcessCheckBillList")]
@@ -292,6 +242,62 @@
}
#endregion
+ #region 宸ュ簭妫�楠屽崟鏍规嵁婧愬崟绫诲瀷鑾峰彇淇℃伅-婧愬崟涓哄彇鏍峰崟
+ [Route("QC_ProcessCheckBill/get_TakeSampleCheckBill")]
+ [HttpGet]
+ public object get_TakeSampleCheckBill(string HInterID, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ string sReturn = "";
+ string sql = "";
+ if (oSystemParameter.ShowBill(ref sReturn))
+ {
+ switch (oSystemParameter.omodel.QC_ProcessCheckBill_QCSchemeSource)
+ {
+ case "宸ュ簭":
+ sql = "exec h_p_QC_Process_GetTakeSampleCheckBillList " + "'宸ュ簭','" + HInterID + "'";
+ break;
+ case "鐗╂枡":
+ sql = "exec h_p_QC_Process_GetTakeSampleCheckBillList " + "'鐗╂枡','" + HInterID + "'";
+ break;
+ case "宸ヨ壓璺嚎":
+ sql = "exec h_p_QC_Process_GetTakeSampleCheckBillList " + "'宸ヨ壓璺嚎','" + HInterID + "'";
+ break;
+ }
+
+ }
+
+ ds = oCN.RunProcReturn(sql, "h_p_QC_Process_GetTakeSampleCheckBillList");
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 宸ュ簭妫�楠屽崟 瀹℃牳 鍙嶅鏍� 鍏抽棴 鍙嶅叧闂� 浣滃簾 鍙嶄綔搴�
/// <summary>
/// 宸ュ簭妫�楠屽崟 瀹℃牳銆佸弽瀹℃牳
@@ -315,7 +321,20 @@
objJsonResult.data = null;
return objJsonResult;
}
-
+ //鑾峰彇绯荤粺鍙傛暟鍒ゆ柇宸ヨ壓璺嚎鏄惁鍚敤澶氱骇瀹℃壒绂佺敤鏅�氬鎵�
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ if (oSystemParameter.omodel.QC_ProcessCheckBill_EnableMultiLevel.ToUpper() == "Y") //绯荤粺鍙傛暟 鍚敤鑷姩瀹℃牳
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "宸ュ簭妫�楠屽崟宸插惎鐢ㄥ绾у鎵规櫘閫氬鏍哥鐢�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
var ds = oCN.RunProcReturn("select * from QC_ProcessCheckBillMain where HInterID=" + HInterID, "QC_ProcessCheckBillMain");
if (ds.Tables[0].Rows.Count > 0)
{
@@ -377,7 +396,7 @@
}
}
- oCN.RunProc("update QC_ProcessCheckBillMain set HChecker='" + CurUserName + "',HCheckDate=getdate() where HInterID=" + HInterID);
+ oCN.RunProc("update QC_ProcessCheckBillMain set HBillStatus=2,HChecker='" + CurUserName + "',HCheckDate=getdate() where HInterID=" + HInterID);
//瀹℃牳鍚庢帶鍒�
DataSet EndDs = oCN.RunProcReturn("Exec h_p_QC_ProcessCheckBill_AfterCheckCtrl " + HInterID.ToString() + ",'" + ds.Tables[0].Rows[0]["HBillNo"].ToString() + "','" + CurUserName + "'", "h_p_QC_ProcessCheckBill_AfterCheckCtrl");
@@ -431,7 +450,7 @@
}
}
- oCN.RunProc("update QC_ProcessCheckBillMain set HChecker='',HCheckDate=null where HInterID=" + HInterID);
+ oCN.RunProc("update QC_ProcessCheckBillMain set HBillStatus=1,HChecker='',HCheckDate=null where HInterID=" + HInterID);
//鍙嶅鏍稿悗鎺у埗
DataSet EndDs = oCN.RunProcReturn("Exec h_p_QC_ProcessCheckBill_AfterUnCheckCtrl " + HInterID.ToString() + ",'" + ds.Tables[0].Rows[0]["HBillNo"].ToString() + "','" + CurUserName + "'", " h_p_QC_ProcessCheckBill_AfterUnCheckCtrl");
@@ -508,52 +527,49 @@
objJsonResult.data = null;
return objJsonResult;
}
-
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HInterID);
ClsPub.CurUserName = user;
BillOld.MvarItemKey = "QC_ProcessCheckBillMain";
- oCN.BeginTran();//寮�濮嬩簨鍔�
+ DAL.ClsQC_ProcessCheckBill oBill = new DAL.ClsQC_ProcessCheckBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
- //Type 1 鍏抽棴 2 鍙嶅叧闂�
- if (Type == 1)
+ //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
+ if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) //鏍规嵁HInterID鑾峰彇璇ュ崟鎹殑鏁版嵁
{
- //鍒ゆ柇鍗曟嵁鏄惁宸茬粡鍏抽棴
- DataSet ds;
- string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
- ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
- if (ds == null || ds.Tables[0].Rows.Count == 0)
+ if (oBill.omodel.HDeleteMan.Trim() != "")
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦紒";
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘杩涜鍏抽棴锛�";
objJsonResult.data = null;
return objJsonResult;
}
- if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ if (oBill.omodel.HChecker.Trim() == "")
{
- if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶈兘杩涜鍏抽棴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (Type == 1) //鍏抽棴鍒ゆ柇
+ {
+ if (oBill.omodel.HCloseMan.Trim() != "")
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘杩涜鍏抽棴!";
+ objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆鍏抽棴锛�";
objJsonResult.data = null;
return objJsonResult;
}
-
-
- if (ds.Tables[0].Rows[0]["HCloseMan"] != null && ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
+ }
+ if (Type == 2) //鍙嶅叧闂垽鏂�
+ {
+ if (oBill.omodel.HCloseMan.Trim() == "")
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆鍏抽棴!";
- objJsonResult.data = null;
- return objJsonResult;
- }
- //鍏抽棴鍗曟嵁
- if (!BillOld.CloseBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "鍏抽棴澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.Message = "鍗曟嵁鏈叧闂�!涓嶉渶瑕佸弽鍏抽棴锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -561,49 +577,101 @@
}
else
{
- //鍒ゆ柇鍗曟嵁鏄惁宸茬粡鍙嶅叧闂�
- DataSet ds;
- string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
- ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
- if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
- {
- if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘杩涜鍏抽棴!";
- objJsonResult.data = null;
- return objJsonResult;
- }
-
- if (ds.Tables[0].Rows[0]["HCloseMan"] == null || ds.Tables[0].Rows[0]["HCloseMan"].ToString() == "")
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁鏈叧闂�!涓嶉渶瑕佸啀鍙嶅叧闂�!";
- objJsonResult.data = null;
- return objJsonResult;
- }
- //鍙嶅叧闂崟鎹�
- if (!BillOld.CancelClose(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
}
- oCN.Commit();//鎻愪氦浜嬪姟
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "鎵ц鎴愬姛锛�";
- objJsonResult.data = null;
- return objJsonResult; ;
+ //杩涜闇�瑕佽繘琛岀殑鍏抽棴/鍙嶅叧闂搷浣�
+ if (Type == 1) //鍏抽棴鎻愪氦
+ {
+ //鍏抽棴鍓嶆帶鍒�=========================================
+ string sql1 = "exec h_p_QC_ProcessCheckBill_BeforeCloseCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + user + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_QC_ProcessCheckBill_BeforeCloseCtrl");
+ 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 (oBill.CloseBill(lngBillKey, oBill.omodel.HBillNo, "h_p_QC_ProcessCheckBill_AfterCloseCtrl", user, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍏抽棴鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍏抽棴澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (Type == 2) //鍙嶅叧闂彁浜�
+ {
+ //鍙嶅叧闂墠鎺у埗=========================================
+ string sql1 = "exec h_p_QC_ProcessCheckBill_BeforeUnCloseCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + user + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_QC_ProcessCheckBill_BeforeUnCloseCtrl");
+ 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 (oBill.CancelClose(lngBillKey, oBill.omodel.HBillNo, "h_p_QC_ProcessCheckBill_AfterUnCloseCtrl", user, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅叧闂垚鍔�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ return objJsonResult;
}
catch (Exception e)
{
@@ -752,11 +820,7 @@
}
#endregion
- /// <summary>
- /// 杩斿洖宸ュ簭妫�楠屽崟鍒楄〃
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
+ #region 杩斿洖宸ュ簭妫�楠屽崟鍒楄〃
[Route("QC_ProcessCheckBill/GetProcessCheckBillList")]
[HttpGet]
public object GetProcessCheckBillList(string sWhere, string user)
@@ -784,22 +848,12 @@
ds = oCN.RunProcReturn(sql, "h_v_QC_ProcessCheckBillListDetail");
}
- //if (ds.Tables[0].Rows.Count != 0 || ds != null)
- //{
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
return objJsonResult;
- //}
- //else
- //{
- //objJsonResult.code = "0";
- //objJsonResult.count = 0;
- //objJsonResult.Message = "鏃犳暟鎹�";
- //objJsonResult.data = null;
- //return objJsonResult;
- //}
}
catch (Exception e)
{
@@ -810,14 +864,10 @@
return objJsonResult;
}
}
-
+ #endregion
#region 宸ュ簭妫�楠屽崟淇濆瓨
- /// <summary>
- /// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
+
[Route("QC_ProcessCheckBill/set_SaveBill")]
[HttpPost]
public object set_SaveBill([FromBody] JObject sMainSub)
@@ -872,6 +922,7 @@
BillNew.omodel.HBillNo = mainList[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
BillNew.omodel.HDate = HDate;
BillNew.omodel.HRemark = mainList[0].HRemark;//澶囨敞
+ BillNew.omodel.HRemarkSN = mainList[0].HRemarkSN;//SN澶囨敞
BillNew.omodel.HMaker = mainList[0].HMaker;
BillNew.omodel.HSourceID = ClsPub.isLong(mainList[0].HSourceID);
BillNew.omodel.HICMOInterID = ClsPub.isLong(mainList[0].HICMOInterID);
@@ -897,6 +948,8 @@
BillNew.omodel.HBatchNo = ClsPub.isStrNull(mainList[0].HBatchNo);
BillNew.omodel.HTakeSampleCheckBillID = ClsPub.isLong(mainList[0].HTakeSampleCheckBillID);
BillNew.omodel.HTakeSampleCheckBillNo = ClsPub.isStrNull(mainList[0].HTakeSampleCheckBillNo);
+ BillNew.omodel.HCheckQty = ClsPub.isLong(mainList[0].HCheckQty);
+
List<Model.ClsQC_ProcessCheckBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_ProcessCheckBillSub>>(msg3);
BillNew.DetailColl = new List<Model.ClsQC_ProcessCheckBillSub>();
for (int i = 0; i < subList.ToArray().Length; i++)
@@ -942,6 +995,12 @@
oSub.HInspectInstruMentID = DBUtility.ClsPub.isLong(subList[i].HInspectInstruMentID);
oSub.HInspectResult = DBUtility.ClsPub.isStrNull(subList[i].HResult);
+ oSub.HQualityStdID = DBUtility.ClsPub.isLong(subList[i].HQualityStdID);//璐ㄩ噺鏍囧噯
+ oSub.HInspectMethodID = DBUtility.ClsPub.isLong(subList[i].HInspectMethodID);//妫�楠屾柟娉�
+ oSub.HInspectBasisID = DBUtility.ClsPub.isLong(subList[i].HInspectBasisID);//妫�楠屼緷鎹�
+ oSub.HCompareSymbol = DBUtility.ClsPub.isStrNull(subList[i].HCompareSymbol);//姣旇緝绗�
+ oSub.HInspectValQ = subList[i].HInspectValQ;
+
BillNew.DetailColl.Add(oSub);
}
else
@@ -953,21 +1012,66 @@
return objJsonResult;
}
}
+
+
+
+
//淇濆瓨瀹屾瘯鍚庡鐞�
if (OperationType.Equals("1") || OperationType.Equals("2"))
{
+ string sAutoCheck = oSystemParameter.GetSingleSystemParameter("QC_ProcessCheckBill_AutoCheck", ref DBUtility.ClsPub.sExeReturnInfo);
+ objJsonResult.Verify = sAutoCheck;
bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
}
else
{
+
+ if (BillOld.ShowBill(mainList[0].HInterID, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹湁璇紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (BillOld.omodel.HChecker != "" && BillOld.omodel.HChecker != null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽淇敼锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
bResult = BillNew.ModifyBill(BillNew.omodel.HInterID, ref ClsPub.sExeReturnInfo);
}
//鎻愮ず
if (bResult == true)
{
+ string sReturn = "";
+ // 鍗庤垷 淇濆瓨鎴愬姛鍚庝笅鎺ㄥ伐浣滆仈绯诲崟
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ if (oSystemParameter.omodel.WMS_CampanyName == "鍗庤垷")
+ {
+ //鑷姩鐢熸垚宸ヤ綔鑱旂郴鍗�
+ var ds2 = oCN.RunProcReturn("exec h_p_OA_WorkLinkBill_Create " + BillOld.omodel.HInterID + "," + 7520, "h_p_OA_WorkLinkBill_Create");
+
+ if (ds2 != null && ds2.Tables[0].Rows.Count > 0)
+ {
+ int HInterID = int.Parse(ds2.Tables[0].Rows[0]["NewHInterID"].ToString());
+ LogService.Write("鎵ц娑堟伅鎺ㄩ��..." + HInterID);
+
+ // 瑙﹀彂娑堟伅鎺ㄩ��
+ Service.GeTuiService.PubishSingle(HInterID);
+
+ }
+ }
+ }
+
objJsonResult.code = "1";
objJsonResult.count = 1;
- //objJsonResult.Message = "鍗曟嵁瀛樼洏瀹屾瘯!鍗曟嵁鍙�:" + mainList[0].HBillNo.Trim();
objJsonResult.Message = ClsPub.sExeReturnInfo+"鍗曟嵁鍙�:" + mainList[0].HBillNo.Trim();
objJsonResult.data = null;
return objJsonResult;
@@ -1242,6 +1346,26 @@
objJsonResult.data = null;
return objJsonResult;
}
+
+ var s = "";
+ if (BillOld.ShowBill(long.Parse(HItemID.ToString()), ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹湁璇紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //鍒ゆ柇鏄惁鍙垹闄�
+ if (BillOld.omodel.HChecker != "" && BillOld.omodel.HChecker != null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽鍒犻櫎锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
var ds = oCN.RunProcReturn("select * from QC_ProcessCheckBillMain where HInterID=" + HItemID, "QC_ProcessCheckBillMain");
//鍒犻櫎鍓嶆帶鍒�
DataSet BeforeDs = oCN.RunProcReturn("Exec h_p_QC_ProcessCheckBill_BeforeDelCtrl " + HItemID.ToString() + ",'" + user + "'", "h_p_QC_ProcessCheckBill_BeforeDelCtrl");
@@ -1291,11 +1415,8 @@
}
#endregion
- /// <summary>
- ///杩斿洖妫�楠屽�煎垪琛�
- /// </summary>
- /// <param name="sWhere"></param>
- /// <returns></returns>
+
+ #region 杩斿洖妫�楠屽�煎垪琛�
[Route("QC_ValueTable_ProcessCheck/getValueList")]
[HttpGet]
public object getValueList(Int64 HInterID, Int64 HEntryID, string user)
@@ -1335,8 +1456,9 @@
return objJsonResult;
}
}
-
- #region 棣栦欢妫�楠屽崟鏍规嵁婧愬崟绫诲瀷鑾峰彇淇℃伅-婧愬崟涓哄伐搴忓嚭绔欏崟
+ #endregion
+
+ #region 鏈欢妫�楠屽崟鏍规嵁婧愬崟绫诲瀷鑾峰彇淇℃伅-婧愬崟涓哄伐搴忓嚭绔欏崟
[Route("QC_ProcessCheckBill/get_StationOutBill")]
[HttpGet]
public object get_StationOutBill(string HInterID, string user)
@@ -1478,5 +1600,788 @@
}
}
#endregion
+
+ #region 宸ュ簭妫�楠屽崟鏍规嵁婧愬崟绫诲瀷鑾峰彇淇℃伅-婧愬崟涓虹敓浜ц鍗�
+ [Route("QC_ProcessCheckBill/get_ICMOBill")]
+ [HttpGet]
+ public object get_ICMOBill(string HICMOInterID, string HICMOEntryID, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ string sReturn = "";
+ string sql = "";
+ if (oSystemParameter.ShowBill(ref sReturn))
+ {
+ switch (oSystemParameter.omodel.QC_ProcessCheckBill_QCSchemeSource)
+ {
+ case "鐗╂枡":
+ sql = "exec h_p_QC_ProcessCheck_GetICMOBillList " + "'鐗╂枡','" + HICMOInterID + "','" + HICMOEntryID + "'";
+ break;
+ case "宸ヨ壓璺嚎":
+ sql = "exec h_p_QC_ProcessCheckB_GetICMOBillList " + "'宸ヨ壓璺嚎','" + HICMOInterID + "','" + HICMOEntryID + "'";
+ break;
+ }
+
+ }
+
+ ds = oCN.RunProcReturn(sql, "h_p_QC_ProcessCheckB_GetICMOBillList");
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 宸ュ簭妫�楠屽崟鏍规嵁婧愬崟绫诲瀷鑾峰彇淇℃伅-婧愬崟涓虹敓浜ц鍗� 閫氳繃鍗曟嵁鍙峰甫鍑�
+ [Route("QC_ProcessCheckBill/get_ICMOBill_ByBillNo")]
+ [HttpGet]
+ public object get_ICMOBill_ByBillNo(string HBillNo, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ string sReturn = "";
+ string sql = "";
+ if (oSystemParameter.ShowBill(ref sReturn))
+ {
+ switch (oSystemParameter.omodel.QC_ProcessCheckBill_QCSchemeSource)
+ {
+ case "鐗╂枡":
+ sql = "exec h_p_QC_ProcessCheck_GetICMOBillList_ByBillNo " + "'鐗╂枡','" + HBillNo + "'";
+ break;
+ case "宸ュ簭":
+ sql = "exec h_p_QC_ProcessCheck_GetICMOBillList_ByBillNo " + "'宸ュ簭','" + HBillNo + "'";
+ break;
+ case "宸ヨ壓璺嚎":
+ sql = "exec h_p_QC_ProcessCheck_GetICMOBillList_ByBillNo " + "'宸ヨ壓璺嚎','" + HBillNo + "'";
+ break;
+ }
+
+ }
+
+ ds = oCN.RunProcReturn(sql, "h_p_QC_ProcessCheck_GetICMOBillList_ByBillNo");
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 宸ュ簭妫�楠屽崟鏍规嵁婧愬崟绫诲瀷鑾峰彇淇℃伅-婧愬崟涓哄伐搴忚繘绔欏崟
+ [Route("QC_ProcessCheckBill/get_StationInBill")]
+ [HttpGet]
+ public object get_StationInBill(string HInterID, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ string sReturn = "";
+ string sql = "";
+ if (oSystemParameter.ShowBill(ref sReturn))
+ {
+ switch (oSystemParameter.omodel.QC_ProcessCheckBill_QCSchemeSource)
+ {
+ case "宸ュ簭":
+ sql = "exec h_p_QC_ProcessCheck_GetStationInBillList " + "'宸ュ簭','" + HInterID + "'";
+ break;
+ case "鐗╂枡":
+ sql = "exec h_p_QC_ProcessCheck_GetStationInBillList " + "'鐗╂枡','" + HInterID + "'";
+ break;
+ case "宸ヨ壓璺嚎":
+ sql = "exec h_p_QC_ProcessCheck_GetStationInBillList " + "'宸ヨ壓璺嚎','" + HInterID + "'";
+ break;
+ }
+
+ }
+
+ ds = oCN.RunProcReturn(sql, "h_p_QC_ProcessCheck_GetStationInBillList");
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 宸ュ簭妫�楠屽崟鏍规嵁婧愬崟绫诲瀷鑾峰彇淇℃伅-婧愬崟涓哄伐搴忚繘绔欏崟 閫氳繃鍗曟嵁鍙疯幏鍙�
+ [Route("QC_ProcessCheckBill/get_StationInBill_ByHBillNo")]
+ [HttpGet]
+ public object get_StationInBill_ByHBillNo(string HBillNo, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ string sReturn = "";
+ string sql = "";
+ if (oSystemParameter.ShowBill(ref sReturn))
+ {
+ switch (oSystemParameter.omodel.QC_ProcessCheckBill_QCSchemeSource)
+ {
+ case "宸ュ簭":
+ sql = "exec h_p_QC_ProcessCheck_GetStationInBillList_ByHBillNo " + "'宸ュ簭','" + HBillNo + "'";
+ break;
+ case "鐗╂枡":
+ sql = "exec h_p_QC_ProcessCheck_GetStationInBillList_ByHBillNo " + "'鐗╂枡','" + HBillNo + "'";
+ break;
+ case "宸ヨ壓璺嚎":
+ sql = "exec h_p_QC_ProcessCheck_GetStationInBillList_ByHBillNo " + "'宸ヨ壓璺嚎','" + HBillNo + "'";
+ break;
+ }
+
+ }
+
+ ds = oCN.RunProcReturn(sql, "h_p_QC_ProcessCheck_GetStationInBillList_ByHBillNo");
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 澶氱骇瀹℃牳
+ #region 宸ュ簭妫�楠屽崟椹冲洖
+ [Route("QC_ProcessCheckBill/RejectCheckFlow")]
+ [HttpGet]
+ public object RejectCheckFlow(string HInterID, string CurUserID)
+ {
+ try
+ {
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HInterID); //瀵笻InterID杩涜绫诲瀷鐨勮浆鎹�
+ DAL.ClsQC_ProcessCheckBill oBill = new DAL.ClsQC_ProcessCheckBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+ //鑾峰彇绯荤粺鍙傛暟鍒ゆ柇宸ュ簭妫�楠屽崟鏄惁鍚敤澶氱骇瀹℃壒绂佺敤
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ if (oSystemParameter.omodel.QC_ProcessCheckBill_EnableMultiLevel.ToUpper() == "N") //绯荤粺鍙傛暟 鏈惎鐢ㄨ嚜鍔ㄥ鏍�
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "宸ュ簭妫�楠屽崟鏈惎鐢ㄥ绾у鎵圭鐢�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) //鏍规嵁HInterID鑾峰彇璇ュ崟鎹殑鏁版嵁
+ {
+ if (oBill.omodel.HBillStatus != 6)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鍗曟嵁鏈湪瀹℃牳涓笉鑳介┏鍥�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍙戣捣椹冲洖
+ if (oBill.RejectCheckFlowProgress(lngBillKey, oBill.omodel.HBillNo, CurUserID, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = "椹冲洖鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "椹冲洖澶辫触澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 宸ュ簭妫�楠屽崟 鍙戣捣瀹℃壒
+ [Route("QC_ProcessCheckBill/StartCheckFlow")]
+ [HttpGet]
+ public object StartCheckFlow(int HInterID, string CurUserName)
+ {
+ DBUtility.ClsPub.CurUserName = CurUserName;
+ try
+ {
+ ////瀹℃牳鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ //鑾峰彇绯荤粺鍙傛暟鍒ゆ柇宸ュ簭妫�楠屽崟鏄惁鍚敤澶氱骇瀹℃壒绂佺敤
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ if (oSystemParameter.omodel.QC_ProcessCheckBill_EnableMultiLevel.ToUpper() == "N") //绯荤粺鍙傛暟 鏈惎鐢ㄨ嚜鍔ㄥ鏍�
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "宸ュ簭妫�楠屽崟鏈惎鐢ㄥ绾у鎵圭鐢�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ //HInterID鏁版嵁鍒ゆ柇
+ if (HInterID <= 0)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "HInterID灏忎簬0锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HInterID); //瀵笻InterID杩涜绫诲瀷鐨勮浆鎹�
+ DAL.ClsQC_ProcessCheckBill oBill = new DAL.ClsQC_ProcessCheckBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+
+ //鍙戣捣瀹℃壒
+ if (oBill.startCheckFlow(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = "鍙戣捣瀹℃壒鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鍙戣捣瀹℃壒澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鍙戣捣瀹℃壒澶辫触澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 宸ュ簭妫�楠屽崟 澶氱骇 瀹℃牳/鍙嶅鏍�
+ /// <summary>
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("QC_ProcessCheckBill/AuditFlow")]
+ [HttpGet]
+ public object AuditQC_ProcessCheckBill_Flow(int HInterID, int IsAudit, string CurUserName, string CurUserID)
+ {
+ //string ModRightNameCheck = "QC_ProcessCheckBill_Check";
+ DBUtility.ClsPub.CurUserName = CurUserName;
+ try
+ {
+ ////瀹℃牳鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ //鑾峰彇绯荤粺鍙傛暟鍒ゆ柇宸ュ簭妫�楠屽崟鏄惁鍚敤澶氱骇瀹℃壒绂佺敤
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ if (oSystemParameter.omodel.QC_ProcessCheckBill_EnableMultiLevel.ToUpper() == "N") //绯荤粺鍙傛暟 鏈惎鐢ㄨ嚜鍔ㄥ鏍�
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "宸ュ簭妫�楠屽崟鏈惎鐢ㄥ绾у鎵圭鐢�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ //HInterID鏁版嵁鍒ゆ柇
+ if (HInterID <= 0)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "HInterID灏忎簬0锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HInterID); //瀵笻InterID杩涜绫诲瀷鐨勮浆鎹�
+ DAL.ClsQC_ProcessCheckBill oBill = new DAL.ClsQC_ProcessCheckBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+
+ //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
+ if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) //鏍规嵁HInterID鑾峰彇璇ュ崟鎹殑鏁版嵁
+ {
+ if (oBill.omodel.HCloseMan.Trim() != "")
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HDeleteMan.Trim() != "")
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (IsAudit == TypeConstant.AUDIT) //瀹℃牳鍒ゆ柇
+ {
+ //鍒ゆ柇鏄惁宸茬粡鍙戣捣瀹℃壒
+ string sql0 = "select * from Xt_BillCheckFlowStatus where HBillInterID = " + lngBillKey + " and HBillTypeID = '" + oBill.BillType + "'";
+ DataSet ds0 = oCN.RunProcReturn(sql0, "Xt_BillCheckFlowStatus");
+ if (ds0 != null && ds0.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:鍗曟嵁鏈彂璧峰鎵癸紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //鍒ゆ柇鍗曟嵁褰撳墠鐘舵��
+ if (oBill.omodel.HChecker.Trim() != "")
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:鍗曟嵁宸插畬鎴愬鏍�!涓嶈兘缁х画瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == TypeConstant.REVERSE_AUDIT) //鍙嶅鏍稿垽鏂�
+ {
+ //鍒ゆ柇鏄惁瀛樺湪瀹℃牳杩囩殑椤圭洰
+ string sql0 = "select * from Xt_BillCheckFlowStatus where HBillInterID = " + lngBillKey + " and HBillTypeID = '" + oBill.BillType + "' and ISNULL(HChecker,'') <> ''";
+ DataSet ds0 = oCN.RunProcReturn(sql0, "Xt_BillCheckFlowStatus");
+ if (ds0 != null && ds0.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:鍗曟嵁涓嶅瓨鍦ㄥ凡缁忓鏍哥殑椤圭洰锛侊紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ oCN.BeginTran();
+ //杩涜闇�瑕佽繘琛岀殑瀹℃牳/鍙嶅鏍告搷浣�
+ if (IsAudit == TypeConstant.AUDIT) //瀹℃牳鎻愪氦
+ {
+ #region 瀹℃牳鍓嶇殑鐩稿叧鍒ゆ柇
+ //瀹℃牳鍓嶆帶鍒�=========================================
+ //string sql1 = "exec h_p_QC_ProcessCheckBill_BeforeCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'";
+ //ds = oCN.RunProcReturn(sql1, "h_p_QC_ProcessCheckBill_BeforeCheckCtrl");
+ //if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:瀹℃牳鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ //if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ //==================================================================================
+
+ //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ DateTime HDate = DateTime.Now;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.Message = s;
+ return objJsonResult;
+ }
+ #endregion
+
+ //鑾峰彇褰撳墠瀹℃牳椤圭洰
+ string sql0 = "select * from " + oBill.MvarItemKey + " where HInterID = " + lngBillKey;
+ DataSet ds0 = oCN.RunProcReturn(sql0, oBill.MvarItemKey);
+ string HCheckFlowID = ds0.Tables[0].Rows[0]["HCheckFlowID"].ToString(); //瀹℃壒娴佸唴鐮�
+ string HCheckItemNowID = ds0.Tables[0].Rows[0]["HCheckItemNowID"].ToString(); //褰撳墠瀹℃壒椤圭洰鍐呯爜
+ string HCheckItemNextID = ds0.Tables[0].Rows[0]["HCheckItemNextID"].ToString(); //寰呭鎵归」鐩唴鐮�
+
+ //鍒ゆ柇鐢ㄦ埛鏄惁鏈夋潈闄� 瀹℃壒 褰撳墠瀹℃壒娴佺殑瀹℃壒椤圭洰
+ //string sql01 = "select * from Xt_CheckUserRight where HUserID = '" + CurUserID + "' and HCheckFlowInterID = " + HCheckFlowID + " and HCheckItemID = " + HCheckItemNowID + " and HValue = 1";
+ string sql01 = "select * from Xt_CheckUserRight where HUserID = '" + CurUserID + "' and HCheckFlowInterID = " + HCheckFlowID + " and HCheckItemID = " + HCheckItemNowID + "";
+ DataSet ds01 = oCN.RunProcReturn(sql01, "Xt_CheckUserRight");
+ if (ds01.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:鐢ㄦ埛鏃犲綋鍓嶅鏍搁」鐩殑瀹℃牳鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //鏇存柊 鍗曟嵁瀹℃壒鐘舵�佽〃 涓搴斿鏍搁」鐩殑瀹℃牳鐘舵��
+ string sql02 = "update Xt_BillCheckFlowStatus set HChecker='" + CurUserName + "',HCheckDate=getdate() where HBillTypeID = '" + oBill.BillType + "' and HBillInterID=" + lngBillKey + " and HCheckFlowID=" + HCheckFlowID + " and HCheckItemID=" + HCheckItemNowID;
+ oCN.RunProc(sql02);
+
+ //鍒ゆ柇褰撳墠瀹℃牳椤圭洰鏄惁鏄渶鍚庝竴涓」鐩紝濡傛灉鏄紝瀹℃牳鍚庡弽鍐欏崟鎹殑鍗曟嵁鐘舵�併�傚鏋滀笉鏄紝鑾峰彇涓嬩竴涓鏍搁」鐩苟鏇存柊鍒伴攢鍞鍗曚富琛�
+ if (HCheckItemNextID != "0") //鍒氬垰瀹℃牳鐨勫鏍搁」鐩笉鏄渶鍚庝竴涓鏍搁」鐩�
+ {
+ string sql03 = "select b.HInterID,b.HCheckItemID from Xt_CheckFlowMain as a " +
+ "inner join Xt_CheckFlowSub as b on a.HInterID = b.HInterID " +
+ "where a.HBillTypeID = '" + oBill.BillType + "' " +
+ "and a.HInterID = " + HCheckFlowID + " " +
+ "order by b.HFlowNo asc";
+ DataSet ds03 = oCN.RunProcReturn(sql03, "Xt_CheckFlowMain");
+
+ //鑾峰彇鏂扮殑褰撳墠瀹℃牳椤圭洰鍜屽緟瀹℃牳椤圭洰
+ for (int i = 0; i < ds03.Tables[0].Rows.Count; i++)
+ {
+ if (ds03.Tables[0].Rows[i]["HCheckItemID"].ToString() == HCheckItemNextID)
+ {
+ HCheckItemNowID = HCheckItemNextID;
+ }
+ else if (HCheckItemNowID == HCheckItemNextID)
+ {
+ HCheckItemNextID = ds03.Tables[0].Rows[i]["HCheckItemID"].ToString();
+ break;
+ }
+ }
+ //鏂扮殑褰撳墠瀹℃牳椤圭洰涓烘渶鍚庝竴涓鏍搁」鐩紝寰呭鏍搁」鐩笉瀛樺湪锛岃涓洪粯璁ゅ��"0"
+ if (HCheckItemNowID == HCheckItemNextID)
+ {
+ HCheckItemNextID = "0";
+ }
+
+ //鏇存柊鍗曟嵁涓昏〃鐨勫鎵规祦鏁版嵁
+ string sql04 = "update " + oBill.MvarItemKey + " set HCheckItemNowID=" + HCheckItemNowID + ",HCheckItemNextID=" + HCheckItemNextID + " where HInterID = " + lngBillKey;
+ oCN.RunProc(sql04);
+
+
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = "瀹℃牳鎴愬姛";
+ objJsonResult.data = null;
+ }
+ else //鍒氬垰瀹℃牳鐨勫鏍搁」鐩槸鏈�鍚庝竴涓鏍搁」鐩�
+ {
+ //鏇存柊鍗曟嵁涓昏〃鐨勫鎵规祦鏁版嵁
+ HCheckItemNowID = "0";
+ HCheckItemNextID = "0";
+
+ string sql04 = "update " + oBill.MvarItemKey + " set HCheckItemNowID=" + HCheckItemNowID + ",HCheckItemNextID=" + HCheckItemNextID + " where HInterID = " + lngBillKey;
+ oCN.RunProc(sql04);
+
+ //鏇存柊鍗曟嵁鐨勫崟鎹姸鎬�
+ if (oBill.CheckBill(oCN, oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_QC_ProcessCheckBill_AfterCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = "瀹℃牳鎴愬姛";
+ objJsonResult.data = null;
+
+ }
+ else
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ }
+ }
+ if (IsAudit == TypeConstant.REVERSE_AUDIT) //鍙嶅鏍告彁浜�
+ {
+ #region 鍙嶅鏍稿墠鐨勭浉鍏冲垽鏂�
+ //鍙嶅鏍稿墠鎺у埗=========================================
+ //DataSet ds = oCN.RunProcReturn("Exec h_p_QC_ProcessCheckBill_BeforeUnCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'", "h_p_QC_ProcessCheckBill_BeforeUnCheckCtrl");
+ //if (ds == null)
+ //{
+ // objJsonResult.code = CodeConstant.FAIL;
+ // objJsonResult.count = CountConstant.FAIL;
+ // objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + "鍙嶅鏍稿墠鍒ゆ柇澶辫触锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ //if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ //{
+ // objJsonResult.code = CodeConstant.FAIL;
+ // objJsonResult.count = CountConstant.FAIL;
+ // objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ //=========================================================
+
+ //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ DateTime HDate = DateTime.Now;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.Message = s;
+ return objJsonResult;
+ }
+ #endregion
+
+ //鑾峰彇闇�瑕佸弽瀹℃牳鐨勫鏍搁」鐩�
+ string sql0 = "select c.* from Xt_CheckFlowMain as a " +
+ "inner join Xt_CheckFlowSub as b on a.HInterID = b.HInterID " +
+ "inner join Xt_BillCheckFlowStatus as c on a.HBillTypeID = c.HBillTypeID and b.HCheckItemID = c.HCheckItemID " +
+ "where c.HBillTypeID = '" + oBill.BillType + "' and c.HBillInterID = " + lngBillKey + " " +
+ "order by b.HFlowNo asc";
+ DataSet ds0 = oCN.RunProcReturn(sql0, "Xt_BillCheckFlowStatus");
+ if (ds0 == null || ds0.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:鏈彂璧峰鎵癸紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ string HCheckFlowID = ds0.Tables[0].Rows[0]["HCheckFlowID"].ToString(); //瀹℃壒娴佸唴鐮�
+ string HCheckItemNowID = "0"; //褰撳墠瀹℃壒椤圭洰鍐呯爜
+ string HCheckItemNextID = "0"; //寰呭鎵归」鐩唴鐮�
+ if (oBill.omodel.HBillStatus == 6)
+ {
+ for (int i = 0; i < ds0.Tables[0].Rows.Count; i++)
+ {
+ if (ds0.Tables[0].Rows[i]["HChecker"].ToString() != "")
+ {
+ HCheckItemNowID = ds0.Tables[0].Rows[i]["HCheckItemID"].ToString();
+ HCheckItemNextID = ds0.Tables[0].Rows[i]["HCheckItemID"].ToString();
+ }
+ else
+ {
+ HCheckItemNextID = ds0.Tables[0].Rows[i]["HCheckItemID"].ToString();
+ break;
+ }
+ }
+ if (HCheckItemNowID == HCheckItemNextID)
+ {
+ HCheckItemNextID = "0";
+ }
+ }
+ else
+ {
+ HCheckItemNowID = ds0.Tables[0].Rows[ds0.Tables[0].Rows.Count - 1]["HCheckItemID"].ToString();
+ HCheckItemNextID = "0";
+ }
+
+ //鍒ゆ柇鐢ㄦ埛鏄惁鏈夋潈闄� 瀹℃壒 褰撳墠瀹℃壒娴佺殑瀹℃壒椤圭洰
+ //string sql01 = "select * from Xt_CheckUserRight where HUserID = '" + CurUserID + "' and HCheckFlowInterID = " + HCheckFlowID + " and HCheckItemID = " + HCheckItemNowID + " and HValue = 1";
+ string sql01 = "select * from Xt_CheckUserRight where HUserID = '" + CurUserID + "' and HCheckFlowInterID = " + HCheckFlowID + " and HCheckItemID = " + HCheckItemNowID + "";
+ DataSet ds01 = oCN.RunProcReturn(sql01, "Xt_CheckUserRight");
+ if (ds01.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:鐢ㄦ埛鏃犲綋鍓嶅鏍搁」鐩殑瀹℃牳鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ //鏇存柊 鍗曟嵁瀹℃壒鐘舵�佽〃 涓搴斿鏍搁」鐩殑瀹℃牳鐘舵��
+ string sql02 = "update Xt_BillCheckFlowStatus set HChecker='',HCheckDate='' where HBillTypeID = '" + oBill.BillType + "' and HBillInterID=" + lngBillKey + " and HCheckFlowID=" + HCheckFlowID + " and HCheckItemID=" + HCheckItemNowID;
+ oCN.RunProc(sql02);
+
+ //鍒ゆ柇鍙嶅鏍哥殑鍗曟嵁鏄惁宸茬粡瀹℃牳瀹屾垚锛岃嫢瀹℃牳瀹屾垚锛屽弽瀹℃牳闇�瑕佸彉鏇村崟鎹姸鎬併��
+ if (oBill.omodel.HBillStatus == 6)
+ {
+ //鏇存柊鍗曟嵁涓昏〃鐨勫鎵规祦鏁版嵁
+ string sql04 = "update " + oBill.MvarItemKey + " set HCheckItemNowID=" + HCheckItemNowID + ",HCheckItemNextID=" + HCheckItemNextID + " where HInterID = " + lngBillKey;
+ oCN.RunProc(sql04);
+
+
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = "瀹℃牳鎴愬姛";
+ objJsonResult.data = null;
+ }
+ else
+ {
+
+ //鍙嶅鏍告彁浜bandonCheck
+ if (oBill.AbandonCheck(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ //鏇存柊鍗曟嵁涓昏〃鐨勫鎵规祦鏁版嵁
+ string sql04 = "update " + oBill.MvarItemKey + " set HCheckItemNowID=" + HCheckItemNowID + ",HCheckItemNextID=" + HCheckItemNextID + ",HBillStatus=6 " + " where HInterID = " + lngBillKey;
+ oCN.RunProc(sql04);
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = "鍙嶅鏍告垚鍔�";
+ objJsonResult.data = null;
+ }
+ else
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ }
+ }
+
+ oCN.Commit();
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ }
+ #endregion
+ #endregion
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1