11
pzy
2024-08-26 61ec554e4da9d87519d568350ed7dcba441b8326
11
19个文件已修改
3个文件已添加
711 ■■■■ 已修改文件
DAL/应付管理/ClsYF_PayMentBill.cs 59 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DAL/应收管理/ClsYS_ReceiveBill.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache 补丁 | 查看 | 原始文档 | blame | 历史
DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
NETERPNoWin/obj/Debug/Interop.gregn6Lib.dll 补丁 | 查看 | 原始文档 | blame | 历史
NETERPNoWin/obj/Debug/NETERPNoWin.csproj.ResolveComReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
PayM/obj/Debug/Interop.gregn6Lib.dll 补丁 | 查看 | 原始文档 | blame | 历史
PayM/obj/Debug/PayM.csproj.ResolveComReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs 104 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CGGL/YF_PayMentBillController.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Models/ClsKf_ICStockBillSub.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml.user 425 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile3.pubxml 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile3.pubxml.user 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user 40 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/WebAPI.csproj.user 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DAL/Ó¦¸¶¹ÜÀí/ClsYF_PayMentBill.cs
@@ -31,8 +31,48 @@
        {
            DetailColl = null;
        }
        #endregion   è‡ªå®šä¹‰æ–¹æ³•
        //删除关联
        public override void DeleteRelation(ref string sReturn, Int64 lngBillKey)
        {
            //应收单 å…³è”数量
            try
            {
                if (DetailColl[0].HSourceBillType == "1114")                    //应付单
                {
                    oCn.RunProc("exec h_p_Cg_UpDateRelation_PayableToPayMent_Del " + lngBillKey.ToString());
                }
                else
                {
                }
            }
            catch (Exception e)
            {
                throw (e);
            }
        }
        //新增关联
        public override void AddNewRelation(ref string sReturn, Int64 lngBillKey)
        {
            //应收单 å…³è”数量
            try
            {
                if (DetailColl[0].HSourceBillType == "1114")                    //应付单
                {
                    oCn.RunProc("exec h_p_Cg_UpDateRelation_PayableToPayMent_Add " + lngBillKey.ToString());
                }
                else
                {
                }
            }
            catch (Exception e)
            {
                throw (e);
            }
        }
        //修改单据
        public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
        {
@@ -82,8 +122,11 @@
                ",HMainSourceBillNo='" + omodel.HMainSourceBillNo.ToString() +
                "',HMainSourceBillType='" + omodel.HMainSourceBillType.ToString() +
                "' where HInterID=" + lngBillKey.ToString());
                //删除关联
                DeleteRelation(ref sReturn, lngBillKey);
                if (DetailColl.Count != 0)
                {
                    //删除关联
                    DeleteRelation(ref sReturn, lngBillKey);
                }
                //删除子表
                DeleteBillSub(lngBillKey);
                //插入子表
@@ -120,6 +163,11 @@
                //        return false;
                //    }
                //}
                if (DetailColl.Count != 0)
                {
                    //更新订单关联数量
                    AddNewRelation(ref sReturn, omodel.HInterID);
                }
                sReturn = "修改单据成功!";
                oCn.Commit();
                return true;
@@ -178,6 +226,11 @@
                      "," + oSub.HPOContractInterID.ToString() + "," + oSub.HPOContractEntryID.ToString() + ",'" + oSub.HPOContractBillNo + "'," + oSub.HSeContractInterID.ToString() + "," + oSub.HSeContractEntryID.ToString() + ",'" + oSub.HSeContractBillNo + "'" +
                      ") ");
                }
                if (DetailColl.Count != 0)
                {
                    //更新订单关联数量
                    AddNewRelation(ref sReturn, omodel.HInterID);
                }
                //
                //foreach (Model.ClsYF_PayMentBillSub oSub in DetailColl)
                //{
DAL/Ó¦ÊÕ¹ÜÀí/ClsYS_ReceiveBill.cs
@@ -41,7 +41,7 @@
            //应收单 å…³è”数量
            try
            {
                if (DetailColl[0].HSourceBillType == "1114")                    //应收单
                if (DetailColl[0].HSourceBillType == "1426")                    //应收单
                {
                    oCn.RunProc("exec h_p_Xs_UpDateRelation_ReceiveToReceivableIn_Del " + lngBillKey.ToString());
                }
@@ -60,7 +60,7 @@
            //应收单 å…³è”数量
            try
            {
                if (DetailColl[0].HSourceBillType == "1114")                    //应收单
                if (DetailColl[0].HSourceBillType == "1426")                    //应收单
                {
                    oCn.RunProc("exec h_p_Xs_UpDateRelation_ReceiveToReceivableIn_Add " + lngBillKey.ToString());
                }
DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache
Binary files differ
DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
Binary files differ
NETERPNoWin/obj/Debug/Interop.gregn6Lib.dll
Binary files differ
NETERPNoWin/obj/Debug/NETERPNoWin.csproj.ResolveComReference.cache
Binary files differ
PayM/obj/Debug/Interop.gregn6Lib.dll
Binary files differ
PayM/obj/Debug/PayM.csproj.ResolveComReference.cache
Binary files differ
WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
@@ -35,7 +35,7 @@
                {
                    ds = oCN.RunProcReturn("select * from  Xt_grdAlignment_WMES where HModName='" + HModName + "' and (HUserName='admin' or HUserName='Admin')", "Xt_grdAlignment_WMES");
                    if (ds.Tables[0].Rows.Count == 0) {
                    if (ds.Tables[0].Rows.Count != 0) {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "Sucess!";
WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
@@ -2953,6 +2953,110 @@
            }
        }
        #endregion
        #region é‡‡è´­è®¢å•查询列表
        [Route("Cg_POOrderBill/QueryList")]
        [HttpGet]
        public object QueryList(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //判断是否有查询权限
                if (!DBUtility.ClsPub.Security_Log("Cg_POOrderBillQuery", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无权限查看!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                string sql = "select * from h_v_Cg_POOrderBillQuery where 1 = 1 ";
                if (sWhere == "" || sWhere == null)
                {
                    ds = oCN.RunProcReturn("select * from h_v_Cg_POOrderBillQuery  order by hmainid desc", "h_v_Cg_POOrderBillQuery");
                }
                else
                {
                    ds = oCN.RunProcReturn(sql + sWhere + " order by hmainid desc", "h_v_Cg_POOrderBillQuery");
                }
                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));//获取到DataColumn列对象的列名
                }
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess!";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        #region é‡‡è´­è®¢å•查询子列表
        [Route("Cg_POOrderBill/QuerySubList")]
        [HttpGet]
        public object QuerySubList(string hmainid, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //判断是否有查询权限
                if (!DBUtility.ClsPub.Security_Log("Cg_POOrderBillQuery", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无权限查看!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                string sql = "select * from h_v_Cg_POOrderBillQuerySub where hmainid =  "+ hmainid;
                ds = oCN.RunProcReturn(sql + " order by hsubid desc", "h_v_Cg_POOrderBillQuerySub");
                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));//获取到DataColumn列对象的列名
                }
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess!";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }
}
WebAPI/Controllers/CGGL/YF_PayMentBillController.cs
@@ -447,7 +447,13 @@
                string sReturn = "";
                oCN.BeginTran();
                ds = oCN.RunProcReturn("select * from h_v_YF_PayMentBillList where hmainid=" + HInterID, "h_v_YF_PayMentBillList");
                string hSourceBillType = ds.Tables[0].Rows[0]["源单类型"].ToString();
                if (hSourceBillType == "1114")
                {
                    //收款单 åˆ é™¤å›žå¡« åº”付单关联数量
                    oCN.RunProc("exec h_p_Cg_UpDateRelation_PayableToPayMent_Del " + HInterID);
                }
                oCN.RunProc("delete from YF_PayMentBillMain where HInterID = " + HInterID);
                oCN.RunProc("delete from YF_PayMentBillSub where HInterID= " + HInterID);
WebAPI/Models/ClsKf_ICStockBillSub.cs
@@ -74,7 +74,7 @@
        public Int64 HSourceInterID;
        public Int64 HSourceEntryID;
        public Int64 HAuxPropID;
        public Int64 HlineTotal;
        public double HlineTotal;
        public object HContainerNum { get; internal set; }
        public object HPVC { get; internal set; }
WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml
@@ -10,7 +10,11 @@
    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
    <LastUsedPlatform>Any CPU</LastUsedPlatform>
    <PublishProvider>FileSystem</PublishProvider>
<<<<<<< HEAD
    <PublishUrl>D:\网站发布\API</PublishUrl>
=======
    <PublishUrl>G:\issWeb\网站发布\API</PublishUrl>
>>>>>>> a37a23572325c5acac8e8a8f32dd61a9f61faf01
    <WebPublishMethod>FileSystem</WebPublishMethod>
  </PropertyGroup>
</Project>
WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user
@@ -4,6 +4,7 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
<<<<<<< HEAD
    <_PublishTargetUrl>D:\网站发布\API</_PublishTargetUrl>
    <History>True|2024-08-26T07:01:15.1678813Z;True|2024-08-26T14:58:26.9690997+08:00;True|2024-08-26T14:54:35.5794054+08:00;True|2024-08-26T14:32:03.8719422+08:00;False|2024-08-26T14:31:43.2800075+08:00;True|2024-08-23T14:37:38.1141512+08:00;</History>
  </PropertyGroup>
@@ -492,4 +493,8 @@
      <publishTime>08/23/2024 14:37:34</publishTime>
    </File>
  </ItemGroup>
=======
    <History>False|2024-08-26T01:46:23.8837034Z;False|2024-08-26T09:42:50.5108789+08:00;False|2024-08-26T09:33:16.5156645+08:00;False|2024-08-26T09:31:17.8659550+08:00;False|2024-08-26T09:30:43.9441152+08:00;False|2024-08-26T08:57:22.1073145+08:00;False|2024-08-26T08:56:38.8704796+08:00;</History>
  </PropertyGroup>
>>>>>>> a37a23572325c5acac8e8a8f32dd61a9f61faf01
</Project>
WebAPI/Properties/PublishProfiles/FolderProfile21.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|2024-08-23T02:19:36.3998566Z;False|2024-08-23T10:19:11.7322045+08:00;True|2024-08-22T15:00:00.6272300+08:00;True|2024-08-22T14:23:56.2431121+08:00;True|2024-08-22T14:21:07.8891099+08:00;True|2024-08-22T14:16:16.8593691+08:00;True|2024-08-22T14:10:54.9485086+08:00;False|2024-08-22T14:10:34.3992110+08:00;True|2024-08-22T13:59:37.0535963+08:00;False|2024-08-22T13:59:18.1850177+08:00;True|2024-08-22T10:34:18.4560987+08:00;True|2024-08-22T10:32:54.8825393+08:00;False|2024-08-22T10:32:23.3647548+08:00;True|2024-08-21T09:11:59.9409596+08:00;</History>
    <_PublishTargetUrl>G:\issWeb\网站发布\API</_PublishTargetUrl>
    <History>True|2024-08-23T00:57:01.4824044Z;True|2024-08-22T16:32:28.5510545+08:00;True|2024-08-22T15:05:33.7972126+08:00;True|2024-08-22T13:12:04.7949636+08:00;True|2024-08-22T12:38:36.4895558+08:00;True|2024-08-22T10:56:52.4037571+08:00;True|2024-08-22T10:23:09.0739592+08:00;True|2024-08-22T09:03:26.5727554+08:00;False|2024-08-22T09:02:31.4240959+08:00;True|2024-08-22T08:47:36.3625451+08:00;True|2024-08-21T16:51:37.2382964+08:00;True|2024-08-21T16:25:44.7030554+08:00;True|2024-08-21T16:21:11.7076342+08:00;False|2024-08-21T16:20:13.4190052+08:00;True|2024-08-21T16:00:41.9895716+08:00;True|2024-08-21T14:57:09.3460834+08:00;True|2024-08-21T10:38:36.4128047+08:00;True|2024-08-21T08:14:03.4933362+08:00;</History>
  </PropertyGroup>
  <ItemGroup>
    <File Include="apiapp.json">
      <publishTime>04/06/2023 15:57:04</publishTime>
=======
    <History>True|2024-08-22T05:54:00.8671096Z;True|2024-08-22T13:51:47.3774868+08:00;True|2024-08-22T11:08:16.6367044+08:00;False|2024-08-22T11:08:06.3321501+08:00;True|2024-08-22T10:54:44.9493185+08:00;False|2024-08-22T10:54:36.6051798+08:00;True|2024-08-21T16:59:42.2314838+08:00;True|2024-08-21T16:15:39.3970105+08:00;True|2024-08-21T16:15:21.1951828+08:00;False|2024-08-21T16:15:00.1718456+08:00;True|2024-08-21T15:52:14.1734637+08:00;True|2024-08-21T15:51:10.6106267+08:00;False|2024-08-21T15:50:05.7560087+08:00;True|2024-08-21T14:26:54.6150600+08:00;True|2024-08-21T10:36:07.4567215+08:00;True|2024-08-21T10:09:07.9820150+08:00;True|2024-08-21T10:08:57.7601146+08:00;False|2024-08-21T10:08:41.4637507+08:00;True|2024-08-19T15:51:06.3264524+08:00;True|2024-08-19T11:32:14.9720932+08:00;True|2024-07-17T13:18:07.5448501+08:00;True|2024-07-17T12:53:35.8246446+08:00;True|2024-07-17T10:34:20.6073593+08:00;True|2024-07-17T09:54:04.5489967+08:00;True|2024-07-16T16:30:18.3627034+08:00;True|2024-07-15T18:25:56.8513970+08:00;True|2024-07-15T18:09:06.8846250+08:00;True|2024-07-15T16:43:30.5405561+08:00;True|2024-07-15T15:21:21.1227016+08:00;True|2024-07-15T15:17:39.9283465+08:00;True|2024-07-15T14:54:11.3495767+08:00;True|2024-07-15T13:59:09.4243337+08:00;True|2024-07-15T13:54:34.1993714+08:00;True|2024-07-15T13:50:18.8921152+08:00;True|2024-07-15T13:48:52.6793990+08:00;True|2024-07-15T13:41:38.7896562+08:00;True|2024-07-15T12:07:43.8834464+08:00;True|2024-07-15T12:03:36.2859286+08:00;True|2024-07-15T11:31:11.9462854+08:00;True|2024-07-12T11:12:48.2429052+08:00;True|2024-07-12T11:00:40.3954752+08:00;True|2024-07-12T10:59:20.7895441+08:00;True|2024-07-12T10:23:59.9903863+08:00;True|2024-07-12T10:23:38.3456675+08:00;False|2024-07-11T20:05:30.6369108+08:00;False|2024-07-11T20:04:21.0285923+08:00;</History>
    <_PublishTargetUrl>D:\网站发布\智云MESWMS\API</_PublishTargetUrl>
  </PropertyGroup>
  <ItemGroup>
    <File Include="apiapp.json">
      <publishTime>05/25/2024 09:46:41</publishTime>
>>>>>>> 626324c6aac0ace48aeb6e7dc72b4ce49d9b240a
      <publishTime>04/15/2024 12:55:47</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>08/21/2024 09:11:46</publishTime>
      <publishTime>08/23/2024 08:56:36</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>08/21/2024 09:11:46</publishTime>
=======
      <publishTime>08/22/2024 13:53:48</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>08/22/2024 13:53:48</publishTime>
>>>>>>> 626324c6aac0ace48aeb6e7dc72b4ce49d9b240a
      <publishTime>08/23/2024 08:56:36</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
<<<<<<< HEAD
      <publishTime>08/21/2024 09:11:44</publishTime>
      <publishTime>08/23/2024 08:56:33</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>08/21/2024 09:11:44</publishTime>
=======
      <publishTime>08/22/2024 13:53:47</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>08/22/2024 13:53:47</publishTime>
>>>>>>> 626324c6aac0ace48aeb6e7dc72b4ce49d9b240a
      <publishTime>08/23/2024 08:56:33</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
<<<<<<< HEAD
      <publishTime>08/21/2024 09:11:40</publishTime>
      <publishTime>08/22/2024 09:03:00</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>08/21/2024 09:11:40</publishTime>
=======
      <publishTime>08/22/2024 13:53:45</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>08/22/2024 13:53:45</publishTime>
>>>>>>> 626324c6aac0ace48aeb6e7dc72b4ce49d9b240a
      <publishTime>08/22/2024 09:03:00</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.dll">
      <publishTime>03/22/2022 13:17:26</publishTime>
@@ -123,11 +93,7 @@
      <publishTime>05/09/2021 01:08:30</publishTime>
    </File>
    <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
<<<<<<< HEAD
      <publishTime>04/06/2023 15:57:04</publishTime>
=======
      <publishTime>05/25/2024 09:46:41</publishTime>
>>>>>>> 626324c6aac0ace48aeb6e7dc72b4ce49d9b240a
      <publishTime>04/15/2024 12:55:44</publishTime>
    </File>
    <File Include="bin/libgrpc_csharp_ext.x64.dylib">
      <publishTime>03/19/2022 07:38:44</publishTime>
@@ -145,23 +111,13 @@
      <publishTime>07/25/2012 19:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
<<<<<<< HEAD
      <publishTime>08/21/2024 09:11:41</publishTime>
      <publishTime>08/22/2024 09:03:03</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>08/21/2024 09:11:41</publishTime>
      <publishTime>08/22/2024 09:03:03</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>04/06/2023 15:57:04</publishTime>
=======
      <publishTime>08/22/2024 13:53:45</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>08/22/2024 13:53:45</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>05/25/2024 09:46:41</publishTime>
>>>>>>> 626324c6aac0ace48aeb6e7dc72b4ce49d9b240a
      <publishTime>04/15/2024 12:55:45</publishTime>
    </File>
    <File Include="bin/Newtonsoft.Json.dll">
      <publishTime>03/08/2023 15:09:56</publishTime>
@@ -191,45 +147,25 @@
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
<<<<<<< HEAD
      <publishTime>08/21/2024 09:11:38</publishTime>
      <publishTime>08/22/2024 09:02:58</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>08/21/2024 09:11:38</publishTime>
      <publishTime>08/22/2024 09:02:58</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>08/21/2024 09:11:39</publishTime>
      <publishTime>08/22/2024 09:02:59</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>08/21/2024 09:11:39</publishTime>
=======
      <publishTime>08/22/2024 13:53:43</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>08/22/2024 13:53:43</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>08/22/2024 13:53:44</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>08/22/2024 13:53:44</publishTime>
>>>>>>> 626324c6aac0ace48aeb6e7dc72b4ce49d9b240a
      <publishTime>08/22/2024 09:02:59</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
<<<<<<< HEAD
      <publishTime>08/21/2024 09:11:39</publishTime>
      <publishTime>08/22/2024 09:02:59</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>08/21/2024 09:11:39</publishTime>
=======
      <publishTime>08/22/2024 13:53:44</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>08/22/2024 13:53:44</publishTime>
>>>>>>> 626324c6aac0ace48aeb6e7dc72b4ce49d9b240a
      <publishTime>08/22/2024 09:02:59</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
@@ -310,11 +246,7 @@
      <publishTime>11/28/2018 21:01:00</publishTime>
    </File>
    <File Include="bin/System.Web.Http.WebHost.dll">
<<<<<<< HEAD
      <publishTime>04/06/2023 15:57:04</publishTime>
=======
      <publishTime>05/25/2024 09:46:41</publishTime>
>>>>>>> 626324c6aac0ace48aeb6e7dc72b4ce49d9b240a
      <publishTime>04/15/2024 12:55:45</publishTime>
    </File>
    <File Include="bin/System.Web.Mvc.dll">
      <publishTime>01/28/2015 12:02:18</publishTime>
@@ -347,36 +279,22 @@
      <publishTime>05/09/2023 10:43:40</publishTime>
    </File>
    <File Include="bin/TopSdk.dll">
<<<<<<< HEAD
      <publishTime>08/20/2024 16:45:27</publishTime>
      <publishTime>08/16/2024 16:35:48</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>08/20/2024 16:45:27</publishTime>
=======
      <publishTime>08/21/2024 16:02:12</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>08/21/2024 16:02:14</publishTime>
>>>>>>> 626324c6aac0ace48aeb6e7dc72b4ce49d9b240a
      <publishTime>08/16/2024 16:35:48</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
<<<<<<< HEAD
      <publishTime>08/23/2024 10:19:28</publishTime>
      <publishTime>08/23/2024 08:56:45</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>08/23/2024 10:19:28</publishTime>
      <publishTime>08/23/2024 08:56:45</publishTime>
    </File>
    <File Include="bin/WebAPI.XmlSerializers.dll">
      <publishTime>08/23/2024 10:19:32</publishTime>
=======
      <publishTime>08/22/2024 13:53:53</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>08/22/2024 13:53:53</publishTime>
>>>>>>> 626324c6aac0ace48aeb6e7dc72b4ce49d9b240a
      <publishTime>08/23/2024 08:56:56</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/18/2013 01:03:52</publishTime>
@@ -388,113 +306,58 @@
      <publishTime>11/29/2018 21:26:30</publishTime>
    </File>
    <File Include="Config/kdapi.config">
<<<<<<< HEAD
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>04/15/2024 12:55:43</publishTime>
    </File>
    <File Include="Content/bootstrap.css">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>04/15/2024 12:55:43</publishTime>
    </File>
    <File Include="Content/bootstrap.min.css">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>04/15/2024 12:55:43</publishTime>
    </File>
    <File Include="Content/Site.css">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>04/15/2024 12:55:43</publishTime>
    </File>
    <File Include="DLL/BLL.dll">
      <publishTime>04/06/2023 15:57:04</publishTime>
      <publishTime>04/15/2024 12:55:44</publishTime>
    </File>
    <File Include="DLL/DAL.dll">
      <publishTime>04/06/2023 15:57:04</publishTime>
      <publishTime>04/15/2024 12:55:44</publishTime>
    </File>
    <File Include="DLL/DBUtility.dll">
      <publishTime>04/06/2023 15:57:04</publishTime>
      <publishTime>04/15/2024 12:55:44</publishTime>
    </File>
    <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
      <publishTime>04/06/2023 15:57:04</publishTime>
      <publishTime>04/15/2024 12:55:44</publishTime>
    </File>
    <File Include="DLL/Model.dll">
      <publishTime>04/06/2023 15:57:04</publishTime>
      <publishTime>04/15/2024 12:55:44</publishTime>
    </File>
    <File Include="DLL/Newtonsoft.Json.Net35.dll">
      <publishTime>04/06/2023 15:57:04</publishTime>
      <publishTime>04/15/2024 12:55:44</publishTime>
    </File>
    <File Include="DLL/Pub_Class.dll">
      <publishTime>04/06/2023 15:57:04</publishTime>
      <publishTime>04/15/2024 12:55:45</publishTime>
    </File>
    <File Include="DLL/Pub_Control.dll">
      <publishTime>04/06/2023 15:57:04</publishTime>
      <publishTime>04/15/2024 12:55:45</publishTime>
    </File>
    <File Include="DLL/SQLHelper.dll">
      <publishTime>04/06/2023 15:57:04</publishTime>
      <publishTime>04/15/2024 12:55:45</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.eot">
      <publishTime>04/06/2023 15:57:04</publishTime>
      <publishTime>04/15/2024 12:55:47</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.svg">
      <publishTime>04/06/2023 15:57:04</publishTime>
      <publishTime>04/15/2024 12:55:47</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.ttf">
      <publishTime>04/06/2023 15:57:04</publishTime>
      <publishTime>04/15/2024 12:55:47</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.woff">
      <publishTime>04/06/2023 15:57:04</publishTime>
      <publishTime>04/15/2024 12:55:47</publishTime>
    </File>
    <File Include="Global.asax">
      <publishTime>04/06/2023 15:57:04</publishTime>
=======
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Content/bootstrap.css">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Content/bootstrap.min.css">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Content/Site.css">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="DLL/BLL.dll">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="DLL/DAL.dll">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="DLL/DBUtility.dll">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="DLL/Model.dll">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="DLL/Newtonsoft.Json.Net35.dll">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="DLL/Pub_Class.dll">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="DLL/Pub_Control.dll">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="DLL/SQLHelper.dll">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.eot">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.svg">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.ttf">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.woff">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Global.asax">
      <publishTime>05/25/2024 09:46:41</publishTime>
>>>>>>> 626324c6aac0ace48aeb6e7dc72b4ce49d9b240a
      <publishTime>04/15/2024 12:55:45</publishTime>
    </File>
    <File Include="grpc_csharp_ext.x64.dll">
      <publishTime>03/22/2022 13:17:22</publishTime>
@@ -503,11 +366,7 @@
      <publishTime>03/22/2022 13:17:22</publishTime>
    </File>
    <File Include="Index.html">
<<<<<<< HEAD
      <publishTime>04/06/2023 15:57:04</publishTime>
=======
      <publishTime>05/25/2024 09:46:41</publishTime>
>>>>>>> 626324c6aac0ace48aeb6e7dc72b4ce49d9b240a
      <publishTime>04/15/2024 12:55:45</publishTime>
    </File>
    <File Include="libgrpc_csharp_ext.x64.dylib">
      <publishTime>03/19/2022 07:38:44</publishTime>
@@ -516,239 +375,121 @@
      <publishTime>03/19/2022 07:38:42</publishTime>
    </File>
    <File Include="libman.json">
<<<<<<< HEAD
      <publishTime>07/12/2023 08:14:22</publishTime>
      <publishTime>04/15/2024 12:55:47</publishTime>
    </File>
    <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
      <publishTime>04/06/2023 15:57:04</publishTime>
      <publishTime>04/15/2024 12:55:45</publishTime>
    </File>
    <File Include="packages.config">
      <publishTime>08/15/2024 16:27:01</publishTime>
      <publishTime>08/16/2024 08:34:04</publishTime>
    </File>
    <File Include="Views/Scripts/bootstrap.js">
      <publishTime>04/06/2023 15:57:04</publishTime>
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Views/Scripts/bootstrap.min.js">
      <publishTime>04/06/2023 15:57:04</publishTime>
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.js">
      <publishTime>04/06/2023 15:57:04</publishTime>
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.min.js">
      <publishTime>04/06/2023 15:57:04</publishTime>
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.min.map">
      <publishTime>04/06/2023 15:57:04</publishTime>
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.js">
      <publishTime>04/06/2023 15:57:04</publishTime>
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.min.js">
      <publishTime>04/06/2023 15:57:04</publishTime>
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
      <publishTime>04/06/2023 15:57:04</publishTime>
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
      <publishTime>04/06/2023 15:57:04</publishTime>
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Views/Scripts/modernizr-2.6.2.js">
      <publishTime>04/06/2023 15:57:04</publishTime>
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Views/Shared/Error.cshtml">
      <publishTime>04/06/2023 15:57:04</publishTime>
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Views/Shared/_Layout.cshtml">
      <publishTime>04/06/2023 15:57:04</publishTime>
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Views/web.config">
      <publishTime>04/06/2023 15:57:04</publishTime>
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Views/_ViewStart.cshtml">
      <publishTime>04/06/2023 15:57:04</publishTime>
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
      <publishTime>04/06/2023 15:57:04</publishTime>
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
      <publishTime>04/06/2023 15:57:04</publishTime>
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
      <publishTime>04/06/2023 15:57:04</publishTime>
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
      <publishTime>04/06/2023 15:57:04</publishTime>
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
      <publishTime>04/06/2023 15:57:04</publishTime>
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
      <publishTime>04/06/2023 15:57:04</publishTime>
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
      <publishTime>04/06/2023 15:57:04</publishTime>
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
      <publishTime>04/06/2023 15:57:04</publishTime>
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
      <publishTime>04/06/2023 15:57:04</publishTime>
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
      <publishTime>04/06/2023 15:57:04</publishTime>
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
      <publishTime>04/06/2023 15:57:04</publishTime>
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
      <publishTime>04/06/2023 15:57:04</publishTime>
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
      <publishTime>04/06/2023 15:57:04</publishTime>
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
      <publishTime>04/06/2023 15:57:04</publishTime>
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
      <publishTime>04/06/2023 15:57:04</publishTime>
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
      <publishTime>04/06/2023 15:57:04</publishTime>
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
      <publishTime>04/06/2023 15:57:04</publishTime>
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
      <publishTime>04/06/2023 15:57:04</publishTime>
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
      <publishTime>04/06/2023 15:57:04</publishTime>
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
      <publishTime>04/06/2023 15:57:04</publishTime>
      <publishTime>04/15/2024 12:55:46</publishTime>
    </File>
    <File Include="Web References/WebS/Reference.map">
      <publishTime>05/06/2024 13:47:58</publishTime>
      <publishTime>04/29/2024 08:30:03</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>08/21/2024 09:11:58</publishTime>
=======
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="packages.config">
      <publishTime>08/16/2024 09:07:08</publishTime>
    </File>
    <File Include="Views/Scripts/bootstrap.js">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Views/Scripts/bootstrap.min.js">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.js">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.min.js">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.min.map">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.js">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.min.js">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Views/Scripts/modernizr-2.6.2.js">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Views/Shared/Error.cshtml">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Views/Shared/_Layout.cshtml">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Views/web.config">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Views/_ViewStart.cshtml">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/Reference.map">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>08/22/2024 13:53:59</publishTime>
>>>>>>> 626324c6aac0ace48aeb6e7dc72b4ce49d9b240a
      <publishTime>08/22/2024 15:05:31</publishTime>
    </File>
  </ItemGroup>
</Project>
WebAPI/Properties/PublishProfiles/FolderProfile3.pubxml
New file
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <DeleteExistingFiles>False</DeleteExistingFiles>
    <ExcludeApp_Data>False</ExcludeApp_Data>
    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
    <LastUsedPlatform>Any CPU</LastUsedPlatform>
    <PublishProvider>FileSystem</PublishProvider>
    <PublishUrl>G:\issWeb\网站发布\API</PublishUrl>
    <WebPublishMethod>FileSystem</WebPublishMethod>
  </PropertyGroup>
</Project>
WebAPI/Properties/PublishProfiles/FolderProfile3.pubxml.user
New file
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</Project>
WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml
@@ -4,10 +4,10 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <DeleteExistingFiles>False</DeleteExistingFiles>
    <DeleteExistingFiles>True</DeleteExistingFiles>
    <ExcludeApp_Data>False</ExcludeApp_Data>
    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
    <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
    <LastUsedPlatform>Any CPU</LastUsedPlatform>
    <PublishProvider>FileSystem</PublishProvider>
    <PublishUrl>G:\issWeb\网站发布\API</PublishUrl>
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|2024-08-16T08:55:32.0918962Z;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|2024-08-26T02:17:08.7733750Z;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>G:\issWeb\网站发布\API</_PublishTargetUrl>
  </PropertyGroup>
  <ItemGroup>
@@ -45,28 +45,28 @@
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>08/16/2024 16:55:13</publishTime>
      <publishTime>08/26/2024 10:16:57</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>08/16/2024 16:55:13</publishTime>
      <publishTime>08/26/2024 10:16:57</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>08/16/2024 16:55:11</publishTime>
      <publishTime>08/26/2024 10:16:54</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>08/16/2024 16:55:11</publishTime>
      <publishTime>08/26/2024 10:16:54</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>08/16/2024 16:55:04</publishTime>
      <publishTime>08/26/2024 10:16:44</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>08/16/2024 16:55:04</publishTime>
      <publishTime>08/26/2024 10:16:44</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>08/16/2024 16:55:06</publishTime>
      <publishTime>08/26/2024 10:16:47</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>08/16/2024 16:55:06</publishTime>
      <publishTime>08/26/2024 10:16:47</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>04/15/2024 12:55:45</publishTime>
@@ -147,25 +147,25 @@
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>08/16/2024 16:36:26</publishTime>
      <publishTime>08/26/2024 10:16:41</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>08/16/2024 16:36:26</publishTime>
      <publishTime>08/26/2024 10:16:41</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>08/16/2024 16:46:45</publishTime>
      <publishTime>08/26/2024 10:16:43</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>08/16/2024 16:46:45</publishTime>
      <publishTime>08/26/2024 10:16:43</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>08/16/2024 16:53:38</publishTime>
      <publishTime>08/26/2024 10:16:43</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>08/16/2024 16:53:38</publishTime>
      <publishTime>08/26/2024 10:16:43</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
@@ -279,19 +279,19 @@
      <publishTime>05/09/2023 10:43:40</publishTime>
    </File>
    <File Include="bin/TopSdk.dll">
      <publishTime>08/16/2024 16:35:48</publishTime>
      <publishTime>08/26/2024 10:09:15</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>08/16/2024 16:35:48</publishTime>
      <publishTime>08/26/2024 10:09:15</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>08/16/2024 16:55:20</publishTime>
      <publishTime>08/26/2024 10:17:06</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>08/16/2024 16:55:20</publishTime>
      <publishTime>08/26/2024 10:17:06</publishTime>
    </File>
    <File Include="bin/WebAPI.XmlSerializers.dll">
      <publishTime>08/16/2024 16:55:28</publishTime>
@@ -489,7 +489,7 @@
      <publishTime>04/29/2024 08:30:03</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>08/16/2024 16:53:22</publishTime>
      <publishTime>08/26/2024 10:17:07</publishTime>
    </File>
  </ItemGroup>
</Project>
WebAPI/WebAPI.csproj.user
@@ -1,8 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
<<<<<<< HEAD
    <NameOfLastUsedPublishProfile>D:\vs\项目代码\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile2.pubxml</NameOfLastUsedPublishProfile>
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
=======
    <WebStackScaffolding_ControllerDialogWidth>600</WebStackScaffolding_ControllerDialogWidth>
    <WebStackScaffolding_IsLayoutPageSelected>True</WebStackScaffolding_IsLayoutPageSelected>
    <WebStackScaffolding_IsPartialViewSelected>False</WebStackScaffolding_IsPartialViewSelected>
    <WebStackScaffolding_IsReferencingScriptLibrariesSelected>True</WebStackScaffolding_IsReferencingScriptLibrariesSelected>
    <WebStackScaffolding_LayoutPageFile />
    <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>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />
    <IISExpressSSLPort />
    <IISExpressAnonymousAuthentication>enabled</IISExpressAnonymousAuthentication>
    <IISExpressWindowsAuthentication>disabled</IISExpressWindowsAuthentication>
    <IISExpressUseClassicPipelineMode>false</IISExpressUseClassicPipelineMode>
    <UseGlobalApplicationHostFile />
    <ProjectView>ProjectFiles</ProjectView>
    <Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
    <Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
>>>>>>> a37a23572325c5acac8e8a8f32dd61a9f61faf01
  </PropertyGroup>
  <ProjectExtensions>
    <VisualStudio>
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
Binary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
@@ -4,8 +4,17 @@
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
<<<<<<< HEAD
D:\vs\项目代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
D:\vs\项目代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
D:\vs\项目代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
D:\vs\项目代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
D:\vs\项目代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
=======
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
>>>>>>> a37a23572325c5acac8e8a8f32dd61a9f61faf01