From 12b53bc939e70508f1c9b0169ee32165e1959f7d Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期一, 06 九月 2021 18:57:15 +0800
Subject: [PATCH] 设备保养计划单列表双网格修订,加载列表页面的接口视图重写

---
 WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user   |  192 +++++++++++++++++++-------------------
 WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs |   85 +++++++++++++++-
 WebAPI/WebAPI.csproj.user                                     |    2 
 WebAPI/Controllers/PublicPageMethodController.cs              |    2 
 4 files changed, 176 insertions(+), 105 deletions(-)

diff --git a/WebAPI/Controllers/PublicPageMethodController.cs b/WebAPI/Controllers/PublicPageMethodController.cs
index 2ec055e..410fe8d 100644
--- a/WebAPI/Controllers/PublicPageMethodController.cs
+++ b/WebAPI/Controllers/PublicPageMethodController.cs
@@ -2991,5 +2991,7 @@
         #endregion
 
         #endregion
+
+
     }
 }
diff --git a/WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs
index 7c415bd..6e73a3b 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs
@@ -10,6 +10,7 @@
     {
         private json objJsonResult = new json();
         public DataSet ds = new DataSet();
+        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
 
         #region 璁惧淇濆吇璁″垝琛�
 
@@ -23,12 +24,38 @@
         {
             try
             {
-                ds = Sb_EquipMaintainPlanBillList_s(sWhere);
-                objJsonResult.code = "1";
-                objJsonResult.count = 1;
-                objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
-                objJsonResult.data = ds.Tables[0];
-                return objJsonResult;
+                if (sWhere == null || sWhere.Equals(""))
+                {
+                    ds = oCN.RunProcReturn("select * from h_v_Sc_EquipMaintain " + sWhere + " order by hmainid desc", "h_v_Sc_EquipMaintain");
+                }
+                else
+                {
+                    string sql1 = "select * from h_v_Sc_EquipMaintain where 1 = 1";
+                    string sql = sql1 + sWhere + " order by hmainid desc";
+                    ds = oCN.RunProcReturn(sql, "h_v_Sc_EquipMaintain");
+                }
+                if (ds == null || ds.Tables[0].Rows.Count == 0)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "娌℃湁浣犺鎵剧殑璁板綍锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                else
+                {
+                    objJsonResult.code = "1";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
+                    objJsonResult.data = ds.Tables[0];
+                    return objJsonResult;
+                }
+                //ds = Sb_EquipMaintainPlanBillList_s(sWhere);
+                //objJsonResult.code = "1";
+                //objJsonResult.count = 1;
+                //objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
+                //objJsonResult.data = ds.Tables[0];
+                //return objJsonResult;
             }
             catch (Exception ex)
             {
@@ -285,7 +312,7 @@
                 SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                 if (sqlWhere == null || sqlWhere.Equals(""))
                 {
-                    ds = oCN.RunProcReturn("select 鐢ㄩ噺 HQty,HMaterID, HUnitID ,琛ㄤ綋澶囨敞 HRemark from h_v_Sb_EquipMaintainPlanBillList", "h_v_Sb_EquipMaintainPlanBillList_Edit");
+                    ds = oCN.RunProcReturn("select 鐢ㄩ噺 HQty, HMaterID ,鍗曚綅ID HItemID,鍗曚綅浠g爜 HUnitCodem,鍗曚綅鍚嶇О HUnitName,琛ㄤ綋澶囨敞 HRemark from h_v_Sb_EquipMaintainPlanBillList", "h_v_Sb_EquipMaintainPlanBillList_Edit");
                     objJsonResult.code = "0";
                     objJsonResult.count = 1;
                     objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
@@ -293,7 +320,7 @@
                 }
                 else
                 {
-                    string sql1 = "select 鐢ㄩ噺 HQty,HMaterID, HUnitID ,琛ㄤ綋澶囨敞 HRemark from h_v_Sb_EquipMaintainPlanBillList where 1 = 1 ";
+                    string sql1 = "select 鐢ㄩ噺 HQty, HMaterID ,鍗曚綅ID HItemID,鍗曚綅浠g爜 HUnitCodem,鍗曚綅鍚嶇О HUnitName,琛ㄤ綋澶囨敞 HRemark from h_v_Sb_EquipMaintainPlanBillList where 1 = 1 ";
                     string sql = sql1 + sqlWhere;
                     ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipMaintainPlanBillList");
                     objJsonResult.code = "0";
@@ -313,7 +340,49 @@
         }
         #endregion
 
+        #region[璁惧淇濆吇璁″垝琛ㄧ紪杈戞椂鑾峰彇琛ㄤ綋鏁版嵁鏂�(淇濆吇椤瑰垪琛ㄣ�侀厤浠堕」鍒楄〃)]
+        [Route("Sb_EquipMaintainPlanBill/Sb_EquipMaintainBillListProjectDetaiNew")]
+        [HttpGet]
+        public object Sb_EquipMaintainBillListProjectDetaiNew(string HInterID)
+        {
 
+            DataSet ds, ds1;
+            List<object> list = new List<object>();
+            string Swhere = "";
+            try
+            {
+                if (HInterID != "" || HInterID != null)
+                {
+                    Swhere = " and hmainid='" + HInterID + "'";
+                }
+                else
+                {
+                    Swhere = HInterID;
+                }
+                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+                //鑾峰彇淇濆吇椤圭洰缂栬緫鏁版嵁
+                string sql = "select HMaintainItemID, 淇濆吇椤圭洰浠g爜 HMaintainItemNumber,淇濆吇椤圭洰鍚嶇О HMaintainItem,淇濆吇閮ㄤ綅 HMaintainPart,鍏蜂綋瑕佹眰 HClaim,HManagerID,璐熻矗浜轰唬鐮� HManagerNumber,璐熻矗浜� HManagerName,琛ㄤ綋澶囨敞 HRemark  from h_v_Sb_EquipMaintainBillSub_Item where 1 = 1 " + Swhere + "";
+                ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipMaintainBillSub_Item");
+                //鑾峰彇閰嶄欢椤圭洰缂栬緫鏁版嵁
+                string sql1 = "select HMaterID, 閰嶄欢浠g爜 HMaterNumber,閰嶄欢鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,鍗曚綅ID,鍗曚綅浠g爜 HUnitNumber,鍗曚綅鍚嶇О HUnitName,鐢ㄩ噺 HQty,鏍囧噯鐢ㄩ噺 HQtyMust,琛ㄤ綋澶囨敞 HRemark  from h_v_Sb_EquipMaintainPlanBillList where 1 = 1 " + Swhere + "";
+                ds1 = oCN.RunProcReturn(sql1, "h_v_Sb_EquipMaintainPlanBillList");
+                list.Add(ds.Tables[0]);
+                list.Add(ds1.Tables[0]);
+                objJsonResult.code = "0";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+                objJsonResult.list = list;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+                objJsonResult.data = null;
+            }
+            return objJsonResult;
+        }
+        #endregion
 
 
 
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index b100275..45b7631 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -9,40 +9,40 @@
   </PropertyGroup>
   <ItemGroup>
     <File Include="apiapp.json">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:16</publishTime>
     </File>
     <File Include="bin/Antlr3.Runtime.dll">
-      <publishTime>02/22/2013 16:43:40</publishTime>
+      <publishTime>02/22/2013 08:43:40</publishTime>
     </File>
     <File Include="bin/Antlr3.Runtime.pdb">
-      <publishTime>02/22/2013 16:43:40</publishTime>
+      <publishTime>02/22/2013 08:43:40</publishTime>
     </File>
     <File Include="bin/BLL.dll">
-      <publishTime>09/03/2021 16:27:44</publishTime>
+      <publishTime>09/06/2021 18:53:30</publishTime>
     </File>
     <File Include="bin/BLL.pdb">
-      <publishTime>09/03/2021 16:27:44</publishTime>
+      <publishTime>09/06/2021 18:53:30</publishTime>
     </File>
     <File Include="bin/DAL.dll">
-      <publishTime>09/03/2021 16:27:43</publishTime>
+      <publishTime>09/06/2021 18:53:28</publishTime>
     </File>
     <File Include="bin/DAL.pdb">
-      <publishTime>09/03/2021 16:27:43</publishTime>
+      <publishTime>09/06/2021 18:53:28</publishTime>
     </File>
     <File Include="bin/Dapper.dll">
-      <publishTime>07/22/2016 22:52:40</publishTime>
+      <publishTime>07/22/2016 14:52:40</publishTime>
     </File>
     <File Include="bin/DBUtility.dll">
-      <publishTime>09/03/2021 16:27:41</publishTime>
+      <publishTime>09/06/2021 18:53:24</publishTime>
     </File>
     <File Include="bin/DBUtility.pdb">
-      <publishTime>09/03/2021 16:27:41</publishTime>
+      <publishTime>09/06/2021 18:53:24</publishTime>
     </File>
     <File Include="bin/Interop.gregn6Lib.dll">
       <publishTime>08/25/2021 10:28:25</publishTime>
     </File>
     <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
-      <publishTime>08/25/2021 20:46:09</publishTime>
+      <publishTime>08/16/2021 17:23:13</publishTime>
     </File>
     <File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
       <publishTime>09/20/2018 19:23:20</publishTime>
@@ -51,49 +51,49 @@
       <publishTime>09/20/2018 19:28:34</publishTime>
     </File>
     <File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll">
-      <publishTime>03/19/2015 01:02:50</publishTime>
+      <publishTime>03/18/2015 17:02:50</publishTime>
     </File>
     <File Include="bin/Microsoft.CSharp.dll">
       <publishTime>09/26/2012 03:16:08</publishTime>
     </File>
     <File Include="bin/Microsoft.Web.Infrastructure.dll">
-      <publishTime>07/25/2012 19:48:56</publishTime>
+      <publishTime>07/25/2012 11:48:56</publishTime>
     </File>
     <File Include="bin/Model.dll">
-      <publishTime>09/03/2021 16:27:42</publishTime>
+      <publishTime>09/06/2021 18:53:25</publishTime>
     </File>
     <File Include="bin/Model.pdb">
-      <publishTime>09/03/2021 16:27:42</publishTime>
+      <publishTime>09/06/2021 18:53:25</publishTime>
     </File>
     <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="bin/Newtonsoft.Json.dll">
-      <publishTime>08/04/2014 04:33:56</publishTime>
+      <publishTime>08/03/2014 20:33:56</publishTime>
     </File>
     <File Include="bin/Pub_Class.dll">
-      <publishTime>09/03/2021 16:27:40</publishTime>
+      <publishTime>09/06/2021 18:53:22</publishTime>
     </File>
     <File Include="bin/Pub_Class.pdb">
-      <publishTime>09/03/2021 16:27:40</publishTime>
+      <publishTime>09/06/2021 18:53:22</publishTime>
     </File>
     <File Include="bin/Pub_Control.dll">
-      <publishTime>09/03/2021 16:27:41</publishTime>
+      <publishTime>09/06/2021 18:53:23</publishTime>
     </File>
     <File Include="bin/Pub_Control.pdb">
-      <publishTime>09/03/2021 16:27:41</publishTime>
+      <publishTime>09/06/2021 18:53:23</publishTime>
     </File>
     <File Include="bin/SQLHelper.dll">
-      <publishTime>09/03/2021 16:27:41</publishTime>
+      <publishTime>09/06/2021 18:53:23</publishTime>
     </File>
     <File Include="bin/SQLHelper.pdb">
-      <publishTime>09/03/2021 16:27:41</publishTime>
+      <publishTime>09/06/2021 18:53:23</publishTime>
     </File>
     <File Include="bin/stdole.dll">
       <publishTime>05/09/2021 13:35:37</publishTime>
     </File>
     <File Include="bin/Swashbuckle.Core.dll">
-      <publishTime>02/16/2015 01:57:08</publishTime>
+      <publishTime>02/15/2015 17:57:08</publishTime>
     </File>
     <File Include="bin/System.ComponentModel.DataAnnotations.dll">
       <publishTime>09/26/2012 03:16:08</publishTime>
@@ -117,13 +117,13 @@
       <publishTime>09/26/2012 03:16:08</publishTime>
     </File>
     <File Include="bin/System.IdentityModel.Tokens.Jwt.dll">
-      <publishTime>08/19/2014 18:03:34</publishTime>
+      <publishTime>08/19/2014 10:03:34</publishTime>
     </File>
     <File Include="bin/System.Net.Http.dll">
       <publishTime>09/26/2012 03:16:08</publishTime>
     </File>
     <File Include="bin/System.Net.Http.Formatting.dll">
-      <publishTime>11/28/2018 21:00:36</publishTime>
+      <publishTime>11/28/2018 13:00:36</publishTime>
     </File>
     <File Include="bin/System.Runtime.Serialization.dll">
       <publishTime>09/26/2012 03:16:08</publishTime>
@@ -132,7 +132,7 @@
       <publishTime>09/26/2012 03:16:08</publishTime>
     </File>
     <File Include="bin/System.Web.Cors.dll">
-      <publishTime>11/28/2018 20:58:44</publishTime>
+      <publishTime>11/28/2018 12:58:44</publishTime>
     </File>
     <File Include="bin/System.Web.dll">
       <publishTime>09/26/2012 03:16:08</publishTime>
@@ -147,37 +147,37 @@
       <publishTime>09/26/2012 03:16:08</publishTime>
     </File>
     <File Include="bin/System.Web.Helpers.dll">
-      <publishTime>01/28/2015 12:04:30</publishTime>
+      <publishTime>01/28/2015 04:04:30</publishTime>
     </File>
     <File Include="bin/System.Web.Http.Cors.dll">
-      <publishTime>11/28/2018 21:01:26</publishTime>
+      <publishTime>11/28/2018 13:01:26</publishTime>
     </File>
     <File Include="bin/System.Web.Http.dll">
-      <publishTime>11/28/2018 21:01:00</publishTime>
+      <publishTime>11/28/2018 13:01:00</publishTime>
     </File>
     <File Include="bin/System.Web.Http.WebHost.dll">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="bin/System.Web.Mvc.dll">
-      <publishTime>01/28/2015 12:02:18</publishTime>
+      <publishTime>01/28/2015 04:02:18</publishTime>
     </File>
     <File Include="bin/System.Web.Optimization.dll">
-      <publishTime>02/11/2014 23:26:04</publishTime>
+      <publishTime>02/11/2014 15:26:04</publishTime>
     </File>
     <File Include="bin/System.Web.Razor.dll">
-      <publishTime>01/28/2015 12:02:32</publishTime>
+      <publishTime>01/28/2015 04:02:32</publishTime>
     </File>
     <File Include="bin/System.Web.Services.dll">
       <publishTime>09/26/2012 03:16:08</publishTime>
     </File>
     <File Include="bin/System.Web.WebPages.Deployment.dll">
-      <publishTime>01/28/2015 12:04:30</publishTime>
+      <publishTime>01/28/2015 04:04:30</publishTime>
     </File>
     <File Include="bin/System.Web.WebPages.dll">
-      <publishTime>01/28/2015 12:04:30</publishTime>
+      <publishTime>01/28/2015 04:04:30</publishTime>
     </File>
     <File Include="bin/System.Web.WebPages.Razor.dll">
-      <publishTime>01/28/2015 12:04:30</publishTime>
+      <publishTime>01/28/2015 04:04:30</publishTime>
     </File>
     <File Include="bin/System.Xml.dll">
       <publishTime>09/26/2012 03:16:08</publishTime>
@@ -186,184 +186,184 @@
       <publishTime>09/26/2012 03:16:08</publishTime>
     </File>
     <File Include="bin/WebActivatorEx.dll">
-      <publishTime>11/24/2014 19:18:48</publishTime>
+      <publishTime>11/24/2014 11:18:48</publishTime>
     </File>
     <File Include="bin/WebAPI.dll">
-      <publishTime>09/03/2021 16:27:45</publishTime>
+      <publishTime>09/06/2021 18:53:33</publishTime>
     </File>
     <File Include="bin/WebAPI.pdb">
-      <publishTime>09/03/2021 16:27:45</publishTime>
+      <publishTime>09/06/2021 18:53:33</publishTime>
     </File>
     <File Include="bin/WebGrease.dll">
-      <publishTime>07/18/2013 01:03:52</publishTime>
+      <publishTime>07/17/2013 17:03:52</publishTime>
     </File>
     <File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
-      <publishTime>11/29/2018 21:26:02</publishTime>
+      <publishTime>11/29/2018 13:26:02</publishTime>
     </File>
     <File Include="bin/zh-Hans/System.Web.Http.resources.dll">
-      <publishTime>11/29/2018 21:26:30</publishTime>
+      <publishTime>11/29/2018 13:26:30</publishTime>
     </File>
     <File Include="Content/bootstrap.css">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Content/bootstrap.min.css">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Content/Site.css">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="DLL/BLL.dll">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="DLL/DAL.dll">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="DLL/DBUtility.dll">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="DLL/Model.dll">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="DLL/Newtonsoft.Json.Net35.dll">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="DLL/Pub_Class.dll">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="DLL/Pub_Control.dll">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="DLL/SQLHelper.dll">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.eot">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:16</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.svg">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:16</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.ttf">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:16</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.woff">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:16</publishTime>
     </File>
     <File Include="Global.asax">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Index.html">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="packages.config">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:16</publishTime>
     </File>
     <File Include="Views/Scripts/bootstrap.js">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Views/Scripts/bootstrap.min.js">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Views/Scripts/jquery-1.10.2.js">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Views/Scripts/jquery-1.10.2.min.js">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Views/Scripts/jquery-1.10.2.min.map">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.js">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.min.js">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Views/Scripts/modernizr-2.6.2.js">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Views/Shared/Error.cshtml">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Views/Shared/_Layout.cshtml">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Views/web.config">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Views/_ViewStart.cshtml">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
-      <publishTime>08/25/2021 20:46:11</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/Reference.map">
       <publishTime>08/06/2021 22:57:28</publishTime>
     </File>
     <File Include="Web.config">
-      <publishTime>09/03/2021 16:27:50</publishTime>
+      <publishTime>09/06/2021 18:53:42</publishTime>
     </File>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index 8d7bb3f..c934955 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -7,7 +7,7 @@
     <WebStackScaffolding_IsReferencingScriptLibrariesSelected>True</WebStackScaffolding_IsReferencingScriptLibrariesSelected>
     <WebStackScaffolding_LayoutPageFile />
     <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
-    <NameOfLastUsedPublishProfile>D:\Git浠撳簱\MESWMS\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
     <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>false</UseIISExpress>
     <Use64BitIISExpress />

--
Gitblit v1.9.1