| DAL/车间管理/ClsSc_WorkBeginDotCheckBillMain.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| SyntacticSugar/bin/Debug/SyntacticSugar.dll | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| SyntacticSugar/bin/Debug/SyntacticSugar.pdb | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| SyntacticSugar/obj/Debug/SyntacticSugar.dll | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| SyntacticSugar/obj/Debug/SyntacticSugar.pdb | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebAPI/Controllers/CJGL/Sc_WorkBeginDotCheckBillController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebAPI/Controllers/品质管理/质量报表/QC_QualityReportsController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebAPI/WebAPI.csproj.user | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| sdk_dingding/TopSdk/bin/Debug/TopSdk.dll | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| sdk_dingding/TopSdk/obj/Debug/TopSdk.dll | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb | 补丁 | 查看 | 原始文档 | blame | 历史 |
DAL/³µ¼ä¹ÜÀí/ClsSc_WorkBeginDotCheckBillMain.cs
@@ -37,6 +37,21 @@ try { //ä¿ååæ§å¶========================================= string HBillNote = ""; DataSet ds = oCn.RunProcReturn("Exec h_p_Sc_WorkBeginDotCheckBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_Sc_QualityReportBill_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 Sc_WorkBeginDotCheckBillMain set " + @@ -89,9 +104,24 @@ "')"; oCn.RunProc(subSql); } sReturn = "ä¿®æ¹åæ®æåï¼"; //=========================ä¿ååæ§å¶ DataSet ds2 = oCn.RunProcReturn("h_p_Sc_WorkBeginDotCheckBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_Sc_QualityReportBill_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; } @@ -109,6 +139,21 @@ { DataSet ds; //ä¿ååæ§å¶========================================= string HBillNote = ""; ds = oCn.RunProcReturn("Exec h_p_Sc_WorkBeginDotCheckBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_Sc_QualityReportBill_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(); @@ -180,8 +225,24 @@ "')"; oCn.RunProc(subSql); } sReturn = "æ°å¢åæ®æåï¼"; //=========================ä¿ååæ§å¶ DataSet ds2 = oCn.RunProcReturn("h_p_Sc_WorkBeginDotCheckBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_Sc_QualityReportBill_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; } SyntacticSugar/bin/Debug/SyntacticSugar.dllBinary files differ
SyntacticSugar/bin/Debug/SyntacticSugar.pdbBinary files differ
SyntacticSugar/obj/Debug/SyntacticSugar.dllBinary files differ
SyntacticSugar/obj/Debug/SyntacticSugar.pdbBinary files differ
WebAPI/Controllers/CJGL/Sc_WorkBeginDotCheckBillController.cs
@@ -318,6 +318,7 @@ oCN.BeginTran(); oCN.RunProc("delete from Sc_WorkBeginDotCheckBillMain where HInterID = " + HInterID); oCN.RunProc("delete from Sc_WorkBeginDotCheckBillSub where HInterID = " + HInterID); oCN.Commit(); @@ -824,6 +825,44 @@ } #endregion #region æ ¹æ®ç产èµæºè·åææ°çæ¨¡å · [Route("Sc_WorkBeginDotCheckBill/Sc_WorkBeginDotCheckBill_HMould")] [HttpGet] public object Sc_WorkBeginDotCheckBill_HMould(string HSourceID, string User) { try { List<DataTable> tableList = new List<DataTable>(); //æ¥çæé if (!DBUtility.ClsPub.Security_Log("Sc_WorkBeginDotCheckBillMain_Edit", 1, false, User)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ¥è¯¢å¤±è´¥!"; objJsonResult.data = null; return objJsonResult; } ds = oCN.RunProcReturn("select top 1 a.*,b.HName æ¨¡å ·å称 from Sc_MouldUpperBillSub a left join Gy_MouldFileMain b on a.HMouldID=b.HInterID where a.HSourceID='" + HSourceID + "'order by HScanDate desc", "Sc_MouldUpperBillSub"); objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "æ¥è¯¢æåï¼"; objJsonResult.data = ds.Tables[0]; 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_WorkBeginDotCheckBill/getGy_WorkBeginDotCheckListBillMainList")] [HttpGet] @@ -1117,6 +1156,7 @@ oCN.BeginTran(); oCN.RunProc("delete from Gy_WorkBeginDotCheckListBillMain where HInterID = " + HInterID); oCN.RunProc("delete from Gy_WorkBeginDotCheckListBillSub where HInterID = " + HInterID); oCN.Commit();
@@ -548,8 +548,10 @@ string HProject = dic["HProject"].ToString();//项ç®å· string HBatchWork = dic["HBatchWork"].ToString();//æ¯å¦é产 string HDivisionName = dic["HDivisionName"].ToString();//äºä¸é¨ string HResult = dic["HResult"].ToString();//å¤æç»æ string HProcName = dic["HProcName"].ToString();//å·¥åºå称 ds = oCN.RunProcReturn("exec h_p_QC_QualityStatisticsDailyReport '" + HYear + "','" + HMonth + "'," + HDeptName + "," + HOrgID+ ",'" + HProject + "','" + HBatchWork + "','" + HDivisionName + "'", "h_p_QC_QualityStatisticsDailyReport"); ds = oCN.RunProcReturn("exec h_p_QC_QualityStatisticsDailyReport '" + HYear + "','" + HMonth + "'," + HDeptName + "," + HOrgID+ ",'" + HProject + "','" + HBatchWork + "','" + HDivisionName + "','" + HResult + "','" + HProcName + "'", "h_p_QC_QualityStatisticsDailyReport"); //æ·»å åå foreach (DataColumn col in ds.Tables[0].Columns) @@ -1195,8 +1197,9 @@ string HMaterName = dic["HMaterName"].ToString();//ç©æå称 string HBatchNo = dic["HBatchNo"].ToString();//æ¹æ¬¡å· string HProjectNum = dic["HProjectNum"].ToString();//项ç®å· string HProcName = dic["HProcName"].ToString();//å·¥åºå称 ds = oCN.RunProcReturn("exec h_p_QC_BadProductsReport '" + HBeginDate + "','" + HEndDate + "','" + HProject + "','" + HBatchWork + "','" + HDivisionName + "','" + HMaterNumber + "','" + HMaterName + "','" + HBatchNo + "','" + HProjectNum + "'", "h_p_QC_BadProductsReport"); ds = oCN.RunProcReturn("exec h_p_QC_BadProductsReport '" + HBeginDate + "','" + HEndDate + "','" + HProject + "','" + HBatchWork + "','" + HDivisionName + "','" + HMaterNumber + "','" + HMaterName + "','" + HBatchNo + "','" + HProjectNum + "','"+ HProcName + "'", "h_p_QC_BadProductsReport"); //æ·»å åå foreach (DataColumn col in ds.Tables[0].Columns) WebAPI/Properties/PublishProfiles/JFAPI.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|2024-10-22T08:25:12.9514711Z;False|2024-10-22T16:24:42.9025167+08:00;True|2024-10-22T10:22:33.9932601+08:00;False|2024-10-22T10:22:05.3030308+08:00;True|2024-10-21T17:53:29.9552741+08:00;True|2024-10-21T16:37:31.4159544+08:00;True|2024-10-21T16:35:43.6207036+08:00;True|2024-10-21T16:00:05.5040651+08:00;False|2024-10-21T15:59:35.9279259+08:00;True|2024-10-21T12:06:42.5768961+08:00;False|2024-10-21T12:06:16.6344662+08:00;True|2024-10-18T10:44:02.6495536+08:00;True|2024-10-18T09:55:47.9769914+08:00;True|2024-10-18T09:47:46.6365831+08:00;True|2024-10-18T09:46:40.4036657+08:00;True|2024-10-18T09:44:25.4598960+08:00;True|2024-10-18T09:30:07.6972377+08:00;False|2024-10-18T09:28:18.9251743+08:00;True|2024-10-17T12:13:34.8639685+08:00;True|2024-10-17T12:02:26.5251711+08:00;False|2024-10-17T12:01:31.3822430+08:00;True|2024-10-17T11:49:09.2395208+08:00;False|2024-10-17T11:48:38.0189241+08:00;True|2024-10-16T19:35:29.2047484+08:00;False|2024-10-16T19:32:43.0637947+08:00;True|2024-10-16T11:27:13.1263407+08:00;False|2024-10-16T11:25:49.8688677+08:00;True|2024-10-15T18:26:50.9948482+08:00;False|2024-10-15T18:26:23.6998750+08:00;True|2024-08-26T14:17:37.8502046+08:00;False|2024-08-26T14:16:09.8501361+08:00;True|2024-08-22T11:12:48.4249984+08:00;</History> <History>True|2024-10-24T03:17:46.9974483Z;False|2024-10-24T11:17:17.0925356+08:00;True|2024-10-23T19:16:25.5189930+08:00;True|2024-10-23T17:10:44.4267777+08:00;False|2024-10-23T17:10:10.2947971+08:00;True|2024-10-23T14:13:22.6901287+08:00;False|2024-10-23T14:12:24.3997100+08:00;True|2024-10-22T16:25:12.9514711+08:00;False|2024-10-22T16:24:42.9025167+08:00;True|2024-10-22T10:22:33.9932601+08:00;False|2024-10-22T10:22:05.3030308+08:00;True|2024-10-21T17:53:29.9552741+08:00;True|2024-10-21T16:37:31.4159544+08:00;True|2024-10-21T16:35:43.6207036+08:00;True|2024-10-21T16:00:05.5040651+08:00;False|2024-10-21T15:59:35.9279259+08:00;True|2024-10-21T12:06:42.5768961+08:00;False|2024-10-21T12:06:16.6344662+08:00;True|2024-10-18T10:44:02.6495536+08:00;True|2024-10-18T09:55:47.9769914+08:00;True|2024-10-18T09:47:46.6365831+08:00;True|2024-10-18T09:46:40.4036657+08:00;True|2024-10-18T09:44:25.4598960+08:00;True|2024-10-18T09:30:07.6972377+08:00;False|2024-10-18T09:28:18.9251743+08:00;True|2024-10-17T12:13:34.8639685+08:00;True|2024-10-17T12:02:26.5251711+08:00;False|2024-10-17T12:01:31.3822430+08:00;True|2024-10-17T11:49:09.2395208+08:00;False|2024-10-17T11:48:38.0189241+08:00;True|2024-10-16T19:35:29.2047484+08:00;False|2024-10-16T19:32:43.0637947+08:00;True|2024-10-16T11:27:13.1263407+08:00;False|2024-10-16T11:25:49.8688677+08:00;True|2024-10-15T18:26:50.9948482+08:00;False|2024-10-15T18:26:23.6998750+08:00;True|2024-08-26T14:17:37.8502046+08:00;False|2024-08-26T14:16:09.8501361+08:00;True|2024-08-22T11:12:48.4249984+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>10/22/2024 16:24:57</publishTime> <publishTime>10/24/2024 11:17:28</publishTime> </File> <File Include="bin/BLL.pdb"> <publishTime>10/22/2024 16:24:57</publishTime> <publishTime>10/24/2024 11:17:28</publishTime> </File> <File Include="bin/BouncyCastle.Crypto.dll"> <publishTime>12/18/2020 05:32:28</publishTime> </File> <File Include="bin/DAL.dll"> <publishTime>10/22/2024 16:24:56</publishTime> <publishTime>10/24/2024 11:17:27</publishTime> </File> <File Include="bin/DAL.pdb"> <publishTime>10/22/2024 16:24:56</publishTime> <publishTime>10/24/2024 11:17:27</publishTime> </File> <File Include="bin/Dapper.dll"> <publishTime>07/22/2016 22:52:40</publishTime> </File> <File Include="bin/DBUtility.dll"> <publishTime>10/22/2024 16:24:53</publishTime> <publishTime>10/24/2024 11:17:24</publishTime> </File> <File Include="bin/DBUtility.pdb"> <publishTime>10/22/2024 16:24:53</publishTime> <publishTime>10/24/2024 11:17:24</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>10/22/2024 16:24:54</publishTime> <publishTime>10/24/2024 11:17:24</publishTime> </File> <File Include="bin/Model.pdb"> <publishTime>10/22/2024 16:24:54</publishTime> <publishTime>10/24/2024 11:17:24</publishTime> </File> <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs"> <publishTime>05/25/2024 09:46:41</publishTime> @@ -147,34 +147,34 @@ <publishTime>10/23/2021 17:07:54</publishTime> </File> <File Include="bin/Pub_Class.dll"> <publishTime>10/22/2024 16:24:52</publishTime> <publishTime>10/24/2024 11:17:22</publishTime> </File> <File Include="bin/Pub_Class.pdb"> <publishTime>10/22/2024 16:24:52</publishTime> <publishTime>10/24/2024 11:17:22</publishTime> </File> <File Include="bin/Pub_Control.dll"> <publishTime>10/22/2024 16:24:52</publishTime> <publishTime>10/24/2024 11:17:23</publishTime> </File> <File Include="bin/Pub_Control.pdb"> <publishTime>10/22/2024 16:24:52</publishTime> <publishTime>10/24/2024 11:17:23</publishTime> </File> <File Include="bin/RestSharp.dll"> <publishTime>08/31/2012 06:22:50</publishTime> </File> <File Include="bin/SQLHelper.dll"> <publishTime>10/22/2024 16:24:52</publishTime> <publishTime>10/24/2024 11:17:23</publishTime> </File> <File Include="bin/SQLHelper.pdb"> <publishTime>10/22/2024 16:24:52</publishTime> <publishTime>10/24/2024 11:17:23</publishTime> </File> <File Include="bin/Swashbuckle.Core.dll"> <publishTime>02/16/2015 01:57:08</publishTime> </File> <File Include="bin/SyntacticSugar.dll"> <publishTime>10/22/2024 10:30:55</publishTime> <publishTime>10/24/2024 11:16:35</publishTime> </File> <File Include="bin/SyntacticSugar.pdb"> <publishTime>10/22/2024 10:30:55</publishTime> <publishTime>10/24/2024 11:16:35</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>10/22/2024 16:24:03</publishTime> <publishTime>10/24/2024 11:16:37</publishTime> </File> <File Include="bin/TopSdk.pdb"> <publishTime>10/22/2024 16:24:03</publishTime> <publishTime>10/24/2024 11:16:37</publishTime> </File> <File Include="bin/WebActivatorEx.dll"> <publishTime>11/24/2014 19:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> <publishTime>10/22/2024 16:24:30</publishTime> <publishTime>10/24/2024 11:17:09</publishTime> </File> <File Include="bin/WebAPI.pdb"> <publishTime>10/22/2024 16:24:30</publishTime> <publishTime>10/24/2024 11:17:09</publishTime> </File> <File Include="bin/WebGrease.dll"> <publishTime>07/18/2013 01:03:52</publishTime> WebAPI/WebAPI.csproj.user
@@ -9,7 +9,7 @@ <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected> <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\æºäºè¿æ\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>D:\æºäºè¿æ\MES\MES-WEB-API\WebAPI\Properties\PublishProfiles\JFAPI.pubxml</NameOfLastUsedPublishProfile> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <UseIISExpress>true</UseIISExpress> <Use64BitIISExpress /> sdk_dingding/TopSdk/bin/Debug/TopSdk.dllBinary files differ
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdbBinary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.dllBinary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdbBinary files differ
