智云MES后端API代码
parent: d9f0d4a6 | 补丁 | 提交 | ignore whitespace
wtt
15 小时以前 4c0ed17a986978b896e4c4b035f6a6f1b6a64c97 
出站汇报成本期初导入接口修改
8个文件已修改
61 ■■■■■ 已修改文件
Model/obj/Release/Model.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
Model/obj/x86/Release/Model.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Kf_WIPBalController.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/Gy_MaterErrorPreventionController.cs 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/WTTFolder.pubxml.user 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/WebAPI.csproj.user 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 Model/obj/Release/Model.csproj.AssemblyReference.cache

Binary files differ



 Model/obj/x86/Release/Model.csproj.AssemblyReference.cache

Binary files differ



 WebAPI/Controllers/BaseSet/Kf_WIPBalController.cs


@@ -367,7 +367,7 @@


                        int HProcID = int.Parse(item["HProcID"].ToString());         //工序ID


                        Double HBeginQty = Double.Parse(item["期初数量"].ToString());


                        Double HBeginBal = Double.Parse(item["期初金额"].ToString());




                        Double HPanelQty = Double.Parse(item["拼板数"].ToString());


                        // 1. 检查主表是否存在记录


                        string checkMainSql = $"select HInterID from Kf_WIPBalMain where HOrgID='{HOrgID}' and HWorkShopID={HWorkShopID} and HCostObjID={HCostObjID}";


                        DataSet ds = oCN.RunProcReturn(checkMainSql, "Kf_WIPBalMain");


@@ -414,7 +414,7 @@


                                         HBeginBal, HCnangeBal, HDebit, HDebit_Sum, HCredit,


                                         HEndBal, HEndBal_Rel, HYtdDebit, HYtdCredit,


                                         HBeginDiff, HReceiveDiff, HSendDiff, HEndDiff,


                                         HYtdReceiveDiff, HYtdSendDiff)


                                         HYtdReceiveDiff, HYtdSendDiff,HPanelQty)


                                        values


                                        ({HInterID}, {HEntryID}, {HCostItemID}, {HMaterID}, {HProcID}, 0,


                                         {HBeginQty}, 0, 0, 0, 0,


@@ -422,7 +422,7 @@


                                         {HBeginBal}, 0, 0, 0, 0,


                                         0, 0, 0, 0,


                                         0, 0, 0, 0,


                                         0, 0)";


                                         0, 0,{HPanelQty})";




                        oCN.RunProc(insertSubSql);






 WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs


@@ -309,11 +309,14 @@


                                oCN.RunProc("exec h_p_IFCLD_ERPSourceBillToLocal_ProcExchAndRouting '" + BillNo_PGD + "'");


                                ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList  where 单据号= '" + BillNo_PGD + "'", "h_v_Sc_ProcessExchangeBillList");


                            }


                            else


                            {


                                //同步工序流转卡


                                oCN.RunProc("exec h_p_IFCLD_ERPSourceBillToLocal_ProcExchAndRouting '" + BillNo_PGD + "'");


                                ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList  where 单据号= '" + BillNo_PGD + "'", "h_v_Sc_ProcessExchangeBillList");


                            }


                        }


                        else


                        {


                            ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList  where 单据号= '" + BillNo_PGD + "'", "h_v_Sc_ProcessExchangeBillList");


                        }


                        


                        break;


                    case "MO"://流转卡


                         sErr = "";




 WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs


@@ -637,7 +637,7 @@


                if ("Add".Equals(eventType))


                {


                    //判断客户为海诚 同步金蝶工序汇报单


                    if (oSystemParameter.omodel.WMS_CampanyName == "海诚")


                    if (oSystemParameter.omodel.WMS_CampanyName == "海诚"|| oSystemParameter.omodel.WMS_CampanyName == "天擎")


                    {


                        object objResult = set_SaveStationOutBill_CLD_Json(HInterID, HBillNo, user);


                    }




 WebAPI/Controllers/Gy_MaterErrorPreventionController.cs


@@ -143,8 +143,8 @@


                {   


                    oCN.RunProc($@"insert into Sc_FeedingErrorProofingBillSub (HInterID,HBillNo_bak, HEntryID, HRemark, HSourceInterID, HSourceEntryID, HSourceBillNo, HSourceBillType,


                                HRelationQty, HRelationMoney, HMaterID, HUnitID, HQty, HScanDate, HBarCode)


                                values('{HMainBill["HInterID"]}','{HMainBill["HBillNo"]}', {i++}, '', 0, 0, '', '', 0, 0, {HSubItem["HMaterID"]}, {HSubItem["HUnitID"]}, {HSubItem["HQty"]}, '{HSubItem["HScanDate"]}',


                                {HSubItem["HBarCode"]})");


                                values('{HMainBill["HInterID"]}','{HMainBill["HBillNo"]}', {i++}, '', 0, 0, '', '', 0, 0, {HSubItem["HMaterID"]}, {HSubItem["HUnitID"]}, {HSubItem["HQty"]}, '{HSubItem["HScanDate"]}','


                                {HSubItem["HBarCode"]}')");




                    // 通过系统参数判断是否需要 反写条码主档单据状态


                    if(oSystemParameter.ShowBill(ref DBUtility.ClsPub.sErrInfo))




 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-03-10T05:21:23.4020454Z;False|2026-03-10T13:20:37.7978257+08:00;True|2026-03-09T16:23:37.1957075+08:00;False|2026-03-09T16:23:09.1793900+08:00;True|2026-03-08T19:14:49.7700862+08:00;False|2026-03-08T19:13:57.9637951+08:00;True|2026-03-07T15:31:56.3119377+08:00;True|2026-03-07T15:27:26.3686205+08:00;True|2026-03-07T15:20:44.8497962+08:00;True|2026-03-07T15:16:09.1126972+08:00;True|2026-03-07T15:13:14.8502726+08:00;True|2026-03-07T15:00:35.5106409+08:00;True|2026-03-06T09:17:38.4826562+08:00;False|2026-03-06T09:17:12.2137124+08:00;True|2026-03-04T10:37:38.3542826+08:00;True|2026-03-04T10:35:38.0033181+08:00;False|2026-03-04T10:35:21.6139985+08:00;True|2026-03-04T10:10:33.7184690+08:00;False|2026-03-04T10:10:13.6608297+08:00;True|2026-02-28T14:44:48.8921146+08:00;True|2026-02-28T13:49:09.3417790+08:00;True|2026-02-28T13:36:36.7808689+08:00;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>


    <History>True|2026-03-17T01:33:58.4998522Z;True|2026-03-13T14:39:56.2046419+08:00;True|2026-03-13T10:45:44.5969827+08:00;False|2026-03-13T10:45:39.0031185+08:00;True|2026-03-13T10:33:50.6454960+08:00;True|2026-03-13T10:13:54.8054151+08:00;False|2026-03-13T10:13:48.7433858+08:00;True|2026-03-13T08:27:44.0365848+08:00;False|2026-03-13T08:27:15.7236925+08:00;True|2026-03-10T13:21:23.4020454+08:00;False|2026-03-10T13:20:37.7978257+08:00;True|2026-03-09T16:23:37.1957075+08:00;False|2026-03-09T16:23:09.1793900+08:00;True|2026-03-08T19:14:49.7700862+08:00;False|2026-03-08T19:13:57.9637951+08:00;True|2026-03-07T15:31:56.3119377+08:00;True|2026-03-07T15:27:26.3686205+08:00;True|2026-03-07T15:20:44.8497962+08:00;True|2026-03-07T15:16:09.1126972+08:00;True|2026-03-07T15:13:14.8502726+08:00;True|2026-03-07T15:00:35.5106409+08:00;True|2026-03-06T09:17:38.4826562+08:00;False|2026-03-06T09:17:12.2137124+08:00;True|2026-03-04T10:37:38.3542826+08:00;True|2026-03-04T10:35:38.0033181+08:00;False|2026-03-04T10:35:21.6139985+08:00;True|2026-03-04T10:10:33.7184690+08:00;False|2026-03-04T10:10:13.6608297+08:00;True|2026-02-28T14:44:48.8921146+08:00;True|2026-02-28T13:49:09.3417790+08:00;True|2026-02-28T13:36:36.7808689+08:00;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>03/10/2026 13:21:11</publishTime>


      <publishTime>03/17/2026 09:00:47</publishTime>


    </File>


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


      <publishTime>03/10/2026 13:21:11</publishTime>


      <publishTime>03/17/2026 09:00:47</publishTime>


    </File>


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


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


    </File>


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


      <publishTime>03/10/2026 13:21:06</publishTime>


      <publishTime>03/17/2026 09:00:45</publishTime>


    </File>


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


      <publishTime>03/10/2026 13:21:06</publishTime>


      <publishTime>03/17/2026 09:00:45</publishTime>


    </File>


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


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


    </File>


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


      <publishTime>03/10/2026 13:21:01</publishTime>


      <publishTime>03/17/2026 09:00:42</publishTime>


    </File>


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


      <publishTime>03/10/2026 13:21:01</publishTime>


      <publishTime>03/17/2026 09:00:42</publishTime>


    </File>


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


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


@@ -141,10 +141,10 @@


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


    </File>


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


      <publishTime>03/10/2026 13:21:04</publishTime>


      <publishTime>03/17/2026 09:00:43</publishTime>


    </File>


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


      <publishTime>03/10/2026 13:21:04</publishTime>


      <publishTime>03/17/2026 09:00:43</publishTime>


    </File>


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


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


@@ -180,25 +180,25 @@


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


    </File>


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


      <publishTime>03/10/2026 13:20:57</publishTime>


      <publishTime>03/17/2026 09:00:40</publishTime>


    </File>


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


      <publishTime>03/10/2026 13:20:57</publishTime>


      <publishTime>03/17/2026 09:00:40</publishTime>


    </File>


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


      <publishTime>03/10/2026 13:20:59</publishTime>


      <publishTime>03/17/2026 09:00:41</publishTime>


    </File>


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


      <publishTime>03/10/2026 13:20:59</publishTime>


      <publishTime>03/17/2026 09:00:41</publishTime>


    </File>


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


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


    </File>


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


      <publishTime>03/10/2026 13:20:59</publishTime>


      <publishTime>03/17/2026 09:00:40</publishTime>


    </File>


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


      <publishTime>03/10/2026 13:20:59</publishTime>


      <publishTime>03/17/2026 09:00:40</publishTime>


    </File>


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


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


@@ -330,10 +330,10 @@


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


    </File>


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


      <publishTime>03/10/2026 13:21:20</publishTime>


      <publishTime>03/17/2026 09:00:53</publishTime>


    </File>


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


      <publishTime>03/10/2026 13:21:20</publishTime>


      <publishTime>03/17/2026 09:00:53</publishTime>


    </File>


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


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


@@ -558,7 +558,7 @@


      <publishTime>10/27/2025 08:51:29</publishTime>


    </File>


    <File Include="Web.config">


      <publishTime>03/06/2026 09:17:36</publishTime>


      <publishTime>03/17/2026 09:33:56</publishTime>


    </File>


  </ItemGroup>


</Project>




 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>Debug|x86</LastActiveSolutionConfig>


    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>


    <NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\智云迈思\MES-WEB-API\WebAPI\Properties\PublishProfiles\WTTFolder.pubxml</NameOfLastUsedPublishProfile>


    <Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID>


    <Controller_SelectedScaffolderCategoryPath>root/Common/Web API</Controller_SelectedScaffolderCategoryPath>