From be368ef45174e5e47c6896dea8abc87e3bb6293a Mon Sep 17 00:00:00 2001 From: cwjbxqmz <1134865194@qq.com> Date: 星期三, 27 九月 2023 08:24:54 +0800 Subject: [PATCH] 增加 审核,反审核,禁用,反禁用,按钮设置 等按钮;并修改视图,将 审核人,审核日期,禁用人,禁用日期 4列 显示出来; --- WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs | 93 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 93 insertions(+), 0 deletions(-) diff --git a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs index 15a850e..98940fd 100644 --- a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs +++ b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs @@ -1169,6 +1169,99 @@ } #endregion + #region 鎸囧紩鍗″彉鏇村崟 鏂板淇濆瓨 + [Route("MES_Sc_ProcessExchangeBillMain_Note_PDA/ProcessExchangeBillMain_NoteAddBill")] + [HttpPost] + public object ProcessExchangeBillMain_NoteAddBill([FromBody] JObject oMain) + { + var _value = oMain["oMain"].ToString(); + string msg1 = _value.ToString(); + string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); + try + { + //鍙嶅簭鍒楀寲 + string msg2 = "[" + sArray[0].ToString() + "]"; + string user = sArray[1].ToString();//鐢ㄦ埛鍚� + string OperationType = sArray[2].ToString();//绫诲瀷 + + //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄� + if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Change", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犲彉鏇存潈闄�!"; + objJsonResult.data = null; + return objJsonResult; + } + + List<Model.Sc_ProcessExchangeBillMain_Note> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.Sc_ProcessExchangeBillMain_Note>>(msg2); + + long HSouceID_Original = list[0].HSouceID_Original; + long HSouceID_Now = list[0].HSouceID_Now; + long HOrgID = list[0].HOrgID;//缁勭粐ID + String HICMOBillNo = list[0].HICMOBillNo;//浠诲姟鍗� + long HICMOInterID = list[0].HICMOInterID;//浠诲姟鍗旾D + long HProcExchInterID = list[0].HProcExchInterID; + long HProcExchEntryID = list[0].HProcExchEntryID; + String HProcExchBillNo = list[0].HProcExchBillNo; + String HBillNo_Note = list[0].HBillNo_Note;//鎸囧紩鍗� + long HMaterID = list[0].HMaterID;//浜у搧ID + long HUnitID = list[0].HUnitID;//璁¢噺鍗曚綅 + long HProcID = list[0].HProcID;//宸ュ簭ID + string HMaker = user;//鍒跺崟浜� + string HMakeDate = list[0].HMakeDate;//鍒跺崟鏃ユ湡 + + //鍗曟嵁瀹屾暣鎬у垽鏂� + if (HProcExchBillNo == "") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娴佽浆鍗℃病鏈夐�夋嫨锛佽鎵弿鏉″舰鐮佹垨杈撳叆鏉″舰鐮佸悗鍥炶溅"; + objJsonResult.data = null; + return objJsonResult; + } + + oCN.BeginTran(); + if (OperationType == "1") + { + oCN.RunProc("Insert Into Sc_ProcessExchangeBillMain_Note " + + "(HBillNo_Note,HSouceID_Original,HSouceID_Now,HOrgID,HICMOInterID,HICMOBillNo,HProcExchBillNo,HProcExchInterID" + + ",HProcExchEntryID,HMaterID,HUnitID,HProcID,HMaker,HMakeDate)" + + " values('" + HBillNo_Note + "','" + HSouceID_Original + "'," + HSouceID_Now + ",'" + HOrgID + "'," + HICMOInterID + ",'"+ HICMOBillNo + "','" + HProcExchBillNo + "' ," + HProcExchInterID + + "," + HProcExchEntryID + ",'" + HMaterID + "','" + HUnitID + "'," + HProcID + ",'" + HMaker + "','" + HMakeDate + "')" ); + + oCN.RunProc("update Sc_ProcessExchangeBillSub set HSourceID=" + HSouceID_Now + " where HInterID=" + HProcExchInterID + " and HEntryID=" + HProcExchEntryID); + } + else + { + oCN.RollBack(); + objJsonResult.code = "0"; + objJsonResult.count = 0; + 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 = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + #endregion + #region 鍑虹珯姹囨姤鍗曟樉绀鸿〃浣撴槑缁� [Route("Cj_StationEntrustInBill/DisBillEntryList")] -- Gitblit v1.9.1