From 9dfddcb21acd47446a612ea64582d45c705548e4 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 01 十一月 2024 11:16:51 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/数据同步/钉钉同步/DD_DataSynchronizationController.cs | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 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 4bb6860..84d603b 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"
@@ -2074,7 +2074,7 @@
if (getInstanceByIdResponse.Body.InstanceStatus != "COMPLETED")
{
- //continue;
+ continue;
}
//寮�鍗曟棩鏈�
@@ -2168,7 +2168,7 @@
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 HNumber='" + HDate_Temp + "'", "Gy_MouldFileMain");
+ 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)
{
@@ -2182,7 +2182,7 @@
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();
@@ -2404,18 +2404,18 @@
string sql_main = "Insert Into Sc_MouldMaintainBillMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate" +
",HYear,HPeriod,HRemark,HUpDateDate" +
- ",HPlanNo,HPlanInterID,HMouldID,HBeginDate" +
+ ",HMouldID,HBeginDate" +
",HEndDate" +
- ",HInnerBillNo,HExplanation,HMouldMaintainRuleInterID,HMaintainLevID,HLastResult" +
+ ",HInnerBillNo,HExplanation,HMouldMaintainRuleInterID,HLastResult" +
",HRequestComDate,HRecentMainModule,HCumulativeModule,HProductionModule" +
",HPlanInterID,HPlanNo,HMaintainLevID)" +
"values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + oItem.HBillNo + "','"+ oItem.HDate + "','" + oItem.HOriginator + "','" + oItem.HMakeDate + "'" +
",'" + DateTime.Now.Year + "','" + DateTime.Now.Month + "','"+ oItem.HRemark + "','" + oItem.HUpdateDate + "'" +
- ",'','0','" + oItem.HMouldID + "','" + oItem.HRepairBeginDate + "'" +
+ ",'" + oItem.HMouldID + "','" + oItem.HRepairBeginDate + "'" +
",'" + oItem.HRepairEndDate + "'" +
- ",'" + oItem.HInstanceID + "','',"+ HMouldMaintainRuleInterID + ",0,'OK'" +
+ ",'" + oItem.HInstanceID + "','',"+ HMouldMaintainRuleInterID + ",'OK'" +
",'"+ oItem.HRequestComDate + "'," + oItem.HRecentMainModule + "," + oItem.HCumulativeModule + "," + oItem.HProductionModule + "" +
- "," + oItem.HPlanInterID + "," + oItem.HPlanNo + "," + oItem.HMaintainLevID + ")";
+ "," + (oItem.HPlanInterID == "" ? "0" : oItem.HPlanInterID) + ",'" + oItem.HPlanNo + "'," + oItem.HMaintainLevID + ")";
LogService.Write(sql_main);
oCN.RunProc(sql_main);
int i = 1;
@@ -2562,9 +2562,9 @@
continue;
}
- if (oItem.HInstanceID != "9b6e108c-b7bf-45e4-910d-5629ac30d4aa") {
- continue;
- }
+ //if (oItem.HInstanceID != "9b6e108c-b7bf-45e4-910d-5629ac30d4aa") {
+ // continue;
+ //}
//璁惧缂栫爜
if (keys.Contains("textField_lfg9hgys"))
--
Gitblit v1.9.1