From 152a02e90a7da2d431d2ea75499c1d07ef495e1b Mon Sep 17 00:00:00 2001 From: yangle <admin@YINMOU> Date: 星期四, 23 三月 2023 09:27:33 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API --- WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs | 135 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 133 insertions(+), 2 deletions(-) diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs index 62bbee0..e8e3b3b 100644 --- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs +++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs @@ -1,4 +1,5 @@ -锘縰sing Newtonsoft.Json; +锘縰sing Model; +using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Pub_Class; using System; @@ -2099,7 +2100,137 @@ } #endregion + #region 杩斿洖宸ュ簭鍑虹珯姹囨姤鍗曟槑缁嗗垪琛� + [Route("Cj_StationOutBill_Detail/get_Display2")] + [HttpGet] + public object get_Display2(string HMaterID, string HWorkProcID, string HProcExchBillNo) + { + try + { + ds = oCN.RunProcReturn("select * from h_v_GetStationOutBill_Detail where 宸ュ簭ID = " + HWorkProcID + " and 鐗╂枡ID = " + HMaterID + " and 娴佽浆鍗″彿 = '" + HProcExchBillNo + "'" , "h_v_GetStationOutBill_Detail"); + 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; + } + } + #endregion - + #region 鏄庣粏 淇濆瓨/缂栬緫鍔熻兘 + //[Route("Cj_StationOutBill/AddBill_Detail")] + //[HttpPost] + //public object AddBill_Detail([FromBody] JObject sMain) + //{ + // try + // { + // var _value = sMain["sMainSub"].ToString(); + // string msg1 = _value.ToString(); + // oCN.BeginTran(); + // //淇濆瓨涓昏〃 + // objJsonResult = Add_Detail(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 = "鍗曟嵁淇濆瓨鎴愬姛锛�"; + // objJsonResult.data = null; + // return objJsonResult; + + // } + // catch (Exception e) + // { + // oCN.RollBack(); + // objJsonResult.code = "0"; + // objJsonResult.count = 0; + // objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString(); + // objJsonResult.data = null; + // return objJsonResult; + // } + //} + + //public json Add_Detail(string msg1) + //{ + // string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); + // string msg2 = sArray[0].ToString(); //琛ㄥご鏁版嵁 + // string msg3 = sArray[1].ToString(); //琛ㄤ綋鏁版嵁 + // int OperationType = int.Parse(sArray[2].ToString()); // 鏁版嵁绫诲瀷 1娣诲姞 3淇敼 + // string user = sArray[3].ToString(); //鐢ㄦ埛鍚� + // try + // { + // List<ClsSc_StationOutBillSub_Emp> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsSc_StationOutBillSub_Emp>>(msg2); + + // List<ClsSc_StationOutBillSub_Emp> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsSc_StationOutBillSub_Emp>>(msg3); + + // long HWorkEmpID = subList[0].HWorkEmpID; + // long HWorkSourceID = subList[0].HWorkSourceID; + // decimal HQty = subList[0].HQty; + // decimal HRate = subList[0].HRate; + // decimal HProcPrice = subList[0].HProcPrice; + // decimal HMoney = subList[0].HMoney; + // long HWorkProcID = mainList[0].HWorkProcID; + + // foreach (ClsSc_StationOutBillSub_Emp oSub in subList) + // { + // //ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillList where hmainid=" + HInterID + " and 鍗曟嵁鍙�='" + HBillNo + "'", "h_v_IF_ICMOBillList"); + + // if ((OperationType == 1 || OperationType == 2) && ds.Tables[0].Rows.Count == 0)//鏂板 + // { + // //涓昏〃 + // oCN.RunProc(@"Insert Into Sc_StationOutBillSub_Emp + // (HBillNo_bak ,HCloseMan ,HEntryCloseDate ,HCloseType ,HRemark ,HSourceInterID + // ,HSourceEntryID ,HSourceBillNo ,HSourceBillType ,HRelationQty ,HRelationMoney + // ,HWorkEmpID ,HWorkSourceID ,HQty ,HRate ,HProcPrice + // ,HMoney ,HWorkProcID) + // values('3710',1," + HInterID + ",'" + HBillNo + "','" + HDate + "'," + HPRDORGID + + // "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + HRemark + "','" + HMaker + "',getdate()" + + // ",'" + HSeOrderBillNo + "'," + HSeOrderInterID + "," + HSeOrderEntryID + "," + HEmpID + "," + HCusID + + // "," + HCenterID + ",0,0,0,0," + HBomID + ",'','') "); + // } + // } + + // 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; + // } + //} + #endregion } } \ No newline at end of file -- Gitblit v1.9.1