Model/车间管理/ClsSc_ProcessPlanMain.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/生产管理/报工台工序/Sc_MESReturnStepWorkBillController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/DLL/ClsSc_MESReturnStepWorkBill.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/ListModels.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Model/³µ¼ä¹ÜÀí/ClsSc_ProcessPlanMain.cs
@@ -22,5 +22,12 @@ public string HInnerBillNo;// varchar(50) --å é¨åæ®å· public bool HCloseType;// bit --å ³éç±»å ï¼é»è®¤ä¸º0ï¼ public int HWorkerID; public int HProcNo; public int HProcID; public int HGroupID; public int HDeptID; public int HQty; } } Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -732,6 +732,12 @@ { omodel.Sc_MESBeginWorkBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } //==========è¿å·¥å //èªå¨å®¡æ ¸ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MESReturnWorkBill_AutoCheck") { omodel.Sc_MESReturnWorkBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } //==========ç»çå //èªå¨å®¡æ ¸ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MESEndWorkBill_AutoCheck") Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
@@ -205,6 +205,8 @@ //å¼çå public string Sc_MESBeginWorkBill_AutoCheck; //èªå¨å®¡æ ¸ //è¿å·¥å public string Sc_MESReturnWorkBill_AutoCheck; //èªå¨å®¡æ ¸ //ç»çå public string Sc_MESEndWorkBill_AutoCheck; //èªå¨å®¡æ ¸ //åå·¥æèµ·å WebAPI/Controllers/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/Sc_MESReturnStepWorkBillController.cs
@@ -1,4 +1,6 @@ using System; using DBUtility; using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; using System.Data; using System.Linq; @@ -72,17 +74,17 @@ #endregion #region[è¿å·¥åç¼è¾æ¶è·åè¡¨å¤´æ°æ®] [Route("Sc_MESBeginStepWorkBill/Sc_MESBeginStepWorkBillListCheckDetai")] [Route("Sc_MESReturnStepWorkBill/Sc_MESReturnStepWorkBillListCheckDetai")] [HttpGet] public ApiResult<DataSet> Sc_MESBeginStepWorkBillListCheckDetai(string HID) public ApiResult<DataSet> Sc_MESReturnStepWorkBillListCheckDetai(string HID) { if (string.IsNullOrEmpty(HID)) return new ApiResult<DataSet> { code = -1, msg = "IDä¸è½ä¸ºç©º" }; SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sc_MESBeginWorkBillList_NEW where hmainid= " + HID + " ", "h_v_Sc_MESBeginWorkBillList_NEW"); var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sc_MESReturnWorkBillList where hmainid= " + HID + " ", "h_v_Sc_MESReturnWorkBillList"); if (dataSet == null || dataSet.Tables[0].Rows.Count == 0) return new ApiResult<DataSet> { code = -1, msg = "ä¸åå¨å¼å·¥åå·" }; return new ApiResult<DataSet> { code = -1, msg = "ä¸åå¨è¿å·¥åå·" }; return new ApiResult<DataSet> { code = 1, msg = "æ¥è¯¢æå", data = dataSet }; } @@ -99,7 +101,7 @@ { DBUtility.ClsPub.CurUserName = UserName; //ç¼è¾æé if (!DBUtility.ClsPub.Security_Log_second("MES_MESReturnWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName)) if (!DBUtility.ClsPub.Security_Log_second("Sc_ProcessPlan_Drop", 1, true, DBUtility.ClsPub.CurUserName)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -181,7 +183,7 @@ [HttpGet] public object AuditReturnStepProcessReportList(int HInterID, int IsAudit, string CurUserName) { string ModRightNameCheck = "MES_MESReturnWorkBill_Check"; string ModRightNameCheck = "Sc_ProcessPlan_Check"; DBUtility.ClsPub.CurUserName = CurUserName; try { @@ -308,6 +310,182 @@ } #endregion #region è¿å·¥åä¿å/ç¼è¾ /// <summary> /// è¿å·¥å /// </summary> /// <param name="msg"></param> /// <returns></returns> [Route("Sc_MESReturnStepWorkBill/SaveGetMESReturnStepWorkFrom")] [HttpPost] public object SaveGetMESReturnStepWorkFrom([FromBody] JObject msg) { var _value = msg["msg"].ToString(); string msg1 = _value.ToString(); string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); string msg2 = sArray[0].ToString(); string UserName = sArray[1].ToString(); string refSav = sArray[2].ToString(); DBUtility.ClsPub.CurUserName = UserName; //ä¿åæé if (!DBUtility.ClsPub.Security_Log_second("Sc_ProcessPlan_Edit", 1, true, DBUtility.ClsPub.CurUserName)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ ä¿åæéï¼"; objJsonResult.data = null; return objJsonResult; } //夿ä¼è®¡ææ¯å¦åç string s = ""; int sYear = 0; int sPeriod = 0; if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(DateTime.Now, ref sYear, ref sPeriod, ref s) == false) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = s; objJsonResult.data = null; return objJsonResult; } ListModels oListModels = new ListModels(); try { DLL.ClsSc_MESReturnStepWorkBill oBill = new DLL.ClsSc_MESReturnStepWorkBill(); List<Model.ClsSc_ProcessPlanMain> lsmain = new List<Model.ClsSc_ProcessPlanMain>(); msg2 = msg2.Replace("\\", ""); msg2 = msg2.Replace("\n", ""); //\n lsmain = oListModels.getObjectByJson_Gy_MESReturnWorkFrom(msg2); foreach (Model.ClsSc_ProcessPlanMain oItem in lsmain) { if (refSav == "Add") { //忮巿¯å¦éå¤ if (BillNew.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld.omodel.HInterID)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "åæ®å·éå¤ï¼ä¸å 许ä¿åï¼"; objJsonResult.data = 1; return objJsonResult; } } if (refSav == "Update") { if (BillOld.ShowBill(oItem.HInterID, ref s) == false) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ¤åæ®æè¯¯ï¼"; objJsonResult.data = 1; return objJsonResult; } //夿æ¯å¦å¯ç¼è¾ if (BillOld.omodel.HChecker != "" && BillOld.omodel.HChecker != null) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ¤åæ®å·²ç»è¢«å®¡æ ¸ï¼ä¸å 许修æ¹ï¼"; objJsonResult.data = 1; return objJsonResult; } if (BillOld.omodel.HBillStatus > 1) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ¤åæ®å¤äºä¸å¯ç¼è¾ç¶æï¼ä¸å 许修æ¹ï¼"; objJsonResult.data = 1; return objJsonResult; } if (!DBUtility.Xt_BaseBillFun.Fun_AllowEditBill(BillOld, ref s)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = s + "ï¼ä¸å 许修æ¹"; objJsonResult.data = 1; return objJsonResult; } } DBUtility.ClsPub.CurUserName = oItem.HMaker; oItem.HBillType = "3718"; oItem.HBillSubType = "3718"; oItem.HBillStatus = 1; //åæ®ç¶æï¼1æªå®¡ï¼2å®¡æ ¸éè¿ï¼3å ³éï¼4ä½åºï¼5å®¡æ ¸éå,6å®¡æ ¸ä¸,7å·²é ï¼8å·²åå¤ï¼9ç»æ¡ï¼10éªè¯,11ä¸è¾¾ï¼12å¼å·¥,13ç³è¯·å®¡æ¹,15ç³è¯·æ£éªï¼16 å¤å®åæ ¼ï¼17å¤å®ä¸åæ ¼ï¼ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year); oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd")); if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "") { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "ä¿åå¤±è´¥ï¼æ²¡æåæ®æ¥æï¼æ æ³ä¿åï¼"; objJsonResult.data = 1; return objJsonResult; } oBill.omodel = oItem; } //ä¿å //ä¿å宿¯åå¤ç bool bResult; if (oBill.omodel.HInterID == 0) { bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo); if (bResult) { objJsonResult.HInterID = DBUtility.ClsPub.sExeReturnInfo; //è¿å主ID //ç³»ç»åæ° èªå¨å®¡æ ¸ string sReturn = ""; if (oSystemParameter.ShowBill(ref sReturn) == true) { if (oSystemParameter.omodel.Sc_ICMOBillWorkQtyStatus_AutoCheck == "Y") //ç³»ç»åæ° èªå¨å®¡æ ¸ { objJsonResult.Verify = "Y"; } else { objJsonResult.Verify = "N"; } } } } else { bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo); objJsonResult.Verify = "N"; } if (bResult) { objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "ä¿åæåï¼"; objJsonResult.data = 1; return objJsonResult; } else { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "ä¿å失败ï¼" + DBUtility.ClsPub.sExeReturnInfo; objJsonResult.data = 1; return objJsonResult; } } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = e.Message; objJsonResult.data = 1; return objJsonResult; } } #endregion #endregion } } WebAPI/DLL/ClsSc_MESReturnStepWorkBill.cs
@@ -22,5 +22,106 @@ base.HBillSubType = "3718"; } #region åºå®ä»£ç ~ClsSc_MESReturnStepWorkBill() { DetailColl = null; } #endregion èªå®ä¹æ¹æ³ //ä¿®æ¹åæ® public override bool ModifyBill(Int64 lngBillKey, ref string sReturn) { try { // oCn.BeginTran(); //æ´æ°ä¸»è¡¨ oCn.RunProc("UpDate Sc_ProcessPlanMain set " + " HBillNo='" + omodel.HBillNo + "'" + //åºå®èµå¼=============== ",HDate='" + omodel.HDate + "'" + ",HYear='" + omodel.HYear.ToString() + "'" + ",HPeriod='" + omodel.HPeriod.ToString() + "'" + ",HBillStatus='" + omodel.HBillStatus + "'" + ",HRemark='" + omodel.HRemark + "'" + ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" + ",HUpDateDate=getdate()" + //======================================== //",HSupID=" + omodel.HSupID.ToString() + //",HEmpID=" + omodel.HEmpID.ToString() + ",HICMOInterID=" + omodel.HICMOInterID.ToString() + ",HICMOBillNo='" + omodel.HICMOBillNo + "'" + ",HMaterID=" + omodel.HMaterID.ToString() + " where HInterID=" + lngBillKey.ToString()); //å é¤å ³è DeleteRelation(ref sReturn, lngBillKey); //å é¤å表 DeleteBillSub(lngBillKey); //æå ¥å表 omodel.HInterID = lngBillKey; //æå ¥å表 oCn.RunProc("Insert Into Sc_ProcessPlanSub " + "(HInterID,HEntryID,HBillNo" + ",HICMOInterID,HICMOBillNo,HProcNo,HProcID" + ",HGroupID,HDeptID,HWorkerID,HQty,HPlanBeginDate" + ") " + " values(" + omodel.HInterID.ToString() + ",0,'" + omodel.HBillNo + "'," + omodel.HICMOInterID.ToString() + ",'" + omodel.HICMOBillNo + "','" + omodel.HProcNo + "'," + omodel.HProcID.ToString() + "," + omodel.HGroupID.ToString() + "," + omodel.HDeptID.ToString() + "," + omodel.HWorkerID.ToString() + "," + omodel.HQty.ToString() + ",'" + omodel.HPlanBeginDate.ToString() + "') "); sReturn = "ä¿®æ¹åæ®æåï¼"; oCn.Commit(); return true; } catch (Exception e) { sReturn = e.Message; oCn.RollBack(); throw (e); } } //æ°å¢åæ® public override bool AddBill(ref string sReturn) { try { //å¾å°mainid omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo); //è¥MAINDIéå¤åéæ°è·å oCn.BeginTran(); //主表 oCn.RunProc("Insert Into Sc_ProcessPlanMain " + "(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" + ",HYear,HPeriod,HRemark" + ",HICMOInterID,HICMOBillNo,HMaterID" + ") " + " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + ",getdate(),'" + DBUtility.ClsPub.CurUserName + "',getdate()" + "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'" + "," + omodel.HICMOInterID.ToString() + ",'" + omodel.HICMOBillNo + "'," + omodel.HMaterID.ToString() + ") "); //æå ¥å表 oCn.RunProc("Insert Into Sc_ProcessPlanSub " + "(HInterID,HEntryID,HBillNo" + ",HICMOInterID,HICMOBillNo,HProcNo,HProcID" + ",HGroupID,HDeptID,HWorkerID,HQty,HPlanBeginDate" + ") " + " values(" + omodel.HInterID.ToString() + ",0,'" + omodel.HBillNo + "'," + omodel.HICMOInterID.ToString() + ",'" + omodel.HICMOBillNo + "','" + omodel.HProcNo + "'," + omodel.HProcID.ToString() + "," + omodel.HGroupID.ToString() + "," + omodel.HDeptID.ToString() + "," + omodel.HWorkerID.ToString() + "," + omodel.HQty.ToString() + ",'" + omodel.HPlanBeginDate.ToString() + "') "); sReturn = "æ°å¢åæ®æåï¼"; oCn.Commit(); return true; } catch (Exception e) { sReturn = e.Message; oCn.RollBack(); throw (e); } } } } WebAPI/ListModels.cs
@@ -1653,7 +1653,19 @@ List<Models.ClsSc_MESBeginWorkBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_MESBeginWorkBillMain>>(jsonString); return list; } /// <summary> /// æ¥å·¥å¹³å°è¿å·¥å主表json /// </summary> /// <param name="jsonString"></param> /// <returns></returns> public List<Model.ClsSc_ProcessPlanMain> getObjectByJson_Gy_MESReturnWorkFrom(string jsonString) { jsonString = "[" + jsonString.ToString() + "]"; List<Model.ClsSc_ProcessPlanMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcessPlanMain>>(jsonString); return list; } /// <summary> /// æ¥å·¥å¹³å°äº§éæ±æ¥ä¸»è¡¨json /// </summary> WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -18,25 +18,25 @@ <publishTime>02/22/2013 08:43:40</publishTime> </File> <File Include="bin/BLL.dll"> <publishTime>12/08/2021 17:59:13</publishTime> <publishTime>12/10/2021 16:24:07</publishTime> </File> <File Include="bin/BLL.pdb"> <publishTime>12/08/2021 17:59:13</publishTime> <publishTime>12/10/2021 16:24:07</publishTime> </File> <File Include="bin/DAL.dll"> <publishTime>12/08/2021 17:59:11</publishTime> <publishTime>12/10/2021 16:24:05</publishTime> </File> <File Include="bin/DAL.pdb"> <publishTime>12/08/2021 17:59:11</publishTime> <publishTime>12/10/2021 16:24:05</publishTime> </File> <File Include="bin/Dapper.dll"> <publishTime>07/22/2016 14:52:40</publishTime> </File> <File Include="bin/DBUtility.dll"> <publishTime>12/08/2021 17:59:08</publishTime> <publishTime>12/10/2021 16:24:02</publishTime> </File> <File Include="bin/DBUtility.pdb"> <publishTime>12/08/2021 17:59:08</publishTime> <publishTime>12/10/2021 16:24:02</publishTime> </File> <File Include="bin/Interop.gregn6Lib.dll"> <publishTime>08/25/2021 10:28:25</publishTime> @@ -60,10 +60,10 @@ <publishTime>07/25/2012 11:48:56</publishTime> </File> <File Include="bin/Model.dll"> <publishTime>12/08/2021 17:59:08</publishTime> <publishTime>12/10/2021 16:24:03</publishTime> </File> <File Include="bin/Model.pdb"> <publishTime>12/08/2021 17:59:08</publishTime> <publishTime>12/10/2021 16:24:03</publishTime> </File> <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs"> <publishTime>08/16/2021 17:23:15</publishTime> @@ -72,22 +72,22 @@ <publishTime>08/03/2014 20:33:56</publishTime> </File> <File Include="bin/Pub_Class.dll"> <publishTime>12/08/2021 17:59:05</publishTime> <publishTime>12/10/2021 16:24:00</publishTime> </File> <File Include="bin/Pub_Class.pdb"> <publishTime>12/08/2021 17:59:05</publishTime> <publishTime>12/10/2021 16:24:00</publishTime> </File> <File Include="bin/Pub_Control.dll"> <publishTime>12/08/2021 17:59:06</publishTime> <publishTime>12/10/2021 16:24:01</publishTime> </File> <File Include="bin/Pub_Control.pdb"> <publishTime>12/08/2021 17:59:06</publishTime> <publishTime>12/10/2021 16:24:01</publishTime> </File> <File Include="bin/SQLHelper.dll"> <publishTime>12/08/2021 17:59:07</publishTime> <publishTime>12/10/2021 16:24:01</publishTime> </File> <File Include="bin/SQLHelper.pdb"> <publishTime>12/08/2021 17:59:07</publishTime> <publishTime>12/10/2021 16:24:01</publishTime> </File> <File Include="bin/stdole.dll"> <publishTime>05/09/2021 13:35:37</publishTime> @@ -189,10 +189,10 @@ <publishTime>11/24/2014 11:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> <publishTime>12/08/2021 17:59:17</publishTime> <publishTime>12/10/2021 16:24:10</publishTime> </File> <File Include="bin/WebAPI.pdb"> <publishTime>12/08/2021 17:59:17</publishTime> <publishTime>12/10/2021 16:24:10</publishTime> </File> <File Include="bin/WebGrease.dll"> <publishTime>07/17/2013 17:03:52</publishTime> @@ -363,7 +363,7 @@ <publishTime>08/06/2021 22:57:28</publishTime> </File> <File Include="Web.config"> <publishTime>12/08/2021 17:59:26</publishTime> <publishTime>12/10/2021 16:24:31</publishTime> </File> </ItemGroup> </Project>