智云MES后端API代码
parent: 18c0093f | 补丁 | 提交 | ignore whitespace
chenhaozhe
2026-02-28 b2e18e3fc0735edf1fc378936c81e5971bc52f61 
Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
9个文件已修改
71 ■■■■■ 已修改文件
WebAPI/Controllers/成本管理/CB_ItemMoneyBillController.cs 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/成本管理/CB_WipProcessTableController.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/项目管理/工作任务/PM_WorkTaskBillController.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/WTTFolder.pubxml.user 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/WebAPI.csproj.user 2 ●●●●● 补丁 | 查看 | 原始文档 | 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 | 历史 
 WebAPI/Controllers/³É±¾¹ÜÀí/CB_ItemMoneyBillController.cs


@@ -1190,8 +1190,8 @@


                }




                // 3. æ‰¹é‡æŸ¥è¯¢chengbenxiangmu信息


                string CostQuery = $"SELECT HItemID, HNumber, HName FROM Gy_ItemMoney_1 WHERE HNumber IN ({string.Join(",", CostNumbers.Select(m => $"'{m.Replace("'", "''")}'"))}) AND HName IN ({string.Join(",", CostNames.Select(m => $"'{m.Replace("'", "''")}'"))}) and HUSEORGID ={organ}";


                DataSet CostData = oCN.RunProcReturn(CostQuery, "Gy_ItemMoney_1");


                string CostQuery = $"SELECT HItemID, HNumber, HName FROM Gy_CostItem WHERE HNumber IN ({string.Join(",", CostNumbers.Select(m => $"'{m.Replace("'", "''")}'"))}) AND HName IN ({string.Join(",", CostNames.Select(m => $"'{m.Replace("'", "''")}'"))}) and HUSEORGID ={organ}";


                DataSet CostData = oCN.RunProcReturn(CostQuery, "Gy_CostItem");


                Dictionary<string, int> CostDict = new Dictionary<string, int>();


                foreach (DataRow row in CostData.Tables[0].Rows)


                {


@@ -1262,7 +1262,7 @@


                        missingMaterialMessages.Add($"第{lineNumber}行的生产订单【{ICMOcheck}】");


                    }


                    // æ£€æŸ¥é¡¹ç›®æˆæœ¬


                    if (CostDict.Count == 0)


                    if (CostDict.Count == 0|| !CostDict.ContainsKey(Costcheck))


                    {


                        missingCostMessages.Add($"第{lineNumber}行的项目成本【{Costcheck}】");


                    }


@@ -1357,12 +1357,12 @@


                    long HInterID = DBUtility.ClsPub.CreateBillID("1802", ref DBUtility.ClsPub.sExeReturnInfo);






                    




                    


                        // æ’入主表（每组插入一次）


                        insertSql.AppendLine($"INSERT INTO CB_ItemMoneyBillMain  ([HInterID], [HBillNo], [HDate], [HYear], [HPeriod], [HBillType], [HBillSubType], [HBillStatus], [HCheckItemNowID], [HCheckItemNextID], [HCheckFlowID], [HRemark], [HBacker], [HBackDate], [HBackRemark], [HChecker], [HCheckDate], [HMaker], [HMakeDate], [HUpDater], [HUpDateDate], [HCloseMan], [HCloseDate], [HCloseType], [HDeleteMan], [HDeleteDate], [HMainSourceBillType], [HMainSourceInterID], [HMainSourceEntryID], [HMainSourceBillNo], [HPrintQty],  [HEmpID], [HDeptID], [HICMOInterID], [HMaterID], [HICMOBillNo], [HExplanation], [HInnerBillNo], [HBeginDate], [HEndDate], [HOrgID]) VALUES (");


                        insertSql.AppendLine($"'{HInterID}', '{HBillNo}', '{DateTime.Now}', {list[0]["年份"]}, {list[0]["月份"]}, {"1802"}, '{"1802"}', '{"1"}',  '{"0"}', '{"0"}', '{"0"}', '{"excel导入"}', '{""}', '{DateTime.Now}', '{""}', '{""}', '{DateTime.Now}', '{""}', '{DateTime.Now}', '{""}', '{DateTime.Now}', '{""}', '{DateTime.Now}', '{"0"}', '{""}', '{DateTime.Now}', '{""}', '{"0"}', '{"0"}', '{""}', '{"0"}', '{EmpID}', '{HSupplierID}', '{ICMOInterID}','{0}','{ICMO}','{""}','{"0"}','{DateTime.Now}','{DateTime.Now}','{"100038"}');");




                    DateTime firstDayWithTime = new DateTime(Convert.ToInt32(list[0]["年份"]), Convert.ToInt32(list[0]["月份"]), 1);


                    // æ’入主表（每组插入一次）


                    insertSql.AppendLine($"INSERT INTO CB_ItemMoneyBillMain  ([HInterID], [HBillNo], [HDate], [HYear], [HPeriod], [HBillType], [HBillSubType], [HBillStatus], [HCheckItemNowID], [HCheckItemNextID], [HCheckFlowID], [HRemark], [HBacker], [HBackDate], [HBackRemark], [HChecker], [HCheckDate], [HMaker], [HMakeDate], [HUpDater], [HUpDateDate], [HCloseMan], [HCloseDate], [HCloseType], [HDeleteMan], [HDeleteDate], [HMainSourceBillType], [HMainSourceInterID], [HMainSourceEntryID], [HMainSourceBillNo], [HPrintQty],  [HEmpID], [HDeptID], [HICMOInterID], [HMaterID], [HICMOBillNo], [HExplanation], [HInnerBillNo], [HBeginDate], [HEndDate], [HOrgID]) VALUES (");


                        insertSql.AppendLine($"'{HInterID}', '{HBillNo}', '{firstDayWithTime}', {list[0]["年份"]}, {list[0]["月份"]}, {"1802"}, '{"1802"}', '{"1"}',  '{"0"}', '{"0"}', '{"0"}', '{"excel导入"}', '{""}', '{DateTime.Now}', '{""}', '{""}', '{DateTime.Now}', '{user}', '{DateTime.Now}', '{""}', '{DateTime.Now}', '{""}', '{DateTime.Now}', '{"0"}', '{""}', '{DateTime.Now}', '{""}', '{"0"}', '{"0"}', '{""}', '{"0"}', '{EmpID}', '{HSupplierID}', '{ICMOInterID}','{0}','{ICMO}','{""}','{"0"}','{DateTime.Now}','{DateTime.Now}','{"100038"}');");




                        // æ’入子表（组内每个物料插入一次）


                        int HEntryID = 1;




 WebAPI/Controllers/³É±¾¹ÜÀí/CB_WipProcessTableController.cs


@@ -228,7 +228,7 @@






                    insertSql.AppendLine($"INSERT INTO CB_WipProcessTable  ([HYear], [HPeriod], [HDay], [HProcName], [HCusName], [HPartNumber], [HWIPQty], [HInProcessWIPQty], [HPanelQty], [HLot], [HOrderTime], [HStartTime], [HOutputTime], [HProductionTime], [HStatus], [HStayTime], [HChecker], [HCheckDate], [HMaker], [HMakeDate], [HUpDater], [HUpDateDate], [HCloseMan], [HCloseDate], [HCloseType], [HDeleteMan], [HDeleteDate], [HReamrk]) VALUES (");


                    insertSql.AppendLine($" {item["年份"]}, {item["月份"]}, {DateTime.Now.Day}, '{item["产出工序"]}', '{item["客户"]}',  '{item["成品料号"]}', '{item["WIP数量"]}', '{item["在制WIP数量"]}', '{item["拼版数"]}', '{item["LOT"]}', '{item["下单时间"]}', '{item["投产时间"]}', '{item["产出时间"]}', '{item["生产时间"]}', '{item["状态"]}', '{item["停留时间(分钟)"]}', '{""}', '{""}', '{user}', '{DateTime.Now}', '{""}', '{DateTime.Now}', '{""}', '{""}', '{"0"}', '{""}', '{""}', '{"excel导入"}');");


                    insertSql.AppendLine($" {item["年份"]}, {item["月份"]}, {1}, '{item["产出工序"]}', '{item["客户"]}',  '{item["成品料号"]}', '{item["WIP数量"]}', '{item["在制WIP数量"]}', '{item["拼版数"]}', '{item["LOT"]}', '{item["下单时间"]}', '{item["投产时间"]}', '{item["产出时间"]}', '{item["生产时间"]}', '{item["状态"]}', '{item["停留时间(分钟)"]}', '{""}', '{""}', '{user}', '{DateTime.Now}', '{""}', '{DateTime.Now}', '{""}', '{""}', '{"0"}', '{""}', '{""}', '{"excel导入"}');");


                }




                if (errorMessage.Length > 0)




 WebAPI/Controllers/ÏîÄ¿¹ÜÀí/¹¤×÷ÈÎÎñ/PM_WorkTaskBillController.cs


@@ -65,6 +65,7 @@


            public string HDeleteManDate;


            public string HBackerDate;


            public string HBackRemark;


            public string HTaskType;




            public int HMainSourceInterID;


            public int HMainSourceEntryID;


@@ -185,6 +186,7 @@


                string HDeleteManDate = mainList[0].HDeleteManDate;


                string HBackerDate = mainList[0].HBackerDate;


                string HBackRemark = mainList[0].HBackRemark;


                string HTaskType = mainList[0].HTaskType;


                int HMainSourceInterID = mainList[0].HMainSourceInterID;


                int HMainSourceEntryID = mainList[0].HMainSourceEntryID;


                string HMainSourceBillNo = mainList[0].HMainSourceBillNo;


@@ -212,7 +214,7 @@


                {


                    string sql = "insert into PM_WorkTaskBillMain" +


                        "(HYear,HPeriod,HBillType,HBillSubType,HInterID,HBillNo,HProjectID,HProNumber,HProjectStageID,HName,HDate,HTaskNote,HPlanTimes" +


                        ",HSelfTimes,HLastDate,HSendEmp,HReceiveEmp,HType,HCopyEmp,HRemark,HOrgID,HMaker,HMakeDate,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType,HOrderLevID,HTaskClassID)" +


                        ",HSelfTimes,HLastDate,HSendEmp,HReceiveEmp,HType,HCopyEmp,HRemark,HOrgID,HMaker,HMakeDate,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType,HOrderLevID,HTaskClassID,HTaskType)" +


                        "values(" +


                        "" + HYear +


                        "," + HPeriod +


@@ -243,6 +245,7 @@


                        "','" + HMainSourceBillType +


                        "','" + HOrderLevID  +


                        "','"+ HTaskClassID+


                        "','"+ HTaskType +


                        "')";




                    //主表


@@ -281,6 +284,7 @@


                        "',HMainSourceBillType = '" + HMainSourceBillType +


                        "',HOrderLevID  = '" + HOrderLevID  +


                        "',HTaskClassID  = '" + HTaskClassID +


                        "',HTaskType  = '" + HTaskType +


                        "' where HInterID = " + HInterID;




                    oCN.RunProc(sql);


@@ -295,7 +299,7 @@


                {


                    string sql = "insert into PM_WorkTaskBillMain" +


                        "(HYear,HPeriod,HBillType,HBillSubType,HInterID,HBillNo,HProjectID,HProNumber,HProjectStageID,HName,HDate,HTaskNote,HPlanTimes" +


                        ",HSelfTimes,HLastDate,HSendEmp,HReceiveEmp,HType,HCopyEmp,HRemark,HOrgID,HMaker,HMakeDate,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType,HOrderLevID )" +


                        ",HSelfTimes,HLastDate,HSendEmp,HReceiveEmp,HType,HCopyEmp,HRemark,HOrgID,HMaker,HMakeDate,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType,HOrderLevID,HTaskType )" +


                        "values(" +


                        "" + HYear +


                        "," + HPeriod +


@@ -325,6 +329,7 @@


                        ",'" + HMainSourceBillNo +


                        "','" + HMainSourceBillType +


                        "','" + HOrderLevID +


                        "','" + HTaskType +


                        "')";


                    //主表


                    oCN.RunProc(sql);




 WebAPI/Properties/PublishProfiles/WTTFolder.pubxml.user


@@ -5,7 +5,7 @@


<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">


  <PropertyGroup>


    <_PublishTargetUrl>D:\网站发布\API</_PublishTargetUrl>


    <History>True|2026-02-28T03:22:16.2244092Z;False|2026-02-28T11:21:50.3452184+08:00;True|2026-02-27T15:15:26.7008273+08:00;False|2026-02-27T15:15:03.5165987+08:00;True|2026-02-24T13:26:35.7198126+08:00;True|2026-02-24T13:17:50.6475487+08:00;False|2026-02-24T13:17:16.4754994+08:00;True|2026-02-09T09:03:02.9552827+08:00;False|2026-02-09T09:02:19.7888361+08:00;True|2026-01-23T16:43:00.5233443+08:00;True|2026-01-23T15:52:34.0578166+08:00;True|2026-01-23T15:18:26.9929522+08:00;True|2026-01-23T14:54:41.7989523+08:00;True|2026-01-23T14:20:36.5052445+08:00;False|2026-01-23T13:57:17.0723425+08:00;True|2026-01-23T08:08:55.5799949+08:00;False|2026-01-23T08:08:18.0965301+08:00;True|2026-01-21T13:46:11.7257946+08:00;True|2026-01-20T09:22:33.7255529+08:00;False|2026-01-20T08:33:10.2890987+08:00;True|2026-01-19T13:53:48.2079321+08:00;False|2026-01-19T13:53:24.9464993+08:00;True|2026-01-16T15:23:46.2649561+08:00;True|2026-01-16T09:00:43.1528772+08:00;</History>


    <History>True|2026-02-28T05:36:36.7808689Z;True|2026-02-28T13:07:59.4097968+08:00;True|2026-02-28T11:22:16.2244092+08:00;False|2026-02-28T11:21:50.3452184+08:00;True|2026-02-27T15:15:26.7008273+08:00;False|2026-02-27T15:15:03.5165987+08:00;True|2026-02-24T13:26:35.7198126+08:00;True|2026-02-24T13:17:50.6475487+08:00;False|2026-02-24T13:17:16.4754994+08:00;True|2026-02-09T09:03:02.9552827+08:00;False|2026-02-09T09:02:19.7888361+08:00;True|2026-01-23T16:43:00.5233443+08:00;True|2026-01-23T15:52:34.0578166+08:00;True|2026-01-23T15:18:26.9929522+08:00;True|2026-01-23T14:54:41.7989523+08:00;True|2026-01-23T14:20:36.5052445+08:00;False|2026-01-23T13:57:17.0723425+08:00;True|2026-01-23T08:08:55.5799949+08:00;False|2026-01-23T08:08:18.0965301+08:00;True|2026-01-21T13:46:11.7257946+08:00;True|2026-01-20T09:22:33.7255529+08:00;False|2026-01-20T08:33:10.2890987+08:00;True|2026-01-19T13:53:48.2079321+08:00;False|2026-01-19T13:53:24.9464993+08:00;True|2026-01-16T15:23:46.2649561+08:00;True|2026-01-16T09:00:43.1528772+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>02/28/2026 11:22:10</publishTime>


      <publishTime>02/28/2026 13:36:25</publishTime>


    </File>


    <File Include="bin/BLL.pdb">


      <publishTime>02/28/2026 11:22:10</publishTime>


      <publishTime>02/28/2026 13:36:25</publishTime>


    </File>


    <File Include="bin/BouncyCastle.Crypto.dll">


      <publishTime>12/18/2020 05:32:28</publishTime>


    </File>


    <File Include="bin/DAL.dll">


      <publishTime>02/28/2026 11:22:08</publishTime>


      <publishTime>02/28/2026 13:36:20</publishTime>


    </File>


    <File Include="bin/DAL.pdb">


      <publishTime>02/28/2026 11:22:08</publishTime>


      <publishTime>02/28/2026 13:36:20</publishTime>


    </File>


    <File Include="bin/Dapper.dll">


      <publishTime>07/22/2016 22:52:40</publishTime>


    </File>


    <File Include="bin/DBUtility.dll">


      <publishTime>02/28/2026 11:22:05</publishTime>


      <publishTime>02/28/2026 13:36:15</publishTime>


    </File>


    <File Include="bin/DBUtility.pdb">


      <publishTime>02/28/2026 11:22:05</publishTime>


      <publishTime>02/28/2026 13:36:15</publishTime>


    </File>


    <File Include="bin/Fleck.dll">


      <publishTime>04/22/2021 11:48:12</publishTime>


@@ -138,10 +138,10 @@


      <publishTime>07/25/2012 19:48:56</publishTime>


    </File>


    <File Include="bin/Model.dll">


      <publishTime>02/28/2026 11:22:06</publishTime>


      <publishTime>02/28/2026 13:36:18</publishTime>


    </File>


    <File Include="bin/Model.pdb">


      <publishTime>02/28/2026 11:22:06</publishTime>


      <publishTime>02/28/2026 13:36:18</publishTime>


    </File>


    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">


      <publishTime>08/18/2025 16:11:18</publishTime>


@@ -177,34 +177,34 @@


      <publishTime>11/13/2012 20:19:34</publishTime>


    </File>


    <File Include="bin/Pub_Class.dll">


      <publishTime>02/28/2026 11:22:03</publishTime>


      <publishTime>02/28/2026 13:36:11</publishTime>


    </File>


    <File Include="bin/Pub_Class.pdb">


      <publishTime>02/28/2026 11:22:03</publishTime>


      <publishTime>02/28/2026 13:36:11</publishTime>


    </File>


    <File Include="bin/Pub_Control.dll">


      <publishTime>02/28/2026 11:22:04</publishTime>


      <publishTime>02/28/2026 13:36:13</publishTime>


    </File>


    <File Include="bin/Pub_Control.pdb">


      <publishTime>02/28/2026 11:22:04</publishTime>


      <publishTime>02/28/2026 13:36:13</publishTime>


    </File>


    <File Include="bin/RestSharp.dll">


      <publishTime>08/31/2012 06:22:50</publishTime>


    </File>


    <File Include="bin/SQLHelper.dll">


      <publishTime>02/28/2026 11:22:04</publishTime>


      <publishTime>02/28/2026 13:36:13</publishTime>


    </File>


    <File Include="bin/SQLHelper.pdb">


      <publishTime>02/28/2026 11:22:04</publishTime>


      <publishTime>02/28/2026 13:36:13</publishTime>


    </File>


    <File Include="bin/Swashbuckle.Core.dll">


      <publishTime>02/16/2015 01:57:08</publishTime>


    </File>


    <File Include="bin/SyntacticSugar.dll">


      <publishTime>02/28/2026 11:20:20</publishTime>


      <publishTime>02/28/2026 13:33:08</publishTime>


    </File>


    <File Include="bin/SyntacticSugar.pdb">


      <publishTime>02/28/2026 11:20:20</publishTime>


      <publishTime>02/28/2026 13:33:08</publishTime>


    </File>


    <File Include="bin/System.Buffers.dll">


      <publishTime>07/19/2017 18:01:28</publishTime>


@@ -315,19 +315,19 @@


      <publishTime>05/09/2023 10:43:40</publishTime>


    </File>


    <File Include="bin/TopSdk.dll">


      <publishTime>02/28/2026 11:20:21</publishTime>


      <publishTime>02/28/2026 13:33:11</publishTime>


    </File>


    <File Include="bin/TopSdk.pdb">


      <publishTime>02/28/2026 11:20:21</publishTime>


      <publishTime>02/28/2026 13:33:11</publishTime>


    </File>


    <File Include="bin/WebActivatorEx.dll">


      <publishTime>11/24/2014 19:18:48</publishTime>


    </File>


    <File Include="bin/WebAPI.dll">


      <publishTime>02/28/2026 11:22:14</publishTime>


      <publishTime>02/28/2026 13:36:34</publishTime>


    </File>


    <File Include="bin/WebAPI.pdb">


      <publishTime>02/28/2026 11:22:14</publishTime>


      <publishTime>02/28/2026 13:36:34</publishTime>


    </File>


    <File Include="bin/WebGrease.dll">


      <publishTime>07/18/2013 01:03:52</publishTime>




 WebAPI/WebAPI.csproj.user


@@ -2,7 +2,7 @@


<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">


  <PropertyGroup>


    <LastActiveSolutionConfig>Debug|x86</LastActiveSolutionConfig>


    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>


    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>


    <UseIISExpress>true</UseIISExpress>


    <Use64BitIISExpress />


    <IISExpressSSLPort />




 sdk_dingding/TopSdk/bin/Debug/TopSdk.dll

Binary files differ



 sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb

Binary files differ



 sdk_dingding/TopSdk/obj/Debug/TopSdk.dll

Binary files differ



 sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb

Binary files differ