Model/obj/Release/Model.csproj.AssemblyReference.cacheBinary files differ
PayM/bin/x86/Debug/AxInterop.gregn6Lib.dllBinary files differ
PayM/bin/x86/Debug/BLL.dllBinary files differ
PayM/bin/x86/Debug/BLL.pdbBinary files differ
PayM/bin/x86/Debug/DAL.dllBinary files differ
PayM/bin/x86/Debug/DAL.pdbBinary files differ
PayM/bin/x86/Debug/DBUtility.dllBinary files differ
PayM/bin/x86/Debug/DBUtility.pdbBinary files differ
PayM/bin/x86/Debug/Interop.gregn6Lib.dllBinary files differ
PayM/bin/x86/Debug/Model.dllBinary files differ
PayM/bin/x86/Debug/Model.pdbBinary files differ
PayM/bin/x86/Debug/PayM.dllBinary files differ
PayM/bin/x86/Debug/PayM.pdbBinary files differ
PayM/bin/x86/Debug/Pub_Class.dllBinary files differ
PayM/bin/x86/Debug/Pub_Class.pdbBinary files differ
PayM/bin/x86/Debug/Pub_Control.dllBinary files differ
PayM/bin/x86/Debug/Pub_Control.pdbBinary files differ
PayM/bin/x86/Debug/SQLHelper.dllBinary files differ
PayM/bin/x86/Debug/SQLHelper.pdbBinary files differ
PayM/obj/x86/Debug/AxInterop.gregn6Lib.dllBinary files differ
PayM/obj/x86/Debug/Interop.gregn6Lib.dllBinary files differ
PayM/obj/x86/Debug/PayM.csproj.AssemblyReference.cacheBinary files differ
PayM/obj/x86/Debug/PayM.csproj.CoreCompileInputs.cache
@@ -1 +1 @@ 76d6e649eaf418858fb80b047dbac5a1964f90f8 4af767f9af5d42f2c393c62e78567bbdb3e4f775 PayM/obj/x86/Debug/PayM.csproj.FileListAbsolute.txt
@@ -1672,7 +1672,6 @@ C:\Users\86130\Desktop\æºäºè¿æ\MES-WEB-API\PayM\bin\x86\Debug\SQLHelper.pdb C:\Users\86130\Desktop\æºäºè¿æ\MES-WEB-API\PayM\bin\x86\Debug\Interop.gregn6Lib.dll C:\Users\86130\Desktop\æºäºè¿æ\MES-WEB-API\PayM\bin\x86\Debug\AxInterop.gregn6Lib.dll C:\Users\86130\Desktop\æºäºè¿æ\MES-WEB-API\PayM\obj\x86\Debug\PayM.csproj.AssemblyReference.cache C:\Users\86130\Desktop\æºäºè¿æ\MES-WEB-API\PayM\obj\x86\Debug\Interop.gregn6Lib.dll C:\Users\86130\Desktop\æºäºè¿æ\MES-WEB-API\PayM\obj\x86\Debug\AxInterop.gregn6Lib.dll C:\Users\86130\Desktop\æºäºè¿æ\MES-WEB-API\PayM\obj\x86\Debug\PayM.csproj.ResolveComReference.cache PayM/obj/x86/Debug/PayM.csproj.GenerateResource.cacheBinary files differ
PayM/obj/x86/Debug/PayM.csproj.ResolveComReference.cacheBinary files differ
PayM/obj/x86/Debug/PayM.dllBinary files differ
PayM/obj/x86/Debug/PayM.pdbBinary files differ
SyntacticSugar/bin/Debug/SyntacticSugar.dllBinary files differ
SyntacticSugar/bin/Debug/SyntacticSugar.pdbBinary files differ
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -3,3 +3,8 @@ D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb C:\Users\86130\Desktop\æºäºè¿æ\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll C:\Users\86130\Desktop\æºäºè¿æ\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb C:\Users\86130\Desktop\æºäºè¿æ\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache C:\Users\86130\Desktop\æºäºè¿æ\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll C:\Users\86130\Desktop\æºäºè¿æ\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb SyntacticSugar/obj/Debug/SyntacticSugar.dllBinary files differ
SyntacticSugar/obj/Debug/SyntacticSugar.pdbBinary files differ
WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
@@ -2431,10 +2431,9 @@ } catch (Exception e) { oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "å®¡æ ¸æåå®¡æ ¸å·¥èºè·¯çº¿å¤±è´¥ï¼" + e.ToString(); objJsonResult.Message = "驳åå·¥èºè·¯çº¿å¤±è´¥ï¼" + e.ToString(); objJsonResult.data = null; return objJsonResult; } WebAPI/Controllers/Êý¾Ýͬ²½/¶¤¶¤Í¬²½/DD_DataSynchronizationController.cs
@@ -17,6 +17,8 @@ using DingTalk.Api.Response; using System.Globalization; using System.Linq; using AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models; using System.Text.RegularExpressions; namespace WebAPI.Controllers { @@ -85,6 +87,13 @@ public long? TotalCount; public long? PageNumber; public List<string> Data; } //oa审æ¹è¿åç±» public class OA_GetInstanceIDListResponse { public List<string> list;//è·åçidå表 public string nextToken; public bool? success; } #region åå±å®¡æ ¸ç¾å°è¡¨ @@ -358,8 +367,83 @@ public List<Sc_MouldRepairWorkBillSub> DetailColMouldRepair = new List<Sc_MouldRepairWorkBillSub>(); } #endregion #region å¼å¸¸å·¥æ¶ç³è¯·å #region 主表+å表 public class Pay_ErrWorkTimesRequestBill { public int HInterID; public string HBillNo; public string HDate; public string HInnerBillNo; public int HDeptID; public string HDeptName; public int HGroupID; public string HGroupName; public int HMangerID; public string HManagerName; public int HICMOInterID; public string HICMOBillNo; public string HExplanation; public double HSumRequestTimes; public int HMaterID; public string HMaterName; public int HUnitID; public string HUnitName; public double HPlanQty; public string HBatchNo; public string HRemark; public string HMaker; public string HMakerDate; public string HUpdater; public string HUpdaterDate; public string HChecker; public string HCheckerDate; public string HCloseMan; public string HCloseManDate; public string HDeleteMan; public string HDeleteManDate; public string HBacker; public string HBackerDate; public string HBackRemark; public List<Pay_ErrWorkTimesRequestBillSub> Pay_ErrWorkTimesRequestBillSub = new List<Pay_ErrWorkTimesRequestBillSub>(); } #endregion #region å表 public class Pay_ErrWorkTimesRequestBillSub { public int HEmpID; public string HEmpNumber; public string HEmpName; public int HWorkTypeID; public string HWorkTypeNumber; public string HWorkTypeName; public double HPayMoney; public string HBTimes; public string HETimes; public double HTimes; public double HRelTimes; public double HRelPay; public string HRemark; public int HSourceInterID; public int HSourceEntryID; public string HSourceBillNo; public string HSourceBillType; public double HRelationQty; public double HRelationMoney; public string HCloseMan; public string HEntryCloseDate; } #endregion #endregion #endregion #region éé éç¨æä½æ¹æ³ @@ -722,6 +806,145 @@ } } #endregion #endregion #region oa éç¨æä½æ¹æ³ #region OA è·å审æ¹å®ä¾IDå表(å页) public bool getInstanceIDList_Page_OA(string processCode,DateTime startTime, DateTime endTime,long nextToken, int maxResult, List<string> statuses, ref OA_GetInstanceIDListResponse response, ref string msg) { AlibabaCloud.SDK.Dingtalkworkflow_1_0.Client client = CreateClient1(); AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.ListProcessInstanceIdsHeaders listProcessInstanceIdsHeaders = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.ListProcessInstanceIdsHeaders(); listProcessInstanceIdsHeaders.XAcsDingtalkAccessToken = this.accessToken; AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.ListProcessInstanceIdsRequest listProcessInstanceIdsRequest = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.ListProcessInstanceIdsRequest { Statuses = statuses, StartTime = getTimeMillions(startTime), EndTime = getTimeMillions(endTime), ProcessCode = processCode, NextToken = nextToken, MaxResults = maxResult, }; try { ListProcessInstanceIdsResponse listProcessInstanceIdsResponse = client.ListProcessInstanceIdsWithOptions(listProcessInstanceIdsRequest, listProcessInstanceIdsHeaders, new AlibabaCloud.TeaUtil.Models.RuntimeOptions()); response.success = listProcessInstanceIdsResponse.Body.Success; response.list = listProcessInstanceIdsResponse.Body.Result.List; response.nextToken = listProcessInstanceIdsResponse.Body.Result.NextToken; return true; } catch (TeaException err) { if (!AlibabaCloud.TeaUtil.Common.Empty(err.Code) && !AlibabaCloud.TeaUtil.Common.Empty(err.Message)) { // err ä¸å«æ code å message 屿§ï¼å¯å¸®å©å¼åå®ä½é®é¢ } msg = "é误代ç " + err.Code + "ï¼" + err.Message; return false; } catch (Exception _err) { TeaException err = new TeaException(new Dictionary<string, object> { { "message", _err.Message } }); if (!AlibabaCloud.TeaUtil.Common.Empty(err.Code) && !AlibabaCloud.TeaUtil.Common.Empty(err.Message)) { // err ä¸å«æ code å message 屿§ï¼å¯å¸®å©å¼åå®ä½é®é¢ } msg = "é误代ç " + err.Code + "ï¼" + err.Message; return false; } } #endregion #region è·å OAæå®åæ®çå®ä¾IDå表(å ¨é¨) public bool getInstanceIDList_OA(string processCode, DateTime startTime, DateTime endTime, long nextToken, int maxResult, List<string> statuses, ref List<string> IDList, ref string msg) { OA_GetInstanceIDListResponse response = new OA_GetInstanceIDListResponse(); response.nextToken = nextToken.ToString();//èµå¼åå§å¼ do { nextToken = long.Parse(response.nextToken); if (getInstanceIDList_Page_OA(processCode, startTime, endTime, nextToken, maxResult, statuses,ref response, ref msg) == false) { return false; } for (int i = 0; i < response.list.Count; i++) { IDList.Add(response.list[i]); } } while (response.nextToken!=null); return true; } #endregion #region è·å OA æ ¹æ®å®ä¾IDè·åå®ä¾è¯¦æ public bool getInstanceDetailByInstanceID_OA(string processinstanceID,ref GetProcessInstanceResponse response, ref string msg) { AlibabaCloud.SDK.Dingtalkworkflow_1_0.Client client = CreateClient1(); AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.GetProcessInstanceHeaders getProcessInstanceHeaders = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.GetProcessInstanceHeaders(); getProcessInstanceHeaders.XAcsDingtalkAccessToken = this.accessToken; AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.GetProcessInstanceRequest getProcessInstanceRequest = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.GetProcessInstanceRequest { ProcessInstanceId = processinstanceID, }; try { response = client.GetProcessInstanceWithOptions(getProcessInstanceRequest, getProcessInstanceHeaders, new AlibabaCloud.TeaUtil.Models.RuntimeOptions()); return true; } catch (TeaException err) { if (!AlibabaCloud.TeaUtil.Common.Empty(err.Code) && !AlibabaCloud.TeaUtil.Common.Empty(err.Message)) { // err ä¸å«æ code å message 屿§ï¼å¯å¸®å©å¼åå®ä½é®é¢ } msg = "é误代ç " + err.Code + "ï¼" + err.Message; return false; } catch (Exception _err) { TeaException err = new TeaException(new Dictionary<string, object> { { "message", _err.Message } }); if (!AlibabaCloud.TeaUtil.Common.Empty(err.Code) && !AlibabaCloud.TeaUtil.Common.Empty(err.Message)) { // err ä¸å«æ code å message 屿§ï¼å¯å¸®å©å¼åå®ä½é®é¢ } msg = "é误代ç " + err.Code + "ï¼" + err.Message; return false; } } #endregion #region è·å OA æ ¹æ®å®ä¾IDå表è·åå®ä¾è¯¦æ å表 public bool getInstanceDetailListByInstanceIDList_OA(List<string> processinstanceIDList, ref List<GetProcessInstanceResponse> responseList, ref string msg) { GetProcessInstanceResponse getProcessInstanceResponse = new GetProcessInstanceResponse(); try { foreach(string processinstanceID in processinstanceIDList) { if(!getInstanceDetailByInstanceID_OA(processinstanceID,ref getProcessInstanceResponse,ref msg)) { return false; } responseList.Add(getProcessInstanceResponse); } return true; } catch (Exception e) { msg = e.Message; return false; } } #endregion #endregion #region æ°æ®åæ¥æ¹æ³ @@ -2857,6 +3080,272 @@ #endregion #endregion #region æ°æ®åæ¥-å¼å¸¸å·¥æ¶åOAéè·å #region ç±»åè½¬æ¢æåresponseä¸çvalue对象 public class StatValue { public string Id { get; set; } public string Label { get; set; } public string Upper { get; set; } public string Num { get; set; } } public class ExtValue { public List<StatValue> StatValue { get; set; } public string ComponentName { get; set; } } public class RowValue { public string Label { get; set; } public object Value { get; set; } public string Key { get; set; } // 注æï¼è¿éä¸å®ä¹extendValue屿§ï¼å 为æä»¬ä¸éè¦å® // public SomeType ExtendValue { get; set; } // 妿éè¦ï¼å¯ä»¥æ³¨éææå é¤è¿è¡ } public class Row { public List<RowValue> RowValue { get; set; } public string RowNumber { get; set; } // 注æï¼è¿éåè®¾ä½ ä¸éè¦componentNameï¼å 为JSON示ä¾ä¸æ²¡æç´æ¥å å«å® // ä½å¦æä½ çå®é JSONæéæ±ä¸å å«ï¼ä½ åºè¯¥æ·»å è¿ä¸ªå±æ§ // public string ComponentName { get; set; } } #endregion #region OAå¼å¸¸å·¥æ¶ç³è¯·å å®ä¾IDå表对åºçå®ä¾è¯¦æ public bool getInstanceDetailList___ErrWorkTimesRequest_OA(List<string> processinstanceIDList, DateTime startTime, DateTime endTime, ref List<Pay_ErrWorkTimesRequestBill> lsmain,ref string msg) { try { List<GetProcessInstanceResponse> getProcessInstanceResponses = new List<GetProcessInstanceResponse>(); //è·åééresponse if (getInstanceDetailListByInstanceIDList_OA(processinstanceIDList,ref getProcessInstanceResponses,ref msg)==false) { return false; } foreach(GetProcessInstanceResponse getProcessInstanceResponse in getProcessInstanceResponses) { Pay_ErrWorkTimesRequestBill oItem = new Pay_ErrWorkTimesRequestBill(); //主表 oItem.HDate = getProcessInstanceResponse.Body.Result.FormComponentValues[1].Value;//åæ®æ¥æè®¡æ¶æ¶é´ DateTime dateTime1 = DateTime.ParseExact(oItem.HDate + " 00:00:00", "yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture); if (!(DateTime.Compare(dateTime1, startTime)>=0&& DateTime.Compare(dateTime1, endTime) <= 0))//æ§å¶æ¶é´ { continue; } string[] deptNameAndGroupName = getProcessInstanceResponse.Body.Result.OriginatorDeptName.Split('-');//è·åé¨é¨æ¼æ¥å符串æ°ç» oItem.HDeptName = deptNameAndGroupName[1]; oItem.HGroupName = deptNameAndGroupName[deptNameAndGroupName.Length-1]; //主管-è´è´£äºº string HManagerValue = getProcessInstanceResponse.Body.Result.FormComponentValues[9].Value;//è·åçååå«åç¼è±æ string pattern = @"[\u4e00-\u9fff]+"; // 䏿å符çUnicodeèå´ MatchCollection matches = Regex.Matches(HManagerValue, pattern); // å建ä¸ä¸ªStringBuilderæ¥æ¼æ¥ææå¹é ç䏿å符 System.Text.StringBuilder chineseChars = new System.Text.StringBuilder(); foreach (Match match in matches) { chineseChars.Append(match.Value); } string HManagerName = chineseChars.ToString(); DataSet ds = oCN.RunProcReturn("select * from Gy_Employee with(nolock) where HName='" + HManagerName + "'", "Gy_Employee"); string HMangerID = "0"; if (ds.Tables[0].Rows.Count > 0) { HMangerID = ds.Tables[0].Rows[0]["HItemID"].ToString(); } oItem.HMangerID = int.Parse(HMangerID); //å¤çé¨é¨åçç»åç§°id ds = oCN.RunProcReturn("select * from Gy_Department with(nolock) where HName='" + oItem.HDeptName + "'", "Gy_Department"); string HDeptID = "0"; if (ds.Tables[0].Rows.Count > 0) { HDeptID = ds.Tables[0].Rows[0]["HItemID"].ToString(); } oItem.HDeptID = int.Parse(HDeptID); ds = oCN.RunProcReturn("select * from Gy_Group with(nolock) where HName='" + oItem.HGroupName + "'", "Gy_Group"); string HGroupID = "0"; if (ds.Tables[0].Rows.Count > 0) { HGroupID = ds.Tables[0].Rows[0]["HItemID"].ToString(); } oItem.HGroupID = int.Parse(HGroupID); //ååºååæç»å 容 string tableFieldValue = getProcessInstanceResponse.Body.Result.FormComponentValues[11].Value; List<Row> rows = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Row>>(tableFieldValue); ExtValue extValue = Newtonsoft.Json.JsonConvert.DeserializeObject<ExtValue>(getProcessInstanceResponse.Body.Result.FormComponentValues[11].ExtValue); oItem.HBatchNo = rows[0].RowValue[1].Value.ToString();//æ¹æ¬¡å·-订åå·ç //ä»»å¡æè¿°-ä»»å¡ç±»å+å·¥ä½å 容 oItem.HExplanation = getProcessInstanceResponse.Body.Result.FormComponentValues[2].Value + "-" + rows[0].RowValue[0].Value; oItem.HSumRequestTimes = double.Parse(extValue.StatValue[1].Num);//æ»æ¶é¿ oItem.HPlanQty = 0;//è®¡åæ°é oItem.HRemark = "ééå¯¼å ¥" + getProcessInstanceResponse.Body.Result.Title;//夿³¨ //循ç¯éåè·åèååç§°idï¼å·¥æ¶ for (int i = 0; i < rows.Count; i++) { string[] nameArray = rows[i].RowValue[4].Value.ToString().Split(',');//è·åæ¯ä¸ªäººç人å oItem.HPlanQty += double.Parse(rows[i].RowValue[2].Value.ToString());//è®¡åæ°é for (int j = 0; j < int.Parse(rows[i].RowValue[5].Value.ToString()); j++) { Pay_ErrWorkTimesRequestBillSub pay_ErrWorkTimesRequestBillSub = new Pay_ErrWorkTimesRequestBillSub(); ds = oCN.RunProcReturn("select * from Gy_Employee with(nolock) where HName='" + nameArray[j] + "'", "Gy_Employee"); string HEmpID = "0"; //设置å表èåidåç§° if (ds.Tables[0].Rows.Count > 0) { HEmpID = ds.Tables[0].Rows[0]["HItemID"].ToString(); } pay_ErrWorkTimesRequestBillSub.HEmpName = nameArray[j]; pay_ErrWorkTimesRequestBillSub.HEmpID = int.Parse(HEmpID); pay_ErrWorkTimesRequestBillSub.HRelTimes = double.Parse(rows[i].RowValue[6].Value.ToString()); pay_ErrWorkTimesRequestBillSub.HTimes = double.Parse(rows[i].RowValue[6].Value.ToString()); pay_ErrWorkTimesRequestBillSub.HRelPay = double.Parse(rows[i].RowValue[10].Value.ToString()); pay_ErrWorkTimesRequestBillSub.HPayMoney = pay_ErrWorkTimesRequestBillSub.HRelPay / pay_ErrWorkTimesRequestBillSub.HTimes; pay_ErrWorkTimesRequestBillSub.HRemark = "ééå¯¼å ¥"; oItem.Pay_ErrWorkTimesRequestBillSub.Add(pay_ErrWorkTimesRequestBillSub); } } lsmain.Add(oItem); } return true; }catch(Exception e) { msg = e.Message; return false; } } #endregion #region æ°æ®åæ¥ public bool getData_ErrWorkTimesRequest(DateTime startTime, DateTime endTime,ref string msg) { string processCode = "PROC-21371550-FEF1-4EDD-A827-639746E22E43"; long nextToken = 1; int maxResult = 20;//æå¤§20 List<string> statues = new List<string>{"COMPLETED"}; this.AppKey = "ding7miekiaqn4rc2ert"; this.AppSecret = "81qMrC5SvkgjT9t2A3wUyEEENzyl9jJLeXOpjv2SNULc_HSlFZF4NE21YFCXik4K"; getAccessToken();//设置accessToken //è·åå·¥æ¶ç³è¯·çå®ä¾IDå表 List<string> IDList = new List<string>(); if (getInstanceIDList_OA(processCode,startTime,endTime,nextToken,maxResult,statues,ref IDList, ref msg) == false) { return false; } //è·å详ç»ä¿¡æ¯å¹¶éå å°å表lsmainä¸ List<Pay_ErrWorkTimesRequestBill> lsmain = new List<Pay_ErrWorkTimesRequestBill>(); if (getInstanceDetailList___ErrWorkTimesRequest_OA(IDList,startTime,endTime, ref lsmain, ref msg) == false) { return false; } try { oCN.BeginTran(); //å 餿¶é´èå´å çå¯¼å ¥åæ® DataSet dataSet = oCN.RunProcReturn(@"select HInterID from Pay_ErrWorkTimesRequestBillMain a with(nolock) where a.HRemark like '%ééå¯¼å ¥%' and HDate >= '" + startTime + "' and HDate<='" + endTime + "'", "Pay_ErrWorkTimesRequestBillMain"); if(dataSet != null && dataSet.Tables[0].Rows.Count > 0) { foreach (DataRow row in dataSet.Tables[0].Rows) { int HInterID = row.Field<int>("HInterID"); oCN.RunProc(@"Delete From Pay_ErrWorkTimesRequestBillMain where HInterID = " + HInterID); oCN.RunProc(@"Delete From Pay_ErrWorkTimesRequestBillSub where HInterID = " + HInterID); } } //æå ¥æ°æ® foreach(Pay_ErrWorkTimesRequestBill oItem in lsmain) { if (oItem.Pay_ErrWorkTimesRequestBillSub.Count != 0) { string HBillType = "2231"; long HInterID = DBUtility.ClsPub.CreateBillID(HBillType, ref DBUtility.ClsPub.sExeReturnInfo); string HBillNo = DBUtility.ClsPub.CreateBillCode_Prod(HBillType, ref DBUtility.ClsPub.sExeReturnInfo, true); int HYear = int.Parse(oItem.HDate.Split('-')[0]); int HPeriod = int.Parse(oItem.HDate.Split('-')[1]); //主表 string sql = "insert into Pay_ErrWorkTimesRequestBillMain" + "(HYear,HPeriod,HBillType,HBillSubType,HBillStatus,HInterID,HBillNo,HDate,HInnerBillNo,HDeptID,HGroupID,HMangerID,HICMOInterID,HICMOBillNo,HExplanation,HSumRequestTimes,HMaterID,HUnitID,HPlanQty,HBatchNo,HRemark,HMaker,HMakeDate) " + "values(" + "" + HYear + "," + HPeriod + ",'" + HBillType + "','" + " " + "'," + 1 + "," + HInterID + ",'" + HBillNo + "','" + oItem.HDate + "','" + " " + "'," + oItem.HDeptID + "," + oItem.HGroupID + "," + oItem.HMangerID + "," + "0" + ",'" + " " + "','" + oItem.HExplanation + "'," + oItem.HSumRequestTimes + "," + 0 + "," + 0 + "," + oItem.HPlanQty + ",'" + oItem.HBatchNo + "','" + oItem.HRemark + "','" + "System" + "'," + "GETDATE()" + ")"; //主表 LogService.Write(sql); oCN.RunProc(sql); int i = 1; foreach (Pay_ErrWorkTimesRequestBillSub oItem_Detail in oItem.Pay_ErrWorkTimesRequestBillSub) { sql = "insert into Pay_ErrWorkTimesRequestBillSub" + "(HInterID,HEntryID,HEmpID,HWorkTypeID,HPayMoney,HBTimes,HETimes,HTimes,HRelTimes,HRelPay,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo" + ",HSourceBillType,HRelationQty,HRelationMoney) " + "values(" + "" + HInterID + "," + i + "," + oItem_Detail.HEmpID + "," + 0 + "," + oItem_Detail.HPayMoney + ",'" + "" + "','" + "" + "'," + oItem_Detail.HTimes + "," + oItem_Detail.HRelTimes + "," + oItem_Detail.HRelPay + ",'" + oItem_Detail.HRemark + "'," + 0 + "," + 0 + ",'" + " " + "','" + " " + "'," + 0 + "," + 0 + ")"; LogService.Write(sql); oCN.RunProc(sql); i += 1; } } } oCN.Commit(); return true; } catch (Exception e) { LogService.Write(e.Message); msg = e.Message; oCN.RollBack(); return false; } } #endregion #endregion #endregion @@ -2932,5 +3421,39 @@ } #endregion #region ééæ°æ®åæ¥OA [Route("DD_DataSynchronization/DataSynchronization_DingDing_OA")] [HttpGet] public object DataSynchronization_DingDing_OA(DateTime startTime, DateTime endTime, string user) { string msg = ""; try { if (getData_ErrWorkTimesRequest(startTime,endTime,ref msg) == false) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "Exceptionï¼" + msg; objJsonResult.data = null; return objJsonResult; } objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "Sucessï¼"; 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 } } WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
@@ -4,7 +4,7 @@ --> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <History>True|2024-11-06T06:13:46.3129972Z;False|2024-11-06T14:12:47.9022879+08:00;False|2024-11-05T20:45:28.3960353+08:00;True|2024-11-05T19:04:11.0417788+08:00;False|2024-11-05T19:03:03.9263878+08:00;True|2024-11-05T15:54:24.8374699+08:00;False|2024-11-05T15:53:24.4214141+08:00;True|2024-10-25T16:51:46.3066612+08:00;True|2024-10-25T12:16:27.8737941+08:00;True|2024-10-25T10:12:38.8056269+08:00;False|2024-10-25T10:11:44.1117608+08:00;True|2024-10-25T09:54:06.8572059+08:00;True|2024-10-25T08:21:42.6333993+08:00;True|2024-10-24T17:56:19.5319332+08:00;True|2024-10-24T17:50:10.0801119+08:00;False|2024-10-24T17:49:21.0726954+08:00;True|2024-10-24T17:40:46.0577697+08:00;False|2024-10-24T17:39:53.3743103+08:00;True|2024-10-24T14:57:00.6752320+08:00;True|2024-10-24T10:08:39.8269595+08:00;False|2024-10-24T10:07:47.3834032+08:00;True|2024-10-22T10:33:10.1961964+08:00;True|2024-10-21T08:43:54.1422810+08:00;False|2024-10-21T08:43:00.6574201+08:00;True|2024-10-18T14:56:55.6749850+08:00;True|2024-10-18T14:47:05.1073813+08:00;True|2024-10-18T11:24:23.9069952+08:00;True|2024-10-18T11:14:57.8486575+08:00;False|2024-10-18T11:14:07.5289704+08:00;True|2024-10-18T10:57:00.2425175+08:00;False|2024-10-18T10:56:04.8949960+08:00;True|2024-10-15T16:44:32.6189434+08:00;True|2024-10-15T14:38:49.8658311+08:00;True|2024-10-15T09:49:55.2197004+08:00;False|2024-10-15T09:49:14.8790668+08:00;False|2024-10-12T15:28:24.1303695+08:00;True|2024-10-10T10:59:36.7878419+08:00;False|2024-10-10T10:58:40.9900315+08:00;True|2024-10-03T10:57:02.9299524+08:00;True|2024-10-03T10:02:10.1156720+08:00;True|2024-09-30T11:07:22.5376794+08:00;True|2024-09-30T10:15:40.3990343+08:00;True|2024-09-30T10:04:38.1942221+08:00;True|2024-09-29T19:22:01.5340857+08:00;False|2024-09-29T19:21:12.2387012+08:00;True|2024-09-26T09:50:22.2637977+08:00;True|2024-09-25T20:44:33.3994634+08:00;True|2024-09-25T16:07:23.2747063+08:00;True|2024-09-25T14:55:37.9194143+08:00;True|2024-09-24T20:03:43.9841995+08:00;True|2024-09-24T19:42:48.7479102+08:00;True|2024-09-24T19:38:31.5777012+08:00;True|2024-09-24T16:26:58.5969765+08:00;True|2024-09-24T15:31:00.7140362+08:00;True|2024-09-24T10:17:46.7830753+08:00;True|2024-09-24T09:40:19.5788062+08:00;False|2024-09-24T09:39:27.4521802+08:00;True|2024-09-23T19:35:55.3572583+08:00;True|2024-09-23T18:53:15.4480118+08:00;False|2024-09-23T18:52:22.0135173+08:00;True|2024-09-20T09:59:12.9943442+08:00;False|2024-09-20T09:58:18.6945854+08:00;True|2024-09-12T20:40:58.7161451+08:00;False|2024-09-12T20:40:00.0672966+08:00;True|2024-09-12T16:47:22.7671323+08:00;True|2024-09-12T16:34:18.5850144+08:00;True|2024-09-12T16:13:32.1929032+08:00;True|2024-09-12T09:12:54.4456999+08:00;False|2024-09-12T09:12:06.1002866+08:00;False|2024-09-11T21:06:15.4423786+08:00;True|2024-09-10T15:26:48.7055081+08:00;True|2024-09-10T09:26:36.8509916+08:00;True|2024-09-09T19:51:32.6059511+08:00;True|2024-09-09T19:05:47.5349922+08:00;True|2024-09-09T09:26:23.2022383+08:00;False|2024-09-09T09:25:27.3736749+08:00;True|2024-09-06T15:32:52.1865278+08:00;True|2024-09-06T15:16:01.1405794+08:00;True|2024-09-06T14:21:05.7482343+08:00;True|2024-09-06T14:09:17.1494566+08:00;True|2024-09-06T13:49:56.4128481+08:00;True|2024-09-06T13:11:53.0863947+08:00;True|2024-09-06T09:34:54.5934463+08:00;True|2024-09-06T08:47:19.9744092+08:00;True|2024-09-05T15:01:38.6968629+08:00;True|2024-09-05T14:56:09.3505818+08:00;True|2024-09-05T14:49:56.8774757+08:00;True|2024-09-05T08:14:13.2359921+08:00;False|2024-09-05T08:13:11.8797534+08:00;True|2024-09-03T16:52:02.8227375+08:00;False|2024-09-03T16:51:32.4250926+08:00;True|2024-09-03T16:33:05.7269609+08:00;True|2024-09-03T16:00:15.0288548+08:00;True|2024-08-29T08:06:32.4732067+08:00;False|2024-08-29T08:06:02.4801886+08:00;True|2024-08-26T10:17:08.7733750+08:00;False|2024-08-26T10:11:05.1864217+08:00;False|2024-08-26T09:50:31.1539306+08:00;False|2024-08-26T09:47:37.4351309+08:00;True|2024-08-16T16:55:32.0918962+08:00;True|2024-08-16T16:53:23.3505641+08:00;False|2024-08-16T16:49:30.4579212+08:00;False|2024-08-16T16:47:01.9799743+08:00;</History> <History>True|2024-11-18T07:27:25.3419580Z;True|2024-11-18T15:19:07.4691728+08:00;True|2024-11-18T14:57:25.8637252+08:00;True|2024-11-18T14:52:10.6158576+08:00;True|2024-11-18T14:46:03.5051743+08:00;True|2024-11-18T13:42:14.5146469+08:00;True|2024-11-18T13:27:53.4498275+08:00;True|2024-11-18T11:26:05.8168670+08:00;True|2024-11-18T11:04:00.4711300+08:00;True|2024-11-18T10:54:15.6267907+08:00;True|2024-11-18T10:45:29.5275370+08:00;True|2024-11-15T16:58:39.1926238+08:00;True|2024-11-15T16:45:12.0168760+08:00;True|2024-11-15T16:37:11.8513587+08:00;True|2024-11-15T16:31:13.0430714+08:00;True|2024-11-15T16:27:45.3575015+08:00;False|2024-11-15T16:26:49.5306586+08:00;True|2024-11-15T16:16:54.0542122+08:00;True|2024-11-15T15:51:41.6920560+08:00;False|2024-11-15T15:50:37.8798414+08:00;True|2024-11-06T14:13:46.3129972+08:00;False|2024-11-06T14:12:47.9022879+08:00;False|2024-11-05T20:45:28.3960353+08:00;True|2024-11-05T19:04:11.0417788+08:00;False|2024-11-05T19:03:03.9263878+08:00;True|2024-11-05T15:54:24.8374699+08:00;False|2024-11-05T15:53:24.4214141+08:00;True|2024-10-25T16:51:46.3066612+08:00;True|2024-10-25T12:16:27.8737941+08:00;True|2024-10-25T10:12:38.8056269+08:00;False|2024-10-25T10:11:44.1117608+08:00;True|2024-10-25T09:54:06.8572059+08:00;True|2024-10-25T08:21:42.6333993+08:00;True|2024-10-24T17:56:19.5319332+08:00;True|2024-10-24T17:50:10.0801119+08:00;False|2024-10-24T17:49:21.0726954+08:00;True|2024-10-24T17:40:46.0577697+08:00;False|2024-10-24T17:39:53.3743103+08:00;True|2024-10-24T14:57:00.6752320+08:00;True|2024-10-24T10:08:39.8269595+08:00;False|2024-10-24T10:07:47.3834032+08:00;True|2024-10-22T10:33:10.1961964+08:00;True|2024-10-21T08:43:54.1422810+08:00;False|2024-10-21T08:43:00.6574201+08:00;True|2024-10-18T14:56:55.6749850+08:00;True|2024-10-18T14:47:05.1073813+08:00;True|2024-10-18T11:24:23.9069952+08:00;True|2024-10-18T11:14:57.8486575+08:00;False|2024-10-18T11:14:07.5289704+08:00;True|2024-10-18T10:57:00.2425175+08:00;False|2024-10-18T10:56:04.8949960+08:00;True|2024-10-15T16:44:32.6189434+08:00;True|2024-10-15T14:38:49.8658311+08:00;True|2024-10-15T09:49:55.2197004+08:00;False|2024-10-15T09:49:14.8790668+08:00;False|2024-10-12T15:28:24.1303695+08:00;True|2024-10-10T10:59:36.7878419+08:00;False|2024-10-10T10:58:40.9900315+08:00;True|2024-10-03T10:57:02.9299524+08:00;True|2024-10-03T10:02:10.1156720+08:00;True|2024-09-30T11:07:22.5376794+08:00;True|2024-09-30T10:15:40.3990343+08:00;True|2024-09-30T10:04:38.1942221+08:00;True|2024-09-29T19:22:01.5340857+08:00;False|2024-09-29T19:21:12.2387012+08:00;True|2024-09-26T09:50:22.2637977+08:00;True|2024-09-25T20:44:33.3994634+08:00;True|2024-09-25T16:07:23.2747063+08:00;True|2024-09-25T14:55:37.9194143+08:00;True|2024-09-24T20:03:43.9841995+08:00;True|2024-09-24T19:42:48.7479102+08:00;True|2024-09-24T19:38:31.5777012+08:00;True|2024-09-24T16:26:58.5969765+08:00;True|2024-09-24T15:31:00.7140362+08:00;True|2024-09-24T10:17:46.7830753+08:00;True|2024-09-24T09:40:19.5788062+08:00;False|2024-09-24T09:39:27.4521802+08:00;True|2024-09-23T19:35:55.3572583+08:00;True|2024-09-23T18:53:15.4480118+08:00;False|2024-09-23T18:52:22.0135173+08:00;True|2024-09-20T09:59:12.9943442+08:00;False|2024-09-20T09:58:18.6945854+08:00;True|2024-09-12T20:40:58.7161451+08:00;False|2024-09-12T20:40:00.0672966+08:00;True|2024-09-12T16:47:22.7671323+08:00;True|2024-09-12T16:34:18.5850144+08:00;True|2024-09-12T16:13:32.1929032+08:00;True|2024-09-12T09:12:54.4456999+08:00;False|2024-09-12T09:12:06.1002866+08:00;False|2024-09-11T21:06:15.4423786+08:00;True|2024-09-10T15:26:48.7055081+08:00;True|2024-09-10T09:26:36.8509916+08:00;True|2024-09-09T19:51:32.6059511+08:00;True|2024-09-09T19:05:47.5349922+08:00;True|2024-09-09T09:26:23.2022383+08:00;False|2024-09-09T09:25:27.3736749+08:00;True|2024-09-06T15:32:52.1865278+08:00;True|2024-09-06T15:16:01.1405794+08:00;True|2024-09-06T14:21:05.7482343+08:00;True|2024-09-06T14:09:17.1494566+08:00;True|2024-09-06T13:49:56.4128481+08:00;True|2024-09-06T13:11:53.0863947+08:00;True|2024-09-06T09:34:54.5934463+08:00;True|2024-09-06T08:47:19.9744092+08:00;True|2024-09-05T15:01:38.6968629+08:00;True|2024-09-05T14:56:09.3505818+08:00;True|2024-09-05T14:49:56.8774757+08:00;True|2024-09-05T08:14:13.2359921+08:00;False|2024-09-05T08:13:11.8797534+08:00;True|2024-09-03T16:52:02.8227375+08:00;False|2024-09-03T16:51:32.4250926+08:00;True|2024-09-03T16:33:05.7269609+08:00;True|2024-09-03T16:00:15.0288548+08:00;True|2024-08-29T08:06:32.4732067+08:00;False|2024-08-29T08:06:02.4801886+08:00;True|2024-08-26T10:17:08.7733750+08:00;False|2024-08-26T10:11:05.1864217+08:00;False|2024-08-26T09:50:31.1539306+08:00;False|2024-08-26T09:47:37.4351309+08:00;True|2024-08-16T16:55:32.0918962+08:00;True|2024-08-16T16:53:23.3505641+08:00;False|2024-08-16T16:49:30.4579212+08:00;False|2024-08-16T16:47:01.9799743+08:00;</History> <_PublishTargetUrl>G:\issWeb\ç½ç«åå¸\API</_PublishTargetUrl> </PropertyGroup> <ItemGroup> @@ -45,28 +45,28 @@ <publishTime>02/22/2013 16:43:40</publishTime> </File> <File Include="bin/BLL.dll"> <publishTime>11/06/2024 15:05:51</publishTime> <publishTime>11/18/2024 15:26:50</publishTime> </File> <File Include="bin/BLL.pdb"> <publishTime>11/06/2024 15:05:51</publishTime> <publishTime>11/18/2024 15:26:50</publishTime> </File> <File Include="bin/BouncyCastle.Crypto.dll"> <publishTime>12/18/2020 05:32:28</publishTime> </File> <File Include="bin/DAL.dll"> <publishTime>11/06/2024 15:05:49</publishTime> <publishTime>11/18/2024 15:26:47</publishTime> </File> <File Include="bin/DAL.pdb"> <publishTime>11/06/2024 15:05:49</publishTime> <publishTime>11/18/2024 15:26:47</publishTime> </File> <File Include="bin/Dapper.dll"> <publishTime>07/22/2016 22:52:40</publishTime> </File> <File Include="bin/DBUtility.dll"> <publishTime>11/05/2024 19:03:14</publishTime> <publishTime>11/18/2024 15:26:41</publishTime> </File> <File Include="bin/DBUtility.pdb"> <publishTime>11/05/2024 19:03:14</publishTime> <publishTime>11/18/2024 15:26:41</publishTime> </File> <File Include="bin/Grpc.Core.Api.dll"> <publishTime>03/22/2022 13:17:26</publishTime> @@ -111,10 +111,10 @@ <publishTime>07/25/2012 19:48:56</publishTime> </File> <File Include="bin/Model.dll"> <publishTime>11/06/2024 14:13:05</publishTime> <publishTime>11/18/2024 15:26:42</publishTime> </File> <File Include="bin/Model.pdb"> <publishTime>11/06/2024 14:13:05</publishTime> <publishTime>11/18/2024 15:26:42</publishTime> </File> <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs"> <publishTime>04/15/2024 12:55:45</publishTime> @@ -147,34 +147,34 @@ <publishTime>10/23/2021 17:07:54</publishTime> </File> <File Include="bin/Pub_Class.dll"> <publishTime>11/05/2024 19:03:11</publishTime> <publishTime>11/18/2024 15:26:39</publishTime> </File> <File Include="bin/Pub_Class.pdb"> <publishTime>11/05/2024 19:03:11</publishTime> <publishTime>11/18/2024 15:26:39</publishTime> </File> <File Include="bin/Pub_Control.dll"> <publishTime>11/05/2024 19:03:13</publishTime> <publishTime>11/18/2024 15:26:40</publishTime> </File> <File Include="bin/Pub_Control.pdb"> <publishTime>11/05/2024 19:03:13</publishTime> <publishTime>11/18/2024 15:26:40</publishTime> </File> <File Include="bin/RestSharp.dll"> <publishTime>08/31/2012 06:22:50</publishTime> </File> <File Include="bin/SQLHelper.dll"> <publishTime>11/05/2024 19:03:13</publishTime> <publishTime>11/18/2024 15:26:40</publishTime> </File> <File Include="bin/SQLHelper.pdb"> <publishTime>11/05/2024 19:03:13</publishTime> <publishTime>11/18/2024 15:26:40</publishTime> </File> <File Include="bin/Swashbuckle.Core.dll"> <publishTime>02/16/2015 01:57:08</publishTime> </File> <File Include="bin/SyntacticSugar.dll"> <publishTime>11/05/2024 17:27:43</publishTime> <publishTime>11/18/2024 15:24:44</publishTime> </File> <File Include="bin/SyntacticSugar.pdb"> <publishTime>11/05/2024 17:27:43</publishTime> <publishTime>11/18/2024 15:24:44</publishTime> </File> <File Include="bin/System.Buffers.dll"> <publishTime>07/19/2017 18:01:28</publishTime> @@ -285,19 +285,19 @@ <publishTime>05/09/2023 10:43:40</publishTime> </File> <File Include="bin/TopSdk.dll"> <publishTime>11/05/2024 17:49:50</publishTime> <publishTime>11/13/2024 14:52:33</publishTime> </File> <File Include="bin/TopSdk.pdb"> <publishTime>11/05/2024 16:13:00</publishTime> <publishTime>11/13/2024 14:52:33</publishTime> </File> <File Include="bin/WebActivatorEx.dll"> <publishTime>11/24/2014 19:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> <publishTime>11/13/2024 14:11:29</publishTime> <publishTime>11/18/2024 15:27:22</publishTime> </File> <File Include="bin/WebAPI.pdb"> <publishTime>11/13/2024 14:11:29</publishTime> <publishTime>11/18/2024 15:27:22</publishTime> </File> <File Include="bin/WebAPI.XmlSerializers.dll"> <publishTime>08/16/2024 16:55:28</publishTime> @@ -495,7 +495,7 @@ <publishTime>04/29/2024 08:30:03</publishTime> </File> <File Include="Web.config"> <publishTime>10/25/2024 10:12:36</publishTime> <publishTime>11/15/2024 15:51:40</publishTime> </File> </ItemGroup> </Project> WebAPI/WebAPI.csproj.user
@@ -9,7 +9,7 @@ <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected> <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>D:\æºäºè¿æ\MES\MES-WEB-API\WebAPI\Properties\PublishProfiles\JFAPI.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\æºäºè¿æ\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <UseIISExpress>true</UseIISExpress> <Use64BitIISExpress />