|
@@ -1064,10 +1064,11 @@ namespace TeamAAS_VP.Core
|
|
|
addressConfig.In_QrCodePhotoRequest.Address,
|
|
addressConfig.In_QrCodePhotoRequest.Address,
|
|
|
addressConfig.In_PickINC.Address,
|
|
addressConfig.In_PickINC.Address,
|
|
|
addressConfig.In_Throw.Address,
|
|
addressConfig.In_Throw.Address,
|
|
|
- addressConfig.RunMode.Address,
|
|
|
|
|
|
|
+ // addressConfig.RunMode.Address,
|
|
|
addressConfig.ManualMode.Address,
|
|
addressConfig.ManualMode.Address,
|
|
|
|
|
+ addressConfig.AutoRunning.Address,
|
|
|
addressConfig.ClearMode.Address,
|
|
addressConfig.ClearMode.Address,
|
|
|
- addressConfig.Fault.Address,
|
|
|
|
|
|
|
+ // addressConfig.Fault.Address,
|
|
|
};
|
|
};
|
|
|
for (int i = 0; i < 10; i++)
|
|
for (int i = 0; i < 10; i++)
|
|
|
{
|
|
{
|
|
@@ -3265,7 +3266,7 @@ namespace TeamAAS_VP.Core
|
|
|
{
|
|
{
|
|
|
DateTime dt = DateTime.Now;
|
|
DateTime dt = DateTime.Now;
|
|
|
string filename = $"{ProductMainSN[i]}_{dt.ToString("yyyyMMddHHmmss")}";
|
|
string filename = $"{ProductMainSN[i]}_{dt.ToString("yyyyMMddHHmmss")}";
|
|
|
- string csvfilename = $"{i}_{stationConfig.DeviceName}_{dt.ToString("yyyy-MM-dd")}";
|
|
|
|
|
|
|
+ //string csvfilename = $"{i}_{stationConfig.DeviceName}_{dt.ToString("yyyy-MM-dd")}";
|
|
|
var device = _configService.GetDeviceInfo(i);
|
|
var device = _configService.GetDeviceInfo(i);
|
|
|
var systemConfig = _configService.GetSystemConfiguration();
|
|
var systemConfig = _configService.GetSystemConfiguration();
|
|
|
var pressureSensorConfig = systemConfig.PressureSensorConfig.FirstOrDefault();
|
|
var pressureSensorConfig = systemConfig.PressureSensorConfig.FirstOrDefault();
|
|
@@ -3321,7 +3322,7 @@ namespace TeamAAS_VP.Core
|
|
|
if (isAfter20 && isNewDay && !_hasCompressedToday)
|
|
if (isAfter20 && isNewDay && !_hasCompressedToday)
|
|
|
{
|
|
{
|
|
|
// 执行压缩
|
|
// 执行压缩
|
|
|
- CompressionImage(source_csv2, csvfilename, device.Station, device.FixtureId);
|
|
|
|
|
|
|
+ CompressionImage(source_csv2, filename, device.Station, device.FixtureId);
|
|
|
_lastCompressDate = dt;
|
|
_lastCompressDate = dt;
|
|
|
_hasCompressedToday = true;
|
|
_hasCompressedToday = true;
|
|
|
LogHelper.WriteLogMes("csv上传数据成功");
|
|
LogHelper.WriteLogMes("csv上传数据成功");
|
