Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
| | |
| | | /NETERPNoWin/obj/Debug/.NETFramework,Version=v4.0.AssemblyAttributes.cs |
| | | /NETERPNoWin/bin/Debug |
| | | /NETERPNoWin/obj/Debug |
| | | /WebAPI/Sc_MouldProdInBill/Log |
| | | /WebAPI/Vlog |
| | |
| | | } |
| | | if (bResult) |
| | | { |
| | | string sql = $"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' "; |
| | | string sql =string.Format( $"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' "); |
| | | oCn.RunProc(sql); |
| | | objJsonResult.code = "0"; |
| | | objJsonResult.count = 1; |
| | |
| | | } |
| | | if (bResult) |
| | | { |
| | | string sql = $"exec h_p_Sc_MouldChangeFileStatus 'out','{oBill.omodel.HInterID.ToString()}' "; |
| | | string sql =string.Format($"exec h_p_Sc_MouldChangeFileStatus 'out','{oBill.omodel.HInterID.ToString()}' ") ; |
| | | oCn.RunProc(sql); |
| | | objJsonResult.code = "0"; |
| | | objJsonResult.count = 1; |
| | |
| | | } |
| | | if (bResult) |
| | | { |
| | | string sql = $"exec h_p_Sc_MouldChangeFileStatus 'out','{oBill.omodel.HInterID.ToString()}' "; |
| | | string sql =string.Format($"exec h_p_Sc_MouldChangeFileStatus 'out','{oBill.omodel.HInterID.ToString()}' "); |
| | | oCn.RunProc(sql); |
| | | objJsonResult.code = "0"; |
| | | objJsonResult.count = 1; |
| | |
| | | } |
| | | if (bResult) |
| | | { |
| | | string sql = $"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' "; |
| | | string sql =string.Format($"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' "); |
| | | DataSet db=oCn.RunProcReturn(sql, "h_p_Sc_MouldChangeFileStatus"); |
| | | if (db.Tables[0].Rows[0]["issuccess"].ToString()=="0") |
| | | { |
| | |
| | | } |
| | | if (bResult) |
| | | { |
| | | string sql = $"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' "; |
| | | string sql =string.Format($"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' ") ; |
| | | oCn.RunProc(sql); |
| | | objJsonResult.code = "0"; |
| | | objJsonResult.count = 1; |
| | |
| | | } |
| | | if (bResult) |
| | | { |
| | | string sql = $"exec h_p_Sc_MouldChangeFileStatus 'out',{oBill.omodel.HInterID.ToString()} "; |
| | | string sql =string.Format($"exec h_p_Sc_MouldChangeFileStatus 'out',{oBill.omodel.HInterID.ToString()} ") ; |
| | | oCn.RunProc(sql); |
| | | objJsonResult.code = "0"; |
| | | objJsonResult.count = 1; |
| | |
| | | } |
| | | if (bResult) |
| | | { |
| | | string sql = $"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' "; |
| | | string sql =string.Format($"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' "); |
| | | oCn.RunProc(sql); |
| | | objJsonResult.code = "0"; |
| | | objJsonResult.count = 1; |
| | |
| | | } |
| | | if (bResult) |
| | | { |
| | | string sql = $"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' "; |
| | | string sql =string.Format($"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' ") ; |
| | | oCn.RunProc(sql); |
| | | objJsonResult.code = "0"; |
| | | objJsonResult.count = 1; |
| | |
| | | } |
| | | if (bResult) |
| | | { |
| | | string sql = $"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' "; |
| | | string sql =string.Format($"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' "); |
| | | oCn.RunProc(sql); |
| | | objJsonResult.code = "0"; |
| | | objJsonResult.count = 1; |
| | |
| | | } |
| | | if (bResult) |
| | | { |
| | | string sql = $"exec h_p_Sc_MouldChangeFileStatus 'out','{oBill.omodel.HInterID.ToString()}' "; |
| | | string sql =string.Format($"exec h_p_Sc_MouldChangeFileStatus 'out','{oBill.omodel.HInterID.ToString()}' "); |
| | | oCn.RunProc(sql); |
| | | objJsonResult.code = "0"; |
| | | objJsonResult.count = 1; |
| | |
| | | } |
| | | if (bResult) |
| | | { |
| | | string sql = $"exec h_p_Sc_MouldProdBackBillList '{oBill.omodel.HBillNo}' "; |
| | | string sql =string.Format($"exec h_p_Sc_MouldProdBackBillList '{oBill.omodel.HBillNo}' ") ; |
| | | oCn.RunProc(sql); |
| | | string sql1 = $"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' "; |
| | | string sql1 =string.Format($"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' "); |
| | | oCn.RunProc(sql1); |
| | | objJsonResult.code = "0"; |
| | | objJsonResult.count = 1; |
| | |
| | | } |
| | | if (bResult) |
| | | { |
| | | string sql = $"exec h_p_Sc_MouldChangeFileStatus 'out','{oBill.omodel.HInterID.ToString()}' "; |
| | | string sql =string.Format($"exec h_p_Sc_MouldChangeFileStatus 'out','{oBill.omodel.HInterID.ToString()}' "); |
| | | oCn.RunProc(sql); |
| | | objJsonResult.code = "0"; |
| | | objJsonResult.count = 1; |
| | |
| | | { |
| | | SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); |
| | | string sql = string.Format(@"select b.HDotCheckItemID HDotCheckItemID,c.HNumber HDotCheckCode,b.HDotCheckItem,b.HDotCheckPart,b.HClaim, |
| | | b.HManagerID,e.HNumber HManagerCode,e.HName HManagerName,b.HRemark from Sb_EquipDotCheckRuleBillMain a |
| | | b.HManagerID,e.HNumber HManagerCode,e.HName HManagerName,b.HRemark,a.HInterID,a.HBillNo from Sb_EquipDotCheckRuleBillMain a |
| | | left join Sb_EquipDotCheckRuleBillSub b on a.HInterID=b.HInterID |
| | | left join Gy_QCCheckItem c on c.HItemID=b.HDotCheckItemID |
| | | left join Gy_Employee e on e.HItemID=b.HManagerID |
| | |
| | | msg2 = "[" + msg2.ToString() + "]"; |
| | | List<Models.ClsGy_DotCheck> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_DotCheck>>(msg2); |
| | | |
| | | long HItemID = int.Parse(msg3); |
| | | long HItemID = int.Parse(msg4); |
| | | string HNumber = list[0].HNumber; |
| | | string HName = list[0].HName; |
| | | string HShortNumber = list[0].HNumber; |
| | |
| | | string HUseFlag = list[0].HUseFlag; |
| | | |
| | | //夿æé |
| | | if (!ClsPub.Security_Log("Gy_DotCheck_Edit", 1, false, msg4)) |
| | | if (!ClsPub.Security_Log("Gy_DotCheck_Edit", 1, false, msg3)) |
| | | { |
| | | objJsonResult.code = "0"; |
| | | objJsonResult.count = 0; |
| | |
| | | return objJsonResult; |
| | | } |
| | | |
| | | if (oDept.HavSameNumber(HItemID, 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("Insert into Gy_DotCheck " + |
| | | " (HNumber,HName,HHelpCode,HShortNumber" + |
| | | ",HLevel,HEndFlag,HStopflag,HRemark,HMakeTime) " + |
| | | ",HLevel,HEndFlag,HStopflag,HRemark,HParentID) " + |
| | | " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + |
| | | +HLevel + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "',getdate())", ref DBUtility.ClsPub.sExeReturnInfo); |
| | | +HLevel + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "',0)", ref DBUtility.ClsPub.sExeReturnInfo); |
| | | //ä¿®æ¹ä¸çº§ä¸ºéæ«çº§ä»£ç |
| | | //oCN.RunProc("Update Gy_MouldType set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo); |
| | | oCN.Commit(); |
| | |
| | | return objJsonResult; |
| | | } |
| | | |
| | | if (oDept.HavSameNumber(HItemID, HNumber)) |
| | | { |
| | | objJsonResult.code = "0"; |
| | | objJsonResult.count = 0; |
| | | objJsonResult.Message = "代ç éå¤ï¼"; |
| | | objJsonResult.data = null; |
| | | return objJsonResult; |
| | | } |
| | | |
| | | |
| | | //è¥MAINDIéå¤åéæ°è·å |
| | | oCN.BeginTran(); |
| | |
| | | //主表 |
| | | oCN.RunProc("Insert into Gy_Repair " + |
| | | " (HNumber,HName,HHelpCode,HShortNumber" + |
| | | ",HLevel,HEndFlag,HStopflag,HRemark,HMakeTime) " + |
| | | ",HLevel,HEndFlag,HStopflag,HRemark,HParentID) " + |
| | | " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + |
| | | +HLevel + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "',getdate())", ref DBUtility.ClsPub.sExeReturnInfo); |
| | | +HLevel + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "',0)", ref DBUtility.ClsPub.sExeReturnInfo); |
| | | //ä¿®æ¹ä¸çº§ä¸ºéæ«çº§ä»£ç |
| | | //oCN.RunProc("Update Gy_MouldType set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo); |
| | | oCN.Commit(); |
New file |
| | |
| | | ------------------------2022/8/5 17:52:29------------------------------ |
| | | æåï¼ |
| | | |
New file |
| | |
| | | ------------------------2022/8/5 17:52:29------------------------------ |
| | | ææé |
| | | |
New file |
| | |
| | | ------------------------2022/8/5 17:52:29------------------------------ |
| | | select * from h_v_Sc_MouldProdInHouseBillList where åºåç»ç»='ææºäºä¸é¨' and CONVERT(varchar(100),æ¥æ, 23) >= '2022-07-06' and CONVERT(varchar(100),æ¥æ, 23) <= '2022-08-05'order by hmainid desc |
| | | |
New file |
| | |
| | | 2022/8/5 17:52:29 and CONVERT(varchar(100),æ¥æ, 23) >= '2022-07-06' and CONVERT(varchar(100),æ¥æ, 23) <= '2022-08-05';ææºäºä¸é¨ |