From 772eeec62afebdc6090b69c7584aa65c07ed8834 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 14 三月 2025 13:11:24 +0800
Subject: [PATCH] 添加通用列名，负荷报表接口
---
WebAPI/Controllers/数据同步/钉钉同步/DD_DataSynchronizationController.cs | 264 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 211 insertions(+), 53 deletions(-)
diff --git "a/WebAPI/Controllers/\346\225\260\346\215\256\345\220\214\346\255\245/\351\222\211\351\222\211\345\220\214\346\255\245/DD_DataSynchronizationController.cs" "b/WebAPI/Controllers/\346\225\260\346\215\256\345\220\214\346\255\245/\351\222\211\351\222\211\345\220\214\346\255\245/DD_DataSynchronizationController.cs"
index 7dbfc38..ac770ab 100644
--- "a/WebAPI/Controllers/\346\225\260\346\215\256\345\220\214\346\255\245/\351\222\211\351\222\211\345\220\214\346\255\245/DD_DataSynchronizationController.cs"
+++ "b/WebAPI/Controllers/\346\225\260\346\215\256\345\220\214\346\255\245/\351\222\211\351\222\211\345\220\214\346\255\245/DD_DataSynchronizationController.cs"
@@ -536,25 +536,29 @@
#region 鑾峰彇 閽夐拤-鏅鸿兘浜轰簨 鑾峰彇鍦ㄨ亴鍛樺伐ID鍒楄〃
public bool getEmployeeIDList_DingDing(long offset, long size, ref List<string> IDList, ref string msg)
{
+ LogService.Write("鏌ョ湅5-1-1");
OapiSmartworkHrmEmployeeQueryonjobResponse response = new OapiSmartworkHrmEmployeeQueryonjobResponse();
do
{
if (getEmployeeIDList_Page_DingDing(offset, size, ref response, ref msg) == false)
{
+ LogService.Write("鏌ョ湅5-1-2");
return false;
}
-
+ LogService.Write("鏌ョ湅5-1-3");
for (int i = 0; i < response.Result.DataList.Count; i++)
{
IDList.Add(response.Result.DataList[i]);
}
-
+ LogService.Write("鏌ョ湅5-1-4");
if (response.Result.NextCursor != 0)
{
+ LogService.Write("鏌ョ湅5-1-4-1");
offset = response.Result.NextCursor;
}
else
{
+ LogService.Write("鏌ョ湅5-1-5");
break;
}
} while (true);
@@ -1098,6 +1102,7 @@
lsmain.Add(oItem);
}catch(Exception e)
{
+ LogService.Write("鏌ョ湅1" + e.Message);
continue;
}
}
@@ -1134,7 +1139,7 @@
string formUuid = "FORM-A01FFB0B63A34F18B7753F695F49190DJEY7"; //绛惧埌琛�
int pageNumber = 1;
int pageSize = 100;
-
+ LogService.Write("鏌ョ湅1");
//鑾峰彇鍒嗗眰瀹℃牳琛ㄧ殑瀹炰緥ID鍒楄〃
List<string> IDList = new List<string>();
if (getInstanceIDList_YiDa(appType, systemToken, userID, formUuid, pageNumber, pageSize, ref IDList, ref msg) == false)
@@ -1341,6 +1346,7 @@
lsmain.Add(oItem);
}catch(Exception e)
{
+ LogService.Write("鏌ョ湅2"+e.Message);
continue;
}
}
@@ -1372,7 +1378,7 @@
string formUuid = "FORM-E3DFC12364514330A836DD3056C15668UGG7";
int pageNumber = 1;
int pageSize = 100;
-
+ LogService.Write("鏌ョ湅2");
//鑾峰彇瀹炰緥ID鍒楄〃
List<string> IDList = new List<string>();
if (getInstanceIDList_YiDa(appType, systemToken, userID, formUuid, pageNumber, pageSize, ref IDList, ref msg) == false)
@@ -1610,6 +1616,7 @@
}
catch (Exception e)
{
+ LogService.Write("鏌ョ湅3"+e.Message);
continue;
}
}
@@ -1641,7 +1648,7 @@
string formUuid = "FORM-K5766HA1CKZB4E1L64Y1KBWCJTQF2HWJ3NDJL4";
int pageNumber = 1;
int pageSize = 100;
-
+ LogService.Write("鏌ョ湅3");
//鑾峰彇瀹炰緥ID鍒楄〃
List<string> IDList = new List<string>();
if (getInstanceIDList_YiDa(appType, systemToken, userID, formUuid, pageNumber, pageSize, ref IDList, ref msg) == false)
@@ -1913,6 +1920,7 @@
}
catch (Exception e)
{
+ LogService.Write("鏌ョ湅4"+e.Message);
continue;
}
}
@@ -1944,7 +1952,7 @@
string formUuid = "FORM-65AD77453E7F44EA847166C3AB5A1F04IPSS";
int pageNumber = 1;
int pageSize = 100;
-
+ LogService.Write("鏌ョ湅4");
//鑾峰彇瀹炰緥ID鍒楄〃
List<string> IDList = new List<string>();
if (getInstanceIDList_YiDa(appType, systemToken, userID, formUuid, pageNumber, pageSize, ref IDList, ref msg) == false)
@@ -2158,6 +2166,7 @@
}
catch (Exception e)
{
+ LogService.Write("鏌ョ湅5"+e.Message);
continue;
}
}
@@ -2189,14 +2198,16 @@
{
long offset = 0;
long size = 50;
-
+ LogService.Write("鏌ョ湅5");
+ LogService.Write("鏌ョ湅5.1");
//鑾峰彇鑺卞悕鍐岃亴鍛業D鍒楄〃
List<string> IDList = new List<string>();
if (getEmployeeIDList_DingDing(offset, size, ref IDList, ref msg) == false)
{
+ LogService.Write("鏌ョ湅5-1"+ msg);
return false;
}
-
+ LogService.Write("鏌ョ湅5-2");
//鑾峰彇璇︾粏淇℃伅骞堕檮鍔犲埌鍒楄〃lsmain涓�
List<DD_HuaMingCe> lsmain = new List<DD_HuaMingCe>();
if (getEmployeeDetailList_HuaMingCe__DingDing(IDList, ref lsmain, ref msg) == false)
@@ -2205,6 +2216,7 @@
}
try
{
+ LogService.Write("鏌ョ湅5-3");
oCN.BeginTran();
foreach (DD_HuaMingCe oItem in lsmain)
{
@@ -2229,12 +2241,14 @@
oCN.RunProc(sql_main);
}
+ LogService.Write("鏌ョ湅5-4");
oCN.Commit();
return true;
}
catch (Exception e)
{
msg = e.Message;
+ LogService.Write("鏌ョ湅5鎶ラ敊:" + e.Message);
oCN.RollBack();
return false;
}
@@ -2294,11 +2308,88 @@
{
continue;
}
+ string HStaus = "";
+
+ switch (getInstanceByIdResponse.Body.InstanceStatus)
+ {
+ case "COMPLETED":
+ HStaus = "缁翠慨缁撴潫";
+ break;
+ case "RUNNING":
+ HStaus = "缁翠慨杩涜涓�";
+ break;
+ case "TERMINATED":
+ HStaus = "缁翠慨缁堟";
+ break;
+ }
+
+ LogService.Write("鐘舵��:" + HStaus);
if (getInstanceByIdResponse.Body.InstanceStatus != "COMPLETED")
{
+ //妯″叿缂栫爜
+ if (keys.Contains("selectField_lq3idkvg"))
+ {
+ string HDate_Temp = response.Body.Result[i].FormData["selectField_lq3idkvg"].ToString();
+ LogService.Write("妯″叿:" + HDate_Temp);
+ DataSet ds = oCN.RunProcReturn("select * from Gy_MouldFileMain with(nolock) where HMouldNo='" + HDate_Temp + "'", "Gy_MouldFileMain");
+ string HMouldID = "0";
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ LogService.Write("娴嬭瘯1:" + ds.Tables[0].Rows[0]["HCloseDate"].ToString());
+ string HUpdateDate = ds.Tables[0].Rows[0]["HCloseDate"].ToString() == "" ? "1900-01-01 00:00:00" : ds.Tables[0].Rows[0]["HCloseDate"].ToString();
+ string HMouldStaus = ds.Tables[0].Rows[0]["HMouldStatus"].ToString();
+ LogService.Write("妯″叿:" + HDate_Temp + ",鐘舵��:" + HMouldStaus + ",鏃堕棿:" + HUpdateDate);
+ HMouldID = ds.Tables[0].Rows[0]["HInterID"].ToString();
+ if (HMouldStaus != HStaus && DateTime.Parse(HUpdateDate) <= DateTime.Parse(oItem.HUpdateDate)) {
+ //淇敼妯″叿鐨勭姸鎬佸拰鏃堕棿
+ oCN.RunProc("update Gy_MouldFileMain set HMouldUseStatus='" + HStaus + "',HCloseDate='" + oItem.HUpdateDate + "' WHERE HInterID =" + HMouldID);
+ }
+ }
+ }
+
continue;
}
+
+ //妯″叿缂栫爜
+ if (keys.Contains("selectField_lq3idkvg"))
+ {
+ string HDate_Temp = response.Body.Result[i].FormData["selectField_lq3idkvg"].ToString();
+ LogService.Write("妯″叿:" + HDate_Temp);
+ DataSet ds = oCN.RunProcReturn("select * from Gy_MouldFileMain with(nolock) where HMouldNo='" + HDate_Temp + "'", "Gy_MouldFileMain");
+ string HMouldID = "0";
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ LogService.Write("娴嬭瘯2:" + ds.Tables[0].Rows[0]["HCloseDate"].ToString());
+ HMouldID = ds.Tables[0].Rows[0]["HInterID"].ToString();
+ string HUpdateDate = ds.Tables[0].Rows[0]["HCloseDate"].ToString() == "" ? "1900-01-01 00:00:00" : ds.Tables[0].Rows[0]["HCloseDate"].ToString();
+
+ string HMouldStaus = ds.Tables[0].Rows[0]["HMouldStatus"].ToString();
+
+ LogService.Write("妯″叿:" + HDate_Temp+ ",鐘舵��:" + HMouldStaus + ",鏃堕棿:" + HUpdateDate);
+ if (HMouldStaus != HStaus && DateTime.Parse(HUpdateDate) <= DateTime.Parse(oItem.HUpdateDate))
+ {
+ //淇敼妯″叿鐨勭姸鎬佸拰鏃堕棿
+ oCN.RunProc("update Gy_MouldFileMain set HMouldUseStatus='" + HStaus + "',HCloseDate='" + oItem.HUpdateDate + "' WHERE HInterID =" + HMouldID);
+ }
+ }
+ oItem.HMouldID = long.Parse(HMouldID);
+ oItem.HRemark = HDate_Temp;
+ //LogService.Write("娴嬭瘯3:" + HMouldID);
+
+ //鏌ヨ淇濆吇璁″垝
+ ds = oCN.RunProcReturn(@"select a.HInterID,a.HBillNo from Sc_MouldMaintainPlanBillMain a
+ inner join Sc_MouldMaintainPlanBillSub b on a.HInterID = b.HInterID
+ where a.HMouldID =" + oItem.HMouldID+ " order by a.HMakeDate desc", "Sc_MouldMaintainPlanBillMain");
+ //LogService.Write("娴嬭瘯4:");
+ oItem.HPlanInterID = "";
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ oItem.HPlanInterID = ds.Tables[0].Rows[0]["HInterID"].ToString();
+ oItem.HPlanNo = ds.Tables[0].Rows[0]["HBillNo"].ToString();
+ }
+ }
+ LogService.Write("妯″叿缂栫爜:" + oItem.HMouldID);
//寮�鍗曟棩鏈�
if (keys.Contains("dateField_lq0v65sv"))
@@ -2306,6 +2397,7 @@
double HDate_Temp = double.Parse(response.Body.Result[i].FormData["dateField_lq0v65sv"].ToString());
oItem.HDate = convertFromMillisecondsToDateString(HDate_Temp, "yyyy-MM-dd HH:mm");
}
+ LogService.Write("寮�鍗曟棩鏈�:" + oItem.HDate);
//妯″叿淇濆吇绾у埆
if (keys.Contains("selectField_m1ip9j31"))
@@ -2330,6 +2422,7 @@
oItem.HMaintainLevID = HDate_Temp;
}
+ LogService.Write("妯″叿淇濆吇绾у埆:" + oItem.HMaintainLevID);
//淇ā寮�濮嬫椂闂�
if (keys.Contains("dateField_lq4gf2ih"))
@@ -2337,6 +2430,7 @@
double HDate_Temp = double.Parse(response.Body.Result[i].FormData["dateField_lq4gf2ih"].ToString());
oItem.HRepairBeginDate = DateTime.Parse(convertFromMillisecondsToDateString(HDate_Temp, "yyyy-MM-dd HH:mm"));
}
+ LogService.Write("淇ā寮�濮嬫椂闂�:" + oItem.HRepairBeginDate);
//淇ā缁撴潫鏃堕棿
if (keys.Contains("dateField_lq4gf2ii"))
@@ -2344,6 +2438,7 @@
double HDate_Temp = double.Parse(response.Body.Result[i].FormData["dateField_lq4gf2ii"].ToString());
oItem.HRepairEndDate = DateTime.Parse(convertFromMillisecondsToDateString(HDate_Temp, "yyyy-MM-dd HH:mm"));
}
+ LogService.Write("淇ā缁撴潫鏃堕棿:" + oItem.HRepairEndDate);
//妯″叿鍗曟嵁鍙�
if (keys.Contains("serialNumberField_lqaak4ts"))
@@ -2351,6 +2446,7 @@
string HDate_Temp = response.Body.Result[i].FormData["serialNumberField_lqaak4ts"].ToString();
oItem.HBillNo = HDate_Temp;
}
+ LogService.Write("妯″叿鍗曟嵁鍙�:" + oItem.HBillNo);
//瑕佹眰瀹屾垚鏃ユ湡
if (keys.Contains("dateField_lq3idkvd"))
@@ -2358,6 +2454,7 @@
double HDate_Temp = double.Parse(response.Body.Result[i].FormData["dateField_lq3idkvd"].ToString());
oItem.HRequestComDate = DateTime.Parse(convertFromMillisecondsToDateString(HDate_Temp, "yyyy-MM-dd HH:mm:ss"));
}
+ LogService.Write("瑕佹眰瀹屾垚鏃ユ湡:" + oItem.HRequestComDate);
//缁翠慨鍙楃悊鏃ユ湡
if (keys.Contains("dateField_lq4gf2ih"))
@@ -2365,6 +2462,7 @@
double HDate_Temp = double.Parse(response.Body.Result[i].FormData["dateField_lq4gf2ih"].ToString());
oItem.HRepairAccepDate = DateTime.Parse(convertFromMillisecondsToDateString(HDate_Temp, "yyyy-MM-dd HH:mm:ss"));
}
+ LogService.Write("缁翠慨鍙楃悊鏃ユ湡:" + oItem.HRepairAccepDate);
//鏈�杩戜繚鍏绘ā鏁�
if (keys.Contains("numberField_lq3idkvi"))
@@ -2372,6 +2470,7 @@
string HDate_Temp = response.Body.Result[i].FormData["numberField_lq3idkvi"].ToString();
oItem.HRecentMainModule = double.Parse(HDate_Temp);
}
+ LogService.Write("鏈�杩戜繚鍏绘ā鏁�:" + oItem.HRecentMainModule);
//绱妯℃暟
if (keys.Contains("numberField_lq3idkvj"))
@@ -2379,6 +2478,7 @@
string HDate_Temp = response.Body.Result[i].FormData["numberField_lq3idkvj"].ToString();
oItem.HCumulativeModule = double.Parse(HDate_Temp);
}
+ LogService.Write("绱妯℃暟:" + oItem.HCumulativeModule);
//鏈鐢熶骇妯℃暟
if (keys.Contains("textField_lq4vdvgh"))
@@ -2386,32 +2486,7 @@
string HDate_Temp = response.Body.Result[i].FormData["textField_lq4vdvgh"].ToString();
oItem.HProductionModule = double.Parse(HDate_Temp);
}
-
- //妯″叿缂栫爜
- if (keys.Contains("selectField_lq3idkvg"))
- {
- string HDate_Temp = response.Body.Result[i].FormData["selectField_lq3idkvg"].ToString();
- DataSet ds = oCN.RunProcReturn("select * from Gy_MouldFileMain with(nolock) where HMouldNo='" + HDate_Temp + "'", "Gy_MouldFileMain");
- string HMouldID = "0";
- if (ds.Tables[0].Rows.Count > 0)
- {
- HMouldID = ds.Tables[0].Rows[0]["HInterID"].ToString();
- }
- oItem.HMouldID = long.Parse(HMouldID);
- oItem.HRemark = HDate_Temp;
-
-
- //鏌ヨ淇濆吇璁″垝
- ds = oCN.RunProcReturn(@"select a.HInterID,a.HBillNo from Sc_MouldMaintainPlanBillMain a
- inner join Sc_MouldMaintainPlanBillSub b on a.HInterID = b.HInterID
- where a.HMouldID =" + oItem.HMouldID + " and a.HMaintainLevID = " + oItem.HMaintainLevID, "Sc_MouldMaintainPlanBillMain");
- oItem.HPlanInterID = "";
- if (ds.Tables[0].Rows.Count > 0) {
- oItem.HPlanInterID = ds.Tables[0].Rows[0]["HInterID"].ToString();
- oItem.HPlanNo = ds.Tables[0].Rows[0]["HInterID"].ToString();
- }
- }
-
+ LogService.Write("绱妯℃暟:" + oItem.HProductionModule);
//缁翠慨閮ㄩ棬
if (keys.Contains("selectField_lq3idkva"))
@@ -2425,6 +2500,7 @@
}
oItem.HDeptID = long.Parse(HDeptID);
}
+ LogService.Write("缁翠慨閮ㄩ棬:" + oItem.HDeptID);
//鏂拌璁″鍛�
oItem.HNewDesignLife = 30000;
@@ -2441,6 +2517,7 @@
}
oItem.HEmpID = long.Parse(HEmpID);
}
+ LogService.Write("缁翠慨浜�:" + oItem.HEmpID);
//缁翠慨鏃堕棿
if (keys.Contains("numberField_lq3ixr9j"))
@@ -2450,6 +2527,7 @@
oItem.HTimes = long.Parse(HDate_Temp);
oItem.HPlanTimes = long.Parse(HDate_Temp);
}
+ LogService.Write("缁翠慨鏃堕棿:" + oItem.HTimes);
//瀛愯〃 缁翠慨瑕佹眰 缁翠慨澶囨敞(闂鎻忚堪)
if (keys.Contains("tableField_lq3ixr9b"))
@@ -2466,15 +2544,19 @@
{
oItemSub.HRepairExplanation = dic[ij]["textareaField_lq3ixr9e"].ToString();
}
+ LogService.Write("缁翠慨瑕佹眰:" + oItemSub.HRepairExplanation);
//澶囨敞
if (keys_Sub.Contains("textField_lq3ixr9d"))
{
oItemSub.HRemark = dic[ij]["textField_lq3ixr9d"].ToString();
}
+ LogService.Write("澶囨敞:" + oItemSub.HRemark);
+
oItem.DetailColMouldRepair.Add(oItemSub);
}
}
+
string HRemark = "";
//瀛愯〃 淇濆吇澶囨敞(闂鎻忚堪)
@@ -2496,9 +2578,10 @@
oItemSub.HClaim = HDate_Temp[ij];
oItemSub.HMaintainResult = HRemark;
oItem.DetailColMouldMaintain.Add(oItemSub);
+ LogService.Write("鍏蜂綋瑕佹眰:" + oItemSub.HClaim);
}
-
}
+
int startindex = response.Body.Result[i].Title.IndexOf("zh_CN") + 8;
oItem.HTitle = startIndex + response.Body.Result[i].Title.Substring(startindex).Replace("\"}", "").Replace("'", "");
@@ -2533,6 +2616,7 @@
}
catch (Exception e)
{
+ LogService.Write("鎶ラ敊:" + e.Message);
continue;
}
}
@@ -2568,7 +2652,7 @@
string formUuid = "FORM-30C78F46E77E46A9AA8778214CEFE6B5J0AN";
int pageNumber = 1;
int pageSize = 100;
-
+ LogService.Write("鏌ョ湅7");
//鑾峰彇妯″叿缁翠慨淇濆吇琛ㄧ殑瀹炰緥ID鍒楄〃
List<string> IDList = new List<string>();
if (getInstanceIDList_YiDa(appType, systemToken, userID, formUuid, pageNumber, pageSize, ref IDList, ref msg) == false)
@@ -2780,8 +2864,45 @@
continue;
}
+ string HStaus = "";
+
+ switch (getInstanceByIdResponse.Body.InstanceStatus)
+ {
+ case "COMPLETED":
+ HStaus = "缁翠慨缁撴潫";
+ break;
+ case "RUNNING":
+ HStaus = "缁翠慨杩涜涓�";
+ break;
+ case "TERMINATED":
+ HStaus = "缁翠慨缁堟";
+ break;
+ }
+ LogService.Write("鐘舵��:" + HStaus);
if (getInstanceByIdResponse.Body.InstanceStatus != "COMPLETED")
{
+ //璁惧缂栫爜
+ if (keys.Contains("textField_lfg9hgys"))
+ {
+ string HDate_Temp = response.Body.Result[i].FormData["textField_lfg9hgys"].ToString();
+ DataSet ds = oCN.RunProcReturn("select * from Gy_EquipFileBillMain with(nolock) where HEquipFileNo='" + HDate_Temp + "'", "Gy_EquipFileBillMain");
+ string HEquipID = "0";
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ HEquipID = ds.Tables[0].Rows[0]["HInterID"].ToString();
+ oItem.HEquipID = long.Parse(HEquipID);
+ oItem.HRemark2 = HDate_Temp;
+
+ string HUpdateDate = ds.Tables[0].Rows[0]["HCloseDate"].ToString()==""?"1900-01-01 00:00:00": ds.Tables[0].Rows[0]["HCloseDate"].ToString();
+ string HMouldStaus = ds.Tables[0].Rows[0]["HStatus"].ToString();
+ LogService.Write("璁惧:" + HDate_Temp + ",鐘舵��:" + HMouldStaus + ",鏃堕棿:" + HUpdateDate);
+ if (HMouldStaus != HStaus && DateTime.Parse(HUpdateDate) <= DateTime.Parse(oItem.HUpdateDate))
+ {
+ //淇敼璁惧鐨勭姸鎬佸拰鏃堕棿
+ oCN.RunProc("update Gy_EquipFileBillMain set HStatus='" + HStaus + "',HCloseDate='" + oItem.HUpdateDate + "' WHERE HInterID =" + HEquipID);
+ }
+ }
+ }
continue;
}
@@ -2794,18 +2915,28 @@
{
string HDate_Temp = response.Body.Result[i].FormData["textField_lfg9hgys"].ToString();
DataSet ds = oCN.RunProcReturn("select * from Gy_EquipFileBillMain with(nolock) where HEquipFileNo='" + HDate_Temp + "'", "Gy_EquipFileBillMain");
+ LogService.Write("璁惧鏃�:" + HDate_Temp);
string HEquipID = "0";
if (ds.Tables[0].Rows.Count > 0)
{
HEquipID = ds.Tables[0].Rows[0]["HInterID"].ToString();
oItem.HEquipID = long.Parse(HEquipID);
oItem.HRemark2 = HDate_Temp;
+ string HUpdateDate = ds.Tables[0].Rows[0]["HCloseDate"].ToString() == "" ? "1900-01-01 00:00:00" : ds.Tables[0].Rows[0]["HCloseDate"].ToString();
+ string HMouldStaus = ds.Tables[0].Rows[0]["HStatus"].ToString();
+ LogService.Write("璁惧:" + HDate_Temp + ",鐘舵��:" + HMouldStaus + ",鏃堕棿:" + HUpdateDate);
+ if (HMouldStaus != HStaus && DateTime.Parse(HUpdateDate) <= DateTime.Parse(oItem.HUpdateDate))
+ {
+ //淇敼璁惧鐨勭姸鎬佸拰鏃堕棿
+ oCN.RunProc("update Gy_EquipFileBillMain set HStatus='" + HStaus + "',HCloseDate='" + oItem.HUpdateDate + "' WHERE HInterID =" + HEquipID);
+ }
}
else
{
continue;
}
}
+ LogService.Write("璁惧:" + oItem.HEquipID);
//缁翠慨閮ㄩ棬
if (keys.Contains("selectField_kzgkw10a"))
@@ -2824,6 +2955,7 @@
}
}
+ LogService.Write("缁翠慨閮ㄩ棬:" + oItem.HDeptID);
//缁翠慨浜�
if (keys.Contains("employeeField_lthwkdh2"))
@@ -2842,6 +2974,7 @@
}
}
+ LogService.Write("缁翠慨浜�:" + oItem.HEmpID);
//缁翠慨鍐呭
if (keys.Contains("textField_l2r9bvwk"))
@@ -2850,6 +2983,7 @@
oItem.HRepairContent = HDate_Temp;
}
+ LogService.Write("缁翠慨鍐呭:" + oItem.HRepairContent);
//鎶ヤ慨绫诲埆
if (keys.Contains("multiSelectField_lfg9hgyv"))
@@ -2858,7 +2992,7 @@
oItem.HRepairCategory = HDate_Temp[0];
}
-
+ LogService.Write("鎶ヤ慨绫诲埆:" + oItem.HRepairCategory);
//绱ф�ョ▼搴�
if (keys.Contains("radioField_kzgkw10c"))
{
@@ -2866,6 +3000,7 @@
oItem.HUrgenLevel = HDate_Temp;
}
+ LogService.Write("绱ф�ョ▼搴�:" + oItem.HUrgenLevel);
//鎶ヤ慨浜�
if (keys.Contains("employeeField_lkasesrk"))
@@ -2874,6 +3009,7 @@
oItem.HRepairer = HDate_Temp[0];
}
+ LogService.Write("鎶ヤ慨浜�:" + oItem.HRepairer);
//鏄惁鏈変骇鑳藉奖鍝�
if (keys.Contains("textField_lyjddw0r"))
@@ -2882,7 +3018,8 @@
oItem.HIsCapacityImpact = HDate_Temp;
}
-
+ LogService.Write("鏄惁鏈変骇鑳藉奖鍝�:" + oItem.HIsCapacityImpact);
+
//缁翠慨鏃堕棿
if (keys.Contains("textField_l2r95oo2"))
{
@@ -2898,6 +3035,8 @@
oItem.HTimes = int.Parse(new string(HDate_Temp.Where(char.IsDigit).ToArray()));
oItem.HPlanTimes = int.Parse(new string(HDate_Temp.Where(char.IsDigit).ToArray()));
}
+ LogService.Write("缁翠慨鏃堕棿:" + oItem.HTimes);
+
//瀛愯〃 缁翠慨瑕佹眰 缁翠慨澶囨敞(闂鎻忚堪)
@@ -2910,6 +3049,7 @@
oItem.HExplanation = HDate_Temp;
sub.HRepairExplanation = HDate_Temp;
}
+ LogService.Write("缁翠慨瑕佹眰:" + oItem.HExplanation);
//澶囨敞
if (keys.Contains("textField_l2r95oo0"))
@@ -2918,6 +3058,8 @@
sub.HRemark = HDate_Temp;
}
+ LogService.Write("澶囨敞:" + oItem.HRemark);
+
oItem.DetailColMouldRepair.Add(sub);
int startindex = response.Body.Result[i].Title.IndexOf("zh_CN") + 8;
@@ -2953,7 +3095,7 @@
}
catch (Exception e)
{
- LogService.Write(e.Message);
+ LogService.Write("鎶ラ敊:" + e.Message);
a = "";
continue;
}
@@ -2989,7 +3131,7 @@
string formUuid = "FORM-OM566O7177LW0ARJ5IMFF63NTFKA34G9RL2YKN1";
int pageNumber = 1;
int pageSize = 100;
-
+ LogService.Write("鏌ョ湅6");
//鑾峰彇璁惧缁翠慨淇濆吇琛ㄧ殑瀹炰緥ID鍒楄〃
List<string> IDList = new List<string>();
if (getInstanceIDList_YiDa(appType, systemToken, userID, formUuid, pageNumber, pageSize, ref IDList, ref msg) == false)
@@ -3136,6 +3278,11 @@
{
continue;
}
+ string result = getProcessInstanceResponse.Body.Result.Result.ToString();
+ if (result != "agree")
+ {
+ continue;
+ }
string[] deptNameAndGroupName = getProcessInstanceResponse.Body.Result.OriginatorDeptName.Split('-');//鑾峰彇閮ㄩ棬鎷兼帴瀛楃涓叉暟缁�
oItem.HDeptName = deptNameAndGroupName[1];
oItem.HGroupName = deptNameAndGroupName[deptNameAndGroupName.Length-1];
@@ -3160,11 +3307,11 @@
}
oItem.HMangerID = int.Parse(HMangerID);
//澶勭悊閮ㄩ棬鍜岀彮缁勫悕绉癷d
- ds = oCN.RunProcReturn("select * from Gy_Department with(nolock) where HName='" + oItem.HDeptName + "'", "Gy_Department");
+ ds = oCN.RunProcReturn("select * from h_v_GroupList with(nolock) where 鐝粍鍚嶇О='" + oItem.HGroupName + "'", "h_v_GroupList");
string HDeptID = "0";
if (ds.Tables[0].Rows.Count > 0)
{
- HDeptID = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ HDeptID = ds.Tables[0].Rows[0]["HDeptID"].ToString();
}
oItem.HDeptID = int.Parse(HDeptID);
ds = oCN.RunProcReturn("select * from Gy_Group with(nolock) where HName='" + oItem.HGroupName + "'", "Gy_Group");
@@ -3188,10 +3335,18 @@
//寰幆閬嶅巻鑾峰彇鑱屽憳鍚嶇Оid锛屽伐鏃�
for (int i = 0; i < rows.Count; i++)
{
+ if (rows[i].RowValue.Count<10)
+ {
+ continue;
+ }
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++)
{
+ if (nameArray.Length < j + 1)//闃叉鍑虹幇浜虹鑱屼簡璁℃椂鍗曠敵璇峰畬浜嗗鑷存妧鏈汉鍛樹笌璁℃椂浜烘暟涓嶄竴鑷寸殑闂
+ {
+ continue;
+ }
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";
@@ -3249,7 +3404,7 @@
{
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");
+ DataSet dataSet = oCN.RunProcReturn(@"select HInterID from Pay_ErrWorkTimesRequestBillMain a with(nolock) where a.HRemark like '%閽夐拤瀵煎叆%' and a.HIsImport = 1 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)
@@ -3271,13 +3426,13 @@
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) " +
+ "(HYear,HPeriod,HBillType,HBillSubType,HBillStatus,HInterID,HBillNo,HDate,HInnerBillNo,HDeptID,HGroupID,HMangerID,HICMOInterID,HICMOBillNo,HExplanation,HSumRequestTimes,HMaterID,HUnitID,HPlanQty,HBatchNo,HRemark,HMaker,HMakeDate,HChecker,HCheckDate,HIsImport) " +
"values(" +
"" + HYear +
"," + HPeriod +
",'" + HBillType +
"','" + " " +
- "'," + 1 +
+ "'," + 2 +
"," + HInterID +
",'" + HBillNo +
"','" + oItem.HDate +
@@ -3296,6 +3451,9 @@
"','" + oItem.HRemark +
"','" + "System" +
"'," + "GETDATE()" +
+ ",'" + "System" +
+ "'," + "GETDATE()" +
+ "," + "1" +
")";
//涓昏〃
LogService.Write(sql);
@@ -3429,14 +3587,14 @@
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;
- }
+ //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;
--
Gitblit v1.9.1