From 72e0c48841482d66677f636b1796002f7b7fbe82 Mon Sep 17 00:00:00 2001
From: pzy <2829717936@qq.com>
Date: 星期五, 23 八月 2024 10:42:56 +0800
Subject: [PATCH] 11

---
 WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml.user |  259 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 259 insertions(+), 0 deletions(-)

diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml.user
index ac150e0..3be0a3b 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml.user
@@ -4,12 +4,21 @@
 -->
 <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>
   </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
     </File>
     <File Include="bin/AlibabaCloud.EndpointUtil.dll">
       <publishTime>04/07/2020 16:33:48</publishTime>
@@ -45,28 +54,49 @@
       <publishTime>02/22/2013 16:43:40</publishTime>
     </File>
     <File Include="bin/BLL.dll">
+<<<<<<< HEAD
       <publishTime>08/21/2024 09:11:46</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
     </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>
     </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
     </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>
     </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
     </File>
     <File Include="bin/Grpc.Core.Api.dll">
       <publishTime>03/22/2022 13:17:26</publishTime>
@@ -93,7 +123,11 @@
       <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
     </File>
     <File Include="bin/libgrpc_csharp_ext.x64.dylib">
       <publishTime>03/19/2022 07:38:44</publishTime>
@@ -111,6 +145,7 @@
       <publishTime>07/25/2012 19:48:56</publishTime>
     </File>
     <File Include="bin/Model.dll">
+<<<<<<< HEAD
       <publishTime>08/21/2024 09:11:41</publishTime>
     </File>
     <File Include="bin/Model.pdb">
@@ -118,6 +153,15 @@
     </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
     </File>
     <File Include="bin/Newtonsoft.Json.dll">
       <publishTime>03/08/2023 15:09:56</publishTime>
@@ -147,6 +191,7 @@
       <publishTime>10/23/2021 17:07:54</publishTime>
     </File>
     <File Include="bin/Pub_Class.dll">
+<<<<<<< HEAD
       <publishTime>08/21/2024 09:11:38</publishTime>
     </File>
     <File Include="bin/Pub_Class.pdb">
@@ -157,15 +202,34 @@
     </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
     </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>
     </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
     </File>
     <File Include="bin/Swashbuckle.Core.dll">
       <publishTime>02/16/2015 01:57:08</publishTime>
@@ -246,7 +310,11 @@
       <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
     </File>
     <File Include="bin/System.Web.Mvc.dll">
       <publishTime>01/28/2015 12:02:18</publishTime>
@@ -279,15 +347,23 @@
       <publishTime>05/09/2023 10:43:40</publishTime>
     </File>
     <File Include="bin/TopSdk.dll">
+<<<<<<< HEAD
       <publishTime>08/20/2024 16:45:27</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
     </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>
     </File>
     <File Include="bin/WebAPI.pdb">
@@ -295,6 +371,12 @@
     </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
     </File>
     <File Include="bin/WebGrease.dll">
       <publishTime>07/18/2013 01:03:52</publishTime>
@@ -306,6 +388,7 @@
       <publishTime>11/29/2018 21:26:30</publishTime>
     </File>
     <File Include="Config/kdapi.config">
+<<<<<<< HEAD
       <publishTime>04/06/2023 15:57:02</publishTime>
     </File>
     <File Include="Content/bootstrap.css">
@@ -358,6 +441,60 @@
     </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
     </File>
     <File Include="grpc_csharp_ext.x64.dll">
       <publishTime>03/22/2022 13:17:22</publishTime>
@@ -366,7 +503,11 @@
       <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
     </File>
     <File Include="libgrpc_csharp_ext.x64.dylib">
       <publishTime>03/19/2022 07:38:44</publishTime>
@@ -375,6 +516,7 @@
       <publishTime>03/19/2022 07:38:42</publishTime>
     </File>
     <File Include="libman.json">
+<<<<<<< HEAD
       <publishTime>07/12/2023 08:14:22</publishTime>
     </File>
     <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
@@ -490,6 +632,123 @@
     </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
     </File>
   </ItemGroup>
 </Project>
\ No newline at end of file

--
Gitblit v1.9.1