From 0b8ff185152dcf329f39391928c880e8c7215215 Mon Sep 17 00:00:00 2001 From: ch <37327@LLOOCCY> Date: 星期一, 24 五月 2021 08:42:29 +0800 Subject: [PATCH] 工序检验单列表 单据API --- WebAPI/Models/QC_ProcessCheckBillSub.cs | 32 ++ WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs | 77 +++++ WebAPI/Controllers/SCGL/QC_LastPieceCheckBillController.cs | 77 +++++ WebAPI/Properties/PublishProfiles/API.pubxml.user | 130 ++++---- WebAPI/Controllers/SCGL/QC_ProcessCheckBillController.cs | 424 ++++++++++++++++++++++++++++++ WebAPI/WebAPI.csproj | 5 WebAPI/Models/QC_ProcessCheckBillMain.cs | 71 +++++ 7 files changed, 751 insertions(+), 65 deletions(-) diff --git a/WebAPI/Controllers/SCGL/QC_LastPieceCheckBillController.cs b/WebAPI/Controllers/SCGL/QC_LastPieceCheckBillController.cs new file mode 100644 index 0000000..68e40ab --- /dev/null +++ b/WebAPI/Controllers/SCGL/QC_LastPieceCheckBillController.cs @@ -0,0 +1,77 @@ +锘縰sing Newtonsoft.Json.Linq; +using Pub_Class; +using System; +using System.Collections; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Web.Http; +using WebAPI.Models; + +namespace WebAPI.Controllers +{ + //宸ュ簭妫�楠屽崟Controller + public class QC_LastPieceCheckBillController : ApiController + { + public DBUtility.ClsPub.Enum_BillStatus BillStatus; + + private json objJsonResult = new json(); + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + DataSet ds; + SQLHelper.ClsCN oCN1 = new SQLHelper.ClsCN(); + DataSet ds1; + + + + + /// <summary> + /// 杩斿洖浜у搧鍏ュ簱妫�楠屽崟鍒楄〃 + ///鍙傛暟锛歴tring sql銆� + ///杩斿洖鍊硷細object銆� + /// </summary> + [Route("QC_LastPieceCheckBill/GetLastPieceCheckBillList")] + [HttpGet] + public object GetLastPieceCheckBillList(string sWhere) + { + try + { + if (sWhere == null || sWhere.Equals("")) + { + ds = oCN.RunProcReturn("select * from [h_v_QC_LastPieceCheckBillList] " + sWhere, "[h_v_QC_LastPieceCheckBillList]"); + } + else + { + string sql1 = "select * from [h_v_QC_LastPieceCheckBillList] where 1 = 1 "; + string sql = sql1 + sWhere; + ds = oCN.RunProcReturn(sql, "[h_v_QC_LastPieceCheckBillList]"); + } + if (ds == null || ds.Tables[0].Rows.Count == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "false锛�"; + objJsonResult.data = null; + return objJsonResult; + } + else + { + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "Sucess锛�"; + 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; + } + } + + // + } +} \ No newline at end of file diff --git a/WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs b/WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs new file mode 100644 index 0000000..3ee1d4a --- /dev/null +++ b/WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs @@ -0,0 +1,77 @@ +锘縰sing Newtonsoft.Json.Linq; +using Pub_Class; +using System; +using System.Collections; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Web.Http; +using WebAPI.Models; + +namespace WebAPI.Controllers +{ + //宸ュ簭妫�楠屽崟Controller + public class QC_OutCompCheckBillController : ApiController + { + public DBUtility.ClsPub.Enum_BillStatus BillStatus; + + private json objJsonResult = new json(); + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + DataSet ds; + SQLHelper.ClsCN oCN1 = new SQLHelper.ClsCN(); + DataSet ds1; + + + + + /// <summary> + /// 杩斿洖鍑哄巶妫�楠屽崟鍒楄〃 + ///鍙傛暟锛歴tring sql銆� + ///杩斿洖鍊硷細object銆� + /// </summary> + [Route("QC_OutCompCheckBill/GetOutCompCheckBillList")] + [HttpGet] + public object GetOutCompCheckBillList(string sWhere) + { + try + { + if (sWhere == null || sWhere.Equals("")) + { + ds = oCN.RunProcReturn("select * from h_v_QC_OutCompCheckBillList " + sWhere, "h_v_QC_OutCompCheckBillList"); + } + else + { + string sql1 = "select * from h_v_QC_OutCompCheckBillList where 1 = 1 "; + string sql = sql1 + sWhere; + ds = oCN.RunProcReturn(sql, "h_v_QC_OutCompCheckBillList"); + } + if (ds == null || ds.Tables[0].Rows.Count == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "false锛�"; + objJsonResult.data = null; + return objJsonResult; + } + else + { + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "Sucess锛�"; + 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; + } + } + + // + } +} \ No newline at end of file diff --git a/WebAPI/Controllers/SCGL/QC_ProcessCheckBillController.cs b/WebAPI/Controllers/SCGL/QC_ProcessCheckBillController.cs new file mode 100644 index 0000000..41e27fa --- /dev/null +++ b/WebAPI/Controllers/SCGL/QC_ProcessCheckBillController.cs @@ -0,0 +1,424 @@ +锘縰sing Newtonsoft.Json.Linq; +using Pub_Class; +using System; +using System.Collections; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Web.Http; +using WebAPI.Models; + +namespace WebAPI.Controllers +{ + //宸ュ簭妫�楠屽崟Controller + public class QC_ProcessCheckBillController : ApiController + { + public DBUtility.ClsPub.Enum_BillStatus BillStatus; + + private json objJsonResult = new json(); + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + DataSet ds; + SQLHelper.ClsCN oCN1 = new SQLHelper.ClsCN(); + DataSet ds1; + + + + /// <summary> + /// 鏂板鍗曟嵁-淇濆瓨鎸夐挳 + ///鍙傛暟锛歴tring sql銆� + ///杩斿洖鍊硷細object銆� + /// </summary> + [Route("QC_ProcessCheckBill/AddBill")] + [HttpPost] + public object AddBill([FromBody] JObject sMainSub) + { + var _value = sMainSub["sMainSub"].ToString(); + string msg1 = _value.ToString(); + oCN.BeginTran(); + //淇濆瓨涓昏〃 + objJsonResult = AddBillMain(msg1); + if (objJsonResult.code == "0") + { + oCN.RollBack(); + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = objJsonResult.Message; + objJsonResult.data = null; + return objJsonResult; + } + oCN.Commit(); + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�"; + return objJsonResult; + } + + public json AddBillMain(string msg1) + { + string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); + string msg2 = sArray[0].ToString(); + try + { + msg2 = "[" + msg2.ToString() + "]"; + List<QC_ProcessCheckBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<QC_ProcessCheckBillMain>>(msg2); + string BillType = "7507"; + long HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D + string HBillNo = mainList[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿 + DateTime HDate = mainList[0].HDate;//鏃ユ湡 + int HYear = 2021; + double HPeriod = 1; + long HBillStatus = mainList[0].HBillStatus; + long HCheckItemNowID = mainList[0].HCheckItemNowID; + long HCkeckItemNextID = mainList[0].HCheckItemNextID; + long HCheckFlowID = mainList[0].HCheckFlowID; + string HRemark = mainList[0].HRemark;//澶囨敞 + string HBacker = mainList[0].HBacker; + DateTime HBackDate = mainList[0].HBackDate; + string HBackRemark = mainList[0].HBackRemark; + string HChecker = mainList[0].HChecker; + DateTime HCheckDate = mainList[0].HCheckDate; + string HMaker = mainList[0].HMaker; + DateTime HMakeDate = mainList[0].HMakeDate; + string HUpDater = mainList[0].HUpDater; + DateTime HUpDateDate = mainList[0].HUpDateDate; + string HCloseMan = mainList[0].HCloseMan; + DateTime HCloseDate = mainList[0].HCloseDate; + string HCloseType = mainList[0].HCloseType; + string HDeleteMan = mainList[0].HDeleteMan; + DateTime HDeleteDate = mainList[0].HDeleteDate; + string HMainSourceBillType = mainList[0].HMainSourceBillType; + long HMainSourceInterID = mainList[0].HMainSourceInterID; + long HMainSourceEntryID = mainList[0].HMainSourceEntryID; + string HMainSourceBillNo = mainList[0].HMainSourceBillNo; + double HPrintQty = mainList[0].HPrintQty; + long HICMOInterID = mainList[0].HICMOInterID; + string HICMOBillNo = mainList[0].HICMOBillNo; + long HProExchInterID = mainList[0].HProcExchInterID; + long HProExchEntryID = mainList[0].HProcExchEntryID; + string HProExchBillNo = mainList[0].HProcExchBillNo; + long HMaterID = mainList[0].HMaterID; + long HProcID = mainList[0].HProcID; + long HSourceID = mainList[0].HSourceID; + long HEmpID = mainList[0].HEmpID; + double HInStockQty = mainList[0].HInStockQty; + double HCheckQty = mainList[0].HCheckQty; + double HRightQty = mainList[0].HRightQty; + double HBadQty = mainList[0].HBadQty; + long HFirstCheckEmp = mainList[0].HFirstCheckEmp; + string HCheckerResult = mainList[0].HCheckerResult; + string HBarcode = mainList[0].HBarcode; + string HLBatchNo = mainList[0].HLBatchNo; + long HCusID = mainList[0].HCusID; + string HSortBillNo = mainList[0].HSortBillNo; + string HConTrctBatchNo = mainList[0].HContrctBatchNo; + long HProdAreaID = mainList[0].HProdAreaID; + long HProdTypeID = mainList[0].HProdTypeID; + string HProdStoveNo = mainList[0].HProdStoveNo; + long HRecipeID = mainList[0].HRecipeID; + double HDiameter1 = mainList[0].HDiameter1; + double HDiameter2 = mainList[0].HDiameter2; + long HRoutingInterID = mainList[0].HRoutingInterID; + long HPackTypeID = mainList[0].HPackTypeID; + long HDrawingDireID = mainList[0].HDrawingDireID; + + //涓昏〃 + oCN.RunProc("Insert Into QC_ProcessCheckBillMain " + + "(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" + + ",HYear,HPeriod,HRemark" + + ",HICMOInterID,HICMOBillNo,HProcExchInterID,HProcExchEntryID,HProcExchBillNo" + + ",HMaterID,HProcID,HSourceID,HEmpID,HInStockQty" + + ",HCheckQty,HRightQty,HBadQty,HFirstCheckEmp,HCheckerResult" + + ",HBarCode,HLBatchNo,HCusID,HSortBillNo,HContrctBatchNo" + + ",HProdAreaID,HProdTypeID,HProdStoveNo,HRecipeID,HDiameter1" + + ",HDiameter2,HRoutingInterID,HDrawingDireID,HPackTypeID" + + ") " + + " values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "','" + HBillStatus + "','" + HDate + "','" + HMaker + "','" + HDate + "'" + + "," + HYear + "," + HPeriod + ",'" + HRemark + "'" + + "," + HICMOInterID + "," + HICMOBillNo + "," + HProExchInterID + "," + HProExchEntryID + ",'" + HProExchBillNo + "'" + + "," + HMaterID + "," + HProcID + "," + HSourceID + "," + HEmpID + "," + HInStockQty + + "," + HCheckQty + "," + HRightQty + "," + HBadQty + "," + HFirstCheckEmp + ",'" + HCheckerResult + "'" + + ",'" + HBarcode + "','" + HLBatchNo + "'," + HCusID + ",'" + HSortBillNo + "','" + HConTrctBatchNo + "'" + + "," + HProdAreaID + "," + HProdTypeID + ",'" + HProdStoveNo + "'," + HRecipeID + ",'" + HDiameter1 + "'" + + "," + HDiameter2 + "," + HRoutingInterID + "," + HDrawingDireID + "," + HPackTypeID + + ") "); + + + //瀛愯〃 + oCN.RunProc("Insert into QC_ProcessCheckBillSub " + + " (HInterID,HBillNo_bak,HEntryID,HCloseMan" + + ",HEntryCloseDate,HCloseType,HRemark,HSourceInterID" + + ",HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" + + ",HQCCheckClassID,HQCCheckItemID,HQCStd,HQCRelValue,HResult" + + ",HProcCheckEmp,HProcCheckTime" + + ") " + + " values('" + HInterID + "','',0,'" + HCloseMan + "'" + + ",'','','',0 " + + ",0,'','',0,0" + + ",0,0,'','',''"+ + ",0,''" + + ") "); + if (objJsonResult.code == "0") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = objJsonResult.Message; + objJsonResult.data = null; + return objJsonResult; + } + + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = null; + objJsonResult.data = null; + return objJsonResult; + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + + + /// <summary> + /// 宸ュ簭妫�楠屽崟鍒楄〃淇敼鎸夐挳鏂规硶 + ///鍙傛暟锛歴tring sql銆� + ///杩斿洖鍊硷細object銆� + /// </summary> + [Route("QC_ProcessCheckBill/xg")] + [HttpGet] + public object xg(long HInterID) + { + try + { + ds = oCN.RunProcReturn("select HInterID,HBillNo,HProcExchInterID,HProcExchEntryID,HProcExchBillNo" + + ",HMaterID,HProcID,HSourceID,HEmpID,HInStockQty" + + ",HCheckQty,HRightQty,HBadQty,HFirstCheckEmp,HCheckerResult" + + ",HBarCode,HLBatchNo,HCusID,HSortBillNo,HContrctBatchNo" + + ",HProdAreaID,HProdTypeID,HProdStoveNo,HRecipeID,HDiameter1" + + ",HDiameter2,HRoutingInterID,HDrawingDireID,HPackTypeID from QC_ProcessCheckBillMain where HInterID=" + HInterID, "QC_ProcessCheckBillMain"); + + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = ""; + 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; + } + } + + /// <summary> + /// 淇敼鍗曟嵁-淇濆瓨鎸夐挳 + ///鍙傛暟锛歴tring sql銆� + ///杩斿洖鍊硷細object銆� + /// </summary> + [Route("QC_ProcessCheckBill/AddBill1")] + [HttpPost] + public object AddBill1([FromBody] JObject oMain) + { + var _value = oMain["oMain"].ToString(); + string msg1 = _value.ToString(); + try + { + DAL.ClsQC_ProcessCheckBill oProcess = new DAL.ClsQC_ProcessCheckBill(); + + msg1 = "[" + msg1.ToString() + "]"; + List<QC_ProcessCheckBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<QC_ProcessCheckBillMain>>(msg1); + string BillType = "7507"; + long HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D + string HBillNo = mainList[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿 + DateTime HDate = mainList[0].HDate;//鏃ユ湡 + int HYear = 2021; + double HPeriod = 1; + long HBillStatus = mainList[0].HBillStatus; + long HCheckItemNowID = mainList[0].HCheckItemNowID; + long HCkeckItemNextID = mainList[0].HCheckItemNextID; + long HCheckFlowID = mainList[0].HCheckFlowID; + string HRemark = mainList[0].HRemark;//澶囨敞 + string HBacker = mainList[0].HBacker; + DateTime HBackDate = mainList[0].HBackDate; + string HBackRemark = mainList[0].HBackRemark; + string HChecker = mainList[0].HChecker; + DateTime HCheckDate = mainList[0].HCheckDate; + string HMaker = mainList[0].HMaker; + DateTime HMakeDate = mainList[0].HMakeDate; + string HUpDater = mainList[0].HUpDater; + DateTime HUpDateDate = mainList[0].HUpDateDate; + string HCloseMan = mainList[0].HCloseMan; + DateTime HCloseDate = mainList[0].HCloseDate; + string HCloseType = mainList[0].HCloseType; + string HDeleteMan = mainList[0].HDeleteMan; + DateTime HDeleteDate = mainList[0].HDeleteDate; + string HMainSourceBillType = mainList[0].HMainSourceBillType; + long HMainSourceInterID = mainList[0].HMainSourceInterID; + long HMainSourceEntryID = mainList[0].HMainSourceEntryID; + string HMainSourceBillNo = mainList[0].HMainSourceBillNo; + double HPrintQty = mainList[0].HPrintQty; + long HICMOInterID = mainList[0].HICMOInterID; + string HICMOBillNo = mainList[0].HICMOBillNo; + long HProExchInterID = mainList[0].HProcExchInterID; + long HProExchEntryID = mainList[0].HProcExchEntryID; + string HProExchBillNo = mainList[0].HProcExchBillNo; + long HMaterID = mainList[0].HMaterID; + long HProcID = mainList[0].HProcID; + long HSourceID = mainList[0].HSourceID; + long HEmpID = mainList[0].HEmpID; + double HInStockQty = mainList[0].HInStockQty; + double HCheckQty = mainList[0].HCheckQty; + double HRightQty = mainList[0].HRightQty; + double HBadQty = mainList[0].HBadQty; + long HFirstCheckEmp = mainList[0].HFirstCheckEmp; + string HCheckerResult = mainList[0].HCheckerResult; + string HBarcode = mainList[0].HBarcode; + string HLBatchNo = mainList[0].HLBatchNo; + long HCusID = mainList[0].HCusID; + string HSortBillNo = mainList[0].HSortBillNo; + string HConTrctBatchNo = mainList[0].HContrctBatchNo; + long HProdAreaID = mainList[0].HProdAreaID; + long HProdTypeID = mainList[0].HProdTypeID; + string HProdStoveNo = mainList[0].HProdStoveNo; + long HRecipeID = mainList[0].HRecipeID; + double HDiameter1 = mainList[0].HDiameter1; + double HDiameter2 = mainList[0].HDiameter2; + long HRoutingInterID = mainList[0].HRoutingInterID; + long HPackTypeID = mainList[0].HPackTypeID; + long HDrawingDireID = mainList[0].HDrawingDireID; + + + + //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙� + oCN.BeginTran(); + //涓昏〃 + oCN.RunProc("Update QC_ProcessCheckBillMain set " + + "HMaterID=" + HMaterID + + ",HSourceID=" + HSourceID + + ",HEmpID=" + HEmpID + + ",HInStockQty=" + HInStockQty + + ",HCheckQty=" + HCheckQty + + ",HRightQty=" + HRightQty + + ",HBadQty=" + HBadQty + + ",HCusID=" + HCusID + + ",HRemark= '" + HRemark + "' Where HInterID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo); + //淇敼瀛愰」鐩唬鐮� + //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Department,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo); + //灏嗕笂绾� 涓洪潪鏈骇 + //oCN.RunProc("Update Gy_Department set HEndflag=0 where HItemID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo); + // + oCN.Commit(); + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "淇敼鍗曟嵁鎴愬姛锛�"; + //objJsonResult.data = null; + return objJsonResult; + } + catch (Exception e) + { + oCN.RollBack(); + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.Message; + objJsonResult.data = null; + return objJsonResult; + } + } + + + /// <summary> + /// 宸ュ簭妫�楠屽崟鍒楄〃鍒犻櫎鎸夐挳 + ///鍙傛暟锛歴tring sql銆� + ///杩斿洖鍊硷細object銆� + /// </summary> + [Route("QC_ProcessCheckBill/Delete_Json")] + [HttpGet] + public object Delete_Json(long HItemID) + { + DAL.ClsQC_ProcessCheckBill BillOld = new DAL.ClsQC_ProcessCheckBill(); + try + { + if (BillOld.DeleteBill(HItemID, ref ClsPub.sExeReturnInfo) != true) + { + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "鍒犻櫎鎴愬姛"; + objJsonResult.data = null; + return objJsonResult; + } + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "鍒犻櫎鎴愬姛"; + objJsonResult.data = null; + return objJsonResult; + + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + + + /// <summary> + /// 杩斿洖宸ュ簭妫�楠屽崟鍒楄〃 + ///鍙傛暟锛歴tring sql銆� + ///杩斿洖鍊硷細object銆� + /// </summary> + [Route("QC_ProcessCheckBill/GetProcessCheckBillList")] + [HttpGet] + public object GetProcessCheckBillList(string sWhere) + { + try + { + if (sWhere == null || sWhere.Equals("")) + { + ds = oCN.RunProcReturn("select * from h_v_QC_ProcessCheckBillList " + sWhere, "h_v_QC_ProcessCheckBillList"); + } + else + { + string sql1 = "select * from h_v_QC_ProcessCheckBillList where 1 = 1 "; + string sql = sql1 + sWhere; + ds = oCN.RunProcReturn(sql, "h_v_QC_ProcessCheckBillList"); + } + if (ds == null || ds.Tables[0].Rows.Count == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "false锛�"; + objJsonResult.data = null; + return objJsonResult; + } + else + { + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "Sucess锛�"; + 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; + } + } + + // + } +} \ No newline at end of file diff --git a/WebAPI/Models/QC_ProcessCheckBillMain.cs b/WebAPI/Models/QC_ProcessCheckBillMain.cs new file mode 100644 index 0000000..c6f4e9c --- /dev/null +++ b/WebAPI/Models/QC_ProcessCheckBillMain.cs @@ -0,0 +1,71 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Linq; +using System.Web; + +namespace WebAPI.Models +{ + public class QC_ProcessCheckBillMain + { + public long HInterID { get; set; } + public string HBillNo { get; set; } + public DateTime HDate { get; set; } + public long HBillStatus { get; set; } + public long HCheckItemNowID { get; set; } + public long HCheckItemNextID { get; set; } + public long HCheckFlowID { get; set; } + public string HRemark { get; set; } + public string HBacker { get; set; } + public DateTime HBackDate { get; set; } + public string HBackRemark { get; set; } + public string HChecker { get; set; } + public DateTime HCheckDate { get; set; } + public string HMaker { get; set; } + public DateTime HMakeDate { get; set; } + public string HUpDater { get; set; } + public DateTime HUpDateDate { get; set; } + public string HCloseMan { get; set; } + public DateTime HCloseDate { get; set; } + public string HCloseType { get; set; } + public string HDeleteMan { get; set; } + public DateTime HDeleteDate { get; set; } + public string HMainSourceBillType { get; set; } + public long HMainSourceInterID { get; set; } + public long HMainSourceEntryID { get; set; } + public string HMainSourceBillNo { get; set; } + public long HPrintQty { get; set; } + public long HICMOInterID { get; set; } + public string HICMOBillNo { get; set; } + public long HProcExchInterID { get; set; } + public long HProcExchEntryID { get; set; } + public string HProcExchBillNo { get; set; } + public long HMaterID { get; set; } + public long HProcID { get; set; } + public long HSourceID { get; set; } + public long HEmpID { get; set; } + public long HInStockQty { get; set; } + public long HCheckQty { get; set; } + public long HRightQty { get; set; } + public long HBadQty { get; set; } + + public long HFirstCheckEmp { get; set; } + public string HCheckerResult { get; set; } + public string HBarcode { get; set; } + public string HLBatchNo { get; set; } + public long HCusID { get; set; } + public string HSortBillNo { get; set; } + public string HContrctBatchNo { get; set; } + public long HProdAreaID { get; set; } + + + public long HProdTypeID { get; set; } + public string HProdStoveNo { get; set; } + public long HRecipeID { get; set; } + public double HDiameter1 { get; set; } + public double HDiameter2 { get; set; } + public long HRoutingInterID { get; set; } + public long HDrawingDireID { get; set; } + public long HPackTypeID { get; set; } + + } +} \ No newline at end of file diff --git a/WebAPI/Models/QC_ProcessCheckBillSub.cs b/WebAPI/Models/QC_ProcessCheckBillSub.cs new file mode 100644 index 0000000..53b2ee51 --- /dev/null +++ b/WebAPI/Models/QC_ProcessCheckBillSub.cs @@ -0,0 +1,32 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Linq; +using System.Web; + +namespace WebAPI.Models +{ + public class QC_ProcessCheckBillSub + { + public long HInterID { get; set; } + public string HBillNo_bak { get; set; } + public long HEntryID { get; set; } + public string HCloseMan { get; set; } + public DateTime HEntryCloseDate { get; set; } + public string HCloseType { get; set; } + public string HRemark { get; set; } + public long HSourceInterID { get; set; } + public long HSourceEntryID { get; set; } + public string HSourceBillNo { get; set; } + public string HSourceBillType { get; set; } + public long HrelationQty { get; set; } + public double HRelationMoney { get; set; } + public long HQCCheckClassID { get; set; } + public long HQCCheckItemID { get; set; } + public string HQCStd { get; set; } + public string HQCRelvalue { get; set; } + public string HResult { get; set; } + public long HProCheckEmp { get; set; } + public DateTime HProcCheckTime { get; set; } + + } +} \ No newline at end of file diff --git a/WebAPI/Properties/PublishProfiles/API.pubxml.user b/WebAPI/Properties/PublishProfiles/API.pubxml.user index cfb6eef..4e6793f 100644 --- a/WebAPI/Properties/PublishProfiles/API.pubxml.user +++ b/WebAPI/Properties/PublishProfiles/API.pubxml.user @@ -12,7 +12,7 @@ <ItemGroup> <File Include="apiapp.json"> <publishTime>04/12/2021 11:33:15</publishTime> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="bin/Antlr3.Runtime.dll"> <publishTime>02/22/2013 08:43:40</publishTime> @@ -27,19 +27,19 @@ <publishTime>05/07/2021 20:31:20</publishTime> </File> <File Include="bin/BLL.dll"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="bin/DAL.dll"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="bin/Dapper.dll"> <publishTime>07/22/2016 14:52:40</publishTime> </File> <File Include="bin/DBUtility.dll"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="bin/Kingdee.BOS.WebApi.Client.dll"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="bin/Kingdee.BOS.WebApi.FormService.dll"> <publishTime>09/20/2018 19:23:20</publishTime> @@ -57,7 +57,7 @@ <publishTime>07/25/2012 11:48:56</publishTime> </File> <File Include="bin/Model.dll"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="bin/Newtonsoft.Json.dll"> <publishTime>08/03/2014 20:33:56</publishTime> @@ -66,13 +66,13 @@ <publishTime>01/04/2011 13:48:18</publishTime> </File> <File Include="bin/Pub_Class.dll"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="bin/Pub_Control.dll"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="bin/SQLHelper.dll"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="bin/Swashbuckle.Core.dll"> <publishTime>02/15/2015 17:57:08</publishTime> @@ -138,7 +138,7 @@ <publishTime>11/28/2018 13:01:00</publishTime> </File> <File Include="bin/System.Web.Http.WebHost.dll"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="bin/System.Web.Mvc.dll"> <publishTime>01/28/2015 04:02:18</publishTime> @@ -171,10 +171,10 @@ <publishTime>11/24/2014 11:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> - <publishTime>05/17/2021 16:35:47</publishTime> + <publishTime>05/24/2021 00:01:16</publishTime> </File> <File Include="bin/WebAPI.pdb"> - <publishTime>05/17/2021 16:35:47</publishTime> + <publishTime>05/24/2021 00:01:16</publishTime> </File> <File Include="bin/WebAPI.XmlSerializers.dll"> <publishTime>02/04/2021 21:35:21</publishTime> @@ -192,166 +192,166 @@ <publishTime>03/26/2019 14:23:20</publishTime> </File> <File Include="Content/bootstrap.css"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="Content/bootstrap.min.css"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="Content/Site.css"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="DLL/BLL.dll"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="DLL/DAL.dll"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="DLL/DBUtility.dll"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="DLL/Kingdee.BOS.WebApi.Client.dll"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="DLL/Model.dll"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="DLL/Newtonsoft.Json.Net35.dll"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="DLL/Pub_Class.dll"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="DLL/Pub_Control.dll"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="DLL/SQLHelper.dll"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.eot"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.svg"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.ttf"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.woff"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="Global.asax"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="Index.html"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="packages.config"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="PrecompiledApp.config"> <publishTime>05/07/2021 20:31:19</publishTime> </File> <File Include="Views/Scripts/bootstrap.js"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="Views/Scripts/bootstrap.min.js"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.js"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.min.js"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.min.map"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="Views/Scripts/jquery.validate.js"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="Views/Scripts/jquery.validate.min.js"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="Views/Scripts/jquery.validate.unobtrusive.js"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="Views/Scripts/modernizr-2.6.2.js"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="Views/Shared/Error.cshtml"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="Views/Shared/_Layout.cshtml"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="Views/web.config"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="Views/_ViewStart.cshtml"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Department_Model.datasource"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="Web References/WebS/ClsGy_Customer_Model.datasource"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="Web References/WebS/ClsGy_Department_Model.datasource"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="Web References/WebS/ClsGy_Employee_Model.datasource"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="Web References/WebS/ClsGy_Group_Model.datasource"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="Web References/WebS/ClsGy_Source_Model.datasource"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource"> - <publishTime>05/06/2021 09:48:41</publishTime> + <publishTime>05/10/2021 09:27:02</publishTime> </File> <File Include="Web.config"> - <publishTime>05/17/2021 16:35:59</publishTime> + <publishTime>05/24/2021 00:01:20</publishTime> </File> </ItemGroup> </Project> \ No newline at end of file diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj index 6b25678..935f585 100644 --- a/WebAPI/WebAPI.csproj +++ b/WebAPI/WebAPI.csproj @@ -347,6 +347,9 @@ <Compile Include="Controllers\CJGL\Cj_StationEntrustOutBillController.cs" /> <Compile Include="Controllers\JHGL\Gy_RoutingBillController.cs" /> <Compile Include="Controllers\QC_ManagementController.cs" /> + <Compile Include="Controllers\SCGL\QC_LastPieceCheckBillController.cs" /> + <Compile Include="Controllers\SCGL\QC_OutCompCheckBillController.cs" /> + <Compile Include="Controllers\SCGL\QC_ProcessCheckBillController.cs" /> <Compile Include="Controllers\Sc_ProcessMangementController.cs" /> <Compile Include="Controllers\CJGL\Cj_StationEntrustInBillController.cs" /> <Compile Include="Controllers\LMESController.cs" /> @@ -377,6 +380,8 @@ <Compile Include="Models\ClsWW_EntrustWorkOrderBillMain.cs" /> <Compile Include="Models\ClsWW_EntrustWorkOrderBillSub.cs" /> <Compile Include="Models\DocumentsView.cs" /> + <Compile Include="Models\QC_ProcessCheckBillSub.cs" /> + <Compile Include="Models\QC_ProcessCheckBillMain.cs" /> <Compile Include="Models\Gy_RoutingBillSub.cs" /> <Compile Include="Models\LookingForBill.cs" /> <Compile Include="Models\M_Department.cs" /> -- Gitblit v1.9.1