WebAPI/Controllers/BaseSet/Gy_GroupController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/BaseSet/Gy_ProcessController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/BaseSet/Gy_StockPlaceController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Models/基础资料/Gy_Process.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/WebAPI.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/WebAPI.csproj.user | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
WebAPI/Controllers/BaseSet/Gy_GroupController.cs
@@ -20,7 +20,7 @@ /// <summary> /// è¿åå·¥ä½ä¸å¿å表 /// è¿åçç»å表 ///åæ°ï¼string sqlã ///è¿åå¼ï¼objectã /// </summary> @@ -79,7 +79,7 @@ try { ds = oCN.RunProcReturn("select * from h_v_GroupList where HitemID=" + HInterID, "h_v_GroupList"); ds = oCN.RunProcReturn("select * from h_v_GroupListDetail where HitemID=" + HInterID, "h_v_GroupListDetail"); if (ds == null || ds.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; @@ -220,22 +220,18 @@ { try { DAL.ClsGy_Group_Ctl oDept = new DAL.ClsGy_Group_Ctl(); 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(); string msg5 = sArray[3].ToString(); //ååºåå msg2 = "[" + msg2.ToString() + "]"; List<Gy_Group> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Group>>(msg2); long HItemID = int.Parse(msg3); msg1 = "[" + msg1.ToString() + "]"; DAL.ClsGy_Group_Ctl oDept = new DAL.ClsGy_Group_Ctl(); List<Gy_Group> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Group>>(msg1); long HItemID = list[0].HItemID; string HNumber = list[0].HNumber; string HName = list[0].HName; string HShortNumber = list[0].HNumber; long HParentID = list[0].HParentID.ToString() == "" ? 0 : list[0].HParentID; long HParentID = list[0].HParentID; string HHelpCode = list[0].HHelpCode; string HRemark = list[0].HRemark; string HStopflag = list[0].HStopflag; @@ -246,30 +242,30 @@ var HProcID = list[0].HProcID; //夿æé if (!ClsPub.Security_Log(msg5, 1, true, msg4)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ²¡ææ¾å°è¯¥åè½æ¨¡åï¼"; objJsonResult.data = null; return objJsonResult; } if (!DBUtility.ClsPub.AllowNumber(HNumber)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "代ç ä¸ä¸è½åºç°è¿ç»â.âå¹¶ä¸é¦ä½æ«ä½ä¸è½ä¸ºâ.âï¼"; objJsonResult.data = null; return objJsonResult; } if (oDept.HavSameNumber(HItemID, HNumber)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "代ç éå¤ï¼"; objJsonResult.data = null; return objJsonResult; } //if (!ClsPub.Security_Log(msg5, 1, true, msg4)) //{ // objJsonResult.code = "0"; // objJsonResult.count = 0; // objJsonResult.Message = "æ²¡ææ¾å°è¯¥åè½æ¨¡åï¼"; // objJsonResult.data = null; // return objJsonResult; //} //if (!DBUtility.ClsPub.AllowNumber(HNumber)) //{ // objJsonResult.code = "0"; // objJsonResult.count = 0; // objJsonResult.Message = "代ç ä¸ä¸è½åºç°è¿ç»â.âå¹¶ä¸é¦ä½æ«ä½ä¸è½ä¸ºâ.âï¼"; // objJsonResult.data = null; // return objJsonResult; //} //if (oDept.HavSameNumber(HItemID, HNumber)) //{ // objJsonResult.code = "0"; // objJsonResult.count = 0; // objJsonResult.Message = "代ç éå¤ï¼"; // objJsonResult.data = null; // return objJsonResult; //} //è¥MAINDIéå¤åéæ°è·å oCN.BeginTran(); //主表 @@ -288,7 +284,7 @@ //ä¿®æ¹å项ç®ä»£ç //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Group,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo); //å°ä¸çº§ ä¸ºéæ«çº§ oCN.RunProc("Update Gy_Group set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo); //oCN.RunProc("Update Gy_Group set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo); // oCN.Commit(); objJsonResult.code = "1"; WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
@@ -17,7 +17,143 @@ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); DataSet ds; /// <summary> /// ä¿®æ¹åæ®-ä¿åæé® ///åæ°ï¼string sqlã ///è¿åå¼ï¼objectã /// </summary> [Route("Gy_Process/EditBill")] [HttpPost] //å代ç ç¨äº æ¿æ¢åé¡¹ç® public object EditBill([FromBody] JObject oMain) { try { var _value = oMain["oMain"].ToString(); string msg1 = _value.ToString(); //ååºåå msg1 = "[" + msg1.ToString() + "]"; DAL.ClsGy_Process_Ctl oDept = new DAL.ClsGy_Process_Ctl(); List<Gy_Process> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Process>>(msg1); long HItemID = list[0].HItemID; string HNumber = list[0].HNumber; string HName = list[0].HName; string HShortNumber = list[0].HNumber; long HParentID = list[0].HParentID; string HHelpCode = list[0].HHelpCode; bool HTypeFlow = list[0].HTypeFlow; bool HTypeCount = list[0].HTypeCount; string HDeptNumber = ""; long HLevel = ClsPub.GetLevel(list[0].HNumber.Trim()); bool HEndFlag = false; long HProcessID_K3 = list[0].HProcessID_K3; string HBillSubType = list[0].HType; bool HAutoTrunFlag = list[0].HAutoTrunFlag; string HFixPrice = list[0].HFixPrice; string HOverFixPrice = list[0].HOverFixPrice; string HSNo = list[0].HSNo; string HBarCode = list[0].HBarCode; string HProcMulID = list[0].HProcMulID; string HProcCheckNote = list[0].HProcCheckNote; string HRemark = list[0].HRemark; bool HStopflag = list[0].HStopflag; string HUseFlag = list[0].HUseFlag; long HEmpQty = list[0].HEmpQty; string HBarCodeForBase = list[0].HBarCodeForBase; long HDeptID = list[0].HDeptID; long HProcID = list[0].HProcID; //夿æé //if (!ClsPub.Security_Log(msg5, 1, true, msg4)) //{ // objJsonResult.code = "0"; // objJsonResult.count = 0; // objJsonResult.Message = "æ²¡ææ¾å°è¯¥åè½æ¨¡åï¼"; // objJsonResult.data = null; // return objJsonResult; //} //if (!DBUtility.ClsPub.AllowNumber(HNumber)) //{ // objJsonResult.code = "0"; // objJsonResult.count = 0; // objJsonResult.Message = "代ç ä¸ä¸è½åºç°è¿ç»â.âå¹¶ä¸é¦ä½æ«ä½ä¸è½ä¸ºâ.âï¼"; // objJsonResult.data = null; // return objJsonResult; //} //if (oDept.HavSameNumber(HItemID, HNumber)) //{ // objJsonResult.code = "0"; // objJsonResult.count = 0; // objJsonResult.Message = "代ç éå¤ï¼"; // objJsonResult.data = null; // return objJsonResult; //} //è¥MAINDIéå¤åéæ°è·å //主表 //oCN.RunProc("Update Gy_Process set " + // " (HNumber,HName,HHelpCode,HShortNumber,HParentID" + // ",HTypeFlow,HTypeCount,HDeptNumber,HSNo" + // ",HLevel,HEndFlag,HStopflag,HRemark,HDeptID,HBarCodeForBase,HProcessID_K3,HBillSubType,HAutoTrunFlag" + // ",HFixPrice,HOverFixPrice,HProcMulID,HProcCheckNote) " + // " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() + // "," + Convert.ToString(HTypeFlow ? 1 : 0) + "," + Convert.ToString(HTypeCount ? 1 : 0) + ",'" + HDeptNumber + "'," + HSNo.ToString() + // "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HDeptID + // ",'" + HBarCode + "'," + HProcessID_K3 + ",'" + HBillSubType + "'," + Convert.ToString(HAutoTrunFlag ? 1 : 0) + // "," + HFixPrice.ToString() + "," +HOverFixPrice.ToString() + "," + HProcMulID.ToString() + ",'" + HProcCheckNote.ToString() + "')", ref DBUtility.ClsPub.sExeReturnInfo); oCN.BeginTran(); oCN.RunProc("Update Gy_Process set " + " HNumber='" + HNumber + "'" + ",HName='" + HName + "'" + ",HHelpCode='" + HHelpCode + "'" + ",HShortNumber='" + HShortNumber + "'" + ",HParentID= " + HParentID + ",HTypeFlow= '" + HTypeFlow + "'" + ",HTypeCount= '" + HTypeCount + "'" + ",HDeptNumber='" + HDeptNumber + "'" + ",HSNo= " + HSNo + ",HLevel= " + HLevel + ",HEndFlag= '" + HEndFlag + "'" + ",HStopflag= '" + HStopflag + "'" + ",HRemark='" + HRemark + "'" + ",HDeptID= " + HDeptID + ",HBarCodeForBase='" + HBarCodeForBase + "'" + ",HProcessID_K3= " + HProcessID_K3 + ",HBillSubType='" + HBillSubType + "'" + ",HAutoTrunFlag= '" + HAutoTrunFlag + "'" + ",HFixPrice= " + HFixPrice + ",HOverFixPrice= " + HOverFixPrice + ",HProcMulID= " + HProcMulID + ",HProcCheckNote='" + HProcCheckNote + "'" + " Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo); //ä¿®æ¹ä¸çº§ä¸ºéæ«çº§ä»£ç oCN.RunProc("Update Gy_Process set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo); //return true; //ä¿®æ¹å项ç®ä»£ç //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Group,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo); //å°ä¸çº§ ä¸ºéæ«çº§ //oCN.RunProc("Update Gy_Group set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo); // 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.Message; objJsonResult.data = null; return objJsonResult; } } /// <summary> /// è¿åå·¥åºå表 ///åæ°ï¼string sqlã @@ -67,6 +203,45 @@ } /// <summary> /// æ ¹æ®åºç¡èµæID æ¥æ¾è®°å½ ///åæ°ï¼string sqlã ///è¿åå¼ï¼objectã /// </summary> [Route("Gy_Process/cx")] [HttpGet] public object cx(long HInterID) { try { ds = oCN.RunProcReturn("select * from h_v_Gy_ProcessListDetail where HitemID=" + HInterID, "h_v_Gy_ProcessListDetail"); 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; } } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "Exceptionï¼" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } // } WebAPI/Controllers/BaseSet/Gy_StockPlaceController.cs
@@ -17,56 +17,6 @@ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); DataSet ds; /// <summary> /// è¿åé¨é¨å表 ///åæ°ï¼string sqlã ///è¿åå¼ï¼objectã /// </summary> [Route("Gy_Department/list")] [HttpGet] public object list(string sWhere) { try { if (sWhere == null || sWhere.Equals("")) { ds = oCN.RunProcReturn("select * from h_v_IF_DepartmentList " + sWhere, "h_v_IF_DepartmentList"); } else { string sql1 = "select * from h_v_IF_DepartmentList where 1 = 1 "; string sql = sql1 + sWhere; ds = oCN.RunProcReturn(sql, "h_v_IF_DepartmentList"); } 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; } } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "Exceptionï¼" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } /// <summary> /// æ ¹æ®åºç¡èµæID æ¥æ¾è®°å½ ///åæ°ï¼string sqlã WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs
@@ -222,22 +222,18 @@ { try { DAL.ClsGy_WorkCenter_Ctl oDept = new DAL.ClsGy_WorkCenter_Ctl(); 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(); string msg5 = sArray[3].ToString(); //ååºåå msg2 = "[" + msg2.ToString() + "]"; List<Gy_WorkCenter> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_WorkCenter>>(msg2); long HItemID = int.Parse(msg3); msg1 = "[" + msg1.ToString() + "]"; DAL.ClsGy_WorkCenter_Ctl oDept = new DAL.ClsGy_WorkCenter_Ctl(); List<Gy_WorkCenter> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_WorkCenter>>(msg1); long HItemID = list[0].HItemID; string HNumber = list[0].HNumber; string HName = list[0].HName; string HShortNumber = list[0].HNumber; long HParentID = list[0].HParentID.ToString() == "" ? 0 : list[0].HParentID; long HParentID = list[0].HParentID; string HHelpCode = list[0].HHelpCode; string HRemark = list[0].HRemark; string HStopflag = list[0].HStopflag; @@ -249,30 +245,30 @@ var HWorkTimes = list[0].HWorkTimes; //夿æé if (!ClsPub.Security_Log(msg5, 1, true, msg4)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ²¡ææ¾å°è¯¥åè½æ¨¡åï¼"; objJsonResult.data = null; return objJsonResult; } if (!DBUtility.ClsPub.AllowNumber(HNumber)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "代ç ä¸ä¸è½åºç°è¿ç»â.âå¹¶ä¸é¦ä½æ«ä½ä¸è½ä¸ºâ.âï¼"; objJsonResult.data = null; return objJsonResult; } if (oDept.HavSameNumber(HItemID, HNumber)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "代ç éå¤ï¼"; objJsonResult.data = null; return objJsonResult; } //if (!ClsPub.Security_Log(msg5, 1, true, msg4)) //{ // objJsonResult.code = "0"; // objJsonResult.count = 0; // objJsonResult.Message = "æ²¡ææ¾å°è¯¥åè½æ¨¡åï¼"; // objJsonResult.data = null; // return objJsonResult; //} //if (!DBUtility.ClsPub.AllowNumber(HNumber)) //{ // objJsonResult.code = "0"; // objJsonResult.count = 0; // objJsonResult.Message = "代ç ä¸ä¸è½åºç°è¿ç»â.âå¹¶ä¸é¦ä½æ«ä½ä¸è½ä¸ºâ.âï¼"; // objJsonResult.data = null; // return objJsonResult; //} //if (oDept.HavSameNumber(HItemID, HNumber)) //{ // objJsonResult.code = "0"; // objJsonResult.count = 0; // objJsonResult.Message = "代ç éå¤ï¼"; // objJsonResult.data = null; // return objJsonResult; //} //è¥MAINDIéå¤åéæ°è·å oCN.BeginTran(); //主表 @@ -311,7 +307,7 @@ } } /// <summary> /// ç»´ä¿®åè¡¨ä¿®æ¹æé®æ¹æ³ /// å·¥ä½ä¸å¿åè¡¨ä¿®æ¹æé®æ¹æ³ ///åæ°ï¼string sqlã ///è¿åå¼ï¼objectã /// </summary> @@ -321,7 +317,7 @@ { try { ds = oCN.RunProcReturn("select * from Gy_WorkCenter where HItemID=" + HInterID, "Gy_WorkCenter"); ds = oCN.RunProcReturn("select a.*,b.HName HDeptName from Gy_WorkCenter a left join Gy_Department b on a.HDeptID = b.HItemID where a.HItemID=" + HInterID, "Gy_WorkCenter"); objJsonResult.code = "1"; objJsonResult.count = 1; WebAPI/Models/»ù´¡×ÊÁÏ/Gy_Process.cs
New file @@ -0,0 +1,40 @@ using System; using System.Collections.Generic; using System.Linq; using System.Web; namespace WebAPI.Models { public class Gy_Process { public long HItemID { get; set; } public string HNumber { get; set; } // 代ç public string HName { get; set; } // public string HHelpCode { get; set; } //å©è®°ç public string HShortNumber { get; set; } //ç代ç public bool HEndFlag { get; set; } //æ«çº§æ å¿ public bool HStopflag { get; set; } //ç¦ç¨æ å¿ public string HRemark { get; set; } //夿³¨ public string HUseFlag { get; set; } //ä½¿ç¨æ å¿ public long HParentID { get; set; } //ç¶çº§ID public bool HTypeFlow { get; set; } public bool HTypeCount { get; set; } public string HDeptNumber { get; set; } public string HBarCode { get; set; } public string HLevel { get; set; } public long HProcessID_K3 { get; set; } public string HType { get; set; } public bool HAutoTrunFlag { get; set; } public string HFixPrice { get; set; } public string HOverFixPrice { get; set; } public string HSNo { get; set; } public string HProcMulID { get; set; } public string HProcCheckNote { get; set; } public long HDeptID { get; set; } public long HEmpQty { get; set; } public long HProcID { get; set; } public string HBarCodeForBase { get; set; } } } WebAPI/WebAPI.csproj
@@ -459,6 +459,7 @@ <Compile Include="Models\WWSendOutBillViewModel.cs" /> <Compile Include="Models\WW_EntrustProcSendWorkViewModel.cs" /> <Compile Include="Models\WW_EntrustWorkOrderViewModel.cs" /> <Compile Include="Models\åºç¡èµæ\Gy_Process.cs" /> <Compile Include="Models\åºç¡èµæ\Warehouse.cs" /> <Compile Include="Properties\Resources.Designer.cs"> <AutoGen>True</AutoGen> WebAPI/WebAPI.csproj.user
@@ -7,7 +7,7 @@ <WebStackScaffolding_IsReferencingScriptLibrariesSelected>True</WebStackScaffolding_IsReferencingScriptLibrariesSelected> <WebStackScaffolding_LayoutPageFile /> <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected> <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <UseIISExpress>false</UseIISExpress> <Use64BitIISExpress />