From fa185eceaf8608470a6594c079f88baea6cce383 Mon Sep 17 00:00:00 2001 From: zgq <519541279@qq.com> Date: 星期一, 19 七月 2021 15:37:30 +0800 Subject: [PATCH] 20210719v1 --- WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 49 +++--- WebAPI/Controllers/WebAPIController.cs | 103 ++++++++++++++ WebAPI/WebAPI.csproj | 2 WebAPI/Controllers/品质管理/首检检验单/QC_FirstPieceCheckBillController.cs | 253 ++++++++++++++++++++++++++++++++++++ 4 files changed, 383 insertions(+), 24 deletions(-) diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs index cca193c..b97e75a 100644 --- a/WebAPI/Controllers/WebAPIController.cs +++ b/WebAPI/Controllers/WebAPIController.cs @@ -1831,6 +1831,109 @@ return objjson; } } + /// <summary> + /// 鑾峰彇鐢熶骇浠诲姟鍗曞垪琛� + /// </summary> + /// <returns></returns> + [Route("Web/GetSc_ICMOBillListView2")] + [HttpGet] + public object GetSc_ICMOBillListView2(string ICMOBill, int OrganizationID) + { + if (ICMOBill != "") + { + sWhere = " where 1=1 and 鍗曟嵁鍙� like '%" + ICMOBill + "%' "; + } + try + { + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + if (sWhere == null || sWhere.Equals("")) + { + ds = oCN.RunProcReturn("select * from h_v_Sc_ICMOBillList where 1=1 and isnull(瀹℃牳浜�,'')<>'' order by 鍗曟嵁鍙� desc,hsubid ", "h_v_Sc_ICMOBillList"); + } + else + { + string sql = "select * from h_v_Sc_ICMOBillList " + sWhere + " and isnull(瀹℃牳浜�,'')<>'' order by 鍗曟嵁鍙� desc,hsubid "; + ds = oCN.RunProcReturn(sql, "h_v_Sc_ICMOBillList"); + } + if (ds == null || ds.Tables[0].Rows.Count <= 0) + { + objjson.code = "0"; + objjson.count = 0; + objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo; + objjson.data = null; + return objjson; + } + else + { + objjson.code = "0"; + objjson.count = 1; + objjson.Message = "鑾峰彇鎴愬姛!"; + objjson.data = ds.Tables[0]; + return objjson; + } + } + catch (Exception ex) + { + + objjson.code = "0"; + objjson.count = 0; + objjson.Message = "鑾峰彇澶辫触" + ex.ToString(); + objjson.data = null; + return objjson; + } + } + + /// <summary> + /// 鑾峰彇宸ュ簭娴佽浆鍗″垪琛� + /// </summary> + /// <returns></returns> + [Route("Web/GetSc_ProcessExchangeBillListView")] + [HttpGet] + public object GetSc_ProcessExchangeBillListView(string ICMOBill, int OrganizationID) + { + if (ICMOBill != "") + { + sWhere = " where 1=1 and 鍗曟嵁鍙� like '%" + ICMOBill + "%' "; + } + try + { + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + if (sWhere == null || sWhere.Equals("")) + { + ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessExchangeBillList where 1=1 order by 鍗曟嵁鍙� desc,hsubid ", "h_v_Sc_ProcessExchangeBillList"); + } + else + { + string sql = "select * from h_v_Sc_ProcessExchangeBillList " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid "; + ds = oCN.RunProcReturn(sql, "h_v_Sc_ProcessExchangeBillList"); + } + if (ds == null || ds.Tables[0].Rows.Count <= 0) + { + objjson.code = "0"; + objjson.count = 0; + objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo; + objjson.data = null; + return objjson; + } + else + { + objjson.code = "0"; + objjson.count = 1; + objjson.Message = "鑾峰彇鎴愬姛!"; + objjson.data = ds.Tables[0]; + return objjson; + } + } + catch (Exception ex) + { + + objjson.code = "0"; + objjson.count = 0; + objjson.Message = "鑾峰彇澶辫触" + ex.ToString(); + objjson.data = null; + return objjson; + } + } /// <summary> /// 鑾峰彇缁翠慨椤圭洰鍒楄〃 diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\346\243\200\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\346\243\200\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs" new file mode 100644 index 0000000..f26c014 --- /dev/null +++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\346\243\200\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs" @@ -0,0 +1,253 @@ +锘縰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_FirstPieceCheckBillController : ApiController + { + public DBUtility.ClsPub.Enum_BillStatus BillStatus; + private json objJsonResult = new json(); + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + DataSet ds; + + /// <summary> + /// 鏂板鍗曟嵁-淇濆瓨鎸夐挳 + ///鍙傛暟锛歴tring sql銆� + ///杩斿洖鍊硷細object銆� + /// </summary> + [Route("QC_FirstPieceCheckBill/set_SaveBill")] + [HttpPost] + public object set_SaveBill([FromBody] JObject sMainSub) + { + var _value = sMainSub["sMainSub"].ToString(); + string msg1 = _value.ToString(); + //淇濆瓨鍗曟嵁 + return objJsonResult = AddBillMain(msg1); + } + + public json AddBillMain(string msg1) + { + string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); + string msg2 = sArray[0].ToString(); + string msg3 = sArray[1].ToString(); + string OperationType = sArray[2].ToString().Trim(); + bool bResult; + try + { + msg2 = "[" + msg2.ToString() + "]"; + List<Model.ClsQC_FirstPieceCheckBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_FirstPieceCheckBillMain>>(msg2); + DAL.ClsQC_FirstPieceCheckBill BillNew = new DAL.ClsQC_FirstPieceCheckBill(); + //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞� + string s = ""; + int sYear = 0; + int sPeriod = 0; + DateTime HDate = mainList[0].HDate;//鏃ユ湡 + if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = s; + objJsonResult.data = null; + return objJsonResult; + } + BillNew.omodel.HYear = sYear; + BillNew.omodel.HPeriod = sPeriod; + //鍥哄畾璧嬪��================================= + BillNew.omodel.HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D + BillNew.omodel.HBillNo = mainList[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿 + BillNew.omodel.HDate = HDate; + BillNew.omodel.HRemark = mainList[0].HRemark;//澶囨敞 + BillNew.omodel.HMaker = mainList[0].HMaker; + BillNew.omodel.HSourceID = ClsPub.isLong(mainList[0].HSourceID); + BillNew.omodel.HICMOInterID = ClsPub.isLong(mainList[0].HICMOInterID); + BillNew.omodel.HICMOBillNo = ClsPub.isStrNull(mainList[0].HICMOBillNo); + BillNew.omodel.HICMOInterID = ClsPub.isLong(mainList[0].HICMOInterID); + BillNew.omodel.HICMOQty = ClsPub.isLong(mainList[0].HICMOQty); + BillNew.omodel.HProcExchInterID = ClsPub.isLong(mainList[0].HProcExchInterID); + BillNew.omodel.HProcExchEntryID = ClsPub.isLong(mainList[0].HProcExchEntryID); + BillNew.omodel.HProcExchBillNo = ClsPub.isStrNull(mainList[0].HProcExchBillNo); + BillNew.omodel.HProcExchQty = ClsPub.isLong(mainList[0].HProcExchQty); + BillNew.omodel.HMaterID = ClsPub.isLong(mainList[0].HMaterID); + BillNew.omodel.HFirstCheckEmp = ClsPub.isLong(mainList[0].HFirstCheckEmp); + BillNew.omodel.HLastResult = ClsPub.isBool(mainList[0].HLastResult); + + List<Model.ClsQC_FirstPieceCheckBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_FirstPieceCheckBillSub>>(msg3); + BillNew.DetailColl = new List<Model.ClsQC_FirstPieceCheckBillSub>(); + for (int i = 0; i < subList.ToArray().Length; i++) + { + if (i >= 0)//HQty + { + Model.ClsQC_FirstPieceCheckBillSub oSub = new Model.ClsQC_FirstPieceCheckBillSub(); + oSub.HEntryID = i+1; + oSub.HRemark = ClsPub.isStrNull(subList[i].HRemark); + oSub.HSourceInterID = ClsPub.isLong(subList[i].HSourceInterID); + oSub.HSourceEntryID = ClsPub.isLong(subList[i].HSourceEntryID); + oSub.HSourceBillType = ClsPub.isStrNull(subList[i].HSourceBillType); + oSub.HSourceBillNo = ClsPub.isStrNull(subList[i].HSourceBillNo); + oSub.HRelationQty = DBUtility.ClsPub.isDoule(subList[i].HRelationQty); + oSub.HRelationMoney = DBUtility.ClsPub.isDoule(subList[i].HRelationMoney); + oSub.HCloseMan = DBUtility.ClsPub.isStrNull(subList[i].HCloseMan); + oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(subList[i].HEntryCloseDate); + oSub.HCloseType = DBUtility.ClsPub.isBool(subList[i].HCloseType); + oSub.HQCCheckItemID = DBUtility.ClsPub.isLong(subList[i].HQCCheckItemID); + oSub.HQCStd = DBUtility.ClsPub.isStrNull(subList[i].HQCStd); + oSub.HUnit = DBUtility.ClsPub.isStrNull(subList[i].HUnit); + oSub.HQCNote = DBUtility.ClsPub.isStrNull(subList[i].HQCNote); + oSub.HResult = DBUtility.ClsPub.isStrNull(subList[i].HResult); + oSub.HMax = DBUtility.ClsPub.isStrNull(subList[i].HMax); + oSub.HMin = DBUtility.ClsPub.isStrNull(subList[i].HMin); + oSub.HAvg = DBUtility.ClsPub.isStrNull(subList[i].HAvg); + BillNew.DetailColl.Add(oSub); + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳槑缁嗚淇℃伅!"; + objJsonResult.data = null; + return objJsonResult; + } + } + //淇濆瓨瀹屾瘯鍚庡鐞� + if (OperationType.Equals("1") || OperationType.Equals("2")) + { + bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo); + } + else + { + bResult = BillNew.ModifyBill(BillNew.omodel.HInterID, ref ClsPub.sExeReturnInfo); + } + //鎻愮ず + if (bResult == true) + { + 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; + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo; + 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> + /// 杩斿洖鐢熶骇浠诲姟鍗曟槑缁嗚 + /// </summary> + /// <param name="hmainid">鐢熶骇浠诲姟鍗旾D</param> + /// <returns>object</returns> + [Route("Sc_ProcessExchangeBill/GetICMOBillList")] + [HttpGet] + public object GetICMOBillList(int hmainid,int OrganizationID) + { + try + { + if (hmainid == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鐢熶骇浠诲姟鍗旾D涓�0锛�"; + objJsonResult.data = null; + return objJsonResult; + } + ds = oCN.RunProcReturn("select * from h_v_Sc_ICMOBillListDetail where hmainid=" + hmainid, "h_v_Sc_ICMOBillListDetail"); + if (ds == null || ds.Tables[0].Rows.Count == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "姝ょ敓浜т换鍔″崟鏃犳槑缁嗚锛�"; + 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; + } + } + + /// <summary> + /// 杩斿洖鐢熶骇浠诲姟鍗曟槑缁嗚 + /// </summary> + /// <param name="hmainid">鐢熶骇浠诲姟鍗旾D</param> + /// <returns>object</returns> + [Route("Sc_ProcessExchangeBill/GetICMOBillDetail")] + [HttpGet] + public object GetICMOBillDetail(int hmainid, int OrganizationID) + { + try + { + if (hmainid == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鐢熶骇浠诲姟鍗旾D涓�0锛�"; + objJsonResult.data = null; + return objJsonResult; + } + ds = oCN.RunProcReturn("select * from h_v_S_Sc_ICMOBillList where hmainid=" + hmainid, "h_v_S_Sc_ICMOBillList"); + if (ds == null || ds.Tables[0].Rows.Count == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "姝ょ敓浜т换鍔″崟鏃犳槑缁嗚锛�"; + 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/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user index e9f2669..114e343 100644 --- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -48,7 +48,7 @@ <publishTime>07/25/2012 11:48:56</publishTime> </File> <File Include="bin/Model.dll"> - <publishTime>06/17/2021 23:18:55</publishTime> + <publishTime>07/16/2021 17:42:03</publishTime> </File> <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs"> <publishTime>07/12/2021 16:12:20</publishTime> @@ -162,10 +162,10 @@ <publishTime>11/24/2014 11:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> - <publishTime>07/16/2021 16:50:37</publishTime> + <publishTime>07/19/2021 13:15:04</publishTime> </File> <File Include="bin/WebAPI.pdb"> - <publishTime>07/16/2021 16:50:37</publishTime> + <publishTime>07/19/2021 13:15:04</publishTime> </File> <File Include="bin/WebGrease.dll"> <publishTime>07/17/2013 17:03:52</publishTime> @@ -198,7 +198,7 @@ <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="DLL/Model.dll"> - <publishTime>06/17/2021 23:18:55</publishTime> + <publishTime>07/16/2021 17:42:03</publishTime> </File> <File Include="DLL/Newtonsoft.Json.Net35.dll"> <publishTime>01/13/2021 21:47:30</publishTime> @@ -279,61 +279,64 @@ <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource"> - <publishTime>02/22/2021 09:25:20</publishTime> + <publishTime>07/16/2021 17:42:03</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Department_Model.datasource"> - <publishTime>02/22/2021 09:25:20</publishTime> + <publishTime>07/16/2021 17:42:03</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource"> - <publishTime>02/22/2021 09:25:20</publishTime> + <publishTime>07/16/2021 17:42:03</publishTime> </File> <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource"> - <publishTime>02/22/2021 09:25:20</publishTime> + <publishTime>07/16/2021 17:42:03</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource"> - <publishTime>02/22/2021 09:25:20</publishTime> + <publishTime>07/16/2021 17:42:03</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource"> - <publishTime>02/22/2021 09:25:20</publishTime> + <publishTime>07/16/2021 17:42:03</publishTime> </File> <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource"> - <publishTime>02/22/2021 09:25:20</publishTime> + <publishTime>07/16/2021 17:42:03</publishTime> </File> <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource"> - <publishTime>02/22/2021 09:25:21</publishTime> + <publishTime>07/16/2021 17:42:03</publishTime> </File> <File Include="Web References/WebS/ClsGy_Customer_Model.datasource"> - <publishTime>02/22/2021 09:25:20</publishTime> + <publishTime>07/16/2021 17:42:03</publishTime> </File> <File Include="Web References/WebS/ClsGy_Department_Model.datasource"> - <publishTime>02/22/2021 09:25:20</publishTime> + <publishTime>07/16/2021 17:42:03</publishTime> </File> <File Include="Web References/WebS/ClsGy_Employee_Model.datasource"> - <publishTime>02/22/2021 09:25:21</publishTime> + <publishTime>07/16/2021 17:42:03</publishTime> </File> <File Include="Web References/WebS/ClsGy_Group_Model.datasource"> - <publishTime>02/22/2021 09:25:20</publishTime> + <publishTime>07/16/2021 17:42:03</publishTime> </File> <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource"> - <publishTime>02/22/2021 09:25:20</publishTime> + <publishTime>07/16/2021 17:42:03</publishTime> </File> <File Include="Web References/WebS/ClsGy_Source_Model.datasource"> - <publishTime>02/22/2021 09:25:21</publishTime> + <publishTime>07/16/2021 17:42:03</publishTime> </File> <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource"> - <publishTime>02/22/2021 09:25:20</publishTime> + <publishTime>07/16/2021 17:42:03</publishTime> </File> <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource"> - <publishTime>02/22/2021 09:25:21</publishTime> + <publishTime>07/16/2021 17:42:03</publishTime> </File> <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource"> - <publishTime>02/22/2021 09:25:20</publishTime> + <publishTime>07/16/2021 17:42:03</publishTime> </File> <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource"> - <publishTime>02/22/2021 09:25:20</publishTime> + <publishTime>07/16/2021 17:42:03</publishTime> + </File> + <File Include="Web References/WebS/Reference.map"> + <publishTime>07/16/2021 17:42:03</publishTime> </File> <File Include="Web.config"> - <publishTime>07/16/2021 16:50:44</publishTime> + <publishTime>07/19/2021 13:15:10</publishTime> </File> </ItemGroup> </Project> \ No newline at end of file diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj index 787fc50..3fa8e81 100644 --- a/WebAPI/WebAPI.csproj +++ b/WebAPI/WebAPI.csproj @@ -388,6 +388,7 @@ <Compile Include="Controllers\XSGL\Xs_SeOutStockBackBillController.cs" /> <Compile Include="Controllers\XSGL\Xs_SeOutStockBillController.cs" /> <Compile Include="Controllers\XSGL\Xs_SeOrderBillController.cs" /> + <Compile Include="Controllers\鍝佽川绠$悊\棣栨妫�楠屽崟\QC_FirstPieceCheckBillController.cs" /> <Compile Include="Dapper\SqlHelper.cs" /> <Compile Include="Dapper\SqlPools.cs" /> <Compile Include="DbUntil\DataFormatUntil.cs" /> @@ -558,7 +559,6 @@ </ItemGroup> <ItemGroup> <Folder Include="App_Data\" /> - <Folder Include="Controllers\PZGL\" /> <Folder Include="Views\MoveStockBill\" /> <Folder Include="Views\QC_Management\" /> </ItemGroup> -- Gitblit v1.9.1