From df4649d2b21b588052017bd73fda81ae9483307b Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期四, 15 一月 2026 10:40:25 +0800
Subject: [PATCH] 1
---
MES/app.config | 21
Kanban/Kanban.csproj | 3
SyntacticSugar/bin/Release/SyntacticSugar.dll | 0
WebAPI/WebAPI.csproj.user | 28
PayM/bin/x86/Debug/Pub_Control.pdb | 0
Model/obj/x86/Release/Model.csproj.AssemblyReference.cache | 0
WebAPI/Controllers/生产管理/质量汇报单/Sc_QualityReportBillController.cs | 9
SyntacticSugar/bin/Release/SyntacticSugar.pdb | 0
SelM/SelM.csproj | 3
NETERPNoWin/app.config | 25
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache | 0
DAL/生产管理/模具管理/ClsSc_MouldMaintainBill.cs | 223 +
PayM/bin/x86/Debug/Pub_Class.pdb | 0
PayM/bin/x86/Debug/Pub_Control.dll | 0
sdk_dingding/TopSdk/obj/Release/TopSdk.pdb | 0
APSM/APSM.csproj | 3
PayM/bin/x86/Debug/Pub_Class.dll | 0
sdk_dingding/TopSdk/obj/Release/TopSdk.dll | 0
sdk_dingding/TopSdk/bin/Release/TopSdk.dll | 0
DBUtility/obj/Release/DBUtility.Xt_CheckFlow.resources | 0
SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt | 5
WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs | 4787 -----------------------------
WebAPI/Controllers/生产管理/生产任务单/Sc_ICMOBillController.cs | 8
sdk_dingding/TopSdk/bin/Release/TopSdk.pdb | 0
WebAPI/ListModels.cs | 27
WebAPI/Controllers/Sc_EmployeeSignInNoteBillController.cs | 402 ++
DAL/车间管理/ClsSc_EmployeeSignInNoteBill.cs | 295 +
WarM/app.config | 25
WebAPI/Controllers/MJGL/Sc_MouldReportController.cs | 61
WebAPI/WebAPI.csproj | 1
DAL/信息平台/ClsOA_ErrMsgBackSignBill.cs | 192 +
PayM/bin/x86/Debug/DBUtility.dll | 0
WebAPI/DLL/ClsOA_ErrMsgBackBill.cs | 210 +
DAL/信息平台/ClsOA_ErrMsgBackCheckBill.cs | 194 +
Model/车间管理/ClsSc_EmployeeSignInNoteBill.cs | 27
DBUtility/obj/Release/DBUtility.Xt_CheckFlowList.resources | 0
PayM/bin/x86/Debug/DAL.dll | 0
WebAPI/Controllers/条码管理/WEBSController.cs | 2
PayM/bin/x86/Debug/DBUtility.pdb | 0
Model/Model.csproj | 2
DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache | 0
WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs | 959 +++++
DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache | 0
WebAPI/Web.config | 4
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb | 0
DBUtility/业务单据/ClsXt_BaseBill.cs | 13
APSM/app.config | 23
DBUtility/obj/Release/DBUtility.Xt_BillType.resources | 0
WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs | 4
Kanban/app.config | 23
PayM/bin/x86/Debug/DAL.pdb | 0
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache | 0
PayM/bin/x86/Debug/SQLHelper.dll | 0
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt | 74
PayM/obj/x86/Debug/PayM.csproj.FileListAbsolute.txt | 211 +
SyntacticSugar/bin/Debug/SyntacticSugar.pdb | 0
WarM/packages.config | 3
WebAPI/Controllers/SBGL/Sb_EquipReportController.cs | 59
SyntacticSugar/obj/Debug/SyntacticSugar.dll | 0
WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user | 44
DAL/生产管理/模具管理/ClsSc_MouldDotCheckBill.cs | 198 +
SyntacticSugar/bin/Debug/SyntacticSugar.dll | 0
PayM/bin/x86/Debug/SQLHelper.pdb | 0
WorkM/WorkM.csproj | 1
sdk_dingding/TopSdk/bin/Debug/TopSdk.dll | 0
Model/车间管理/ClsSc_EmployeeSignInNoteBillSub.cs | 16
Pub_Class/bin/Release/SyntacticSugar.pdb | 0
PayM/bin/x86/Debug/Model.pdb | 0
PayM/bin/x86/Debug/BLL.dll | 0
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs | 2
sdk_dingding/TopSdk/obj/Debug/TopSdk.dll | 0
Pub_Class/bin/Release/SyntacticSugar.dll | 0
WebAPI/Controllers/Sc_MouldRepairInBillListController.cs | 313 +
PayM/bin/x86/Debug/BLL.pdb | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt | 36
SyntacticSugar/obj/Debug/SyntacticSugar.pdb | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb | 0
DAL/DAL.csproj | 1
WebAPI/Controllers/MJGL/Sc_MouldDotCheckRuleBillController.cs | 3
WebAPI/Controllers/仓存管理/条码生成/Sc_BarCodeController.cs | 68
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 449 --
WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user | 36
SyntacticSugar/obj/Release/SyntacticSugar.dll | 0
Model/生产管理/模具管理/ClsSc_MouldDotCheckBillMain.cs | 2
SyntacticSugar/obj/Release/SyntacticSugar.pdb | 0
DBUtility/obj/Release/DBUtility.Xt_CheckItem.resources | 0
DBUtility/obj/Release/DBUtility.Gy_UserSelect.resources | 0
PayM/bin/x86/Debug/AxInterop.gregn6Lib.dll | 0
SelM/app.config | 19
WarM/WarM.csproj | 26
PayM/bin/x86/Debug/Model.dll | 0
PayM/bin/x86/Debug/Interop.gregn6Lib.dll | 0
WebAPI/Service/YqnQbService.cs | 2
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt | 10
DAL/信息平台/ClsOA_ErrMsgBackReceiveBill.cs | 190 +
WorkM/app.config | 23
DBUtility/obj/Release/DBUtility.Xt_CheckUserRight.resources | 0
/dev/null | 1
DAL/信息平台/ClsOA_ErrMsgBackHandleBill.cs | 197 +
PayM/bin/x86/Debug/PayM.dll | 0
PayM/bin/x86/Debug/PayM.pdb | 0
LMES/LMES.csproj | 4
102 files changed, 4,090 insertions(+), 5,477 deletions(-)
diff --git a/APSM/APSM.csproj b/APSM/APSM.csproj
index 2ac8377..e0e8f11 100644
--- a/APSM/APSM.csproj
+++ b/APSM/APSM.csproj
@@ -685,6 +685,9 @@
<ItemGroup>
<Folder Include="鏈堝害璇勫\" />
</ItemGroup>
+ <ItemGroup>
+ <None Include="app.config" />
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/APSM/app.config b/APSM/app.config
new file mode 100644
index 0000000..7ca9f4c
--- /dev/null
+++ b/APSM/app.config
@@ -0,0 +1,23 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <runtime>
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <dependentAssembly>
+ <assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.3.2.10" newVersion="1.3.2.10" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
+</configuration>
\ No newline at end of file
diff --git a/DAL/DAL.csproj b/DAL/DAL.csproj
index 87c6dcd..3e613d5 100644
--- a/DAL/DAL.csproj
+++ b/DAL/DAL.csproj
@@ -721,6 +721,7 @@
<Compile Include="璐ㄦ绠＄悊\ClsCrm_CustomerAppealBill.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsGy_EnvironmentTestSchemeBillMain.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsGy_MaterPreventErrMouldBillMain.cs" />
+ <Compile Include="杞﹂棿绠＄悊\ClsSc_EmployeeSignInNoteBill.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsQc_PreventErrMouldCheckBillMain.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsGy_WorkBeginDotCheckListBillMain.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsCJ_WIPBeginStockBill.cs" />
diff --git "a/DAL/\344\277\241\346\201\257\345\271\263\345\217\260/ClsOA_ErrMsgBackCheckBill.cs" "b/DAL/\344\277\241\346\201\257\345\271\263\345\217\260/ClsOA_ErrMsgBackCheckBill.cs"
index 317a093..ea32644 100644
--- "a/DAL/\344\277\241\346\201\257\345\271\263\345\217\260/ClsOA_ErrMsgBackCheckBill.cs"
+++ "b/DAL/\344\277\241\346\201\257\345\271\263\345\217\260/ClsOA_ErrMsgBackCheckBill.cs"
@@ -32,6 +32,7 @@
}
#endregion 鑷畾涔夋柟娉�
+
//淇敼鍗曟嵁
public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
{
@@ -224,6 +225,199 @@
throw (e);
}
}
+
+ //淇敼鍗曟嵁
+ public override bool ModifyBill_APP(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ string HBillNote = "";
+ DataSet ds = oCn.RunProcReturn("Exec h_p_OA_ErrMsgBackCheckBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_OA_ErrMsgBackCheckBill_BeforeSaveCtrl");
+ if (ds == null)
+ {
+ sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ return false;
+ }
+ //=========================================================
+
+ //
+ oCn.BeginTran();
+ //鏇存柊涓昏〃
+ oCn.RunProc("UpDate OA_ErrMsgBackCheckBillMain set " +
+ " HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��===============
+ ",HDate='" + omodel.HDate + "'" +
+ ",HYear='" + omodel.HYear.ToString() + "'" +
+ ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
+ ",HRemark='" + omodel.HRemark + "'" +
+ ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
+ ",HUpDateDate=getdate()" +
+ //========================================
+ ",HDeptID='" + omodel.HDeptID.ToString() + "'" +
+ ",HReceiveID='" + omodel.HReceiveID.ToString() + "'" +
+ ",HSendMan='" + omodel.HSendMan + "'" +
+ ",HReceiveMan='" + omodel.HReceiveMan + "'" +
+ ",HCopyMan='" + omodel.HCopyMan + "'" +
+ ",HLevel='" + omodel.HLevel + "'" +
+ ",HErrMsgBackTypeID='" + omodel.HErrMsgBackTypeID.ToString() +
+ "',HContext='" + omodel.HContext + "'" +
+ ",HDescription='" + omodel.HDescription + "'" +
+ ",HBillTypeName='" + omodel.HBillTypeName + "'" +
+ ",HPlanBillNo='" + omodel.HPlanBillNo + "'" +
+ ",HMaterName='" + omodel.HMaterName + "'" +
+ ",HMaterModel='" + omodel.HMaterModel + "'" +
+ ",HEquipID='" + omodel.HEquipID.ToString() +
+ "',HMouldID='" + omodel.HMouldID.ToString() +
+ "',HCheckEmpID='" + omodel.HCheckEmpID.ToString() +
+ "',HCheckNote='" + omodel.HCheckNote + "'" +
+ ",HCheckResult='" + omodel.HCheckResult + "'" +
+ ",HHCheckDate='" + omodel.HHCheckDate + "'" +
+ ",HErrMsgBackBillNo='" + omodel.HErrMsgBackBillNo +
+ "',HErrMsgBackInterID='" + omodel.HErrMsgBackInterID.ToString() +
+ "',HErrMsgBackEntryID='" + omodel.HErrMsgBackEntryID.ToString() +
+
+ "' where HInterID=" + lngBillKey.ToString());
+ //鍒犻櫎鍏宠仈
+ DeleteRelation(ref sReturn, lngBillKey);
+ //鍒犻櫎瀛愯〃
+ DeleteBillSub(lngBillKey);
+
+ //=========================淇濆瓨鍚庢帶鍒�
+ DataSet ds2 = oCn.RunProcReturn("Exec h_p_OA_ErrMsgBackCheckBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_OA_ErrMsgBackCheckBill_AfterSaveCtrl");
+ if (ds2 == null)
+ {
+ sReturn = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";
+ oCn.RollBack();
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触2锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
+ oCn.RollBack();
+ return false;
+ }
+ //============================
+
+ sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏂板鍗曟嵁
+ public override bool AddBill_APP(ref string sReturn)
+ {
+ try
+ {
+
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCn.BeginTran();
+
+
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ string HBillNote = "";
+ DataSet ds = oCn.RunProcReturn("Exec h_p_OA_ErrMsgBackCheckBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_OA_ErrMsgBackCheckBill_BeforeSaveCtrl");
+ if (ds == null)
+ {
+ sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ return false;
+ }
+ //=========================================================
+
+ string sql = "";
+
+ sql = "Insert Into OA_ErrMsgBackCheckBillMain" +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate,HYear,HPeriod,HRemark,HMaker,HMakeDate,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType," +
+ "HDeptID,HReceiveID,HSendMan,HReceiveMan,HCopyMan,HLevel,HErrMsgBackTypeID,HContext,HDescription,HBillTypeName,HPlanBillNo,HMaterName,HMaterModel,HEquipID,HMouldID,HCheckEmpID,HCheckNote,HCheckResult,HHCheckDate,HErrMsgBackBillNo,HErrMsgBackInterID,HErrMsgBackEntryID) " +
+ " values(" +
+ "'" + this.BillType +
+ "','" + this.HBillSubType +
+ "'," + omodel.HInterID.ToString() +
+ ",'" + omodel.HBillNo +
+ "','" + omodel.HDate +
+ "'," + omodel.HYear +
+ "," + omodel.HPeriod +
+ ",'" + omodel.HRemark +
+ "','" + omodel.HMaker +
+ "',getdate()" +
+ ",'" + omodel.HMainSourceInterID +
+ "','" + omodel.HMainSourceEntryID +
+ "','" + omodel.HMainSourceBillNo +
+ "','" + omodel.HMainSourceBillType +
+
+ "','" + omodel.HDeptID.ToString() +
+ "','" + omodel.HReceiveID.ToString() +
+ "','" + omodel.HSendMan +
+ "','" + omodel.HReceiveMan +
+ "','" + omodel.HCopyMan +
+ "','" + omodel.HLevel +
+ "','" + omodel.HErrMsgBackTypeID.ToString() +
+ "','" + omodel.HContext +
+ "','" + omodel.HDescription +
+ "','" + omodel.HBillTypeName +
+ "','" + omodel.HPlanBillNo +
+ "','" + omodel.HMaterName +
+ "','" + omodel.HMaterModel +
+ "','" + omodel.HEquipID.ToString() +
+ "','" + omodel.HMouldID.ToString() +
+ "','" + omodel.HCheckEmpID.ToString() +
+ "','" + omodel.HCheckNote +
+ "','" + omodel.HCheckResult +
+ "','" + omodel.HHCheckDate +
+ "','" + omodel.HErrMsgBackBillNo +
+ "','" + omodel.HErrMsgBackInterID.ToString() +
+ "','" + omodel.HErrMsgBackEntryID.ToString() +
+
+ "') ";
+ //涓昏〃
+ oCn.RunProc(sql);
+
+ //楠屾敹鍗曞弽鍐欏紓甯稿弽棣堝崟,涓哄凡瀹屾垚
+ oCn.RunProc("update OA_ErrMsgBackBillMain set HCloseFlag='1',HBillStatus='10' where HInterID=" + omodel.HErrMsgBackInterID);
+
+ //=========================淇濆瓨鍚庢帶鍒�
+ DataSet ds2 = oCn.RunProcReturn("Exec h_p_OA_ErrMsgBackCheckBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_OA_ErrMsgBackCheckBill_AfterSaveCtrl");
+ if (ds2 == null)
+ {
+ sReturn = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";
+ oCn.RollBack();
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触2锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
+ oCn.RollBack();
+ return false;
+ }
+ //============================
+
+ sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
//鏄剧ず鍗曟嵁
public override bool ShowBill(Int64 lngBillKey, ref string sReturn)
{
diff --git "a/DAL/\344\277\241\346\201\257\345\271\263\345\217\260/ClsOA_ErrMsgBackHandleBill.cs" "b/DAL/\344\277\241\346\201\257\345\271\263\345\217\260/ClsOA_ErrMsgBackHandleBill.cs"
index dde0c03..8065851 100644
--- "a/DAL/\344\277\241\346\201\257\345\271\263\345\217\260/ClsOA_ErrMsgBackHandleBill.cs"
+++ "b/DAL/\344\277\241\346\201\257\345\271\263\345\217\260/ClsOA_ErrMsgBackHandleBill.cs"
@@ -225,6 +225,203 @@
throw (e);
}
}
+
+
+ //淇敼鍗曟嵁_APP
+ public override bool ModifyBill_APP(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ string HBillNote = "";
+ DataSet ds = oCn.RunProcReturn("Exec h_p_OA_ErrMsgBackHandleBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_OA_ErrMsgBackHandleBill_BeforeSaveCtrl");
+ if (ds == null)
+ {
+ sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ return false;
+ }
+ //=========================================================
+
+ //
+ oCn.BeginTran();
+ //鏇存柊涓昏〃
+ oCn.RunProc("UpDate OA_ErrMsgBackHandleBillMain set " +
+ " HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��===============
+ ",HDate='" + omodel.HDate + "'" +
+ ",HYear='" + omodel.HYear.ToString() + "'" +
+ ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
+ ",HRemark='" + omodel.HRemark + "'" +
+ ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
+ ",HUpDateDate=getdate()" +
+ //========================================
+ ",HDeptID='" + omodel.HDeptID.ToString() + "'" +
+ ",HReceiveID='" + omodel.HReceiveID.ToString() + "'" +
+ ",HSendMan='" + omodel.HSendMan + "'" +
+ ",HReceiveMan='" + omodel.HReceiveMan + "'" +
+ ",HCopyMan='" + omodel.HCopyMan + "'" +
+ ",HLevel='" + omodel.HLevel + "'" +
+ ",HErrMsgBackTypeID='" + omodel.HErrMsgBackTypeID.ToString() +
+ "',HContext='" + omodel.HContext + "'" +
+ ",HDescription='" + omodel.HDescription + "'" +
+ ",HBillTypeName='" + omodel.HBillTypeName + "'" +
+ ",HPlanBillNo='" + omodel.HPlanBillNo + "'" +
+ ",HMaterName='" + omodel.HMaterName + "'" +
+ ",HMaterModel='" + omodel.HMaterModel + "'" +
+ ",HEquipID='" + omodel.HEquipID.ToString() +
+ "',HMouldID='" + omodel.HMouldID.ToString() +
+ "',HHandleEmpID='" + omodel.HHandleEmpID.ToString() +
+ "',HHandleNote='" + omodel.HHandleNote + "'" +
+ ",HHandleResult='" + omodel.HHandleResult + "'" +
+ ",HHandleDate='" + omodel.HHandleDate + "'" +
+ ",HErrMsgBackBillNo='" + omodel.HErrMsgBackBillNo +
+ "',HErrMsgBackInterID='" + omodel.HErrMsgBackInterID.ToString() +
+ "',HErrMsgBackEntryID='" + omodel.HErrMsgBackEntryID.ToString() +
+ "',HBadReasonID='" + omodel.HBadReasonID.ToString() +
+ "' where HInterID=" + lngBillKey.ToString());
+ //鍒犻櫎鍏宠仈
+ DeleteRelation(ref sReturn, lngBillKey);
+ //鍒犻櫎瀛愯〃
+ DeleteBillSub(lngBillKey);
+
+ //=========================淇濆瓨鍚庢帶鍒�
+ DataSet ds2 = oCn.RunProcReturn("Exec h_p_OA_ErrMsgBackHandleBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_OA_ErrMsgBackHandleBill_AfterSaveCtrl");
+ if (ds2 == null)
+ {
+ sReturn = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";
+ oCn.RollBack();
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触2锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
+ oCn.RollBack();
+ return false;
+ }
+ //============================
+
+ sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏂板鍗曟嵁
+ public override bool AddBill_APP(ref string sReturn)
+ {
+ try
+ {
+ //寰楀埌mainid
+ //omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCn.BeginTran();
+
+
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ string HBillNote = "";
+ DataSet ds = oCn.RunProcReturn("Exec h_p_OA_ErrMsgBackHandleBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_OA_ErrMsgBackHandleBill_BeforeSaveCtrl");
+ if (ds == null)
+ {
+ sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ return false;
+ }
+ //=========================================================
+
+ string sql = "";
+
+ sql = "Insert Into OA_ErrMsgBackHandleBillMain" +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate,HYear,HPeriod,HRemark,HMaker,HMakeDate,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType," +
+ "HDeptID,HReceiveID,HSendMan,HReceiveMan,HCopyMan,HLevel,HErrMsgBackTypeID,HContext,HDescription,HBillTypeName,HPlanBillNo,HMaterName,HMaterModel,HEquipID,HMouldID,HHandleEmpID,HHandleNote,HHandleResult,HHandleDate,HErrMsgBackBillNo,HErrMsgBackInterID,HErrMsgBackEntryID,HBadReasonID) " +
+ " values(" +
+ "'" + this.BillType +
+ "','" + this.HBillSubType +
+ "'," + omodel.HInterID.ToString() +
+ ",'" + omodel.HBillNo +
+ "','" + omodel.HDate +
+ "'," + omodel.HYear +
+ "," + omodel.HPeriod +
+ ",'" + omodel.HRemark +
+ "','" + omodel.HMaker +
+ "',getdate()" +
+ ",'" + omodel.HMainSourceInterID +
+ "','" + omodel.HMainSourceEntryID +
+ "','" + omodel.HMainSourceBillNo +
+ "','" + omodel.HMainSourceBillType +
+
+ "','" + omodel.HDeptID.ToString() +
+ "','" + omodel.HReceiveID.ToString() +
+ "','" + omodel.HSendMan +
+ "','" + omodel.HReceiveMan +
+ "','" + omodel.HCopyMan +
+ "','" + omodel.HLevel +
+ "','" + omodel.HErrMsgBackTypeID.ToString() +
+ "','" + omodel.HContext +
+ "','" + omodel.HDescription +
+ "','" + omodel.HBillTypeName +
+ "','" + omodel.HPlanBillNo +
+ "','" + omodel.HMaterName +
+ "','" + omodel.HMaterModel +
+ "','" + omodel.HEquipID.ToString() +
+ "','" + omodel.HMouldID.ToString() +
+ "','" + omodel.HHandleEmpID.ToString() +
+ "','" + omodel.HHandleNote +
+ "','" + omodel.HHandleResult +
+ "','" + omodel.HHandleDate +
+ "','" + omodel.HErrMsgBackBillNo +
+ "','" + omodel.HErrMsgBackInterID.ToString() +
+ "','" + omodel.HErrMsgBackEntryID.ToString() +
+ "','" + omodel.HBadReasonID.ToString() +
+ "') ";
+ //涓昏〃
+ oCn.RunProc(sql);
+
+ //鍙嶉澶勭悊鍗曚繚瀛樺悗,鏇存柊寮傚父鍙嶉鍗曠殑鐘舵��
+ string sql1 = "update OA_ErrMsgBackBillMain set HBillStatus='9' where HBillNo='" + omodel.HErrMsgBackBillNo + "' ";
+ oCn.RunProc(sql1);
+
+ //=========================淇濆瓨鍚庢帶鍒�
+ DataSet ds2 = oCn.RunProcReturn("Exec h_p_OA_ErrMsgBackHandleBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_OA_ErrMsgBackHandleBill_AfterSaveCtrl");
+ if (ds2 == null)
+ {
+ sReturn = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";
+ oCn.RollBack();
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触2锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
+ oCn.RollBack();
+ return false;
+ }
+ //============================
+
+ sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
+
//鏄剧ず鍗曟嵁
public override bool ShowBill(Int64 lngBillKey, ref string sReturn)
{
diff --git "a/DAL/\344\277\241\346\201\257\345\271\263\345\217\260/ClsOA_ErrMsgBackReceiveBill.cs" "b/DAL/\344\277\241\346\201\257\345\271\263\345\217\260/ClsOA_ErrMsgBackReceiveBill.cs"
index 184d550..5a027b2 100644
--- "a/DAL/\344\277\241\346\201\257\345\271\263\345\217\260/ClsOA_ErrMsgBackReceiveBill.cs"
+++ "b/DAL/\344\277\241\346\201\257\345\271\263\345\217\260/ClsOA_ErrMsgBackReceiveBill.cs"
@@ -32,6 +32,7 @@
}
#endregion 鑷畾涔夋柟娉�
+
//淇敼鍗曟嵁
public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
{
@@ -219,6 +220,195 @@
throw (e);
}
}
+
+ //淇敼鍗曟嵁
+ public override bool ModifyBill_APP(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ string HBillNote = "";
+ DataSet ds = oCn.RunProcReturn("Exec h_p_OA_ErrMsgBackReceiveBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_OA_ErrMsgBackReceiveBill_BeforeSaveCtrl");
+ if (ds == null)
+ {
+ sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ return false;
+ }
+ //=========================================================
+
+ //
+ oCn.BeginTran();
+ //鏇存柊涓昏〃
+ oCn.RunProc("UpDate OA_ErrMsgBackReceiveBillMain set " +
+ " HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��===============
+ ",HDate='" + omodel.HDate + "'" +
+ ",HYear='" + omodel.HYear.ToString() + "'" +
+ ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
+ ",HRemark='" + omodel.HRemark + "'" +
+ ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
+ ",HUpDateDate=getdate()" +
+ //========================================
+ ",HDeptID='" + omodel.HDeptID.ToString() + "'" +
+ ",HReceiveID='" + omodel.HReceiveID.ToString() + "'" +
+ ",HSendMan='" + omodel.HSendMan + "'" +
+ ",HReceiveMan='" + omodel.HReceiveMan + "'" +
+ ",HCopyMan='" + omodel.HCopyMan + "'" +
+ ",HLevel='" + omodel.HLevel + "'" +
+ ",HErrMsgBackTypeID='" + omodel.HErrMsgBackTypeID.ToString() +
+ "',HContext='" + omodel.HContext + "'" +
+ ",HDescription='" + omodel.HDescription + "'" +
+ ",HBillTypeName='" + omodel.HBillTypeName + "'" +
+ ",HPlanBillNo='" + omodel.HPlanBillNo + "'" +
+ ",HMaterName='" + omodel.HMaterName + "'" +
+ ",HMaterModel='" + omodel.HMaterModel + "'" +
+ ",HEquipID='" + omodel.HEquipID.ToString() +
+ "',HMouldID='" + omodel.HMouldID.ToString() +
+ "',HRelationEmpID='" + omodel.HRelationEmpID.ToString() +
+ "',HReceiveNote='" + omodel.HReceiveNote + "'" +
+ ",HReceiveDate='" + omodel.HReceiveDate + "'" +
+ ",HHandleEmpID='" + omodel.HHandleEmpID.ToString() +
+ "',HHandleAdvise='" + omodel.HHandleAdvise +
+
+ "' where HInterID=" + lngBillKey.ToString());
+ //鍒犻櫎鍏宠仈
+ DeleteRelation(ref sReturn, lngBillKey);
+ //鍒犻櫎瀛愯〃
+ DeleteBillSub(lngBillKey);
+
+ //=========================淇濆瓨鍚庢帶鍒�
+ DataSet ds2 = oCn.RunProcReturn("Exec h_p_OA_ErrMsgBackReceiveBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_OA_ErrMsgBackReceiveBill_AfterSaveCtrl");
+ if (ds2 == null)
+ {
+ sReturn = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";
+ oCn.RollBack();
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触2锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
+ oCn.RollBack();
+ return false;
+ }
+ //============================
+
+ sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏂板鍗曟嵁
+ public override bool AddBill_APP(ref string sReturn)
+ {
+ try
+ {
+ //寰楀埌mainid
+ //omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCn.BeginTran();
+
+
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ string HBillNote = "";
+ DataSet ds = oCn.RunProcReturn("Exec h_p_OA_ErrMsgBackReceiveBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_OA_ErrMsgBackReceiveBill_BeforeSaveCtrl");
+ if (ds == null)
+ {
+ sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ return false;
+ }
+ //=========================================================
+
+ string sql = "";
+
+ sql = "Insert Into OA_ErrMsgBackReceiveBillMain" +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate,HYear,HPeriod,HRemark,HMaker,HMakeDate,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType," +
+ "HDeptID,HReceiveID,HSendMan,HReceiveMan,HCopyMan,HLevel,HErrMsgBackTypeID,HContext,HDescription,HBillTypeName,HPlanBillNo,HMaterName,HMaterModel,HEquipID,HMouldID,HRelationEmpID,HReceiveNote,HReceiveDate,HHandleEmpID,HHandleAdvise) " +
+ " values(" +
+ "'" + this.BillType +
+ "','" + this.HBillSubType +
+ "'," + omodel.HInterID.ToString() +
+ ",'" + omodel.HBillNo +
+ "','" + omodel.HDate +
+ "'," + omodel.HYear +
+ "," + omodel.HPeriod +
+ ",'" + omodel.HRemark +
+ "','" + omodel.HMaker +
+ "',getdate()" +
+ ",'" + omodel.HMainSourceInterID +
+ "','" + omodel.HMainSourceEntryID +
+ "','" + omodel.HMainSourceBillNo +
+ "','" + omodel.HMainSourceBillType +
+
+ "','" + omodel.HDeptID.ToString() +
+ "','" + omodel.HReceiveID.ToString() +
+ "','" + omodel.HSendMan +
+ "','" + omodel.HReceiveMan +
+ "','" + omodel.HCopyMan +
+ "','" + omodel.HLevel +
+ "','" + omodel.HErrMsgBackTypeID.ToString() +
+ "','" + omodel.HContext +
+ "','" + omodel.HDescription +
+ "','" + omodel.HBillTypeName +
+ "','" + omodel.HPlanBillNo +
+ "','" + omodel.HMaterName +
+ "','" + omodel.HMaterModel +
+ "','" + omodel.HEquipID.ToString() +
+ "','" + omodel.HMouldID.ToString() +
+ "','" + omodel.HRelationEmpID.ToString() +
+ "','" + omodel.HReceiveNote +
+ "','" + omodel.HReceiveDate +
+ "','" + omodel.HHandleEmpID.ToString() +
+ "','" + omodel.HHandleAdvise +
+ "') ";
+ //涓昏〃
+ oCn.RunProc(sql);
+
+ //鍙嶉鎺ユ敹鍗曚繚瀛樺悗,鏇存柊寮傚父鍙嶉鍗曠殑鎸囨淳澶勭悊浜�
+ string sql1 = "update OA_ErrMsgBackBillMain set HHandleEmpID='" + omodel.HHandleEmpID.ToString() + "', HDescription='" + omodel.HDescription.ToString() + "',HBillStatus='14' where HBillNo='" + omodel.HMainSourceBillNo + "' ";
+ oCn.RunProc(sql1);
+ //=========================淇濆瓨鍚庢帶鍒�
+ DataSet ds2 = oCn.RunProcReturn("Exec h_p_OA_ErrMsgBackReceiveBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_OA_ErrMsgBackReceiveBill_AfterSaveCtrl");
+ if (ds2 == null)
+ {
+ sReturn = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";
+ oCn.RollBack();
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触2锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
+ oCn.RollBack();
+ return false;
+ }
+ //============================
+
+ sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
//鏄剧ず鍗曟嵁
public override bool ShowBill(Int64 lngBillKey, ref string sReturn)
{
diff --git "a/DAL/\344\277\241\346\201\257\345\271\263\345\217\260/ClsOA_ErrMsgBackSignBill.cs" "b/DAL/\344\277\241\346\201\257\345\271\263\345\217\260/ClsOA_ErrMsgBackSignBill.cs"
index d406bfd..baa44fd 100644
--- "a/DAL/\344\277\241\346\201\257\345\271\263\345\217\260/ClsOA_ErrMsgBackSignBill.cs"
+++ "b/DAL/\344\277\241\346\201\257\345\271\263\345\217\260/ClsOA_ErrMsgBackSignBill.cs"
@@ -223,6 +223,198 @@
throw (e);
}
}
+
+ //淇敼鍗曟嵁
+ public override bool ModifyBill_APP(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ string HBillNote = "";
+ DataSet ds = oCn.RunProcReturn("Exec h_p_OA_ErrMsgBackSignBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_OA_ErrMsgBackSignBill_BeforeSaveCtrl");
+ if (ds == null)
+ {
+ sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ return false;
+ }
+ //=========================================================
+
+ //
+ oCn.BeginTran();
+ //鏇存柊涓昏〃
+ oCn.RunProc("UpDate OA_ErrMsgBackSignBillMain set " +
+ " HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��===============
+ ",HDate='" + omodel.HDate + "'" +
+ ",HYear='" + omodel.HYear.ToString() + "'" +
+ ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
+ ",HRemark='" + omodel.HRemark + "'" +
+ ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
+ ",HUpDateDate=getdate()" +
+ //========================================
+ ",HDeptID='" + omodel.HDeptID.ToString() + "'" +
+ ",HReceiveID='" + omodel.HReceiveID.ToString() + "'" +
+ ",HSendMan='" + omodel.HSendMan + "'" +
+ ",HReceiveMan='" + omodel.HReceiveMan + "'" +
+ ",HCopyMan='" + omodel.HCopyMan + "'" +
+ ",HLevel='" + omodel.HLevel + "'" +
+ ",HErrMsgBackTypeID='" + omodel.HErrMsgBackTypeID.ToString() +
+ "',HContext='" + omodel.HContext + "'" +
+ ",HDescription='" + omodel.HDescription + "'" +
+ ",HBillTypeName='" + omodel.HBillTypeName + "'" +
+ ",HPlanBillNo='" + omodel.HPlanBillNo + "'" +
+ ",HMaterName='" + omodel.HMaterName + "'" +
+ ",HMaterModel='" + omodel.HMaterModel + "'" +
+ ",HEquipID='" + omodel.HEquipID.ToString() +
+ "',HMouldID='" + omodel.HMouldID.ToString() +
+ "',HSignEmpID='" + omodel.HSignEmpID.ToString() +
+ "',HSignNote='" + omodel.HSignNote + "'" +
+ ",HSignDate='" + omodel.HSignDate + "'" +
+ ",HErrMsgBackBillNo='" + omodel.HErrMsgBackBillNo +
+ "',HErrMsgBackInterID='" + omodel.HErrMsgBackInterID.ToString() +
+ "',HErrMsgBackEntryID='" + omodel.HErrMsgBackEntryID.ToString() +
+
+ "' where HInterID=" + lngBillKey.ToString());
+ //鍒犻櫎鍏宠仈
+ DeleteRelation(ref sReturn, lngBillKey);
+ //鍒犻櫎瀛愯〃
+ DeleteBillSub(lngBillKey);
+
+ //=========================淇濆瓨鍚庢帶鍒�
+ DataSet ds2 = oCn.RunProcReturn("Exec h_p_OA_ErrMsgBackSignBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_OA_ErrMsgBackSignBill_AfterSaveCtrl");
+ if (ds2 == null)
+ {
+ sReturn = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";
+ oCn.RollBack();
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触2锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
+ oCn.RollBack();
+ return false;
+ }
+ //============================
+
+ sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏂板鍗曟嵁
+ public override bool AddBill_APP(ref string sReturn)
+ {
+ try
+ {
+ //寰楀埌mainid
+ //omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCn.BeginTran();
+
+
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ string HBillNote = "";
+ DataSet ds = oCn.RunProcReturn("Exec h_p_OA_ErrMsgBackSignBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_OA_ErrMsgBackSignBill_BeforeSaveCtrl");
+ if (ds == null)
+ {
+ sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ return false;
+ }
+ //=========================================================
+
+ string sql = "";
+
+ sql = "Insert Into OA_ErrMsgBackSignBillMain" +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate,HYear,HPeriod,HRemark,HMaker,HMakeDate,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType," +
+ "HDeptID,HReceiveID,HSendMan,HReceiveMan,HCopyMan,HLevel,HErrMsgBackTypeID,HContext,HDescription,HBillTypeName,HPlanBillNo,HMaterName,HMaterModel,HEquipID,HMouldID,HSignEmpID,HSignNote,HSignDate,HErrMsgBackBillNo,HErrMsgBackInterID,HErrMsgBackEntryID) " +
+ " values(" +
+ "'" + this.BillType +
+ "','" + this.HBillSubType +
+ "'," + omodel.HInterID.ToString() +
+ ",'" + omodel.HBillNo +
+ "','" + omodel.HDate +
+ "'," + omodel.HYear +
+ "," + omodel.HPeriod +
+ ",'" + omodel.HRemark +
+ "','" + omodel.HMaker +
+ "',getdate()" +
+ ",'" + omodel.HMainSourceInterID +
+ "','" + omodel.HMainSourceEntryID +
+ "','" + omodel.HMainSourceBillNo +
+ "','" + omodel.HMainSourceBillType +
+
+ "','" + omodel.HDeptID.ToString() +
+ "','" + omodel.HReceiveID.ToString() +
+ "','" + omodel.HSendMan +
+ "','" + omodel.HReceiveMan +
+ "','" + omodel.HCopyMan +
+ "','" + omodel.HLevel +
+ "','" + omodel.HErrMsgBackTypeID.ToString() +
+ "','" + omodel.HContext +
+ "','" + omodel.HDescription +
+ "','" + omodel.HBillTypeName +
+ "','" + omodel.HPlanBillNo +
+ "','" + omodel.HMaterName +
+ "','" + omodel.HMaterModel +
+ "','" + omodel.HEquipID.ToString() +
+ "','" + omodel.HMouldID.ToString() +
+ "','" + omodel.HSignEmpID.ToString() +
+ "','" + omodel.HSignNote +
+ "','" + omodel.HSignDate +
+ "','" + omodel.HErrMsgBackBillNo +
+ "','" + omodel.HErrMsgBackInterID.ToString() +
+ "','" + omodel.HErrMsgBackEntryID.ToString() +
+
+ "') ";
+ //涓昏〃
+ oCn.RunProc(sql);
+
+ //鍙嶉绛惧埌鍗曚繚瀛樺悗,鏇存柊寮傚父鍙嶉鍗曠殑鐘舵��
+ string sql1 = "update OA_ErrMsgBackBillMain set HBillStatus='13' where HBillNo='" + omodel.HErrMsgBackBillNo + "' ";
+ oCn.RunProc(sql1);
+
+ //=========================淇濆瓨鍚庢帶鍒�
+ DataSet ds2 = oCn.RunProcReturn("Exec h_p_OA_ErrMsgBackSignBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_OA_ErrMsgBackSignBill_AfterSaveCtrl");
+ if (ds2 == null)
+ {
+ sReturn = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";
+ oCn.RollBack();
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触2锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
+ oCn.RollBack();
+ return false;
+ }
+ //============================
+
+ sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
//鏄剧ず鍗曟嵁
public override bool ShowBill(Int64 lngBillKey, ref string sReturn)
{
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_MouldDotCheckBill.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_MouldDotCheckBill.cs"
index 5eeb1b6..79098ce 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_MouldDotCheckBill.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_MouldDotCheckBill.cs"
@@ -44,7 +44,6 @@
" HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��===============
",HYear='" + omodel.HYear.ToString() + "'" +
",HPeriod='" + omodel.HPeriod.ToString() + "'" +
- //",HStockType='" + omodel.HStockType + "'" +
",HRemark='" + omodel.HRemark + "'" +
",HUpDater='" + omodel.HMaker + "'" +
",HUpDateDate=getdate()" +
@@ -64,6 +63,7 @@
",HErrNote='" + omodel.HErrNote + "'" +
",HBigSafeNote='" + omodel.HBigSafeNote + "'" +
",HShiftsID=" + omodel.HShiftsID +
+ ",HDeptID=" + omodel.HDeptID +
",HDotCheckNote='" + omodel.HDotCheckNote + "'" +
" where HInterID=" + lngBillKey.ToString());
//鍒犻櫎鍏宠仈
@@ -248,6 +248,202 @@
throw (e);
}
}
+
+ //淇敼鍗曟嵁_APP
+ public override bool ModifyBill_APP(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //
+ oCn.BeginTran();
+
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ string HBillNote = "";
+ DataSet ds = oCn.RunProcReturn("Exec h_p_Sc_MouldDotCheckBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1,1 ", "h_p_Sc_MouldDotCheckBill_BeforeSaveCtrl");
+ if (ds == null)
+ {
+ sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ return false;
+ }
+ //=========================================================
+
+ //鏇存柊涓昏〃
+ oCn.RunProc("UpDate Sc_MouldDotCheckBillMain set " +
+ " HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��===============
+ ",HYear='" + omodel.HYear.ToString() + "'" +
+ ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
+ ",HRemark='" + omodel.HRemark + "'" +
+ ",HUpDater='" + omodel.HMaker + "'" +
+ ",HUpDateDate=getdate()" +
+ //========================================
+ ",HPlanNo='" + omodel.HPlanNo + "'" +
+ ",HPlanInterID=" + omodel.HPlanInterID.ToString() +
+ ",HMouldDotCheckRuleID=" + omodel.HMouldDotCheckRuleID.ToString() +
+
+
+ ",HMouldID=" + omodel.HMouldID.ToString() +
+ ",HBeginDate='" + omodel.HBeginDate + "'" +
+ ",HEndDate='" + omodel.HEndDate + "'" +
+ ",HExplanation='" + omodel.HExplanation + "'" +
+ ",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
+
+ ",HLastResult='" + omodel.HLastResult + "'" +
+ ",HErrNote='" + omodel.HErrNote + "'" +
+ ",HBigSafeNote='" + omodel.HBigSafeNote + "'" +
+ ",HShiftsID=" + omodel.HShiftsID +
+ ",HDeptID=" + omodel.HDeptID +
+ ",HDotCheckNote='" + omodel.HDotCheckNote + "'" +
+ " where HInterID=" + lngBillKey.ToString());
+ //鍒犻櫎鍏宠仈
+ DeleteRelation(ref sReturn, lngBillKey);
+ //鍒犻櫎瀛愯〃
+ DeleteBillSub(lngBillKey);
+ //DeleteBillSub2(lngBillKey);
+ //鎻掑叆瀛愯〃
+ omodel.HInterID = lngBillKey;
+ //鎻掑叆瀛愯〃
+ foreach (Model.ClsSc_MouldDotCheckBillSub oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into Sc_MouldDotCheckBillSub " +
+ " (HInterID,HEntryID" +
+ ",HManagerID" +
+ ",HDotCheckItemID,HDotCheckItem,HDotCheckPart,HClaim" +
+ ",HCloseMan,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HDotCheckItemClassID,HDotCheckItemMethodID,HDotCheckResult" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() +
+ "," + oSub.HManagerID.ToString() + "," + oSub.HDotCheckItemID.ToString() +
+ ",'" + oSub.HDotCheckItem + "','" + oSub.HDotCheckPart + "','" + oSub.HClaim + "'" +
+ ",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() + "," + oSub.HDotCheckItemClassID + "," + oSub.HDotCheckItemMethodID + ",'" + oSub.HDotCheckResult + "'" +
+ ") ");
+ }
+
+ //=========================淇濆瓨鍚庢帶鍒�
+ DataSet ds2 = oCn.RunProcReturn("Exec h_p_Sc_MouldDotCheckBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1,1 ", "h_p_Sc_MouldDotCheckBill_AfterSaveCtrl");
+ if (ds2 == null)
+ {
+ sReturn = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";
+ oCn.RollBack();
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触2锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
+ oCn.RollBack();
+ return false;
+ }
+ //============================
+
+ sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
+ //鏂板鍗曟嵁_APP
+ public override bool AddBill_APP(ref string sReturn)
+ {
+ try
+ {
+ //寰楀埌mainid
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ string HBillNote = "";
+ DataSet ds = oCn.RunProcReturn("Exec h_p_Sc_MouldDotCheckBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1,1 ", "h_p_Sc_MouldDotCheckBill_BeforeSaveCtrl");
+ if (ds == null)
+ {
+ sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ return false;
+ }
+ //=========================================================
+
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCn.BeginTran();
+ //涓昏〃
+ oCn.RunProc("Insert Into Sc_MouldDotCheckBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate" +
+ ",HYear,HPeriod,HRemark" +
+ ",HMouldID,HBeginDate" +
+ ",HEndDate,HPlanNo,HPlanInterID" +
+ ",HInnerBillNo,HExplanation,HMouldDotCheckRuleID" +
+ ",HLastResult,HErrNote,HBigSafeNote,HShiftsID,HDotCheckNote" +
+ ") " +
+ " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + omodel.HMaker + "',getdate()" +
+ "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'" +
+ "," + omodel.HMouldID.ToString() + ",'" + omodel.HBeginDate + "'" +
+ ",'" + omodel.HEndDate + "','" + omodel.HPlanNo + "'," + omodel.HPlanInterID.ToString() +
+ ",'" + omodel.HInnerBillNo + "','" + omodel.HExplanation + "','" + omodel.HMouldDotCheckRuleID + "','" + omodel.HLastResult + "','" + omodel.HErrNote + "','" + omodel.HBigSafeNote + "'," + omodel.HShiftsID + ",'" + omodel.HDotCheckNote + "'" +
+ ") ");
+ //鎻掑叆瀛愯〃
+ foreach (Model.ClsSc_MouldDotCheckBillSub oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into Sc_MouldDotCheckBillSub " +
+ " (HInterID,HEntryID" +
+ ",HManagerID" +
+ ",HDotCheckItemID,HDotCheckItem,HDotCheckPart,HClaim" +
+ ",HCloseMan,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HDotCheckItemClassID,HDotCheckItemMethodID,HDotCheckResult" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() +
+ "," + oSub.HManagerID.ToString() + "," + oSub.HDotCheckItemID.ToString() +
+ ",'" + oSub.HDotCheckItem + "','" + oSub.HDotCheckPart + "','" + oSub.HClaim + "'" +
+ ",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() + "," + oSub.HDotCheckItemClassID + "," + oSub.HDotCheckItemMethodID + ",'" + oSub.HDotCheckResult + "'" +
+ ") ");
+ }
+
+ //鐐规瀹屾垚锛屽弽鍐欏櫒鍏风偣妫�璁″垝鍗曞瓙琛ㄦ槸鍚︾偣妫�鏍囪
+ oCn.RunProc("exec h_p_Sc_MouldDotCheck_AfterSaveCtrl " + omodel.HMouldDotCheckPlanInterID + "," + omodel.HMouldDotCheckPlanEntryID);
+
+
+ //=========================淇濆瓨鍚庢帶鍒�
+ DataSet ds2 = oCn.RunProcReturn("Exec h_p_Sc_MouldDotCheckBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1,1 ", "h_p_Sc_MouldDotCheckBill_AfterSaveCtrl");
+ if (ds2 == null)
+ {
+ sReturn = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";
+ oCn.RollBack();
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触2锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
+ oCn.RollBack();
+ return false;
+ }
+ //============================
+
+ sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
//鏄剧ず鍗曟嵁
public override bool ShowBill(Int64 lngBillKey, ref string sReturn)
{
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 ceea96c..9d99efa 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"
@@ -123,14 +123,7 @@
",HProductionModule='" + omodel.HProductionModule + "'" +
",HMouldMaintainRuleInterID=" + omodel.HMouldMaintainRuleInterID.ToString() +
",HMaintainLevID=" + omodel.HMaintainLevID +
- ",HLastResult='" + omodel.HLastResult + "'" +
- //",HDeptID=" + omodel.HDeptID.ToString() +
- //",HDeptNumber='" + omodel.HDeptNumber +"'"+
- //",HEmpID=" + omodel.HEmpID.ToString() +
- //",HEmpNumber='" + omodel.HEmpNumber +"'"+
- //",HGroupID=" + omodel.HGroupID.ToString() +
- //",HWHID=" + omodel.HWHID.ToString() +
- //",HSCWHID=" + omodel.HSCWHID.ToString() +
+ ",HLastResult='" + omodel.HLastResult + "'" +
" where HInterID=" + lngBillKey.ToString());
//鍒犻櫎鍏宠仈
@@ -207,10 +200,11 @@
}
oCn.BeginTran();
+
//涓昏〃
oCn.RunProc("Insert Into Sc_MouldMaintainBillMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate" +
- ",HYear,HPeriod,HRemar" +
+ ",HYear,HPeriod,HRemark" +
",HPlanNo,HPlanInterID,HMouldID,HBeginDate"+
",HEndDate,HMainSourceBillNo,HMainSourceInterID,HMainSourceEntryID" +
",HInnerBillNo,HExplanation,HMouldMaintainRuleInterID,HMaintainLevID,HLastResult" +
@@ -397,6 +391,215 @@
}
}
+ //淇敼鍗曟嵁_APP
+ public override bool ModifyBill_APP(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ oCn.BeginTran();
+ //淇濆瓨鍓嶆帶鍒�
+ if (!BeforeSave(lngBillKey, omodel.HBillNo, 2, ref sReturn))
+ {
+ oCn.RollBack();
+ return false;
+ }
+ //鏇存柊涓昏〃
+ oCn.RunProc("UpDate Sc_MouldMaintainBillMain set " +
+ " HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��===============
+ ",HDate='" + omodel.HDate + "'" +
+ ",HYear='" + omodel.HYear.ToString() + "'" +
+ ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
+ //",HStockType='" + omodel.HStockType + "'" +
+ ",HRemark='" + omodel.HRemark + "'" +
+ ",HUpDater='" + omodel.HMaker + "'" +
+ ",HUpDateDate=getdate()" +
+ //========================================
+ ",HPlanNo='" + omodel.HPlanNo + "'" +
+ ",HPlanInterID=" + omodel.HPlanInterID.ToString() +
+ ",HMouldID=" + omodel.HMouldID.ToString() +
+ ",HBeginDate='" + omodel.HBeginDate + "'" +
+ ",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 + "'" +
+
+ " where HInterID=" + lngBillKey.ToString());
+ //鍒犻櫎鍏宠仈
+ DeleteRelation(ref sReturn, lngBillKey);
+ //鍒犻櫎瀛愯〃
+ DeleteBillSub(lngBillKey);
+ DeleteBillSub2(lngBillKey);
+ omodel.HInterID = lngBillKey;
+ //鎻掑叆淇濆吇椤瑰瓙琛�
+ foreach (Model.ClsSc_MouldMaintainRuleBillSub_Item Item in DetailCol)
+ {
+ oCn.RunProc("Insert into Sc_MouldMaintainBillSub_Item" +
+ " (HInterID,HEntryID,HMaintainItemID,HMaintainItem" +
+ ",HMaintainPart,HClaim" +
+ ",HManagerID" +
+ ",HCloseMan,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaintainResult" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + Item.HEntryID.ToString() + "," + Item.HMaintainItemID.ToString() + ",'" + Item.HMaintainItem.ToString() + "'" +
+ ",'" + Item.HMaintainPart.ToString() + "','" + Item.HClaim.ToString() + "'" +
+ "," + Item.HManagerID.ToString() +
+ ",'" + Item.HCloseMan + "'," + Convert.ToString(Item.HCloseType ? 1 : 0) + ",'" + Item.HRemark + "'" +
+ "," + Item.HSourceInterID.ToString() + "," + Item.HSourceEntryID.ToString() + ",'" + Item.HSourceBillNo + "','" + Item.HSourceBillType + "'," + Item.HRelationQty.ToString() + "," + Item.HRelationMoney.ToString() +
+ ",'" + Item.HMaintainResult + "'" +
+ ") ");
+ }
+ //鎻掑叆閰嶄欢椤瑰瓙琛�
+ foreach (Model.ClsSc_MouldMaintainBillSub oSub in DetailColl)
+ {
+
+ oCn.RunProc("Insert into Sc_MouldMaintainBillSub " +
+ " (HInterID,HEntryID,HMaterID" +
+ ",HQty,HUnitID" +
+ ",HQtyMust,HManagerID" +
+ ",HCloseMan,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HMaterID.ToString() +
+ "," + oSub.HQty.ToString() + "," + oSub.HUnitID.ToString() +
+ "," + oSub.HQtyMust.ToString() + "," + oSub.HManagerID.ToString() +
+ ",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ ") ");
+ }
+ //淇濆瓨鍚庢帶鍒�
+ if (!AfterSave(lngBillKey, omodel.HBillNo, 2, ref sReturn))
+ {
+ oCn.RollBack();
+ return false;
+ }
+ sReturn = "鍗曟嵁鍙凤細" + omodel.HBillNo + " 淇敼鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
+ //鏂板鍗曟嵁_APP
+ public override bool AddBill_APP(ref string sReturn)
+ {
+ try
+ {
+ //寰楀埌mainid
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+
+ //淇濆瓨鍓嶆帶鍒�
+ if (!BeforeSave(omodel.HInterID, omodel.HBillNo, 1, ref sReturn))
+ {
+ return false;
+ }
+
+ oCn.BeginTran();
+
+ //涓昏〃
+ oCn.RunProc("Insert Into Sc_MouldMaintainBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate" +
+ ",HYear,HPeriod,HRemark" +
+ ",HPlanNo,HPlanInterID,HMouldID,HBeginDate" +
+ ",HEndDate,HMainSourceBillNo,HMainSourceInterID,HMainSourceEntryID" +
+ ",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 + "'" +
+ ",'" + omodel.HPlanNo + "','" + omodel.HPlanInterID.ToString() + "','" + omodel.HMouldID.ToString() + "','" + omodel.HBeginDate + "'" +
+ ",'" + omodel.HEndDate + "','" + omodel.HMainSourceBillNo.ToString() + "','" + omodel.HMainSourceInterID + "','" + omodel.HMainSourceEntryID + "'" +
+ ",'" + omodel.HInnerBillNo + "','" + omodel.HExplanation + "'," + omodel.HMouldMaintainRuleInterID.ToString() + "," + omodel.HMaintainLevID +
+ ",'" + omodel.HLastResult + "'" +
+ ",'" + omodel.HRequestComDate + "'," + omodel.HRecentMainModule + "," + omodel.HCumulativeModule + "," + omodel.HProductionModule + ") ");
+
+ if (DetailCol.Count > 0)
+ {
+ //鎻掑叆淇濆吇椤瑰瓙琛�
+ foreach (Model.ClsSc_MouldMaintainRuleBillSub_Item Item in DetailCol)
+ {
+ oCn.RunProc("Insert into Sc_MouldMaintainBillSub_Item" +
+ " (HInterID,HEntryID,HMaintainItemID,HMaintainItem" +
+ ",HMaintainPart,HClaim" +
+ ",HManagerID" +
+ ",HCloseMan,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaintainResult" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + Item.HEntryID.ToString() + "," + Item.HMaintainItemID.ToString() + ",'" + Item.HMaintainItem.ToString() + "'" +
+ ",'" + Item.HMaintainPart.ToString() + "','" + Item.HClaim.ToString() + "'" +
+ "," + Item.HManagerID.ToString() +
+ ",'" + Item.HCloseMan + "'," + Convert.ToString(Item.HCloseType ? 1 : 0) + ",'" + Item.HRemark + "'" +
+ "," + Item.HSourceInterID.ToString() + "," + Item.HSourceEntryID.ToString() + ",'" + Item.HSourceBillNo + "','" + Item.HSourceBillType + "'," + Item.HRelationQty.ToString() + "," + Item.HRelationMoney.ToString() +
+ ",'" + Item.HMaintainResult + "'" +
+ ") ");
+ }
+ }
+ if (DetailColl.Count > 0)
+ {
+ //鎻掑叆閰嶄欢椤瑰瓙琛�
+ foreach (Model.ClsSc_MouldMaintainBillSub oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into Sc_MouldMaintainBillSub " +
+ " (HInterID,HEntryID,HMaterID" +
+ ",HQty,HUnitID" +
+ ",HQtyMust,HManagerID" +
+ ",HCloseMan,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HMaterID.ToString() +
+ "," + oSub.HQty.ToString() + "," + oSub.HUnitID.ToString() +
+ "," + oSub.HQtyMust.ToString() + "," + oSub.HManagerID.ToString() +
+ ",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ ") ");
+ }
+ }
+ //
+ //foreach (Model.ClsSc_MouldMaintainBillSub oSub in DetailColl)
+ //{
+ // Ds = oCn.RunProcReturn("exec h_p_Sc_MouldMaintainBill_Qty " + oSub.HICMOInterID, "");
+ // if (Ds.Tables[0].Rows.Count == 0)
+ // return;
+ // if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBool"]) == "Y")
+ // {
+ // sReturn = "姹囨姤鏁伴噺瓒呰繃璁″垝鏁伴噺锛佷笉鍏佽淇濆瓨";
+ // return false;
+ // }
+ //}
+ //
+
+ //淇濆吇瀹屾垚锛屽弽鍐欏櫒鍏蜂繚鍏昏鍒掑崟瀛愯〃鏄惁鐐规鏍囪
+ oCn.RunProc("exec h_p_Sc_MouldMaintain_AfterSaveCtrl " + omodel.HMouldMaintainPlanInterID + "," + omodel.HMouldMaintainPlanEntryID);
+
+ //淇濆瓨鍚庢帶鍒�
+ if (!AfterSave(omodel.HInterID, omodel.HBillNo, 1, ref sReturn))
+ {
+ oCn.RollBack();
+ return false;
+ }
+ sReturn = "鍗曟嵁鍙凤細" + omodel.HBillNo + " 鏂板鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
+
//瀹℃牳
//public bool CheckBill(Int64 lngBillKey, ref string sReturn)
//{
@@ -425,6 +628,6 @@
-
+
}
}
diff --git "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_EmployeeSignInNoteBill.cs" "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_EmployeeSignInNoteBill.cs"
new file mode 100644
index 0000000..32d2976
--- /dev/null
+++ "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_EmployeeSignInNoteBill.cs"
@@ -0,0 +1,295 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace DAL
+{
+ public class ClsSc_EmployeeSignInNoteBill : DBUtility.ClsXt_BaseBill
+ {
+ public Model.ClsSc_EmployeeSignInNoteBill omodel = new Model.ClsSc_EmployeeSignInNoteBill();
+ public List<Model.ClsSc_EmployeeSignInNoteBillSub> DetailColl = new List<Model.ClsSc_EmployeeSignInNoteBillSub>();
+
+
+ public ClsSc_EmployeeSignInNoteBill()
+ {
+ base.MvarItemKeySub = "Sc_EmployeeSignInNoteBillSub";
+ base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey= "Sc_EmployeeSignInNoteBillMain";
+ base.MvarReportTitle = "鍛樺伐绛惧埌璁板綍鍗�";
+ base.BillType = "4616";
+ base.HBillSubType = "4616";
+
+ }
+
+ #region 鍥哄畾浠ｇ爜
+
+ ~ClsSc_EmployeeSignInNoteBill()
+ {
+ DetailColl = null;
+ }
+
+ #endregion 鑷畾涔夋柟娉�
+ //淇敼鍗曟嵁
+ public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //
+ oCn.BeginTran();
+
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ string HBillNote = "";
+ DataSet ds = oCn.RunProcReturn("Exec h_p_Gy_QCVerificationBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',2 ", "h_p_Gy_QCVerificationBill_BeforeSaveCtrl");
+ if (ds == null)
+ {
+ sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ return false;
+ }
+ //=========================================================
+
+ //鏇存柊涓昏〃
+ oCn.RunProc("UpDate Sc_EmployeeSignInNoteBillMain set " +
+ " HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��===============
+ ",HDate='" + omodel.HDate + "'" +
+ ",HYear='" + omodel.HYear.ToString() + "'" +
+ ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
+ ",HRemark='" + omodel.HRemark + "'" +
+ ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
+ ",HUpDateDate=getdate()" +
+ //========================================
+ ",HChecker=" + omodel.HCheckEmp.ToString() +
+ ",HDeptID=" + omodel.HDeptID.ToString() +
+ ",HMainSourceBillType='"+ omodel.HMainSourceBillType+"'"+
+ ",HMainSourceBillNo='" + omodel.HMainSourceBillNo + "'" +
+ ",HMainSourceInterID=" + omodel.HMainSourceInterID.ToString()+
+ ",HEquipID =" + omodel.HEquipID.ToString()+
+ ",HMouldID =" + omodel.HMouldID.ToString()+
+ ",HSourceID =" + omodel.HSourceID.ToString()+
+ ",HProcID =" + omodel.HProcID.ToString()+
+ ",HGroupID =" + omodel.HGroupID.ToString()+
+ ",HShiftsID =" + omodel.HShiftsID.ToString()+
+ ",HSignInReason ='" + omodel.HSignInReason.ToString()+"'"+
+ ",HEmpID ='" + omodel.HEmpID.ToString()+ "'" +
+ " where HInterID=" + lngBillKey.ToString());
+ //鍒犻櫎鍏宠仈
+ DeleteRelation(ref sReturn, lngBillKey);
+ oCn.RunProc("delete from Sc_EmployeeSignInNoteBillSub where HInterID=" + lngBillKey);
+ //鎻掑叆瀛愯〃
+ omodel.HInterID = lngBillKey;
+ foreach (Model.ClsSc_EmployeeSignInNoteBillSub oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into Sc_EmployeeSignInNoteBillSub " +
+ " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ ") ");
+ }
+
+ //=========================淇濆瓨鍚庢帶鍒�
+ DataSet ds2 = oCn.RunProcReturn("Exec h_p_Gy_QCVerificationBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',2 ", "h_p_Gy_QCVerificationBill_AfterSaveCtrl");
+
+
+ if (ds2 == null)
+ {
+ sReturn = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";
+ oCn.RollBack();
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触2锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
+ oCn.RollBack();
+ return false;
+ }
+ //============================
+
+ sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏂板鍗曟嵁
+ public override bool AddBill(ref string sReturn)
+ {
+ try
+ {
+ //寰楀埌mainid
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ string HBillNote = "";
+ DataSet ds = oCn.RunProcReturn("Exec h_p_Gy_QCVerificationBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_Gy_QCVerificationBill_BeforeSaveCtrl");
+ if (ds == null)
+ {
+ sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ return false;
+ }
+ //=========================================================
+
+
+ oCn.BeginTran();
+ oCn.RunProc("Insert Into Sc_EmployeeSignInNoteBillMain " +
+ "(HBillType,HBillSubType,HBillNo,HDate" +
+ ",HYear,HPeriod,HRemark,HMaker,HMakeDate," +
+ "HMainSourceBillType,HMainSourceBillNo,HMainSourceInterID,HMainSourceEntryID," +
+ "HEquipID,HMouldID,HSourceID,HProcID,HGroupID,HShiftsID,HSignInReason,HSignRemark," +
+ "HChecker,HDeptID,HEmpID,HOrgID) " +
+ "values('" + (this.BillType ?? "") + "','" + (this.HBillSubType ?? "") + "'," +
+ "'" + (omodel.HBillNo ?? "") + "','" + (omodel.HDate.ToString() ?? "") + "'" +
+ "," + (omodel.HYear.ToString() ?? "0") + "," + (omodel.HPeriod.ToString() ?? "0") +
+ ",'" + (omodel.HRemark ?? "") + "','" + (omodel.HMaker ?? "") + "',getdate(),'" +
+ (omodel.HMainSourceBillType ?? "") + "','" + (omodel.HMainSourceBillNo ?? "") + "'," +
+ (omodel.HMainSourceInterID.ToString() ?? "0") + "," + (omodel.HMainSourceEntryID.ToString() ?? "0") + "," +
+ (omodel.HEquipID.ToString() ?? "0") + "," + (omodel.HMouldID.ToString() ?? "0") + "," +
+ (omodel.HSourceID.ToString() ?? "0") + "," + (omodel.HProcID.ToString() ?? "0") + "," +
+ (omodel.HGroupID.ToString() ?? "0") + "," + (omodel.HShiftsID.ToString() ?? "0") + ",'" +
+ (omodel.HSignInReason?.ToString() ?? "0") + "','" + (omodel.HSignRemark?.ToString() ?? "") + "'," +
+ (omodel.HCheckEmp.ToString() ?? "0") + "," + (omodel.HDeptID.ToString() ?? "0") + "," + (omodel.HEmpID.ToString() ?? "0") + "," + (omodel.HOrgID.ToString() ?? "0") + ")");
+ //涓昏〃
+ //鎻掑叆瀛愯〃
+
+ foreach (Model.ClsSc_EmployeeSignInNoteBillSub oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into Gy_QCVerificationBillSub " +
+ " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ "" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ ") ");
+ }
+
+ //=========================淇濆瓨鍚庢帶鍒�
+ DataSet ds2 = oCn.RunProcReturn("Exec h_p_Gy_QCVerificationBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1", "h_p_Gy_QCVerificationBill_AfterSaveCtrl");
+
+ if (ds2 == null)
+ {
+ sReturn = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";
+ oCn.RollBack();
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触2锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
+ oCn.RollBack();
+ return false;
+ }
+ //============================
+
+ sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏄剧ず鍗曟嵁
+ public override bool ShowBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //鏌ヨ涓昏〃
+ DataSet Ds ;
+ Ds = oCn.RunProcReturn("Select * from Gy_QCVerificationBillMain Where HInterID=" + lngBillKey.ToString(), "Gy_QCVerificationBillMain");
+ if(Ds.Tables[0].Rows.Count==0)
+ {
+ sReturn = "鍗曟嵁鏈壘鍒帮紒";
+ return false;
+ }
+ //鍥哄畾璧嬪��===========================================
+ omodel.HYear = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HYear"]);
+ omodel.HPeriod = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPeriod"]);
+ omodel.HBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillType"]);
+ omodel.HBillSubType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillSubType"]);
+ omodel.HInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"]);
+ omodel.HDate = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HDate"]);
+ omodel.HBillNo = Ds.Tables[0].Rows[0]["HBillNo"].ToString().Trim();
+ omodel.HBillStatus = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HBillStatus"]);
+ omodel.HCheckItemNowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNowID"]);
+ omodel.HCheckItemNextID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNextID"]);
+ omodel.HCheckFlowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckFlowID"]);
+ omodel.HRemark = Ds.Tables[0].Rows[0]["HRemark"].ToString().Trim();
+ omodel.HBackDate = Ds.Tables[0].Rows[0]["HBackDate"].ToString().Trim();
+ omodel.HBacker = Ds.Tables[0].Rows[0]["HBacker"].ToString().Trim();
+ omodel.HCheckDate = Ds.Tables[0].Rows[0]["HCheckDate"].ToString().Trim();
+ omodel.HChecker = Ds.Tables[0].Rows[0]["HChecker"].ToString().Trim();
+ omodel.HMaker = Ds.Tables[0].Rows[0]["HMaker"].ToString().Trim();
+ omodel.HMakeDate = Ds.Tables[0].Rows[0]["HMakeDate"].ToString().Trim();
+ omodel.HUpDateDate = Ds.Tables[0].Rows[0]["HUpDateDate"].ToString().Trim();
+ omodel.HUpDater = Ds.Tables[0].Rows[0]["HUpDater"].ToString().Trim();
+ omodel.HCloseDate = Ds.Tables[0].Rows[0]["HCloseDate"].ToString().Trim();
+ omodel.HCloseMan = Ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim();
+ omodel.HCloseType = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HCloseType"]);
+ omodel.HDeleteDate = Ds.Tables[0].Rows[0]["HDeleteDate"].ToString().Trim();
+ omodel.HDeleteMan = Ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim();
+ //========================================================
+ omodel.HCheckEmp = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckEmp"]);
+ omodel.HDeptID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HDeptID"]);
+
+
+ //
+
+ //寰幆
+ DataSet DsSub ;
+ DsSub = oCn.RunProcReturn("Select * from Gy_QCVerificationBillSub Where HInterID=" + lngBillKey.ToString() + " order by HEntryID ", "Sc_MouldRepairWorkBillSub");
+ DetailColl.Clear();//娓呯┖
+ for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
+ {
+ Model.ClsSc_EmployeeSignInNoteBillSub oSub = new Model.ClsSc_EmployeeSignInNoteBillSub();
+ // 鍥哄畾璧嬪��===============================================
+ oSub.HInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HInterID"]);
+ oSub.HEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEntryID"]);
+ oSub.HSourceInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceInterID"]);
+ oSub.HSourceEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceEntryID"]);
+ oSub.HSourceBillType = DsSub.Tables[0].Rows[i]["HSourceBillType"].ToString().Trim();
+ oSub.HSourceBillNo = DsSub.Tables[0].Rows[i]["HSourceBillNo"].ToString().Trim();
+ oSub.HRelationQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationQty"]);
+ oSub.HRelationMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationMoney"]);
+ oSub.HCloseMan = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HCloseMan"]);
+ oSub.HCloseType = DBUtility.ClsPub.isBool(DsSub.Tables[0].Rows[i]["HCloseType"]);
+ oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HEntryCloseDate"]);
+ oSub.HRemark = DsSub.Tables[0].Rows[i]["HRemark"].ToString().Trim();
+ //===================================================
+
+ DetailColl.Add(oSub);
+ }
+ sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+
+
+ }
+
+}
diff --git a/DBUtility/obj/Release/DBUtility.Gy_UserSelect.resources b/DBUtility/obj/Release/DBUtility.Gy_UserSelect.resources
index 84a963f..552e300 100644
--- a/DBUtility/obj/Release/DBUtility.Gy_UserSelect.resources
+++ b/DBUtility/obj/Release/DBUtility.Gy_UserSelect.resources
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.Xt_BillType.resources b/DBUtility/obj/Release/DBUtility.Xt_BillType.resources
index c65df75..561c1c7 100644
--- a/DBUtility/obj/Release/DBUtility.Xt_BillType.resources
+++ b/DBUtility/obj/Release/DBUtility.Xt_BillType.resources
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.Xt_CheckFlow.resources b/DBUtility/obj/Release/DBUtility.Xt_CheckFlow.resources
index 1d9a8a4..9103b7d 100644
--- a/DBUtility/obj/Release/DBUtility.Xt_CheckFlow.resources
+++ b/DBUtility/obj/Release/DBUtility.Xt_CheckFlow.resources
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.Xt_CheckFlowList.resources b/DBUtility/obj/Release/DBUtility.Xt_CheckFlowList.resources
index fd5a993..fe71e8f 100644
--- a/DBUtility/obj/Release/DBUtility.Xt_CheckFlowList.resources
+++ b/DBUtility/obj/Release/DBUtility.Xt_CheckFlowList.resources
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.Xt_CheckItem.resources b/DBUtility/obj/Release/DBUtility.Xt_CheckItem.resources
index c8139ba..ae4f855 100644
--- a/DBUtility/obj/Release/DBUtility.Xt_CheckItem.resources
+++ b/DBUtility/obj/Release/DBUtility.Xt_CheckItem.resources
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.Xt_CheckUserRight.resources b/DBUtility/obj/Release/DBUtility.Xt_CheckUserRight.resources
index 3bb77bc..89f77dc 100644
--- a/DBUtility/obj/Release/DBUtility.Xt_CheckUserRight.resources
+++ b/DBUtility/obj/Release/DBUtility.Xt_CheckUserRight.resources
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache b/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache
index 87f901d..0e98ef9 100644
--- a/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache
+++ b/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache b/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
index d04dc37..28ba0b1 100644
--- a/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
+++ b/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
Binary files differ
diff --git "a/DBUtility/\344\270\232\345\212\241\345\215\225\346\215\256/ClsXt_BaseBill.cs" "b/DBUtility/\344\270\232\345\212\241\345\215\225\346\215\256/ClsXt_BaseBill.cs"
index cffe5a0..5b49294 100644
--- "a/DBUtility/\344\270\232\345\212\241\345\215\225\346\215\256/ClsXt_BaseBill.cs"
+++ "b/DBUtility/\344\270\232\345\212\241\345\215\225\346\215\256/ClsXt_BaseBill.cs"
@@ -1600,7 +1600,18 @@
{
return true;
}
-
+
+ //淇敼鍗曟嵁_APP
+ public virtual bool ModifyBill_APP(Int64 lngBillKey, ref string sReturn)
+ {
+ return true;
+ }
+
+ //鏂板鍗曟嵁_APP
+ public virtual bool AddBill_APP(ref string sReturn)
+ {
+ return true;
+ }
//鍒犻櫎鍏宠仈
public virtual void DeleteRelation(ref string sReturn, Int64 lngBillKey)
diff --git a/Kanban/Kanban.csproj b/Kanban/Kanban.csproj
index 4d4704a..c2d5a6a 100644
--- a/Kanban/Kanban.csproj
+++ b/Kanban/Kanban.csproj
@@ -514,6 +514,9 @@
<Install>false</Install>
</BootstrapperPackage>
</ItemGroup>
+ <ItemGroup>
+ <None Include="app.config" />
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Kanban/app.config b/Kanban/app.config
new file mode 100644
index 0000000..7ca9f4c
--- /dev/null
+++ b/Kanban/app.config
@@ -0,0 +1,23 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <runtime>
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <dependentAssembly>
+ <assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.3.2.10" newVersion="1.3.2.10" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
+</configuration>
\ No newline at end of file
diff --git a/LMES/LMES.csproj b/LMES/LMES.csproj
index aa86cff..c96af39 100644
--- a/LMES/LMES.csproj
+++ b/LMES/LMES.csproj
@@ -29,11 +29,11 @@
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <PlatformTarget>AnyCPU</PlatformTarget>
+ <PlatformTarget>x86</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
+ <OutputPath>bin\x86\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
diff --git a/MES/app.config b/MES/app.config
index 51278a4..55fdf68 100644
--- a/MES/app.config
+++ b/MES/app.config
@@ -1,3 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+锘�<?xml version="1.0" encoding="utf-8"?>
<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup>
+ <runtime>
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <dependentAssembly>
+ <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
+</configuration>
diff --git a/Model/Model.csproj b/Model/Model.csproj
index fca16fa..06e2e92 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -771,6 +771,8 @@
<Compile Include="璐ㄦ绠＄悊\ClsGy_EnvironmentTestSchemeBillMain.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsGy_MaterPreventErrMouldBillMain.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsGy_EnvironmentTestSchemeBillSub.cs" />
+ <Compile Include="杞﹂棿绠＄悊\ClsSc_EmployeeSignInNoteBillSub.cs" />
+ <Compile Include="杞﹂棿绠＄悊\ClsSc_EmployeeSignInNoteBill.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsQc_PreventErrMouldCheckBillMain.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsGy_WorkBeginDotCheckListBillMain.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsCJ_WIPBeginStockBillMain.cs" />
diff --git a/Model/obj/x86/Release/Model.csproj.AssemblyReference.cache b/Model/obj/x86/Release/Model.csproj.AssemblyReference.cache
index 33be200..67f1415 100644
--- a/Model/obj/x86/Release/Model.csproj.AssemblyReference.cache
+++ b/Model/obj/x86/Release/Model.csproj.AssemblyReference.cache
Binary files differ
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_MouldDotCheckBillMain.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_MouldDotCheckBillMain.cs"
index 053bd5c..ff72ad1 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_MouldDotCheckBillMain.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_MouldDotCheckBillMain.cs"
@@ -20,7 +20,7 @@
public string HBigSafeNote;// 重大安全隐患记录
public Int64 HShiftsID;// 生产班次（Gy_Shifts）
public string HDotCheckNote;// 点检数据
-
+ public Int64 HDeptID;// 部门（Gy_Shifts）
public long HMouldDotCheckPlanInterID;// int --点检计划内码
public long HMouldDotCheckPlanEntryID;// int --点检计划子内码
diff --git "a/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_EmployeeSignInNoteBill.cs" "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_EmployeeSignInNoteBill.cs"
new file mode 100644
index 0000000..92b5f5e
--- /dev/null
+++ "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_EmployeeSignInNoteBill.cs"
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsSc_EmployeeSignInNoteBill : DBUtility.ClsXt_BaseBillMain
+ {
+ public Int64 HCheckEmp;//
+ public Int64 HDeptID;//
+ public Int64 HEmpID;//
+ public Int64 HOrgID;
+ public Int64 HEquipID;
+ public Int64 HMouldID;
+ public Int64 HSourceID;
+ public Int64 HProcID;
+ public Int64 HGroupID;
+ public Int64 HShiftsID;
+ public string HSignInReason;
+ public string HSignRemark;
+
+
+
+
+
+ }
+}
diff --git "a/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_EmployeeSignInNoteBillSub.cs" "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_EmployeeSignInNoteBillSub.cs"
new file mode 100644
index 0000000..20abbb8
--- /dev/null
+++ "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_EmployeeSignInNoteBillSub.cs"
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsSc_EmployeeSignInNoteBillSub : DBUtility.ClsXt_BaseBillSub
+ {
+
+
+
+
+
+
+ }
+}
diff --git a/NETERPNoWin/app.config b/NETERPNoWin/app.config
index 51278a4..8b8fb46 100644
--- a/NETERPNoWin/app.config
+++ b/NETERPNoWin/app.config
@@ -1,3 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
+锘�<?xml version="1.0" encoding="utf-8"?>
<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup>
+ <runtime>
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <dependentAssembly>
+ <assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.3.2.10" newVersion="1.3.2.10" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
+</configuration>
diff --git a/PayM/bin/x86/Debug/AxInterop.gregn6Lib.dll b/PayM/bin/x86/Debug/AxInterop.gregn6Lib.dll
index be11ca7..9ed999c 100644
--- a/PayM/bin/x86/Debug/AxInterop.gregn6Lib.dll
+++ b/PayM/bin/x86/Debug/AxInterop.gregn6Lib.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/BLL.dll b/PayM/bin/x86/Debug/BLL.dll
index 20788c3..849d00c 100644
--- a/PayM/bin/x86/Debug/BLL.dll
+++ b/PayM/bin/x86/Debug/BLL.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/BLL.pdb b/PayM/bin/x86/Debug/BLL.pdb
index 3321198..deddaa0 100644
--- a/PayM/bin/x86/Debug/BLL.pdb
+++ b/PayM/bin/x86/Debug/BLL.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/DAL.dll b/PayM/bin/x86/Debug/DAL.dll
index bd80c50..71ce7cd 100644
--- a/PayM/bin/x86/Debug/DAL.dll
+++ b/PayM/bin/x86/Debug/DAL.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/DAL.pdb b/PayM/bin/x86/Debug/DAL.pdb
index cd44e59..472e7a9 100644
--- a/PayM/bin/x86/Debug/DAL.pdb
+++ b/PayM/bin/x86/Debug/DAL.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/DBUtility.dll b/PayM/bin/x86/Debug/DBUtility.dll
index 8b2af8f..66f5acc 100644
--- a/PayM/bin/x86/Debug/DBUtility.dll
+++ b/PayM/bin/x86/Debug/DBUtility.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/DBUtility.pdb b/PayM/bin/x86/Debug/DBUtility.pdb
index 6c1530c..9531fb1 100644
--- a/PayM/bin/x86/Debug/DBUtility.pdb
+++ b/PayM/bin/x86/Debug/DBUtility.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/Interop.gregn6Lib.dll b/PayM/bin/x86/Debug/Interop.gregn6Lib.dll
index 23597f8..86d30c5 100644
--- a/PayM/bin/x86/Debug/Interop.gregn6Lib.dll
+++ b/PayM/bin/x86/Debug/Interop.gregn6Lib.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/Model.dll b/PayM/bin/x86/Debug/Model.dll
index b2a671a..687e22c 100644
--- a/PayM/bin/x86/Debug/Model.dll
+++ b/PayM/bin/x86/Debug/Model.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/Model.pdb b/PayM/bin/x86/Debug/Model.pdb
index 02b301b..e1e2d8b 100644
--- a/PayM/bin/x86/Debug/Model.pdb
+++ b/PayM/bin/x86/Debug/Model.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/PayM.dll b/PayM/bin/x86/Debug/PayM.dll
index 8b14953..f98b22e 100644
--- a/PayM/bin/x86/Debug/PayM.dll
+++ b/PayM/bin/x86/Debug/PayM.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/PayM.pdb b/PayM/bin/x86/Debug/PayM.pdb
index bdcf122..fa7b674 100644
--- a/PayM/bin/x86/Debug/PayM.pdb
+++ b/PayM/bin/x86/Debug/PayM.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/Pub_Class.dll b/PayM/bin/x86/Debug/Pub_Class.dll
index bfb06f9..0f7b443 100644
--- a/PayM/bin/x86/Debug/Pub_Class.dll
+++ b/PayM/bin/x86/Debug/Pub_Class.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/Pub_Class.pdb b/PayM/bin/x86/Debug/Pub_Class.pdb
index 6ce04a3..43de051 100644
--- a/PayM/bin/x86/Debug/Pub_Class.pdb
+++ b/PayM/bin/x86/Debug/Pub_Class.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/Pub_Control.dll b/PayM/bin/x86/Debug/Pub_Control.dll
index 753af68..912a271 100644
--- a/PayM/bin/x86/Debug/Pub_Control.dll
+++ b/PayM/bin/x86/Debug/Pub_Control.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/Pub_Control.pdb b/PayM/bin/x86/Debug/Pub_Control.pdb
index cd3dcae..2a585b2 100644
--- a/PayM/bin/x86/Debug/Pub_Control.pdb
+++ b/PayM/bin/x86/Debug/Pub_Control.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/SQLHelper.dll b/PayM/bin/x86/Debug/SQLHelper.dll
index 86be596..0f7826f 100644
--- a/PayM/bin/x86/Debug/SQLHelper.dll
+++ b/PayM/bin/x86/Debug/SQLHelper.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/SQLHelper.pdb b/PayM/bin/x86/Debug/SQLHelper.pdb
index 6c4a134..9d3a304 100644
--- a/PayM/bin/x86/Debug/SQLHelper.pdb
+++ b/PayM/bin/x86/Debug/SQLHelper.pdb
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.csproj.FileListAbsolute.txt b/PayM/obj/x86/Debug/PayM.csproj.FileListAbsolute.txt
index f166c35..f80efc0 100644
--- a/PayM/obj/x86/Debug/PayM.csproj.FileListAbsolute.txt
+++ b/PayM/obj/x86/Debug/PayM.csproj.FileListAbsolute.txt
@@ -2665,6 +2665,216 @@
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\PayM\obj\x86\Debug\PayM.csproj.CopyComplete
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\PayM\obj\x86\Debug\PayM.dll
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\PayM\obj\x86\Debug\PayM.pdb
+<<<<<<< HEAD
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\bin\x86\Debug\PayM.dll
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\bin\x86\Debug\PayM.pdb
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\bin\x86\Debug\BLL.dll
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\bin\x86\Debug\DAL.dll
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\bin\x86\Debug\DBUtility.dll
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\bin\x86\Debug\Model.dll
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\bin\x86\Debug\Pub_Class.dll
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\bin\x86\Debug\Pub_Control.dll
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\bin\x86\Debug\SQLHelper.dll
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\bin\x86\Debug\Kingdee.BOS.WebApi.Client.dll
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\bin\x86\Debug\Newtonsoft.Json.dll
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\bin\x86\Debug\BLL.pdb
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\bin\x86\Debug\DAL.pdb
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\bin\x86\Debug\DBUtility.pdb
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\bin\x86\Debug\Model.pdb
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\bin\x86\Debug\Pub_Class.pdb
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\bin\x86\Debug\Pub_Control.pdb
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\bin\x86\Debug\SQLHelper.pdb
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\bin\x86\Debug\Interop.gregn6Lib.dll
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\bin\x86\Debug\AxInterop.gregn6Lib.dll
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.csproj.AssemblyReference.cache
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\Interop.gregn6Lib.dll
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\AxInterop.gregn6Lib.dll
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.csproj.ResolveComReference.cache
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Form2.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_ContractBookBill.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_ContractBookBillList.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_EmpChangeBillQuery.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_EmpUpChangeBill.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_EmpUpChangeBillList.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_FamilyMemberBill.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_FamilyMemberBillList.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_InsuranceBookBill.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_InsuranceBookBillList.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_LearnHistoryBill.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_LearnHistoryBillList.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_PaperPhotoBill.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_PaperPhotoBillList.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_RewardsPunishBill.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_RewardsPunishBillList.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_WorkInjuryBill.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_WorkInjuryBillList.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_WorkSkillBill.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_WorkSkillBillList.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_WorkStoryBill.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_WorkStoryBillList.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_EmpFosterBill.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_EmpFosterBillList.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.FrmChangeDate.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_AbsentBill.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_AbsentBillList.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_DuSubsidyItemBillQuery.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_DuSubsidyItemBill_KS.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_EarlyLateErrBill.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_EarlyLateErrBillList.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_EmpInitChangeBill.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_EmpInitChangeBillList.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ErrWorkTimesSendBillQuery.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_GroupBalBillQuery.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthICMOStockSumBill.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthICMOStockSumBillList.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OtherBalBillQuery.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OutApplyBillQuery.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OverApplyBillQuery.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\HuanXin.ERP.Pay_PayMentBillListDlg.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\HuanXin.ERP.Pay_PayMentBillListUnPayDlg.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentBillQuery.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMent_QC.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMent_QCAdd.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ProcPriceRequestBillQuery.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_RewardPunishBill.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_RewardPunishBillList.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBillList_KS.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBillQuery.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBill_Enter.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBill_KS.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBill_YR.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SumBalBill.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SumBalBillList.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SumBalBill_JS.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkErrTimesBill.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkErrTimesBillList.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesBillQuery.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesSumQueryBillList.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesSumQueryBillListDlg.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OutForComApplyBill.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OutForComApplyBillList.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentBillReport.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentBillReportDlg.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBillEntryReport.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBillEntryReportDlg.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBillSumReport.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBillSumReportDlg.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesPayMentEntryReport.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesPayMentEntryReportDlg.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesPayMentSumReport.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesPayMentSumReportDlg.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthSubsidyYearReport.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_YearToCashBillReport.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_YearToCashBillReportDlg.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Properties.Resources.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_EmpDimissionBill.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_EmpDimissionBillList.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\OAM.HR_EmpEngageRequestBill.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\OAM.HR_EmpEngageRequestBillList.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_CarOutApplyBill.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_CarOutApplyBillList.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_PayMentBillAutoAddnew.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_PayMentBillAutoAddnew1.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_PayMentBillAutoAddnew2.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_PayMentBillAutoAddnew3.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_PayMentBillAutoAddnew4.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_PayMentBillAutoAddnew5.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\BaseSet.Gy_DataInTmp_DuSubsidyItem.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_DuSubsidyItemBill.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_DuSubsidyItemBillList.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ErrWorkTimesRequestBill.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ErrWorkTimesRequestBillList.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ErrWorkTimesSendBill.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ErrWorkTimesSendBillList.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_GetNeedCheckErrWorkTimesSendBillList.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OtherMoney_Dlg.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentBillList.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_EmpChangeBill.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.HR_EmpChangeBillList.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_GroupBalBill.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_GroupBalBillList.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentDayBill.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentDayBillList.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ProcPriceRequestBill.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ProcPriceRequestBillList.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OtherBalBill.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OtherBalBillList.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OutApplyBill.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OutApplyBillList.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OverApplyBill.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OverApplyBillList.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBill.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBillDlg.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SingleBalBillList.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SubsidyChangeBill.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_SubsidyChangeBillList.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesBill.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesBillList.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentBill.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_EmpPayMentSumReport.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_EmpPayMentSumReportDlg.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_EmpWorkQtyEntryReport.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_EmpWorkQtyEntryReportDlg.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_InnerScrap.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_InnerScrapDlg.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OuterScrap.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_OuterScrapDlg.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentDeptSendList.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentDeptSendListDlg.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentDeptYearReport.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentDeptYearReportDlg.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentPrintReport.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentPrintReportDlg.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentSendList.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentSendListDlg.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentYearReport.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_PayMentYearReportDlg.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ProdWorkQtyEntryReport.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ProdWorkQtyEntryReportDlg.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ProdWorkQtySumReport.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_ProdWorkQtySumReportDlg.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesList.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesListDlg.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthWriteBillReportMX.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthWriteBillReportMX2.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Err_MonthExpenseEntryBill.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Err_MonthExpenseEntryBillDlg.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.KQ_sourceReport.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.KQ_sourceReportDlg.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthSubsidyEntryBillAdd.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthSubsidyEntryBillReportMX.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_NoWorkTimesReport.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_NoWorkTimesReportDlg.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_AccPayMentDayBill.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_AccPayMentDayBill2.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_AccPayMentDayBill3.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_AccPayMentDayBill4.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_AccPayMentDayBill5.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\CostM.Pay_AccPayMentDayBillList.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthExpenseEntryBill1.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthExpenseEntryBill2.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthExpenseEntryBill3.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthExpenseEntryBill4.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthExpenseEntryBill5.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthExpenseEntryBillList.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthExpenseEntryBillReport.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthExpenseEntryBillReportDlg.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthSubsidyEntryBillReport.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthSubsidyEntryBillReportDlg.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthWriteBillReport.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_MonthWriteBillReportDlg.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesCardBill1.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesCardBill2.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesCardBill3.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesCardBill4.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesCardBill5.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.Pay_WorkTimesCardBillList.resources
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.csproj.GenerateResource.cache
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.csproj.CoreCompileInputs.cache
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.csproj.CopyComplete
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.dll
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\PayM\obj\x86\Debug\PayM.pdb
+=======
D:\gz\MES-WEB-API\MES-WEB-API\PayM\bin\x86\Debug\PayM.dll
D:\gz\MES-WEB-API\MES-WEB-API\PayM\bin\x86\Debug\PayM.pdb
D:\gz\MES-WEB-API\MES-WEB-API\PayM\bin\x86\Debug\BLL.dll
@@ -2873,3 +3083,4 @@
D:\gz\MES-WEB-API\MES-WEB-API\PayM\obj\x86\Debug\PayM.csproj.CopyComplete
D:\gz\MES-WEB-API\MES-WEB-API\PayM\obj\x86\Debug\PayM.dll
D:\gz\MES-WEB-API\MES-WEB-API\PayM\obj\x86\Debug\PayM.pdb
+>>>>>>> 0605260d8529635c9dbef283bb5f6b85300a3503
diff --git a/Pub_Class/bin/Release/SyntacticSugar.dll b/Pub_Class/bin/Release/SyntacticSugar.dll
index c0635b3..9a5be6e 100644
--- a/Pub_Class/bin/Release/SyntacticSugar.dll
+++ b/Pub_Class/bin/Release/SyntacticSugar.dll
Binary files differ
diff --git a/Pub_Class/bin/Release/SyntacticSugar.pdb b/Pub_Class/bin/Release/SyntacticSugar.pdb
index ca3eca3..310ad83 100644
--- a/Pub_Class/bin/Release/SyntacticSugar.pdb
+++ b/Pub_Class/bin/Release/SyntacticSugar.pdb
Binary files differ
diff --git a/SelM/SelM.csproj b/SelM/SelM.csproj
index 8c39fc3..515de37 100644
--- a/SelM/SelM.csproj
+++ b/SelM/SelM.csproj
@@ -621,6 +621,9 @@
<Name>WorkM</Name>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <None Include="app.config" />
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/SelM/app.config b/SelM/app.config
new file mode 100644
index 0000000..7075dd4
--- /dev/null
+++ b/SelM/app.config
@@ -0,0 +1,19 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <runtime>
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <dependentAssembly>
+ <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
+</configuration>
\ No newline at end of file
diff --git a/SyntacticSugar/bin/Debug/SyntacticSugar.dll b/SyntacticSugar/bin/Debug/SyntacticSugar.dll
index 5b1b47c..55b6c53 100644
--- a/SyntacticSugar/bin/Debug/SyntacticSugar.dll
+++ b/SyntacticSugar/bin/Debug/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/bin/Debug/SyntacticSugar.pdb b/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
index 2ab4ed6..ceb9ba6 100644
--- a/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
+++ b/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
Binary files differ
diff --git a/SyntacticSugar/bin/Release/SyntacticSugar.dll b/SyntacticSugar/bin/Release/SyntacticSugar.dll
index c0635b3..9a5be6e 100644
--- a/SyntacticSugar/bin/Release/SyntacticSugar.dll
+++ b/SyntacticSugar/bin/Release/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/bin/Release/SyntacticSugar.pdb b/SyntacticSugar/bin/Release/SyntacticSugar.pdb
index ca3eca3..310ad83 100644
--- a/SyntacticSugar/bin/Release/SyntacticSugar.pdb
+++ b/SyntacticSugar/bin/Release/SyntacticSugar.pdb
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache
index fea44e6..88af047 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 1ea149a..abfb640 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -1,63 +1,21 @@
-D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
-D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
-D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
-D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
-D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
+<<<<<<< HEAD
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
+=======
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
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
-<<<<<<< HEAD
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
-=======
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
-D:\WMES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
-D:\WMES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
-D:\WMES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
-D:\WMES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
-D:\WMES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
-D:\GitHub\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
-D:\GitHub\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
-D:\GitHub\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
-D:\GitHub\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
-D:\GitHub\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
-D:\GitHub\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
-<<<<<<< HEAD
-D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
-D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
-D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
-D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
-D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
-=======
-D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
-D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
-D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
-D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
-D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
->>>>>>> 9f2520cf48814553f225271f492ea0d8f763e9d4
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
-<<<<<<< HEAD
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
-D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
-D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
-D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
-D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
-D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
-=======
-D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
-D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
-D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
-D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
-D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
->>>>>>> 48b5decba526435c701a1c9ca4171eaa4f5e7e8e
->>>>>>> 9f2520cf48814553f225271f492ea0d8f763e9d4
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
+>>>>>>> 0605260d8529635c9dbef283bb5f6b85300a3503
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.dll b/SyntacticSugar/obj/Debug/SyntacticSugar.dll
index 5b1b47c..55b6c53 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.dll
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.pdb b/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
index 2ab4ed6..ceb9ba6 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
Binary files differ
diff --git a/SyntacticSugar/obj/Release/.NETFramework,Version=v4.5.AssemblyAttributes.cs b/SyntacticSugar/obj/Release/.NETFramework,Version=v4.5.AssemblyAttributes.cs
deleted file mode 100644
index e5dc9b8..0000000
--- a/SyntacticSugar/obj/Release/.NETFramework,Version=v4.5.AssemblyAttributes.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5", FrameworkDisplayName = ".NET Framework 4.5")]
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache
deleted file mode 100644
index bfb772c..0000000
--- a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache
+++ /dev/null
@@ -1 +0,0 @@
-5dd9c82feb12f833c78ecebea7d9a46c99f29e3f
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
index dd1ef6e..f48159e 100644
--- a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -3,3 +3,8 @@
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.dll b/SyntacticSugar/obj/Release/SyntacticSugar.dll
index c0635b3..9a5be6e 100644
--- a/SyntacticSugar/obj/Release/SyntacticSugar.dll
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.pdb b/SyntacticSugar/obj/Release/SyntacticSugar.pdb
index ca3eca3..310ad83 100644
--- a/SyntacticSugar/obj/Release/SyntacticSugar.pdb
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.pdb
Binary files differ
diff --git a/WarM/WarM.csproj b/WarM/WarM.csproj
index a5f8263..6337e9c 100644
--- a/WarM/WarM.csproj
+++ b/WarM/WarM.csproj
@@ -74,6 +74,12 @@
<Reference Include="AxInterop.gregn6Lib">
<HintPath>..\OCX\AxInterop.gregn6Lib.dll</HintPath>
</Reference>
+ <Reference Include="BouncyCastle.Crypto, Version=1.8.9.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
+ <HintPath>..\packages\Portable.BouncyCastle.1.8.9\lib\net40\BouncyCastle.Crypto.dll</HintPath>
+ </Reference>
+ <Reference Include="ICSharpCode.SharpZipLib, Version=1.3.2.10, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
+ <HintPath>..\packages\SharpZipLib.1.3.2\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
+ </Reference>
<Reference Include="Interop.gregn6Lib">
<HintPath>..\OCX\Interop.gregn6Lib.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
@@ -86,21 +92,17 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>dll\Newtonsoft.Json.dll</HintPath>
</Reference>
- <Reference Include="NPOI, Version=2.1.3.1, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\LMES\bin\x86\Debug\NPOI.dll</HintPath>
+ <Reference Include="NPOI, Version=2.5.5.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
+ <HintPath>..\packages\NPOI.2.5.5\lib\net45\NPOI.dll</HintPath>
</Reference>
- <Reference Include="NPOI.OOXML, Version=2.1.3.1, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\LMES\bin\x86\Debug\NPOI.OOXML.dll</HintPath>
+ <Reference Include="NPOI.OOXML, Version=2.5.5.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
+ <HintPath>..\packages\NPOI.2.5.5\lib\net45\NPOI.OOXML.dll</HintPath>
</Reference>
- <Reference Include="NPOI.OpenXml4Net, Version=2.1.3.1, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\LMES\bin\x86\Debug\NPOI.OpenXml4Net.dll</HintPath>
+ <Reference Include="NPOI.OpenXml4Net, Version=2.5.5.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
+ <HintPath>..\packages\NPOI.2.5.5\lib\net45\NPOI.OpenXml4Net.dll</HintPath>
</Reference>
- <Reference Include="NPOI.OpenXmlFormats, Version=2.1.3.1, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\LMES\bin\x86\Debug\NPOI.OpenXmlFormats.dll</HintPath>
+ <Reference Include="NPOI.OpenXmlFormats, Version=2.5.5.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
+ <HintPath>..\packages\NPOI.2.5.5\lib\net45\NPOI.OpenXmlFormats.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
diff --git a/WarM/app.config b/WarM/app.config
index d9658be..cc86fd1 100644
--- a/WarM/app.config
+++ b/WarM/app.config
@@ -1,5 +1,26 @@
-<?xml version="1.0" encoding="utf-8"?>
+锘�<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
</configSections>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup>
+ <runtime>
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <dependentAssembly>
+ <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
+</configuration>
diff --git a/WarM/packages.config b/WarM/packages.config
index b00e0c5..17d12d1 100644
--- a/WarM/packages.config
+++ b/WarM/packages.config
@@ -1,4 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="M2Mqtt" version="4.3.0.0" targetFramework="net45" />
+ <package id="NPOI" version="2.5.5" targetFramework="net45" />
+ <package id="Portable.BouncyCastle" version="1.8.9" targetFramework="net45" />
+ <package id="SharpZipLib" version="1.3.2" targetFramework="net45" />
</packages>
\ No newline at end of file
diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
index af1c550..f59238f 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -3106,7 +3106,7 @@
sReturn = "鍗曟嵁鏈壘鍒帮紒";
return false;
}
- oCN.RunProc(" Update a set HChecker='" + HChecker + "',HCheckDate='" + HCheckDate + "' from Sc_StationOutBillMain with(nolock) Where HInterID=" + lngBillKey.ToString());
+ oCN.RunProc(" Update a set HChecker='" + HChecker + "',HCheckDate='" + HCheckDate + "' from Sc_StationOutBillMain a Where HInterID=" + lngBillKey.ToString());
oCN.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_Check_In " + lngBillKey.ToString() + ",1");
//鍒ゆ柇鏄惁鏄� 鏈亾宸ュ簭
DataSet ds1;
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldDotCheckRuleBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldDotCheckRuleBillController.cs
index 4481df0..e976cd5 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldDotCheckRuleBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldDotCheckRuleBillController.cs
@@ -83,8 +83,7 @@
try
{
List<object> columnNameList = new List<object>();
- //鍙嶅簭鍒楀寲浼犻�掔殑鍊�
- //HlpBill com = JsonConvert.DeserializeObject<HlpBill>(sWhere.ToString());
+
//缂栬緫鏉冮檺
if (!DBUtility.ClsPub.Security_Log("Sc_MouldDotCheckRuleBillList", 1, false, user))
{
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldReportController.cs b/WebAPI/Controllers/MJGL/Sc_MouldReportController.cs
index 3485d30..2834c61 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldReportController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldReportController.cs
@@ -72,11 +72,7 @@
#endregion
#region 鍣ㄥ叿淇濆吇浠诲姟锛堜粖鏃ュ緟淇濆吇銆佷粖鏃ュ凡淇濆吇銆佷粖澶╁叏閮ㄤ换鍔★級
- /// <summary>
- /// 杩斿洖鍣ㄥ叿淇濆吇浠诲姟
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
+
[Route("Sc_MouldMaintainTaskReport/MaintainList")]
[HttpGet]
public object MaintainList(string user)
@@ -123,6 +119,61 @@
return objJsonResult;
}
}
+
+ [Route("Sc_MouldMaintainTaskReport/MaintainList_APP")]
+ [HttpGet]
+ public object MaintainList_APP(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
+
+ string HBeginDate = dic["HBeginDate"].ToString();//寮�濮嬫棩鏈�
+ string HEndDate = dic["HEndDate"].ToString();//缁撴潫鏃ユ湡
+
+
+ ds = oCN.RunProcReturn("exec h_p_Sc_MouldMaintainTaskReport_APP '" + HBeginDate + "','" + HEndDate + "','" + user + "'", "h_p_Sc_MouldMaintainTaskReport_APP");
+
+
+
+ if (ds.Tables[0].Rows.Count != 0 || ds != null)
+ {
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds;
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳暟鎹�";
+ 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
#region 鍣ㄥ叿缁翠慨浠诲姟锛堝緟缁翠慨銆佸凡缁翠慨銆佸叏閮ㄤ换鍔★級
diff --git a/WebAPI/Controllers/SBGL/Sb_EquipReportController.cs b/WebAPI/Controllers/SBGL/Sb_EquipReportController.cs
index 65d928b..aa4e90a 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipReportController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipReportController.cs
@@ -72,11 +72,7 @@
#endregion
#region 璁惧淇濆吇浠诲姟锛堜粖鏃ュ緟淇濆吇銆佷粖鏃ュ凡淇濆吇銆佷粖澶╁叏閮ㄤ换鍔★級
- /// <summary>
- /// 杩斿洖璁惧淇濆吇浠诲姟
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
+
[Route("Sb_EquipMaintainTaskReport/MaintainList")]
[HttpGet]
public object MaintainList(string user)
@@ -123,6 +119,59 @@
return objJsonResult;
}
}
+
+ [Route("Sb_EquipMaintainTaskReport/MaintainList_APP")]
+ [HttpGet]
+ public object MaintainList_APP(string sWhere, string user)
+ {
+ try
+ {
+ Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
+
+ string HBeginDate = dic["HBeginDate"].ToString();//寮�濮嬫棩鏈�
+ string HEndDate = dic["HEndDate"].ToString();//缁撴潫鏃ユ湡
+
+
+ List<object> columnNameList = new List<object>();
+
+ ds = oCN.RunProcReturn("exec h_p_Sb_EquipMaintainTaskReport_APP '" + HBeginDate + "','" + HEndDate + "','" + user + "'", "h_p_Sb_EquipMaintainTaskReport_APP");
+
+ if (ds.Tables[0].Rows.Count != 0 || ds != null)
+ {
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds;
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳暟鎹�";
+ 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
#region 璁惧缁翠慨浠诲姟锛堝緟缁翠慨銆佸凡缁翠慨銆佸叏閮ㄤ换鍔★級
diff --git a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
index 1256f2b..302931d 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
@@ -1038,14 +1038,14 @@
{
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "宸ュ崟鏆傛湭澶勭悊,鍙互鎿嶄綔锛�";
+ objJsonResult.Message = "宸ュ崟宸插鐞�,涓嶅厑璁告搷浣滐紒";
objJsonResult.data = null;
}
else
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "宸ュ崟宸插鐞�,涓嶅厑璁告搷浣滐紒";
+ objJsonResult.Message = "宸ュ崟鏈鐞�,鍏佽鎿嶄綔锛�";
objJsonResult.data = null;
}
diff --git a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
index 83b8bcd..41baacc 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
@@ -41,6 +41,9 @@
public DAL.ClsOA_WorkLinkBill BillNew2 = new DAL.ClsOA_WorkLinkBill(); //瀵瑰簲鍗曟嵁绫� 宸ヤ綔鑱旂郴鍗�
+ #region 寮傚父鍙嶉鍗�
+
+
#region 鎶ュ伐骞冲彴寮傚父鍙嶉鍗曚繚瀛�/缂栬緫
/// <summary>
/// 寮傚父鍙嶉鍗�
@@ -794,6 +797,213 @@
}
#endregion
+ #region 寮傚父鍙嶉鍗曚繚瀛�/缂栬緫_APP
+ /// <summary>
+ /// 寮傚父鍙嶉鍗�
+ /// </summary>
+ /// <param name="msg"></param>
+ /// <returns></returns>
+ [Route("Sc_MESTransFerWorkBill/SaveGetMESTransFerWorkFrom_APP")]
+ [HttpPost]
+ public object SaveGetMESTransFerWorkFrom_APP([FromBody] JObject msg)
+ {
+
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string UserName = sArray[1].ToString();
+ string refSav = sArray[2].ToString();
+ DBUtility.ClsPub.CurUserName = UserName;
+
+ //淇濆瓨鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("OA_ErrMsgBackBill_Edit", 1, false, DBUtility.ClsPub.CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(DateTime.Now, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ListModels oListModels = new ListModels();
+ try
+ {
+ DLL.ClsOA_ErrMsgBackBill oBill = new DLL.ClsOA_ErrMsgBackBill();
+ List<Models.ClsOA_ErrMsgBackBillMain> lsmain = new List<Models.ClsOA_ErrMsgBackBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Gy_MESTransFerWorkFrom(msg2);
+ foreach (Models.ClsOA_ErrMsgBackBillMain oItem in lsmain)
+ {
+ if (refSav == "Add")
+ {
+ //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ if (BillNew.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld.omodel.HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒涓嶅厑璁镐繚瀛橈紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ if (refSav == "Update")
+ {
+ if (BillOld.ShowBill(oItem.HInterID, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹湁璇紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (BillOld.omodel.HChecker != "" && BillOld.omodel.HChecker != null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽淇敼锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (BillOld.omodel.HBillStatus > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹浜庝笉鍙紪杈戠姸鎬侊紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (!DBUtility.Xt_BaseBillFun.Fun_AllowEditBill(BillOld, ref s))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s + "锛屼笉鍏佽淇敼";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+
+ DBUtility.ClsPub.CurUserName = oItem.HMaker;
+ oItem.HBillType = "4502";
+ oItem.HBillSubType = "4502";
+ oItem.HBillStatus = 1; //鍗曟嵁鐘舵�侊紙1鏈锛�2瀹℃牳閫氳繃锛�3鍏抽棴锛�4浣滃簾锛�5瀹℃牳閫�鍥�,6瀹℃牳涓�,7宸查槄锛�8宸插洖澶嶏紝9缁撴锛�10楠岃瘉,11涓嬭揪锛�12寮�宸�,13鐢宠瀹℃壒,15鐢宠妫�楠岋紝16 鍒ゅ畾鍚堟牸锛�17鍒ゅ畾涓嶅悎鏍硷級
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ string[] arrStr;
+
+ if (string.IsNullOrEmpty(oItem.HCopyMan))
+ {
+ arrStr = new string[0]; // 濡傛灉 oItem.HCopyMan 涓虹┖锛屽垯璧嬪�间负绌烘暟缁�
+ }
+ else
+ {
+ arrStr = oItem.HCopyMan.Split(','); // 鍚﹀垯锛屼娇鐢� Split(',') 鏂规硶鎷嗗垎瀛楃涓�
+ }
+ List<string> b = new List<string>(arrStr);
+ b.Add(oItem.HSendMan);
+ b.Add(oItem.HReceiveMan);
+ arrStr = b.ToArray();
+ //鎶勯�佷汉琛ㄤ綋鏁版嵁
+ for (int i = 1; i <= arrStr.Length; i++)
+ {
+ Models.ClsOA_ErrMsgBackBillSub2 sb = new Models.ClsOA_ErrMsgBackBillSub2();
+ sb.HEntryID = i;
+ sb.HReceiveMan = arrStr[i - 1];
+ if (arrStr[i - 1].ToString() == oItem.HSendMan)
+ {
+ sb.HReadFlag = true;
+ }
+ oBill.DetailColl2.Add(sb);
+ }
+
+ oBill.omodel = oItem;
+ }
+
+
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (refSav == "Add")
+ {
+ bResult = oBill.AddBill_APP(ref DBUtility.ClsPub.sExeReturnInfo);
+ if (bResult)
+ {
+ objJsonResult.HInterID = DBUtility.ClsPub.sExeReturnInfo; //杩斿洖涓籌D
+ //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ if (oSystemParameter.omodel.OA_ErrMsgBackBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ {
+ objJsonResult.Verify = "Y";
+ }
+ else
+ {
+ objJsonResult.Verify = "N";
+ }
+ }
+ }
+
+ }
+ else
+ {
+ bResult = oBill.ModifyBill_APP(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ objJsonResult.Verify = "N";
+ }
+ if (bResult)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = e.Message;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 寮傚父鍙嶉鍒楄〃缂栬緫鑾峰彇鏁版嵁
[Route("Sc_MESTransFerWorkBill/Get_TransFerBillListCheckDetai")]
[HttpGet]
@@ -803,6 +1013,23 @@
return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
string sql =string.Format(@"select * from h_v_OA_ErrMsgBackBillEdit where HInterID='" + HID + "' and HEntryID='" + HEntryID + "'");
+ var dataSet = oCN.RunProcReturn(sql, "OA_ErrMsgBackBillMain");
+ if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+ return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄥ崟鍙�" };
+
+ return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+ }
+ #endregion
+
+ #region 寮傚父鍙嶉鍒楄〃APP缂栬緫鑾峰彇鏁版嵁
+ [Route("Sc_MESTransFerWorkBill/Get_TransFerBillListCheckDetaiL_APP")]
+ [HttpGet]
+ public ApiResult<DataSet> Get_TransFerBillListCheckDetaiL_APP(string HID)
+ {
+ if (string.IsNullOrEmpty(HID))
+ return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ string sql = string.Format(@"select * from h_v_OA_ErrMsgBackBillEdit where HInterID='" + HID + "'");
var dataSet = oCN.RunProcReturn(sql, "OA_ErrMsgBackBillMain");
if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄥ崟鍙�" };
@@ -1197,6 +1424,8 @@
#endregion
+ #endregion
+
#region 寮傚父鍙嶉鎺ユ敹鍗�
#region 寮傚父鍙嶉鎺ユ敹鍗� 鏂板/缂栬緫
@@ -1315,6 +1544,156 @@
else if (refSav == "Update")
{
bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = false;
+ }
+ if (bResult)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
+ #region 寮傚父鍙嶉鎺ユ敹鍗昣APP 鏂板/缂栬緫
+ [Route("Sc_MESTransFerWorkBill/SaveOA_ErrMsgBackReceiveBill_APP")]
+ [HttpPost]
+ public object SaveOA_ErrMsgBackReceiveBill_APP([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ //string msg3 = sArray[1].ToString(); //瀛愯〃
+ string refSav = sArray[1].ToString();//鎿嶄綔鏂瑰紡鏁版嵁绫诲瀷 1娣诲姞 3淇敼 2 澶嶅埗
+ string msg4 = sArray[2].ToString();//鐢ㄦ埛鍚�
+
+ DBUtility.ClsPub.CurUserName = msg4;
+
+ string UserName = "";
+ string s = "";
+ ListModels oListModels = new ListModels();
+ try
+ {
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("OA_ErrMsgBackReceiveBillMain_Edit", 1, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ // OA_ErrMsgBackReceiveBill
+ DAL.ClsOA_ErrMsgBackReceiveBill oBill = new DAL.ClsOA_ErrMsgBackReceiveBill();
+ List<Model.ClsOA_ErrMsgBackReceiveBillMain> lsmain = new List<Model.ClsOA_ErrMsgBackReceiveBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_OA_ErrMsgBackReceiveBill(msg2);
+ foreach (Model.ClsOA_ErrMsgBackReceiveBillMain oItem in lsmain)
+ {
+ if (refSav == "Add")
+ {
+ //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ if (oBill.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld.omodel.HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒涓嶅厑璁镐繚瀛橈紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ if (refSav == "Update")
+ {
+ if (oBill.ShowBill(oItem.HInterID, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹湁璇紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (oBill.omodel.HChecker != "" && oBill.omodel.HChecker != null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽淇敼锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HBillStatus > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹浜庝笉鍙紪杈戠姸鎬侊紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (!DBUtility.Xt_BaseBillFun.Fun_AllowEditBill(oBill, ref s))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s + "锛屼笉鍏佽淇敼";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ UserName = oItem.HMaker; //鍒跺崟浜�
+ oItem.HBillType = "4529";
+ oItem.HBillSubType = "4529";
+
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oBill.omodel = oItem;
+ }
+
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (refSav == "Add")
+ {
+
+ bResult = oBill.AddBill_APP(ref DBUtility.ClsPub.sExeReturnInfo);
+ _ = SendDingDingAsync(oBill.omodel.HSendMan, oBill.omodel.HHandleEmpID, oBill.omodel.HDescription, "");
+ }
+ else if (refSav == "Update")
+ {
+ bResult = oBill.ModifyBill_APP(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
}
else
{
@@ -2468,6 +2847,179 @@
}
#endregion
+ #region 寮傚父鍙嶉绛惧埌鍗� 鏂板/缂栬緫
+ [Route("Sc_MESTransFerWorkBill/SaveOA_ErrMsgBackSignBill_APP")]
+ [HttpPost]
+ public object SaveOA_ErrMsgBackSignBill_APP([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string refSav = sArray[1].ToString();//鎿嶄綔鏂瑰紡鏁版嵁绫诲瀷 1娣诲姞 3淇敼 2 澶嶅埗
+ string msg4 = sArray[2].ToString();//鐢ㄦ埛鍚�
+
+ DBUtility.ClsPub.CurUserName = msg4;
+
+ string UserName = "";
+ string s = "";
+ ListModels oListModels = new ListModels();
+ try
+ {
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("OA_ErrMsgBackSignBillMain_Edit", 1, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ // OA_ErrMsgBackSignBill
+ DAL.ClsOA_ErrMsgBackSignBill oBill = new DAL.ClsOA_ErrMsgBackSignBill();
+ List<Model.ClsOA_ErrMsgBackSignBillMain> lsmain = new List<Model.ClsOA_ErrMsgBackSignBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_OA_ErrMsgBackSignBill(msg2);
+ foreach (Model.ClsOA_ErrMsgBackSignBillMain oItem in lsmain)
+ {
+ if (refSav == "Add")
+ {
+ //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ if (oBill.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld.omodel.HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒涓嶅厑璁镐繚瀛橈紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ if (refSav == "Update")
+ {
+ if (oBill.ShowBill(oItem.HInterID, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹湁璇紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (oBill.omodel.HChecker != "" && oBill.omodel.HChecker != null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽淇敼锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HBillStatus > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹浜庝笉鍙紪杈戠姸鎬侊紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (!DBUtility.Xt_BaseBillFun.Fun_AllowEditBill(oBill, ref s))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s + "锛屼笉鍏佽淇敼";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ UserName = oItem.HMaker; //鍒跺崟浜�
+ oItem.HBillType = "4530";
+ oItem.HBillSubType = "4530";
+
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oBill.omodel = oItem;
+ }
+
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (refSav == "Add")
+ {
+
+ bResult = oBill.AddBill_APP(ref DBUtility.ClsPub.sExeReturnInfo);
+ _ = SendDingDingAsync(oBill.omodel.HSendMan, 1, oBill.omodel.HDescription, oBill.omodel.HReceiveMan);
+ }
+ else if (refSav == "Update")
+ {
+ bResult = oBill.ModifyBill_APP(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = false;
+ }
+ if (bResult)
+ {
+ //鑷姩瀹℃牳璁剧疆
+ if (refSav == "Add")
+ {
+ objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); //杩斿洖涓籌D
+ //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ if (oSystemParameter.omodel.OA_ErrMsgBackSignBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ {
+ objJsonResult.Verify = "Y";
+ }
+ else
+ {
+ objJsonResult.Verify = "N";
+ }
+ }
+ }
+ else
+ if (refSav == "Update")
+ {
+ objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); //杩斿洖涓籌D
+ objJsonResult.Verify = "N";
+ }
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 寮傚父鍙嶉绛惧埌鍗� 缂栬緫鍥炴樉鍒楄〃
[Route("Sc_MESTransFerWorkBill/Edit_OA_ErrMsgBackSignBill")]
@@ -2504,7 +3056,7 @@
objJsonResult.data = null;
return objJsonResult;
}
- }
+ }
#endregion
#region 寮傚父鍙嶉绛惧埌鍗曞垪琛�
@@ -3454,6 +4006,181 @@
else if (refSav == "Update")
{
bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = false;
+ }
+ if (bResult)
+ {
+
+ //鑷姩瀹℃牳璁剧疆
+ if (refSav == "Add")
+ {
+ objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); //杩斿洖涓籌D
+ //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ if (oSystemParameter.omodel.OA_ErrMsgBackHandleBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ {
+ objJsonResult.Verify = "Y";
+ }
+ else
+ {
+ objJsonResult.Verify = "N";
+ }
+ }
+ }
+ else
+ if (refSav == "Update")
+ {
+ objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); //杩斿洖涓籌D
+ objJsonResult.Verify = "N";
+ }
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 寮傚父鍙嶉澶勭悊鍗昣APP 鏂板/缂栬緫
+ [Route("Sc_MESTransFerWorkBill/SaveOA_ErrMsgBackHandleBill_APP")]
+ [HttpPost]
+ public object SaveOA_ErrMsgBackHandleBill_APP([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ //string msg3 = sArray[1].ToString(); //瀛愯〃
+ string refSav = sArray[1].ToString();//鎿嶄綔鏂瑰紡鏁版嵁绫诲瀷 1娣诲姞 3淇敼 2 澶嶅埗
+ string msg4 = sArray[2].ToString();//鐢ㄦ埛鍚�
+
+ DBUtility.ClsPub.CurUserName = msg4;
+
+ string UserName = "";
+ string s = "";
+ ListModels oListModels = new ListModels();
+ try
+ {
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("OA_ErrMsgBackHandleBillMain_Edit", 1, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ // OA_ErrMsgBackHandleBill
+ DAL.ClsOA_ErrMsgBackHandleBill oBill = new DAL.ClsOA_ErrMsgBackHandleBill();
+ List<Model.ClsOA_ErrMsgBackHandleBillMain> lsmain = new List<Model.ClsOA_ErrMsgBackHandleBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_OA_ErrMsgBackHandleBill(msg2);
+ foreach (Model.ClsOA_ErrMsgBackHandleBillMain oItem in lsmain)
+ {
+ if (refSav == "Add")
+ {
+ //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ if (oBill.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld.omodel.HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒涓嶅厑璁镐繚瀛橈紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ if (refSav == "Update")
+ {
+ if (oBill.ShowBill(oItem.HInterID, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹湁璇紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (oBill.omodel.HChecker != "" && oBill.omodel.HChecker != null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽淇敼锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HBillStatus > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹浜庝笉鍙紪杈戠姸鎬侊紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (!DBUtility.Xt_BaseBillFun.Fun_AllowEditBill(oBill, ref s))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s + "锛屼笉鍏佽淇敼";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ UserName = oItem.HMaker; //鍒跺崟浜�
+ oItem.HBillType = "4531";
+ oItem.HBillSubType = "4531";
+
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oBill.omodel = oItem;
+ }
+
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (refSav == "Add")
+ {
+
+ bResult = oBill.AddBill_APP(ref DBUtility.ClsPub.sExeReturnInfo);
+ _ = SendDingDingAsync(oBill.omodel.HSendMan, 2, oBill.omodel.HDescription, oBill.omodel.HReceiveMan);
+ }
+ else if (refSav == "Update")
+ {
+ bResult = oBill.ModifyBill_APP(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
}
else
{
@@ -4497,6 +5224,179 @@
else if (refSav == "Update")
{
bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = false;
+ }
+ if (bResult)
+ {
+
+ //鑷姩瀹℃牳璁剧疆
+ if (refSav == "Add")
+ {
+ objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); //杩斿洖涓籌D
+ //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ if (oSystemParameter.omodel.OA_ErrMsgBackCheckBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ {
+ objJsonResult.Verify = "Y";
+ }
+ else
+ {
+ objJsonResult.Verify = "N";
+ }
+ }
+ }
+ else
+ if (refSav == "Update")
+ {
+ objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); //杩斿洖涓籌D
+ objJsonResult.Verify = "N";
+ }
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 寮傚父鍙嶉楠屾敹鍗昣APP 鏂板/缂栬緫
+ [Route("Sc_MESTransFerWorkBill/SaveOA_ErrMsgBackCheckBill_APP")]
+ [HttpPost]
+ public object SaveOA_ErrMsgBackCheckBill_APP([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string refSav = sArray[1].ToString();//鎿嶄綔鏂瑰紡鏁版嵁绫诲瀷 1娣诲姞 3淇敼 2 澶嶅埗
+ string msg4 = sArray[2].ToString();//鐢ㄦ埛鍚�
+
+ DBUtility.ClsPub.CurUserName = msg4;
+
+ string UserName = "";
+ string s = "";
+ ListModels oListModels = new ListModels();
+ try
+ {
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("OA_ErrMsgBackCheckBillMain_Edit", 1, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ DAL.ClsOA_ErrMsgBackCheckBill oBill = new DAL.ClsOA_ErrMsgBackCheckBill();
+ List<Model.ClsOA_ErrMsgBackCheckBillMain> lsmain = new List<Model.ClsOA_ErrMsgBackCheckBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_OA_ErrMsgBackCheckBill(msg2);
+ foreach (Model.ClsOA_ErrMsgBackCheckBillMain oItem in lsmain)
+ {
+ if (refSav == "Add")
+ {
+ //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ if (oBill.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld.omodel.HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒涓嶅厑璁镐繚瀛橈紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ if (refSav == "Update")
+ {
+ if (oBill.ShowBill(oItem.HInterID, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹湁璇紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (oBill.omodel.HChecker != "" && oBill.omodel.HChecker != null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽淇敼锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HBillStatus > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹浜庝笉鍙紪杈戠姸鎬侊紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (!DBUtility.Xt_BaseBillFun.Fun_AllowEditBill(oBill, ref s))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s + "锛屼笉鍏佽淇敼";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ UserName = oItem.HMaker; //鍒跺崟浜�
+ oItem.HBillType = "4532";
+ oItem.HBillSubType = "4532";
+
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oBill.omodel = oItem;
+ }
+
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庨獙鏀�
+ bool bResult;
+ if (refSav == "Add")
+ {
+
+ bResult = oBill.AddBill_APP(ref DBUtility.ClsPub.sExeReturnInfo);
+ _ = SendDingDingAsync(oBill.omodel.HReceiveMan, 0, oBill.omodel.HDescription, oBill.omodel.HCopyMan);
+ }
+ else if (refSav == "Update")
+ {
+ bResult = oBill.ModifyBill_APP(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
}
else
{
@@ -7645,6 +8545,61 @@
}
#endregion
+ #region 寮傚父鍙嶉鍗曟煡璇⑩�斺�擜PP锛堝緟绛惧埌锛屽緟澶勭悊锛屽緟楠屾敹锛屽叏閮級
+
+ [Route("Sc_MESTransFerWorkBill/GetSc_MESTransFerWorkBillQuery_APP")]
+ [HttpGet]
+ public object GetSc_MESTransFerWorkBillQuery_APP(string sWhere, string user)
+ {
+ try
+ {
+ Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
+
+
+ string HBeginDate = dic["HBeginDate"].ToString();//寮�濮嬫棩鏈�
+ string HEndDate = dic["HEndDate"].ToString();//缁撴潫鏃ユ湡
+
+ List<object> columnNameList = new List<object>();
+
+ ds = oCN.RunProcReturn("exec h_p_OA_ErrMsgBackSelfQuery_APP '" + HBeginDate + "','" + HEndDate + "','" + user + "'", "h_p_OA_ErrMsgBackSelfQuery_APP");
+
+ if (ds.Tables[0].Rows.Count != 0 || ds != null)
+ {
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds;
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳暟鎹�";
+ 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
+
#region 鎶ュ伐鍙拌烦杞紓甯稿弽棣堝崟 寮圭獥鑾峰彇鐢熶骇鐘舵�佷复鏃惰〃鐨� 鐗╂枡 鏁伴噺 淇℃伅
[Route("Sc_MESTransFerWorkBill/Get_Sc_ICMOBillStatus")]
@@ -7662,7 +8617,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犲搴旀纭姸鎬佸伐鍗曚俊鎭�";
+ objJsonResult.Message = "褰撳墠宸ュ崟涓嶆槸寮�宸ョ姸鎬侊紝鏃犳硶杩涜鍙嶉";
objJsonResult.data = null;
return objJsonResult;
}
diff --git a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs
index 52df4ba..ba1d814 100644
--- a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs
+++ b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs
@@ -79,4136 +79,6 @@
}
-
-
-
-
- ///// <summary>
- ///// 妫�鍏风偣妫�璁″垝琛ㄥ垪琛�
- ///// </summary>
- ///// <returns></returns>
- //[Route("Sc_CheckToolsDotCheckPlan/GetCheckToolsDotCheckPlanBillList")]
- //[HttpGet]
- //public object GetCheckToolsDotCheckPlanBillList(string sWhere)
- //{
- // try
- // {
-
- // ds = Sc_CheckToolsDotCheckPlanBillList_s(sWhere);
- // if (ds == null || ds.Tables[0].Rows.Count <= 0)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // else
- // {
- // objJsonResult.code = "1";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- // objJsonResult.data = ds.Tables[0];
- // return objJsonResult;
- // }
- // }
- // catch (Exception ex)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- //}
-
- //#region sql璇彞
-
-
- //public static DataSet Sc_CheckToolsDotCheckPlanBillList_s(string sWhere)
- //{
- // return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_CheckToolsDotCheckPlanBillList ", "h_v_Sc_CheckToolsDotCheckPlanBillList");
- //}
- //#endregion
-
- ///// <summary>
- ///// 妫�鍏蜂繚鍏昏褰曡〃鍒楄〃
- ///// </summary>
- ///// <returns></returns>
- //[Route("Sc_CheckToolsMaintainBill/GetCheckToolsMaintainBillList")]
- //[HttpGet]
- //public object GetCheckToolsMaintainBillList(string sWhere)
- //{
- // try
- // {
-
- // ds = Sc_CheckToolsMaintainBillList_s(sWhere);
- // if (ds == null || ds.Tables[0].Rows.Count <= 0)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // else
- // {
- // objJsonResult.code = "1";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- // objJsonResult.data = ds.Tables[0];
- // return objJsonResult;
- // }
- // }
- // catch (Exception ex)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- //}
-
- //#region sql璇彞
-
-
- //public static DataSet Sc_CheckToolsMaintainBillList_s(string sWhere)
- //{
- // return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_CheckToolsMaintainBillList ", "h_v_Sc_CheckToolsMaintainBillList");
- //}
- //#endregion
-
- ///// <summary>
- ///// 妯″叿淇濆吇璁板綍琛ㄥ垪琛�
- ///// </summary>
- ///// <returns></returns>
- //[Route("Sc_MouldMaintainBill/GetMouldMaintainBillList")]
- //[HttpGet]
- //public object GetMouldMaintainBillList(string sWhere)
- //{
- // try
- // {
-
- // ds = Sc_MouldMaintainBillList_s(sWhere);
- // if (ds == null || ds.Tables[0].Rows.Count <= 0)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // else
- // {
- // objJsonResult.code = "1";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- // objJsonResult.data = ds.Tables[0];
- // return objJsonResult;
- // }
- // }
- // catch (Exception ex)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- //}
-
- //#region sql璇彞
-
-
- //public static DataSet Sc_MouldMaintainBillList_s(string sWhere)
- //{
- // if (sWhere == null || sWhere.Equals(""))
- // {
- // return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldMaintain", "h_v_Sc_MouldMaintain");
- // }
- // else
- // {
- // string sql1 = "select * from h_v_Sc_MouldMaintain where 1 = 1 ";
- // string sql = sql1 + sWhere;
- // return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldMaintain");
-
- // }
- // //return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldMaintainBillList ", "h_v_Sc_MouldMaintainBillList");
- //}
- //#endregion
-
-
-
- ///// <summary>
- ///// 妯″叿鐐规璁″垝琛ㄥ垪琛�
- ///// </summary>
- ///// <returns></returns>
- //[Route("Sc_MouldDotCheckPlanBill/GetMouldDotCheckPlanBillList")]
- //[HttpGet]
- //public object GetMouldDotCheckPlanBillList(string sWhere)
- //{
- // try
- // {
-
- // ds = Sc_MouldDotCheckPlanBillList_s(sWhere);
- // if (ds == null || ds.Tables[0].Rows.Count <= 0)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // else
- // {
- // objJsonResult.code = "1";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- // objJsonResult.data = ds.Tables[0];
- // return objJsonResult;
- // }
- // }
- // catch (Exception ex)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- //}
-
- //#region sql璇彞
-
-
- //public static DataSet Sc_MouldDotCheckPlanBillList_s(string sWhere)
- //{
- // return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldDotCheckPlanBillList ", "h_v_Sc_MouldDotCheckPlanBillList");
- //}
- //#endregion
-
- ///// <summary>
- ///// 妯″叿鐐规璁板綍琛ㄥ垪琛�
- ///// </summary>
- ///// <returns></returns>
- //[Route("Sc_MouldDotCheckBill/GetMouldDotCheckBillList")]
- //[HttpGet]
- //public object GetMouldDotCheckBillList(string sWhere)
- //{
- // try
- // {
-
- // ds = Sc_MouldDotCheckBillList_s(sWhere);
- // if (ds == null || ds.Tables[0].Rows.Count <= 0)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // else
- // {
- // objJsonResult.code = "1";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- // objJsonResult.data = ds.Tables[0];
- // return objJsonResult;
- // }
- // }
- // catch (Exception ex)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- //}
-
- //#region sql璇彞
-
-
- //public static DataSet Sc_MouldDotCheckBillList_s(string sWhere)
- //{
- // return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldDotCheckBillList where 1=1 "+sWhere+" ", "h_v_Sc_MouldDotCheckBillList");
- //}
- //#endregion
-
-
- ///// <summary>
- ///// 妫�鍏蜂繚鍏昏鍒掕〃鍒楄〃
- ///// </summary>
- ///// <returns></returns>
- //[Route("Sc_CheckToolsMaintainPlanBill/GetCheckToolsMaintainPlanBillList")]
- //[HttpGet]
- //public object GetCheckToolsMaintainPlanBillList(string sWhere)
- //{
- // try
- // {
-
- // ds = Sc_CheckToolsMaintainPlanBillList_s(sWhere);
- // if (ds == null || ds.Tables[0].Rows.Count <= 0)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // else
- // {
- // objJsonResult.code = "1";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- // objJsonResult.data = ds.Tables[0];
- // return objJsonResult;
- // }
- // }
- // catch (Exception ex)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- //}
-
- //#region sql璇彞
-
-
- //public static DataSet Sc_CheckToolsMaintainPlanBillList_s(string sWhere)
- //{
- // return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_CheckToolsMaintainPlanBillList ", "h_v_Sc_CheckToolsMaintainPlanBillList");
- //}
- //#endregion
-
-
- ///// <summary>
- ///// 妯″叿淇濆吇璁″垝琛ㄥ垪琛�
- ///// </summary>
- ///// <returns></returns>
- //[Route("Sc_MouldMaintainPlanBill/GetMouldMaintainPlanBillList")]
- //[HttpGet]
- //public object GetMouldMaintainPlanBillList(string sWhere)
- //{
- // try
- // {
-
- // ds = Sc_MouldMaintainPlanBillList_s(sWhere);
- // if (ds == null || ds.Tables[0].Rows.Count <= 0)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // else
- // {
- // objJsonResult.code = "1";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- // objJsonResult.data = ds.Tables[0];
- // return objJsonResult;
- // }
- // }
- // catch (Exception ex)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- //}
-
- //#region sql璇彞
-
-
- //public static DataSet Sc_MouldMaintainPlanBillList_s(string sWhere)
- //{
- // return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldMaintainPlanBillList ", "h_v_Sc_MouldMaintainPlanBillList");
- //}
- //#endregion
-
-
- ///// <summary>
- ///// 妯″叿鏁呴殰鐧昏琛ㄥ垪琛�
- ///// </summary>
- ///// <returns></returns>
- //[Route("Sc_MouldConkBookBill/GetMouldConkBookBillList")]
- //[HttpGet]
- //public object GetMouldConkBookBillList(string sWhere)
- //{
- // try
- // {
-
- // ds = Sc_MouldConkBookBillList_s(sWhere);
- // objJsonResult.code = "1";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "Sucess锛�";
- // objJsonResult.data = ds.Tables[0];
- // return objJsonResult;
- // }
- // catch (Exception ex)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- //}
-
- //#region sql璇彞
-
-
- //public static DataSet Sc_MouldConkBookBillList_s(string sWhere)
- //{
- // DataSet ds;
- // if (sWhere == null || sWhere.Equals(""))
- // {
- // ds = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldConkBookBillList " + sWhere, "h_v_Sc_MouldConkBookBillList");
- // }
- // else
- // {
- // string sql1 = "select * from h_v_Sc_MouldConkBookBillList where 1 = 1 ";
- // string sql = sql1 + sWhere;
- // ds = new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldConkBookBillList");
- // }
- // return ds;
- //}
- //#endregion
-
-
-
- ///// <summary>
- ///// 妯″叿缁翠慨楠屾敹鍗曞垪琛�
- ///// </summary>
- ///// <returns></returns>
- //[Route("Sc_MouldRepairCheckBill/GetMouldRepairCheckBillList")]
- //[HttpGet]
- //public object GetMouldRepairCheckBillList(string sWhere)
- //{
- // try
- // {
- // ds = Sc_MouldRepairCheckBillList_s(sWhere);
- // objJsonResult.code = "1";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- // objJsonResult.data = ds.Tables[0];
- // return objJsonResult;
-
- // }
- // catch (Exception ex)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- //}
-
- //#region sql璇彞
-
-
- //public static DataSet Sc_MouldRepairCheckBillList_s(string sWhere)
- //{
- // DataSet ds;
- // if (sWhere == null || sWhere.Equals(""))
- // {
- // ds = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairCheckBillList_Edit " + sWhere, "h_v_Sc_MouldRepairCheckBillList_Edit");
- // }
- // else
- // {
- // string sql1 = "select * from h_v_Sc_MouldRepairCheckBillList_Edit where 1 = 1 ";
- // string sql = sql1 + sWhere;
- // ds = new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldRepairCheckBillList_Edit");
- // }
- // return ds;
- //}
- //#endregion
-
- ///// <summary>
- ///// 妫�鍏风淮淇獙鏀跺崟鍒楄〃
- ///// </summary>
- ///// <returns></returns>
- //[Route("Sc_CheckToolsRepairCheckBill/GetCheckToolsRepairCheckBillList")]
- //[HttpGet]
- //public object GetCheckToolsRepairCheckBillList(string sWhere)
- //{
- // try
- // {
-
- // ds = Sc_CheckToolsRepairCheckBillList_s(sWhere);
- // if (ds == null || ds.Tables[0].Rows.Count <= 0)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // else
- // {
- // objJsonResult.code = "1";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- // objJsonResult.data = ds.Tables[0];
- // return objJsonResult;
- // }
- // }
- // catch (Exception ex)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- //}
-
- //#region sql璇彞
-
-
- //public static DataSet Sc_CheckToolsRepairCheckBillList_s(string sWhere)
- //{
- // return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_CheckToolsRepairCheckBillList ", "h_v_Sc_CheckToolsRepairCheckBillList");
- //}
- //#endregion
-
-
- //#region sql璇彞
-
-
- ////public static DataSet Sc_MouldRepairCheckBillList_s(string sWhere)
- ////{
- //// return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairCheckBillList ", "h_v_Sc_MouldRepairCheckBillList");
- ////}
- //#endregion
-
- ///// <summary>
- ///// 妯″叿缁翠慨宸ュ崟琛ㄥ垪琛�
- ///// </summary>
- ///// <returns></returns>
- //[Route("Sb_MouldRepairWorkBill/GetMouldRepairWorkBillList")]
- //[HttpGet]
- //public object GetMouldRepairWorkBillList(string sWhere)
- //{
- // try
- // {
-
- // ds = Sc_MouldRepairWorkBillList_s(sWhere);
- // if (ds == null || ds.Tables[0].Rows.Count <= 0)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // else
- // {
- // objJsonResult.code = "1";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- // objJsonResult.data = ds.Tables[0];
- // return objJsonResult;
- // }
- // }
- // catch (Exception ex)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- //}
-
- //#region sql璇彞
-
-
- //public static DataSet Sc_MouldRepairWorkBillList_s(string sWhere)
- //{
- // if (sWhere == null || sWhere.Equals(""))
- // {
- // return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairWorkBillList " + sWhere, "h_v_Sc_MouldRepairWorkBillList");
- // }
- // else
- // {
- // string sql1 = "select * from h_v_Sc_MouldRepairWorkBillList where 1 = 1 ";
- // string sql = sql1 + sWhere;
- // return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldRepairWorkBillList");
- // }
- //}
- //#endregion
-
-
- ///// <summary>
- ///// 妫�鍏锋晠闅滅櫥璁拌〃鍒楄〃
- ///// </summary>
- ///// <returns></returns>
- //[Route("Sc_CheckToolsConkBookBill/GetCheckToolsConkBookBillList")]
- //[HttpGet]
- //public object GetCheckToolsConkBookBillList(string sWhere)
- //{
- // try
- // {
-
- // ds = Sc_CheckToolsConkBookBillList_s(sWhere);
- // if (ds == null || ds.Tables[0].Rows.Count <= 0)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // else
- // {
- // objJsonResult.code = "1";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- // objJsonResult.data = ds.Tables[0];
- // return objJsonResult;
- // }
- // }
- // catch (Exception ex)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- //}
-
- //#region sql璇彞
-
-
- //public static DataSet Sc_CheckToolsConkBookBillList_s(string sWhere)
- //{
- // return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_CheckToolsConkBookBillList ", "h_v_Sc_CheckToolsConkBookBillList");
- //}
- //#endregion
-
-
- ///// <summary>
- ///// 妫�鍏风偣妫�璁板綍琛ㄥ垪琛�
- ///// </summary>
- ///// <returns></returns>
- //[Route("Sc_CheckToolsDotCheckBill/GetCheckToolsDotCheckBillList")]
- //[HttpGet]
- //public object GetCheckToolsDotCheckBillList(string sWhere)
- //{
- // try
- // {
-
- // ds = Sc_CheckToolsDotCheckBillList_s(sWhere);
- // if (ds == null || ds.Tables[0].Rows.Count <= 0)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // else
- // {
- // objJsonResult.code = "1";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- // objJsonResult.data = ds.Tables[0];
- // return objJsonResult;
- // }
- // }
- // catch (Exception ex)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- //}
-
- //#region sql璇彞
-
-
- //public static DataSet Sc_CheckToolsDotCheckBillList_s(string sWhere)
- //{
- // return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_CheckToolsDotCheckBillList ", "h_v_Sc_CheckToolsDotCheckBillList");
- //}
- //#endregion
-
-
- ///// <summary>
- ///// 璋冩嫧鍗曞垪琛�
- ///// </summary>
- ///// <returns></returns>
- //[Route("Kf_MoveStockBill/GetMoveStockBillList")]
- //[HttpGet]
- //public object GetMoveStockBillList(string sWhere)
- //{
- // try
- // {
-
- // ds = Sc_GetMoveStockBillList(sWhere);
- // if (ds == null || ds.Tables[0].Rows.Count <= 0)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // else
- // {
- // objJsonResult.code = "1";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- // objJsonResult.data = ds.Tables[0];
- // return objJsonResult;
- // }
- // }
- // catch (Exception ex)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- //}
-
- //#region sql璇彞
-
-
- //public static DataSet Sc_GetMoveStockBillList(string sWhere)
- //{
- // return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_MoveStockBillList ", "h_v_IF_MoveStockBillList");
- //}
- //#endregion
-
- ///// <summary>
- ///// 鐢熶骇棰嗘枡鍗曞垪琛�
- ///// </summary>
- ///// <returns></returns>
- //[Route("Kf_MateOutBill/GetMateOutBillList")]
- //[HttpGet]
- //public object GetMateOutBillList(string sWhere)
- //{
- // try
- // {
-
- // ds = Sc_GetMateOutBillList(sWhere);
- // if (ds == null || ds.Tables[0].Rows.Count <= 0)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // else
- // {
- // objJsonResult.code = "1";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- // objJsonResult.data = ds.Tables[0];
- // return objJsonResult;
- // }
- // }
- // catch (Exception ex)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- //}
-
- //#region sql璇彞
-
-
- //public static DataSet Sc_GetMateOutBillList(string sWhere)
- //{
- // return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_MateOutBillList ", "h_v_IF_MateOutBillList");
- //}
- //#endregion
-
-
- ///// <summary>
- ///// 閿�鍞嚭搴撳崟鍒楄〃
- ///// </summary>
- ///// <returns></returns>
- //[Route("Kf_SellOutBill/GetSellOutBillList")]
- //[HttpGet]
- //public object GetSellOutBillList(string sWhere)
- //{
- // try
- // {
-
- // ds = Sc_GetSellOutBillList(sWhere);
- // if (ds == null || ds.Tables[0].Rows.Count <= 0)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // else
- // {
- // objJsonResult.code = "1";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- // objJsonResult.data = ds.Tables[0];
- // return objJsonResult;
- // }
- // }
- // catch (Exception ex)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- //}
-
- //#region sql璇彞
-
-
- //public static DataSet Sc_GetSellOutBillList(string sWhere)
- //{
- // return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_SellOutBillList ", "h_v_IF_SellOutBillList");
- //}
- //#endregion
-
-
- ///// <summary>
- ///// 鍏朵粬鍑哄簱鍗曞垪琛�
- ///// </summary>
- ///// <returns></returns>
- //[Route("Kf_OtherOutBill/GetOtherOutBillList")]
- //[HttpGet]
- //public object GetOtherOutBillList(string sWhere)
- //{
- // try
- // {
-
- // ds = Sc_GetOtherOutBillList(sWhere);
- // if (ds == null || ds.Tables[0].Rows.Count <= 0)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // else
- // {
- // objJsonResult.code = "1";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- // objJsonResult.data = ds.Tables[0];
- // return objJsonResult;
- // }
- // }
- // catch (Exception ex)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- //}
-
- //#region sql璇彞
-
-
- //public static DataSet Sc_GetOtherOutBillList(string sWhere)
- //{
- // return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Kf_OtherOutBillList ", "h_v_Kf_OtherOutBillList");
- //}
- //#endregion
-
-
- ///// <summary>
- ///// 濮斿鍑哄簱鍗曞垪琛�
- ///// </summary>
- ///// <returns></returns>
- //[Route("Kf_EntrustOutBill/GetEntrustOutBill")]
- //[HttpGet]
- //public object GetEntrustOutBill(string sWhere)
- //{
- // try
- // {
-
- // ds = Sc_GetEntrustOutBill(sWhere);
- // if (ds == null || ds.Tables[0].Rows.Count <= 0)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // else
- // {
- // objJsonResult.code = "1";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- // objJsonResult.data = ds.Tables[0];
- // return objJsonResult;
- // }
- // }
- // catch (Exception ex)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- //}
-
- //#region sql璇彞
-
-
- //public static DataSet Sc_GetEntrustOutBill(string sWhere)
- //{
- // return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Kf_EntrustOutBillList ", "h_v_Kf_EntrustOutBillList");
- //}
- //#endregion
-
-
- ///// <summary>
- ///// 閲囪喘鍏ュ簱鍗曞垪琛�
- ///// </summary>
- ///// <returns></returns>
- //[Route("Kf_POStockInBill/GetPOStockInBill")]
- //[HttpGet]
- //public object GetPOStockInBill(string sWhere)
- //{
- // try
- // {
-
- // ds = Sc_GetPOStockInBill(sWhere);
- // if (ds == null || ds.Tables[0].Rows.Count <= 0)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // else
- // {
- // objJsonResult.code = "1";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- // objJsonResult.data = ds.Tables[0];
- // return objJsonResult;
- // }
- // }
- // catch (Exception ex)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- //}
-
- //#region sql璇彞
-
-
- //public static DataSet Sc_GetPOStockInBill(string sWhere)
- //{
- // return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_POStockInBillList ", "h_v_IF_POStockInBillList");
- //}
- //#endregion
-
-
-
- ///// <summary>
- ///// 浜у搧鍏ュ簱鍗曞垪琛�
- ///// </summary>
- ///// <returns></returns>
- //[Route("Kf_ProductInBill/GetProductInBill")]
- //[HttpGet]
- //public object GetProductInBill(string sWhere)
- //{
- // try
- // {
-
- // ds = Sc_GetProductInBill(sWhere);
- // if (ds == null || ds.Tables[0].Rows.Count <= 0)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // else
- // {
- // objJsonResult.code = "1";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- // objJsonResult.data = ds.Tables[0];
- // return objJsonResult;
- // }
- // }
- // catch (Exception ex)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- //}
-
- //#region sql璇彞
-
-
- //public static DataSet Sc_GetProductInBill(string sWhere)
- //{
- // return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_ProductInBillList ", "h_v_IF_ProductInBillList");
- //}
- //#endregion
-
-
- ///// <summary>
- ///// 鍏朵粬鍏ュ簱鍗曞垪琛�
- ///// </summary>
- ///// <returns></returns>
- //[Route("Kf_OtherInBill/GetOtherInBill")]
- //[HttpGet]
- //public object GetOtherInBill(string sWhere)
- //{
- // try
- // {
-
- // ds = Sc_GetOtherInBill(sWhere);
- // if (ds == null || ds.Tables[0].Rows.Count <= 0)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // else
- // {
- // objJsonResult.code = "1";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- // objJsonResult.data = ds.Tables[0];
- // return objJsonResult;
- // }
- // }
- // catch (Exception ex)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- //}
-
- //#region sql璇彞
-
-
- //public static DataSet Sc_GetOtherInBill(string sWhere)
- //{
- // return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Kf_OtherInBillList ", "h_v_Kf_OtherInBillList");
- //}
- //#endregion
-
-
- ///// <summary>
- ///// 濮斿鍏ュ簱鍗曞垪琛�
- ///// </summary>
- ///// <returns></returns>
- //[Route("Kf_EntrustInBill/GetEntrustInBill")]
- //[HttpGet]
- //public object GetEntrustInBill(string sWhere)
- //{
- // try
- // {
-
- // ds = Sc_GetEntrustInBill(sWhere);
- // if (ds == null || ds.Tables[0].Rows.Count <= 0)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // else
- // {
- // objJsonResult.code = "1";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- // objJsonResult.data = ds.Tables[0];
- // return objJsonResult;
- // }
- // }
- // catch (Exception ex)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- //}
-
- //#region sql璇彞
-
-
- //public static DataSet Sc_GetEntrustInBill(string sWhere)
- //{
- // return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Kf_EntrustInBillList ", "h_v_Kf_EntrustInBillList");
- //}
- //#endregion
-
-
- ////娴嬭瘯涓撶敤鎺ュ彛
- //[Route("LookingFor/Test")]
- //[HttpGet]
- //public object Test(string HbillNo)//Sc_CheckToolsRepair/GetCheckToolsRepairWorkBillList
- //{
- // DataSet ds;
- // ds = new SQLHelper.ClsCN().RunProcReturn("EXEC h_p_Xs_SellOutFindSP '" + HbillNo + "'", "h_p_Xs_SellOutFindSP");
-
- // if (Pub_Class.ClsPub.isLong(ds.Tables[0].Rows.Count) >= 0)
- // {
- // objJsonResult.code = "1";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "true锛�";
- // objJsonResult.data = ds.Tables[0];//ds.Tables[0].Rows[1][0]
- // return objJsonResult;
- // }
- // else
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "false锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- //}
-
-
-
- //#endregion
-
-
- //#region 妯″叿缁翠慨鍗曚繚瀛�/缂栬緫
- ///// <summary>
- ///// 淇濆瓨妯″叿缁翠慨鍗�
- ///// </summary>
- ///// <param name="msg"></param>
- ///// <returns></returns>
- //[Route("Sb_MouldRepairWorkBill/SaveGetMouldRepairWorkBillList")]
- //[HttpPost]
- //public object SaveGetMouldRepairWorkBillList([FromBody] JObject msg)
- //{
- // var _value = msg["msg"].ToString();
- // string msg1 = _value.ToString();
- // string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
- // string msg2 = sArray[0].ToString();
- // string msg3 = sArray[1].ToString();
-
-
- // string UserName = "";
- // ListModels oListModels = new ListModels();
- // try
- // {
- // DAL.ClsSb_MouldRepairWorkBill oBill = new DAL.ClsSb_MouldRepairWorkBill();
- // List<Model.ClsSb_MouldRepairWorkBillMain> lsmain = new List<Model.ClsSb_MouldRepairWorkBillMain>();
- // msg2 = msg2.Replace("\\", "");
- // msg2 = msg2.Replace("\n", ""); //\n
- // lsmain = oListModels.getObjectByJson_Gy_MouldRepairWorkBillMain(msg2);
- // foreach (Model.ClsSb_MouldRepairWorkBillMain oItem in lsmain)
- // {
- // //oItem.HMaker = "";
- // UserName = oItem.HMaker; //鍒跺崟浜�
- // oItem.HBillType = "3807";
- // oItem.HBillSubType = "3807";
- // //oItem.HBillNo = ""; //鍗曟嵁鍙�
- // //oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡
- // oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
- // oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
- // //oItem.HEquipID = 0; //璁惧ID(Gy_EquipMent)
- // //oItem.HPeriod = 0;
- // //oItem.HRepairBeginDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd")); // --缁翠慨寮�濮嬫棩鏈�
- // //oItem.HRepairEndDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --缁翠慨缁撴潫鏃ユ湡
- // //oItem.HRepairContent = ""; //缁翠慨鍐呭
- // //oItem.HCycleUnit = ""; //鏃堕棿鍗曚綅(灏忔椂锛屽ぉ)
- // //oItem.HPlanTimes = 0; //璁″垝缁翠慨宸ユ椂
- // //oItem.HTimes = 0; //瀹為檯缁翠慨宸ユ椂
- // //oItem.HEmpID = 0; //缁翠慨浜�(Gy_Employee)
- // //oItem.HManagerID = 0; //涓荤(Gy_Employee)
- // //oItem.HDeptID = 0; //缁翠慨閮ㄩ棬(Gy_Department)
- // //oItem.HExplanation = ""; //--缁翠慨瑕佹眰
- // //oItem.HInnerBillNo = ""; // --鍐呴儴鍗曟嵁鍙�
- // //oItem.HMouldID = 0; //鎴愬搧妯″叿ID
- // //oItem.HSupID = 0; //--渚涘簲鍟嗭紙Gy_Supplier锛�
- // //oItem.HRepairType = ""; //--缁翠慨绫诲瀷锛堝唴閮ㄧ淮淇紝濮斿缁翠慨锛� addnew
- // //oItem.HNewModel = ""; //缁翠慨鍚庢柊瑙勬牸
- // //oItem.HNewDesignLife = 0; //鏂拌璁″鍛�
- // //oItem.HRepairID = 0; //缁翠慨椤圭洰(Gy_Repair)
- // //oItem.HRemark = ""; //澶囨敞
- // //oItem.HMainSourceInterID = oItem.HInterID;
-
- // //oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
- // if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- // oBill.omodel = oItem;
- // }
- // //琛ㄤ綋鏁版嵁
- // //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
- // msg3 = msg3.Substring(1, msg3.Length - 2);
- // msg3 = msg3.Replace("\\", "");
- // msg3 = msg3.Replace("\n", ""); //\n
- // //msg2 = msg2.Replace("'", "鈥�");
- // List<Model.ClsSb_MouldRepairWorkBillSub> ls = new List<Model.ClsSb_MouldRepairWorkBillSub>();
- // ls = oListModels.getObjectByJson_Gy_MouldRepairWorkBillSub(msg3);
- // int i = 0;
- // foreach (Model.ClsSb_MouldRepairWorkBillSub oItemSub in ls)
- // {
-
- // i++;
- // oItemSub.HEntryID = i;
- // //oItemSub.HCloseMan = ""; //琛屽叧闂�
- // oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
- // oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
- // //oItemSub.HRemark = ""; //澶囨敞
- // oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
- // oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
- // //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
- // //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
- // oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
- // //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
- // //oItemSub.HRepairID = 0; //缁翠慨椤圭洰
- // //oItemSub.HRepairExplanation =""; //缁翠慨瑕佹眰
- // //oItemSub.HManagerID = 0; //璐熻矗浜篒D
- // //oItemSub.HMoney = 0; //缁翠慨璐圭敤
- // oBill.DetailColl.Add(oItemSub);
-
- // }
- // //淇濆瓨
- // //淇濆瓨瀹屾瘯鍚庡鐞�
- // bool bResult;
- // if (oBill.omodel.HInterID == 0)
- // {
- // // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
- // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
- // }
- // else
- // {
- // bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
- // }
- // if (bResult)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
- // //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- // else
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- // }
- // catch (Exception e)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- //}
- //#endregion
-
- //#region[妯″叿缁翠慨鍒楄〃缂栬緫鏃惰幏鍙栬〃澶存暟鎹甝
- //[Route("Sb_MouldRepairWorkBill/Sb_MouldRepairWorkBillListCheckDetai")]
- //[HttpGet]
- //public ApiResult<DataSet> Sb_MouldRepairWorkBillListCheckDetai(string HID)
- //{
- // if (string.IsNullOrEmpty(HID))
- // return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
- // SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- // var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sc_MouldRepairWorkBillList_Edit where hmainid= " + HID + " ", "h_v_Sc_MouldRepairWorkBillList_Edit");
- // if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
- // return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄧ淮淇崟鍙�" };
- // return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
- //}
- //#endregion
-
- //#region[妯″叿缁翠慨鍒楄〃缂栬緫鏃惰幏鍙栬〃浣撴暟鎹甝
- //[Route("Sb_MouldRepairWorkBill/Sb_MouldRepairWorkBillListProjectDetai")]
- //[HttpGet]
- //public object Sb_MouldRepairWorkBillListProjectDetai(string sqlWhere)
- //{
- // DataSet ds;
- // try
- // {
- // SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- // if (sqlWhere == null || sqlWhere.Equals(""))
- // {
- // //ds = oCN.RunProcReturn("select HRepairID,HRepairExplanation,HManagerID,HMoney,HRemark from Sc_MouldRepairWorkBillSub", "Sc_MouldRepairWorkBillSub");
- // ds = oCN.RunProcReturn("select HRepairID, 瀛愮淮淇」鐩唬鐮� HRepairCode,瀛愮淮淇」鐩� HRepairName,瀛愮淮淇姹� HRepairExplanation,HManagerSonID HManagerID,瀛愯礋璐ｄ汉浠ｇ爜 HManagerCode,瀛愯礋璐ｄ汉 HManagerName,缁翠慨璐圭敤 HMoney,琛ㄤ綋澶囨敞 HRemark from h_v_Sc_MouldRepairWorkBillList_Edit", "h_v_Sc_MouldRepairWorkBillList_Edit");
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
- // objJsonResult.data = ds.Tables[0];
- // }
- // else
- // {
- // //string sql1 = "select HRepairID,HRepairExplanation,HManagerID,HMoney,HRemark from Sc_MouldRepairWorkBillSub where 1 = 1 ";
- // string sql1 = "select HRepairID,瀛愮淮淇」鐩唬鐮� HRepairCode,瀛愮淮淇」鐩� HRepairName,瀛愮淮淇姹� HRepairExplanation,HManagerSonID HManagerID,瀛愯礋璐ｄ汉浠ｇ爜 HManagerCode,瀛愯礋璐ｄ汉 HManagerName,缁翠慨璐圭敤 HMoney,琛ㄤ綋澶囨敞 HRemark from h_v_Sc_MouldRepairWorkBillList_Edit where 1 = 1 ";
- // string sql = sql1 + sqlWhere;
- // ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldRepairWorkBillList_Edit");
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
- // objJsonResult.data = ds.Tables[0];
- // }
- // }
- // catch (Exception e)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
- // objJsonResult.data = null;
- // }
- // return objJsonResult;
- //}
- //#endregion
-
- //#region [妯″叿缁翠慨鍗曞垹闄ゅ姛鑳絔
- ///// <summary>
- ///// 妯″叿缁翠慨鍗曞垹闄ゅ姛鑳�
- ///// </summary>
- ///// <returns></returns>
- //[Route("Sb_MouldRepairWorkBill/DeltetMouldRepairWorkBill")]
- //[HttpGet]
- //public object DeltetMouldRepairWorkBill(string HInterID)
- //{
- // //缂栬緫鏉冮檺
- // //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
- // //{
- // // objJsonResult.code = "0";
- // // objJsonResult.count = 0;
- // // objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
- // // objJsonResult.data = null;
- // // return objJsonResult;
- // //}
-
-
- // Int64 lngBillKey = 0;
- // lngBillKey = DBUtility.ClsPub.isLong(HInterID);
- // if (lngBillKey == 0)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁ID涓虹┖锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // DAL.ClsSb_MouldRepairWorkBill oBill = new DAL.ClsSb_MouldRepairWorkBill();
- // if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
- // {
- // if (oBill.omodel.HBillStatus > 1)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁褰撳墠澶勪簬涓嶈兘鍒犻櫎鐘舵��,涓嶈兘鍒犻櫎锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // if (oBill.omodel.HChecker != "")
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
-
- // bool IsDete = oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
- // if (IsDete)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // else
- // {
-
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // }
- // else
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁鏈壘鍒�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- //}
- //#endregion
-
- //#region [妯″叿缁翠慨鍗曞鏍搞�佸弽瀹℃牳]
- ///// <summary>
- /////
- ///// </summary>
- ///// <param name="HInterID">鍗曟嵁ID</param>
- ///// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
- ///// <param name="CurUserName">瀹℃牳浜�</param>
- ///// <returns></returns>
- //[Route("Sb_MouldRepairWorkBill/AuditProcessReportList")]
- //[HttpGet]
- //public object AuditProcessReportList(int HInterID, int IsAudit, string CurUserName)
- //{
- // string ModRightNameCheck = "Sb_MouldRepairWorkBill_Check";
- // DBUtility.ClsPub.CurUserName=CurUserName;
- // try
- // {
- // //瀹℃牳鏉冮檺
- // if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // if (HInterID <= 0)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "HInterID灏忎簬0锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // Int64 lngBillKey = 0;
- // lngBillKey = DBUtility.ClsPub.isLong(HInterID);
- // DAL.ClsSb_MouldRepairWorkBill oBill = new DAL.ClsSb_MouldRepairWorkBill();
- // //鏌ョ湅鏄惁宸插鏍�,鍏抽棴,浣滃簾
- // if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
- // {
- // if (oBill.omodel.HCloseMan.Trim() != "")
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆瀹℃牳锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // if (oBill.omodel.HDeleteMan.Trim() != "")
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘鍐嶆瀹℃牳锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // if (IsAudit == 0) //瀹℃牳鍒ゆ柇
- // {
- // if (oBill.omodel.HChecker.Trim() != "")
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // }
- // if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
- // {
- // if (oBill.omodel.HChecker.Trim() == "")
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // }
- // }
- // else
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // if (IsAudit == 0) //瀹℃牳鎻愪氦
- // {
- // //瀹℃牳鎻愪氦
- // if (oBill.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
- // {
- // objJsonResult.code = "1";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "瀹℃牳鎴愬姛";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // else
- // {
- // objJsonResult.code = "1";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // }
- // if (IsAudit == 1) //鍙嶅鏍告彁浜�
- // {
- // //鍙嶅鏍告彁浜bandonCheck
- // if (oBill.AbandonCheck(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
- // {
- // objJsonResult.code = "1";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "鍙嶅鏍告垚鍔�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // else
- // {
- // objJsonResult.code = "1";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // }
- // return objJsonResult;
- // }
- // catch (Exception e)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString();
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- //}
- //#endregion
-
-
-
- //#region 妯″叿缁翠慨楠屾敹鍗曚繚瀛�/缂栬緫
- ///// <summary>
- ///// 淇濆瓨妯″叿缁翠慨鍗�
- ///// </summary>
- ///// <param name="msg"></param>
- ///// <returns></returns>
- //[Route("Sc_MouldRepairCheckBill/SaveGetMouldRepairCheckBillList")]
- //[HttpPost]
- //public object SaveGetMouldRepairCheckBillList([FromBody] JObject msg)
- //{
- // var _value = msg["msg"].ToString();
- // string msg1 = _value.ToString();
- // string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
- // string msg2 = sArray[0].ToString();
- // string msg3 = sArray[1].ToString();
- // string msg4 = sArray[2].ToString();
-
-
- // string UserName = "";
- // ListModels oListModels = new ListModels();
- // try
- // {
- // DLL.ClsSc_MouldRepairCheckBill oBill = new DLL.ClsSc_MouldRepairCheckBill();
- // List<Model.ClsSc_MouldRepairCheckBillMain> lsmain = new List<Model.ClsSc_MouldRepairCheckBillMain>();
- // msg2 = msg2.Replace("\\", "");
- // msg2 = msg2.Replace("\n", ""); //\n
- // lsmain = oListModels.getObjectByJson_Gy_MouldRepairCheckBillMain(msg2);
- // foreach (Model.ClsSc_MouldRepairCheckBillMain oItem in lsmain)
- // {
- // oItem.HMaker = msg4;
- // UserName = oItem.HMaker; //鍒跺崟浜�
- // oItem.HBillType = "3817";
- // oItem.HBillSubType = "3817";
- // //oItem.HBillNo = ""; //鍗曟嵁鍙�
- // //oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡
- // //oItem.HInnerBillNo = ""; // --鍐呴儴鍗曟嵁鍙�
- // oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
- // oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
- // //oItem.HEquipID = 0; //璁惧ID(Gy_EquipMent)
- // //oItem.HPeriod = 0;
- // //oItem.HCheckBeginDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd")); // --缁翠慨鏃ユ湡
- // //oItem.HCheckResult = ""; //楠屾敹缁撹--(姝ｅ父锛屽紓甯�)
- // //oItem.HEmpID = 0; //楠屾敹浜�(Gy_Employee)
- // //oItem.HManagerID = 0; //璐熻矗浜�(Gy_Employee)
- // //oItem.HDeptID = 0; //楠屾敹閮ㄩ棬(Gy_Department)
- // //oItem.HExplanation = ""; //鎽樿(鏁呴殰鎻忚堪)
- // //oItem.HRemark = ""; //澶囨敞
-
- // //oItem.HMainSourceInterID = oItem.HInterID;
-
- // //oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
- // if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- // oBill.omodel = oItem;
- // }
- // //琛ㄤ綋鏁版嵁
- // //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
- // msg3 = msg3.Substring(1, msg3.Length - 2);
- // msg3 = msg3.Replace("\\", "");
- // msg3 = msg3.Replace("\n", ""); //\n
- // //msg2 = msg2.Replace("'", "鈥�");
- // List<Model.ClsSc_MouldRepairCheckBillSub> ls = new List<Model.ClsSc_MouldRepairCheckBillSub>();
- // ls = oListModels.getObjectByJson_Gy_MouldRepairCheckBillSub(msg3);
- // int i = 0;
- // foreach (Model.ClsSc_MouldRepairCheckBillSub oItemSub in ls)
- // {
-
- // i++;
- // oItemSub.HEntryID = i;
-
- // //oItemSub.HRepairCheckID = 0; //楠屾敹椤圭洰ID
- // //oItemSub.HRepairCheckContent = ""; //楠屾敹鍐呭
- // //oItemSub.HManagerID = 0; //璐熻矗浜篒D
- // //oItemSub.HCloseMan = ""; //琛屽叧闂�
- // oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
- // //oItemSub.HRemark = ""; //澶囨敞
- // oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
- // oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
- // //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
- // //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
- // //oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
- // //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
- // //oItemSub.HRepairID = 0; //缁翠慨椤圭洰
- // //oItemSub.HRepairExplanation =""; //缁翠慨瑕佹眰
-
- // //oItemSub.HMoney = 0; //缁翠慨璐圭敤
- // oBill.DetailColl.Add(oItemSub);
-
- // }
- // //淇濆瓨
- // //淇濆瓨瀹屾瘯鍚庡鐞�
- // bool bResult;
- // if (oBill.omodel.HInterID == 0)
- // {
- // // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
- // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
- // }
- // else
- // {
- // bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
- // }
- // if (bResult)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
- // //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- // else
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- // }
- // catch (Exception e)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- //}
- //#endregion
-
- //#region[妯″叿缁翠慨楠屾敹鍗曠紪杈戞椂鑾峰彇琛ㄥご鏁版嵁]
- //[Route("Sc_MouldRepairCheckBill/Sb_MouldRepairCheckBillListCheckDetai")]
- //[HttpGet]
- //public ApiResult<DataSet> Sb_MouldRepairCheckBillListCheckDetai(string HID)
- //{
- // if (string.IsNullOrEmpty(HID))
- // return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
- // SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
-
- // var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sc_MouldRepairCheckBillList_Edit where hmainid= " + HID + " ", "h_v_Sc_MouldRepairCheckBillList_Edit");
- // if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
- // return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄧ淮淇崟鍙�" };
-
- // return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
- //}
- //#endregion
-
- //#region[妯″叿缁翠慨楠屾敹鍗曠紪杈戞椂鑾峰彇琛ㄤ綋鏁版嵁]
- //[Route("Sc_MouldRepairCheckBill/Sb_MouldRepairCheckBillListProjectDetai")]
- //[HttpGet]
- //public object Sb_MouldRepairCheckBillListProjectDetai(string sqlWhere)
- //{
- // DataSet ds;
- // try
- // {
- // SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- // if (sqlWhere == null || sqlWhere.Equals(""))
- // {
-
- // //ds = oCN.RunProcReturn("select HRepairCheckID,HRepairCheckContent,HManagerID,HRemark from Sc_MouldRepairCheckBillSub", "Sc_MouldRepairCheckBillSub");
- // ds = oCN.RunProcReturn("select HRepairCheckID,楠屾敹椤圭洰浠ｇ爜 HRepairCheckCode,楠屾敹椤圭洰 HRepairCheckName,楠屾敹鍐呭 HRepairCheckContent,HManagerSonID HManagerID,瀛愯礋璐ｄ汉浠ｇ爜 HManagerCode,瀛愯礋璐ｄ汉 HManagerName,澶囨敞 HRemark from h_v_Sc_MouldRepairCheckBillList_Edit", "h_v_Sc_MouldRepairCheckBillList_Edit");
-
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
- // objJsonResult.data = ds.Tables[0];
- // }
- // else
- // {
-
- // //string sql1 = "select HRepairCheckID,HRepairCheckContent,HManagerID,HRemark from Sc_MouldRepairCheckBillSub where 1 = 1 ";
- // string sql1 = "select HRepairCheckID,楠屾敹椤圭洰浠ｇ爜 HRepairCheckCode,楠屾敹椤圭洰 HRepairCheckName,楠屾敹鍐呭 HRepairCheckContent,HManagerSonID HManagerID,瀛愯礋璐ｄ汉浠ｇ爜 HManagerCode,瀛愯礋璐ｄ汉 HManagerName,澶囨敞 HRemark from h_v_Sc_MouldRepairCheckBillList_Edit where 1 = 1 ";
- // string sql = sql1 + sqlWhere;
- // ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldRepairCheckBillList_Edit");
-
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
- // objJsonResult.data = ds.Tables[0];
- // }
- // }
- // catch (Exception e)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
- // objJsonResult.data = null;
- // }
- // return objJsonResult;
- //}
- //#endregion
-
- //#region [妯″叿缁翠慨楠屾敹鍗曞垹闄ゅ姛鑳絔
- ///// <summary>
- ///// 妯″叿缁翠慨鍗曞垹闄ゅ姛鑳�
- ///// </summary>
- ///// <returns></returns>
- //[Route("Sc_MouldRepairCheckBill/DeltetMouldRepairCheckBill")]
- //[HttpGet]
- //public object DeltetMouldRepairCheckBill(string HInterID)
- //{
- // //缂栬緫鏉冮檺
- // //if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairCheckBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
- // //{
- // // objJsonResult.code = "0";
- // // objJsonResult.count = 0;
- // // objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
- // // objJsonResult.data = null;
- // // return objJsonResult;
- // //}
-
-
- // Int64 lngBillKey = 0;
- // lngBillKey = DBUtility.ClsPub.isLong(HInterID);
- // if (lngBillKey == 0)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁ID涓虹┖锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // DAL.ClsSc_MouldRepairCheckBill oBill = new DAL.ClsSc_MouldRepairCheckBill();
- // if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
- // {
- // if (oBill.omodel.HBillStatus > 1)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁褰撳墠澶勪簬涓嶈兘鍒犻櫎鐘舵��,涓嶈兘鍒犻櫎锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // if (oBill.omodel.HChecker != "")
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
-
- // bool IsDete = oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
- // if (IsDete)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // else
- // {
-
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // }
- // else
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁鏈壘鍒�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- //}
- //#endregion
-
-
- //#region 妯″叿鏁呴殰鐧昏琛�
-
- //#region 妯″叿鏁呴殰鐧昏琛ㄤ繚瀛�/缂栬緫
- ///// <summary>
- ///// 淇濆瓨妯″叿缁翠慨鍗�
- ///// </summary>
- ///// <param name="msg"></param>
- ///// <returns></returns>
- //[Route("Sc_MouldConkBookBill/SaveGetMouldConkBookBillList")]
- //[HttpPost]
- //public object SaveGetMouldConkBookBillList([FromBody] JObject msg)
- //{
- // var _value = msg["msg"].ToString();
- // string msg1 = _value.ToString();
- // string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
- // string msg2 = sArray[0].ToString();
- // string msg3 = sArray[1].ToString();
-
-
- // string UserName = "";
- // ListModels oListModels = new ListModels();
- // try
- // {
- // DAL.ClsSc_MouldConkBookBill oBill = new DAL.ClsSc_MouldConkBookBill();
- // List<Model.ClsSc_MouldConkBookBillMain> lsmain = new List<Model.ClsSc_MouldConkBookBillMain>();
- // msg2 = msg2.Replace("\\", "");
- // msg2 = msg2.Replace("\n", ""); //\n
- // lsmain = oListModels.getObjectByJson_Gy_MouldConkBookBillMain(msg2);
- // foreach (Model.ClsSc_MouldConkBookBillMain oItem in lsmain)
- // {
- // //oItem.HMaker = "";
- // UserName = oItem.HMaker; //鍒跺崟浜�
- // DBUtility.ClsPub.CurUserName = UserName;
- // oItem.HBillType = "3815";
- // oItem.HBillSubType = "3815";
- // //oItem.HBillNo = ""; //鍗曟嵁鍙�
- // //oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡
- // //oItem.HInnerBillNo = ""; // --鍐呴儴鍗曟嵁鍙�
- // oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
- // oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
- // //oItem.HEquipID = 0; //璁惧ID(Gy_EquipMent)
- // //oItem.HPeriod = 0;
- // //oItem.HCheckBeginDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd")); // --缁翠慨鏃ユ湡
- // //oItem.HCheckResult = ""; //楠屾敹缁撹--(姝ｅ父锛屽紓甯�)
- // //oItem.HEmpID = 0; //楠屾敹浜�(Gy_Employee)
- // //oItem.HManagerID = 0; //璐熻矗浜�(Gy_Employee)
- // //oItem.HDeptID = 0; //楠屾敹閮ㄩ棬(Gy_Department)
- // //oItem.HExplanation = ""; //鎽樿(鏁呴殰鎻忚堪)
- // //oItem.HRemark = ""; //澶囨敞
-
- // //oItem.HMainSourceInterID = oItem.HInterID;
-
- // //oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
- // if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- // oBill.omodel = oItem;
- // }
- // //琛ㄤ綋鏁版嵁
- // //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
- // msg3 = msg3.Substring(1, msg3.Length - 2);
- // msg3 = msg3.Replace("\\", "");
- // msg3 = msg3.Replace("\n", ""); //\n
- // //msg2 = msg2.Replace("'", "鈥�");
- // List<Model.ClsSc_MouldConkBookBillSub> ls = new List<Model.ClsSc_MouldConkBookBillSub>();
- // ls = oListModels.getObjectByJson_Gy_MouldConkBookBillSub(msg3);
- // int i = 0;
- // foreach (Model.ClsSc_MouldConkBookBillSub oItemSub in ls)
- // {
-
- // i++;
- // oItemSub.HEntryID = i;
-
- // //oItemSub.HRepairCheckID = 0; //楠屾敹椤圭洰ID
- // //oItemSub.HRepairCheckContent = ""; //楠屾敹鍐呭
- // //oItemSub.HManagerID = 0; //璐熻矗浜篒D
- // //oItemSub.HCloseMan = ""; //琛屽叧闂�
- // oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
- // //oItemSub.HRemark = ""; //澶囨敞
- // oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
- // oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
- // //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
- // //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
- // //oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
- // //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
- // //oItemSub.HRepairID = 0; //缁翠慨椤圭洰
- // //oItemSub.HRepairExplanation =""; //缁翠慨瑕佹眰
-
- // //oItemSub.HMoney = 0; //缁翠慨璐圭敤
- // oBill.DetailColl.Add(oItemSub);
-
- // }
- // //淇濆瓨
- // //淇濆瓨瀹屾瘯鍚庡鐞�
- // bool bResult;
- // if (oBill.omodel.HInterID == 0)
- // {
- // // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
- // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
- // }
- // else
- // {
- // bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
- // }
- // if (bResult)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
- // //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- // else
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- // }
- // catch (Exception e)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- //}
- //#endregion
-
- //#region[妯″叿鏁呴殰鐧昏琛ㄧ紪杈戞椂鑾峰彇琛ㄥご鏁版嵁]
- //[Route("Sc_MouldConkBookBill/Sb_MouldConkBookBillListCheckDetai")]
- //[HttpGet]
- //public ApiResult<DataSet> Sb_MouldConkBookBillListCheckDetai(string HID)
- //{
- // if (string.IsNullOrEmpty(HID))
- // return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
- // SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
-
- // var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sc_MouldConkBookBillList_Edit where hmainid= " + HID + " ", "h_v_Sc_MouldConkBookBillList_Edit");
- // if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
- // return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄧ淮淇崟鍙�" };
-
- // return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
- //}
- //#endregion
-
- //#region[妯″叿鏁呴殰鐧昏琛ㄧ紪杈戞椂鑾峰彇琛ㄤ綋鏁版嵁]
- //[Route("Sc_MouldConkBookBill/Sb_MouldConkBookBillListProjectDetai")]
- //[HttpGet]
- //public object Sb_MouldConkBookBillListProjectDetai(string sqlWhere)
- //{
- // DataSet ds;
- // try
- // {
- // SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- // if (sqlWhere == null || sqlWhere.Equals(""))
- // {
-
- // //ds = oCN.RunProcReturn("select HRepairCheckID,HRepairCheckContent,HManagerID,HRemark from Sc_MouldRepairCheckBillSub", "Sc_MouldRepairCheckBillSub");
- // ds = oCN.RunProcReturn("select HConkReasonID,鏁呴殰鍘熷洜浠ｇ爜 HConkReasonCode,鏁呴殰鍘熷洜 HConkReasonName,鏁呴殰鍘熷洜鎻忚堪 HConkExplanation,HManagerSonID HManagerID,瀛愯礋璐ｄ汉浠ｇ爜 HManagerCode,瀛愯礋璐ｄ汉 HManagerName,澶囨敞 HRemark from h_v_Sc_MouldConkBookBillList_Edit", "h_v_Sc_MouldConkBookBillList_Edit");
-
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
- // objJsonResult.data = ds.Tables[0];
- // }
- // else
- // {
-
- // //string sql1 = "select HRepairCheckID,HRepairCheckContent,HManagerID,HRemark from Sc_MouldRepairCheckBillSub where 1 = 1 ";
- // string sql1 = "select HConkReasonID,鏁呴殰鍘熷洜浠ｇ爜 HConkReasonCode,鏁呴殰鍘熷洜 HConkReasonName,鏁呴殰鍘熷洜鎻忚堪 HConkExplanation,HManagerSonID HManagerID,瀛愯礋璐ｄ汉浠ｇ爜 HManagerCode,瀛愯礋璐ｄ汉 HManagerName,澶囨敞 HRemark from h_v_Sc_MouldConkBookBillList_Edit where 1 = 1 ";
- // string sql = sql1 + sqlWhere;
- // ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldConkBookBillList_Edit");
-
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
- // objJsonResult.data = ds.Tables[0];
- // }
- // }
- // catch (Exception e)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
- // objJsonResult.data = null;
- // }
- // return objJsonResult;
- //}
- //#endregion
-
- //#region [妯″叿鏁呴殰鐧昏琛ㄥ垹闄ゅ姛鑳絔
- ///// <summary>
- ///// 妯″叿缁翠慨鍗曞垹闄ゅ姛鑳�
- ///// </summary>
- ///// <returns></returns>
- //[Route("Sc_MouldConkBookBill/DeltetMouldConkBookBill")]
- //[HttpGet]
- //public object DeltetMouldConkBookBill(string HInterID)
- //{
- // //缂栬緫鏉冮檺
- // //if (!DBUtility.ClsPub.Security_Log("Sc_MouldConkBookBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
- // //{
- // // objJsonResult.code = "0";
- // // objJsonResult.count = 0;
- // // objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
- // // objJsonResult.data = null;
- // // return objJsonResult;
- // //}
-
-
- // Int64 lngBillKey = 0;
- // lngBillKey = DBUtility.ClsPub.isLong(HInterID);
- // if (lngBillKey == 0)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁ID涓虹┖锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // DAL.ClsSc_MouldConkBookBill oBill = new DAL.ClsSc_MouldConkBookBill();
- // if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
- // {
- // if (oBill.omodel.HBillStatus > 1)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁褰撳墠澶勪簬涓嶈兘鍒犻櫎鐘舵��,涓嶈兘鍒犻櫎锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // if (oBill.omodel.HChecker != "")
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
-
- // bool IsDete = oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
- // if (IsDete)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // else
- // {
-
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // }
- // else
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁鏈壘鍒�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- //}
- //#endregion
- //#endregion
-
-
- //#region 妯″叿淇濆吇璁″垝鍗�
-
- //#region 妯″叿淇濆吇璁″垝鍗� 淇濆瓨/缂栬緫
- ///// <summary>
- ///// 淇濆瓨妯″叿淇濆吇璁″垝鍗�
- ///// </summary>
- ///// <param name="msg"></param>
- ///// <returns></returns>
- //[Route("Sc_MouldMaintainPlanBill/SaveGetMouldMaintainPlanBillList")]
- //[HttpPost]
- //public object SaveGetMouldMaintainPlanBillList([FromBody] JObject msg)
- //{
- // var _value = msg["msg"].ToString();
- // string msg1 = _value.ToString();
- // string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
- // string msg2 = sArray[0].ToString();
- // string msg3 = sArray[1].ToString();
-
-
- // string UserName = "";
- // ListModels oListModels = new ListModels();
- // try
- // {
- // DAL.ClsSc_MouldMaintainPlanBill oBill = new DAL.ClsSc_MouldMaintainPlanBill();
- // List<Model.ClsSc_MouldMaintainPlanBillMain> lsmain = new List<Model.ClsSc_MouldMaintainPlanBillMain>();
- // msg2 = msg2.Replace("\\", "");
- // msg2 = msg2.Replace("\n", ""); //\n
- // lsmain = oListModels.getObjectByJson_Gy_MouldMaintainPlanBillMain(msg2);
- // foreach (Model.ClsSc_MouldMaintainPlanBillMain oItem in lsmain)
- // {
- // //oItem.HMaker = "";
- // UserName = oItem.HMaker; //鍒跺崟浜�
- // oItem.HBillType = "3818";
- // oItem.HBillSubType = "3818";
-
- // //oItem.HInterID =0;
- // //oItem.HBillNo = "";
- // oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡
- // oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
- // //oItem.HMakeDate = "";
- // //oItem.HYear = "";
- // //oItem.HPeriod = "";
- // //oItem.HRemark = "";
- // //oItem.HCycleUnit = "";
- // //oItem.HCheckCycle = "";
- // //oItem.HBeginDate = "";
- // //oItem.HEndDate = "";
- // //oItem.HInnerBillNo = "";
- // //oItem.HExplanation = "";
-
- // //oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
- // if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- // oBill.omodel = oItem;
- // }
- // //琛ㄤ綋鏁版嵁
- // //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
- // msg3 = msg3.Substring(1, msg3.Length - 2);
- // msg3 = msg3.Replace("\\", "");
- // msg3 = msg3.Replace("\n", ""); //\n
- // //msg2 = msg2.Replace("'", "鈥�");
- // List<Model.ClsSc_MouldMaintainPlanBillSub> ls = new List<Model.ClsSc_MouldMaintainPlanBillSub>();
- // ls = oListModels.getObjectByJson_Gy_MouldMaintainPlanBillSub(msg3);
- // int i = 0;
- // foreach (Model.ClsSc_MouldMaintainPlanBillSub oItemSub in ls)
- // {
-
- // i++;
- // oItemSub.HEntryID = i;
- // //oItemSub.HCloseMan = ""; //琛屽叧闂�
- // oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
- // oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
- // //oItemSub.HRemark = ""; //澶囨敞
- // oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
- // oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
- // //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
- // //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
- // oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
- // //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
- // //HMaterID = "";//閰嶄欢浠ｇ爜
- // //HUnitID = "";//鍗曚綅浠ｇ爜
- // //HQty = "";//瀹為檯鐢ㄩ噺
- // //HQtyMust = "";//鍗曚綅鐢ㄩ噺
- // //HRemark = "";//澶囨敞
- // //oItemSub.HRepairID = 0; //缁翠慨椤圭洰
- // //oItemSub.HRepairExplanation =""; //缁翠慨瑕佹眰
- // //oItemSub.HManagerID = 0; //璐熻矗浜篒D
- // //oItemSub.HMoney = 0; //缁翠慨璐圭敤
- // oBill.DetailColl.Add(oItemSub);
-
- // }
- // //淇濆瓨
- // //淇濆瓨瀹屾瘯鍚庡鐞�
- // bool bResult;
- // if (oBill.omodel.HInterID == 0)
- // {
- // // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
- // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
- // }
- // else
- // {
- // bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
- // }
- // if (bResult)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
- // //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- // else
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- // }
- // catch (Exception e)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- //}
- //#endregion
- //#region[妯″叿淇濆吇璁″垝鍗曠紪杈戞椂鑾峰彇琛ㄥご鏁版嵁]
- //[Route("Sc_MouldMaintainPlanBill/Sc_MouldMaintainPlanBillListCheckDetai")]
- //[HttpGet]
- //public ApiResult<DataSet> Sc_MouldMaintainPlanBillListCheckDetai(string HID)
- //{
- // if (string.IsNullOrEmpty(HID))
- // return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
- // SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- // var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sc_MouldMaintainPlanBillList where hmainid= " + HID + " ", "h_v_Sc_MouldMaintainPlanBillList");
- // if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
- // return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄤ繚鍏昏鍒掑崟" };
- // return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
- //}
- //#endregion
- //#region[妯″叿淇濆吇璁″垝鍗曠紪杈戞椂鑾峰彇琛ㄩ鏁版嵁]
- //[Route("Sc_MouldMaintainPlanBill/Sc_MouldMaintainPlanBillListProjectDetai")]
- //[HttpGet]
- //public object Sc_MouldMaintainPlanBillListProjectDetai(string sqlWhere)
- //{
- // DataSet ds;
- // try
- // {
- // SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- // if (sqlWhere == null || sqlWhere.Equals(""))
- // {
- // ds = oCN.RunProcReturn("select HMaterID,HUnitID,HQty,HQtyMust,HRemark from Sc_MouldMaintainPlanBillSub", "Sc_MouldMaintainPlanBillSub");
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
- // objJsonResult.data = ds.Tables[0];
- // }
- // else
- // {
- // string sql1 = "select HMaterID,HUnitID,HQty,HQtyMust,HRemark from Sc_MouldMaintainPlanBillSub where 1 = 1 ";
- // string sql = sql1 + sqlWhere;
- // ds = oCN.RunProcReturn(sql, "Sc_MouldMaintainPlanBillSub");
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
- // objJsonResult.data = ds.Tables[0];
- // }
- // }
- // catch (Exception e)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
- // objJsonResult.data = null;
- // }
- // return objJsonResult;
- //}
- //#endregion
- //#region [妯″叿淇濆吇璁″垝鍗曞垹闄ゅ姛鑳絔
- ///// <summary>
- ///// 妯″叿缁翠慨鍗曞垹闄ゅ姛鑳�
- ///// </summary>
- ///// <returns></returns>
- //[Route("Sc_MouldMaintainPlanBill/DeltetMouldMaintainPlanBill")]
- //[HttpGet]
- //public object DeltetMouldMaintainPlanBill(string HInterID)
- //{
- // //缂栬緫鏉冮檺
- // //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
- // //{
- // // objJsonResult.code = "0";
- // // objJsonResult.count = 0;
- // // objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
- // // objJsonResult.data = null;
- // // return objJsonResult;
- // //}
-
-
- // Int64 lngBillKey = 0;
- // lngBillKey = DBUtility.ClsPub.isLong(HInterID);
- // if (lngBillKey == 0)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁ID涓虹┖锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // DAL.ClsSc_MouldMaintainPlanBill oBill = new DAL.ClsSc_MouldMaintainPlanBill();
- // if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
- // {
- // if (oBill.omodel.HBillStatus > 1)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁褰撳墠澶勪簬涓嶈兘鍒犻櫎鐘舵��,涓嶈兘鍒犻櫎锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // if (oBill.omodel.HChecker != "")
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
-
- // bool IsDete = oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
- // if (IsDete)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // else
- // {
-
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // }
- // else
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁鏈壘鍒�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- //}
- //#endregion
-
- //#endregion
-
- //#region 妯″叿淇濆吇璁板綍琛�
-
- //#region 妯″叿淇濆吇璁板綍琛� 淇濆瓨/缂栬緫
- ///// <summary>
- ///// 淇濆瓨妯″叿缁翠慨鍗�
- ///// </summary>
- ///// <param name="msg"></param>
- ///// <returns></returns>
- //[Route("Sc_MouldMaintainBill/SaveGetMouldMaintainBillList")]
- //[HttpPost]
- //public object SaveGetMouldMaintainBillList([FromBody] JObject msg)
- //{
- // var _value = msg["msg"].ToString();
- // string msg1 = _value.ToString();
- // string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
- // string msg2 = sArray[0].ToString();
- // string msg3 = sArray[1].ToString();
- // string msg4 = sArray[2].ToString();
-
- // string UserName = "";
- // ListModels oListModels = new ListModels();
- // try
- // {
- // DAL.ClsSc_MouldMaintainBill oBill = new DAL.ClsSc_MouldMaintainBill();
- // List<Model.ClsSc_MouldMaintainBillMain> lsmain = new List<Model.ClsSc_MouldMaintainBillMain>();
- // msg2 = msg2.Replace("\\", "");
- // msg2 = msg2.Replace("\n", ""); //\n
- // lsmain = oListModels.getObjectByJson_Sc_MouldMaintainBillMain(msg2);
- // foreach (Model.ClsSc_MouldMaintainBillMain oItem in lsmain)
- // {
- // UserName = oItem.HMaker; //鍒跺崟浜�
- // DBUtility.ClsPub.CurUserName = UserName;
- // oItem.HBillType = "3819";
- // oItem.HBillSubType = "3819";
-
- // //oItem.HInterID =0;
- // //oItem.HBillNo = "";
- // oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡
- // oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
- // //oItem.HMakeDate = "";
- // //oItem.HYear = "";
- // //oItem.HPeriod = "";
- // //oItem.HRemark = "";
- // //oItem.HCycleUnit = "";
- // //oItem.HCheckCycle = "";
- // //oItem.HBeginDate = "";
- // //oItem.HEndDate = "";
- // //oItem.HInnerBillNo = "";
- // //oItem.HExplanation = "";
-
- // //oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
- // if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- // oBill.omodel = oItem;
- // }
- // //淇濆吇椤硅〃浣撴暟鎹�
- // //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
- // msg3 = msg3.Substring(1, msg3.Length - 2);
- // msg3 = msg3.Replace("\\", "");
- // msg3 = msg3.Replace("\n", ""); //\n
- // //msg2 = msg2.Replace("'", "鈥�");
- // List<Model.ClsSc_MouldMaintainRuleBillSub_Item> ls = new List<Model.ClsSc_MouldMaintainRuleBillSub_Item>();
- // ls = oListModels.getObjectByJson_Sc_MouldMaintainRuleBillSub_Item(msg3);
- // int i = 0;
- // foreach (Model.ClsSc_MouldMaintainRuleBillSub_Item oItemSub in ls)
- // {
-
- // i++;
- // oItemSub.HEntryID = i;
- // //oItemSub.HCloseMan = ""; //琛屽叧闂�
- // oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
- // oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
- // //oItemSub.HRemark = ""; //澶囨敞
- // oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
- // oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
- // //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
- // //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
- // oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
- // oBill.DetailCol.Add(oItemSub);
-
- // }
- // //閰嶄欢椤硅〃浣撴暟鎹�
- // //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
- // msg4 = msg4.Substring(1, msg4.Length - 2);
- // msg4 = msg4.Replace("\\", "");
- // msg4 = msg4.Replace("\n", ""); //\n
- // //msg2 = msg2.Replace("'", "鈥�");
- // List<Model.ClsSc_MouldMaintainBillSub> ls1 = new List<Model.ClsSc_MouldMaintainBillSub>();
- // ls1 = oListModels.getObjectByJson_Sc_MouldMaintainBillSub(msg4);
- // int j = 0;
- // foreach (Model.ClsSc_MouldMaintainBillSub Sub in ls1)
- // {
-
- // j++;
- // Sub.HEntryID = j;
- // //oItemSub.HCloseMan = ""; //琛屽叧闂�
- // Sub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
- // Sub.HCloseType = false; //鍏抽棴绫诲瀷
- // //oItemSub.HRemark = ""; //澶囨敞
- // Sub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
- // Sub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
- // //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
- // //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
- // Sub.HRelationQty = 0; //鍏宠仈鏁伴噺
- // //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
- // //HMaterID = "";//閰嶄欢浠ｇ爜
- // //HUnitID = "";//鍗曚綅浠ｇ爜
- // //HQty = "";//瀹為檯鐢ㄩ噺
- // //HQtyMust = "";//鍗曚綅鐢ㄩ噺
- // //HRemark = "";//澶囨敞
-
- // oBill.DetailColl.Add(Sub);
-
- // }
- // //淇濆瓨
- // //淇濆瓨瀹屾瘯鍚庡鐞�
- // bool bResult;
- // if (oBill.omodel.HInterID == 0)
- // {
- // // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
- // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
- // }
- // else
- // {
- // bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
- // }
- // if (bResult)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
- // //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- // else
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- // }
- // catch (Exception e)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- //}
- //#endregion
-
- //#region[妯″叿淇濆吇璁板綍琛ㄧ紪杈戞椂鑾峰彇琛ㄥご鏁版嵁]
- //[Route("Sc_MouldMaintainBill/Sc_MouldMaintainBillListCheckDetai")]
- //[HttpGet]
- //public ApiResult<DataSet> Sc_MouldMaintainBillListCheckDetai(string HID)
- //{
- // if (string.IsNullOrEmpty(HID))
- // return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
- // SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- // var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sc_MouldMaintain where hmainid= " + HID + " ", "h_v_Sc_MouldMaintain");
- // if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
- // return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄤ繚鍏昏褰曡〃" };
- // return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
- //}
- //#endregion
-
- //#region[妯″叿淇濆吇璁板綍琛ㄧ紪杈戞椂鑾峰彇琛ㄩ鏁版嵁]
- //[Route("Sc_MouldMaintainBill/Sc_MouldMaintainBillListProjectDetai")]
- //[HttpGet]
- //public object Sc_MouldMaintainBillListProjectDetai(string sqlWhere)
- //{
- // DataSet ds;
- // try
- // {
- // SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- // if (sqlWhere == null || sqlWhere.Equals(""))
- // {
- // ds = oCN.RunProcReturn("select HMaterID,HUnitID,HQty,HQtyMust,HRemark,HManagerID from Sc_MouldMaintainBillSub", "Sc_MouldMaintainBillSub");
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
- // objJsonResult.data = ds.Tables[0];
- // }
- // else
- // {
- // string sql1 = "select HMaterID,HUnitID,HQty,HQtyMust,HRemark,HManagerID from Sc_MouldMaintainBillSub where 1 = 1 ";
- // string sql = sql1 + sqlWhere;
- // ds = oCN.RunProcReturn(sql, "Sc_MouldMaintainBillSub");
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
- // objJsonResult.data = ds.Tables[0];
- // }
- // }
- // catch (Exception e)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
- // objJsonResult.data = null;
- // }
- // return objJsonResult;
- //}
- //#endregion
-
- //#region[妯″叿淇濆吇璁板綍琛ㄧ紪杈戞椂鑾峰彇琛ㄤ綋鏁版嵁鏂�(淇濆吇椤瑰垪琛ㄣ�侀厤浠堕」鍒楄〃)]
- //[Route("Sc_MouldMaintainBill/Sc_MouldMaintainBillListProjectDetaiNew")]
- //[HttpGet]
- //public object Sc_MouldMaintainBillListProjectDetaiNew(string HInterID)
- //{
-
- // DataSet ds,ds1;
- // List<object> list = new List<object>();
- // string Swhere = "";
- // try
- // {
- // if (HInterID != "" || HInterID != null)
- // {
- // Swhere = " and hmainid='" + HInterID + "'";
- // }
- // else
- // {
- // Swhere = HInterID;
- // }
- // SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- // //鑾峰彇淇濆吇椤圭洰缂栬緫鏁版嵁
- // string sql = "select HMaintainItemID, 淇濆吇椤圭洰浠ｇ爜 HMaintainItemNumber,淇濆吇椤圭洰鍚嶇О HMaintainItem,淇濆吇閮ㄤ綅 HMaintainPart,鍏蜂綋瑕佹眰 HClaim,HManagerID,璐熻矗浜轰唬鐮� HManagerNumber,璐熻矗浜� HManagerName,琛ㄤ綋澶囨敞 HRemark from h_v_Sc_MouldMaintainBillListItem where 1 = 1 " + Swhere + "";
- // ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldMaintainBillListItem");
- // //鑾峰彇閰嶄欢椤圭洰缂栬緫鏁版嵁
- // string sql1 = "select HMaterID, 閰嶄欢浠ｇ爜 HMaterNumber,閰嶄欢鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,HUnitID,鍗曚綅浠ｇ爜 HUnitNumber,鍗曚綅鍚嶇О HUnitName,瀹為檯鐢ㄩ噺 HQty,鏍囧噯鐢ㄩ噺 HQtyMust,HManagerID,璐熻矗浜轰唬鐮� HManagerNumber,璐熻矗浜� HManagerName,琛ㄤ綋澶囨敞 HRemark from h_v_Sc_MouldMaintainBillList where 1 = 1 " + Swhere + "";
- // ds1 = oCN.RunProcReturn(sql1, "h_v_Sc_MouldMaintainBillList");
- // list.Add(ds.Tables[0]);
- // list.Add(ds1.Tables[0]);
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
- // objJsonResult.list = list;
- // }
- // catch (Exception e)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
- // objJsonResult.data = null;
- // }
- // return objJsonResult;
- //}
- //#endregion
-
- //#region [妯″叿淇濆吇璁板綍琛ㄥ垹闄ゅ姛鑳絔
- // /// <summary>
- // /// 妯″叿缁翠慨鍗曞垹闄ゅ姛鑳�
- // /// </summary>
- // /// <returns></returns>
- // [Route("Sc_MouldMaintainBill/DeltetSc_MouldMaintainBill")]
- //[HttpGet]
- //public object DeltetSc_MouldMaintainBill(string HInterID)
- //{
- // Int64 lngBillKey = 0;
- // lngBillKey = DBUtility.ClsPub.isLong(HInterID);
- // if (lngBillKey == 0)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁ID涓虹┖锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // DAL.ClsSc_MouldMaintainBill oBill = new DAL.ClsSc_MouldMaintainBill();
- // if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
- // {
- // if (oBill.omodel.HBillStatus > 1)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁褰撳墠澶勪簬涓嶈兘鍒犻櫎鐘舵��,涓嶈兘鍒犻櫎锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // if (oBill.omodel.HChecker != "")
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
-
- // bool IsDete = oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
- // if (IsDete)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // else
- // {
-
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // }
- // else
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁鏈壘鍒�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- //}
- //#endregion
-
- //#endregion
-
- //#region 妯″叿鐐规璁板綍琛�
-
- //#region 妯″叿鐐规璁板綍琛� 淇濆瓨/缂栬緫
- ///// <summary>
- ///// 淇濆瓨妯″叿缁翠慨鍗�
- ///// </summary>
- ///// <param name="msg"></param>
- ///// <returns></returns>
- //[Route("Sc_MouldDotCheckBill/SaveGetMouldDotCheckBillList")]
- //[HttpPost]
- //public object SaveGetMouldDotCheckBillList([FromBody] JObject msg)
- //{
- // var _value = msg["msg"].ToString();
- // string msg1 = _value.ToString();
- // string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
- // string msg2 = sArray[0].ToString();
- // string msg3 = sArray[1].ToString();
-
-
- // string UserName = "";
- // ListModels oListModels = new ListModels();
- // try
- // {
- // DAL.ClsSc_MouldDotCheckBill oBill = new DAL.ClsSc_MouldDotCheckBill();
- // List<Model.ClsSc_MouldDotCheckBillMain> lsmain = new List<Model.ClsSc_MouldDotCheckBillMain>();
- // msg2 = msg2.Replace("\\", "");
- // msg2 = msg2.Replace("\n", ""); //\n
- // lsmain = oListModels.getObjectByJson_Sc_MouldDotCheckBillMain(msg2);
- // foreach (Model.ClsSc_MouldDotCheckBillMain oItem in lsmain)
- // {
- // //oItem.HMaker = "";
- // UserName = oItem.HMaker; //鍒跺崟浜�
- // oItem.HBillType = "3821";
- // oItem.HBillSubType = "3821";
-
- // //oItem.HInterID =0;
- // //oItem.HBillNo = "";
- // oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡
- // oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
- // //oItem.HMakeDate = "";
- // //oItem.HYear = "";
- // //oItem.HPeriod = "";
- // //oItem.HRemark = "";
- // //oItem.HCycleUnit = "";
- // //oItem.HCheckCycle = "";
- // //oItem.HBeginDate = "";
- // //oItem.HEndDate = "";
- // //oItem.HInnerBillNo = "";
- // //oItem.HExplanation = "";
-
- // //oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
- // if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- // oBill.omodel = oItem;
- // }
- // //琛ㄤ綋鏁版嵁
- // //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
- // msg3 = msg3.Substring(1, msg3.Length - 2);
- // msg3 = msg3.Replace("\\", "");
- // msg3 = msg3.Replace("\n", ""); //\n
- // //msg2 = msg2.Replace("'", "鈥�");
- // List<Model.ClsSc_MouldDotCheckBillSub> ls = new List<Model.ClsSc_MouldDotCheckBillSub>();
- // ls = oListModels.getObjectByJson_Sc_MouldDotCheckBillSub(msg3);
- // int i = 0;
- // foreach (Model.ClsSc_MouldDotCheckBillSub oItemSub in ls)
- // {
-
- // i++;
- // oItemSub.HEntryID = i;
- // //oItemSub.HCloseMan = ""; //琛屽叧闂�
- // oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
- // oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
- // //oItemSub.HRemark = ""; //澶囨敞
- // oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
- // oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
- // //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
- // //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
- // oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
- // //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
- // //HMaterID = "";//閰嶄欢浠ｇ爜
- // //HUnitID = "";//鍗曚綅浠ｇ爜
- // //HQty = "";//瀹為檯鐢ㄩ噺
- // //HQtyMust = "";//鍗曚綅鐢ㄩ噺
- // //HRemark = "";//澶囨敞
-
- // oBill.DetailColl.Add(oItemSub);
-
- // }
- // //淇濆瓨
- // //淇濆瓨瀹屾瘯鍚庡鐞�
- // bool bResult;
- // if (oBill.omodel.HInterID == 0)
- // {
- // // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
- // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
- // }
- // else
- // {
- // bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
- // }
- // if (bResult)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
- // //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- // else
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- // }
- // catch (Exception e)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- //}
- //#endregion
-
-
- //#region[妯″叿鐐规璁板綍琛ㄧ紪杈戞椂鑾峰彇琛ㄥご鏁版嵁]
- //[Route("Sc_MouldDotCheckBill/Sc_MouldDotCheckBillListCheckDetai")]
- //[HttpGet]
- //public ApiResult<DataSet> Sc_MouldDotCheckBillListCheckDetai(string HID)
- //{
- // if (string.IsNullOrEmpty(HID))
- // return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
- // SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- // var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sc_MouldDotCheckBillList where hmainid= " + HID + " ", "h_v_Sc_MouldDotCheckBillList");
- // if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
- // return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄧ偣妫�璁板綍琛�" };
- // return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
- //}
- //#endregion
- //#region[妯″叿鐐规璁板綍琛ㄧ紪杈戞椂鑾峰彇琛ㄩ鏁版嵁]
- //[Route("Sc_MouldDotCheckBill/Sc_MouldDotCheckBillListProjectDetai")]
- //[HttpGet]
- //public object Sc_MouldDotCheckBillListProjectDetai(string sqlWhere)
- //{
- // DataSet ds;
- // try
- // {
- // SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- // if (sqlWhere == null || sqlWhere.Equals(""))
- // {
- // ds = oCN.RunProcReturn("select 鐐规椤圭洰 HDotCheckItem,鐐规閮ㄤ綅 HDotCheckPart,鍏蜂綋瑕佹眰 HClaim,琛ㄤ綋澶囨敞 HRemark,HManagerID,璐熻矗浜轰唬鐮� HManagerNumber,璐熻矗浜� HManagerName from h_v_Sc_MouldDotCheckBillList", "h_v_Sc_MouldDotCheckBillList");
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
- // objJsonResult.data = ds.Tables[0];
- // }
- // else
- // {
- // string sql1 = "select 鐐规椤圭洰 HDotCheckItem,鐐规閮ㄤ綅 HDotCheckPart,鍏蜂綋瑕佹眰 HClaim,琛ㄤ綋澶囨敞 HRemark,HManagerID,璐熻矗浜轰唬鐮� HManagerNumber,璐熻矗浜� HManagerName from h_v_Sc_MouldDotCheckBillList where 1 = 1 ";
- // string sql = sql1 + sqlWhere;
- // ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldDotCheckBillList");
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
- // objJsonResult.data = ds.Tables[0];
- // }
- // }
- // catch (Exception e)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
- // objJsonResult.data = null;
- // }
- // return objJsonResult;
- //}
- //#endregion
-
- //#region [妯″叿鐐规璁板綍琛ㄥ垹闄ゅ姛鑳絔
- ///// <summary>
- ///// 妯″叿缁翠慨鍗曞垹闄ゅ姛鑳�
- ///// </summary>
- ///// <returns></returns>
- //[Route("Sc_MouldDotCheckBill/DeltetSc_MouldDotCheckBill")]
- //[HttpGet]
- //public object DeltetSc_MouldDotCheckBill(string HInterID)
- //{
- // //缂栬緫鏉冮檺
- // //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
- // //{
- // // objJsonResult.code = "0";
- // // objJsonResult.count = 0;
- // // objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
- // // objJsonResult.data = null;
- // // return objJsonResult;
- // //}
-
-
- // Int64 lngBillKey = 0;
- // lngBillKey = DBUtility.ClsPub.isLong(HInterID);
- // if (lngBillKey == 0)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁ID涓虹┖锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // DAL.ClsSc_MouldDotCheckBill oBill = new DAL.ClsSc_MouldDotCheckBill();
- // if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
- // {
- // if (oBill.omodel.HBillStatus > 1)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁褰撳墠澶勪簬涓嶈兘鍒犻櫎鐘舵��,涓嶈兘鍒犻櫎锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // if (oBill.omodel.HChecker != "")
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
-
- // bool IsDete = oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
- // if (IsDete)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // else
- // {
-
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // }
- // else
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁鏈壘鍒�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- //}
- //#endregion
-
-
- //#endregion
-
- //#region 妯″叿鐐规璁″垝琛�
-
- //#region 妯″叿鐐规璁″垝琛� 淇濆瓨/缂栬緫
- ///// <summary>
- ///// 淇濆瓨妯″叿缁翠慨鍗�
- ///// </summary>
- ///// <param name="msg"></param>
- ///// <returns></returns>
- //[Route("Sc_MouldDotCheckPlanBill/SaveGetMouldDotCheckPlanBillList")]
- //[HttpPost]
- //public object SaveGetMouldDotCheckPlanBillList([FromBody] JObject msg)
- //{
- // var _value = msg["msg"].ToString();
- // string msg1 = _value.ToString();
- // string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
- // string msg2 = sArray[0].ToString();
- // string msg3 = sArray[1].ToString();
-
-
- // string UserName = "";
- // ListModels oListModels = new ListModels();
- // try
- // {
- // DAL.ClsSc_MouldDotCheckPlanBill oBill = new DAL.ClsSc_MouldDotCheckPlanBill();
- // List<Model.ClsSc_MouldDotCheckPlanBillMain> lsmain = new List<Model.ClsSc_MouldDotCheckPlanBillMain>();
- // msg2 = msg2.Replace("\\", "");
- // msg2 = msg2.Replace("\n", ""); //\n
- // lsmain = oListModels.getObjectByJson_Sc_MouldDotCheckPlanBillMain(msg2);
- // foreach (Model.ClsSc_MouldDotCheckPlanBillMain oItem in lsmain)
- // {
- // //oItem.HMaker = "";
- // UserName = oItem.HMaker; //鍒跺崟浜�
- // oItem.HBillType = "3821";
- // oItem.HBillSubType = "3821";
-
- // //oItem.HInterID =0;
- // //oItem.HBillNo = "";
- // oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡
- // oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
- // //oItem.HMakeDate = "";
- // //oItem.HYear = "";
- // //oItem.HPeriod = "";
- // //oItem.HRemark = "";
- // //oItem.HCycleUnit = "";
- // //oItem.HCheckCycle = "";
- // //oItem.HBeginDate = "";
- // //oItem.HEndDate = "";
- // //oItem.HInnerBillNo = "";
- // //oItem.HExplanation = "";
-
- // //oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
- // if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- // oBill.omodel = oItem;
- // }
- // //琛ㄤ綋鏁版嵁
- // //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
- // msg3 = msg3.Substring(1, msg3.Length - 2);
- // msg3 = msg3.Replace("\\", "");
- // msg3 = msg3.Replace("\n", ""); //\n
- // //msg2 = msg2.Replace("'", "鈥�");
- // List<Model.ClsSc_MouldDotCheckPlanBillSub> ls = new List<Model.ClsSc_MouldDotCheckPlanBillSub>();
- // ls = oListModels.getObjectByJson_Sc_MouldDotCheckPlanBillSub(msg3);
- // int i = 0;
- // foreach (Model.ClsSc_MouldDotCheckPlanBillSub oItemSub in ls)
- // {
-
- // i++;
- // oItemSub.HEntryID = i;
- // //oItemSub.HCloseMan = ""; //琛屽叧闂�
- // oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
- // oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
- // //oItemSub.HRemark = ""; //澶囨敞
- // oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
- // oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
- // //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
- // //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
- // oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
- // //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
- // //HMaterID = "";//閰嶄欢浠ｇ爜
- // //HUnitID = "";//鍗曚綅浠ｇ爜
- // //HQty = "";//瀹為檯鐢ㄩ噺
- // //HQtyMust = "";//鍗曚綅鐢ㄩ噺
- // //HRemark = "";//澶囨敞
-
- // oBill.DetailColl.Add(oItemSub);
-
- // }
- // //淇濆瓨
- // //淇濆瓨瀹屾瘯鍚庡鐞�
- // bool bResult;
- // if (oBill.omodel.HInterID == 0)
- // {
- // // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
- // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
- // }
- // else
- // {
- // bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
- // }
- // if (bResult)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
- // //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- // else
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- // }
- // catch (Exception e)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- //}
- //#endregion
-
-
- //#region[妯″叿鐐规璁″垝琛ㄧ紪杈戞椂鑾峰彇琛ㄥご鏁版嵁]
- //[Route("Sc_MouldDotCheckPlanBill/Sc_MouldDotCheckPlanBillListCheckDetai")]
- //[HttpGet]
- //public ApiResult<DataSet> Sc_MouldDotCheckPlanBillListCheckDetai(string HID)
- //{
- // if (string.IsNullOrEmpty(HID))
- // return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
- // SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- // var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sc_MouldDotCheckPlanBillList where hmainid= " + HID + " ", "h_v_Sc_MouldDotCheckPlanBillList");
- // if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
- // return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄧ偣妫�璁″垝琛�" };
- // return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
- //}
- //#endregion
- //#region[妯″叿鐐规璁″垝琛ㄧ紪杈戞椂鑾峰彇琛ㄩ鏁版嵁]
- //[Route("Sc_MouldDotCheckPlanBill/Sc_MouldDotCheckPlanBillListProjectDetai")]
- //[HttpGet]
- //public object Sc_MouldDotCheckPlanBillListProjectDetai(string sqlWhere)
- //{
- // DataSet ds;
- // try
- // {
- // SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- // if (sqlWhere == null || sqlWhere.Equals(""))
- // {
- // ds = oCN.RunProcReturn("select HDotCheckItem,HDotCheckPart,HClaim,HRemark,HManagerID from Sc_MouldDotCheckPlanBillSub", "Sc_MouldDotCheckPlanBillSub");
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
- // objJsonResult.data = ds.Tables[0];
- // }
- // else
- // {
- // string sql1 = "select HDotCheckItem,HDotCheckPart,HClaim,HRemark,HManagerID from Sc_MouldDotCheckPlanBillSub where 1 = 1 ";
- // string sql = sql1 + sqlWhere;
- // ds = oCN.RunProcReturn(sql, "Sc_MouldDotCheckPlanBillSub");
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
- // objJsonResult.data = ds.Tables[0];
- // }
- // }
- // catch (Exception e)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁″垝锛�" + e.ToString();
- // objJsonResult.data = null;
- // }
- // return objJsonResult;
- //}
- //#endregion
-
-
- //#region [妯″叿鐐规璁″垝琛ㄥ垹闄ゅ姛鑳絔
- ///// <summary>
- ///// 妯″叿缁翠慨鍗曞垹闄ゅ姛鑳�
- ///// </summary>
- ///// <returns></returns>
- //[Route("Sc_MouldDotCheckPlanBill/DeltetSc_MouldDotCheckPlanBillBill")]
- //[HttpGet]
- //public object DeltetSc_MouldDotCheckPlanBillBill(string HInterID)
- //{
- // //缂栬緫鏉冮檺
- // //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
- // //{
- // // objJsonResult.code = "0";
- // // objJsonResult.count = 0;
- // // objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
- // // objJsonResult.data = null;
- // // return objJsonResult;
- // //}
-
-
- // Int64 lngBillKey = 0;
- // lngBillKey = DBUtility.ClsPub.isLong(HInterID);
- // if (lngBillKey == 0)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁ID涓虹┖锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // DAL.ClsSc_MouldDotCheckPlanBill oBill = new DAL.ClsSc_MouldDotCheckPlanBill();
- // if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
- // {
- // if (oBill.omodel.HBillStatus > 1)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁褰撳墠澶勪簬涓嶈兘鍒犻櫎鐘舵��,涓嶈兘鍒犻櫎锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // if (oBill.omodel.HChecker != "")
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
-
- // bool IsDete = oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
- // if (IsDete)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // else
- // {
-
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // }
- // else
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁鏈壘鍒�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- //}
- //#endregion
-
-
- //#endregion
-
-
-
- //#region 妯″叿鎶ュ簾鍏ュ簱鍗�
-
-
-
- //#region[妯″叿鎶ュ簾鍏ュ簱鍗曠紪杈戞椂鑾峰彇琛ㄥご鏁版嵁]
- //[Route("Sc_MouldScrapInHouseBill/Sc_MouldScrapInHouseBillListCheckDetai")]
- //[HttpGet]
- //public ApiResult<DataSet> Sc_MouldScrapInHouseBillListCheckDetai(string HID)
- //{
- // if (string.IsNullOrEmpty(HID))
- // return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
- // SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
-
- // var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sc_MouldScrapInHouseBillList where hmainid= " + HID + " ", "h_v_Sc_MouldScrapInHouseBillList");
- // if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
- // return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄧ淮淇崟鍙�" };
-
- // return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
- //}
- //#endregion
-
- //#region[妯″叿鎶ュ簾鍏ュ簱鍗曠紪杈戞椂鑾峰彇琛ㄤ綋鏁版嵁]
- //[Route("Sc_MouldScrapInHouseBill/Sc_MouldScrapInHouseBillListProjectDetai")]
- //[HttpGet]
- //public object Sc_MouldScrapInHouseBillListProjectDetai(string sqlWhere)
- //{
- // DataSet ds;
- // try
- // {
- // SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- // if (sqlWhere == null || sqlWhere.Equals(""))
- // {
- // ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID,妯″叿浠ｇ爜 HMaterCode,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,HPropertyID,杈呭姪灞炴�т唬鐮� HPropertyCode,杈呭姪灞炴�у悕绉� HPropertyName,
- // HSecUnitID, 杈呭姪璁￠噺鍗曚綅浠ｇ爜 HSecUnitCode, 杈呭姪璁￠噺鍗曚綅鍚嶇О HSecUnitName, HUnitID, 璁￠噺鍗曚綅浠ｇ爜 HUnitCode, 璁￠噺鍗曚綅鍚嶇О HUnitName, 鎵规 HBatchNo,
- // 璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 浣跨敤瀵垮懡 HUseLife, 瀹炴敹鏁伴噺 HQty, 鍗曚环 HPrice, 閲戦 HMoney, HWHID, 鏀舵枡浠撳簱浠ｇ爜 HWHCode, 鏀舵枡浠撳簱鍚嶇О HWHName,
- // HSPID, 浠撲綅浠ｇ爜 HSPCode, 浠撲綅鍚嶇О HSPName, 澶囨敞 HRemark
- // FROM h_v_Sc_MouldScrapInHouseBillList"), "h_v_Sc_MouldScrapInHouseBillList");
-
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
- // objJsonResult.data = ds.Tables[0];
- // }
- // else
- // {
-
- // //string sql1 = "select HRepairCheckID,HRepairCheckContent,HManagerID,HRemark from Sc_MouldRepairCheckBillSub where 1 = 1 ";
- // string sql1 = string.Format(@"SELECT HMaterID,妯″叿浠ｇ爜 HMaterCode,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,HPropertyID,杈呭姪灞炴�т唬鐮� HPropertyCode,杈呭姪灞炴�у悕绉� HPropertyName,
- // HSecUnitID, 杈呭姪璁￠噺鍗曚綅浠ｇ爜 HSecUnitCode, 杈呭姪璁￠噺鍗曚綅鍚嶇О HSecUnitName, HUnitID, 璁￠噺鍗曚綅浠ｇ爜 HUnitCode, 璁￠噺鍗曚綅鍚嶇О HUnitName, 鎵规 HBatchNo,
- // 璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 浣跨敤瀵垮懡 HUseLife, 瀹炴敹鏁伴噺 HQty, 鍗曚环 HPrice, 閲戦 HMoney, HWHID, 鏀舵枡浠撳簱浠ｇ爜 HWHCode, 鏀舵枡浠撳簱鍚嶇О HWHName,
- // HSPID, 浠撲綅浠ｇ爜 HSPCode, 浠撲綅鍚嶇О HSPName, 澶囨敞 HRemark
- // FROM h_v_Sc_MouldScrapInHouseBillList where 1 = 1 ");
- // string sql = sql1 + sqlWhere;
- // ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldScrapInHouseBillList");
-
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
- // objJsonResult.data = ds.Tables[0];
- // }
- // }
- // catch (Exception e)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
- // objJsonResult.data = null;
- // }
- // return objJsonResult;
- //}
- //#endregion
-
- //#region 妯″叿鎶ュ簾鍏ュ簱鍗曚繚瀛�/缂栬緫
- ///// <summary>
- ///// 淇濆瓨妯″叿鎶ュ簾鍏ュ簱鍗�
- ///// </summary>
- ///// <param name="msg"></param>
- ///// <returns></returns>
- //[Route("Sc_MouldScrapInHouseBill/SaveGetMouldScrapInHouseBillList")]
- //[HttpPost]
- //public object SaveGetMouldScrapInHouseBillList([FromBody] JObject msg)
- //{
- // var _value = msg["msg"].ToString();
- // string msg1 = _value.ToString();
- // string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
- // string msg2 = sArray[0].ToString();
- // string msg3 = sArray[1].ToString();
- // string refSav = sArray[2].ToString();
-
- // string UserName = "";
- // string s = "";
- // ListModels oListModels = new ListModels();
- // try
- // {
- // DLL.ClsSc_MouldScrapInBill oBill = new DLL.ClsSc_MouldScrapInBill();
- // List<Models.ClsSc_MouldStockBillMain> lsmain = new List<Models.ClsSc_MouldStockBillMain>();
- // msg2 = msg2.Replace("\\", "");
- // msg2 = msg2.Replace("\n", ""); //\n
- // lsmain = oListModels.getObjectByJson_Gy_MouldScrapInHouseBillMain(msg2);
- // foreach (Models.ClsSc_MouldStockBillMain oItem in lsmain)
- // {
- // if (refSav == "Add")
- // {
- // //鍗曟嵁鍙锋槸鍚﹂噸澶�
- // if (BillNew0.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld0.omodel.HInterID))
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒涓嶅厑璁镐繚瀛橈紒";
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- // }
- // if (refSav == "Update")
- // {
- // if (BillOld0.ShowBill(oItem.HInterID, ref s) == false)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "姝ゅ崟鎹湁璇紒";
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- // //鍒ゆ柇鏄惁鍙紪杈�
- // if (BillOld0.omodel.HChecker != "" && BillOld0.omodel.HChecker != null)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽淇敼锛�";
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- // if (BillOld0.omodel.HBillStatus > 1)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "姝ゅ崟鎹浜庝笉鍙紪杈戠姸鎬侊紝涓嶅厑璁镐慨鏀癸紒";
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- // if (!DBUtility.Xt_BaseBillFun.Fun_AllowEditBill(BillOld0, ref s))
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = s + "锛屼笉鍏佽淇敼";
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- // }
- // //oItem.HMaker = "";
- // UserName = oItem.HMaker; //鍒跺崟浜�
- // oItem.HBillType = "3831";
- // oItem.HBillSubType = "3831";
- // //oItem.HBillNo = ""; //鍗曟嵁鍙�
- // //oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡
- // //oItem.HInnerBillNo = ""; // --鍐呴儴鍗曟嵁鍙�
- // oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
- // oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
- // //oItem.HEquipID = 0; //璁惧ID(Gy_EquipMent)
- // //oItem.HPeriod = 0;
- // //oItem.HCheckBeginDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd")); // --缁翠慨鏃ユ湡
- // //oItem.HCheckResult = ""; //楠屾敹缁撹--(姝ｅ父锛屽紓甯�)
- // //oItem.HEmpID = 0; //楠屾敹浜�(Gy_Employee)
- // //oItem.HManagerID = 0; //璐熻矗浜�(Gy_Employee)
- // //oItem.HDeptID = 0; //楠屾敹閮ㄩ棬(Gy_Department)
- // //oItem.HExplanation = ""; //鎽樿(鏁呴殰鎻忚堪)
- // //oItem.HRemark = ""; //澶囨敞
-
- // //oItem.HMainSourceInterID = oItem.HInterID;
-
- // //oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
- // if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- // oBill.omodel = oItem;
- // }
- // //琛ㄤ綋鏁版嵁
- // //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
- // msg3 = msg3.Substring(1, msg3.Length - 2);
- // msg3 = msg3.Replace("\\", "");
- // msg3 = msg3.Replace("\n", ""); //\n
- // //msg2 = msg2.Replace("'", "鈥�");
- // List<Models.ClsSc_MouldStockBillSub> ls = new List<Models.ClsSc_MouldStockBillSub>();
- // ls = oListModels.getObjectByJson_Gy_MouldScrapInHouseBillSub(msg3);
- // int i = 0;
- // foreach (Models.ClsSc_MouldStockBillSub oItemSub in ls)
- // {
-
- // i++;
- // oItemSub.HEntryID = i;
-
- // //oItemSub.HRepairCheckID = 0; //楠屾敹椤圭洰ID
- // //oItemSub.HRepairCheckContent = ""; //楠屾敹鍐呭
- // //oItemSub.HManagerID = 0; //璐熻矗浜篒D
- // //oItemSub.HCloseMan = ""; //琛屽叧闂�
- // oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
- // oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
- // //oItemSub.HRemark = ""; //澶囨敞
- // oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
- // oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
- // //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
- // //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
- // //oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
- // //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
- // //oItemSub.HRepairID = 0; //缁翠慨椤圭洰
- // //oItemSub.HRepairExplanation =""; //缁翠慨瑕佹眰
- // //oItemSub.HMoney = 0; //缁翠慨璐圭敤
- // oBill.DetailColl.Add(oItemSub);
-
- // }
- // //淇濆瓨
- // //淇濆瓨瀹屾瘯鍚庡鐞�
- // bool bResult;
- // if (oBill.omodel.HInterID == 0)
- // {
- // // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
- // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
- // }
- // else
- // {
- // bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
- // }
- // if (bResult)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
- // //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- // else
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- // }
- // catch (Exception e)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- //}
- //#endregion
-
-
-
-
- //#region 妯″叿鎶ュ簾鍏ュ簱鍗曚繚瀛�
-
- //[Route("Sc_MouldScrapInHouseBill/SaveGetMouldScrapInHouseBillList_PDA")]
- //[HttpPost]
- //public object SaveGetMouldScrapInHouseBillList_PDA([FromBody] JObject msg)
- //{
- // var _value = msg["msg"].ToString();
- // string msg1 = _value.ToString();
- // string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
- // string msg2 = sArray[0].ToString();
-
- // string UserName = "";
-
- // ListModels oListModels = new ListModels();
- // try
- // {
- // DLL.ClsSc_MouldScrapInBill oBill = new DLL.ClsSc_MouldScrapInBill();
- // List<Models.ClsSc_MouldStockBillMain> lsmain = new List<Models.ClsSc_MouldStockBillMain>();
- // msg2 = msg2.Replace("\\", "");
- // msg2 = msg2.Replace("\n", ""); //\n
- // lsmain = oListModels.getObjectByJson_Gy_MouldScrapInHouseBillMain(msg2);
- // foreach (Models.ClsSc_MouldStockBillMain oItem in lsmain)
- // {
- // //鍗曟嵁鍙锋槸鍚﹂噸澶�
- // if (BillNew0.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld0.omodel.HInterID))
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒涓嶅厑璁镐繚瀛橈紒";
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
-
- // //oItem.HMaker = "";
- // UserName = oItem.HMaker; //鍒跺崟浜�
- // oItem.HBillType = "3831";
- // oItem.HBillSubType = "3831";
- // //oItem.HBillNo = ""; //鍗曟嵁鍙�
- // //oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡
- // //oItem.HInnerBillNo = ""; // --鍐呴儴鍗曟嵁鍙�
- // oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
- // oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
- // //oItem.HEquipID = 0; //璁惧ID(Gy_EquipMent)
- // //oItem.HPeriod = 0;
- // //oItem.HCheckBeginDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd")); // --缁翠慨鏃ユ湡
- // //oItem.HCheckResult = ""; //楠屾敹缁撹--(姝ｅ父锛屽紓甯�)
- // //oItem.HEmpID = 0; //楠屾敹浜�(Gy_Employee)
- // //oItem.HManagerID = 0; //璐熻矗浜�(Gy_Employee)
- // //oItem.HDeptID = 0; //楠屾敹閮ㄩ棬(Gy_Department)
- // //oItem.HExplanation = ""; //鎽樿(鏁呴殰鎻忚堪)
- // //oItem.HRemark = ""; //澶囨敞
-
- // //oItem.HMainSourceInterID = oItem.HInterID;
-
- // //oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
- // if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- // oBill.omodel = oItem;
- // }
- // //瀛愯〃浣撴暟鎹�
-
- // List<Models.ClsSc_MouldStockBillSub> ls = new List<Models.ClsSc_MouldStockBillSub>();
- // ls = oListModels.getObjectByJson_Gy_MouldScrapInHouseBillSub(msg2);
- // int i = 0;
- // foreach (Models.ClsSc_MouldStockBillSub oItemSub in ls)
- // {
-
- // i++;
- // oItemSub.HEntryID = i;
-
- // //oItemSub.HRepairCheckID = 0; //楠屾敹椤圭洰ID
- // //oItemSub.HRepairCheckContent = ""; //楠屾敹鍐呭
- // //oItemSub.HManagerID = 0; //璐熻矗浜篒D
- // //oItemSub.HCloseMan = ""; //琛屽叧闂�
- // oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
- // oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
- // //oItemSub.HRemark = ""; //澶囨敞
- // oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
- // oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
- // //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
- // //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
- // //oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
- // //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
- // //oItemSub.HRepairID = 0; //缁翠慨椤圭洰
- // //oItemSub.HRepairExplanation =""; //缁翠慨瑕佹眰
- // //oItemSub.HMoney = 0; //缁翠慨璐圭敤
- // oBill.DetailColl.Add(oItemSub);
-
- // }
- // //淇濆瓨
- // //淇濆瓨瀹屾瘯鍚庡鐞�
- // bool bResult;
- // if (oBill.omodel.HInterID == 0)
- // {
- // // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
- // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
- // }
- // else
- // {
- // bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
- // }
- // if (bResult)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
- // //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- // else
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- // }
- // catch (Exception e)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- //}
- //#endregion
-
- //#endregion
-
- //#region 妯″叿澶勭悊鍑哄簱鍗�
-
- //#region 妯″叿澶勭悊鍑哄簱鍗曞垪琛�
-
- //[Route("Sc_MouldScrapOutHouseBill/GetMouldScrapOutHouseBill")]
- //[HttpGet]
- //public object GetMouldScrapOutHouseBill(string sWhere)
- //{
- // try
- // {
-
- // ds = Sc_GetMouldScrapOutHouseBill(sWhere);
- // objJsonResult.code = "1";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- // objJsonResult.data = ds.Tables[0];
- // return objJsonResult;
- // }
- // catch (Exception ex)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- //}
-
- //public static DataSet Sc_GetMouldScrapOutHouseBill(string sWhere)
- //{
- // if (sWhere == null || sWhere.Equals(""))
- // {
- // return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldScrapOutHouseBillList ", "h_v_Sc_MouldScrapOutHouseBillList");
- // }
- // else
- // {
- // string sql1 = "select * from h_v_Sc_MouldScrapOutHouseBillList where 1 = 1 ";
- // string sql = sql1 + sWhere;
- // return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldScrapOutHouseBillList");
- // }
- //}
-
- //#endregion
-
- //#region[妯″叿澶勭悊鍑哄簱鍗曠紪杈戞椂鑾峰彇琛ㄥご鏁版嵁]
- //[Route("Sc_MouldScrapOutHouseBill/Sc_MouldScrapOutHouseBillListCheckDetai")]
- //[HttpGet]
- //public ApiResult<DataSet> Sc_MouldScrapOutHouseBillListCheckDetai(string HID)
- //{
- // if (string.IsNullOrEmpty(HID))
- // return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
- // SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
-
- // var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sc_MouldScrapOutHouseBillList where hmainid= " + HID + " ", "h_v_Sc_MouldScrapOutHouseBillList");
- // if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
- // return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄧ淮淇崟鍙�" };
-
- // return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
- //}
- //#endregion
-
- //#region[妯″叿澶勭悊鍑哄簱鍗曠紪杈戞椂鑾峰彇琛ㄤ綋鏁版嵁]
- //[Route("Sc_MouldScrapOutHouseBill/Sc_MouldScrapOutHouseBillListProjectDetai")]
- //[HttpGet]
- //public object Sc_MouldScrapOutHouseBillListProjectDetai(string sqlWhere)
- //{
- // DataSet ds;
- // try
- // {
- // SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- // if (sqlWhere == null || sqlWhere.Equals(""))
- // {
- // ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID,妯″叿浠ｇ爜 HMaterCode,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,HPropertyID,杈呭姪灞炴�т唬鐮� HPropertyCode,杈呭姪灞炴�у悕绉� HPropertyName,
- // HSecUnitID, 杈呭姪璁￠噺鍗曚綅浠ｇ爜 HSecUnitCode, 杈呭姪璁￠噺鍗曚綅鍚嶇О HSecUnitName, 鎹㈢畻鐜� HSecUnitRate, HUnitID, 璁￠噺鍗曚綅浠ｇ爜 HUnitCode, 璁￠噺鍗曚綅鍚嶇О HUnitName, 鎵规 HBatchNo,
- // 璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 浣跨敤瀵垮懡 HUseLife, 瀹炲彂鏁伴噺 HQty, 鍗曚环 HPrice, 閲戦 HMoney, HWHID, 鍙戣揣浠撳簱浠ｇ爜 HWHCode, 鍙戣揣浠撳簱鍚嶇О HWHName,
- // HSPID, 浠撲綅浠ｇ爜 HSPCode, 浠撲綅鍚嶇О HSPName, 澶囨敞 HRemark FROM h_v_Sc_MouldScrapOutHouseBillList"), "h_v_Sc_MouldScrapOutHouseBillList");
-
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
- // objJsonResult.data = ds.Tables[0];
- // }
- // else
- // {
-
- // //string sql1 = "select HRepairCheckID,HRepairCheckContent,HManagerID,HRemark from Sc_MouldRepairCheckBillSub where 1 = 1 ";
- // string sql1 = string.Format(@"SELECT HMaterID,妯″叿浠ｇ爜 HMaterCode,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,HPropertyID,杈呭姪灞炴�т唬鐮� HPropertyCode,杈呭姪灞炴�у悕绉� HPropertyName,
- // HSecUnitID, 杈呭姪璁￠噺鍗曚綅浠ｇ爜 HSecUnitCode, 杈呭姪璁￠噺鍗曚綅鍚嶇О HSecUnitName, 鎹㈢畻鐜� HSecUnitRate, HUnitID, 璁￠噺鍗曚綅浠ｇ爜 HUnitCode, 璁￠噺鍗曚綅鍚嶇О HUnitName, 鎵规 HBatchNo,
- // 璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 浣跨敤瀵垮懡 HUseLife, 瀹炲彂鏁伴噺 HQty, 鍗曚环 HPrice, 閲戦 HMoney, HWHID, 鍙戣揣浠撳簱浠ｇ爜 HWHCode, 鍙戣揣浠撳簱鍚嶇О HWHName,
- // HSPID, 浠撲綅浠ｇ爜 HSPCode, 浠撲綅鍚嶇О HSPName, 澶囨敞 HRemark FROM h_v_Sc_MouldScrapOutHouseBillList where 1 = 1 ");
- // string sql = sql1 + sqlWhere;
- // ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldScrapOutHouseBillList");
-
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
- // objJsonResult.data = ds.Tables[0];
- // }
- // }
- // catch (Exception e)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
- // objJsonResult.data = null;
- // }
- // return objJsonResult;
- //}
- //#endregion
-
- //#region 妯″叿澶勭悊鍑哄簱鍗曚繚瀛�/缂栬緫
- ///// <summary>
- ///// 淇濆瓨妯″叿澶勭悊鍑哄簱鍗�
- ///// </summary>
- ///// <param name="msg"></param>
- ///// <returns></returns>
- //[Route("Sc_MouldScrapOutHouseBill/SaveGetMouldScrapOutHouseBillList")]
- //[HttpPost]
- //public object SaveGetMouldScrapOutHouseBillList([FromBody] JObject msg)
- //{
- // var _value = msg["msg"].ToString();
- // string msg1 = _value.ToString();
- // string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
- // string msg2 = sArray[0].ToString();
- // string msg3 = sArray[1].ToString();
-
-
- // string UserName = "";
- // ListModels oListModels = new ListModels();
- // try
- // {
- // DLL.ClsSc_MouldScrapOutBill oBill = new DLL.ClsSc_MouldScrapOutBill();
- // List<Model.ClsSc_MouldStockBillMain> lsmain = new List<Model.ClsSc_MouldStockBillMain>();
- // msg2 = msg2.Replace("\\", "");
- // msg2 = msg2.Replace("\n", ""); //\n
- // lsmain = oListModels.getObjectByJson_Gy_MouldScrapOutHouseBillMain(msg2);
- // foreach (Model.ClsSc_MouldStockBillMain oItem in lsmain)
- // {
- // //oItem.HMaker = "";
- // UserName = oItem.HMaker; //鍒跺崟浜�
- // oItem.HBillType = "3832";
- // oItem.HBillSubType = "3832";
- // //oItem.HBillNo = ""; //鍗曟嵁鍙�
- // //oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡
- // //oItem.HInnerBillNo = ""; // --鍐呴儴鍗曟嵁鍙�
- // oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
- // oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
- // //oItem.HEquipID = 0; //璁惧ID(Gy_EquipMent)
- // //oItem.HPeriod = 0;
- // //oItem.HCheckBeginDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd")); // --缁翠慨鏃ユ湡
- // //oItem.HCheckResult = ""; //楠屾敹缁撹--(姝ｅ父锛屽紓甯�)
- // //oItem.HEmpID = 0; //楠屾敹浜�(Gy_Employee)
- // //oItem.HManagerID = 0; //璐熻矗浜�(Gy_Employee)
- // //oItem.HDeptID = 0; //楠屾敹閮ㄩ棬(Gy_Department)
- // //oItem.HExplanation = ""; //鎽樿(鏁呴殰鎻忚堪)
- // //oItem.HRemark = ""; //澶囨敞
-
- // //oItem.HMainSourceInterID = oItem.HInterID;
-
- // //oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
- // if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- // oBill.omodel = oItem;
- // }
- // //琛ㄤ綋鏁版嵁
- // //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
- // msg3 = msg3.Substring(1, msg3.Length - 2);
- // msg3 = msg3.Replace("\\", "");
- // msg3 = msg3.Replace("\n", ""); //\n
- // //msg2 = msg2.Replace("'", "鈥�");
- // List<Model.ClsSc_MouldStockBillSub> ls = new List<Model.ClsSc_MouldStockBillSub>();
- // ls = oListModels.getObjectByJson_Gy_MouldScrapOutHouseBillSub(msg3);
- // int i = 0;
- // foreach (Model.ClsSc_MouldStockBillSub oItemSub in ls)
- // {
-
- // i++;
- // oItemSub.HEntryID = i;
-
- // //oItemSub.HRepairCheckID = 0; //楠屾敹椤圭洰ID
- // //oItemSub.HRepairCheckContent = ""; //楠屾敹鍐呭
- // //oItemSub.HManagerID = 0; //璐熻矗浜篒D
- // //oItemSub.HCloseMan = ""; //琛屽叧闂�
- // oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
- // oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
- // //oItemSub.HRemark = ""; //澶囨敞
- // oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
- // oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
- // //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
- // //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
- // //oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
- // //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
- // //oItemSub.HRepairID = 0; //缁翠慨椤圭洰
- // //oItemSub.HRepairExplanation =""; //缁翠慨瑕佹眰
- // //oItemSub.HMoney = 0; //缁翠慨璐圭敤
- // oBill.DetailColl.Add(oItemSub);
-
- // }
- // //淇濆瓨
- // //淇濆瓨瀹屾瘯鍚庡鐞�
- // bool bResult;
- // if (oBill.omodel.HInterID == 0)
- // {
- // // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
- // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
- // }
- // else
- // {
- // bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
- // }
- // if (bResult)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
- // //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- // else
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- // }
- // catch (Exception e)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- //}
- //#endregion
-
- //#region [妯″叿澶勭悊鍑哄簱鍗曞垹闄ゅ姛鑳絔
- ///// <summary>
- ///// 妯″叿澶勭悊鍑哄簱搴撳崟鍒犻櫎鍔熻兘
- ///// </summary>
- ///// <returns></returns>
- //[Route("Sc_MouldScrapOutHouseBill/DeltetMouldScrapOutHouseBill")]
- //[HttpGet]
- //public object DeltetMouldScrapOutHouseBill(string HInterID)
- //{
- // //缂栬緫鏉冮檺
- // //if (!DBUtility.ClsPub.Security_Log("Sc_MouldScrapOutBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
- // //{
- // // objJsonResult.code = "0";
- // // objJsonResult.count = 0;
- // // objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
- // // objJsonResult.data = null;
- // // return objJsonResult;
- // //}
-
-
- // Int64 lngBillKey = 0;
- // lngBillKey = DBUtility.ClsPub.isLong(HInterID);
- // if (lngBillKey == 0)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁ID涓虹┖锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // DAL.ClsSc_MouldScrapInBill oBill = new DAL.ClsSc_MouldScrapInBill();
- // if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
- // {
- // if (oBill.omodel.HBillStatus > 1)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁褰撳墠澶勪簬涓嶈兘鍒犻櫎鐘舵��,涓嶈兘鍒犻櫎锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // if (oBill.omodel.HChecker != "")
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
-
- // bool IsDete = oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
- // if (IsDete)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // else
- // {
-
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // }
- // else
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁鏈壘鍒�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- //}
- //#endregion
-
- //#region [妯″叿澶勭悊鍑哄簱鍗曞鏍搞�佸弽瀹℃牳]
- ///// <summary>
- /////
- ///// </summary>
- ///// <param name="HInterID">鍗曟嵁ID</param>
- ///// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
- ///// <param name="CurUserName">瀹℃牳浜�</param>
- ///// <returns></returns>
- //[Route("Sc_MouldScrapOutHouseBill/AuditMouldScrapOutList")]
- //[HttpGet]
- //public object AuditMouldScrapOutList(int HInterID, int IsAudit, string CurUserName)
- //{
- // string ModRightNameCheck = "Sc_MouldScrapOutBill_Check";
- // DBUtility.ClsPub.CurUserName = CurUserName;
- // try
- // {
- // //瀹℃牳鏉冮檺
- // if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // if (HInterID <= 0)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "HInterID灏忎簬0锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // Int64 lngBillKey = 0;
- // lngBillKey = DBUtility.ClsPub.isLong(HInterID);
- // DLL.ClsSc_MouldScrapOutBill oBill = new DLL.ClsSc_MouldScrapOutBill();
- // //鏌ョ湅鏄惁宸插鏍�,鍏抽棴,浣滃簾
- // if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
- // {
- // if (oBill.omodel.HCloseMan.Trim() != "")
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆瀹℃牳锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // if (oBill.omodel.HDeleteMan.Trim() != "")
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘鍐嶆瀹℃牳锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // if (IsAudit == 0) //瀹℃牳鍒ゆ柇
- // {
- // if (oBill.omodel.HChecker.Trim() != "")
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // }
- // if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
- // {
- // if (oBill.omodel.HChecker.Trim() == "")
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // }
- // }
- // else
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // if (IsAudit == 0) //瀹℃牳鎻愪氦
- // {
- // //瀹℃牳鎻愪氦
- // if (oBill.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
- // {
- // objJsonResult.code = "1";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "瀹℃牳鎴愬姛";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // else
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // }
- // if (IsAudit == 1) //鍙嶅鏍告彁浜�
- // {
- // //鍙嶅鏍告彁浜bandonCheck
- // if (oBill.AbandonCheck(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
- // {
- // objJsonResult.code = "1";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "鍙嶅鏍告垚鍔�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // else
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // }
- // return objJsonResult;
- // }
- // catch (Exception e)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString();
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- //}
- //#endregion
-
- //#endregion
-
#region 鍣ㄥ叿鏀瑰埗鍏ュ簱鍗�
#region 鍣ㄥ叿鏀瑰埗鍏ュ簱鍗曟嵁缁存姢鍒楄〃
@@ -5094,663 +964,6 @@
#endregion
#endregion
- //#region 妯″叿棰嗙敤鍗�
-
- //#region 妯″叿棰嗙敤鍗曞垪琛�
-
- //[Route("Sc_MouldProdOutBill/GetMouldProdOutBill")]
- //[HttpGet]
- //public object GetMouldProdOutBill(string sWhere)
- //{
- // try
- // {
-
- // ds = Sc_GetMouldProdOutBill(sWhere);
- // objJsonResult.code = "1";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- // objJsonResult.data = ds.Tables[0];
- // return objJsonResult;
- // }
- // catch (Exception ex)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- //}
-
- //public static DataSet Sc_GetMouldProdOutBill(string sWhere)
- //{
- // if (sWhere == null || sWhere.Equals(""))
- // {
- // return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldProdOutHouseBillList ", "h_v_Sc_MouldProdOutHouseBillList");
- // }
- // else
- // {
- // string sql1 = "select * from h_v_Sc_MouldProdOutHouseBillList where 1 = 1 ";
- // string sql = sql1 + sWhere;
- // return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldProdOutHouseBillList");
- // }
-
- //}
-
- //#endregion
-
- //#region[妯″叿棰嗙敤鍗曠紪杈戞椂鑾峰彇琛ㄥご鏁版嵁]
- //[Route("Sc_MouldProdOutBill/Sc_MouldProdOutBillListCheckDetai")]
- //[HttpGet]
- //public ApiResult<DataSet> Sc_MouldProdOutBillListCheckDetai(string HID)
- //{
- // if (string.IsNullOrEmpty(HID))
- // return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
- // SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
-
- // var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sc_MouldProdOutHouseBillList where hmainid= " + HID + " ", "h_v_Sc_MouldProdOutHouseBillList");
- // if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
- // return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄩ��搴撳崟鍙�" };
-
- // return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
- //}
- //#endregion
-
- //#region[妯″叿棰嗙敤鍗曠紪杈戞椂鑾峰彇琛ㄤ綋鏁版嵁]
- //[Route("Sc_MouldProdOutBill/Sc_MouldProdOutBillListProjectDetai")]
- //[HttpGet]
- //public object Sc_MouldProdOutBillListProjectDetai(string sqlWhere)
- //{
- // DataSet ds;
- // try
- // {
- // SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- // if (sqlWhere == null || sqlWhere.Equals(""))
- // {
- // ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID,妯″叿浠ｇ爜 HMaterCode,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,鎵规 HBatchNo,
- // 璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 绱Н浣跨敤瀵垮懡 HUseLife, 搴斿彂鏁伴噺 HQtyMust, 瀹炲彂鏁伴噺 HQty,
- // 鍗曚环 HPrice, 閲戦 HMoney,HWHSonID HWHID, 鍙戞枡浠撳簱浠ｇ爜 HWHCode, 鍙戞枡浠撳簱 HWHName,HSPID,
- // 浠撲綅浠ｇ爜 HSPCode, 浠撲綅 HSPName,琛ㄤ綋澶囨敞 HRemark FROM h_v_Sc_MouldProdOutHouseBillList"), "h_v_Sc_MouldProdOutHouseBillList");
-
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
- // objJsonResult.data = ds.Tables[0];
- // }
- // else
- // {
-
- // //string sql1 = "select HRepairCheckID,HRepairCheckContent,HManagerID,HRemark from Sc_MouldRepairCheckBillSub where 1 = 1 ";
- // string sql1 = string.Format(@"SELECT HMaterID,妯″叿浠ｇ爜 HMaterCode,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,鎵规 HBatchNo,
- // 璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 绱Н浣跨敤瀵垮懡 HUseLife, 搴斿彂鏁伴噺 HQtyMust, 瀹炲彂鏁伴噺 HQty,
- // 鍗曚环 HPrice, 閲戦 HMoney,HWHSonID HWHID, 鍙戞枡浠撳簱浠ｇ爜 HWHCode, 鍙戞枡浠撳簱 HWHName,HSPID,
- // 浠撲綅浠ｇ爜 HSPCode, 浠撲綅 HSPName,琛ㄤ綋澶囨敞 HRemark FROM h_v_Sc_MouldProdOutHouseBillList where 1 = 1 ");
- // string sql = sql1 + sqlWhere;
- // ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldProdOutHouseBillList");
-
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
- // objJsonResult.data = ds.Tables[0];
- // }
- // }
- // catch (Exception e)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
- // objJsonResult.data = null;
- // }
- // return objJsonResult;
- //}
- //#endregion
-
- //#region 妯″叿棰嗙敤鍗曚繚瀛�/缂栬緫
- ///// <summary>
- ///// 淇濆瓨妯″叿棰嗙敤鍗�
- ///// </summary>
- ///// <param name="msg"></param>
- ///// <returns></returns>
- //[Route("Sc_MouldProdOutBill/SaveGetMouldProdOutBillList")]
- //[HttpPost]
- //public object SaveGetMouldProdOutBillList([FromBody] JObject msg)
- //{
- // var _value = msg["msg"].ToString();
- // string msg1 = _value.ToString();
- // string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
- // string msg2 = sArray[0].ToString();
- // string msg3 = sArray[1].ToString();
-
-
- // string UserName = "";
- // ListModels oListModels = new ListModels();
- // try
- // {
- // DLL.ClsSc_MouldProdOutBill oBill = new DLL.ClsSc_MouldProdOutBill();
- // List<Model.ClsSc_MouldProdOutBillMain> lsmain = new List<Model.ClsSc_MouldProdOutBillMain>();
- // msg2 = msg2.Replace("\\", "");
- // msg2 = msg2.Replace("\n", ""); //\n
- // lsmain = oListModels.getObjectByJson_Gy_MouldProdOutBillMain(msg2);
- // foreach (Model.ClsSc_MouldProdOutBillMain oItem in lsmain)
- // {
- // //oItem.HMaker = "";
- // UserName = oItem.HMaker; //鍒跺崟浜�
- // oItem.HBillType = "3802";
- // oItem.HBillSubType = "3802";
- // //oItem.HBillNo = ""; //鍗曟嵁鍙�
- // //oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡
- // //oItem.HInnerBillNo = ""; // --鍐呴儴鍗曟嵁鍙�
- // oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
- // oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
- // //oItem.HEquipID = 0; //璁惧ID(Gy_EquipMent)
- // //oItem.HPeriod = 0;
- // //oItem.HCheckBeginDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd")); // --缁翠慨鏃ユ湡
- // //oItem.HCheckResult = ""; //楠屾敹缁撹--(姝ｅ父锛屽紓甯�)
- // //oItem.HEmpID = 0; //楠屾敹浜�(Gy_Employee)
- // //oItem.HManagerID = 0; //璐熻矗浜�(Gy_Employee)
- // //oItem.HDeptID = 0; //楠屾敹閮ㄩ棬(Gy_Department)
- // //oItem.HExplanation = ""; //鎽樿(鏁呴殰鎻忚堪)
- // //oItem.HRemark = ""; //澶囨敞
-
- // //oItem.HMainSourceInterID = oItem.HInterID;
-
- // //oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
- // if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- // oBill.omodel = oItem;
- // }
- // //琛ㄤ綋鏁版嵁
- // //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
- // msg3 = msg3.Substring(1, msg3.Length - 2);
- // msg3 = msg3.Replace("\\", "");
- // msg3 = msg3.Replace("\n", ""); //\n
- // //msg2 = msg2.Replace("'", "鈥�");
- // List<Model.ClsSc_MouldStockBillSub> ls = new List<Model.ClsSc_MouldStockBillSub>();
- // ls = oListModels.getObjectByJson_Gy_MouldStockBillSub(msg3);
- // int i = 0;
- // foreach (Model.ClsSc_MouldStockBillSub oItemSub in ls)
- // {
-
- // i++;
- // oItemSub.HEntryID = i;
-
- // //oItemSub.HRepairCheckID = 0; //楠屾敹椤圭洰ID
- // //oItemSub.HRepairCheckContent = ""; //楠屾敹鍐呭
- // //oItemSub.HManagerID = 0; //璐熻矗浜篒D
- // //oItemSub.HCloseMan = ""; //琛屽叧闂�
- // oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
- // oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
- // //oItemSub.HRemark = ""; //澶囨敞
- // oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
- // oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
- // //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
- // //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
- // //oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
- // //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
- // //oItemSub.HRepairID = 0; //缁翠慨椤圭洰
- // //oItemSub.HRepairExplanation =""; //缁翠慨瑕佹眰
- // //oItemSub.HMoney = 0; //缁翠慨璐圭敤
- // oBill.DetailColl.Add(oItemSub);
-
- // }
- // //淇濆瓨
- // //淇濆瓨瀹屾瘯鍚庡鐞�
- // bool bResult;
- // if (oBill.omodel.HInterID == 0)
- // {
- // // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
- // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
- // }
- // else
- // {
- // bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
- // }
- // if (bResult)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
- // //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- // else
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- // }
- // catch (Exception e)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- //}
- //#endregion
-
- //#region [妯″叿澶勭悊棰嗙敤鍗曞垹闄ゅ姛鑳絔
- ///// <summary>
- ///// 妯″叿澶勭悊棰嗙敤鍗曞垹闄ゅ姛鑳�
- ///// </summary>
- ///// <returns></returns>
- //[Route("Sc_MouldProdOutBill/DeltetMouldProdOutBill")]
- //[HttpGet]
- //public object DeltetMouldProdOutBill(string HInterID)
- //{
- // //缂栬緫鏉冮檺
- // //if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdBackBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
- // //{
- // // objJsonResult.code = "0";
- // // objJsonResult.count = 0;
- // // objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
- // // objJsonResult.data = null;
- // // return objJsonResult;
- // //}
-
-
- // Int64 lngBillKey = 0;
- // lngBillKey = DBUtility.ClsPub.isLong(HInterID);
- // if (lngBillKey == 0)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁ID涓虹┖锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // DLL.ClsSc_MouldProdOutBill oBill = new DLL.ClsSc_MouldProdOutBill();
- // if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
- // {
- // if (oBill.omodel.HBillStatus > 1)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁褰撳墠澶勪簬涓嶈兘鍒犻櫎鐘舵��,涓嶈兘鍒犻櫎锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // if (oBill.omodel.HChecker != "")
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
-
- // bool IsDete = oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
- // if (IsDete)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // else
- // {
-
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // }
- // else
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁鏈壘鍒�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- //}
- //#endregion
-
- //#endregion
-
- //#region 妯″叿瀵垮懡璋冩暣鍗�
-
- //#region 妯″叿瀵垮懡璋冩暣琛�
-
- //[Route("Sc_MouldLifeChangeBill/GetMouldLifeChangeBill")]
- //[HttpGet]
- //public object GetMouldLifeChangeBill(string sWhere)
- //{
- // try
- // {
-
- // ds = Sc_GetMouldLifeChangeBill(sWhere);
- // objJsonResult.code = "1";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
- // objJsonResult.data = ds.Tables[0];
- // return objJsonResult;
- // }
- // catch (Exception ex)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- //}
-
- //public static DataSet Sc_GetMouldLifeChangeBill(string sWhere)
- //{
- // if (sWhere == null || sWhere.Equals(""))
- // {
- // return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldLifeChangeBillList ", "h_v_Sc_MouldLifeChangeBillList");
- // }
- // else
- // {
- // string sql1 = "select * from h_v_Sc_MouldLifeChangeBillList where 1 = 1 ";
- // string sql = sql1 + sWhere;
- // return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldLifeChangeBillList");
- // }
-
- //}
-
- //#endregion
-
- //#region[妯″叿瀵垮懡璋冩暣鍗曠紪杈戞椂鑾峰彇琛ㄥご鏁版嵁]
- //[Route("Sc_MouldLifeChangeBill/Sc_GetMouldLifeChangeBillListCheckDetai")]
- //[HttpGet]
- //public ApiResult<DataSet> Sc_Sc_GetMouldLifeChangeBillListCheckDetai(string HID)
- //{
- // if (string.IsNullOrEmpty(HID))
- // return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
- // SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
-
- // var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sc_MouldLifeChangeBillList where hmainid= " + HID + " ", "h_v_Sc_MouldLifeChangeBillList");
- // if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
- // return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄩ��搴撳崟鍙�" };
-
- // return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
- //}
- //#endregion
-
- //#region[妯″叿瀵垮懡璋冩暣鍗曠紪杈戞椂鑾峰彇琛ㄤ綋鏁版嵁]
- //[Route("Sc_MouldLifeChangeBill/Sc_MouldLifeChangeBillListProjectDetai")]
- //[HttpGet]
- //public object Sc_MouldLifeChangeBillListProjectDetai(string sqlWhere)
- //{
- // DataSet ds;
- // try
- // {
- // SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- // if (sqlWhere == null || sqlWhere.Equals(""))
- // {
- // ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID,妯″叿浠ｇ爜 HMaterCode,妯″叿 HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,HPropertyID,杈呭姪灞炴�т唬鐮� HPropertyCode,杈呭姪灞炴�� HPropertyName,
- // HSecUnitID, 杈呭姪璁￠噺鍗曚綅浠ｇ爜 HSecUnitCode, 杈呭姪璁￠噺鍗曚綅 HSecUnitName,鎹㈢畻鐜� HSecUnitRate,
- // HUnitID, 璁￠噺鍗曚綅浠ｇ爜 HUnitCode, 璁￠噺鍗曚綅 HUnitName,
- // 璁捐瀵垮懡 HDesignLife, 鍘熷墿浣欏鍛� HLeaveLife, 鏂板墿浣欏鍛� HNewLife,琛ㄤ綋澶囨敞 HRemark
- // FROM h_v_Sc_MouldLifeChangeBillList_Edit"), "h_v_Sc_MouldLifeChangeBillList_Edit");
-
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
- // objJsonResult.data = ds.Tables[0];
- // }
- // else
- // {
-
- // //string sql1 = "select HRepairCheckID,HRepairCheckContent,HManagerID,HRemark from Sc_MouldRepairCheckBillSub where 1 = 1 ";
- // string sql1 = string.Format(@"SELECT HMaterID,妯″叿浠ｇ爜 HMaterCode,妯″叿 HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,HPropertyID,杈呭姪灞炴�т唬鐮� HPropertyCode,杈呭姪灞炴�� HPropertyName,
- // HSecUnitID, 杈呭姪璁￠噺鍗曚綅浠ｇ爜 HSecUnitCode, 杈呭姪璁￠噺鍗曚綅 HSecUnitName,鎹㈢畻鐜� HSecUnitRate,
- // HUnitID, 璁￠噺鍗曚綅浠ｇ爜 HUnitCode, 璁￠噺鍗曚綅 HUnitName,
- // 璁捐瀵垮懡 HDesignLife, 鍘熷墿浣欏鍛� HLeaveLife, 鏂板墿浣欏鍛� HNewLife,琛ㄤ綋澶囨敞 HRemark
- // FROM h_v_Sc_MouldLifeChangeBillList_Edit where 1 = 1 ");
- // string sql = sql1 + sqlWhere;
- // ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldLifeChangeBillList_Edit");
-
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
- // objJsonResult.data = ds.Tables[0];
- // }
- // }
- // catch (Exception e)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
- // objJsonResult.data = null;
- // }
- // return objJsonResult;
- //}
- //#endregion
-
- //#region 妯″叿瀵垮懡璋冩暣鍗曚繚瀛�/缂栬緫
- ///// <summary>
- ///// 淇濆瓨妯″叿棰嗙敤鍗�
- ///// </summary>
- ///// <param name="msg"></param>
- ///// <returns></returns>
- //[Route("Sc_MouldLifeChangeBill/SaveGetMouldLifeChangeBillList")]
- //[HttpPost]
- //public object SaveGetMouldLifeChangeBillList([FromBody] JObject msg)
- //{
- // var _value = msg["msg"].ToString();
- // string msg1 = _value.ToString();
- // string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
- // string msg2 = sArray[0].ToString();
- // string msg3 = sArray[1].ToString();
-
-
- // string UserName = "";
- // ListModels oListModels = new ListModels();
- // try
- // {
- // DLL.ClsSc_MouldLifeChangeBill oBill = new DLL.ClsSc_MouldLifeChangeBill();
- // List<Model.ClsSc_MouldLifeChangeBillMain> lsmain = new List<Model.ClsSc_MouldLifeChangeBillMain>();
- // msg2 = msg2.Replace("\\", "");
- // msg2 = msg2.Replace("\n", ""); //\n
- // lsmain = oListModels.getObjectByJson_Gy_MouldLifeChangeBillMain(msg2);
- // foreach (Model.ClsSc_MouldLifeChangeBillMain oItem in lsmain)
- // {
- // //oItem.HMaker = "";
- // UserName = oItem.HMaker; //鍒跺崟浜�
- // oItem.HBillType = "3824";
- // oItem.HBillSubType = "3824";
- // //oItem.HBillNo = ""; //鍗曟嵁鍙�
- // //oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡
- // //oItem.HInnerBillNo = ""; // --鍐呴儴鍗曟嵁鍙�
- // oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
- // oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
- // //oItem.HEquipID = 0; //璁惧ID(Gy_EquipMent)
- // //oItem.HPeriod = 0;
- // //oItem.HCheckBeginDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd")); // --缁翠慨鏃ユ湡
- // //oItem.HCheckResult = ""; //楠屾敹缁撹--(姝ｅ父锛屽紓甯�)
- // //oItem.HEmpID = 0; //楠屾敹浜�(Gy_Employee)
- // //oItem.HManagerID = 0; //璐熻矗浜�(Gy_Employee)
- // //oItem.HDeptID = 0; //楠屾敹閮ㄩ棬(Gy_Department)
- // //oItem.HExplanation = ""; //鎽樿(鏁呴殰鎻忚堪)
- // //oItem.HRemark = ""; //澶囨敞
-
- // //oItem.HMainSourceInterID = oItem.HInterID;
-
- // //oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
- // if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- // oBill.omodel = oItem;
- // }
- // //琛ㄤ綋鏁版嵁
- // //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
- // msg3 = msg3.Substring(1, msg3.Length - 2);
- // msg3 = msg3.Replace("\\", "");
- // msg3 = msg3.Replace("\n", ""); //\n
- // //msg2 = msg2.Replace("'", "鈥�");
- // List<Model.ClsSc_MouldLifeChangeBillSub> ls = new List<Model.ClsSc_MouldLifeChangeBillSub>();
- // ls = oListModels.getObjectByJson_Gy_MouldLifeChangeBillSub(msg3);
- // int i = 0;
- // foreach (Model.ClsSc_MouldLifeChangeBillSub oItemSub in ls)
- // {
-
- // i++;
- // oItemSub.HEntryID = i;
-
- // //oItemSub.HRepairCheckID = 0; //楠屾敹椤圭洰ID
- // //oItemSub.HRepairCheckContent = ""; //楠屾敹鍐呭
- // //oItemSub.HManagerID = 0; //璐熻矗浜篒D
- // //oItemSub.HCloseMan = ""; //琛屽叧闂�
- // oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
- // oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
- // //oItemSub.HRemark = ""; //澶囨敞
- // oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
- // oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
- // //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
- // //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
- // //oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
- // //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
- // //oItemSub.HRepairID = 0; //缁翠慨椤圭洰
- // //oItemSub.HRepairExplanation =""; //缁翠慨瑕佹眰
- // //oItemSub.HMoney = 0; //缁翠慨璐圭敤
- // oBill.DetailColl.Add(oItemSub);
-
- // }
- // //淇濆瓨
- // //淇濆瓨瀹屾瘯鍚庡鐞�
- // bool bResult;
- // if (oBill.omodel.HInterID == 0)
- // {
- // // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
- // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
- // }
- // else
- // {
- // bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
- // }
- // if (bResult)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
- // //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- // else
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- // }
- // catch (Exception e)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
- // objJsonResult.data = 1;
- // return objJsonResult;
- // }
- //}
- //#endregion
-
- //#region [妯″叿瀵垮懡璋冩暣鍗曞垹闄ゅ姛鑳絔
- ///// <summary>
- ///// 妯″叿澶勭悊棰嗙敤鍗曞垹闄ゅ姛鑳�
- ///// </summary>
- ///// <returns></returns>
- //[Route("Sc_MouldLifeChangeBill/DeltetMouldLifeChangeBill")]
- //[HttpGet]
- //public object DeltetMouldLifeChangeBill(string HInterID)
- //{
- // //缂栬緫鏉冮檺
- // //if (!DBUtility.ClsPub.Security_Log("Sc_MouldLifeChangeBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
- // //{
- // // objJsonResult.code = "0";
- // // objJsonResult.count = 0;
- // // objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
- // // objJsonResult.data = null;
- // // return objJsonResult;
- // //}
-
-
- // Int64 lngBillKey = 0;
- // lngBillKey = DBUtility.ClsPub.isLong(HInterID);
- // if (lngBillKey == 0)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁ID涓虹┖锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // DLL.ClsSc_MouldLifeChangeBill oBill = new DLL.ClsSc_MouldLifeChangeBill();
- // if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
- // {
- // if (oBill.omodel.HBillStatus > 1)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁褰撳墠澶勪簬涓嶈兘鍒犻櫎鐘舵��,涓嶈兘鍒犻櫎锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // if (oBill.omodel.HChecker != "")
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
-
- // bool IsDete = oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
- // if (IsDete)
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 1;
- // objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // else
- // {
-
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- // }
- // else
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁鏈壘鍒�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
- //}
- //#endregion
-
- //#endregion
}
}
#endregion
\ No newline at end of file
diff --git a/WebAPI/Controllers/Sc_EmployeeSignInNoteBillController.cs b/WebAPI/Controllers/Sc_EmployeeSignInNoteBillController.cs
new file mode 100644
index 0000000..9782b1f
--- /dev/null
+++ b/WebAPI/Controllers/Sc_EmployeeSignInNoteBillController.cs
@@ -0,0 +1,402 @@
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Pub_Class;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers
+{
+ public class Sc_EmployeeSignInNoteBillController : ApiController
+ {
+
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;//鍗曟嵁鐘舵�侊紙鏂板锛屼慨鏀癸紝娴忚锛屾洿鏂板崟浠凤紝鍙樻洿锛�
+ private json objJsonResult = new json();
+ public DataSet ds = new DataSet();
+ public DataSet ds1 = new DataSet();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+
+ #region 鍒嗛〉鍒楄〃
+ [Route("Sc_EmployeeSignInNoteBillController/GetListPage")]
+ [HttpGet]
+ public object GetListPage(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ if (!DBUtility.ClsPub.Security_Log("Gy_QCVerificationBillMain_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Sc_EmployeeSignInNoteBill order by 鍗曟嵁鍙� desc", "锘縣_v_Sc_EmployeeSignInNoteBill");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Sc_EmployeeSignInNoteBill where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by 鍗曟嵁鍙� desc";
+ ds = oCN.RunProcReturn(sql, "锘縣_v_Sc_EmployeeSignInNoteBill");
+ }
+
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
+ #region 鏍规嵁婧愬崟浼犵墿鏂欏垪琛�
+ [Route("WLYayBillController/GetMesByOrginBill_1")]
+ [HttpGet]
+ public object GetMesByOrginBill_1(string ListMaterial)
+ {
+ try
+ {
+ if (ListMaterial.EndsWith(";"))
+ {
+ ListMaterial = ListMaterial.Remove(ListMaterial.Length - 1);
+ }
+ ListMaterial = ListMaterial.Replace(';', ',');
+ List<object> columnNameList = new List<object>();
+
+
+
+ ds = oCN.RunProcReturn("select a.*,b.HUnitID from h_v_Gy_MaterialPackingRelationList_Edit a left JOIN Gy_Material b on a.HMaterID=b.HItemID where HDefaultSendPackFlag=1 and 瀹℃牳浜�='' and HMaterID in (" + ListMaterial + ")", "锘縣_v_Gy_MaterialPackingRelationList");
+
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
+ #region 淇濆瓨/缂栬緫
+
+ [Route("Sc_EmployeeSignInNoteBillController/SaveBill")]
+ [HttpPost]
+ public object SaveBill([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+ string msg4 = sArray[2].ToString();
+
+
+ ListModels oListModels = new ListModels();
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Gy_QCVerificationBillMain_Edit", 1, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ DAL.ClsSc_EmployeeSignInNoteBill oBill = new DAL.ClsSc_EmployeeSignInNoteBill();
+ List<Model.ClsSc_EmployeeSignInNoteBill> lsmain = new List<Model.ClsSc_EmployeeSignInNoteBill>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Sc_EmployeeSignInNoteBill(msg2);
+ foreach (Model.ClsSc_EmployeeSignInNoteBill oItem in lsmain)
+ {
+ oItem.HMaker = msg4;
+ DBUtility.ClsPub.CurUserName = msg4; //鍒跺崟浜�
+ oItem.HBillType = "4616";
+ oItem.HBillSubType = "4616";
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ oItem.HCheckEmp = oItem.HEmpID;
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oBill.omodel = oItem;
+ }
+ ////琛ㄤ綋鏁版嵁
+ ////鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ //msg3 = msg3.Substring(1, msg3.Length - 2);
+ //msg3 = msg3.Replace("\\", "");
+ //msg3 = msg3.Replace("\n", ""); //\n
+ ////msg2 = msg2.Replace("'", "鈥�");
+ //List<Model.ClsSc_EmployeeSignInNoteBillSub> ls = new List<Model.ClsSc_EmployeeSignInNoteBillSub>();
+ //ls = oListModels.getObjectByJson_Sc_EmployeeSignInNoteBillSub(msg3);
+ //int i = 0;
+ //foreach (Model.ClsSc_EmployeeSignInNoteBillSub oItem in ls)
+ //{
+
+ // i++;
+ // oItem.HEntryID = i;
+ // oItem.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ // oItem.HCloseType = false; //鍏抽棴绫诲瀷
+ // oBill.DetailColl.Add(oItem);
+
+ //}
+
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (oBill.omodel.HInterID == 0)
+ {
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ if (bResult)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
+ #region[缂栬緫鏃惰幏鍙栨暟鎹甝
+ [Route("Sc_EmployeeSignInNoteBillController/Sc_EmployeeSignInNoteBilldetail")]
+ [HttpGet]
+ public ApiResult<DataSet> Sc_EmployeeSignInNoteBilldetail(string HID)
+ {
+ if (string.IsNullOrEmpty(HID))
+ return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ var dataSet = oCN.RunProcReturn("select * from h_v_Sc_EmployeeSignInNoteBill where HInterID= " + HID + " ", "h_v_Sc_EmployeeSignInNoteBill");
+ if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+ return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄥ崟鍙�" };
+ return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+ }
+ #endregion
+
+
+ #region 瀹℃牳銆佸弽瀹℃牳
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("WLYayBillController/AuditWLYayBill1")]
+ [HttpGet]
+ public object AuditWLYayBill(int HInterID, int IsAudit, string CurUserName)
+ {
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_Supplier_Check", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var ds = oCN.RunProcReturn("select * from WL_YayBillMain where HInterID=" + HInterID, "WL_YayBillMain");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ {
+ if (ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ if (ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.BeginTran();
+
+ if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ {
+ oCN.RunProc("update WL_YayBillMain set HChecker='" + CurUserName + "',HCheckDate=getdate() ,HBillStatus=2 where HInterID=" + HInterID);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛";
+ objJsonResult.data = null;
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ oCN.RunProc("update WL_YayBillMain set HChecker='',HCheckDate=null,HBillStatus=1 where HInterID=" + HInterID);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍告垚鍔�";
+ objJsonResult.data = null;
+ }
+ oCN.Commit();
+
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ //#region
+ //[Route("Sc_EmployeeSignInNoteBillController/APP_Edit_json")]
+ //[HttpPost]
+ //public object APP_Edit_json(int HInterID,string HBarCode)
+ //{
+ // DataSet ds = oCN.RunProcReturn("select * from Gy_EquipFileBillMain where HBarCode='"+ HBarCode+"'", "Gy_EquipFileBillMain");
+ // if(ds!=null||ds.Tables.Count>0)
+ // {
+ // var EquipmentID = ds.Tables[0].Rows[0]["HInterID"];
+ // DataSet dds = oCN.RunProcReturn("exec h_p_SB_HEquipHMould_Query "+ EquipmentID, "h_p_SB_HEquipHMould_Query");
+ // if(dds != null || dds.Tables.Count > 0)
+ // {
+
+ // }
+ // }
+ //}
+ //#endregion
+
+
+
+
+
+
+
+ [Route("WLYayBillController/updateBillMEs1")]
+ [HttpGet]
+ public object updateBillMEs(int HInterID,int HEntryID, int ScatteredVolume, string CurUserName)
+ {
+ var ds = oCN.RunProcReturn("select * from WL_YayBillMain a inner join WL_YayBillSub_Material b on b.HInterID=a.HInterID where a.HInterID=" + HInterID, "WL_YayBillMain");
+ if (ds != null || ds.Tables[0].Rows.Count <= 0)
+ {
+ oCN.BeginTran();
+ oCN.RunProc("update WL_YayBillSub_Material set HScatteredVolume= " + ScatteredVolume + " where HInterID=" + HInterID+ "and HEntryID="+ HEntryID);
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛";
+ objJsonResult.data = null;
+ oCN.Commit();
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏇存柊澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+}
diff --git a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
index 8786be2..00b3256 100644
--- a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
+++ b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
@@ -7522,22 +7522,10 @@
oItem.HBillType = "3819";
oItem.HBillSubType = "3819";
- //oItem.HInterID =0;
- //oItem.HBillNo = "";
oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡
oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
- //oItem.HMakeDate = "";
- //oItem.HYear = "";
- //oItem.HPeriod = "";
- //oItem.HRemark = "";
- //oItem.HCycleUnit = "";
- //oItem.HCheckCycle = "";
- //oItem.HBeginDate = "";
- //oItem.HEndDate = "";
- //oItem.HInnerBillNo = "";
- //oItem.HExplanation = "";
- //oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
+
if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
{
objJsonResult.code = "0";
@@ -7580,7 +7568,6 @@
bool bResult;
if (oBill.omodel.HInterID == 0)
{
- // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
}
else
@@ -7592,7 +7579,121 @@
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
- //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 妯″叿淇濆吇璁板綍琛� 淇濆瓨/缂栬緫APP
+ /// <summary>
+ /// 淇濆瓨妯″叿缁翠慨鍗�
+ /// </summary>
+ /// <param name="msg"></param>
+ /// <returns></returns>
+ [Route("Sc_MouldMaintainBill/SaveGetMouldMaintainBillListAPP")]
+ [HttpPost]
+ public object SaveGetMouldMaintainBillListAPP([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+ string msg5 = sArray[2].ToString();
+
+ string UserName = "";
+ ListModels oListModels = new ListModels();
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldMaintainBill_Edit", 1, false, msg5))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ DAL.ClsSc_MouldMaintainBill oBill = new DAL.ClsSc_MouldMaintainBill();
+ List<Model.ClsSc_MouldMaintainBillMain> lsmain = new List<Model.ClsSc_MouldMaintainBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Sc_MouldMaintainBillMain(msg2);
+ foreach (Model.ClsSc_MouldMaintainBillMain oItem in lsmain)
+ {
+ UserName = oItem.HMaker; //鍒跺崟浜�
+ DBUtility.ClsPub.CurUserName = UserName;
+ oItem.HBillType = "3819";
+ oItem.HBillSubType = "3819";
+
+ oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+
+
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oBill.omodel = oItem;
+ }
+ //淇濆吇椤硅〃浣撴暟鎹�
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ msg3 = msg3.Substring(1, msg3.Length - 2);
+ msg3 = msg3.Replace("\\", "");
+ msg3 = msg3.Replace("\n", ""); //\n
+ List<Model.ClsSc_MouldMaintainRuleBillSub_Item> ls = new List<Model.ClsSc_MouldMaintainRuleBillSub_Item>();
+ ls = oListModels.getObjectByJson_Sc_MouldMaintainRuleBillSub_Item(msg3);
+ int i = 0;
+ foreach (Model.ClsSc_MouldMaintainRuleBillSub_Item oItemSub in ls)
+ {
+
+ i++;
+ oItemSub.HEntryID = i;
+ oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
+ oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
+ oBill.DetailCol.Add(oItemSub);
+
+ }
+
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (oBill.omodel.HInterID == 0)
+ {
+ bResult = oBill.AddBill_APP(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = oBill.ModifyBill_APP(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ if (bResult)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
objJsonResult.data = 1;
return objJsonResult;
}
@@ -8257,7 +8358,6 @@
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
string msg4 = sArray[2].ToString();
- //string msg5 = sArray[3].ToString();
string UserName = "";
ListModels oListModels = new ListModels();
@@ -8279,28 +8379,14 @@
lsmain = oListModels.getObjectByJson_Sc_MouldDotCheckBillMain(msg2);
foreach (Model.ClsSc_MouldDotCheckBillMain oItem in lsmain)
{
- //oItem.HMaker = "";
UserName = oItem.HMaker; //鍒跺崟浜�
oItem.HMaker = msg4;
oItem.HBillType = "3821";
oItem.HBillSubType = "3821";
- //oItem.HInterID =0;
- //oItem.HBillNo = "";
oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡
oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
- //oItem.HMakeDate = "";
- //oItem.HYear = "";
- //oItem.HPeriod = "";
- //oItem.HRemark = "";
- //oItem.HCycleUnit = "";
- //oItem.HCheckCycle = "";
- //oItem.HBeginDate = "";
- //oItem.HEndDate = "";
- //oItem.HInnerBillNo = "";
- //oItem.HExplanation = "";
- //oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
{
objJsonResult.code = "0";
@@ -8316,7 +8402,6 @@
msg3 = msg3.Substring(1, msg3.Length - 2);
msg3 = msg3.Replace("\\", "");
msg3 = msg3.Replace("\n", ""); //\n
- //msg2 = msg2.Replace("'", "鈥�");
List<Model.ClsSc_MouldDotCheckBillSub> ls = new List<Model.ClsSc_MouldDotCheckBillSub>();
ls = oListModels.getObjectByJson_Sc_MouldDotCheckBillSub(msg3);
int i = 0;
@@ -8325,57 +8410,26 @@
i++;
oItemSub.HEntryID = i;
- //oItemSub.HCloseMan = ""; //琛屽叧闂�
+
oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
- //oItemSub.HRemark = ""; //澶囨敞
+
oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
- //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
- //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
+
oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
- //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
- //HMaterID = "";//閰嶄欢浠ｇ爜
- //HUnitID = "";//鍗曚綅浠ｇ爜
- //HQty = "";//瀹為檯鐢ㄩ噺
- //HQtyMust = "";//鍗曚綅鐢ㄩ噺
- //HRemark = "";//澶囨敞
+
oBill.DetailColl.Add(oItemSub);
}
- ////閰嶄欢椤硅〃浣撴暟鎹�
- ////鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
- //msg5 = msg5.Substring(1, msg5.Length - 2);
- //msg5 = msg5.Replace("\\", "");
- //msg5 = msg5.Replace("\n", ""); //\n
- // //msg2 = msg2.Replace("'", "鈥�");
- //List<Model.ClsSc_MouldDotCheckBillSub_Item> ls1 = new List<Model.ClsSc_MouldDotCheckBillSub_Item>();
- //ls1 = oListModels.getObjectByJson_Sc_MouldDotCheckBillSub_Item(msg5);
- //int j = 0;
- //foreach (Model.ClsSc_MouldDotCheckBillSub_Item oItemSub in ls1)
- //{
-
- // j++;
- // oItemSub.HEntryID = j;
- // //oItemSub.HCloseMan = ""; //琛屽叧闂�
- // oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
- // oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
-
- // oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
- // oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
-
- // oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
- // oBill.DetailCol.Add(oItemSub);
- //}
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
bool bResult;
if (oBill.omodel.HInterID == 0)
{
- // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
}
else
@@ -8387,7 +8441,128 @@
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
- //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 妯″叿鐐规璁板綍琛� 淇濆瓨/缂栬緫APP
+ /// <summary>
+ /// 淇濆瓨妯″叿缁翠慨鍗�
+ /// </summary>
+ /// <param name="msg"></param>
+ /// <returns></returns>
+ [Route("Sc_MouldDotCheckBill/SaveGetMouldDotCheckBillListAPP")]
+ [HttpPost]
+ public object SaveGetMouldDotCheckBillListAPP([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+ string msg4 = sArray[2].ToString();
+
+ string UserName = "";
+ ListModels oListModels = new ListModels();
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldDotCheckBill_Edit", 1, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ DAL.ClsSc_MouldDotCheckBill oBill = new DAL.ClsSc_MouldDotCheckBill();
+ List<Model.ClsSc_MouldDotCheckBillMain> lsmain = new List<Model.ClsSc_MouldDotCheckBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Sc_MouldDotCheckBillMain(msg2);
+ foreach (Model.ClsSc_MouldDotCheckBillMain oItem in lsmain)
+ {
+ UserName = oItem.HMaker; //鍒跺崟浜�
+ oItem.HMaker = msg4;
+ oItem.HBillType = "3821";
+ oItem.HBillSubType = "3821";
+
+ oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oBill.omodel = oItem;
+ }
+ //琛ㄤ綋鏁版嵁
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ msg3 = msg3.Substring(1, msg3.Length - 2);
+ msg3 = msg3.Replace("\\", "");
+ msg3 = msg3.Replace("\n", ""); //\n
+ List<Model.ClsSc_MouldDotCheckBillSub> ls = new List<Model.ClsSc_MouldDotCheckBillSub>();
+ ls = oListModels.getObjectByJson_Sc_MouldDotCheckBillSub(msg3);
+ int i = 0;
+ foreach (Model.ClsSc_MouldDotCheckBillSub oItemSub in ls)
+ {
+
+ i++;
+ oItemSub.HEntryID = i;
+
+ oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
+
+ oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
+ oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
+
+ oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
+
+
+ oBill.DetailColl.Add(oItemSub);
+
+ }
+
+
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (oBill.omodel.HInterID == 0)
+ {
+ bResult = oBill.AddBill_APP(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = oBill.ModifyBill_APP(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ if (bResult)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
objJsonResult.data = 1;
return objJsonResult;
}
@@ -8448,7 +8623,7 @@
list.Add(ds.Tables[0]);
list.Add(ds1.Tables[0]);
- objJsonResult.code = "0";
+ objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
objJsonResult.data = ds.Tables[0];
@@ -8997,7 +9172,7 @@
return objJsonResult;
}
#endregion
-
+
#endregion
#region 妯″叿鐐规璁″垝琛�
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
index 89500ec..0cc67c0 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
@@ -3389,6 +3389,7 @@
string HSelectBarCodeType = "鎵樼洏鏉＄爜";
string CampanyName = "灏忓崼";
string UserName = sArray[2].ToString();//鐢ㄦ埛
+ string barCode_middle = sArray[3].ToString();//涓鐮�
ClsPub.CurUserName = UserName;
//鑾峰彇鍐呯爜
@@ -3418,7 +3419,7 @@
else
{
//鐢熸垚鏉＄爜
- SaveBarCode_xiaowei(msg2, HSelectBarCodeType, CampanyName, HSourceBillTypeName);
+ SaveBarCode_xiaowei(msg2, HSelectBarCodeType, CampanyName, HSourceBillTypeName, barCode_middle);
}
}
catch (Exception e)
@@ -3433,7 +3434,7 @@
#endregion
#region[鏉＄爜鐢熸垚鏂规硶_xiaowei]
- private object SaveBarCode_xiaowei(string msg2, string HSelectBarCodeType, string CampanyName, string HSourceBillTypeName)
+ private object SaveBarCode_xiaowei(string msg2, string HSelectBarCodeType, string CampanyName, string HSourceBillTypeName,string barCode_middle)
{
DateTime sDate = DateTime.Now; //鏃ユ湡
string HSourceBillType_Temp = ""; //婧愬崟绫诲瀷
@@ -3470,54 +3471,31 @@
string sTMNumber = ""; //鏉＄爜鍓嶇紑
string LSH = ""; //鏈�澶ф祦姘村彿
int HLen = 6; //娴佹按鍙烽暱搴�
-
+
//鏉＄爜鎷兼帴鎵�闇�瀛楁
string HMaterialName = DBUtility.ClsPub.isStrNull(ordrlist.HMaterName);
string HSupNumber = DBUtility.ClsPub.isStrNull(ordrlist.HSupNumber).Replace(".", ""); //渚涘簲鍟嗕唬鐮侊紙鍘绘帀鍒嗛殧绗︼級
- int lastDigit = int.Parse(DateTime.Today.Year.ToString().Last().ToString());
- int currentMonth = DateTime.Now.Month;
- char[] monthToLetter = {
- 'N', 'P', 'Q', 'R', 'S', 'T',
- 'U', 'V', 'W', 'X', 'Y', 'Z'
- };
- char productionMonth = monthToLetter[currentMonth - 1];
- char productionDay = DateTime.Today.Month <= 9
- ? (char)(DateTime.Today.Month + '0')
- : (char)('A' + DateTime.Today.Month - 10);
- if (HMaterialName.Trim() == "")
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鐗╂枡涓嶈兘涓虹┖锛屼笉鑳界敓鎴愭潯鐮侊紒";
- return objJsonResult;
- }
-
- Ds2 = oCN.RunProcReturn("select top 1 HCusRelationNumber from Gy_Material m with(nolock) left join Gy_MateNumRelation_Sec b with(nolock) on m.HMASTERID = b.HMaterID where m.HItemID = " + ordrlist.HMaterID, "Gy_MateNumRelation_Sec");
-
- string HSKU = "";//鍟嗗搧SKU
- if (Ds2.Tables[0].Rows.Count > 0)
- {
- HSKU = Ds2.Tables[0].Rows[0]["HCusRelationNumber"].ToString();
- }
- else
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁鍖归厤鍒板搴旂殑鍟嗗搧SKU!";
- return objJsonResult;
- }
-
+
+ DataSet dds= oCN.RunProcReturn("exec h_p_rule_BarCodePack_xiaowei "+ ordrlist.HMaterID+",'"+ barCode_middle+"'", "h_p_rule_BarCodePack_xiaowei");
//todo
+ if (dds.Tables[0].Rows[0]["HBack"]=="1")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鐢熸垚鏉＄爜澶辫触锛�" + dds.Tables[0].Rows[0]["HRemark"].ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else if(dds == null || dds.Tables[0].Rows.Count <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鐢熸垚鏉＄爜澶辫触锛屾湭鎵惧埌鏉＄爜锛�" ;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//鏉＄爜鍓嶇紑 = p+鍟嗗搧SKU+鐢熶骇骞翠唤+鐢熶骇鏈堜唤+6浣嶆祦姘村彿+鐢熶骇宸ュ巶浠ｇ爜
- sTMNumber = "P" + HSKU + lastDigit+ productionMonth;
-
- //鏍规嵁鏉＄爜鍓嶇紑鑾峰彇鏈�澶ф祦姘村彿
- Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo");
- LSH = String.Format("{0:D" + HLen + "}", ClsPub.isInt(Ds.Tables[0].Rows[0][0]) + 1);
-
- //鎷兼帴鏉＄爜
- HBarCode_Temp = sTMNumber + "A" + LSH + "AHW";
-
+ HBarCode_Temp = dds.Tables[0].Rows[0]["HRemark"].ToString();
if (HSumQty - HMinQty > 0)
{
diff --git "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs" "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
index 579811a..6a3a208 100644
--- "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
+++ "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
@@ -1118,7 +1118,7 @@
}
else
{
- objJsonResult.code = "0";
+ objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "鎴愬姛锛�";
objJsonResult.data = ds.Tables[0];
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
index f486748..e9375ad 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
@@ -330,24 +330,24 @@
,HYear,HPeriod,HRemark,HMaker,HMakeDate,HChecker,HCheckDate
,HSeOrderBillNo,HSeOrderInterID,HSeOrderEntryID,HEmpID,HCusID
,HCenterID,HPlanQty,HDeptID,HMaterID,HUnitID,HBomID,HPlanBeginDate,HPlanEndDate,HBillStatus
- ,HOWNERID,HOWNERTYPEID,HComboXSLX)
+ ,HOWNERID,HOWNERTYPEID,HComboXSLX,HBillSubType)
values('3710'," + mainList[0].HInterID + ",'" + mainList[0].HBillNo + "','" + mainList[0].HDate + "'," + mainList[0].HPRDORGID +
"," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + mainList[0].HRemark + "','" + mainList[0].HMaker + "',getdate(),'" + mainList[0].HMaker + "',getdate()" +
",'" + mainList[0].HSeOrderBillNo + "'," + mainList[0].HSeOrderInterID + "," + mainList[0].HSeOrderEntryID + "," + mainList[0].HEmpID + "," + mainList[0].HCusID +
"," + mainList[0].HCenterID + "," + mainList[0].HPlanQty + ",0,0,0,0,'','',2" +
- "," + mainList[0].HOWNERID + ",'" + mainList[0].HOWNERTYPEID + "','" + mainList[0].HComboXSLX + "') ");
+ "," + mainList[0].HOWNERID + ",'" + mainList[0].HOWNERTYPEID + "','" + mainList[0].HComboXSLX + "','" + mainList[0].HBillSubType + "') ");
//涓昏〃
oCN.RunProc(@"Insert Into Sc_ICMOBillMain
(HBillType,HInterID,HBillNo,HDate,HPRDORGID
,HYear,HPeriod,HRemark,HMaker,HMakeDate,HChecker,HCheckDate
,HSeOrderBillNo,HSeOrderInterID,HSeOrderEntryID,HEmpID,HCusID
,HCenterID,HPlanQty,HDeptID,HMaterID,HUnitID,HBomID,HPlanBeginDate,HPlanEndDate,HBillStatus
- ,HOWNERID,HOWNERTYPEID,HComboXSLX)
+ ,HOWNERID,HOWNERTYPEID,HComboXSLX,HBillSubType)
values('3710'," + mainList[0].HInterID + ",'" + mainList[0].HBillNo + "','" + mainList[0].HDate + "'," + mainList[0].HPRDORGID +
"," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + mainList[0].HRemark + "','" + mainList[0].HMaker + "',getdate(),'" + mainList[0].HMaker + "',getdate()" +
",'" + mainList[0].HSeOrderBillNo + "'," + mainList[0].HSeOrderInterID + "," + mainList[0].HSeOrderEntryID + "," + mainList[0].HEmpID + "," + mainList[0].HCusID +
"," + mainList[0].HCenterID + "," + mainList[0].HPlanQty + ",0,0,0,0,'','',2" +
- ","+ mainList[0].HOWNERID + ",'"+ mainList[0].HOWNERTYPEID + "','" + mainList[0].HComboXSLX + "') ");
+ ","+ mainList[0].HOWNERID + ",'"+ mainList[0].HOWNERTYPEID + "','" + mainList[0].HComboXSLX + "','" + mainList[0].HBillSubType + "') ");
//淇濆瓨涓昏〃
foreach (var oSub in subList)
{
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs"
index db8a236..172fe19 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs"
@@ -247,8 +247,9 @@
BillNew.HMaker = mainList[0].HMaker;
BillNew.HMakeDate = mainList[0].HMakeDate;
BillNew.HReportType = mainList[0].HReportType;
- BillNew.HSourceBillNo = mainList[0].HICMOBillNo;
- BillNew.HSourceInterID = mainList[0].HICMOInterID;
+ BillNew.HSourceBillNo = mainList[0].HSourceBillNo;
+ BillNew.HSourceInterID = mainList[0].HSourceInterID;
+ BillNew.HSourceEntryID = mainList[0].HSourceEntryID;
BillNew.HSourceBillType = mainList[0].HSourceBillType;
BillNew.HBadReasonHQty = mainList[0].HBadReasonHQty;
BillNew.HQty = DBUtility.ClsPub.isLong(mainList[0].HQty);
@@ -265,7 +266,7 @@
",'" + BillNew.HProcExchBillNo + "'," + BillNew.HProcExchInterID + "," + BillNew.HProcExchEntryID + "," + BillNew.HProcID + "," + BillNew.HMaterID +
"," + BillNew.HSourceID + "," + BillNew.HGroupID + "," + BillNew.HDeptID + "," + BillNew.HCheckManID + "," + BillNew.HBadReasonID + ",'" + BillNew.HBarCode + "'" +
",'" + BillNew.HMaker + "','" + BillNew.HMakeDate + "','" + BillNew.HBillType + "','" + +BillNew.HReportType + "','" +BillNew.HSourceBillNo + "'" +
- "," + BillNew.HSourceInterID + ",'" + BillNew.HSourceBillType + "'," + BillNew.HICMOEntryID + "," + BillNew.HICMOEntryID + "," + BillNew.HBadReasonHQty + "," + BillNew.HQty +
+ "," + BillNew.HSourceInterID + ",'" + BillNew.HSourceBillType + "'," + BillNew.HICMOEntryID + "," + BillNew.HSourceEntryID + "," + BillNew.HBadReasonHQty + "," + BillNew.HQty +
") ");
sReturn = "鎵爜鎴愬姛锛�";
oCN.Commit();
@@ -697,6 +698,7 @@
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
+ oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "淇濆瓨鍚庡垽鏂け璐ワ紒";
@@ -705,6 +707,7 @@
}
if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
{
+ oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
diff --git a/WebAPI/DLL/ClsOA_ErrMsgBackBill.cs b/WebAPI/DLL/ClsOA_ErrMsgBackBill.cs
index e3eab55..2bc42e5 100644
--- a/WebAPI/DLL/ClsOA_ErrMsgBackBill.cs
+++ b/WebAPI/DLL/ClsOA_ErrMsgBackBill.cs
@@ -275,6 +275,216 @@
}
}
+
+ //淇敼鍗曟嵁
+ public override bool ModifyBill_APP(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //
+ oCn.BeginTran();
+
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ string HBillNote = "";
+ DataSet ds = oCn.RunProcReturn("Exec h_p_OA_ErrMsgBackBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',2", "h_p_OA_ErrMsgBackBill_BeforeSaveCtrl");
+ if (ds == null)
+ {
+ sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ return false;
+ }
+ //=========================================================
+
+
+ //鏇存柊涓昏〃
+ oCn.RunProc("UpDate OA_ErrMsgBackBillMain set " +
+ " HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��===============
+ ",HDate='" + omodel.HDate + "'" +
+ ",HYear='" + omodel.HYear.ToString() + "'" +
+ ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
+ ",HRemark='" + omodel.HRemark + "'" +
+ ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
+ ",HUpDateDate=getdate()" +
+ //========================================
+ ",HContext='" + omodel.HContext + "'" +
+ ",HDeptID=" + omodel.HDeptID.ToString() +
+ ",HSendMan='" + omodel.HSendMan + "'" +
+ ",HReceiveMan='" + omodel.HReceiveMan + "'" +
+ ",HCopyMan='" + omodel.HCopyMan + "'" +
+ ",HLevel='" + omodel.HLevel + "'" +
+ ",HReTransmitMan='" + omodel.HReTransmitMan + "'" +
+ ",HBillTypeName='" + omodel.HBillTypeName + "'" +
+ ",HPlanBillNo='" + omodel.HPlanBillNo + "'" +
+ ",HMaterName='" + omodel.HMaterName + "'" +
+ ",HMaterModel='" + omodel.HMaterModel + "'" +
+ ",HSendType='" + omodel.HSendType + "'" +
+ ",HDescription='" + omodel.HDescription + "'" +
+ ",HHasten=" + omodel.HHasten.ToString() +
+ ",HQty=" + omodel.HQty.ToString() +
+ ",HRecDeptID=" + omodel.HRecDeptID.ToString() +
+ ",HMaterNumber='" + omodel.HMaterNumber + "'" +
+ ",HForm='" + omodel.HForm + "'" +
+ ",HChangeNote='" + omodel.HChangeNote + "'" +
+ ",HNote='" + omodel.HNote + "'" +
+ ",HCenterID='" + omodel.HCenterID + "'" +
+ ",HBadProcMan='" + omodel.HBadProcMan.ToString() + "'" +
+ ",HQEMan='" + omodel.HQEMan.ToString() + "'" +
+ ",HSourceID='" + omodel.HSourceID.ToString() + "'" +
+ ",HShiftsID='" + omodel.HShiftsID.ToString() + "'" +
+ ",HErrLev ='" + omodel.HErrLev.ToString() + "'" +
+ ",HHandleEmpID=" + omodel.HHandleEmpID.ToString() +
+
+ " where HInterID=" + lngBillKey.ToString());
+ //鍒犻櫎鍏宠仈
+ DeleteRelation(ref sReturn, lngBillKey);
+ //鍒犻櫎瀛愯〃
+ DeleteBillSub(lngBillKey);
+ DeleteBillSub2(lngBillKey);
+ //鎻掑叆瀛愯〃
+ omodel.HInterID = lngBillKey;
+ foreach (Models.ClsOA_ErrMsgBackBillSub oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into OA_ErrMsgBackBillSub " +
+ " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HSendStatus,HSendMan,HDescription,HDate" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ "," + oSub.HSendStatus.ToString() + ",'" + oSub.HSendMan + "','" + oSub.HDescription + "','" + oSub.HDate.ToShortDateString() + "'" +
+ ") ");
+ }
+ //
+ foreach (Models.ClsOA_ErrMsgBackBillSub2 oSubSec in DetailColl2)
+ {
+ oCn.RunProc("Insert into OA_ErrMsgBackBillSub2 " +
+ " (HInterID,HEntryID,HReceiveMan,HReadFlag" +
+ ")" +
+ " values("
+ + omodel.HInterID.ToString() + "," + oSubSec.HEntryID.ToString() + ",'" + oSubSec.HReceiveMan + "'," + Convert.ToString(oSubSec.HReadFlag ? 1 : 0) +
+ ") ");
+ }
+
+ sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
+
+ //=========================淇濆瓨鍚庢帶鍒�
+ DataSet ds2 = oCn.RunProcReturn("h_p_OA_ErrMsgBackBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',2 ", "h_p_OA_ErrMsgBackBill_AfterSaveCtrl");
+ if (ds2 == null)
+ {
+ sReturn = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";
+ oCn.RollBack();
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触2锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
+ oCn.RollBack();
+ return false;
+ }
+ //============================
+
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏂板鍗曟嵁
+ public override bool AddBill_APP(ref string sReturn)
+ {
+ try
+ {
+ DataSet ds;
+
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCn.BeginTran();
+
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ string HBillNote = "";
+ ds = oCn.RunProcReturn("Exec h_p_OA_ErrMsgBackBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_OA_ErrMsgBackBill_BeforeSaveCtrl");
+ if (ds == null)
+ {
+ sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ return false;
+ }
+ //=========================================================
+
+ //涓昏〃
+ oCn.RunProc("Insert Into OA_ErrMsgBackBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
+ ",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
+ ",HContext,HDeptID,HDescription,HSendMan,HReceiveMan" +
+ ",HCopyMan,HHasten,HLevel,HReTransmitMan,HBillTypeName" +
+ ",HPlanBillNo,HMaterName,HMaterModel,HQty,HSendType" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRecDeptID,HMaterNumber,HErrMsgBackTypeID,HHandleEmpID,HCloseFlag" +
+ ",HForm,HChangeNote,HNote,HBadProcMan,HQEMan,HSourceID,HShiftsID,HErrLev,HCenterID" +
+ ") " +
+ " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
+ "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
+ ",'" + omodel.HContext + "'," + omodel.HDeptID.ToString() + ",'" + omodel.HDescription + "','" + omodel.HSendMan + "','" + omodel.HReceiveMan + "'" +
+ ",'" + omodel.HCopyMan + "'," + omodel.HHasten.ToString() + ",'" + omodel.HLevel + "','" + omodel.HReTransmitMan + "','" + omodel.HBillTypeName + "'" +
+ ",'" + omodel.HPlanBillNo + "','" + omodel.HMaterName + "','" + omodel.HMaterModel + "'," + omodel.HQty.ToString() + ",'" + omodel.HSendType + "'" +
+ ",'" + omodel.HMainSourceInterID + "','" + omodel.HMainSourceEntryID + "','" + omodel.HMainSourceBillNo + "','" + omodel.HMainSourceBillType + "'" +
+ "," + omodel.HRecDeptID + ",'" + omodel.HMaterNumber + "'," + omodel.HErrMsgBackTypeID + ", " + omodel.HHandleEmpID + ", '" + "0" +
+ "','" + omodel.HForm + "','" + omodel.HChangeNote + "','" + omodel.HNote + "','" + omodel.HBadProcMan + "','" + omodel.HQEMan + "','" + omodel.HSourceID + "','" + omodel.HShiftsID + "','" + omodel.HErrLev + "','" + omodel.HCenterID + "') ");
+ //鎻掑叆瀛愯〃
+
+ foreach (Models.ClsOA_ErrMsgBackBillSub2 oSubSec in DetailColl2)
+ {
+ oCn.RunProc("Insert into OA_ErrMsgBackBillSub2 " +
+ " (HInterID,HEntryID" +
+ ",HReceiveMan,HReadFlag" +
+ ")" +
+ " values("
+ + omodel.HInterID.ToString() + "," + oSubSec.HEntryID.ToString() +
+ ",'" + oSubSec.HReceiveMan + "'," + Convert.ToString(oSubSec.HReadFlag ? 1 : 0) +
+ ") ");
+ }
+
+ sReturn = omodel.HInterID.ToString();
+
+
+ //=========================淇濆瓨鍚庢帶鍒�
+ DataSet ds2 = oCn.RunProcReturn("h_p_OA_ErrMsgBackBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_OA_ErrMsgBackBill_AfterSaveCtrl");
+ if (ds2 == null)
+ {
+ sReturn = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";
+ oCn.RollBack();
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触2锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
+ oCn.RollBack();
+ return false;
+ }
+ //============================
+
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
+
public bool ReplyBill(ref string sReturn)
{
try
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index 8deb00e..d9d4662 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -700,7 +700,7 @@
}
/// <summary>
- /// 澶勭悊妫�楠屼华鍣ㄨ褰曞崟鐨刯son
+ /// 澶勭悊妫�楠屼华鍣ㄨ褰曞崟鐨刯son
/// </summary>
/// <param name="jsonString"></param>
/// <returns></returns>
@@ -708,6 +708,17 @@
{
jsonString = "[" + jsonString.ToString() + "]";
List<Model.ClsGy_QCVerificationBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_QCVerificationBillMain>>(jsonString);
+ return list;
+ }
+ /// <summary>
+ /// 澶勭悊妫�楠屼华鍣ㄨ褰曞崟鐨刯son ClsSc_EmployeeSignInNoteBill
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsSc_EmployeeSignInNoteBill> getObjectByJson_Sc_EmployeeSignInNoteBill(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsSc_EmployeeSignInNoteBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_EmployeeSignInNoteBill>>(jsonString);
return list;
}
/// <summary>
@@ -755,8 +766,18 @@
List<Model.ClsGy_QCVerificationBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_QCVerificationBillSub>>(jsonString);
return list;
}
-
-
+ /// <summary>
+ /// 澶勭悊鏂板妯″叿缁翠慨瀛愯〃閰嶄欢淇℃伅鐨刯son
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsSc_EmployeeSignInNoteBillSub> getObjectByJson_Sc_EmployeeSignInNoteBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsSc_EmployeeSignInNoteBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_EmployeeSignInNoteBillSub>>(jsonString);
+ return list;
+ }
+
public List<Model.ClsWL_YayBillMainBillSub> getObjectByJson_WL_YayBillMainBillSub(string jsonString)
{
jsonString = "[" + jsonString.ToString() + "]";
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 4533a0d..93b72a3 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,21 +4,12 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
-<<<<<<< HEAD
- <_PublishTargetUrl>D:\缃戠珯鍙戝竷\API</_PublishTargetUrl>
- <History>True|2026-01-05T07:36:49.1808362Z;True|2026-01-05T13:09:24.8481053+08:00;False|2026-01-05T13:08:59.7237464+08:00;True|2025-12-30T10:28:00.1438578+08:00;True|2025-12-30T08:03:41.8164442+08:00;False|2025-12-30T08:03:20.4105693+08:00;False|2025-12-29T17:01:33.3200810+08:00;True|2025-12-29T13:14:37.2747700+08:00;</History>
- </PropertyGroup>
- <ItemGroup>
- <File Include="apiapp.json">
- <publishTime>11/12/2025 10:43:48</publishTime>
-=======
- <History>True|2026-01-05T15:26:15.9058534Z;True|2026-01-05T23:10:09.2125130+08:00;True|2026-01-05T23:05:18.2406265+08:00;False|2026-01-05T23:04:03.0504675+08:00;</History>
+ <History>True|2026-01-08T07:25:28.3342514Z;True|2026-01-08T15:04:02.9833571+08:00;False|2026-01-08T15:03:27.6253594+08:00;True|2026-01-08T08:30:06.5557840+08:00;False|2026-01-08T08:29:26.8234993+08:00;True|2026-01-05T23:26:15.9058534+08:00;True|2026-01-05T23:10:09.2125130+08:00;True|2026-01-05T23:05:18.2406265+08:00;False|2026-01-05T23:04:03.0504675+08:00;</History>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
- <publishTime>04/21/2025 11:46:17</publishTime>
->>>>>>> 9f2520cf48814553f225271f492ea0d8f763e9d4
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="bin/AlibabaCloud.EndpointUtil.dll">
<publishTime>04/07/2020 16:33:48</publishTime>
@@ -54,49 +45,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
-<<<<<<< HEAD
- <publishTime>01/05/2026 13:09:11</publishTime>
+ <publishTime>01/08/2026 08:29:49</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>01/05/2026 13:09:11</publishTime>
-=======
- <publishTime>01/05/2026 23:04:30</publishTime>
- </File>
- <File Include="bin/BLL.pdb">
- <publishTime>01/05/2026 23:04:30</publishTime>
->>>>>>> 9f2520cf48814553f225271f492ea0d8f763e9d4
+ <publishTime>01/08/2026 08:29:49</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
-<<<<<<< HEAD
- <publishTime>01/05/2026 13:09:09</publishTime>
+ <publishTime>01/08/2026 08:29:47</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>01/05/2026 13:09:09</publishTime>
-=======
- <publishTime>01/05/2026 23:04:27</publishTime>
- </File>
- <File Include="bin/DAL.pdb">
- <publishTime>01/05/2026 23:04:27</publishTime>
->>>>>>> 9f2520cf48814553f225271f492ea0d8f763e9d4
+ <publishTime>01/08/2026 08:29:47</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
-<<<<<<< HEAD
- <publishTime>01/05/2026 13:09:06</publishTime>
+ <publishTime>01/08/2026 08:29:42</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>01/05/2026 13:09:06</publishTime>
-=======
- <publishTime>01/05/2026 23:04:18</publishTime>
- </File>
- <File Include="bin/DBUtility.pdb">
- <publishTime>01/05/2026 23:04:18</publishTime>
->>>>>>> 9f2520cf48814553f225271f492ea0d8f763e9d4
+ <publishTime>01/08/2026 08:29:42</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -123,10 +93,7 @@
<publishTime>05/09/2021 01:08:30</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
-<<<<<<< HEAD
- <publishTime>11/12/2025 10:43:47</publishTime>
-=======
- <publishTime>04/21/2025 11:46:16</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
>>>>>>> 9f2520cf48814553f225271f492ea0d8f763e9d4
</File>
<File Include="bin/libgrpc_csharp_ext.x64.dylib">
@@ -145,23 +112,13 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
-<<<<<<< HEAD
- <publishTime>01/05/2026 13:09:07</publishTime>
+ <publishTime>01/08/2026 08:29:42</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>01/05/2026 13:09:07</publishTime>
+ <publishTime>01/08/2026 08:29:42</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
- <publishTime>11/12/2025 10:43:47</publishTime>
-=======
- <publishTime>01/05/2026 23:04:19</publishTime>
- </File>
- <File Include="bin/Model.pdb">
- <publishTime>01/05/2026 23:04:19</publishTime>
- </File>
- <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
- <publishTime>04/21/2025 11:46:16</publishTime>
->>>>>>> 9f2520cf48814553f225271f492ea0d8f763e9d4
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>03/08/2023 15:09:56</publishTime>
@@ -191,61 +148,34 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
-<<<<<<< HEAD
- <publishTime>12/30/2025 08:03:28</publishTime>
+ <publishTime>01/08/2026 08:29:40</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>12/30/2025 08:03:28</publishTime>
+ <publishTime>01/08/2026 08:29:40</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>12/30/2025 08:03:29</publishTime>
+ <publishTime>01/08/2026 08:29:41</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>12/30/2025 08:03:29</publishTime>
-=======
- <publishTime>01/05/2026 23:04:14</publishTime>
- </File>
- <File Include="bin/Pub_Class.pdb">
- <publishTime>01/05/2026 23:04:14</publishTime>
- </File>
- <File Include="bin/Pub_Control.dll">
- <publishTime>01/05/2026 23:04:16</publishTime>
- </File>
- <File Include="bin/Pub_Control.pdb">
- <publishTime>01/05/2026 23:04:16</publishTime>
->>>>>>> 9f2520cf48814553f225271f492ea0d8f763e9d4
+ <publishTime>01/08/2026 08:29:41</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
-<<<<<<< HEAD
- <publishTime>01/05/2026 13:03:17</publishTime>
+ <publishTime>01/08/2026 08:29:41</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>01/05/2026 13:03:17</publishTime>
-=======
- <publishTime>01/05/2026 23:04:16</publishTime>
- </File>
- <File Include="bin/SQLHelper.pdb">
- <publishTime>01/05/2026 23:04:16</publishTime>
->>>>>>> 9f2520cf48814553f225271f492ea0d8f763e9d4
+ <publishTime>01/08/2026 08:29:41</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
-<<<<<<< HEAD
- <publishTime>12/29/2025 16:38:11</publishTime>
+ <publishTime>01/08/2026 08:29:38</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>12/29/2025 16:38:11</publishTime>
-=======
- <publishTime>01/05/2026 23:04:11</publishTime>
- </File>
- <File Include="bin/SyntacticSugar.pdb">
- <publishTime>01/05/2026 23:04:11</publishTime>
->>>>>>> 9f2520cf48814553f225271f492ea0d8f763e9d4
+ <publishTime>01/08/2026 08:29:38</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>07/19/2017 18:01:28</publishTime>
@@ -323,10 +253,7 @@
<publishTime>11/28/2018 21:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
-<<<<<<< HEAD
- <publishTime>11/12/2025 10:43:47</publishTime>
-=======
- <publishTime>04/21/2025 11:46:16</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
>>>>>>> 9f2520cf48814553f225271f492ea0d8f763e9d4
</File>
<File Include="bin/System.Web.Mvc.dll">
@@ -360,39 +287,22 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
-<<<<<<< HEAD
- <publishTime>12/29/2025 16:38:11</publishTime>
+ <publishTime>01/08/2026 08:29:43</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>12/29/2025 16:38:11</publishTime>
-=======
- <publishTime>01/05/2026 23:04:20</publishTime>
- </File>
- <File Include="bin/TopSdk.pdb">
- <publishTime>01/05/2026 23:04:20</publishTime>
->>>>>>> 9f2520cf48814553f225271f492ea0d8f763e9d4
+ <publishTime>01/08/2026 08:29:43</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
-<<<<<<< HEAD
- <publishTime>01/05/2026 15:36:45</publishTime>
+ <publishTime>01/08/2026 15:25:18</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>01/05/2026 15:36:45</publishTime>
+ <publishTime>01/08/2026 15:25:18</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
- <publishTime>01/05/2026 15:36:48</publishTime>
-=======
- <publishTime>01/05/2026 23:09:51</publishTime>
- </File>
- <File Include="bin/WebAPI.pdb">
- <publishTime>01/05/2026 23:09:51</publishTime>
- </File>
- <File Include="bin/WebAPI.XmlSerializers.dll">
- <publishTime>01/05/2026 23:10:04</publishTime>
->>>>>>> 9f2520cf48814553f225271f492ea0d8f763e9d4
+ <publishTime>01/08/2026 15:25:25</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -404,119 +314,61 @@
<publishTime>11/29/2018 21:26:30</publishTime>
</File>
<File Include="Config/kdapi.config">
-<<<<<<< HEAD
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>04/06/2023 15:57:01</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>04/06/2023 15:57:01</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>04/06/2023 15:57:01</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>04/06/2023 15:57:01</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/Interop.grsvr6Lib.dll">
- <publishTime>12/17/2025 13:18:47</publishTime>
+ <publishTime>01/04/2026 18:33:49</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>11/12/2025 10:43:48</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>11/12/2025 10:43:48</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>11/12/2025 10:43:48</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>11/12/2025 10:43:48</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>11/12/2025 10:43:47</publishTime>
-=======
- <publishTime>04/21/2025 11:46:15</publishTime>
- </File>
- <File Include="Content/bootstrap.css">
- <publishTime>04/21/2025 11:46:15</publishTime>
- </File>
- <File Include="Content/bootstrap.min.css">
- <publishTime>04/21/2025 11:46:15</publishTime>
- </File>
- <File Include="Content/Site.css">
- <publishTime>04/21/2025 11:46:15</publishTime>
- </File>
- <File Include="DLL/BLL.dll">
- <publishTime>04/21/2025 11:46:16</publishTime>
- </File>
- <File Include="DLL/DAL.dll">
- <publishTime>04/21/2025 11:46:16</publishTime>
- </File>
- <File Include="DLL/DBUtility.dll">
- <publishTime>04/21/2025 11:46:16</publishTime>
- </File>
- <File Include="DLL/Interop.grsvr6Lib.dll">
- <publishTime>12/14/2025 21:28:19</publishTime>
- </File>
- <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>04/21/2025 11:46:16</publishTime>
- </File>
- <File Include="DLL/Model.dll">
- <publishTime>04/21/2025 11:46:16</publishTime>
- </File>
- <File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>04/21/2025 11:46:16</publishTime>
- </File>
- <File Include="DLL/Pub_Class.dll">
- <publishTime>04/21/2025 11:46:16</publishTime>
- </File>
- <File Include="DLL/Pub_Control.dll">
- <publishTime>04/21/2025 11:46:16</publishTime>
- </File>
- <File Include="DLL/SQLHelper.dll">
- <publishTime>04/21/2025 11:46:16</publishTime>
- </File>
- <File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>04/21/2025 11:46:17</publishTime>
- </File>
- <File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>04/21/2025 11:46:17</publishTime>
- </File>
- <File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>04/21/2025 11:46:17</publishTime>
- </File>
- <File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>04/21/2025 11:46:17</publishTime>
- </File>
- <File Include="Global.asax">
- <publishTime>04/21/2025 11:46:16</publishTime>
->>>>>>> 9f2520cf48814553f225271f492ea0d8f763e9d4
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="grpc_csharp_ext.x64.dll">
<publishTime>03/22/2022 13:17:22</publishTime>
@@ -525,10 +377,7 @@
<publishTime>03/22/2022 13:17:22</publishTime>
</File>
<File Include="Index.html">
-<<<<<<< HEAD
- <publishTime>11/12/2025 10:43:47</publishTime>
-=======
- <publishTime>04/21/2025 11:46:16</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
>>>>>>> 9f2520cf48814553f225271f492ea0d8f763e9d4
</File>
<File Include="libgrpc_csharp_ext.x64.dylib">
@@ -538,251 +387,127 @@
<publishTime>03/19/2022 07:38:42</publishTime>
</File>
<File Include="libman.json">
-<<<<<<< HEAD
- <publishTime>11/12/2025 10:43:48</publishTime>
+ <publishTime>07/12/2023 08:14:21</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="packages.config">
- <publishTime>12/29/2025 17:01:02</publishTime>
+ <publishTime>01/04/2026 18:33:49</publishTime>
</File>
<File Include="Properties/PublishProfiles/JFAPI.pubxml.user">
- <publishTime>12/09/2025 08:11:33</publishTime>
+ <publishTime>12/08/2025 16:05:47</publishTime>
</File>
<File Include="Template/barCodeTemplateStorage.json">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>09/01/2025 08:23:20</publishTime>
</File>
<File Include="Utility/Barcode.ashx">
- <publishTime>12/17/2025 13:18:47</publishTime>
+ <publishTime>01/04/2026 18:33:49</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>11/12/2025 10:43:47</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web.config">
- <publishTime>12/30/2025 08:03:41</publishTime>
-=======
- <publishTime>04/21/2025 11:46:17</publishTime>
- </File>
- <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>04/21/2025 11:46:16</publishTime>
- </File>
- <File Include="packages.config">
- <publishTime>12/29/2025 09:02:47</publishTime>
- </File>
- <File Include="Properties/PublishProfiles/JFAPI.pubxml.user">
- <publishTime>12/07/2025 12:01:10</publishTime>
- </File>
- <File Include="Template/barCodeTemplateStorage.json">
- <publishTime>08/29/2025 09:43:09</publishTime>
- </File>
- <File Include="Utility/Barcode.ashx">
- <publishTime>12/14/2025 21:28:19</publishTime>
- </File>
- <File Include="Views/Scripts/bootstrap.js">
- <publishTime>04/21/2025 11:46:17</publishTime>
- </File>
- <File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>04/21/2025 11:46:17</publishTime>
- </File>
- <File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>04/21/2025 11:46:17</publishTime>
- </File>
- <File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>04/21/2025 11:46:17</publishTime>
- </File>
- <File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>04/21/2025 11:46:17</publishTime>
- </File>
- <File Include="Views/Scripts/jquery.validate.js">
- <publishTime>04/21/2025 11:46:17</publishTime>
- </File>
- <File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>04/21/2025 11:46:17</publishTime>
- </File>
- <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>04/21/2025 11:46:17</publishTime>
- </File>
- <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>04/21/2025 11:46:17</publishTime>
- </File>
- <File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>04/21/2025 11:46:17</publishTime>
- </File>
- <File Include="Views/Shared/Error.cshtml">
- <publishTime>04/21/2025 11:46:17</publishTime>
- </File>
- <File Include="Views/Shared/_Layout.cshtml">
- <publishTime>04/21/2025 11:46:17</publishTime>
- </File>
- <File Include="Views/web.config">
- <publishTime>04/21/2025 11:46:17</publishTime>
- </File>
- <File Include="Views/_ViewStart.cshtml">
- <publishTime>04/21/2025 11:46:17</publishTime>
- </File>
- <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
- </File>
- <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
- </File>
- <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
- </File>
- <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
- </File>
- <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
- </File>
- <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
- </File>
- <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
- </File>
- <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
- </File>
- <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
- </File>
- <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
- </File>
- <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
- </File>
- <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
- </File>
- <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
- </File>
- <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
- </File>
- <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
- </File>
- <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
- </File>
- <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
- </File>
- <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
- </File>
- <File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
- </File>
- <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
- </File>
- <File Include="Web.config">
- <publishTime>01/05/2026 23:05:15</publishTime>
->>>>>>> 9f2520cf48814553f225271f492ea0d8f763e9d4
+ <publishTime>01/08/2026 08:30:04</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user
index 2db6e0f..020b7e6 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
- <History>True|2026-01-06T02:53:31.3630500Z;True|2026-01-06T10:41:35.6408400+08:00;True|2026-01-06T10:22:33.1369055+08:00;False|2026-01-06T10:22:23.4143577+08:00;True|2026-01-05T13:00:09.7525819+08:00;True|2026-01-05T09:56:58.7459126+08:00;False|2026-01-05T09:56:50.7744167+08:00;True|2026-01-04T19:41:03.3384229+08:00;True|2026-01-04T18:38:42.0727166+08:00;False|2026-01-04T18:38:27.9765366+08:00;True|2025-12-30T14:23:14.0889784+08:00;True|2025-12-29T09:12:05.7081903+08:00;False|2025-12-29T09:11:27.9082848+08:00;True|2025-07-01T16:53:57.8492332+08:00;True|2025-07-01T16:14:28.8419744+08:00;True|2025-07-01T15:15:43.3121091+08:00;True|2025-07-01T14:48:00.3454856+08:00;True|2025-07-01T09:17:46.2541717+08:00;False|2025-07-01T09:17:07.0648196+08:00;True|2025-06-23T14:30:28.6691264+08:00;False|2025-06-23T14:27:45.6002040+08:00;True|2025-06-23T11:02:08.3020700+08:00;True|2025-06-23T10:47:44.4654541+08:00;True|2025-06-23T09:46:24.9049910+08:00;False|2025-06-23T09:45:40.5195919+08:00;True|2025-06-20T14:33:10.9210583+08:00;True|2025-06-20T13:22:54.5321865+08:00;False|2025-06-20T13:21:30.8643897+08:00;True|2025-06-20T08:36:32.6695266+08:00;False|2025-06-20T08:35:57.8274069+08:00;True|2025-06-19T08:14:35.0623669+08:00;False|2025-06-19T08:12:57.2451557+08:00;True|2025-06-18T16:56:03.4555368+08:00;True|2025-06-18T16:42:43.2441845+08:00;False|2025-06-18T16:42:02.6907205+08:00;True|2025-06-16T16:13:03.2956026+08:00;False|2025-06-16T16:12:23.8438917+08:00;True|2025-06-16T15:21:32.7370852+08:00;True|2025-06-16T15:08:57.7166003+08:00;True|2025-06-16T14:02:18.4224630+08:00;True|2025-06-16T11:00:03.6375429+08:00;False|2025-06-16T10:59:26.0956296+08:00;True|2025-06-09T16:45:52.0865612+08:00;True|2025-06-09T16:38:47.2182194+08:00;True|2025-06-09T16:17:50.9170601+08:00;False|2025-06-09T16:17:43.0333396+08:00;True|2025-06-09T15:25:17.0429161+08:00;True|2025-06-09T15:00:15.0058791+08:00;True|2025-06-09T14:50:02.1370115+08:00;True|2025-06-09T14:38:10.9037045+08:00;True|2025-06-09T14:34:53.2826267+08:00;True|2025-06-09T14:07:24.5341951+08:00;True|2025-06-09T13:39:17.5042542+08:00;True|2025-06-09T09:30:31.8197114+08:00;True|2025-01-10T13:10:47.2046185+08:00;True|2025-01-10T11:11:49.4016910+08:00;True|2025-01-10T10:59:12.3481721+08:00;False|2025-01-10T10:58:24.5033898+08:00;True|2025-01-04T14:35:42.2792864+08:00;</History>
+ <History>False|2026-01-12T01:27:01.9297704Z;True|2026-01-11T14:27:58.9407325+08:00;False|2026-01-11T14:26:47.1324504+08:00;True|2026-01-11T13:54:38.7697615+08:00;True|2026-01-11T12:39:56.1396008+08:00;False|2026-01-11T12:37:59.5059421+08:00;True|2026-01-09T15:34:00.7959753+08:00;False|2026-01-09T15:32:33.3223847+08:00;True|2026-01-09T10:27:04.4418230+08:00;False|2026-01-09T10:24:55.6104648+08:00;True|2026-01-08T18:05:09.8950096+08:00;False|2026-01-08T18:03:49.6828377+08:00;True|2026-01-08T15:53:31.8458993+08:00;True|2026-01-08T15:43:35.4452984+08:00;True|2026-01-08T15:16:09.2797564+08:00;True|2026-01-08T15:09:12.1761272+08:00;False|2026-01-08T15:08:31.8053125+08:00;True|2026-01-08T12:28:32.3839432+08:00;False|2026-01-08T12:28:06.4930402+08:00;False|2026-01-06T13:05:41.4537127+08:00;True|2026-01-04T11:27:03.6003486+08:00;True|2026-01-04T11:16:09.0856233+08:00;True|2026-01-04T11:09:33.9721372+08:00;True|2026-01-04T10:59:57.5111892+08:00;False|2026-01-04T10:57:57.5312203+08:00;True|2025-12-30T14:23:14.0889784+08:00;True|2025-12-29T09:12:05.7081903+08:00;False|2025-12-29T09:11:27.9082848+08:00;True|2025-07-01T16:53:57.8492332+08:00;True|2025-07-01T16:14:28.8419744+08:00;True|2025-07-01T15:15:43.3121091+08:00;True|2025-07-01T14:48:00.3454856+08:00;True|2025-07-01T09:17:46.2541717+08:00;False|2025-07-01T09:17:07.0648196+08:00;True|2025-06-23T14:30:28.6691264+08:00;False|2025-06-23T14:27:45.6002040+08:00;True|2025-06-23T11:02:08.3020700+08:00;True|2025-06-23T10:47:44.4654541+08:00;True|2025-06-23T09:46:24.9049910+08:00;False|2025-06-23T09:45:40.5195919+08:00;True|2025-06-20T14:33:10.9210583+08:00;True|2025-06-20T13:22:54.5321865+08:00;False|2025-06-20T13:21:30.8643897+08:00;True|2025-06-20T08:36:32.6695266+08:00;False|2025-06-20T08:35:57.8274069+08:00;True|2025-06-19T08:14:35.0623669+08:00;False|2025-06-19T08:12:57.2451557+08:00;True|2025-06-18T16:56:03.4555368+08:00;True|2025-06-18T16:42:43.2441845+08:00;False|2025-06-18T16:42:02.6907205+08:00;True|2025-06-16T16:13:03.2956026+08:00;False|2025-06-16T16:12:23.8438917+08:00;True|2025-06-16T15:21:32.7370852+08:00;True|2025-06-16T15:08:57.7166003+08:00;True|2025-06-16T14:02:18.4224630+08:00;True|2025-06-16T11:00:03.6375429+08:00;False|2025-06-16T10:59:26.0956296+08:00;True|2025-06-09T16:45:52.0865612+08:00;True|2025-06-09T16:38:47.2182194+08:00;True|2025-06-09T16:17:50.9170601+08:00;False|2025-06-09T16:17:43.0333396+08:00;True|2025-06-09T15:25:17.0429161+08:00;True|2025-06-09T15:00:15.0058791+08:00;True|2025-06-09T14:50:02.1370115+08:00;True|2025-06-09T14:38:10.9037045+08:00;True|2025-06-09T14:34:53.2826267+08:00;True|2025-06-09T14:07:24.5341951+08:00;True|2025-06-09T13:39:17.5042542+08:00;True|2025-06-09T09:30:31.8197114+08:00;True|2025-01-10T13:10:47.2046185+08:00;True|2025-01-10T11:11:49.4016910+08:00;True|2025-01-10T10:59:12.3481721+08:00;False|2025-01-10T10:58:24.5033898+08:00;True|2025-01-04T14:35:42.2792864+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
@@ -45,28 +45,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>01/06/2026 10:52:55</publishTime>
+ <publishTime>01/11/2026 14:52:42</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>01/06/2026 10:52:55</publishTime>
+ <publishTime>01/11/2026 14:52:42</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>01/06/2026 10:52:52</publishTime>
+ <publishTime>01/11/2026 14:52:24</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>01/06/2026 10:52:52</publishTime>
+ <publishTime>01/11/2026 14:52:24</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>01/06/2026 10:52:45</publishTime>
+ <publishTime>01/08/2026 15:53:14</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>01/06/2026 10:52:45</publishTime>
+ <publishTime>01/08/2026 15:53:14</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>01/06/2026 10:52:46</publishTime>
+ <publishTime>01/08/2026 15:53:17</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>01/06/2026 10:52:46</publishTime>
+ <publishTime>01/08/2026 15:53:17</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>05/23/2025 10:00:25</publishTime>
@@ -147,34 +147,34 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>01/06/2026 10:52:42</publishTime>
+ <publishTime>01/06/2026 13:06:08</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>01/06/2026 10:52:42</publishTime>
+ <publishTime>01/06/2026 13:06:08</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>01/06/2026 10:52:43</publishTime>
+ <publishTime>01/06/2026 13:06:11</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>01/06/2026 10:52:43</publishTime>
+ <publishTime>01/06/2026 13:06:11</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>01/06/2026 10:52:43</publishTime>
+ <publishTime>01/06/2026 13:06:11</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>01/06/2026 10:52:43</publishTime>
+ <publishTime>01/06/2026 13:06:11</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>01/06/2026 10:52:40</publishTime>
+ <publishTime>01/06/2026 13:01:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>01/06/2026 10:52:40</publishTime>
+ <publishTime>01/06/2026 13:01:08</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>01/06/2026 10:52:44</publishTime>
+ <publishTime>01/06/2026 13:01:08</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>01/06/2026 10:52:44</publishTime>
+ <publishTime>01/06/2026 13:01:08</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>01/06/2026 10:53:08</publishTime>
+ <publishTime>01/12/2026 17:26:36</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>01/06/2026 10:53:08</publishTime>
+ <publishTime>01/12/2026 17:26:36</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
<publishTime>07/01/2025 16:53:56</publishTime>
@@ -504,7 +504,7 @@
<publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web.config">
- <publishTime>01/06/2026 10:53:28</publishTime>
+ <publishTime>01/08/2026 15:43:34</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
index a3000d0..52ba654 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
+++ b/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|2026-01-06T08:58:35.5484672Z;True|2026-01-05T13:39:06.4644994+08:00;False|2026-01-05T13:38:50.7711229+08:00;True|2025-12-30T13:24:33.4231811+08:00;False|2025-12-30T13:24:23.7687660+08:00;True|2025-12-30T08:15:09.6688736+08:00;True|2025-12-30T08:13:50.4492459+08:00;False|2025-12-30T08:13:45.0798847+08:00;True|2025-12-29T16:52:39.7894348+08:00;True|2025-12-29T16:16:10.7792709+08:00;False|2025-12-29T16:16:00.4241687+08:00;True|2025-12-23T09:43:13.8918995+08:00;True|2025-12-23T09:42:09.7206407+08:00;True|2025-12-22T15:40:41.8795215+08:00;False|2025-12-22T15:40:35.2940687+08:00;True|2025-12-22T08:45:57.3615997+08:00;False|2025-12-22T08:45:51.0771978+08:00;True|2025-12-19T16:28:59.2288561+08:00;False|2025-12-19T16:28:41.4920964+08:00;True|2025-12-19T15:43:54.2823664+08:00;True|2025-12-18T08:46:09.8358401+08:00;False|2025-12-18T08:46:02.7318186+08:00;True|2025-12-18T08:07:54.3693074+08:00;False|2025-12-18T08:07:45.6090674+08:00;True|2025-12-17T17:05:23.5970528+08:00;True|2025-12-17T13:08:15.8085856+08:00;True|2025-12-17T12:05:52.9797421+08:00;True|2025-12-17T11:27:47.6416543+08:00;False|2025-12-17T11:27:42.3019407+08:00;True|2025-12-17T11:14:49.0908221+08:00;True|2025-12-17T11:08:53.4369374+08:00;False|2025-12-17T11:08:45.0402692+08:00;True|2025-12-16T16:06:53.1110683+08:00;True|2025-12-16T15:53:59.2905202+08:00;False|2025-12-16T15:53:50.3369570+08:00;True|2025-12-16T13:20:43.3609968+08:00;True|2025-12-16T13:04:36.7893657+08:00;False|2025-12-16T13:04:09.5572052+08:00;True|2025-12-11T17:06:16.6959487+08:00;False|2025-12-11T17:06:03.7184361+08:00;True|2025-12-11T16:18:49.6369388+08:00;False|2025-12-11T16:18:37.3969848+08:00;True|2025-12-08T17:02:56.3292906+08:00;False|2025-12-08T17:02:50.6587191+08:00;True|2025-12-08T14:22:05.5028004+08:00;False|2025-12-08T14:21:51.5681305+08:00;True|2025-12-03T16:01:44.3905890+08:00;False|2025-12-03T16:01:35.0635101+08:00;True|2025-11-28T11:27:04.6248331+08:00;True|2025-11-28T11:07:17.0249718+08:00;False|2025-11-28T11:07:11.3086456+08:00;True|2025-11-27T18:37:16.9508633+08:00;True|2025-11-27T17:10:40.3522364+08:00;True|2025-11-27T16:35:58.2595051+08:00;True|2025-11-27T10:18:55.2307371+08:00;False|2025-11-27T10:18:46.2066993+08:00;True|2025-11-17T09:27:55.7259977+08:00;False|2025-11-17T09:27:16.7136935+08:00;True|2025-11-11T13:58:05.2172999+08:00;True|2025-11-11T10:37:35.1191334+08:00;True|2025-11-10T15:06:22.3357673+08:00;False|2025-11-10T15:06:11.8400556+08:00;True|2025-11-07T08:57:00.1734758+08:00;True|2025-11-06T16:48:00.0284671+08:00;False|2025-11-06T16:47:45.7437599+08:00;True|2025-11-05T13:31:44.6179596+08:00;True|2025-11-05T08:33:54.1548243+08:00;False|2025-11-05T08:33:24.5684931+08:00;True|2025-11-03T13:35:15.5366201+08:00;True|2025-11-03T10:57:58.1269080+08:00;True|2025-11-03T09:27:46.8362957+08:00;False|2025-11-03T09:27:37.6852594+08:00;True|2025-10-31T15:18:06.4022197+08:00;True|2025-10-31T13:32:17.1759540+08:00;False|2025-10-31T13:32:08.0028313+08:00;True|2025-10-31T11:15:10.5355694+08:00;False|2025-10-31T11:14:55.6627999+08:00;True|2025-10-31T10:49:30.4944361+08:00;True|2025-10-31T10:42:57.7706914+08:00;True|2025-10-30T16:15:53.3336368+08:00;False|2025-10-30T16:15:40.9253965+08:00;True|2025-10-28T16:01:06.5666553+08:00;False|2025-10-28T16:00:38.5947348+08:00;True|2025-10-27T13:43:49.5161274+08:00;False|2025-10-27T13:43:42.5342286+08:00;True|2025-10-27T09:42:46.5335165+08:00;True|2025-10-27T08:53:31.2276269+08:00;False|2025-10-27T08:53:25.4177209+08:00;True|2025-10-22T08:11:11.0901859+08:00;False|2025-10-22T08:11:03.4971724+08:00;True|2025-10-16T09:53:45.6893131+08:00;True|2025-10-16T09:46:23.1367811+08:00;True|2025-10-16T09:41:45.9417321+08:00;True|2025-10-16T09:37:10.8036335+08:00;True|2025-10-16T09:34:38.7879337+08:00;True|2025-10-16T09:27:23.7972937+08:00;False|2025-10-16T09:27:15.3584640+08:00;True|2025-10-15T13:18:13.1534605+08:00;True|2025-10-15T11:54:34.1416019+08:00;True|2025-10-14T14:52:11.7549757+08:00;True|2025-10-14T14:02:31.7864158+08:00;True|2025-10-14T13:58:05.5977325+08:00;True|2025-10-14T10:12:35.5186964+08:00;True|2025-10-13T09:24:47.5787047+08:00;False|2025-10-13T09:24:42.7177753+08:00;True|2025-10-13T09:16:46.4811414+08:00;True|2025-10-13T09:15:21.5309960+08:00;True|2025-10-13T09:09:15.1695102+08:00;False|2025-10-13T09:09:08.5879473+08:00;True|2025-10-09T10:00:33.5750010+08:00;True|2025-10-09T09:33:11.4532680+08:00;False|2025-10-09T09:33:04.5858282+08:00;True|2025-09-26T11:07:04.5894247+08:00;False|2025-09-26T11:06:52.9247286+08:00;True|2025-09-24T16:34:25.3145173+08:00;True|2025-09-23T09:30:03.7438798+08:00;False|2025-09-23T09:29:41.1444600+08:00;True|2025-09-17T17:02:04.9034722+08:00;False|2025-09-17T17:01:53.0112736+08:00;True|2025-09-14T18:27:58.3167162+08:00;False|2025-09-14T18:27:47.9377936+08:00;True|2025-08-29T09:29:06.6419251+08:00;True|2025-08-29T09:23:11.0758344+08:00;False|2025-08-29T09:23:00.6033841+08:00;True|2025-08-25T13:43:52.6697107+08:00;False|2025-08-25T13:43:42.8785673+08:00;True|2025-08-21T13:29:18.9335767+08:00;True|2025-08-21T11:13:20.9093967+08:00;False|2025-08-21T11:13:10.8256540+08:00;True|2025-08-19T15:35:19.4743877+08:00;True|2025-08-19T15:09:57.0299457+08:00;False|2025-08-19T15:09:49.9658349+08:00;False|2025-08-19T15:02:52.4274789+08:00;False|2025-08-19T15:02:39.9727509+08:00;False|2025-08-19T15:02:36.7287443+08:00;True|2025-08-19T11:03:00.3784015+08:00;True|2025-08-18T16:53:43.4851878+08:00;False|2025-08-18T16:53:30.4295443+08:00;True|2025-08-18T16:01:19.9787029+08:00;False|2025-08-18T16:01:03.9842180+08:00;True|2025-08-14T18:32:31.1936983+08:00;True|2025-08-13T16:33:00.5421619+08:00;True|2025-08-13T13:22:53.0413832+08:00;False|2025-08-13T13:22:41.0451268+08:00;True|2025-08-12T10:23:11.0645305+08:00;False|2025-08-12T10:23:04.2787778+08:00;True|2025-08-09T13:19:27.9772377+08:00;False|2025-08-09T13:19:12.2232716+08:00;True|2025-08-08T17:01:57.4731423+08:00;True|2025-08-08T12:51:45.7474316+08:00;True|2025-08-08T10:20:06.0336393+08:00;False|2025-08-08T10:19:49.3475689+08:00;True|2025-08-04T22:23:46.6736035+08:00;False|2025-08-04T22:23:34.5441277+08:00;True|2025-08-04T22:17:39.1859867+08:00;True|2025-08-04T22:07:00.9139591+08:00;False|2025-08-04T22:06:52.0807225+08:00;True|2025-08-04T21:40:22.9828884+08:00;True|2025-08-04T21:38:38.0973676+08:00;True|2025-08-04T17:13:55.3765124+08:00;True|2025-08-04T16:47:49.6221076+08:00;False|2025-08-04T16:47:33.9713263+08:00;True|2025-07-24T13:53:49.6344878+08:00;False|2025-07-24T13:53:30.5020566+08:00;True|2025-07-22T16:17:28.5098998+08:00;False|2025-07-22T16:17:11.7327042+08:00;True|2025-07-18T14:36:12.8758873+08:00;True|2025-07-18T14:34:51.0308463+08:00;True|2025-07-17T13:46:41.7825452+08:00;False|2025-07-17T13:46:34.7923451+08:00;True|2025-07-10T15:32:46.2125476+08:00;True|2025-07-10T13:04:51.1753421+08:00;False|2025-07-10T13:04:36.0826557+08:00;True|2025-06-30T15:07:20.0280664+08:00;True|2025-06-27T15:26:25.9639936+08:00;True|2025-06-27T14:47:26.1931097+08:00;True|2025-06-26T14:55:48.9758888+08:00;False|2025-06-26T14:55:35.8969707+08:00;True|2025-06-26T10:10:12.9628884+08:00;True|2025-06-23T11:10:52.6295857+08:00;False|2025-06-23T11:10:46.2505309+08:00;True|2025-06-18T14:13:15.0141966+08:00;False|2025-06-18T14:13:08.3724816+08:00;True|2025-06-18T13:24:40.1027054+08:00;True|2025-06-17T08:19:03.1298222+08:00;False|2025-06-17T08:18:48.1583742+08:00;True|2025-06-12T15:16:16.9926905+08:00;False|2025-06-12T15:16:09.7255464+08:00;True|2025-06-10T07:49:56.5698941+08:00;False|2025-06-10T07:49:47.3414841+08:00;True|2025-06-06T21:04:33.8746305+08:00;True|2025-06-06T20:56:56.6195108+08:00;True|2025-06-06T16:32:26.7872473+08:00;False|2025-06-06T16:31:43.4644697+08:00;True|2025-05-27T13:34:19.9152695+08:00;True|2025-05-26T13:59:11.0434021+08:00;True|2025-05-26T10:32:52.6605356+08:00;False|2025-05-26T10:32:38.4759922+08:00;True|2025-05-21T19:58:17.4859837+08:00;True|2025-05-21T19:56:00.7906025+08:00;True|2025-05-21T19:38:51.0984867+08:00;True|2025-05-21T16:49:04.2014052+08:00;True|2025-05-21T14:47:57.4746320+08:00;True|2025-05-20T19:29:56.6172010+08:00;False|2025-05-20T19:29:50.2198527+08:00;True|2025-05-19T15:06:53.2645411+08:00;True|2025-05-16T16:32:02.9818718+08:00;True|2025-05-16T16:30:33.9588010+08:00;True|2025-05-16T15:44:32.5318879+08:00;True|2025-05-16T15:10:54.6822997+08:00;True|2025-05-16T15:01:00.7569816+08:00;True|2025-05-16T13:50:40.0040164+08:00;True|2025-05-16T13:01:14.5388124+08:00;True|2025-05-16T10:38:20.4876566+08:00;True|2025-05-16T10:23:09.0484073+08:00;True|2025-05-16T10:14:49.6622040+08:00;False|2025-05-16T10:14:36.5792240+08:00;True|2025-05-15T14:29:05.4556596+08:00;True|2025-05-15T14:00:45.9974491+08:00;True|2025-05-15T13:58:06.3825427+08:00;True|2025-05-15T08:35:55.0404130+08:00;True|2025-05-15T08:35:27.5658528+08:00;True|2025-05-14T16:08:41.1106680+08:00;True|2025-05-14T15:43:29.5573491+08:00;True|2025-05-14T15:34:13.5272127+08:00;True|2025-05-13T15:19:29.7660222+08:00;True|2025-05-12T15:58:42.3279365+08:00;True|2025-05-12T14:46:40.4175974+08:00;True|2025-05-12T14:25:17.7975975+08:00;True|2025-05-12T14:15:03.6854114+08:00;True|2025-05-12T13:20:39.4575875+08:00;True|2025-05-12T13:04:59.2637345+08:00;True|2025-05-12T11:05:39.1423146+08:00;True|2025-05-12T11:04:52.2191892+08:00;True|2025-05-12T11:00:33.9329101+08:00;False|2025-05-12T11:00:26.8429710+08:00;True|2025-05-12T10:24:55.6169026+08:00;False|2025-05-12T10:24:26.9432217+08:00;True|2025-05-09T15:17:47.6968997+08:00;False|2025-05-09T15:17:41.5165040+08:00;True|2025-05-08T15:55:24.8437328+08:00;True|2025-05-08T15:49:52.1982131+08:00;True|2025-05-08T14:30:58.6658233+08:00;True|2025-05-08T13:57:47.2409635+08:00;True|2025-05-08T13:49:25.7927065+08:00;True|2025-05-08T10:56:53.9086795+08:00;True|2025-05-08T10:47:04.1369521+08:00;True|2025-05-07T11:19:22.7005176+08:00;True|2025-05-07T11:12:33.5037815+08:00;True|2025-05-07T11:08:26.5089483+08:00;True|2025-05-06T09:56:16.4670446+08:00;True|2025-05-06T09:53:13.1199697+08:00;False|2025-05-06T09:53:05.2692896+08:00;True|2025-04-30T10:16:44.1151152+08:00;True|2025-04-30T10:00:47.3410363+08:00;True|2025-04-30T09:39:12.0356027+08:00;True|2025-04-30T08:45:37.0637703+08:00;True|2025-04-30T08:18:50.0996148+08:00;False|2025-04-30T08:18:21.1738369+08:00;True|2025-04-30T08:09:22.0615915+08:00;False|2025-04-30T08:09:12.5664882+08:00;True|2025-04-29T16:21:28.2743192+08:00;True|2025-04-29T14:10:09.9848859+08:00;True|2025-04-28T11:01:44.6987411+08:00;False|2025-04-28T11:01:34.7062558+08:00;True|2025-04-27T16:12:37.4743910+08:00;False|2025-04-27T16:12:24.8989765+08:00;True|2025-04-24T11:13:25.0763421+08:00;True|2025-04-24T10:49:10.1323679+08:00;True|2025-04-23T11:12:58.7127237+08:00;True|2025-04-22T17:15:39.9949091+08:00;False|2025-04-22T17:15:33.9335391+08:00;True|2025-04-21T16:13:12.9842708+08:00;True|2025-04-21T16:11:03.4262306+08:00;True|2025-04-21T16:06:02.5167412+08:00;True|2025-04-21T16:03:57.2299958+08:00;False|2025-04-21T16:03:44.4356436+08:00;True|2025-04-21T15:28:15.2307697+08:00;True|2025-04-21T15:17:17.5682286+08:00;True|2025-04-21T15:12:16.8982275+08:00;True|2025-04-21T14:53:26.4605418+08:00;True|2025-04-21T14:49:48.8960696+08:00;True|2025-04-21T14:35:59.4591551+08:00;False|2025-04-21T14:35:46.2281772+08:00;True|2025-04-08T13:10:52.8749775+08:00;True|2025-04-08T09:10:05.3755564+08:00;True|2025-04-07T09:32:09.4220262+08:00;True|2025-04-02T10:07:49.7129656+08:00;True|2025-04-02T09:28:18.3104138+08:00;False|2025-04-02T09:28:06.8644783+08:00;True|2025-04-02T09:03:43.1765932+08:00;False|2025-04-02T09:03:36.6874678+08:00;True|2025-03-26T08:15:22.1038130+08:00;True|2025-03-25T17:13:07.6600191+08:00;True|2025-03-25T16:53:58.9214849+08:00;False|2025-03-25T16:53:46.3315797+08:00;True|2025-03-24T15:53:51.6757690+08:00;True|2025-03-24T14:18:37.5668299+08:00;True|2025-03-21T15:06:33.1307351+08:00;True|2025-03-21T15:04:11.9681650+08:00;True|2025-03-21T14:14:59.1591046+08:00;True|2025-03-21T10:25:57.3452453+08:00;True|2025-03-21T09:07:23.5814841+08:00;True|2025-03-20T16:42:24.9342284+08:00;False|2025-03-20T16:42:17.5165982+08:00;True|2025-03-20T16:34:56.3337544+08:00;True|2025-03-20T16:29:15.1683525+08:00;True|2025-03-20T16:23:42.5038047+08:00;True|2025-03-19T20:24:10.0975063+08:00;True|2025-03-18T09:34:22.6164243+08:00;True|2025-03-17T21:47:20.2930413+08:00;True|2025-03-17T19:41:02.3815065+08:00;False|2025-03-17T19:40:55.9908892+08:00;True|2025-03-17T19:19:49.8872115+08:00;True|2025-03-17T18:58:03.6903198+08:00;True|2025-03-17T14:26:34.9258043+08:00;True|2025-03-14T15:40:57.9378742+08:00;False|2025-03-14T15:40:46.0132033+08:00;False|2025-03-14T12:34:38.6551944+08:00;True|2025-03-05T14:35:44.7812995+08:00;True|2025-03-05T12:57:06.2539555+08:00;True|2025-03-05T11:19:01.3450138+08:00;True|2025-03-04T15:25:38.6174966+08:00;True|2025-03-04T14:54:41.4026832+08:00;True|2025-03-04T11:08:16.5619007+08:00;True|2025-03-04T10:01:43.5782535+08:00;True|2025-03-04T08:42:48.4526420+08:00;False|2025-03-04T08:42:42.2828130+08:00;True|2025-02-27T15:13:52.3469275+08:00;True|2025-02-27T10:59:33.6194212+08:00;False|2025-02-27T10:59:25.0394841+08:00;True|2025-02-27T10:44:18.9014583+08:00;True|2025-02-26T14:27:14.6049136+08:00;False|2025-02-26T14:27:02.9843524+08:00;True|2025-02-25T15:20:23.1640745+08:00;True|2025-02-25T14:48:55.2842125+08:00;False|2025-02-25T14:48:42.2715748+08:00;True|2025-02-11T10:10:05.6068846+08:00;True|2025-02-11T09:45:52.5312134+08:00;False|2025-02-11T09:42:54.6560039+08:00;False|2025-02-11T09:42:44.7260867+08:00;True|2025-02-10T15:18:16.8537767+08:00;True|2025-02-10T15:11:21.0436532+08:00;True|2025-02-10T13:51:35.4452640+08:00;True|2025-02-10T13:22:03.2907876+08:00;True|2025-02-10T11:04:24.1824725+08:00;True|2025-02-10T10:28:28.1308553+08:00;False|2025-02-10T10:25:56.3141700+08:00;True|2025-02-10T10:20:23.8683188+08:00;False|2025-02-10T10:20:11.3293731+08:00;True|2025-01-10T16:40:52.1666611+08:00;False|2025-01-10T16:40:46.4916510+08:00;True|2025-01-07T14:28:51.8669083+08:00;True|2025-01-07T13:07:29.9052541+08:00;True|2025-01-07T12:56:00.2870613+08:00;True|2025-01-07T12:43:45.7885867+08:00;True|2025-01-07T11:09:19.5063011+08:00;True|2025-01-07T11:00:06.9697471+08:00;True|2025-01-07T09:56:02.2879532+08:00;True|2025-01-07T09:45:19.5462835+08:00;True|2025-01-07T09:42:50.9089289+08:00;False|2025-01-07T09:42:40.4271324+08:00;True|2025-01-04T15:46:13.8527906+08:00;True|2025-01-04T15:39:45.2037219+08:00;False|2025-01-04T15:39:22.4930686+08:00;True|2025-01-04T13:31:08.6975632+08:00;True|2025-01-04T13:29:16.6440831+08:00;True|2025-01-04T13:13:10.1452466+08:00;True|2025-01-03T14:15:46.7252901+08:00;True|2025-01-03T10:09:32.6319841+08:00;False|2025-01-03T10:09:25.9409250+08:00;True|2024-12-31T15:30:13.0841451+08:00;True|2024-12-31T15:20:44.4779893+08:00;False|2024-12-31T15:20:38.3464087+08:00;True|2024-12-30T19:31:50.5186513+08:00;True|2024-12-30T19:26:51.9369903+08:00;True|2024-12-30T19:03:43.0165721+08:00;True|2024-12-30T17:03:44.6035503+08:00;True|2024-12-30T16:59:37.4694911+08:00;True|2024-12-30T15:14:16.7657186+08:00;False|2024-12-30T15:14:09.9136437+08:00;True|2024-12-28T14:22:43.5822832+08:00;True|2024-12-28T14:10:54.9885289+08:00;True|2024-12-28T13:56:42.0405943+08:00;True|2024-12-28T13:18:42.1604585+08:00;True|2024-12-28T10:48:49.0559287+08:00;False|2024-12-28T10:48:41.8813560+08:00;True|2024-12-27T16:41:50.4368711+08:00;True|2024-12-27T14:31:25.7129706+08:00;True|2024-12-27T11:24:16.6524093+08:00;False|2024-12-27T11:23:25.9617516+08:00;True|2024-12-18T08:34:56.1537647+08:00;True|2024-12-17T13:56:47.7915112+08:00;True|2024-12-17T11:13:27.2665832+08:00;True|2024-12-16T16:01:15.5110052+08:00;True|2024-12-16T15:53:18.1111331+08:00;True|2024-12-16T15:13:43.9719840+08:00;True|2024-12-16T15:08:49.2287341+08:00;True|2024-12-16T14:59:21.3003410+08:00;True|2024-12-16T10:16:34.6636364+08:00;True|2024-12-16T10:12:38.1827164+08:00;False|2024-12-16T10:12:16.1621752+08:00;True|2024-12-13T15:44:29.9921182+08:00;False|2024-12-13T15:43:36.1775569+08:00;True|2024-12-11T09:06:23.2065068+08:00;True|2024-12-11T09:02:10.9767948+08:00;True|2024-12-11T08:26:16.2292105+08:00;True|2024-12-10T16:17:47.2702447+08:00;True|2024-12-10T14:47:18.4352590+08:00;True|2024-12-10T14:10:37.0165625+08:00;True|2024-12-10T13:59:25.4712057+08:00;True|2024-12-10T13:46:02.3070111+08:00;True|2024-12-10T13:39:19.2434918+08:00;True|2024-12-10T10:42:47.3763447+08:00;True|2024-12-10T10:28:20.0524748+08:00;True|2024-12-09T11:01:35.7691980+08:00;True|2024-12-09T09:20:22.9742701+08:00;True|2024-12-09T08:47:26.0470083+08:00;True|2024-12-06T13:13:33.9776030+08:00;True|2024-12-05T14:33:41.1542437+08:00;True|2024-12-05T14:21:02.3120095+08:00;True|2024-12-05T14:13:09.2733831+08:00;True|2024-12-05T13:27:25.9831554+08:00;True|2024-12-05T13:23:25.4183580+08:00;True|2024-12-05T11:27:26.9609695+08:00;True|2024-12-05T09:20:29.4596887+08:00;True|2024-12-05T08:47:57.2553570+08:00;True|2024-12-05T08:41:06.4860297+08:00;True|2024-12-05T08:32:16.9785572+08:00;True|2024-12-04T15:54:19.4995372+08:00;True|2024-12-04T11:10:12.2273624+08:00;True|2024-12-04T10:21:44.8769236+08:00;False|2024-12-04T10:20:59.8206595+08:00;True|2024-12-04T09:52:03.8506923+08:00;True|2024-12-03T15:09:48.8710712+08:00;False|2024-12-03T15:08:46.8904626+08:00;True|2024-11-28T10:42:45.3823067+08:00;True|2024-11-28T09:58:38.0983021+08:00;True|2024-11-27T16:16:28.4276838+08:00;True|2024-11-27T16:09:08.0834912+08:00;True|2024-11-27T14:32:21.1684294+08:00;True|2024-11-27T13:24:51.2115157+08:00;True|2024-11-27T13:16:51.5888615+08:00;True|2024-11-26T10:47:18.1958719+08:00;False|2024-11-26T10:46:22.2016963+08:00;False|2024-11-25T10:22:55.3420353+08:00;True|2024-11-20T09:08:48.6293480+08:00;True|2024-11-19T17:01:27.8454996+08:00;True|2024-11-19T08:20:49.6371464+08:00;True|2024-11-18T15:27:25.3419580+08:00;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>
+ <History>True|2026-01-12T03:03:44.8671220Z;False|2026-01-12T11:03:39.1688548+08:00;True|2026-01-12T10:43:22.5289499+08:00;False|2026-01-12T10:43:12.7832171+08:00;True|2026-01-06T16:58:35.5484672+08:00;True|2026-01-05T13:39:06.4644994+08:00;False|2026-01-05T13:38:50.7711229+08:00;True|2025-12-30T13:24:33.4231811+08:00;False|2025-12-30T13:24:23.7687660+08:00;True|2025-12-30T08:15:09.6688736+08:00;True|2025-12-30T08:13:50.4492459+08:00;False|2025-12-30T08:13:45.0798847+08:00;True|2025-12-29T16:52:39.7894348+08:00;True|2025-12-29T16:16:10.7792709+08:00;False|2025-12-29T16:16:00.4241687+08:00;True|2025-12-23T09:43:13.8918995+08:00;True|2025-12-23T09:42:09.7206407+08:00;True|2025-12-22T15:40:41.8795215+08:00;False|2025-12-22T15:40:35.2940687+08:00;True|2025-12-22T08:45:57.3615997+08:00;False|2025-12-22T08:45:51.0771978+08:00;True|2025-12-19T16:28:59.2288561+08:00;False|2025-12-19T16:28:41.4920964+08:00;True|2025-12-19T15:43:54.2823664+08:00;True|2025-12-18T08:46:09.8358401+08:00;False|2025-12-18T08:46:02.7318186+08:00;True|2025-12-18T08:07:54.3693074+08:00;False|2025-12-18T08:07:45.6090674+08:00;True|2025-12-17T17:05:23.5970528+08:00;True|2025-12-17T13:08:15.8085856+08:00;True|2025-12-17T12:05:52.9797421+08:00;True|2025-12-17T11:27:47.6416543+08:00;False|2025-12-17T11:27:42.3019407+08:00;True|2025-12-17T11:14:49.0908221+08:00;True|2025-12-17T11:08:53.4369374+08:00;False|2025-12-17T11:08:45.0402692+08:00;True|2025-12-16T16:06:53.1110683+08:00;True|2025-12-16T15:53:59.2905202+08:00;False|2025-12-16T15:53:50.3369570+08:00;True|2025-12-16T13:20:43.3609968+08:00;True|2025-12-16T13:04:36.7893657+08:00;False|2025-12-16T13:04:09.5572052+08:00;True|2025-12-11T17:06:16.6959487+08:00;False|2025-12-11T17:06:03.7184361+08:00;True|2025-12-11T16:18:49.6369388+08:00;False|2025-12-11T16:18:37.3969848+08:00;True|2025-12-08T17:02:56.3292906+08:00;False|2025-12-08T17:02:50.6587191+08:00;True|2025-12-08T14:22:05.5028004+08:00;False|2025-12-08T14:21:51.5681305+08:00;True|2025-12-03T16:01:44.3905890+08:00;False|2025-12-03T16:01:35.0635101+08:00;True|2025-11-28T11:27:04.6248331+08:00;True|2025-11-28T11:07:17.0249718+08:00;False|2025-11-28T11:07:11.3086456+08:00;True|2025-11-27T18:37:16.9508633+08:00;True|2025-11-27T17:10:40.3522364+08:00;True|2025-11-27T16:35:58.2595051+08:00;True|2025-11-27T10:18:55.2307371+08:00;False|2025-11-27T10:18:46.2066993+08:00;True|2025-11-17T09:27:55.7259977+08:00;False|2025-11-17T09:27:16.7136935+08:00;True|2025-11-11T13:58:05.2172999+08:00;True|2025-11-11T10:37:35.1191334+08:00;True|2025-11-10T15:06:22.3357673+08:00;False|2025-11-10T15:06:11.8400556+08:00;True|2025-11-07T08:57:00.1734758+08:00;True|2025-11-06T16:48:00.0284671+08:00;False|2025-11-06T16:47:45.7437599+08:00;True|2025-11-05T13:31:44.6179596+08:00;True|2025-11-05T08:33:54.1548243+08:00;False|2025-11-05T08:33:24.5684931+08:00;True|2025-11-03T13:35:15.5366201+08:00;True|2025-11-03T10:57:58.1269080+08:00;True|2025-11-03T09:27:46.8362957+08:00;False|2025-11-03T09:27:37.6852594+08:00;True|2025-10-31T15:18:06.4022197+08:00;True|2025-10-31T13:32:17.1759540+08:00;False|2025-10-31T13:32:08.0028313+08:00;True|2025-10-31T11:15:10.5355694+08:00;False|2025-10-31T11:14:55.6627999+08:00;True|2025-10-31T10:49:30.4944361+08:00;True|2025-10-31T10:42:57.7706914+08:00;True|2025-10-30T16:15:53.3336368+08:00;False|2025-10-30T16:15:40.9253965+08:00;True|2025-10-28T16:01:06.5666553+08:00;False|2025-10-28T16:00:38.5947348+08:00;True|2025-10-27T13:43:49.5161274+08:00;False|2025-10-27T13:43:42.5342286+08:00;True|2025-10-27T09:42:46.5335165+08:00;True|2025-10-27T08:53:31.2276269+08:00;False|2025-10-27T08:53:25.4177209+08:00;True|2025-10-22T08:11:11.0901859+08:00;False|2025-10-22T08:11:03.4971724+08:00;True|2025-10-16T09:53:45.6893131+08:00;True|2025-10-16T09:46:23.1367811+08:00;True|2025-10-16T09:41:45.9417321+08:00;True|2025-10-16T09:37:10.8036335+08:00;True|2025-10-16T09:34:38.7879337+08:00;True|2025-10-16T09:27:23.7972937+08:00;False|2025-10-16T09:27:15.3584640+08:00;True|2025-10-15T13:18:13.1534605+08:00;True|2025-10-15T11:54:34.1416019+08:00;True|2025-10-14T14:52:11.7549757+08:00;True|2025-10-14T14:02:31.7864158+08:00;True|2025-10-14T13:58:05.5977325+08:00;True|2025-10-14T10:12:35.5186964+08:00;True|2025-10-13T09:24:47.5787047+08:00;False|2025-10-13T09:24:42.7177753+08:00;True|2025-10-13T09:16:46.4811414+08:00;True|2025-10-13T09:15:21.5309960+08:00;True|2025-10-13T09:09:15.1695102+08:00;False|2025-10-13T09:09:08.5879473+08:00;True|2025-10-09T10:00:33.5750010+08:00;True|2025-10-09T09:33:11.4532680+08:00;False|2025-10-09T09:33:04.5858282+08:00;True|2025-09-26T11:07:04.5894247+08:00;False|2025-09-26T11:06:52.9247286+08:00;True|2025-09-24T16:34:25.3145173+08:00;True|2025-09-23T09:30:03.7438798+08:00;False|2025-09-23T09:29:41.1444600+08:00;True|2025-09-17T17:02:04.9034722+08:00;False|2025-09-17T17:01:53.0112736+08:00;True|2025-09-14T18:27:58.3167162+08:00;False|2025-09-14T18:27:47.9377936+08:00;True|2025-08-29T09:29:06.6419251+08:00;True|2025-08-29T09:23:11.0758344+08:00;False|2025-08-29T09:23:00.6033841+08:00;True|2025-08-25T13:43:52.6697107+08:00;False|2025-08-25T13:43:42.8785673+08:00;True|2025-08-21T13:29:18.9335767+08:00;True|2025-08-21T11:13:20.9093967+08:00;False|2025-08-21T11:13:10.8256540+08:00;True|2025-08-19T15:35:19.4743877+08:00;True|2025-08-19T15:09:57.0299457+08:00;False|2025-08-19T15:09:49.9658349+08:00;False|2025-08-19T15:02:52.4274789+08:00;False|2025-08-19T15:02:39.9727509+08:00;False|2025-08-19T15:02:36.7287443+08:00;True|2025-08-19T11:03:00.3784015+08:00;True|2025-08-18T16:53:43.4851878+08:00;False|2025-08-18T16:53:30.4295443+08:00;True|2025-08-18T16:01:19.9787029+08:00;False|2025-08-18T16:01:03.9842180+08:00;True|2025-08-14T18:32:31.1936983+08:00;True|2025-08-13T16:33:00.5421619+08:00;True|2025-08-13T13:22:53.0413832+08:00;False|2025-08-13T13:22:41.0451268+08:00;True|2025-08-12T10:23:11.0645305+08:00;False|2025-08-12T10:23:04.2787778+08:00;True|2025-08-09T13:19:27.9772377+08:00;False|2025-08-09T13:19:12.2232716+08:00;True|2025-08-08T17:01:57.4731423+08:00;True|2025-08-08T12:51:45.7474316+08:00;True|2025-08-08T10:20:06.0336393+08:00;False|2025-08-08T10:19:49.3475689+08:00;True|2025-08-04T22:23:46.6736035+08:00;False|2025-08-04T22:23:34.5441277+08:00;True|2025-08-04T22:17:39.1859867+08:00;True|2025-08-04T22:07:00.9139591+08:00;False|2025-08-04T22:06:52.0807225+08:00;True|2025-08-04T21:40:22.9828884+08:00;True|2025-08-04T21:38:38.0973676+08:00;True|2025-08-04T17:13:55.3765124+08:00;True|2025-08-04T16:47:49.6221076+08:00;False|2025-08-04T16:47:33.9713263+08:00;True|2025-07-24T13:53:49.6344878+08:00;False|2025-07-24T13:53:30.5020566+08:00;True|2025-07-22T16:17:28.5098998+08:00;False|2025-07-22T16:17:11.7327042+08:00;True|2025-07-18T14:36:12.8758873+08:00;True|2025-07-18T14:34:51.0308463+08:00;True|2025-07-17T13:46:41.7825452+08:00;False|2025-07-17T13:46:34.7923451+08:00;True|2025-07-10T15:32:46.2125476+08:00;True|2025-07-10T13:04:51.1753421+08:00;False|2025-07-10T13:04:36.0826557+08:00;True|2025-06-30T15:07:20.0280664+08:00;True|2025-06-27T15:26:25.9639936+08:00;True|2025-06-27T14:47:26.1931097+08:00;True|2025-06-26T14:55:48.9758888+08:00;False|2025-06-26T14:55:35.8969707+08:00;True|2025-06-26T10:10:12.9628884+08:00;True|2025-06-23T11:10:52.6295857+08:00;False|2025-06-23T11:10:46.2505309+08:00;True|2025-06-18T14:13:15.0141966+08:00;False|2025-06-18T14:13:08.3724816+08:00;True|2025-06-18T13:24:40.1027054+08:00;True|2025-06-17T08:19:03.1298222+08:00;False|2025-06-17T08:18:48.1583742+08:00;True|2025-06-12T15:16:16.9926905+08:00;False|2025-06-12T15:16:09.7255464+08:00;True|2025-06-10T07:49:56.5698941+08:00;False|2025-06-10T07:49:47.3414841+08:00;True|2025-06-06T21:04:33.8746305+08:00;True|2025-06-06T20:56:56.6195108+08:00;True|2025-06-06T16:32:26.7872473+08:00;False|2025-06-06T16:31:43.4644697+08:00;True|2025-05-27T13:34:19.9152695+08:00;True|2025-05-26T13:59:11.0434021+08:00;True|2025-05-26T10:32:52.6605356+08:00;False|2025-05-26T10:32:38.4759922+08:00;True|2025-05-21T19:58:17.4859837+08:00;True|2025-05-21T19:56:00.7906025+08:00;True|2025-05-21T19:38:51.0984867+08:00;True|2025-05-21T16:49:04.2014052+08:00;True|2025-05-21T14:47:57.4746320+08:00;True|2025-05-20T19:29:56.6172010+08:00;False|2025-05-20T19:29:50.2198527+08:00;True|2025-05-19T15:06:53.2645411+08:00;True|2025-05-16T16:32:02.9818718+08:00;True|2025-05-16T16:30:33.9588010+08:00;True|2025-05-16T15:44:32.5318879+08:00;True|2025-05-16T15:10:54.6822997+08:00;True|2025-05-16T15:01:00.7569816+08:00;True|2025-05-16T13:50:40.0040164+08:00;True|2025-05-16T13:01:14.5388124+08:00;True|2025-05-16T10:38:20.4876566+08:00;True|2025-05-16T10:23:09.0484073+08:00;True|2025-05-16T10:14:49.6622040+08:00;False|2025-05-16T10:14:36.5792240+08:00;True|2025-05-15T14:29:05.4556596+08:00;True|2025-05-15T14:00:45.9974491+08:00;True|2025-05-15T13:58:06.3825427+08:00;True|2025-05-15T08:35:55.0404130+08:00;True|2025-05-15T08:35:27.5658528+08:00;True|2025-05-14T16:08:41.1106680+08:00;True|2025-05-14T15:43:29.5573491+08:00;True|2025-05-14T15:34:13.5272127+08:00;True|2025-05-13T15:19:29.7660222+08:00;True|2025-05-12T15:58:42.3279365+08:00;True|2025-05-12T14:46:40.4175974+08:00;True|2025-05-12T14:25:17.7975975+08:00;True|2025-05-12T14:15:03.6854114+08:00;True|2025-05-12T13:20:39.4575875+08:00;True|2025-05-12T13:04:59.2637345+08:00;True|2025-05-12T11:05:39.1423146+08:00;True|2025-05-12T11:04:52.2191892+08:00;True|2025-05-12T11:00:33.9329101+08:00;False|2025-05-12T11:00:26.8429710+08:00;True|2025-05-12T10:24:55.6169026+08:00;False|2025-05-12T10:24:26.9432217+08:00;True|2025-05-09T15:17:47.6968997+08:00;False|2025-05-09T15:17:41.5165040+08:00;True|2025-05-08T15:55:24.8437328+08:00;True|2025-05-08T15:49:52.1982131+08:00;True|2025-05-08T14:30:58.6658233+08:00;True|2025-05-08T13:57:47.2409635+08:00;True|2025-05-08T13:49:25.7927065+08:00;True|2025-05-08T10:56:53.9086795+08:00;True|2025-05-08T10:47:04.1369521+08:00;True|2025-05-07T11:19:22.7005176+08:00;True|2025-05-07T11:12:33.5037815+08:00;True|2025-05-07T11:08:26.5089483+08:00;True|2025-05-06T09:56:16.4670446+08:00;True|2025-05-06T09:53:13.1199697+08:00;False|2025-05-06T09:53:05.2692896+08:00;True|2025-04-30T10:16:44.1151152+08:00;True|2025-04-30T10:00:47.3410363+08:00;True|2025-04-30T09:39:12.0356027+08:00;True|2025-04-30T08:45:37.0637703+08:00;True|2025-04-30T08:18:50.0996148+08:00;False|2025-04-30T08:18:21.1738369+08:00;True|2025-04-30T08:09:22.0615915+08:00;False|2025-04-30T08:09:12.5664882+08:00;True|2025-04-29T16:21:28.2743192+08:00;True|2025-04-29T14:10:09.9848859+08:00;True|2025-04-28T11:01:44.6987411+08:00;False|2025-04-28T11:01:34.7062558+08:00;True|2025-04-27T16:12:37.4743910+08:00;False|2025-04-27T16:12:24.8989765+08:00;True|2025-04-24T11:13:25.0763421+08:00;True|2025-04-24T10:49:10.1323679+08:00;True|2025-04-23T11:12:58.7127237+08:00;True|2025-04-22T17:15:39.9949091+08:00;False|2025-04-22T17:15:33.9335391+08:00;True|2025-04-21T16:13:12.9842708+08:00;True|2025-04-21T16:11:03.4262306+08:00;True|2025-04-21T16:06:02.5167412+08:00;True|2025-04-21T16:03:57.2299958+08:00;False|2025-04-21T16:03:44.4356436+08:00;True|2025-04-21T15:28:15.2307697+08:00;True|2025-04-21T15:17:17.5682286+08:00;True|2025-04-21T15:12:16.8982275+08:00;True|2025-04-21T14:53:26.4605418+08:00;True|2025-04-21T14:49:48.8960696+08:00;True|2025-04-21T14:35:59.4591551+08:00;False|2025-04-21T14:35:46.2281772+08:00;True|2025-04-08T13:10:52.8749775+08:00;True|2025-04-08T09:10:05.3755564+08:00;True|2025-04-07T09:32:09.4220262+08:00;True|2025-04-02T10:07:49.7129656+08:00;True|2025-04-02T09:28:18.3104138+08:00;False|2025-04-02T09:28:06.8644783+08:00;True|2025-04-02T09:03:43.1765932+08:00;False|2025-04-02T09:03:36.6874678+08:00;True|2025-03-26T08:15:22.1038130+08:00;True|2025-03-25T17:13:07.6600191+08:00;True|2025-03-25T16:53:58.9214849+08:00;False|2025-03-25T16:53:46.3315797+08:00;True|2025-03-24T15:53:51.6757690+08:00;True|2025-03-24T14:18:37.5668299+08:00;True|2025-03-21T15:06:33.1307351+08:00;True|2025-03-21T15:04:11.9681650+08:00;True|2025-03-21T14:14:59.1591046+08:00;True|2025-03-21T10:25:57.3452453+08:00;True|2025-03-21T09:07:23.5814841+08:00;True|2025-03-20T16:42:24.9342284+08:00;False|2025-03-20T16:42:17.5165982+08:00;True|2025-03-20T16:34:56.3337544+08:00;True|2025-03-20T16:29:15.1683525+08:00;True|2025-03-20T16:23:42.5038047+08:00;True|2025-03-19T20:24:10.0975063+08:00;True|2025-03-18T09:34:22.6164243+08:00;True|2025-03-17T21:47:20.2930413+08:00;True|2025-03-17T19:41:02.3815065+08:00;False|2025-03-17T19:40:55.9908892+08:00;True|2025-03-17T19:19:49.8872115+08:00;True|2025-03-17T18:58:03.6903198+08:00;True|2025-03-17T14:26:34.9258043+08:00;True|2025-03-14T15:40:57.9378742+08:00;False|2025-03-14T15:40:46.0132033+08:00;False|2025-03-14T12:34:38.6551944+08:00;True|2025-03-05T14:35:44.7812995+08:00;True|2025-03-05T12:57:06.2539555+08:00;True|2025-03-05T11:19:01.3450138+08:00;True|2025-03-04T15:25:38.6174966+08:00;True|2025-03-04T14:54:41.4026832+08:00;True|2025-03-04T11:08:16.5619007+08:00;True|2025-03-04T10:01:43.5782535+08:00;True|2025-03-04T08:42:48.4526420+08:00;False|2025-03-04T08:42:42.2828130+08:00;True|2025-02-27T15:13:52.3469275+08:00;True|2025-02-27T10:59:33.6194212+08:00;False|2025-02-27T10:59:25.0394841+08:00;True|2025-02-27T10:44:18.9014583+08:00;True|2025-02-26T14:27:14.6049136+08:00;False|2025-02-26T14:27:02.9843524+08:00;True|2025-02-25T15:20:23.1640745+08:00;True|2025-02-25T14:48:55.2842125+08:00;False|2025-02-25T14:48:42.2715748+08:00;True|2025-02-11T10:10:05.6068846+08:00;True|2025-02-11T09:45:52.5312134+08:00;False|2025-02-11T09:42:54.6560039+08:00;False|2025-02-11T09:42:44.7260867+08:00;True|2025-02-10T15:18:16.8537767+08:00;True|2025-02-10T15:11:21.0436532+08:00;True|2025-02-10T13:51:35.4452640+08:00;True|2025-02-10T13:22:03.2907876+08:00;True|2025-02-10T11:04:24.1824725+08:00;True|2025-02-10T10:28:28.1308553+08:00;False|2025-02-10T10:25:56.3141700+08:00;True|2025-02-10T10:20:23.8683188+08:00;False|2025-02-10T10:20:11.3293731+08:00;True|2025-01-10T16:40:52.1666611+08:00;False|2025-01-10T16:40:46.4916510+08:00;True|2025-01-07T14:28:51.8669083+08:00;True|2025-01-07T13:07:29.9052541+08:00;True|2025-01-07T12:56:00.2870613+08:00;True|2025-01-07T12:43:45.7885867+08:00;True|2025-01-07T11:09:19.5063011+08:00;True|2025-01-07T11:00:06.9697471+08:00;True|2025-01-07T09:56:02.2879532+08:00;True|2025-01-07T09:45:19.5462835+08:00;True|2025-01-07T09:42:50.9089289+08:00;False|2025-01-07T09:42:40.4271324+08:00;True|2025-01-04T15:46:13.8527906+08:00;True|2025-01-04T15:39:45.2037219+08:00;False|2025-01-04T15:39:22.4930686+08:00;True|2025-01-04T13:31:08.6975632+08:00;True|2025-01-04T13:29:16.6440831+08:00;True|2025-01-04T13:13:10.1452466+08:00;True|2025-01-03T14:15:46.7252901+08:00;True|2025-01-03T10:09:32.6319841+08:00;False|2025-01-03T10:09:25.9409250+08:00;True|2024-12-31T15:30:13.0841451+08:00;True|2024-12-31T15:20:44.4779893+08:00;False|2024-12-31T15:20:38.3464087+08:00;True|2024-12-30T19:31:50.5186513+08:00;True|2024-12-30T19:26:51.9369903+08:00;True|2024-12-30T19:03:43.0165721+08:00;True|2024-12-30T17:03:44.6035503+08:00;True|2024-12-30T16:59:37.4694911+08:00;True|2024-12-30T15:14:16.7657186+08:00;False|2024-12-30T15:14:09.9136437+08:00;True|2024-12-28T14:22:43.5822832+08:00;True|2024-12-28T14:10:54.9885289+08:00;True|2024-12-28T13:56:42.0405943+08:00;True|2024-12-28T13:18:42.1604585+08:00;True|2024-12-28T10:48:49.0559287+08:00;False|2024-12-28T10:48:41.8813560+08:00;True|2024-12-27T16:41:50.4368711+08:00;True|2024-12-27T14:31:25.7129706+08:00;True|2024-12-27T11:24:16.6524093+08:00;False|2024-12-27T11:23:25.9617516+08:00;True|2024-12-18T08:34:56.1537647+08:00;True|2024-12-17T13:56:47.7915112+08:00;True|2024-12-17T11:13:27.2665832+08:00;True|2024-12-16T16:01:15.5110052+08:00;True|2024-12-16T15:53:18.1111331+08:00;True|2024-12-16T15:13:43.9719840+08:00;True|2024-12-16T15:08:49.2287341+08:00;True|2024-12-16T14:59:21.3003410+08:00;True|2024-12-16T10:16:34.6636364+08:00;True|2024-12-16T10:12:38.1827164+08:00;False|2024-12-16T10:12:16.1621752+08:00;True|2024-12-13T15:44:29.9921182+08:00;False|2024-12-13T15:43:36.1775569+08:00;True|2024-12-11T09:06:23.2065068+08:00;True|2024-12-11T09:02:10.9767948+08:00;True|2024-12-11T08:26:16.2292105+08:00;True|2024-12-10T16:17:47.2702447+08:00;True|2024-12-10T14:47:18.4352590+08:00;True|2024-12-10T14:10:37.0165625+08:00;True|2024-12-10T13:59:25.4712057+08:00;True|2024-12-10T13:46:02.3070111+08:00;True|2024-12-10T13:39:19.2434918+08:00;True|2024-12-10T10:42:47.3763447+08:00;True|2024-12-10T10:28:20.0524748+08:00;True|2024-12-09T11:01:35.7691980+08:00;True|2024-12-09T09:20:22.9742701+08:00;True|2024-12-09T08:47:26.0470083+08:00;True|2024-12-06T13:13:33.9776030+08:00;True|2024-12-05T14:33:41.1542437+08:00;True|2024-12-05T14:21:02.3120095+08:00;True|2024-12-05T14:13:09.2733831+08:00;True|2024-12-05T13:27:25.9831554+08:00;True|2024-12-05T13:23:25.4183580+08:00;True|2024-12-05T11:27:26.9609695+08:00;True|2024-12-05T09:20:29.4596887+08:00;True|2024-12-05T08:47:57.2553570+08:00;True|2024-12-05T08:41:06.4860297+08:00;True|2024-12-05T08:32:16.9785572+08:00;True|2024-12-04T15:54:19.4995372+08:00;True|2024-12-04T11:10:12.2273624+08:00;True|2024-12-04T10:21:44.8769236+08:00;False|2024-12-04T10:20:59.8206595+08:00;True|2024-12-04T09:52:03.8506923+08:00;True|2024-12-03T15:09:48.8710712+08:00;False|2024-12-03T15:08:46.8904626+08:00;True|2024-11-28T10:42:45.3823067+08:00;True|2024-11-28T09:58:38.0983021+08:00;True|2024-11-27T16:16:28.4276838+08:00;True|2024-11-27T16:09:08.0834912+08:00;True|2024-11-27T14:32:21.1684294+08:00;True|2024-11-27T13:24:51.2115157+08:00;True|2024-11-27T13:16:51.5888615+08:00;True|2024-11-26T10:47:18.1958719+08:00;False|2024-11-26T10:46:22.2016963+08:00;False|2024-11-25T10:22:55.3420353+08:00;True|2024-11-20T09:08:48.6293480+08:00;True|2024-11-19T17:01:27.8454996+08:00;True|2024-11-19T08:20:49.6371464+08:00;True|2024-11-18T15:27:25.3419580+08:00;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>D:\缃戠珯鍙戝竷\API</_PublishTargetUrl>
</PropertyGroup>
<ItemGroup>
@@ -45,28 +45,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>01/06/2026 16:58:15</publishTime>
+ <publishTime>01/12/2026 11:01:41</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>01/06/2026 16:58:15</publishTime>
+ <publishTime>01/12/2026 11:01:41</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>01/06/2026 16:58:12</publishTime>
+ <publishTime>01/12/2026 11:01:39</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>01/06/2026 16:58:12</publishTime>
+ <publishTime>01/12/2026 11:01:39</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>01/06/2026 16:58:09</publishTime>
+ <publishTime>01/12/2026 11:01:36</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>01/06/2026 16:58:09</publishTime>
+ <publishTime>01/12/2026 11:01:36</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>01/06/2026 16:58:11</publishTime>
+ <publishTime>01/12/2026 11:01:37</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>01/06/2026 16:58:11</publishTime>
+ <publishTime>01/12/2026 11:01:37</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>08/18/2025 16:11:18</publishTime>
@@ -147,25 +147,25 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>01/06/2026 16:58:07</publishTime>
+ <publishTime>01/12/2026 11:01:34</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>01/06/2026 16:58:07</publishTime>
+ <publishTime>01/12/2026 11:01:34</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>01/06/2026 16:58:08</publishTime>
+ <publishTime>01/12/2026 11:01:35</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>01/06/2026 16:58:08</publishTime>
+ <publishTime>01/12/2026 11:01:35</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>01/06/2026 16:58:08</publishTime>
+ <publishTime>01/12/2026 11:01:34</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>01/06/2026 16:58:08</publishTime>
+ <publishTime>01/12/2026 11:01:34</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
@@ -294,10 +294,10 @@
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>01/06/2026 16:58:25</publishTime>
+ <publishTime>01/12/2026 11:01:47</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>01/06/2026 16:58:25</publishTime>
+ <publishTime>01/12/2026 11:01:47</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
<publishTime>08/16/2024 16:55:28</publishTime>
@@ -507,7 +507,7 @@
<publishTime>04/29/2024 08:30:03</publishTime>
</File>
<File Include="Web.config">
- <publishTime>01/06/2026 16:58:33</publishTime>
+ <publishTime>01/12/2026 11:03:43</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Service/YqnQbService.cs b/WebAPI/Service/YqnQbService.cs
index cfa77d4..25126d5 100644
--- a/WebAPI/Service/YqnQbService.cs
+++ b/WebAPI/Service/YqnQbService.cs
@@ -411,7 +411,7 @@
public static DataSet GetGroupDb(string sWhere)
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- var dataSet = oCN.RunProcReturn("Select HItemID,HNumber 宸ヤ綔涓績浠ｇ爜,HName 宸ヤ綔涓績 from Gy_WorkCenter where HStopflag=0 " + sWhere + " Order by HItemID ", "Gy_Source");
+ var dataSet = oCN.RunProcReturn("Select HItemID,HNumber 宸ヤ綔涓績浠ｇ爜,HName 宸ヤ綔涓績 from Gy_WorkCenter where HStopflag=0 " + sWhere + " Order by HItemID ", "Gy_WorkCenter");
return dataSet;
}
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index 41ca5eb..6521186 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -35,12 +35,12 @@
<!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/>--> <!--娴嬭瘯鏈嶅姟鍣�-->
<!--<add key="surl" value="http://localhost:8082/webs/webservice1.asmx"/> --><!--鏈湴-->
<!--<add key="sUrl" value="http://192.168.110.57:81/WEBS/WebService1.asmx"/>--> <!--闄堥洴闈欐湰鍦伴厤缃�-->
- <!--<add key="surl" value="http://localhost/webs-web/webservice1.asmx" />--> <!--缈佹稕娑涙湰鍦伴厤缃�-->
+ <!--<add key="surl" value="http://localhost/WEBS-WMS/webservice1.asmx" /> --><!--缈佹稕娑涙湰鍦伴厤缃�-->
<!--<add key="sUrl" value="http://192.168.1.57:8082/WEBS-WMS/WebService1.asmx"/>涔濊彵-->
<!--<add key="sUrl" value="http://61.130.182.102:18181/WEBSCS/WebService1.asmx"/>--><!--鏂帿灏�-->
<!--<add key="surl" value="http://192.168.0.113/WEBS-WMS/Webservice1.asmx" />涓夊崌鏈湴閰嶇疆-->
<!--<add key="surl" value="http://36.134.2.30:200/WEBS-WMS/WebService1.asmx" />--> <!--閲戝竻-->
- <add key="sUrl" value="http://localhost:81/MESWMS-WEBS/WebService1.asmx" />
+ <add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx" />
<add key="webpages:Version" value="3.0.0.0" />
<add key="webpages:Enabled" value="false" />
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index af48005..960cb57 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -477,6 +477,7 @@
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_DayPlanPlatFormBill_TKController.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱Xs_SendGoodsPlanBillController.cs" />
<Compile Include="Controllers\WLGL\Cg_CarTrajectoryBillController.cs" />
+ <Compile Include="Controllers\Sc_EmployeeSignInNoteBillController.cs" />
<Compile Include="Controllers\XSGL\Crm_ComplainVisitBillController.cs" />
<Compile Include="Controllers\XSGL\Xs_SellOutBillList_SecController.cs" />
<Compile Include="Controllers\XSGL\Xs_SeQuotationBillController.cs" />
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index 235ff41..4fff7d9 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Debug|x86</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
@@ -12,29 +12,5 @@
<NameOfLastUsedPublishProfile>D:\gz\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>D:\gz\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile3.pubxml</NameOfLastUsedPublishProfile>
</PropertyGroup>
- <ProjectExtensions>
- <VisualStudio>
- <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
- <WebProjectProperties>
- <StartPageUrl>
- </StartPageUrl>
- <StartAction>CurrentPage</StartAction>
- <AspNetDebugging>True</AspNetDebugging>
- <SilverlightDebugging>False</SilverlightDebugging>
- <NativeDebugging>False</NativeDebugging>
- <SQLDebugging>False</SQLDebugging>
- <ExternalProgram>
- </ExternalProgram>
- <StartExternalURL>
- </StartExternalURL>
- <StartCmdLineArguments>
- </StartCmdLineArguments>
- <StartWorkingDirectory>
- </StartWorkingDirectory>
- <EnableENC>True</EnableENC>
- <AlwaysStartWebServerOnDebug>False</AlwaysStartWebServerOnDebug>
- </WebProjectProperties>
- </FlavorProperties>
- </VisualStudio>
- </ProjectExtensions>
+ <ProjectExtensions />
</Project>
\ No newline at end of file
diff --git a/WorkM/WorkM.csproj b/WorkM/WorkM.csproj
index df12a27..cb7a58c 100644
--- a/WorkM/WorkM.csproj
+++ b/WorkM/WorkM.csproj
@@ -1462,6 +1462,7 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
+ <None Include="app.config" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
diff --git a/WorkM/app.config b/WorkM/app.config
new file mode 100644
index 0000000..7ca9f4c
--- /dev/null
+++ b/WorkM/app.config
@@ -0,0 +1,23 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <runtime>
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <dependentAssembly>
+ <assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.3.2.10" newVersion="1.3.2.10" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
+</configuration>
\ No newline at end of file
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
index 22cd26a..1380f6e 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 c864829..9099933 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/bin/Release/TopSdk.dll b/sdk_dingding/TopSdk/bin/Release/TopSdk.dll
index 35bd74a..89db198 100644
--- a/sdk_dingding/TopSdk/bin/Release/TopSdk.dll
+++ b/sdk_dingding/TopSdk/bin/Release/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/bin/Release/TopSdk.pdb b/sdk_dingding/TopSdk/bin/Release/TopSdk.pdb
index 2b3e479..774f3d6 100644
--- a/sdk_dingding/TopSdk/bin/Release/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/bin/Release/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 35e5324..f6c481e 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 cc76324..fbb915d 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
@@ -1,28 +1,24 @@
<<<<<<< HEAD
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
+=======
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
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
<<<<<<< HEAD
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
=======
-=======
-D:\GIT浠撳簱\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
-D:\GIT浠撳簱\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
-D:\GIT浠撳簱\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
-D:\GIT浠撳簱\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
-D:\GIT浠撳簱\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
-D:\GIT浠撳簱\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
->>>>>>> 17752a6ca5434cac875b98272c9bc7534ae4a059
->>>>>>> 48b5decba526435c701a1c9ca4171eaa4f5e7e8e
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
+D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
+>>>>>>> 83c09afa05bd507c148e6fbd12cf16a3d7b392cf
+>>>>>>> 0605260d8529635c9dbef283bb5f6b85300a3503
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
index 22cd26a..1380f6e 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 c864829..9099933 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache
deleted file mode 100644
index 0312216..0000000
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache
+++ /dev/null
@@ -1 +0,0 @@
-eb64bc61f5da8fdd8ad56e04c391e3a377d8ca59
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
index e11a207..dd9e641 100644
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
@@ -1,5 +1,5 @@
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.dll b/sdk_dingding/TopSdk/obj/Release/TopSdk.dll
index 35bd74a..89db198 100644
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.dll
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb b/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
index 2b3e479..774f3d6 100644
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
Binary files differ
--
Gitblit v1.9.1