From 598b30271d6cf3a01621310e55296c1f61f0baf7 Mon Sep 17 00:00:00 2001 From: WYB <908761037@qq.com> Date: 星期五, 09 四月 2021 22:11:41 +0800 Subject: [PATCH] PDA工序汇报单保存逻辑实现以及普通工序汇报单保存逻辑编写 --- WebAPI/Controllers/Sc_ProcessMangementController.cs | 228 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 223 insertions(+), 5 deletions(-) diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs index b2b315a..5867b53 100644 --- a/WebAPI/Controllers/Sc_ProcessMangementController.cs +++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs @@ -458,25 +458,50 @@ ListModels oListModels = new ListModels(); try { - DAL.ClsSc_ProcessReport ReportModel = new DAL.ClsSc_ProcessReport(); + WebAPI.DLL.ClsSc_ProcessReport ReportModel = new WebAPI.DLL.ClsSc_ProcessReport(); List<WebAPI.Models.Sc_ProcessReportViewModel> ls = new List<WebAPI.Models.Sc_ProcessReportViewModel>(); ls = oListModels.getObjectByJson_Report(msg1); int i = 0; - Model.ClsSc_ProcessReportMain ReportMain = new Model.ClsSc_ProcessReportMain(); - Model.ClsSc_ProcessReportSub ReportSub = new Model.ClsSc_ProcessReportSub(); + foreach (Models.Sc_ProcessReportViewModel ItemView in ls) { i++; + Model.ClsSc_ProcessReportMain ReportMain = new Model.ClsSc_ProcessReportMain(); + Model.ClsSc_ProcessReportSub ReportSub = new Model.ClsSc_ProcessReportSub(); //宸ュ簭姹囨姤鍗曚富琛ㄤ繚瀛� ReportMain.HBillType = "3714"; ReportMain.HBillNo = ItemView.HBillNo; ReportMain.HMakeDate=DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd")); ReportMain.HYear=DBUtility.ClsPub.isLong(DateTime.Now.Year); ReportMain.HDate = DateTime.Now; - ReportMain.HInterID = ItemView.HInterID; ReportMain.HMaker = ItemView.HEmp; ReportMain.HCloseType = false; ReportMain.HPlanQty = (double)ItemView.HQty; + ReportMain.HMainSourceInterID = ItemView.HInterID; + ReportMain.HInterID =0; + ReportMain.HPeriod = 1; + ReportMain.HBillSubType = "3714"; + ReportMain.HBillStatus = 0; + ReportMain.HCheckItemNowID = 0; + ReportMain.HCheckItemNextID = 0; + ReportMain.HICMOInterID= (long)ItemView.HICMOInterID; + ReportMain.HICMOBillNo=ItemView.HICMOBillNo; + ReportMain.HDeptID = (long)ItemView.HDeptID; + ReportMain.HDeptNumber =ItemView.HDeptNumber; + ReportMain.HGroupID = (long)ItemView.HGroupID; + ReportMain.HGroupNumber = ItemView.HGroupNumber; + ReportMain.HMaterID = (long)ItemView.HMaterID; + ReportMain.HMaterNumber = ItemView.HMaterNumber; + ReportMain.HUnitID = ItemView.HUnitID; + ReportMain.HUnitNumber = ItemView.HUnitNumber; + ReportMain.HInStockQty = 0; + ReportMain.HSumTimes = 0; + ReportMain.HExplanation = ""; + ReportMain.HInnerBillNo = ""; + ReportMain.HSupID = 0; + + + //淇濆瓨鍒版眹鎶ュ崟涓昏〃 ReportModel.omodel = ReportMain; @@ -491,6 +516,64 @@ ReportSub.HCloseType = false; ReportSub.HSourceBillType = "3712"; ReportSub.HQty = (double)ItemView.HQty; + ReportSub.HProcID = ItemView.HProcID; + ReportSub.HProcNumber = ItemView.HProcNumber; + ReportSub.HOutPrice =0; + ReportSub.HOutMoney = 0; + ReportSub.HSourceID = (long)ItemView.HSourceID; + ReportSub.HEmpNumber = ""; + ReportSub.HRelBeginDate = DateTime.Now; + ReportSub.HRelEndDate = DateTime.Now; + ReportSub.HTimes =3; + ReportSub.HSeOrderInterID = 0; + ReportSub.HSeOrderEntryID =0; + ReportSub.HSeOrderBillNo = ""; + ReportSub.HProcPlanInterID = 0; + ReportSub.HProcPlanBillNo = ""; + ReportSub.HSourceInterID = 0; + ReportSub.HSourceBillNo = ""; + ReportSub.HRelationQty = 0; + ReportSub.HRelationMoney = 0; + ReportSub.HMaterID = (long)ItemView.HMaterID; + ReportSub.HMaterNumber = ItemView.HMaterNumber; + ReportSub.HCheckQty =0; + ReportSub.HBadCount =0; + ReportSub.HWasterQty =0; + ReportSub.HWasterQty2 =0; + ReportSub.HPrice =0; + ReportSub.HMoney =0; + ReportSub.HProcPlanInterID =0; + ReportSub.HProcPlanEntryID =0; + ReportSub.HProcPlanBillNo =""; + ReportSub.HSourceEntryID =0; + ReportSub.HSourceBillType =""; + ReportSub.HRelationQty =0; + ReportSub.HRelationMoney =0; + ReportSub.HBadPrirce =0; + ReportSub.HBadMoney =0; + ReportSub.HWasterPrice =0; + ReportSub.HWasterMoney =0; + ReportSub.HQualityRate =0; + ReportSub.HSecUnitQty1 =0; + ReportSub.HSecUnitRate1=0; + ReportSub.HSecUnitQty2=0; + ReportSub.HSecUnitRate2=0; + ReportSub.HUsingQty=0; + ReportSub.HSelfBadCount=0; + ReportSub.HPreBadCount=0; + ReportSub.HPayMentQty=0; + ReportSub.HOtherDeduct=0; + ReportSub.HRelPay=0; + ReportSub.HOtherItem1=""; + ReportSub.HOtherItem2=""; + ReportSub.HOtherItem3=""; + ReportSub.HOtherItem4=""; + ReportSub.HOtherItem5=""; + ReportSub.HPackType=""; + ReportSub.HCheckEmpID=0; + ReportSub.HWeight=0; + ReportSub.HBatchNo=""; + //淇濆瓨鍒版眹鎶ュ崟瀛愯〃 ReportModel.DetailColl.Add(ReportSub); } @@ -559,7 +642,142 @@ return model; } + /// <summary> + /// 淇濆瓨宸ュ簭姹囨姤鍗曚俊鎭� + /// </summary> + /// <param name="msg"></param> + /// <returns></returns> + [Route("SaveProcessReportList")] + [HttpPost] + public object SaveProcessReportList([FromBody] JObject msg) + { + var _value = msg["msg"].ToString(); + string msg1 = _value.ToString(); + string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); + string msg2 = sArray[0].ToString(); + string msg3 = sArray[1].ToString(); + + ListModels oListModels = new ListModels(); + try + { + WebAPI.DLL.ClsSc_ProcessReport ReportModel = new WebAPI.DLL.ClsSc_ProcessReport(); + List<Model.ClsSc_ProcessReportMain> lsmain = new List<Model.ClsSc_ProcessReportMain>(); + msg2 = msg2.Replace("\\", ""); + msg2 = msg2.Replace("\n", ""); //\n + lsmain = oListModels.getObjectByJson_Reportlist(msg2); + foreach (Model.ClsSc_ProcessReportMain oItem in lsmain) + { + //oItem.HMaker = ""; + //UserName = oItem.HMaker; + oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd")); + oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year); + oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd")); + oItem.HBillType = "3714"; + //oItem.HExRate = 1; + oItem.HMainSourceInterID = oItem.HInterID; + oItem.HInterID = 0; + //oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo); + if (DBUtility.ClsPub.isStrNull(oItem.HPlanQty) == "") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊~鍐欐淳宸ユ暟閲忥紝鏃犳硶淇濆瓨锛�"; + objJsonResult.data = 1; + return objJsonResult; + } + ReportModel.omodel = oItem; + } - // + //琛ㄤ綋鏁版嵁 + //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆� + msg3 = msg3.Substring(1, msg3.Length - 2); + msg3 = msg3.Replace("\\", ""); + msg3 = msg3.Replace("\n", ""); //\n + //msg2 = msg2.Replace("'", "鈥�"); + //List<Model.ClsCg_POInStockBillSub> ls = new List<Model.ClsCg_POInStockBillSub>(); + //ls = oListModels.getObjectByJson_POInStockSub(msg3); + //int i = 0; + //foreach (Model.ClsCg_POInStockBillSub oItemSub in ls) + //{ + // i++; + // if (oItemSub.HQty <= 0) + // { + // objJsonResult.code = "0"; + // objJsonResult.count = 0; + // objJsonResult.Message = "淇濆瓨澶辫触锛佺" + i.ToString() + "琛屾暟閲忎笉澶т簬0鏃犳硶淇濆瓨锛�"; + // objJsonResult.data = 1; + // return objJsonResult; + // } + // if (oItemSub.HQty > oItemSub.HRQty) + // { + // objJsonResult.code = "0"; + // objJsonResult.count = 0; + // objJsonResult.Message = "淇濆瓨澶辫触锛佺" + i.ToString() + "琛屾暟閲忎笉鑳藉ぇ浜庢湭鍏宠仈鏁伴噺锛�"; + // objJsonResult.data = 1; + // return objJsonResult; + // } + // if (DBUtility.ClsPub.isStrNull(oItemSub.HBatChNo) == "") + // { + // objJsonResult.code = "0"; + // objJsonResult.count = 0; + // objJsonResult.Message = "淇濆瓨澶辫触锛佺" + i.ToString() + "琛屾湭濉啓鎵瑰彿锛�"; + // objJsonResult.data = 1; + // return objJsonResult; + // } + + // oItemSub.HEntryID = i; + // oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now); + // oItemSub.HRemark = ""; + // oItemSub.HCloseMan = ""; + // oItemSub.HCloseType = false; + // oBill.DetailColl.Add(oItemSub); + + //} + ////淇濆瓨鍓嶅垽鏂�(鍗曟嵁鍙烽噸澶嶏紝绗斿綍椤圭洰) + ////淇濆瓨 + ////淇濆瓨瀹屾瘯鍚庡鐞� + //bool bResult; + //if (oBill.omodel.HInterID == 0) + //{ + // // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo); + // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo); + //} + //else + //{ + // bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo); + //} + //if (bResult) + //{ + // objJsonResult.code = "0"; + // objJsonResult.count = 1; + // objJsonResult.Message = "淇濆瓨鎴愬姛锛�"; + // WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�"); + // objJsonResult.data = 1; + // return objJsonResult; + //} + //else + //{ + // objJsonResult.code = "0"; + // objJsonResult.count = 0; + // objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo; + // objJsonResult.data = 1; + // return objJsonResult; + //} + + + } + catch (Exception e) + { + + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString(); + objJsonResult.data = 1; + return objJsonResult; + } + } + + + } } \ No newline at end of file -- Gitblit v1.9.1