From 1d30ccbec6631bbf9b1fc14ece97843587b2abbf Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 23 九月 2024 15:51:01 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
PayM/bin/Debug/Pub_Control.pdb | 0
PayM/obj/Debug/AxInterop.gregn6Lib.dll | 0
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt | 4
PayM/bin/Debug/SQLHelper.dll | 0
PayM/bin/Debug/BLL.pdb | 0
WebAPI/Models/ClsSb_EquipRepairWorkBillMain.cs | 6
Model/生产管理/模具管理/ClsSb_MouldRepairWorkBillMain.cs | 1
PayM/bin/Debug/Interop.gregn6Lib.dll | 0
PayM/bin/Debug/SQLHelper.pdb | 0
PayM/obj/Debug/PayM.pdb | 0
Model/生产管理/模具管理/ClsSc_MouldMaintainBillMain.cs | 4
PayM/bin/Debug/DBUtility.dll | 0
PayM/bin/Debug/Pub_Control.dll | 0
PayM/bin/Debug/AxInterop.gregn6Lib.dll | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache | 0
WebAPI/DLL/ClsSb_EquipRepairWorkBill.cs | 7 +
DAL/生产管理/模具管理/ClsSc_MouldMaintainBill.cs | 7 +
LMES/Program.cs | 72 ++++++------
PayM/bin/Debug/BLL.dll | 0
PayM/bin/Debug/DAL.pdb | 0
WebAPI/Controllers/数据同步/钉钉同步/DD_DataSynchronizationController.cs | 215 +++++++++++++++++++++++++++++------
PayM/bin/Debug/Pub_Class.pdb | 0
PayM/obj/Debug/Interop.gregn6Lib.dll | 0
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb | 0
sdk_dingding/TopSdk/bin/Debug/TopSdk.dll | 0
DAL/生产管理/模具管理/ClsSb_MouldRepairWorkBill.cs | 4
PayM/bin/Debug/Model.dll | 0
PayM/bin/Debug/PayM.dll | 0
PayM/bin/Debug/Model.pdb | 0
PayM/bin/Debug/Pub_Class.dll | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.dll | 0
WebAPI/Controllers/Sc_MouldRepairInBillListController.cs | 4
PayM/bin/Debug/DAL.dll | 0
PayM/obj/Debug/PayM.dll | 0
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt | 9 +
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb | 0
PayM/bin/Debug/DBUtility.pdb | 0
PayM/bin/Debug/PayM.pdb | 0
39 files changed, 251 insertions(+), 82 deletions(-)
diff --git "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSb_MouldRepairWorkBill.cs" "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSb_MouldRepairWorkBill.cs"
index 064804d..0c7e815 100644
--- "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSb_MouldRepairWorkBill.cs"
+++ "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSb_MouldRepairWorkBill.cs"
@@ -63,6 +63,7 @@
",HCycleUnit='" + omodel.HCycleUnit + "'" +
",HExplanation='" + omodel.HExplanation + "'" +
",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
+ ",HRepairAccepDate='" + omodel.HRepairAccepDate + "'" +
",HSupID=" + omodel.HSupID.ToString() +
",HRepairType='" + omodel.HRepairType + "'" +
",HNewModel='" + omodel.HNewModel + "'" +
@@ -161,6 +162,7 @@
",HCycleUnit,HPlanTimes,HTimes,HEmpID,HManagerID"+
",HDeptID,HExplanation,HInnerBillNo,HMouldID" +
",HSupID,HRepairType,HNewModel,HNewDesignLife,HMainSourceBillType,HMainSourceInterID,HMainSourceEntryID" +
+ ",HRepairAccepDate" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HMaker + "',getdate()" +
@@ -168,7 +170,7 @@
",'" + omodel.HCycleUnit + "'," + omodel.HPlanTimes.ToString() + "," + omodel.HTimes.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() +
"," + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + omodel.HMouldID.ToString() +
", " + omodel.HSupID.ToString() + ",'" + omodel.HRepairType + "','" + omodel.HNewModel + "'," + omodel.HNewDesignLife.ToString() +",'"+ omodel.HMainSourceBillType+"',"+ omodel.HMainSourceInterID.ToString()+","+ omodel.HMainSourceEntryID.ToString()+
- ") ");
+ ",'"+ omodel.HRepairAccepDate + "') ");
//鎻掑叆瀛愯〃
foreach (Model.ClsSb_MouldRepairWorkBillSub oSub in DetailColl)
{
diff --git "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainBill.cs" "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainBill.cs"
index 276ef2d..30c2cbf 100644
--- "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainBill.cs"
+++ "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainBill.cs"
@@ -117,6 +117,10 @@
",HEndDate='" + omodel.HEndDate + "'" +
",HExplanation='" + omodel.HExplanation + "'" +
",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
+ ",HRequestComDate='" + omodel.HRequestComDate + "'" +
+ ",HRecentMainModule='" + omodel.HRecentMainModule + "'" +
+ ",HCumulativeModule='" + omodel.HCumulativeModule + "'" +
+ ",HProductionModule='" + omodel.HProductionModule + "'" +
",HMouldMaintainRuleInterID=" + omodel.HMouldMaintainRuleInterID.ToString() +
",HMaintainLevID=" + omodel.HMaintainLevID +
",HLastResult='" + omodel.HLastResult + "'" +
@@ -210,6 +214,7 @@
",HPlanNo,HPlanInterID,HMouldID,HBeginDate"+
",HEndDate"+
",HInnerBillNo,HExplanation,HMouldMaintainRuleInterID,HMaintainLevID,HLastResult" +
+ ",HRequestComDate,HRecentMainModule,HCumulativeModule,HProductionModule" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'"+
@@ -217,7 +222,7 @@
",'" + omodel.HEndDate + "'"+
",'" + omodel.HInnerBillNo + "','" + omodel.HExplanation + "'," +omodel.HMouldMaintainRuleInterID.ToString() + "," + omodel.HMaintainLevID +
",'" + omodel.HLastResult + "'" +
- ") ");
+ ",'"+ omodel.HRequestComDate + "'," + omodel.HRecentMainModule + "," + omodel.HCumulativeModule + "," + omodel.HProductionModule + ") ");
if (DetailCol.Count > 0)
{
diff --git a/LMES/Program.cs b/LMES/Program.cs
index 7f03a02..81a7262 100644
--- a/LMES/Program.cs
+++ b/LMES/Program.cs
@@ -15,44 +15,44 @@
{
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
- Application.Run(new DingDing_autoGetData());
+ //Application.Run(new DingDing_autoGetData());
- //DBUtility.ClsPub.AppPath = System.Environment.CurrentDirectory;
- //Pub_Class.ClsPub.AppPath = System.Environment.CurrentDirectory;
- //Pub_Class.ClsPub.SetIPAddress();
- //DBUtility.ClsPub.SetIPAddress();
- //DBUtility.ClsPub.VersionNum = "12.1";
- //Pub_Class.ClsPub.VersionNum = "12.1";//
- ////===================================================================
- //try
- //{
- // if (DBUtility.ClsPub.CheckUpdate())
- // {
- // MessageBox.Show("鍙戠幇鏈�鏂扮増鏈�,闇�瑕佹洿鏂帮紒");
- // string strFileName = DBUtility.ClsPub.AppPath + @"\HX_Update.exe";
- // System.Diagnostics.Process.Start(strFileName);
- // Application.Exit();
- // return;
- // }
- // else
- // {
- // //============================================
- // BLL.FrmLogin frmlg = new BLL.FrmLogin();
- // frmlg.ShowDialog();
- // if (frmlg.isOk)
- // {
- // MDIMain MainFrm = new MDIMain();
- // Application.Run(MainFrm);
- // }
- // }
- //}
- //catch (Exception e)
- //{
- // MessageBox.Show(e.Message);
- // Application.Exit();
- // return;
- //}
+ DBUtility.ClsPub.AppPath = System.Environment.CurrentDirectory;
+ Pub_Class.ClsPub.AppPath = System.Environment.CurrentDirectory;
+ Pub_Class.ClsPub.SetIPAddress();
+ DBUtility.ClsPub.SetIPAddress();
+ DBUtility.ClsPub.VersionNum = "12.1";
+ Pub_Class.ClsPub.VersionNum = "12.1";//
+ //===================================================================
+ try
+ {
+ if (DBUtility.ClsPub.CheckUpdate())
+ {
+ MessageBox.Show("鍙戠幇鏈�鏂扮増鏈�,闇�瑕佹洿鏂帮紒");
+ string strFileName = DBUtility.ClsPub.AppPath + @"\HX_Update.exe";
+ System.Diagnostics.Process.Start(strFileName);
+ Application.Exit();
+ return;
+ }
+ else
+ {
+ //============================================
+ BLL.FrmLogin frmlg = new BLL.FrmLogin();
+ frmlg.ShowDialog();
+ if (frmlg.isOk)
+ {
+ MDIMain MainFrm = new MDIMain();
+ Application.Run(MainFrm);
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ MessageBox.Show(e.Message);
+ Application.Exit();
+ return;
+ }
}
}
}
diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSb_MouldRepairWorkBillMain.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSb_MouldRepairWorkBillMain.cs"
index 984bfb6..b4e0257 100644
--- "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSb_MouldRepairWorkBillMain.cs"
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSb_MouldRepairWorkBillMain.cs"
@@ -10,6 +10,7 @@
public Int64 HRepairID;// --维修项目(Gy_Repair)
public DateTime HRepairBeginDate;// --维修开始日期
public DateTime HRepairEndDate;// --维修结束日期
+ public DateTime HRepairAccepDate;// --维修受理日期
public string HRepairContent;// --维修内容
public string HCycleUnit;// varchar(10) --时间单位(小时，天)
public double HPlanTimes;// money --计划维修工时
diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainBillMain.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainBillMain.cs"
index 6ab8a98..bcd80e7 100644
--- "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainBillMain.cs"
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainBillMain.cs"
@@ -22,5 +22,9 @@
public int HMouldMaintainPlanEntryID; //器具保养计划单（Sc_MouldMaintainPlanBillSub_Plan）子内码
public string HLastResult;
+ public string HRequestComDate;
+ public Int64 HRecentMainModule;
+ public Int64 HCumulativeModule;
+ public Int64 HProductionModule;
}
}
diff --git a/PayM/bin/Debug/AxInterop.gregn6Lib.dll b/PayM/bin/Debug/AxInterop.gregn6Lib.dll
index f4127a1..dcca299 100644
--- a/PayM/bin/Debug/AxInterop.gregn6Lib.dll
+++ b/PayM/bin/Debug/AxInterop.gregn6Lib.dll
Binary files differ
diff --git a/PayM/bin/Debug/BLL.dll b/PayM/bin/Debug/BLL.dll
index 58981c8..10d4a0a 100644
--- a/PayM/bin/Debug/BLL.dll
+++ b/PayM/bin/Debug/BLL.dll
Binary files differ
diff --git a/PayM/bin/Debug/BLL.pdb b/PayM/bin/Debug/BLL.pdb
index 8a3ee7f..e037880 100644
--- a/PayM/bin/Debug/BLL.pdb
+++ b/PayM/bin/Debug/BLL.pdb
Binary files differ
diff --git a/PayM/bin/Debug/DAL.dll b/PayM/bin/Debug/DAL.dll
index 5da4f1e..b82b232 100644
--- a/PayM/bin/Debug/DAL.dll
+++ b/PayM/bin/Debug/DAL.dll
Binary files differ
diff --git a/PayM/bin/Debug/DAL.pdb b/PayM/bin/Debug/DAL.pdb
index 157c845..e63d9b4 100644
--- a/PayM/bin/Debug/DAL.pdb
+++ b/PayM/bin/Debug/DAL.pdb
Binary files differ
diff --git a/PayM/bin/Debug/DBUtility.dll b/PayM/bin/Debug/DBUtility.dll
index 78fe909..2b2cb63 100644
--- a/PayM/bin/Debug/DBUtility.dll
+++ b/PayM/bin/Debug/DBUtility.dll
Binary files differ
diff --git a/PayM/bin/Debug/DBUtility.pdb b/PayM/bin/Debug/DBUtility.pdb
index 6d688ac..8a9baeb 100644
--- a/PayM/bin/Debug/DBUtility.pdb
+++ b/PayM/bin/Debug/DBUtility.pdb
Binary files differ
diff --git a/PayM/bin/Debug/Interop.gregn6Lib.dll b/PayM/bin/Debug/Interop.gregn6Lib.dll
index c9bd545..38438ed 100644
--- a/PayM/bin/Debug/Interop.gregn6Lib.dll
+++ b/PayM/bin/Debug/Interop.gregn6Lib.dll
Binary files differ
diff --git a/PayM/bin/Debug/Model.dll b/PayM/bin/Debug/Model.dll
index da5f5a9..9ff3121 100644
--- a/PayM/bin/Debug/Model.dll
+++ b/PayM/bin/Debug/Model.dll
Binary files differ
diff --git a/PayM/bin/Debug/Model.pdb b/PayM/bin/Debug/Model.pdb
index 4f5983c..8e0b283 100644
--- a/PayM/bin/Debug/Model.pdb
+++ b/PayM/bin/Debug/Model.pdb
Binary files differ
diff --git a/PayM/bin/Debug/PayM.dll b/PayM/bin/Debug/PayM.dll
index 0c4c115..b7c5581 100644
--- a/PayM/bin/Debug/PayM.dll
+++ b/PayM/bin/Debug/PayM.dll
Binary files differ
diff --git a/PayM/bin/Debug/PayM.pdb b/PayM/bin/Debug/PayM.pdb
index 80280a8..fe38585 100644
--- a/PayM/bin/Debug/PayM.pdb
+++ b/PayM/bin/Debug/PayM.pdb
Binary files differ
diff --git a/PayM/bin/Debug/Pub_Class.dll b/PayM/bin/Debug/Pub_Class.dll
index d2c9b49..36ab673 100644
--- a/PayM/bin/Debug/Pub_Class.dll
+++ b/PayM/bin/Debug/Pub_Class.dll
Binary files differ
diff --git a/PayM/bin/Debug/Pub_Class.pdb b/PayM/bin/Debug/Pub_Class.pdb
index a698355..a90decd 100644
--- a/PayM/bin/Debug/Pub_Class.pdb
+++ b/PayM/bin/Debug/Pub_Class.pdb
Binary files differ
diff --git a/PayM/bin/Debug/Pub_Control.dll b/PayM/bin/Debug/Pub_Control.dll
index 6ae2820..b65ed25 100644
--- a/PayM/bin/Debug/Pub_Control.dll
+++ b/PayM/bin/Debug/Pub_Control.dll
Binary files differ
diff --git a/PayM/bin/Debug/Pub_Control.pdb b/PayM/bin/Debug/Pub_Control.pdb
index 2e63e8d..a73d128 100644
--- a/PayM/bin/Debug/Pub_Control.pdb
+++ b/PayM/bin/Debug/Pub_Control.pdb
Binary files differ
diff --git a/PayM/bin/Debug/SQLHelper.dll b/PayM/bin/Debug/SQLHelper.dll
index 92597ac..92ac54b 100644
--- a/PayM/bin/Debug/SQLHelper.dll
+++ b/PayM/bin/Debug/SQLHelper.dll
Binary files differ
diff --git a/PayM/bin/Debug/SQLHelper.pdb b/PayM/bin/Debug/SQLHelper.pdb
index 2d3db95..11c0b55 100644
--- a/PayM/bin/Debug/SQLHelper.pdb
+++ b/PayM/bin/Debug/SQLHelper.pdb
Binary files differ
diff --git a/PayM/obj/Debug/AxInterop.gregn6Lib.dll b/PayM/obj/Debug/AxInterop.gregn6Lib.dll
index f4127a1..dcca299 100644
--- a/PayM/obj/Debug/AxInterop.gregn6Lib.dll
+++ b/PayM/obj/Debug/AxInterop.gregn6Lib.dll
Binary files differ
diff --git a/PayM/obj/Debug/Interop.gregn6Lib.dll b/PayM/obj/Debug/Interop.gregn6Lib.dll
index c9bd545..38438ed 100644
--- a/PayM/obj/Debug/Interop.gregn6Lib.dll
+++ b/PayM/obj/Debug/Interop.gregn6Lib.dll
Binary files differ
diff --git a/PayM/obj/Debug/PayM.dll b/PayM/obj/Debug/PayM.dll
index 0c4c115..b7c5581 100644
--- a/PayM/obj/Debug/PayM.dll
+++ b/PayM/obj/Debug/PayM.dll
Binary files differ
diff --git a/PayM/obj/Debug/PayM.pdb b/PayM/obj/Debug/PayM.pdb
index 80280a8..fe38585 100644
--- a/PayM/obj/Debug/PayM.pdb
+++ b/PayM/obj/Debug/PayM.pdb
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache
index fea44e6..b04aad7 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
index 0fcea8f..3cc1a90 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -14,4 +14,8 @@
E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
+<<<<<<< HEAD
+E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
+=======
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
+>>>>>>> b9924fc9913cd3d10ea35725a3d7ee6eff09fb36
diff --git a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
index eb08517..44f3792 100644
--- a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
+++ b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
@@ -4032,7 +4032,7 @@
lsmain = oListModels.getObjectByJson_Gy_MouldRepairWorkBillMain(msg2);
foreach (Model.ClsSb_MouldRepairWorkBillMain oItem in lsmain)
{
- //oItem.HMaker = "";
+ oItem.HMaker = msg4;
UserName = msg4; //鍒跺崟浜�
oItem.HBillType = "3807";
oItem.HBillSubType = "3807";
@@ -5538,7 +5538,7 @@
foreach (Model.ClsSc_MouldMaintainBillMain oItem in lsmain)
{
UserName = oItem.HMaker; //鍒跺崟浜�
- DBUtility.ClsPub.CurUserName = UserName;
+ DBUtility.ClsPub.CurUserName = msg5;
oItem.HBillType = "3819";
oItem.HBillSubType = "3819";
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 9d3c298..df0bb97 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"
@@ -16,6 +16,7 @@
using DingTalk.Api;
using DingTalk.Api.Response;
using System.Globalization;
+using System.Linq;
namespace WebAPI.Controllers
{
@@ -268,15 +269,23 @@
public string HExplanation;// varchar(500) --缁翠慨瑕佹眰
public string HInnerBillNo;// varchar(50) --鍐呴儴鍗曟嵁鍙�
public Int64 HMouldID;
+ public Int64 HMouldMaintainRuleInterID;
+ public Int64 HMaintainItemID;
public Int64 HSupID;// int --渚涘簲鍟嗭紙Gy_Supplier锛� addnew
public string HRepairType;// varchar(10) --缁翠慨绫诲瀷锛堝唴閮ㄧ淮淇紝濮斿缁翠慨锛� addnew
public string HNewModel;// varchar(100) --缁翠慨鍚庢柊瑙勬牸 addnew
public Single HNewDesignLife;// money --鏂拌璁″鍛�
public string HRemark;
-
+ public DateTime HRequestComDate;
+ public double HRecentMainModule;
+ public double HCumulativeModule;
+ public double HProductionModule;
+ public DateTime HRepairAccepDate;
+
//鍗曟嵁鍐呭
+ public string HBillNo; //鍗曟嵁鍙�
public string HDate; //鏃ユ湡
public string HCheckLevel; //瀹℃牳绛夌骇
public string HArea; //鍖哄煙
@@ -332,6 +341,10 @@
public Single HPlanTimes;// money --璁″垝缁翠慨宸ユ椂
public Single HTimes;// money --瀹為檯缁翠慨宸ユ椂
public string HRemark2;//澶囨敞
+ public string HRepairCategory;
+ public string HUrgenLevel;
+ public string HRepairer;
+ public string HIsCapacityImpact;
//鍗曟嵁鍐呭
public string HDate; //鏃ユ湡
@@ -510,7 +523,7 @@
//OriginatorId = "12", //鏍规嵁娴佺▼鍙戣捣浜哄伐鍙锋煡璇€��
//TaskId = "12", //浠诲姟ID銆�
- //CreateFromTimeGMT = DateTime.Now.ToString("dd") == "01" ? "2022-01-01" : DateTime.Now.AddDays(-7).ToString("yyyy-MM-dd"), //鍒涘缓鏃堕棿璧峰鍊笺��
+ //CreateFromTimeGMT = DateTime.Now.AddMonths(-10).ToString("yyyy-MM-dd"), //鍒涘缓鏃堕棿璧峰鍊笺��
//CreateToTimeGMT = DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss"), //鍒涘缓鏃堕棿缁堟鍊笺��
ModifiedFromTimeGMT = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd"), //淇敼鏃堕棿璧峰鍊笺��
ModifiedToTimeGMT = DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss"), //淇敼鏃堕棿缁堟鍊笺��
@@ -2061,6 +2074,13 @@
continue;
}
+ //寮�鍗曟棩鏈�
+ if (keys.Contains("dateField_lq0v65sv"))
+ {
+ double HDate_Temp = double.Parse(response.Body.Result[i].FormData["dateField_lq0v65sv"].ToString());
+ oItem.HDate = convertFromMillisecondsToDateString(HDate_Temp, "yyyy-MM-dd HH:mm");
+ }
+
//淇ā寮�濮嬫椂闂�
if (keys.Contains("dateField_lq4gf2ih"))
{
@@ -2075,17 +2095,52 @@
oItem.HRepairEndDate = DateTime.Parse(convertFromMillisecondsToDateString(HDate_Temp, "yyyy-MM-dd HH:mm"));
}
- //妯″叿鎵规鍙�
+ //妯″叿鍗曟嵁鍙�
if (keys.Contains("serialNumberField_lqaak4ts"))
{
string HDate_Temp = response.Body.Result[i].FormData["serialNumberField_lqaak4ts"].ToString();
- oItem.HRemark = HDate_Temp;
+ oItem.HBillNo = HDate_Temp;
}
- //妯″叿缂栫爜
- if (keys.Contains("dateField_lq4gf2ii"))
+ //瑕佹眰瀹屾垚鏃ユ湡
+ if (keys.Contains("dateField_lq3idkvd"))
{
- string HDate_Temp = response.Body.Result[i].FormData["dateField_lq4gf2ii"].ToString();
+ 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"));
+ }
+
+ //缁翠慨鍙楃悊鏃ユ湡
+ if (keys.Contains("dateField_lq4gf2ih"))
+ {
+ 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"));
+ }
+
+ //鏈�杩戜繚鍏绘ā鏁�
+ if (keys.Contains("numberField_lq3idkvi"))
+ {
+ string HDate_Temp = response.Body.Result[i].FormData["numberField_lq3idkvi"].ToString();
+ oItem.HRecentMainModule = double.Parse(HDate_Temp);
+ }
+
+ //绱妯℃暟
+ if (keys.Contains("numberField_lq3idkvj"))
+ {
+ string HDate_Temp = response.Body.Result[i].FormData["numberField_lq3idkvj"].ToString();
+ oItem.HCumulativeModule = double.Parse(HDate_Temp);
+ }
+
+ //鏈鐢熶骇妯℃暟
+ if (keys.Contains("textField_lq4vdvgh"))
+ {
+ 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 HNumber='" + HDate_Temp + "'", "Gy_MouldFileMain");
string HMouldID = "0";
if (ds.Tables[0].Rows.Count > 0)
@@ -2093,6 +2148,7 @@
HMouldID = ds.Tables[0].Rows[0]["HInterID"].ToString();
}
oItem.HMouldID = long.Parse(HMouldID);
+ oItem.HRemark = HDate_Temp;
}
@@ -2116,7 +2172,7 @@
if (keys.Contains("employeeField_lq3idkvh"))
{
string[] HDate_Temp = JsonConvert.DeserializeObject<string[]>(JsonConvert.SerializeObject(response.Body.Result[i].FormData["employeeField_lq3idkvh"]));
- DataSet ds = oCN.RunProcReturn("select * from Gy_Employee with(nolock) where HNumber='" + HDate_Temp[0] + "'", "Gy_Employee");
+ DataSet ds = oCN.RunProcReturn("select * from Gy_Employee with(nolock) where hname='" + HDate_Temp[0] + "'", "Gy_Employee");
string HEmpID = "0";
if (ds.Tables[0].Rows.Count > 0)
{
@@ -2233,6 +2289,7 @@
}
catch (Exception e)
{
+ LogService.Write(e.Message);
msg = e.Message;
return false;
}
@@ -2268,11 +2325,33 @@
try
{
oCN.BeginTran();
+
+ string HMouldMaintainRuleInterID = "0";
+ string HMaintainItemID = "0";
+ string HRepairID = "0";
+ DataSet dataSet = oCN.RunProcReturn(@"select a.HInterID,item.HMaintainItemID from Sc_MouldMaintainRuleBillMain a with(nolock)
+inner join Sc_MouldMaintainRuleBillSub_Item item with(nolock) on a.HInterID = item.HInterID
+where a.HRemark like'%閽夐拤鍚屾%'", "Sc_MouldMaintainRuleBillMain");
+
+ if (dataSet.Tables[0].Rows.Count > 0)
+ {
+ HMouldMaintainRuleInterID = dataSet.Tables[0].Rows[0]["HInterID"].ToString();
+ HMaintainItemID = dataSet.Tables[0].Rows[0]["HMaintainItemID"].ToString();
+ }
+
+ dataSet = oCN.RunProcReturn(@"select HItemID from Gy_Repair a with(nolock) where a.HRemark like'%閽夐拤鍚屾%' and HName like'%妯″叿缁翠慨%'", "Gy_Repair");
+
+ if (dataSet.Tables[0].Rows.Count > 0)
+ {
+ HRepairID = dataSet.Tables[0].Rows[0]["HItemID"].ToString();
+ }
+
foreach (MouldFileWeiXiuBaoYang oItem in lsmain)
{
//淇濆吇璁板綍
if (oItem.DetailColMouldMaintain.Count != 0)
{
+
string BillType = "3819";
string sql = $@"select HInnerBillNo from Sc_MouldMaintainBillMain
where HInnerBillNo = '{oItem.HInstanceID}'";
@@ -2281,7 +2360,7 @@
if (ds.Tables[0].Rows.Count == 0)
{
long HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
- string HBillNo = DBUtility.ClsPub.CreateBillCode_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
+ //string HBillNo = DBUtility.ClsPub.CreateBillCode_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
//long HInterID = 0;
//string HBillNo = "";
string sql_main = "Insert Into Sc_MouldMaintainBillMain " +
@@ -2290,11 +2369,13 @@
",HPlanNo,HPlanInterID,HMouldID,HBeginDate" +
",HEndDate" +
",HInnerBillNo,HExplanation,HMouldMaintainRuleInterID,HMaintainLevID,HLastResult" +
- ")values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "',getdate(),'" + oItem.HOriginator + "','" + oItem.HMakeDate + "'" +
+ ",HRequestComDate,HRecentMainModule,HCumulativeModule,HProductionModule)" +
+ "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.HRepairEndDate + "'" +
- ",'" + oItem.HInstanceID + "','',0,0,'OK')";
+ ",'" + oItem.HInstanceID + "','',"+ HMouldMaintainRuleInterID + ",0,'OK'" +
+ ",'"+ oItem.HRequestComDate + "'," + oItem.HRecentMainModule + "," + oItem.HCumulativeModule + "," + oItem.HProductionModule + ")";
LogService.Write(sql_main);
oCN.RunProc(sql_main);
int i = 1;
@@ -2306,11 +2387,12 @@
",HManagerID" +
",HCloseMan,HCloseType,HRemark" +
",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaintainResult" +
- ") values('" + HInterID + "'," + i + ",0,'" + oItem_Detail.HClaim + "'" +
+ ") " +
+ "values('" + HInterID + "'," + i + ","+ HMaintainItemID + ",'" + oItem_Detail.HClaim + "'" +
",'','" + oItem_Detail.HClaim + "'" +
",'" + oItem.HEmpID + "'" +
",'','','" + oItem_Detail.HMaintainResult + "'" +
- ",'0','0','','',0,0,'')";
+ ",'0','0','','',0,0,'Y')";
LogService.Write(sql_sub);
oCN.RunProc(sql_sub);
i += 1;
@@ -2330,7 +2412,7 @@
if (ds.Tables[0].Rows.Count == 0)
{
long HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
- string HBillNo = DBUtility.ClsPub.CreateBillCode_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
+ //string HBillNo = DBUtility.ClsPub.CreateBillCode_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
//long HInterID = 0;
//string HBillNo = "";
string sql_main = "Insert Into Sc_MouldRepairWorkBillMain " +
@@ -2340,12 +2422,14 @@
",HCycleUnit,HPlanTimes,HTimes,HEmpID,HManagerID" +
",HDeptID,HExplanation,HInnerBillNo,HMouldID" +
",HSupID,HRepairType,HNewModel,HNewDesignLife,HMainSourceBillType,HMainSourceInterID,HMainSourceEntryID" +
- ")values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "',getdate()" +
- ",'" + DateTime.Now.Year + "','" + DateTime.Now.Month + "','','" + oItem.HOriginator + "','" + oItem.HMakeDate + "'" +
- ",'0','0','" + oItem.HRepairBeginDate + "','" + oItem.HUpdateDate + "',''" +
+ ",HRepairAccepDate)values" +
+ "('" + BillType + "','" + BillType + "'," + HInterID + ",'" + oItem.HBillNo + "','"+ oItem .HDate+ "'" +
+ ",'" + DateTime.Now.Year + "','" + DateTime.Now.Month + "','"+ oItem.HRemark + "','" + oItem.HOriginator + "','" + oItem.HMakeDate + "'" +
+ ",'0','"+ HRepairID + "','" + oItem.HRepairBeginDate + "','" + oItem.HRepairEndDate + "',''" +
",'灏忔椂','" + oItem.HPlanTimes + "','" + oItem.HTimes + "','" + oItem.HEmpID + "',0" +
",'" + oItem.HDeptID + "','','" + oItem.HInstanceID + "','" + oItem.HMouldID + "'" +
- ",'0','鍐呴儴缁翠慨','','" + oItem.HNewDesignLife + "','',0,0)";
+ ",'0','鍐呴儴缁翠慨','','" + oItem.HNewDesignLife + "','1',0,0" +
+ ",'"+ oItem.HRepairAccepDate + "')";
LogService.Write(sql_main);
oCN.RunProc(sql_main);
int i = 1;
@@ -2357,7 +2441,7 @@
",HRepairID,HRepairExplanation,HManagerID,HMoney) values" +
"('" + HInterID + "'," + i + ",'','','','" + oItem_Detail.HRemark + "'" +
",0,0,'','',0,0" +
- ",0,'" + oItem_Detail.HRepairExplanation + "','" + oItem.HEmpID + "',0)";
+ ","+ HRepairID + ",'" + oItem_Detail.HRepairExplanation + "','" + oItem.HEmpID + "',0)";
LogService.Write(sql_sub);
oCN.RunProc(sql_sub);
i += 1;
@@ -2373,6 +2457,7 @@
}
catch (Exception e)
{
+ LogService.Write(e.Message);
msg = e.Message;
oCN.RollBack();
return false;
@@ -2385,7 +2470,7 @@
#region 鑾峰彇 瀹滄惌-璁惧缁翠慨璁板綍鍗� 瀹炰緥ID鍒楄〃瀵瑰簲鐨勫疄渚嬭鎯�
public bool getInstanceDetailList___EquipRepairWeiXiu_YiDa(string appType, string systemToken, string userID, string formUuid, List<string> IDList, ref List<EquipRepairWeiXiu> lsmain, ref string msg, int size = 500)
{
-
+ string a = "";
try
{
int startIndex = 0;
@@ -2437,11 +2522,59 @@
continue;
}
+ //鎶ヤ慨绫诲埆
+ if (keys.Contains("multiSelectField_lfg9hgyv"))
+ {
+ string[] HDate_Temp = JsonConvert.DeserializeObject<string[]>(JsonConvert.SerializeObject(response.Body.Result[i].FormData["multiSelectField_lfg9hgyv"]));
+
+ oItem.HRepairCategory = HDate_Temp[0];
+ }
+
+ //绱ф�ョ▼搴�
+ if (keys.Contains("radioField_kzgkw10c"))
+ {
+ string HDate_Temp = response.Body.Result[i].FormData["radioField_kzgkw10c"].ToString();
+
+ oItem.HUrgenLevel = HDate_Temp;
+ }
+
+ //鎶ヤ慨浜�
+ if (keys.Contains("employeeField_lkasesrk"))
+ {
+ string[] HDate_Temp = JsonConvert.DeserializeObject<string[]>(JsonConvert.SerializeObject(response.Body.Result[i].FormData["employeeField_lkasesrk"]));
+
+ oItem.HRepairer = HDate_Temp[0];
+ }
+
+ //鏄惁鏈変骇鑳藉奖鍝�
+ if (keys.Contains("textField_lyjddw0r"))
+ {
+ string HDate_Temp = response.Body.Result[i].FormData["textField_lyjddw0r"].ToString();
+
+ oItem.HIsCapacityImpact = HDate_Temp;
+ }
+
+ //缁翠慨鏃堕棿
+ if (keys.Contains("textField_l2r95oo2"))
+ {
+ string HDate_Temp = response.Body.Result[i].FormData["textField_l2r95oo2"].ToString();
+ bool containsNumber = HDate_Temp.Any(c => char.IsDigit(c));
+
+ if (!containsNumber)
+ {
+ HDate_Temp = "0";
+ }
+ LogService.Write("1:------"+HDate_Temp+ ",2:------" + int.Parse(new string(HDate_Temp.Where(char.IsDigit).ToArray())));
+ //a = HDate_Temp;
+ oItem.HTimes = int.Parse(new string(HDate_Temp.Where(char.IsDigit).ToArray()));
+ oItem.HPlanTimes = int.Parse(new string(HDate_Temp.Where(char.IsDigit).ToArray()));
+ }
+
//璁惧缂栫爜
if (keys.Contains("textField_lfg9hgys"))
{
string HDate_Temp = response.Body.Result[i].FormData["textField_lfg9hgys"].ToString();
- DataSet ds = oCN.RunProcReturn("select * from Gy_MouldFileMain with(nolock) where HNumber='" + HDate_Temp + "'", "Gy_MouldFileMain");
+ 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)
{
@@ -2450,7 +2583,6 @@
oItem.HEquipID = long.Parse(HEquipID);
oItem.HRemark2 = HDate_Temp;
}
-
//缁翠慨閮ㄩ棬
if (keys.Contains("selectField_kzgkw10a"))
@@ -2465,27 +2597,17 @@
oItem.HDeptID = long.Parse(HDeptID);
}
-
//缁翠慨浜�
if (keys.Contains("employeeField_lthwkdh2"))
{
string[] HDate_Temp = JsonConvert.DeserializeObject<string[]>(JsonConvert.SerializeObject(response.Body.Result[i].FormData["employeeField_lthwkdh2"]));
- DataSet ds = oCN.RunProcReturn("select * from Gy_Employee with(nolock) where HNumber='" + HDate_Temp[0] + "'", "Gy_Employee");
+ DataSet ds = oCN.RunProcReturn("select * from Gy_Employee with(nolock) where HName='" + HDate_Temp[0] + "'", "Gy_Employee");
string HEmpID = "0";
if (ds.Tables[0].Rows.Count > 0)
{
HEmpID = ds.Tables[0].Rows[0]["HItemID"].ToString();
}
oItem.HEmpID = long.Parse(HEmpID);
- }
-
- //缁翠慨鏃堕棿
- if (keys.Contains("textField_l2r95oo2"))
- {
- string HDate_Temp = response.Body.Result[i].FormData["textField_l2r95oo2"].ToString();
-
- oItem.HTimes = long.Parse(HDate_Temp);
- oItem.HPlanTimes = long.Parse(HDate_Temp);
}
//缁翠慨鍐呭
@@ -2505,7 +2627,7 @@
if (keys.Contains("textareaField_lthwo99r"))
{
string HDate_Temp = response.Body.Result[i].FormData["textareaField_lthwo99r"].ToString();
-
+ oItem.HExplanation = HDate_Temp;
sub.HRepairExplanation = HDate_Temp;
}
@@ -2551,6 +2673,8 @@
}
catch (Exception e)
{
+ //LogService.Write(a);
+ a = "";
continue;
}
}
@@ -2586,7 +2710,7 @@
int pageNumber = 1;
int pageSize = 100;
- //鑾峰彇妯″叿缁翠慨淇濆吇琛ㄧ殑瀹炰緥ID鍒楄〃
+ //鑾峰彇璁惧缁翠慨淇濆吇琛ㄧ殑瀹炰緥ID鍒楄〃
List<string> IDList = new List<string>();
if (getInstanceIDList_YiDa(appType, systemToken, userID, formUuid, pageNumber, pageSize, ref IDList, ref msg) == false)
{
@@ -2603,6 +2727,14 @@
try
{
oCN.BeginTran();
+
+ DataSet dataSet = oCN.RunProcReturn(@"select HItemID from Gy_Repair a with(nolock) where a.HRemark like'%閽夐拤鍚屾%' and HName like'%璁惧缁翠慨%'", "Gy_Repair");
+ string HRepairID = "0";
+ if (dataSet.Tables[0].Rows.Count > 0)
+ {
+ HRepairID = dataSet.Tables[0].Rows[0]["HItemID"].ToString();
+ }
+
foreach (EquipRepairWeiXiu oItem in lsmain)
{
//缁翠慨璁板綍
@@ -2625,11 +2757,13 @@
",HEquipID,HRepairID,HPlanTimes,HEmpID,HManagerID,HTimes" +
",HDeptID,HExplanation,HInnerBillNo,HRepairBeginDate,HRepairEndDate" +
",HRepairContent,HCycleUnit,HMainSourceBillType,HMainSourceInterID,HMainSourceEntryID" +
- ")values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "',getdate()" +
+ ",HRepairCategory,HUrgenLevel,HRepairer,HIsCapacityImpact)" +
+ "values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "',getdate()" +
",'" + DateTime.Now.Year + "','" + DateTime.Now.Month + "','"+ oItem.HRemark2 + "','" + oItem.HOriginator + "','" + oItem.HMakeDate + "'" +
- ",'" + oItem.HEquipID + "','0','" + oItem.HTimes + "','" + oItem.HEmpID + "','" + oItem.HEmpID + "','" + oItem.HTimes + "'" +
- ",'" + oItem.HDeptID + "','" + oItem.HExplanation + "','" + oItem.HInstanceID + "','',''" +
- ",'" + oItem.HRepairContent + "','灏忔椂','','0',0)";
+ ",'" + oItem.HEquipID + "','"+ HRepairID + "','" + oItem.HTimes + "','" + oItem.HEmpID + "','" + oItem.HEmpID + "','" + oItem.HTimes + "'" +
+ ",'" + oItem.HDeptID + "','"+ oItem.HExplanation + "','" + oItem.HInstanceID + "','"+ oItem.HMakeDate + "','" + oItem.HUpdateDate + "'" +
+ ",'" + oItem.HRepairContent + "','灏忔椂','鎵嬪伐褰曞叆','0',0" +
+ ",'"+ oItem.HRepairCategory + "','" + oItem.HUrgenLevel + "','" + oItem.HRepairer + "','" + oItem.HIsCapacityImpact + "')";
LogService.Write(sql_main);
oCN.RunProc(sql_main);
int i = 1;
@@ -2641,7 +2775,7 @@
",HRepairID,HManagerID,HRepairExplanation,HEmpID)" +
"values('" + HInterID + "'," + i + ",'','','','" + oItem_Detail.HRemark + "'" +
",0,0,'','',0,0" +
- ",0,'" + oItem.HEmpID + "','" + oItem_Detail.HRepairExplanation + "','" + oItem.HEmpID + "')";
+ "," + HRepairID + ",'" + oItem.HEmpID + "','" + oItem_Detail.HRepairExplanation + "','" + oItem.HEmpID + "')";
LogService.Write(sql_sub);
oCN.RunProc(sql_sub);
i += 1;
@@ -2657,6 +2791,7 @@
}
catch (Exception e)
{
+ LogService.Write(e.Message);
msg = e.Message;
oCN.RollBack();
return false;
diff --git a/WebAPI/DLL/ClsSb_EquipRepairWorkBill.cs b/WebAPI/DLL/ClsSb_EquipRepairWorkBill.cs
index 658339a..bd1cce7 100644
--- a/WebAPI/DLL/ClsSb_EquipRepairWorkBill.cs
+++ b/WebAPI/DLL/ClsSb_EquipRepairWorkBill.cs
@@ -75,6 +75,10 @@
",HPlanTimes=" + omodel.HPlanTimes.ToString() +
",HDeptID=" + omodel.HDeptID.ToString() +
",HExplanation='" + omodel.HExplanation + "'" +
+ ",HRepairCategory='" + omodel.HRepairCategory + "'" +
+ ",HUrgenLevel='" + omodel.HUrgenLevel + "'" +
+ ",HRepairer='" + omodel.HRepairer + "'" +
+ ",HIsCapacityImpact='" + omodel.HIsCapacityImpact + "'" +
",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
",HRepairContent='" + omodel.HRepairContent + "'" +
",HMainSourceBillType='"+ omodel.HMainSourceBillType+"'"+
@@ -194,13 +198,14 @@
",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
",HEquipID,HRepairID,HPlanTimes,HEmpID,HManagerID,HTimes" +
",HDeptID,HExplanation,HInnerBillNo,HRepairBeginDate,HRepairEndDate,HRepairContent,HCycleUnit,HMainSourceBillType,HMainSourceInterID,HMainSourceEntryID" +
+ ",HRepairCategory,HUrgenLevel,HRepairer,HIsCapacityImpact" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HMaker + "',getdate()" +
", " + omodel.HEquipID.ToString() + "," + omodel.HRepairID.ToString() + "," + omodel.HPlanTimes.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HTimes.ToString() +
", " + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "','" + omodel.HRepairBeginDate + "','" + omodel.HRepairEndDate + "','" + omodel.HRepairContent + "','" + omodel.HCycleUnit + "','" +
omodel.HMainSourceBillType+"',"+ omodel.HMainSourceInterID.ToString()+","+ omodel.HMainSourceEntryID.ToString() +
- ") ");
+ ",'"+ omodel.HRepairCategory + "','" + omodel.HUrgenLevel + "','" + omodel.HRepairer + "','" + omodel.HIsCapacityImpact + "') ");
//鎻掑叆瀛愯〃
foreach (Models.ClsSb_EquipRepairWorkBillSub oSub in DetailColl)
{
diff --git a/WebAPI/Models/ClsSb_EquipRepairWorkBillMain.cs b/WebAPI/Models/ClsSb_EquipRepairWorkBillMain.cs
index 9d2c6bc..a1fa11b 100644
--- a/WebAPI/Models/ClsSb_EquipRepairWorkBillMain.cs
+++ b/WebAPI/Models/ClsSb_EquipRepairWorkBillMain.cs
@@ -23,6 +23,10 @@
public string HCycleUnit;//varchar(10) --时间单位(小时，天)
public Single HPlanTimes;// money --计划维修工时
public Single HTimes;// money --实际维修工时
-
+ public string HRepairCategory;// --报修类别
+ public string HUrgenLevel;// --紧急程度
+ public string HRepairer;// --报修人
+ public string HIsCapacityImpact;// --是否有产能影响
+
}
}
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
index ddb9de8..f5bd043 100644
--- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
+++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
index 7e29fa1..4dc5dba 100644
--- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
index d6e21aa..b45cbe2 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
index 0b82a49..5e0d1a0 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
@@ -4,9 +4,18 @@
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
+<<<<<<< HEAD
+E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
+E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
+E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
+E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
+E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
+E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
+=======
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
+>>>>>>> b9924fc9913cd3d10ea35725a3d7ee6eff09fb36
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
index ddb9de8..f5bd043 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
index 7e29fa1..4dc5dba 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
Binary files differ
--
Gitblit v1.9.1