1.车间看板

.gitignore

@@ -15,3 +15,9 @@
 /FTT.Board.VueUI/board
 /Product
 /MTM-zby
+/FTT.Board/.vs/FTT.Board/v16/Server/sqlite3/storage.ide-wal
+/FTT.Board/.vs/FTT.Board/v16/Server/sqlite3/storage.ide-shm
+/FTT.Board/.vs/FTT.Board/v16/Server/sqlite3/storage.ide
+/FTT.Board/.vs/FTT.Board/v16/Server/sqlite3/db.lock
+/FTT.Board/.vs/FTT.Board/v16/.suo
+/FTT.Board/.vs/FTT.Board/config/applicationhost.config

FTT.Board/FTT.Board.Api/Controllers/API/FactoryBoardController.cs

@@ -17,7 +17,7 @@ namespace FTT.Board.Controllers.API
 
         public ModuleModel ModuleName => ModuleModel.MES;
 
-        public FactoryBoardZCResponse GetZC(int FactoryWorkShopTeamID)
+        public string GetZC(int FactoryWorkShopTeamID)
         {
             FactoryBoardZCResponse model = new FactoryBoardZCResponse();
             DataSet dataSet = Dbo.Create(ModuleName).GetDataSet("[SP_MES_FactoryWageBoardZC]", new
@@ -32,10 +32,10 @@ namespace FTT.Board.Controllers.API
             model.MonthStarIEPercent = Table2Model.ToModelList<MonthStarIEPercent>(dataSet.Tables[4]);
             model.DayYield = (int)dataSet.Tables[5].Rows[0][0];
             
-            return model;                       
+            return model.ToString();                       
         }
 
-        public FactoryBoardCXResponse GetCX(int FactoryWorkShopTeamID)
+        public string GetCX(int FactoryWorkShopTeamID)
         {
             FactoryBoardCXResponse model = new FactoryBoardCXResponse();
             DataSet dataSet = Dbo.Create(ModuleName).GetDataSet("[SP_MES_FactoryWageBoardZC]", new
@@ -49,10 +49,10 @@ namespace FTT.Board.Controllers.API
             model.MonthStar = Table2Model.ToModel<MonthStar>(dataSet.Tables[3]);
             model.MonthStarIEPercent = Table2Model.ToModelList<MonthStarIEPercent>(dataSet.Tables[4]);
             model.DayYield = (int)dataSet.Tables[5].Rows[0][0];
-            return model;
+            return model.ToString();
         }
 
-        public FactoryBoardZCResponse PostZC(FactoryBoardRepuest value)
+        public string PostZC(FactoryBoardRepuest value)
         {
             FactoryBoardZCResponse model = new FactoryBoardZCResponse();
             DataSet dataSet = Dbo.Create(ModuleName).GetDataSet("[SP_MES_FactoryWageBoardZC]", new
@@ -68,10 +68,10 @@ namespace FTT.Board.Controllers.API
             model.MonthStar = Table2Model.ToModel<MonthStar>(dataSet.Tables[3]);
             model.MonthStarIEPercent = Table2Model.ToModelList<MonthStarIEPercent>(dataSet.Tables[4]);
             model.DayYield = (int)dataSet.Tables[5].Rows[0][0];
-            return model;
+            return model.ToString();
         }
 
-        public FactoryBoardCXResponse PostCX(FactoryBoardRepuest value)
+        public string PostCX(FactoryBoardRepuest value)
         {
             FactoryBoardCXResponse model = new FactoryBoardCXResponse();
             DataSet dataSet = Dbo.Create(ModuleName).GetDataSet("[SP_MES_FactoryWageBoardZC]", new
@@ -87,7 +87,7 @@ namespace FTT.Board.Controllers.API
             model.MonthStar = Table2Model.ToModel<MonthStar>(dataSet.Tables[3]);
             model.MonthStarIEPercent = Table2Model.ToModelList<MonthStarIEPercent>(dataSet.Tables[4]);
             model.DayYield = (int)dataSet.Tables[5].Rows[0][0];
-            return model;
+            return model.ToString();
         }
     }
 }
\ No newline at end of file

FTT.Board/FTT.Board.Api/Models/FactoryBoard.cs

@@ -125,6 +125,11 @@ namespace FTT.Board.Models
     /// </summary>
     public class UserWageRanking
     {
+        /// <summary>
+        /// 排名
+        /// </summary>
+        public int Ranking { get; set; }
+
         /// <summary>
         /// 员工姓名
         /// </summary>