From 04a6967c9e4f4b83213fa90cee66b48e855c818c Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期三, 20 十月 2021 18:21:42 +0800
Subject: [PATCH] 新增设备分类列表

---
 WebAPI/Controllers/SBGL/Gy_EquipTypeController.cs           |  239 +++++++++++++++++++++++++++++
 WebAPI/ListModels.cs                                        |   12 +
 WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user |  146 +++++++++---------
 WebAPI/DLL/ClsGy_EquipTypeBill.cs                           |   26 +++
 WebAPI/Models/ClsGy_EquipFileType.cs                        |   31 +++
 WebAPI/WebAPI.csproj                                        |    4 
 6 files changed, 385 insertions(+), 73 deletions(-)

diff --git a/WebAPI/Controllers/SBGL/Gy_EquipTypeController.cs b/WebAPI/Controllers/SBGL/Gy_EquipTypeController.cs
new file mode 100644
index 0000000..c556479
--- /dev/null
+++ b/WebAPI/Controllers/SBGL/Gy_EquipTypeController.cs
@@ -0,0 +1,239 @@
+锘縰sing DBUtility;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers.SBGL
+{
+    public class Gy_EquipTypeController : ApiController
+    {
+        public DBUtility.ClsPub.Enum_BillStatus BillStatus;//鍗曟嵁鐘舵�侊紙鏂板锛屼慨鏀癸紝娴忚锛屾洿鏂板崟浠凤紝鍙樻洿锛�
+        private json objJsonResult = new json();
+        public DataSet ds = new DataSet();
+        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+        public DLL.ClsGy_EquipTypeBill BillNew0 = new DLL.ClsGy_EquipTypeBill();   //妯″叿鎶ュ簾鍏ュ簱瀵瑰簲鍗曟嵁绫�
+        public DLL.ClsGy_EquipTypeBill BillOld0 = new DLL.ClsGy_EquipTypeBill();   //妯″叿鎶ュ簾鍏ュ簱瀵瑰簲鍗曟嵁绫�
+
+        #region 璁惧鍒嗙被鍒楄〃
+
+        [Route("Gy_EquipType/GetList")]
+        [HttpGet]
+        public object GetList(string sWhere)
+        {
+            try
+            {
+                ds = Sc_GetEquipTypeList(sWhere);
+                if (ds == null)
+                {
+                    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;
+                }
+            }
+            catch (Exception ex)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�" + ex.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+
+        public static DataSet Sc_GetEquipTypeList(string sWhere)
+        {
+            string sql1 = string.Format(@"select * from h_v_Gy_EquipTypeList");
+            if (sWhere == null || sWhere.Equals(""))
+            {
+                return new SQLHelper.ClsCN().RunProcReturn(sql1 + sWhere + " order by HItemID desc", "h_v_Gy_EquipTypeList");
+            }
+            else
+            {
+                string sql = sql1 + sWhere + " order by HItemID desc";
+                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Gy_EquipTypeList");
+            }
+
+        }
+
+        #endregion
+
+        #region [璁惧鍒嗙被鍒犻櫎鍔熻兘]
+        [Route("Gy_EquipType/Delete_EquipType")]
+        [HttpGet]
+        public object Delete_EquipType(string HItemID)
+        {
+            string s = "";
+            Int64 lngBillKey = 0;
+            lngBillKey = DBUtility.ClsPub.isLong(HItemID);
+            if (lngBillKey == 0)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "鍗曟嵁ID涓虹┖锛�";
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+            DLL.ClsGy_EquipTypeBill oBill = new DLL.ClsGy_EquipTypeBill();
+            if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
+            {
+                bool IsDete = oBill.DeleteBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo);
+                if (IsDete)
+                {
+                    objJsonResult.code = "1";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                else
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+            }
+            else
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "鍗曟嵁鏈壘鍒�";
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+
+        #endregion
+
+        #region 璁惧鍒嗙被淇濆瓨/缂栬緫
+        [Route("Gy_EquipType/SaveEquipTypeList")]
+        [HttpPost]
+        public object SaveEquipTypeList([FromBody] JObject msg)
+        {
+            var _value = msg["msg"].ToString();
+            string msg1 = _value.ToString();
+            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+            string msg2 = sArray[0].ToString();
+            string refSav = sArray[1].ToString();
+
+            ListModels oListModels = new ListModels();
+            try
+            {
+                DLL.ClsGy_EquipTypeBill oBill = new DLL.ClsGy_EquipTypeBill();
+                List<Models.ClsGy_EquipFileType> lsmain = new List<Models.ClsGy_EquipFileType>();
+                msg2 = msg2.Replace("\\", "");
+                msg2 = msg2.Replace("\n", "");  //\n
+                lsmain = oListModels.getObjectByJson_Gy_EquipFileType(msg2);
+
+                long HItemID = lsmain[0].HItemID;
+                string HNumber = lsmain[0].HNumber;
+                string HName = lsmain[0].HName;
+                string HShortNumber = lsmain[0].HNumber;
+                long HParentID = lsmain[0].HParentID;
+                long HLevel = lsmain[0].HLevel;
+                string HHelpCode = lsmain[0].HHelpCode;
+                string HRemark = lsmain[0].HRemark;
+                bool HStopflag = lsmain[0].HStopflag;
+                string HUseFlag = lsmain[0].HUseFlag;
+                bool HEndFlag = lsmain[0].HEndFlag;
+
+                if (refSav == "Add")
+                {
+                        //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+                        oCN.BeginTran();
+                        //涓昏〃
+                        oCN.RunProc("Insert into Gy_EquipFileType " +
+                           " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
+                           ",HLevel,HEndFlag,HStopflag,HRemark,HMakeTime) " +
+                           " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID +
+                           "," + HLevel + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "',getdate())", ref DBUtility.ClsPub.sExeReturnInfo);
+                        //淇敼涓婄骇涓洪潪鏈骇浠g爜
+                        oCN.RunProc("Update Gy_EquipFileType set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+                        oCN.Commit();
+                        objJsonResult.code = "1";
+                        objJsonResult.count = 1;
+                        objJsonResult.Message = "鏂板鎴愬姛锛�";
+                        //objJsonResult.data = null;
+                        return objJsonResult;
+                }
+                if (refSav == "Update")
+                {
+                        oCN.BeginTran();
+                        //涓昏〃
+                        oCN.RunProc("Update Gy_EquipFileType set " +
+                            " HNumber='" + HNumber + "'" +
+                            ",HName='" + HName + "'" +
+                            ",HShortNumber='" +HShortNumber + "'" +
+                            ",HHelpCode='" + HHelpCode + "'" +
+                            ",HParentID=" + HParentID +
+                            ",HStopflag='" + HStopflag + "'" +
+                            ",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+                        //淇敼瀛愰」鐩唬鐮�
+                        //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_RepairCheck,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
+                        //灏嗕笂绾� 涓洪潪鏈骇
+                        oCN.RunProc("Update Gy_EquipFileType set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+                        //
+                        oCN.Commit();
+                        objJsonResult.code = "1";
+                        objJsonResult.count = 1;
+                        objJsonResult.Message = "淇敼鎴愬姛锛�";
+                        //objJsonResult.data = null;
+                        return objJsonResult;
+                }
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+                objJsonResult.data = 1;
+                return objJsonResult;
+            }
+            return false;
+        }
+        #endregion
+
+        #region[璁惧鍒嗙被缂栬緫鏃惰幏鍙栬〃澶存暟鎹甝
+        [Route("Gy_EquipType/Gy_EquipTypeCheckDetai")]
+        [HttpGet]
+        public object Gy_EquipTypeCheckDetai(long HInterID)
+        {
+            try
+            {
+                ds = oCN.RunProcReturn("select * from Gy_EquipFileType where HItemID=" + HInterID, "Gy_EquipFileType");
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "";
+                objJsonResult.data = ds.Tables[0];
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+    }
+}
diff --git a/WebAPI/DLL/ClsGy_EquipTypeBill.cs b/WebAPI/DLL/ClsGy_EquipTypeBill.cs
new file mode 100644
index 0000000..9abe871
--- /dev/null
+++ b/WebAPI/DLL/ClsGy_EquipTypeBill.cs
@@ -0,0 +1,26 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.DLL
+{
+    public class ClsGy_EquipTypeBill : DBUtility.ClsXt_BaseBill
+    {
+        public Models.ClsGy_EquipFileType omodel = new Models.ClsGy_EquipFileType();
+
+        public ClsGy_EquipTypeBill()
+        {
+            base.MvarItemKeySub = "";
+            base.MvarItemKeySub2 = "";
+            base.MvarItemKeySub3 = "";
+            base.MvarItemKeySub4 = "";
+            base.MvarItemKey = "Gy_EquipFileType";
+            base.MvarReportTitle = "璁惧鍒嗙被";
+            base.BillType = "";
+            base.HBillSubType = "";
+        }
+
+        
+    }
+}
\ No newline at end of file
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index d1903a8..4c93580 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -1402,6 +1402,18 @@
             return list;
         }
 
+        /// <summary>
+        /// 澶勭悊鏂板璁惧鍒嗙被涓昏〃鐨刯son
+        /// </summary>
+        /// <param name="jsonString"></param>
+        /// <returns></returns>
+        public List<Models.ClsGy_EquipFileType> getObjectByJson_Gy_EquipFileType(string jsonString)
+        {
+            jsonString = "[" + jsonString.ToString() + "]";
+            List<Models.ClsGy_EquipFileType> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_EquipFileType>>(jsonString);
+            return list;
+        }
+
 
         /// <summary>
         /// PDA澶勭悊鏂板璁惧淇濆吇璁板綍鍗曞瓙琛ㄧ殑json
diff --git a/WebAPI/Models/ClsGy_EquipFileType.cs b/WebAPI/Models/ClsGy_EquipFileType.cs
new file mode 100644
index 0000000..fe04378
--- /dev/null
+++ b/WebAPI/Models/ClsGy_EquipFileType.cs
@@ -0,0 +1,31 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+    public class ClsGy_EquipFileType : DBUtility.ClsXt_BaseBillMain
+    {
+        public int HItemID;                     //涓婚敭 int             	 
+        public string HNumber;      //浠g爜 
+        public string HName;        //鍚嶇О 
+        public string HShortNumber;     //鐭唬鐮�   
+        public int HParentID;          //鐖剁骇ID int   
+        public int HLevel;			//绛夌骇	int  
+        public bool HEndFlag;			//鏈骇鏍囧織 bit   
+        public bool HStopflag;			//绂佺敤鏍囧織 bit
+        public string HRemark;      //澶囨敞 varchar(50)   
+        public string HHelpCode;        //鍔╄鐮�  varchar(20)
+        public string HUseFlag;     //浣跨敤鐘舵�侊紙鏈娴嬶紝鏈娇鐢紝宸蹭娇鐢級
+        public DateTime HMakeTime;          //寤虹珛鏃堕棿(getdate())	
+        public string HMakeEmp;     //鍒涘缓浜�			
+        public string HCheckEmp;        //瀹℃牳浜�
+        public DateTime HCheckTime;			//瀹℃牳鏃堕棿
+        public string HModifyEmp;       //淇敼浜�
+        public DateTime HModifyTime;			//淇敼鏃堕棿
+        public string HStopEmp;     //绂佺敤浜�
+        public DateTime HStopTime;			//绂佺敤鏃堕棿
+
+    }
+}
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 272a9d0..97e1b1a 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -9,7 +9,7 @@
   </PropertyGroup>
   <ItemGroup>
     <File Include="apiapp.json">
-      <publishTime>08/09/2021 09:06:27</publishTime>
+      <publishTime>08/16/2021 17:23:16</publishTime>
     </File>
     <File Include="bin/Antlr3.Runtime.dll">
       <publishTime>02/22/2013 08:43:40</publishTime>
@@ -18,31 +18,31 @@
       <publishTime>02/22/2013 08:43:40</publishTime>
     </File>
     <File Include="bin/BLL.dll">
-      <publishTime>10/19/2021 10:42:06</publishTime>
+      <publishTime>10/20/2021 18:16:16</publishTime>
     </File>
     <File Include="bin/BLL.pdb">
-      <publishTime>10/19/2021 10:42:06</publishTime>
+      <publishTime>10/20/2021 18:16:16</publishTime>
     </File>
     <File Include="bin/DAL.dll">
-      <publishTime>10/19/2021 10:42:05</publishTime>
+      <publishTime>10/20/2021 18:16:15</publishTime>
     </File>
     <File Include="bin/DAL.pdb">
-      <publishTime>10/19/2021 10:42:05</publishTime>
+      <publishTime>10/20/2021 18:16:15</publishTime>
     </File>
     <File Include="bin/Dapper.dll">
       <publishTime>07/22/2016 14:52:40</publishTime>
     </File>
     <File Include="bin/DBUtility.dll">
-      <publishTime>10/19/2021 10:42:03</publishTime>
+      <publishTime>10/20/2021 18:16:12</publishTime>
     </File>
     <File Include="bin/DBUtility.pdb">
-      <publishTime>10/19/2021 10:42:03</publishTime>
+      <publishTime>10/20/2021 18:16:12</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/09/2021 09:06:25</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>
@@ -60,34 +60,34 @@
       <publishTime>07/25/2012 11:48:56</publishTime>
     </File>
     <File Include="bin/Model.dll">
-      <publishTime>10/19/2021 10:42:03</publishTime>
+      <publishTime>10/20/2021 18:16:12</publishTime>
     </File>
     <File Include="bin/Model.pdb">
-      <publishTime>10/19/2021 10:42:03</publishTime>
+      <publishTime>10/20/2021 18:16:12</publishTime>
     </File>
     <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
-      <publishTime>08/09/2021 09:06:27</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="bin/Newtonsoft.Json.dll">
       <publishTime>08/03/2014 20:33:56</publishTime>
     </File>
     <File Include="bin/Pub_Class.dll">
-      <publishTime>10/19/2021 10:42:02</publishTime>
+      <publishTime>10/20/2021 18:16:10</publishTime>
     </File>
     <File Include="bin/Pub_Class.pdb">
-      <publishTime>10/19/2021 10:42:02</publishTime>
+      <publishTime>10/20/2021 18:16:10</publishTime>
     </File>
     <File Include="bin/Pub_Control.dll">
-      <publishTime>10/19/2021 10:42:02</publishTime>
+      <publishTime>10/20/2021 18:16:11</publishTime>
     </File>
     <File Include="bin/Pub_Control.pdb">
-      <publishTime>10/19/2021 10:42:02</publishTime>
+      <publishTime>10/20/2021 18:16:11</publishTime>
     </File>
     <File Include="bin/SQLHelper.dll">
-      <publishTime>10/19/2021 10:42:02</publishTime>
+      <publishTime>10/20/2021 18:16:11</publishTime>
     </File>
     <File Include="bin/SQLHelper.pdb">
-      <publishTime>10/19/2021 10:42:02</publishTime>
+      <publishTime>10/20/2021 18:16:11</publishTime>
     </File>
     <File Include="bin/stdole.dll">
       <publishTime>05/09/2021 13:35:37</publishTime>
@@ -156,7 +156,7 @@
       <publishTime>11/28/2018 13:01:00</publishTime>
     </File>
     <File Include="bin/System.Web.Http.WebHost.dll">
-      <publishTime>08/09/2021 09:06:27</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="bin/System.Web.Mvc.dll">
       <publishTime>01/28/2015 04:02:18</publishTime>
@@ -189,10 +189,10 @@
       <publishTime>11/24/2014 11:18:48</publishTime>
     </File>
     <File Include="bin/WebAPI.dll">
-      <publishTime>10/19/2021 10:42:08</publishTime>
+      <publishTime>10/20/2021 18:16:19</publishTime>
     </File>
     <File Include="bin/WebAPI.pdb">
-      <publishTime>10/19/2021 10:42:08</publishTime>
+      <publishTime>10/20/2021 18:16:19</publishTime>
     </File>
     <File Include="bin/WebGrease.dll">
       <publishTime>07/17/2013 17:03:52</publishTime>
@@ -204,166 +204,166 @@
       <publishTime>11/29/2018 13:26:30</publishTime>
     </File>
     <File Include="Content/bootstrap.css">
-      <publishTime>08/09/2021 09:06:27</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Content/bootstrap.min.css">
-      <publishTime>08/09/2021 09:06:27</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Content/Site.css">
-      <publishTime>08/09/2021 09:06:27</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="DLL/BLL.dll">
-      <publishTime>08/09/2021 09:06:27</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="DLL/DAL.dll">
-      <publishTime>08/09/2021 09:06:27</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="DLL/DBUtility.dll">
-      <publishTime>08/09/2021 09:06:27</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
-      <publishTime>08/09/2021 09:06:27</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="DLL/Model.dll">
-      <publishTime>08/09/2021 09:06:27</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="DLL/Newtonsoft.Json.Net35.dll">
-      <publishTime>08/09/2021 09:06:27</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="DLL/Pub_Class.dll">
-      <publishTime>08/09/2021 09:06:27</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="DLL/Pub_Control.dll">
-      <publishTime>08/09/2021 09:06:27</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="DLL/SQLHelper.dll">
-      <publishTime>08/09/2021 09:06:27</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.eot">
-      <publishTime>08/09/2021 09:06:27</publishTime>
+      <publishTime>08/16/2021 17:23:16</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.svg">
-      <publishTime>08/09/2021 09:06:27</publishTime>
+      <publishTime>08/16/2021 17:23:16</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.ttf">
-      <publishTime>08/09/2021 09:06:27</publishTime>
+      <publishTime>08/16/2021 17:23:16</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.woff">
-      <publishTime>08/09/2021 09:06:27</publishTime>
+      <publishTime>08/16/2021 17:23:16</publishTime>
     </File>
     <File Include="Global.asax">
-      <publishTime>08/09/2021 09:06:27</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Index.html">
-      <publishTime>08/09/2021 09:06:27</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
-      <publishTime>08/09/2021 09:06:27</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="packages.config">
-      <publishTime>08/09/2021 09:06:27</publishTime>
+      <publishTime>08/16/2021 17:23:16</publishTime>
     </File>
     <File Include="Views/Scripts/bootstrap.js">
-      <publishTime>08/09/2021 09:06:27</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Views/Scripts/bootstrap.min.js">
-      <publishTime>08/09/2021 09:06:27</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Views/Scripts/jquery-1.10.2.js">
-      <publishTime>08/09/2021 09:06:27</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Views/Scripts/jquery-1.10.2.min.js">
-      <publishTime>08/09/2021 09:06:27</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Views/Scripts/jquery-1.10.2.min.map">
-      <publishTime>08/09/2021 09:06:27</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.js">
-      <publishTime>08/09/2021 09:06:27</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.min.js">
-      <publishTime>08/09/2021 09:06:27</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
-      <publishTime>08/09/2021 09:06:27</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
-      <publishTime>08/09/2021 09:06:27</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Views/Scripts/modernizr-2.6.2.js">
-      <publishTime>08/09/2021 09:06:27</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Views/Shared/Error.cshtml">
-      <publishTime>08/09/2021 09:06:27</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Views/Shared/_Layout.cshtml">
-      <publishTime>08/09/2021 09:06:27</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Views/web.config">
-      <publishTime>08/09/2021 09:06:27</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Views/_ViewStart.cshtml">
-      <publishTime>08/09/2021 09:06:27</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
-      <publishTime>08/10/2021 08:30:51</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
-      <publishTime>08/10/2021 08:30:51</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
-      <publishTime>08/10/2021 08:30:51</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
-      <publishTime>08/10/2021 08:30:51</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
-      <publishTime>08/10/2021 08:30:51</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
-      <publishTime>08/10/2021 08:30:51</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
-      <publishTime>08/10/2021 08:30:51</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
-      <publishTime>08/10/2021 08:30:52</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
-      <publishTime>08/10/2021 08:30:52</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
-      <publishTime>08/10/2021 08:30:52</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
-      <publishTime>08/10/2021 08:30:52</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
-      <publishTime>08/10/2021 08:30:52</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
-      <publishTime>08/10/2021 08:30:51</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
-      <publishTime>08/10/2021 08:30:52</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
-      <publishTime>08/10/2021 08:30:52</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
-      <publishTime>08/10/2021 08:30:52</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
-      <publishTime>08/10/2021 08:30:52</publishTime>
+      <publishTime>08/16/2021 17:23:15</publishTime>
     </File>
     <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
-      <publishTime>08/10/2021 08:30:52</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>10/19/2021 10:42:12</publishTime>
+      <publishTime>10/20/2021 18:16:53</publishTime>
     </File>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 8616f1f..604bb6d 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -339,6 +339,7 @@
     <Compile Include="Controllers\PublicPageMethodController.cs" />
     <Compile Include="Controllers\ReportFromController.cs" />
     <Compile Include="Controllers\ReportPlatFormController.cs" />
+    <Compile Include="Controllers\SBGL\Gy_EquipTypeController.cs" />
     <Compile Include="Controllers\SCGL\Sc_MESProductReportBillController.cs" />
     <Compile Include="Controllers\Sc_MouldRepairOutBillController.cs" />
     <Compile Include="Controllers\Sc_MouldRepairInBillListController - .cs" />
@@ -378,6 +379,7 @@
     <Compile Include="DbUntil\DataFormatUntil.cs" />
     <Compile Include="DLL\ClsGy_BadReason_Ctl.cs" />
     <Compile Include="DLL\ClsGy_DuSubsidyItemBill.cs" />
+    <Compile Include="DLL\ClsGy_EquipTypeBill.cs" />
     <Compile Include="DLL\ClsGy_Material_Ctl.cs" />
     <Compile Include="DLL\ClsGy_Source_Ctl.cs" />
     <Compile Include="DLL\ClsGy_WorkPayTypeBill.cs" />
@@ -422,6 +424,7 @@
     <Compile Include="Models\ApiConfig.cs" />
     <Compile Include="Models\ApiResult.cs" />
     <Compile Include="Models\CheckItem.cs" />
+    <Compile Include="Models\ClsGy_EquipFileType.cs" />
     <Compile Include="Models\ClsGy_Material_Model.cs" />
     <Compile Include="Models\ClsSb_EquipDotCheckBillMain.cs" />
     <Compile Include="Models\ClsSb_EquipDotCheckBillSub.cs" />
@@ -593,6 +596,7 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\" />
+    <Folder Include="Views\Gy_EquipType\" />
     <Folder Include="Views\MoveStockBill\" />
     <Folder Include="Views\QC_Management\" />
     <Folder Include="Views\Sc_MouldRepairOutBill\" />

--
Gitblit v1.9.1