Model/生产管理/ClsSc_ICMOBillSub.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Model/生产管理/设备管理/ClsSc_ICMOBillMain.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/BLL/Xt_UserController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/BLL/Xt_UserGroupController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormBillController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/生产管理/生产任务单/Sc_ICMOBillController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Model/Éú²ú¹ÜÀí/ClsSc_ICMOBillSub.cs
@@ -8,5 +8,13 @@ { //============ //public string HRemark; public Int64 HMaterID; public Int64 HSourceID; public Int64 HDeptID; public Int64 HUnitID; public double? HQty; public int HSTATUS; public DateTime? HPlanBeginDate= DateTime.Parse(DateTime.Now.ToString("F")); public DateTime? HPlanEndDate; } } Model/Éú²ú¹ÜÀí/É豸¹ÜÀí/ClsSc_ICMOBillMain.cs
@@ -30,7 +30,7 @@ public DateTime HEndDate; // --æè¿å®å·¥æ¥æ public int HLevNum; // --ä¼å 级 public double HReadyQty; // --é½å¥æ°é public double HPlanQty; //计åç产æ°é public double? HPlanQty; //计åç产æ°é public string HRemark; public double HRelationQty; WebAPI/Controllers/BLL/Xt_UserController.cs
@@ -154,6 +154,7 @@ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); string msg2 = sArray[0].ToString(); string msg3 = sArray[1].ToString(); string msg4 = sArray[2].ToString(); ListModels oListModels = new ListModels(); try @@ -162,6 +163,8 @@ msg2 = msg2.Replace("\\", ""); msg2 = msg2.Replace("\n", ""); //\n lsmain = oListModels.getObjectByJson_Gy_Gy_User(msg2); var num = msg4.Split(','); //ä¿å if (msg3=="Add") //æ°å¢ @@ -198,6 +201,28 @@ "," + lsmain[0].HWhID.ToString() + ",'" + lsmain[0].HWHName.ToString() + "'," + lsmain[0].HSupID.ToString() + ",'" + lsmain[0].HSupName.ToString() + "'" + "," + lsmain[0].HSCWHID.ToString() + ",'" + lsmain[0].HSCWHName.ToString() + "'" + ",'" + lsmain[0].HCloudUserName.ToString() + "','" + lsmain[0].HCloudUserPsd.ToString() + "',"+ lsmain[0].HOrgID.ToString() + ")"); //æ°å¢åæ¥è¯¢ ç¡®ä¿æ°æ®æ·»å æå ds = oCN.RunProcReturn("Select * from Gy_Czygl where Czybm='" + lsmain[0].Czybm.ToString() + "'", "Gy_Czygl"); if (ds == null || ds.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "è§è²æ°å¢å¤±è´¥ï¼"; objJsonResult.data = null; return objJsonResult; } oCN.RunProc("delete from System_UserGroupInfo where UserId='" + lsmain[0].Czybm.ToString() + "'"); if (num[0] != "-1") { for (int i = 0; i < num.Length; i++) { oCN.RunProc("insert into System_UserGroupInfo (GroupId,UserId) values (" + num[i] + ",'" + lsmain[0].Czybm.ToString() + "')"); } } } else //ä¿®æ¹ { @@ -254,6 +279,16 @@ " where Czybm='" + lsmain[0].Czybm.ToString() + "'"); } oCN.RunProc("delete from System_UserGroupInfo where UserId='" + lsmain[0].Czybm.ToString()+"'"); if (num[0] != "-1") { for (int i = 0; i < num.Length; i++) { oCN.RunProc("insert into System_UserGroupInfo (GroupId,UserId) values (" + num[i] + ",'" + lsmain[0].Czybm.ToString() + "')"); } } } objJsonResult.code = "1"; WebAPI/Controllers/BLL/Xt_UserGroupController.cs
@@ -17,7 +17,7 @@ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); DataSet ds; #region è§è²å表 /// <summary> /// è¿åç¨æ·è§è²å表 ///åæ°ï¼string sqlã @@ -29,33 +29,13 @@ { try { if (sWhere == null || sWhere.Equals("")) { ds = oCN.RunProcReturn("select * from h_v_System_UserGroup " + sWhere, "h_v_System_UserGroup"); } else { string sql1 = "select * from h_v_System_UserGroup where 1 = 1 "; string sql = sql1 + sWhere; ds = oCN.RunProcReturn(sql, "h_v_System_UserGroup"); } ds = oCN.RunProcReturn("select * from h_v_System_UserGroup where 1 = 1 " + sWhere, "h_v_System_UserGroup"); //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) { @@ -66,9 +46,182 @@ return objJsonResult; } } #endregion #region è§è²ç»å®ç¨æ·æ°æ® [Route("Xt_UserGroup/UserGroupInfoList")] [HttpGet] public object UserGroupInfoList(string sWhere) { try { string sql = "select * from System_UserGroupInfo where 1=1 " + sWhere; ds = oCN.RunProcReturn(sql, "System_UserGroupInfo"); 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 è§è²å表 æ·»å /ä¿®æ¹ public class Xt_UserGroup { public int HGroupID; public string GroupName { get; set; } public string HLev { get; set; } public string Explain { get; set; } } [Route("Xt_UserGroup/UserGroupInfoEdit")] [HttpPost] public object UserGroupInfoEdit([FromBody] JObject sMainSub) { var _value = sMainSub["sMainSub"].ToString(); string msg1 = _value.ToString(); oCN.BeginTran(); //ä¿å主表 objJsonResult = AddBillMain(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; } public json AddBillMain(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 { Xt_UserGroup omdelMian = Newtonsoft.Json.JsonConvert.DeserializeObject<Xt_UserGroup>(msg2); var num = msg3.Split(','); if (OperationType == 1)//æ°å¢ { //主表 oCN.RunProc("insert into System_UserGroup (GroupName,HLev,Explain)values" + $"('{omdelMian.GroupName}','{omdelMian.HLev}','{omdelMian.Explain}')"); //æ°å¢åæ¥è¯¢ ç¡®ä¿æ°æ®æ·»å æå ds = oCN.RunProcReturn("Select * from System_UserGroup where GroupName='" + omdelMian.GroupName + "'", "System_UserGroup"); if (ds == null || ds.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "ç¨æ·æ°å¢å¤±è´¥ï¼"; objJsonResult.data = null; return objJsonResult; } var HGroupID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["GroupID"]); oCN.RunProc("delete from System_UserGroupInfo where GroupId=" + HGroupID.ToString()); if (num[0] != "-1") { for (int i = 0; i < num.Length; i++) { oCN.RunProc("insert into System_UserGroupInfo (GroupId,UserId) values (" + HGroupID.ToString() + ",'" + num[i] + "')"); } } } else if (OperationType == 3) { oCN.RunProc("update System_UserGroup set GroupName='" + omdelMian.GroupName + "',HLev='" + omdelMian.HLev + "',Explain='" + omdelMian.Explain + "'" + " where GroupId=" + omdelMian.HGroupID); oCN.RunProc("delete from System_UserGroupInfo where GroupId=" + omdelMian.HGroupID); for (int i = 0; i < num.Length; i++) { oCN.RunProc("insert into System_UserGroupInfo (GroupId,UserId) values (" + omdelMian.HGroupID + ",'" + num[i] + "')"); } } 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 #region è§è²å表 å é¤ [Route("Xt_UserGroup/DelXt_UserGroupList")] [HttpGet] public object DelXt_UserGroupList(string HInterID,string User) { try { ds = oCN.RunProcReturn("select * from h_v_System_UserGroup where 1=1 and HGroupID=" + HInterID, "h_v_System_UserGroup"); if (ds.Tables[0].Rows.Count > 0) { oCN.BeginTran();//å¼å¯äºå¡ oCN.RunProc($"delete from h_v_System_UserGroup where HGroupID={HInterID}"); oCN.Commit();//ç»æäºå¡ objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "å 餿åï¼"; objJsonResult.data = null; return objJsonResult; } objJsonResult.code = "0"; objJsonResult.count = 0; 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; } } #endregion // } } WebAPI/Controllers/SCGL/Èռƻ®¹ÜÀí/JIT_DayPlanPlatFormBillController.cs
@@ -1222,8 +1222,7 @@ try { DataSet dt = new DataSet(); oCN.RunProc("exec h_p_ICMOBillList_PrimarySubTable"); ds = oCN.RunProcReturn($"select * from ##ICMOBillList where æºå主å ç in({hmainid}) and æºååå ç in({HEntryID})", "##ICMOBillList"); ds = oCN.RunProcReturn($"exec h_p_ICMOBillList_PrimarySubTable '{hmainid}','{HEntryID}'", "h_p_ICMOBillList_PrimarySubTable"); for (int i = 0; i < ds.Tables[0].Rows.Count; i++) { WebAPI/Controllers/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillController.cs
@@ -1,4 +1,6 @@ using Newtonsoft.Json.Linq; using Model; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Pub_Class; using System; using System.Collections; @@ -19,6 +21,208 @@ private json objJsonResult = new json(); SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); DataSet ds; #region ç产任å¡å ä¿å/ç¼è¾åè½ [Route("Sc_ICMOBill/ICMOBillEdit")] [HttpPost] public object ICMOBillEdit([FromBody] JObject sMainSub) { try { var _value = sMainSub["sMainSub"].ToString(); string msg1 = _value.ToString(); oCN.BeginTran(); //ä¿å主表 objJsonResult = AddBillMain(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 AddBillMain(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 { if (!DBUtility.ClsPub.Security_Log("Sc_ICMOBill_Edit", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ ä¿åæéï¼"; objJsonResult.data = null; return objJsonResult; } msg2 = "[" + msg2.ToString() + "]"; List<ClsSc_ICMOBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsSc_ICMOBillMain>>(msg2); long HInterID = mainList[0].HInterID;//éå ¥typeå¾å°çåæ®ID string HBillNo = mainList[0].HBillNo;//éå ¥typeå¾å°çåæ®å· long HPRDORGID = mainList[0].HPRDORGID;//ç»ç» DateTime HDate = mainList[0].HDate;//æ¥æ string HRemark = mainList[0].HRemark;//夿³¨ string HSeOrderBillNo = mainList[0].HSeOrderBillNo;//éå®è®¢åå· long HSeOrderInterID = mainList[0].HSeOrderInterID;//éå®è®¢ä¸»id long HSeOrderEntryID = mainList[0].HSeOrderEntryID;//éå®è®¢åid long HEmpID = mainList[0].HEmpID;//ä¸å¡å long HCusID = mainList[0].HCusID;//å®¢æ· long HCenterID = mainList[0].HCenterID;//å·¥ä½ä¸å¿ double? HPlanQty = mainList[0].HPlanQty==null?0: mainList[0].HPlanQty;//è®¡åæ°é string HMaker = user;//å¶å人 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_ICMOBillMain (HBillType,HInterID,HBillNo,HDate,HPRDORGID ,HYear,HPeriod,HRemark,HMaker,HMakeDate ,HSeOrderBillNo,HSeOrderInterID,HSeOrderEntryID,HEmpID,HCusID ,HCenterID,HPlanQty,HDeptID,HMaterID,HUnitID,HBomID,HPlanBeginDate,HPlanEndDate) values('3710'," + HInterID + ",'" + HBillNo + "','" + HDate + "',"+ HPRDORGID + "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + HRemark + "','" + HMaker + "',getdate()"+ ",'"+ HSeOrderBillNo+"',"+ HSeOrderInterID + "," + HSeOrderEntryID + "," + HEmpID + "," + HCusID+ ","+ HCenterID+ "," + HPlanQty+ ",0,0,0,0,'','') "); } else if (OperationType == 3 || ds.Tables[0].Rows.Count != 0) { //ä¿®æ¹ oCN.RunProc("update Sc_ICMOBillMain set " + "HRemark='" + HRemark + "', HChecker='" + HMaker + "', HCheckDate=getdate()" + ", HSeOrderBillNo='" + HSeOrderBillNo + "', HSeOrderInterID=" + HSeOrderInterID + ", HSeOrderEntryID=" + HSeOrderEntryID + ", HEmpID=" + HEmpID + ", HCusID=" + HCusID + "" + ", HCenterID=" + HCenterID + ", HPlanQty=" + HPlanQty + " where HInterID="+ HInterID); //å é¤å表 oCN.RunProc("delete from Sc_ICMOBillSub where HInterID='" + HInterID + "'"); } //ä¿åå表 objJsonResult = AddBillSub(msg3, HInterID, OperationType); if (objJsonResult.code == "0") { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = objJsonResult.Message; objJsonResult.data = null; return objJsonResult; } 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; } } public json AddBillSub(string msg3, long HInterID, int OperationType) { List<ClsSc_ICMOBillSub> DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsSc_ICMOBillSub>>(msg3); int i = 0; foreach (ClsSc_ICMOBillSub oSub in DetailColl) { i++; if (oSub.HQty <= 0||oSub.HQty==null) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "第" + i + "è¡ï¼æ°éä¸è½ä¸º0æè å°äº0"; objJsonResult.data = null; return objJsonResult; } if (oSub.HMaterID == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "第" + i + "è¡ï¼ç©æä¸è½ä¸ºç©º"; objJsonResult.data = null; return objJsonResult; } //if (oSub.HSourceID == 0) //{ // objJsonResult.code = "0"; // objJsonResult.count = 0; // objJsonResult.Message = "第" + i + "è¡ï¼çäº§èµæºä¸è½ä¸ºç©º"; // objJsonResult.data = null; // return objJsonResult; //} if (oSub.HDeptID == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "第" + i + "è¡,ç产车é´ä¸è½ä¸ºç©º"; objJsonResult.data = null; return objJsonResult; } if (oSub.HUnitID == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "第" + i + "è¡ï¼è®¡éåä½ä¸è½ä¸ºç©º"; objJsonResult.data = null; return objJsonResult; } oCN.RunProc($@"Insert into Sc_ICMOBillSub (HInterID,HENTRYID,HQty ,HPlanBeginDate,HPlanEndDate ,HBeginDate,HEndDate ,HMaterID,HUnitID,HRemark,HSourceID,HDeptID,HSTATUS ,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney) values({HInterID},{i},{(oSub.HQty==null?0:oSub.HQty)} ,'{(oSub.HPlanBeginDate == null ? DateTime.Now.ToString("yyyy-MM-dd") : oSub.HPlanBeginDate.ToString())}','{(oSub.HPlanEndDate == null ? DateTime.Now.AddDays(1).ToString("yyyy-MM-dd") : oSub.HPlanEndDate.ToString())}' ,'{(oSub.HPlanBeginDate == null ? DateTime.Now.ToString("yyyy-MM-dd") : oSub.HPlanBeginDate.ToString())}','{(oSub.HPlanEndDate == null ? DateTime.Now.AddDays(1).ToString("yyyy-MM-dd") : oSub.HPlanEndDate.ToString())}' ,{oSub.HMaterID},{oSub.HUnitID},'{oSub.HRemark}',{oSub.HSourceID},{oSub.HDeptID},{oSub.HSTATUS} ,0,0,'','',0,0)"); } objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = null; objJsonResult.data = null; return objJsonResult; } #endregion #region ç产任å¡åå é¤åè½ [Route("Sc_ICMOBill/DeltetSc_ICMOReportBill")] @@ -56,6 +260,7 @@ return objJsonResult; ; } oCN.RunProc("delete from Sc_ICMOBillMain where HInterID=" + HInterID); oCN.RunProc("delete from Sc_ICMOBillSub where HInterID=" + HInterID); oCN.Commit();//æäº¤äºå¡ objJsonResult.code = "0"; objJsonResult.count = 1;