wtt
3 天以前 20da473ee72997fda2ce9e417dfb2afc1c80260a
工位添加子表
1个文件已添加
9个文件已修改
1个文件已删除
146 ■■■■ 已修改文件
WebAPI/Controllers/基础资料/基础资料/Gy_WorkStationBillController.cs 78 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Models/WorkStationSub.cs 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/WTTFolder.pubxml.user 49 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/WebAPI.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/WebAPI.csproj.user 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/bin/Debug/TopSdk.dll 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Debug/TopSdk.dll 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_WorkStationBillController.cs
@@ -79,11 +79,14 @@
                string msg1 = _value.ToString();
                string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
                string msg2 = sArray[0].ToString();
                string msg3 = sArray[1].ToString();
                string msg3 = sArray[2].ToString();
                string msg4 = sArray[1].ToString();//子表
                //反序列化
                msg2 = "[" + msg2.ToString() + "]";
                List<WorkStation> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<WorkStation>>(msg2);
                List<WorkStationSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<WorkStationSub>>(msg4);
                long HItemID = list[0].HItemID;
                string HNumber = list[0].HNumber;
@@ -97,6 +100,8 @@
                string HRemark = list[0].HRemark;
                long HUSEORGID = list[0].HUSEORGID;
                long HCREATEORGID = list[0].HCREATEORGID;
                #region [注释代码]
@@ -146,14 +151,46 @@
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    oCN.RunProc("Insert into Gy_WorkStation  " +
                    DataSet ds = oCN.RunProcReturn("Insert into Gy_WorkStation  " +
                        " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
                        ",HLevel,HEndFlag,HStopflag,HRemark," +
                        "HUSEORGID,HCREATEORGID,HMakeEmp,HMakeTime) " +
                        "HUSEORGID,HCREATEORGID,HMakeEmp,HMakeTime) output inserted.HItemID" +//获取刚才插入的自增ID
                        " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
                        "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "',"  + HUSEORGID + ",'" + HCREATEORGID + "','" + msg3 + "',getdate())", ref DBUtility.ClsPub.sExeReturnInfo);
                        "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "',"  + HUSEORGID + ",'" + HCREATEORGID + "','" + msg3 + "',getdate())", "Gy_WorkStation");
                    int HInterID = Convert.ToInt32(ds.Tables[0].Rows[0]["HItemID"]);//自增ID
                    //修改上级为非末级代码
                    oCN.RunProc("Update Gy_WorkStation set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                    //删除子表
                    oCN.RunProc("Delete From " + "Gy_WorkStationSub" + "  where HInterID=" + HInterID);
                    //插入子表
                    if (subList != null && subList.Count > 0)
                    {
                        int i = 0;
                        foreach (Models.WorkStationSub oSub in subList)
                        {
                            if (oSub == null)
                                continue;
                            i++;
                            string subSql = "insert into Gy_WorkStationSub" +
                                   "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
                                   ",HMaterID" + ")" +
                                   " values(" +
                                   HInterID + "," +
                                   (i) + "," +
                                   (oSub.HSourceInterID != 0 ? oSub.HSourceInterID.ToString() : "0") + "," +
                                   ( oSub.HSourceEntryID != 0 ? oSub.HSourceEntryID.ToString() : "0") + ",'" +
                                   (oSub.HSourceBillNo ?? "") + "','" + (oSub.HSourceBillType ?? "") + "'," +
                                   (oSub.HMaterID != 0 ? oSub.HMaterID.ToString() : "0") +
                                   ")";
                            oCN.RunProc(subSql);
                        }
                    }
                    oCN.Commit();
                }
                else
@@ -188,6 +225,37 @@
                    //将上级 ä¸ºéžæœ«çº§
                    oCN.RunProc("Update Gy_WorkStation set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                    //
                    //删除子表
                    oCN.RunProc("Delete From " + "Gy_WorkStationSub" + "  where HInterID=" + HItemID);
                    //插入子表
                    if (subList != null && subList.Count > 0)
                    {
                        int i = 0;
                        foreach (Models.WorkStationSub oSub in subList)
                        {
                            if (oSub == null)
                                continue;
                            i++;
                            string subSql = "insert into Gy_WorkStationSub" +
                                   "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
                                   ",HMaterID" + ")" +
                                   " values(" +
                                   HItemID + "," +
                                   (i) + "," +
                                   (oSub.HSourceInterID != 0 ? oSub.HSourceInterID.ToString() : "0") + "," +
                                   (oSub.HSourceEntryID != 0 ? oSub.HSourceEntryID.ToString() : "0") + ",'" +
                                   (oSub.HSourceBillNo ?? "") + "','" + (oSub.HSourceBillType ?? "") + "'," +
                                   (oSub.HMaterID != 0 ? oSub.HMaterID.ToString() : "0") +
                                   ")";
                            oCN.RunProc(subSql);
                        }
                    }
                    oCN.Commit();
                }
                objJsonResult.code = "0";
@@ -411,7 +479,7 @@
            try
            {
                ds = oCN.RunProcReturn("select * from h_v_Gy_WorkStationList where HitemID=" + HInterID, "h_v_Gy_WorkStationList");
                ds = oCN.RunProcReturn("select * from h_v_Gy_WorkStationEdit where HitemID=" + HInterID, "h_v_Gy_WorkStationList");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
WebAPI/Models/WorkStationSub.cs
New file
@@ -0,0 +1,13 @@
using DBUtility;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
namespace WebAPI.Models
{
    public class WorkStationSub: ClsXt_BaseBillSub
    {
        public int HMaterID;       //物料
    }
}
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-04T02:37:38.3542826Z;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-07T07:31:56.3119377Z;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/04/2026 10:37:31</publishTime>
      <publishTime>03/07/2026 15:31:51</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>03/04/2026 10:37:31</publishTime>
      <publishTime>03/07/2026 15:31:51</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>03/04/2026 10:37:28</publishTime>
      <publishTime>03/07/2026 15:31:48</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>03/04/2026 10:37:28</publishTime>
      <publishTime>03/07/2026 15:31:48</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>03/04/2026 10:37:25</publishTime>
      <publishTime>03/07/2026 15:31:46</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>03/04/2026 10:37:25</publishTime>
      <publishTime>03/07/2026 15:31:46</publishTime>
    </File>
    <File Include="bin/Fleck.dll">
      <publishTime>04/22/2021 11:48:12</publishTime>
@@ -125,6 +125,9 @@
    <File Include="bin/Microsoft.CSharp.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/Microsoft.Owin.Cors.dll">
      <publishTime>01/19/2019 04:50:50</publishTime>
    </File>
    <File Include="bin/Microsoft.Owin.dll">
      <publishTime>01/19/2019 04:50:30</publishTime>
    </File>
@@ -138,10 +141,10 @@
      <publishTime>07/25/2012 19:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>03/04/2026 10:37:27</publishTime>
      <publishTime>03/07/2026 15:31:47</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>03/04/2026 10:37:27</publishTime>
      <publishTime>03/07/2026 15:31:47</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>08/18/2025 16:11:18</publishTime>
@@ -177,34 +180,34 @@
      <publishTime>11/13/2012 20:19:34</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>03/04/2026 10:37:24</publishTime>
      <publishTime>03/07/2026 15:31:44</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>03/04/2026 10:37:24</publishTime>
      <publishTime>03/07/2026 15:31:44</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>03/04/2026 10:37:24</publishTime>
      <publishTime>03/07/2026 15:31:45</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>03/04/2026 10:37:24</publishTime>
      <publishTime>03/07/2026 15:31:45</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>03/04/2026 10:37:25</publishTime>
      <publishTime>03/07/2026 15:31:45</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>03/04/2026 10:37:25</publishTime>
      <publishTime>03/07/2026 15:31:45</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.dll">
      <publishTime>03/04/2026 10:36:06</publishTime>
      <publishTime>03/07/2026 15:29:28</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.pdb">
      <publishTime>03/04/2026 10:36:06</publishTime>
      <publishTime>03/07/2026 15:29:28</publishTime>
    </File>
    <File Include="bin/System.Buffers.dll">
      <publishTime>07/19/2017 18:01:28</publishTime>
@@ -318,19 +321,19 @@
      <publishTime>05/09/2023 10:43:40</publishTime>
    </File>
    <File Include="bin/TopSdk.dll">
      <publishTime>03/04/2026 10:36:07</publishTime>
      <publishTime>03/07/2026 15:29:30</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>03/04/2026 10:36:07</publishTime>
      <publishTime>03/07/2026 15:29:30</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>03/04/2026 10:37:35</publishTime>
      <publishTime>03/07/2026 15:31:55</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>03/04/2026 10:37:35</publishTime>
      <publishTime>03/07/2026 15:31:55</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/18/2013 01:03:52</publishTime>
@@ -435,7 +438,7 @@
      <publishTime>08/18/2025 16:11:18</publishTime>
    </File>
    <File Include="packages.config">
      <publishTime>03/04/2026 09:23:23</publishTime>
      <publishTime>03/06/2026 09:14:06</publishTime>
    </File>
    <File Include="Properties/PublishProfiles/JFAPI.pubxml.user">
      <publishTime>12/08/2025 10:29:30</publishTime>
@@ -555,7 +558,7 @@
      <publishTime>10/27/2025 08:51:29</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>02/09/2026 09:03:01</publishTime>
      <publishTime>03/06/2026 09:17:36</publishTime>
    </File>
  </ItemGroup>
</Project>
WebAPI/WebAPI.csproj
@@ -988,6 +988,7 @@
    <Compile Include="Models\Gy_MateNumRelation_Sec.cs" />
    <Compile Include="Models\ClsQC_RequestCheckBillMain.cs" />
    <Compile Include="Models\ClsQC_RequestCheckBillSub.cs" />
    <Compile Include="Models\WorkStationSub.cs" />
    <Compile Include="Models\Xs_SendGoodsPlanBillMain.cs" />
    <Compile Include="Models\基础资料\ClsGy_EmployeeSub.cs" />
    <Compile Include="Models\基础资料\Gy_ColorClass.cs" />
WebAPI/WebAPI.csproj.user
@@ -3,7 +3,7 @@
  <PropertyGroup>
    <LastActiveSolutionConfig>Debug|x86</LastActiveSolutionConfig>
    <LastActiveSolutionConfig>Debug|x86</LastActiveSolutionConfig>
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />
    <IISExpressSSLPort />
@@ -13,7 +13,7 @@
    <UseGlobalApplicationHostFile />
    <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\FolderProfile8.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile4.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\智云迈思\MES-WEB-API\WebAPI\Properties\PublishProfiles\WTTFolder.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ShowAllFiles</ProjectView>
  </PropertyGroup>
  <ProjectExtensions>
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.csproj.AssemblyReference.cache
Binary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
@@ -3,4 +3,3 @@
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
sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
Binary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
Binary files differ