From 0204c8b3d98d6cd557063ff5fc341187c084b48d Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Fri, 17 May 2024 15:47:30 +0800
Subject: [PATCH] =?UTF-8?q?change-=E5=8F=91=E6=B3=A1=E9=87=87=E6=95=B0?=
=?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Admin.Core.Api/Admin.Core.Model.xml | 5 +++++
.../Model_New/RecordBoxFoamFixtureComplate.cs | 5 +++++
.../RecordBoxFoamFixtureComplateServices.cs | 20 ++++++++++---------
.../Business/CollectionFoamLine.cs | 12 ++++++-----
.../EnterWarehouseStatisticsPageViewModel.cs | 2 +-
.../ViewModels/FoamMonitorPageViewModel.cs | 2 +-
Aucma.Core.OldBoxFoam/Business/Collection.cs | 10 ++++++----
7 files changed, 36 insertions(+), 20 deletions(-)
diff --git a/Admin.Core.Api/Admin.Core.Model.xml b/Admin.Core.Api/Admin.Core.Model.xml
index 24ab1221..36ac2a08 100644
--- a/Admin.Core.Api/Admin.Core.Model.xml
+++ b/Admin.Core.Api/Admin.Core.Model.xml
@@ -986,6 +986,11 @@
记录时间
</summary>
</member>
+ <member name="P:Admin.Core.Model.Model_New.RecordBoxFoamFixtureComplate.LoginTeam">
+ <summary>
+ 登录班组
+ </summary>
+ </member>
<member name="P:Admin.Core.Model.Model_New.Record_DeviceAlarmInfo.DeviceCode">
<summary>
设备编号
diff --git a/Admin.Core.Model/Model_New/RecordBoxFoamFixtureComplate.cs b/Admin.Core.Model/Model_New/RecordBoxFoamFixtureComplate.cs
index f59edb71..e343cfe1 100644
--- a/Admin.Core.Model/Model_New/RecordBoxFoamFixtureComplate.cs
+++ b/Admin.Core.Model/Model_New/RecordBoxFoamFixtureComplate.cs
@@ -78,5 +78,10 @@ namespace Admin.Core.Model.Model_New
/// </summary>
[SugarColumn(ColumnName = "RECORDTIME")]
public DateTime RecordTime { get; set; }
+ /// <summary>
+ /// 登录班组
+ /// </summary>
+ [SugarColumn(ColumnName = "LOGIN_TEAM")]
+ public string LoginTeam { get; set; }
}
}
diff --git a/Admin.Core.Service/Service_New/RecordBoxFoamFixtureComplateServices.cs b/Admin.Core.Service/Service_New/RecordBoxFoamFixtureComplateServices.cs
index 7b5350e1..fccea9f8 100644
--- a/Admin.Core.Service/Service_New/RecordBoxFoamFixtureComplateServices.cs
+++ b/Admin.Core.Service/Service_New/RecordBoxFoamFixtureComplateServices.cs
@@ -63,12 +63,10 @@ namespace Admin.Core.Service.Service_New
{
//获取当前工位，前一条数据
var lastFixtureList = _dal.Query(x => x.ProductionLine == productLineCode && x.StationCode == stationCode && x.FixtureCode == item.FixtureCode);
-
- if(lastFixtureList != null)
+
+ if(lastFixtureList != null && lastFixtureList.Count>0)
{
- if (lastFixtureList.Count > 0)
- {
-
+
RecordBoxFoamFixtureComplate lastFixtureComplate = lastFixtureList.OrderByDescending(x => x.RecordTime).First();
if (lastFixtureComplate != null)
{
@@ -90,12 +88,16 @@ namespace Admin.Core.Service.Service_New
}
}
}
- }
+
+ }
+ else
+ {
+ _dal.Add(item);
+ //更新小时数据
+ UpdateHourInfo(item, productLineCode, stationCode);
}
- _dal.Add(item);
- //更新小时数据
- UpdateHourInfo(item, productLineCode, stationCode);
+
}
}
catch (Exception ex)
diff --git a/Aucma.Core.BoxFoam/Business/CollectionFoamLine.cs b/Aucma.Core.BoxFoam/Business/CollectionFoamLine.cs
index 08577f2a..d21e394d 100644
--- a/Aucma.Core.BoxFoam/Business/CollectionFoamLine.cs
+++ b/Aucma.Core.BoxFoam/Business/CollectionFoamLine.cs
@@ -3,6 +3,7 @@ using Admin.Core.IService;
using Admin.Core.IService.IService_New;
using Admin.Core.Model.Model_New;
using Admin.Core.Service;
+using Aucma.Core.BoxFoam.Config;
using Aucma.Core.BoxFoam.Models;
using Aucma.Core.HwPLc;
using Aucma.Core.Tasks.Models;
@@ -31,7 +32,7 @@ namespace Aucma.Core.BoxFoam.Business
public static event RefreshBoxFoamDataDelegate RefreshBoxFoamDataDelegateEvent;
private static System.Text.ASCIIEncoding asciiEncoding = new System.Text.ASCIIEncoding();
-
+ private AppConfig appConfig = AppConfig.Instance;
public static List<SpaceDetailModel> spaceDetailModel = new List<SpaceDetailModel>();
public static List<FixtureStatus> listFixtureStatus = new List<FixtureStatus>();
private readonly IRecordBoxFoamFixtureComplateServices _fixtureComplateServices;
@@ -103,8 +104,8 @@ namespace Aucma.Core.BoxFoam.Business
{
fixtureComplates.Add(new RecordBoxFoamFixtureComplate()
{
- ProductionLine = "CX_02",
- StationCode = "1005",
+ ProductionLine = appConfig.ProductlineCode,
+ StationCode = appConfig.StationCode,
FixtureCode = x.ObjId,
FixtureBoxType = x.FixtureBoxType,
FixtureStatus = x.Status,
@@ -112,9 +113,10 @@ namespace Aucma.Core.BoxFoam.Business
PlanCuringTime = x.PlanCuringTime,
RealCuringTime = x.RealCuringTime,
RecordTime = DateTime.Now,
+ LoginTeam = appConfig.TeamName
});
- });
- var info = _fixtureComplateServices.SaveFixtureComplate(fixtureComplates, "CX_02", "1005");
+ });
+ var info = _fixtureComplateServices.SaveFixtureComplate(fixtureComplates, appConfig.ProductlineCode, appConfig.StationCode);
}
}
catch (Exception ex)
diff --git a/Aucma.Core.BoxFoam/ViewModels/EnterWarehouseStatisticsPageViewModel.cs b/Aucma.Core.BoxFoam/ViewModels/EnterWarehouseStatisticsPageViewModel.cs
index e611e354..588b7633 100644
--- a/Aucma.Core.BoxFoam/ViewModels/EnterWarehouseStatisticsPageViewModel.cs
+++ b/Aucma.Core.BoxFoam/ViewModels/EnterWarehouseStatisticsPageViewModel.cs
@@ -40,7 +40,7 @@ namespace Aucma.Core.BoxFoam.ViewModels
DateTime startTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 00:00:00"));
DateTime endTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 23:59:59"));
var list = await _recordInstoreServices.queryRecordToDb(storeCode, startTime, endTime);
- if (list == null) return;
+ if (list == null || list.Count==0) return;
int count = 0;
foreach (var item in list)
{
diff --git a/Aucma.Core.BoxFoam/ViewModels/FoamMonitorPageViewModel.cs b/Aucma.Core.BoxFoam/ViewModels/FoamMonitorPageViewModel.cs
index 3c3b91a8..ee88ff94 100644
--- a/Aucma.Core.BoxFoam/ViewModels/FoamMonitorPageViewModel.cs
+++ b/Aucma.Core.BoxFoam/ViewModels/FoamMonitorPageViewModel.cs
@@ -66,7 +66,7 @@ namespace Aucma.Core.BoxFoam.ViewModels
}
});
}
-
+
#region 日产量
diff --git a/Aucma.Core.OldBoxFoam/Business/Collection.cs b/Aucma.Core.OldBoxFoam/Business/Collection.cs
index fbd6b045..31d0f985 100644
--- a/Aucma.Core.OldBoxFoam/Business/Collection.cs
+++ b/Aucma.Core.OldBoxFoam/Business/Collection.cs
@@ -5,6 +5,7 @@ using Admin.Core.Model;
using Admin.Core.Model.Model_New;
using Admin.Core.Service;
using Aucma.Core.HwPLc;
+using Aucma.Core.OldBoxFoam.Config;
using Aucma.Core.OldBoxFoam.Models;
using Consul;
using log4net;
@@ -26,7 +27,7 @@ namespace Aucma.Core.OldBoxFoam.Business
private readonly log4net.ILog log = LogManager.GetLogger(typeof(Collection));
public static List<FixtureStatus> listFixtureStatus = new List<FixtureStatus>();
public static List<SpaceDetailModel> spaceDetailModel = new List<SpaceDetailModel>();
-
+ private AppConfig appConfig = AppConfig.Instance;
private readonly IRecordBoxFoamFixtureComplateServices _fixtureComplateServices;
/// <summary>
@@ -109,8 +110,8 @@ namespace Aucma.Core.OldBoxFoam.Business
{
fixtureComplates.Add(new RecordBoxFoamFixtureComplate()
{
- ProductionLine = "CX_01",
- StationCode = "1105",
+ ProductionLine = appConfig.ProductlineCode,
+ StationCode = appConfig.StationCode,
FixtureCode = x.ObjId,
FixtureBoxType = x.FixtureBoxType,
FixtureStatus = x.Status,
@@ -118,10 +119,11 @@ namespace Aucma.Core.OldBoxFoam.Business
PlanCuringTime = x.PlanCuringTime,
RealCuringTime = x.RealCuringTime,
RecordTime = DateTime.Now,
+ LoginTeam = appConfig.TeamName,
});
});
- var info = _fixtureComplateServices.SaveFixtureComplate(fixtureComplates,"CX_01","1105");
+ var info = _fixtureComplateServices.SaveFixtureComplate(fixtureComplates, appConfig.ProductlineCode, appConfig.StationCode);
}
}