From c86d3069d9cc1047c8334acecb324b4f9013de35 Mon Sep 17 00:00:00 2001 From: ch <37327@LLOOCCY> Date: 星期四, 20 十月 2022 22:51:32 +0800 Subject: [PATCH] 修改了看板 生产流转卡同步JSON --- WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs | 449 ++++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 386 insertions(+), 63 deletions(-) diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs index d3874e3..1441cb9 100644 --- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs +++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs @@ -31,11 +31,25 @@ { var _value = oMain["oMain"].ToString(); string msg1 = _value.ToString(); + string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); try { //鍙嶅簭鍒楀寲 - msg1 = "[" + msg1.ToString() + "]"; - List<StationBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StationBill>>(msg1); + string msg2 = "[" + sArray[0].ToString() + "]"; + string user = sArray[1].ToString();//鐢ㄦ埛鍚� + + //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄� + if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Edit", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犵紪杈戞潈闄�!"; + objJsonResult.data = null; + return objJsonResult; + } + + + List<StationBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StationBill>>(msg2); long HMainInterID = 0; HMainInterID = list[0].HMainInterID; string eventType = list[0].eventType; @@ -142,14 +156,14 @@ objJsonResult.data = null; return objJsonResult; } - if (HGroupID == 0) - { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "鐢熶骇鐝粍娌℃湁閫夋嫨锛�"; - objJsonResult.data = null; - return objJsonResult; - } + //if (HGroupID == 0) + //{ + // objJsonResult.code = "0"; + // objJsonResult.count = 0; + // objJsonResult.Message = "鐢熶骇鐝粍娌℃湁閫夋嫨锛�"; + // objJsonResult.data = null; + // return objJsonResult; + //} if (HProcID == 0) { @@ -167,22 +181,22 @@ objJsonResult.data = null; return objJsonResult; } - if (HQCCheckID == 0) - { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "妫�楠屽憳娌℃湁閫夋嫨锛�"; - objJsonResult.data = null; - return objJsonResult; - } - if (HSourceID == 0) - { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "鐢熶骇璧勬簮娌℃湁閫夋嫨锛�"; - objJsonResult.data = null; - return objJsonResult; - } + //if (HQCCheckID == 0) + //{ + // objJsonResult.code = "0"; + // objJsonResult.count = 0; + // objJsonResult.Message = "妫�楠屽憳娌℃湁閫夋嫨锛�"; + // objJsonResult.data = null; + // return objJsonResult; + //} + //if (HSourceID == 0) + //{ + // objJsonResult.code = "0"; + // objJsonResult.count = 0; + // objJsonResult.Message = "鐢熶骇璧勬簮娌℃湁閫夋嫨锛�"; + // objJsonResult.data = null; + // return objJsonResult; + //} if (HCenterID == 0) { objJsonResult.code = "0"; @@ -199,14 +213,14 @@ objJsonResult.data = null; return objJsonResult; } - if (HWorkTimes <= 0) - { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "宸ユ椂蹇呴』澶т簬0锛�"; - objJsonResult.data = null; - return objJsonResult; - } + //if (HWorkTimes <= 0) + //{ + // objJsonResult.code = "0"; + // objJsonResult.count = 0; + // objJsonResult.Message = "宸ユ椂蹇呴』澶т簬0锛�"; + // objJsonResult.data = null; + // return objJsonResult; + //} //if (HEmpID2 == 0 ) //{ // objJsonResult.code = "0"; @@ -386,6 +400,290 @@ } } + + + + + + + /// <summary> + /// 鏂板鍗曟嵁-鎵归噺鍑虹珯鍗曚繚瀛樻寜閽� + ///鍙傛暟锛歴tring sql銆� + ///杩斿洖鍊硷細object銆� + /// </summary> + [Route("Cj_StationOutBill/AddBill_Mul")] + [HttpPost] + public object AddBill_Mul([FromBody] JObject oMain) + { + + + string UserName = ""; + + + try + { + var _value = oMain["oMain"].ToString(); + string msg1 = _value.ToString(); + + string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); + string msg2 = sArray[0].ToString(); + string msg3 = sArray[1].ToString(); + string msg4 = sArray[2].ToString(); + + List<Model.ClsSc_StationOutBillMain> list = new List<Model.ClsSc_StationOutBillMain>(); + + msg1 = msg1.Replace("\\", ""); + msg1 = msg1.Replace("\n", ""); //\n + ListModels oListModels = new ListModels(); + list = oListModels.getObjectByJson_Sc_StationOutBillMain(msg2); + int i = 0; + int j = 0; + foreach (Model.ClsSc_StationOutBillMain oItemSub in list) + { + DAL.ClsSc_StationOutBill oBill = new DAL.ClsSc_StationOutBill(); + j++; + oBill.omodel.HInterID = list[i].HInterID; + oBill.omodel.HBillNo = msg3 + "- " + j; + oBill.omodel.HBillStatus = 0; + oBill.omodel.HMouldNum = list[i].HMouldNum; + oBill.omodel.HYear = 2022; + oBill.omodel.HPeriod = 1; + oBill.omodel.HRemark = list[i].HRemark; + oBill.omodel.HSourceName = list[i].HSourceName; + oBill.omodel.HPieceQty = list[i].HPieceQty; + oBill.omodel.HWasterQty = list[i].HWasterQty; + oBill.omodel.HPlanPieceQty = list[i].HPlanPieceQty; + oBill.omodel.HBadPNL = list[i].HBadPNL; + oBill.omodel.HICMOInterID = list[i].HICMOInterID; + oBill.omodel.HICMOBillNo = list[i].HICMOBillNo; + oBill.omodel.HProcExchInterID = list[i].HProcExchInterID; + oBill.omodel.HProcExchEntryID = list[i].HProcExchEntryID; + oBill.omodel.HProcExchBillNo = list[i].HProcExchBillNo; + oBill.omodel.HMaterID = list[i].HMaterID; + oBill.omodel.HProcID = list[i].HProcID; + oBill.omodel.HICMOQty = list[i].HICMOQty; + oBill.omodel.HPlanQty = list[i].HPlanQty; + oBill.omodel.HStationOutTime = list[i].HStationOutTime; + oBill.omodel.HSourceID = list[i].HSourceID; + oBill.omodel.HPayProcID = list[i].HPayProcID; + oBill.omodel.HGroupID = list[i].HGroupID; + oBill.omodel.HDeptID = list[i].HDeptID; + oBill.omodel.HEmpID = list[i].HEmpID; + oBill.omodel.HBarCode = list[i].HBarCode; + oBill.omodel.HAddr = list[i].HAddr; + //oBill.omodel.HBarCodeMaker = list[i].HBarCodeMaker; + oBill.omodel.HBarCodeMaker = msg4; + oBill.omodel.HSourceID2 = list[i].HSourceID2; + oBill.omodel.HSourceID3 = list[i].HSourceID3; + oBill.omodel.HSourceID4 = list[i].HSourceID4; + oBill.omodel.HSourceID5 = list[i].HSourceID5; + oBill.omodel.HSupID = list[i].HSupID; + oBill.omodel.HQty = list[i].HQty; + oBill.omodel.HPrice = list[i].HPrice; + oBill.omodel.HMoney = list[i].HMoney; + oBill.omodel.HBadCount = list[i].HBadCount; + oBill.omodel.HCenterID = list[i].HCenterID; + oBill.omodel.HProcNo = list[i].HProcNo; + oBill.omodel.HOrderProcNO = list[i].HOrderProcNO; + oBill.omodel.HSourceNameList = list[i].HSourceNameList; + oBill.omodel.HMainSourceInterID = list[i].HMainSourceInterID; + oBill.omodel.HMainSourceBillNo = list[i].HMainSourceBillNo; + oBill.omodel.HMainSourceBillType = list[i].HMainSourceBillType; + oBill.omodel.HLastSubProc = true; + oBill.omodel.HEmpID2 = list[i].HEmpID2; + oBill.omodel.HEmpID3 = list[i].HEmpID3; + oBill.omodel.HEmpID4 = list[i].HEmpID4; + oBill.omodel.HEmpID5 = list[i].HEmpID5; + oBill.omodel.HDSQty = list[i].HDSQty; + oBill.omodel.HChongQty = list[i].HChongQty; + oBill.omodel.HPriceRate = list[i].HPriceRate; + oBill.omodel.HWorkTimes = list[i].HWorkTimes; + oBill.omodel.HQCCheckID = list[i].HQCCheckID; + oBill.omodel.HMaker = msg4; + + //string HBillSubType = "3791"; + //long HInterID = list[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D + //string HBillNo = msg3 + "- " + i;//閫掑叆type寰楀埌鐨勫崟鎹彿 + //int HBillStatus = 0; + //string HMaker = list[0].HMaker;//鍒跺崟浜� + //string HMouldNum = list[0].HMouldNum;//妯$┐鍙� + //int HYear = 2021; + //double HPeriod = 1; + //string HRemark = list[0].HRemark;//澶囨敞 + //string HSourceName = list[0].HSourceName;//鐢熶骇璧勬簮鍚嶇О + //double HPieceQty = list[0].HPieceQty;//杩涚珯PCS鏁� + //double HWasterQty = list[0].HWasterQty;//鎶ュ簾鏁伴噺 + //double HPlanPieceQty = list[0].HPlanPieceQty;//杩涚珯PNL鏁� + //double HBadPNL = list[0].HBadPNL;//鎶ュ簾PNL鏁� + //long HICMOInterID = list[0].HICMOInterID;//浠诲姟鍗旾D + //string HICMOBillNo = list[0].HICMOBillNo;//浠诲姟鍗� + //int HProcPlanInterID = 0; + //int HProcPlanEntryID = 0; + //string HProcPlanBillNo = ""; + //long HProcExchInterID = list[0].HProcExchInterID; + //long HProcExchEntryID = list[0].HProcExchEntryID; + //string HProcExchBillNo = list[0].HProcExchBillNo;//娴佽浆鍗� + //long HMaterID = list[0].HMaterID;//浜у搧ID + //long HProcID = list[0].HProcID;//褰撳墠宸ュ簭ID + //double HICMOQty = list[0].HICMOQty;//浠诲姟鍗曟暟閲� + //double HPlanQty = list[0].HPlanQty;//绉讳氦PNL鏁� + //DateTime HStationOutTime = list[0].HStationOutTime;//姹囨姤鏃堕棿 + //long HSourceID = list[0].HSourceID;//鐢熶骇璧勬簮ID + //long HPayProcID = list[0].HPayProcID;//鏍哥畻宸ュ簭ID + //long HGroupID = list[0].HGroupID;//鐝粍ID + //long HDeptID = 0; + //long HEmpID = list[0].HEmpID;//鎿嶄綔鍛業D + //string HBarCode = list[0].HBarCode;//鏉″舰鐮� + //string HAddr = ""; + //string HBarCodeMaker = ""; + //long HSourceID2 = list[0].HSourceID2;//鐢熶骇璧勬簮2ID + //long HSourceID3 = list[0].HSourceID3;//鐢熶骇璧勬簮3ID + //long HSourceID4 = list[0].HSourceID4;//鐢熶骇璧勬簮4ID + //long HSourceID5 = list[0].HSourceID5;//鐢熶骇璧勬簮5ID + //long HSupID = 0; + //double HQty = list[0].HQty;//鍚堟牸鏁伴噺 + //double HPrice = 0; + //double HMoney = 0; + //double HBadCount = list[0].HBadCount;//涓嶈壇鏁伴噺 + //long HCenterID = list[0].HCenterID;//宸ヤ綔涓績ID + //long HProcNo = list[0].HProcNo;//娴佹按鍙� + //string HOrderProcNO = list[0].HOrderProcNO;//璁㈠崟璺熻釜鍙� + //string HSourceNameList = list[0].HSourceNameList;//璁惧娓呭崟 + //long HMainSourceInterID = list[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D + //string HMainSourceBillNo = list[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿 + //string HMainSourceBillType = "3790"; + //bool HLastSubProc = list[0].HLastSubProc;//杞笅宸ュ簭 + //long HEmpID2 = list[0].HEmpID2;//鎿嶄綔鍛�2ID + //long HEmpID3 = list[0].HEmpID3;//鎿嶄綔鍛�3ID + //long HEmpID4 = list[0].HEmpID4;//鎿嶄綔鍛�4ID + //long HEmpID5 = list[0].HEmpID5;//鎿嶄綔鍛�5ID + //double HDSQty = list[0].HDSQty;//鎶樺集鍒�鏁� + //double HChongQty = list[0].HChongQty;//NCT鍐叉鏁� + //double HPriceRate = list[0].HPriceRate;//绯绘暟 + //double HWorkTimes = list[0].HWorkTimes;//宸ユ椂 + //long HQCCheckID = list[0].HQCCheckID;//妫�楠屽憳ID + + //淇濆瓨 + //淇濆瓨瀹屾瘯鍚庡鐞� + bool bResult; + // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo); + bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo); + oCN.RunProc($"update Sc_StationOutBillMain set HMaker='{msg4}' where HInterID={oBill.omodel.HInterID}"); + i++; + //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; + //} + } + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "淇濆瓨鎴愬姛锛�"; + objJsonResult.data = 1; + return objJsonResult; + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString(); + objJsonResult.data = 1; + return objJsonResult; + } + } + + //閫掑叆鐗╂枡淇℃伅 杩斿洖鏈畬鍏ㄦ眹鎶ョ殑娴佽浆鍗� + [Route("LEMS/Sc_StationOutBill_Mul_RYQ")] + [HttpGet] + public object Sc_StationOutBill_Mul_RYQ(String HMaterName, Int64 HOrgID) + { + try + { + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + DataSet ds = oCN.RunProcReturn("exec h_p_CJGXPLHB_Query '" + HMaterName + "'," + HOrgID + "", "h_p_CJGXPLHB_Query"); + + if (ds == null || ds.Tables[0].Rows.Count <= 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�"; + objJsonResult.data = null; + return objJsonResult; + //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning); + } + else + { + 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 = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + + //閫変腑缃戞牸閲岄潰鐨勬煇涓�琛屾祦杞崱 杩斿洖璇ユ祦杞崱鐨勮繘鍑虹珯鎯呭喌 + [Route("LEMS/Mul_RYQ_DisPlayBillList")] + [HttpGet] + public object Mul_RYQ_DisPlayBillList(String HBillNo,String HProcName) + { + try + { + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + DataSet ds = oCN.RunProcReturn("exec h_P_Mul_RYQ_DisPlayBillList '" + HBillNo + "','" + HProcName + "'", "h_P_Mul_RYQ_DisPlayBillList"); + + if (ds == null || ds.Tables[0].Rows.Count <= 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�"; + objJsonResult.data = null; + return objJsonResult; + //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning); + } + else + { + 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 = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + + + private bool AllowbillNo(string HBillNo) { ds = oCN.RunProcReturn("select HBillNo from Sc_StationOutBillMain where HBillNo = '" + HBillNo + "'", "Sc_StationOutBillMain"); @@ -400,36 +698,47 @@ #region 杩斿洖宸ュ簭鍑虹珯姹囨姤鍗曞垪琛� [Route("Cj_StationOutBill/get_Display")] [HttpGet] - public object get_Display(string sWhere) + public object get_Display(string sWhere,string user) { try { + //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄� + if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Query", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳煡璇㈡潈闄�!"; + objJsonResult.data = null; + return objJsonResult; + } + if (sWhere == null || sWhere.Equals("")) { - ds = oCN.RunProcReturn("select * from h_v_MES_StationOutBillList " + sWhere + " order by 鍑虹珯鏃堕棿 desc", "h_v_MES_StationOutBillList"); + ds = oCN.RunProcReturn("select * from h_v_MES_StationOutBillList order by hmainid desc", "h_v_MES_StationOutBillList"); } else { string sql1 = "select * from h_v_MES_StationOutBillList where 1 = 1 "; - string sql = sql1 + sWhere; + string sql = sql1 + sWhere+ " order by hmainid desc"; ds = oCN.RunProcReturn(sql, "h_v_MES_StationOutBillList"); } - 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; - } + + //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) { @@ -682,7 +991,7 @@ { //缂栬緫鏉冮檺 - if (!DBUtility.ClsPub.Security_Log("MES_StationOutBill_Delete", 1, false, HDeleteMan)) + if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Drop", 1, false, HDeleteMan)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -822,16 +1131,17 @@ { try { - //string ModRightNameCheck = "MES_StationOutBill_Check"; + string ModRightNameCheck = "Cj_StationOutBill_Check"; ////瀹℃牳鏉冮檺 - //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName)) - //{ - // objJsonResult.code = "0"; - // objJsonResult.count = 0; - // objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�"; - // objJsonResult.data = null; - // return objJsonResult; - //} + if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�"; + objJsonResult.data = null; + return objJsonResult; + } + if (HInterID == 0) { objJsonResult.code = "0"; @@ -939,6 +1249,17 @@ { try { + string ModRightNameCheck = "Cj_StationOutBill_Check"; + ////瀹℃牳鏉冮檺 + if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍙嶅鏍稿け璐ワ紒鏃犳潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } + if (HInterID == 0) { objJsonResult.code = "0"; @@ -1112,5 +1433,7 @@ } #endregion + + } } \ No newline at end of file -- Gitblit v1.9.1