change-老线分垛修改及新发泡白夜班切换时间根据mes设置时间切换

main
liuwf 9 months ago
parent faa8e23d17
commit fe562be009

@ -6626,6 +6626,21 @@
前板数量
</summary>
</member>
<member name="T:Admin.Core.Model.ViewModels.TwoTime">
<summary>
条码绑定扫描类型统计
</summary>
</member>
<member name="P:Admin.Core.Model.ViewModels.TwoTime.startTime">
<summary>
开始时间
</summary>
</member>
<member name="P:Admin.Core.Model.ViewModels.TwoTime.endTime">
<summary>
结束时间
</summary>
</member>
<member name="T:Admin.Core.Model.ViewModels.WorkTime">
<summary>
条码绑定扫描类型统计

@ -12,6 +12,12 @@ namespace Admin.Core.IService
public interface IBaseBomInfoServices : IBaseServices<BaseBomInfo>
{
/// <summary>
/// 获取系统白夜班时间,发泡班组切换使用
/// </summary>
public Task<List<TwoTime>> getTwoTime();
/// <summary>
/// 获取系统班组时间
/// </summary>

@ -0,0 +1,29 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Admin.Core.Model.ViewModels
{
/// <summary>
/// 条码绑定扫描类型统计
/// </summary>
[SugarTable("VIEW_TEAM_MAX_MIN_TIME", "AUCMA_MES")]
public class TwoTime
{
/// <summary>
/// 开始时间
/// </summary>
[SugarColumn(ColumnName = "START_TIME")]
public DateTime startTime { get; set; }
/// <summary>
/// 结束时间
/// </summary>
[SugarColumn(ColumnName = "END_TIME")]
public DateTime endTime { get; set; }
}
}

@ -27,6 +27,25 @@ namespace Admin.Core.Service
_baseBomInfoRepository = baseBomInfoRepository;
}
/// <summary>
/// 获取系统白夜班时间,发泡班组切换使用
/// </summary>
public async Task<List<TwoTime>> getTwoTime()
{
try
{
List<TwoTime> list = null;
var _db = this.BaseDal.Db;
list = await _db.CopyNew().Ado.SqlQueryAsync<TwoTime>("SELECT * FROM VIEW_TEAM_MAX_MIN_TIME ORDER BY START_TIME");
return list;
}
catch (Exception)
{
return null;
}
}
/// <summary>
/// 获取系统班组时间
/// </summary>

@ -162,14 +162,18 @@ namespace Admin.Core.Socket
/// <param name="client"></param>
private void SetProdStoreClientId(SocketClient client)
{
if (client.IP == "10.10.92.230")
if (client.IP == "10.10.92.230" || client.IP == "10.10.92.240")
{
client.ResetId("A");
}
else if (client.IP == "10.10.92.231")
else if (client.IP == "10.10.92.231" || client.IP == "10.10.92.241")
{
client.ResetId("B");
}
else if(client.IP == "10.10.92.242")
{
client.ResetId("C");
}
RefreshClientInfoEvent?.Invoke(service);
}

@ -1,5 +1,7 @@
using Admin.Core.IService;
using Admin.Core.Model;
using Admin.Core.Model.ViewModels;
using Admin.Core.Service;
using Aucma.Core.HwPLc;
using log4net;
using Microsoft.Extensions.DependencyInjection;
@ -23,6 +25,8 @@ namespace Aucma.Core.BoxFoam.Business
private readonly IBoxFoamPlanServices _boxFoamPlanServices;
private readonly IBoxFoamDataServices _oldBoxFoamDataServices;
private readonly IBoxFoamDataRecordServices _boxFoamDataRecordServices;
private readonly IBaseBomInfoServices? _baseBomInfoServices;
public List<TwoTime> listTime;
public TeamSwitchBusiness()
{
_boxFoamPlanServices = App.ServiceProvider.GetService<IBoxFoamPlanServices>();
@ -30,11 +34,15 @@ namespace Aucma.Core.BoxFoam.Business
_oldBoxFoamDataServices = App.ServiceProvider.GetService<IBoxFoamDataServices>();
_boxFoamDataRecordServices = App.ServiceProvider.GetService<IBoxFoamDataRecordServices>();
_baseBomInfoServices = App.ServiceProvider.GetService<IBaseBomInfoServices>();
listTime = _baseBomInfoServices.getTwoTime().Result;
}
public void Init()
{
DayShiftInfoCut();
NightShiftInfoCut();
}
@ -45,8 +53,20 @@ namespace Aucma.Core.BoxFoam.Business
private void DayShiftInfoCut()
{
DateTime now = DateTime.Now;
DateTime scheduledTime = new DateTime(now.Year, now.Month, now.Day, 08, 00, 00);
DateTime scheduledTime;
if (listTime == null)
{
listTime = _baseBomInfoServices.getTwoTime().Result;
}
if (listTime != null)
{
scheduledTime = listTime[0].startTime;
}
else
{
scheduledTime = new DateTime(now.Year, now.Month, now.Day, 08, 00, 00);
}
if (now > scheduledTime)
{
@ -64,6 +84,7 @@ namespace Aucma.Core.BoxFoam.Business
private void DayShiftTimerCallback(object sender, ElapsedEventArgs e)
{
DateTime scheduledTime;
Console.WriteLine("切换为白班!");
UpdateShiftInfo(1);
@ -71,7 +92,18 @@ namespace Aucma.Core.BoxFoam.Business
#region 重新定义Timer进行第二天执行
DateTime now = DateTime.Now;
DateTime scheduledTime = new DateTime(now.Year, now.Month, now.Day, 08, 00, 00);
if (listTime == null)
{
listTime = _baseBomInfoServices.getTwoTime().Result;
}
if (listTime != null)
{
scheduledTime = listTime[0].startTime;
}
else
{
scheduledTime = new DateTime(now.Year, now.Month, now.Day, 08, 00, 00);
}
if (now > scheduledTime)
{
@ -95,8 +127,20 @@ namespace Aucma.Core.BoxFoam.Business
private void NightShiftInfoCut()
{
DateTime now = DateTime.Now;
DateTime scheduledTime;
if (listTime == null)
{
listTime = _baseBomInfoServices.getTwoTime().Result;
}
if (listTime != null)
{
scheduledTime = listTime[0].endTime;
}
else
{
scheduledTime = new DateTime(now.Year, now.Month, now.Day, 20, 00, 00);
}
DateTime scheduledTime = new DateTime(now.Year, now.Month, now.Day, 20, 00, 00);
if (now > scheduledTime)
{
@ -114,6 +158,7 @@ namespace Aucma.Core.BoxFoam.Business
private void NightShiftTimerCallback(object sender, ElapsedEventArgs e)
{
DateTime scheduledTime;
Console.WriteLine("切换为夜班!");
UpdateShiftInfo(2);
@ -121,7 +166,18 @@ namespace Aucma.Core.BoxFoam.Business
#region 重新定义Timer进行第二天执行
DateTime now = DateTime.Now;
DateTime scheduledTime = new DateTime(now.Year, now.Month, now.Day, 20, 00, 00);
if (listTime == null)
{
listTime = _baseBomInfoServices.getTwoTime().Result;
}
if (listTime != null)
{
scheduledTime = listTime[0].endTime;
}
else
{
scheduledTime = new DateTime(now.Year, now.Month, now.Day, 20, 00, 00);
}
if (now > scheduledTime)
{

@ -69,6 +69,7 @@ namespace Aucma.Core.BoxFoam.ViewModels
}
#region 日产量
/// <summary>
/// 每日生产
@ -93,6 +94,7 @@ namespace Aucma.Core.BoxFoam.ViewModels
//}
ProductionHourList = xList;
// 货道列表
List<BoxFoamData> list = _boxFoamDataServices.QueryAsync(x => x.ProductLineCode.Equals("CX_02") && x.StationCode == "1005").Result;
if (list != null)

@ -118,9 +118,7 @@
"UpdateTime": "2023-08-07 16:45:45.0530000"
}
],
"StationInfo": {
"StationCode": "1010"
},
"Startup": {
"Cors": {
"PolicyName": "CorsIpAccess", //
@ -208,6 +206,9 @@
"Port": 2015
}
],
"StationInfo": {
"StationCode": "1010"
},
"StoreInfo": {
"StationCode": "1010",
"StationName": "成品分垛库",

@ -74,19 +74,19 @@ namespace Aucma.Core.PalletizCX1.Business
public InStoreBusiness()
{
_appConfig = new AppConfig();
_spaceinfoService = App.ServiceProvider.GetService<IBaseSpaceInfoServices>();
_offlineService = App.ServiceProvider.GetService<IProductOffLineServices>();
HandPalletizViewModel.HandSendEvent += InStore;
// string AA = ExtractNumber("FD01_012");
}
public void Init()
{
TouchSocketService.ReceivedClientBufferEvent += ReceivedBuffer;
}
/// <summary>
/// Buffer缓冲
/// </summary>
@ -145,8 +145,8 @@ namespace Aucma.Core.PalletizCX1.Business
throw new ArgumentException($"货道区域为空");
}
_offlineService.GetProductInfosBySnCode(asciiStr, out ProductOffline prodInfo);
if (prodInfo == null)

@ -160,6 +160,7 @@ namespace Aucma.Core.PalletizCX1.ViewModels
private ObservableCollection<BaseSpaceInfo> spaceItemsB = new ObservableCollection<BaseSpaceInfo>();
private ObservableCollection<BaseSpaceInfo> spaceItemsC = new ObservableCollection<BaseSpaceInfo>();
/// <summary>
/// 刷新界面提示信息
@ -192,10 +193,9 @@ namespace Aucma.Core.PalletizCX1.ViewModels
{
App.Current.Dispatcher.BeginInvoke((Action)(() =>
{
if (spaceItems.Count > 0)
{
spaceItems.Clear();
}
spaceItems.Clear();
foreach (var item in info)
{
spaceItems.Add(item);
@ -204,16 +204,15 @@ namespace Aucma.Core.PalletizCX1.ViewModels
}));
}
var info2 = inStoreBusiness.GetBaseSpaceinfos("A");
info2 = info2.OrderBy(x => x.ObjId).ToList();
var info2 = inStoreBusiness.GetBaseSpaceinfos("B");
info2 = info2.OrderByDescending(x => x.ObjId).ToList();
if (info2 != null)
{
App.Current.Dispatcher.BeginInvoke((Action)(() =>
{
if (spaceItemsB.Count > 0)
{
spaceItemsB.Clear();
}
spaceItemsB.Clear();
foreach (var item in info2)
{
spaceItemsB.Add(item);
@ -222,6 +221,24 @@ namespace Aucma.Core.PalletizCX1.ViewModels
}));
}
var info3 = inStoreBusiness.GetBaseSpaceinfos("C");
info3 = info3.OrderByDescending(x => x.ObjId).ToList();
if (info3 != null)
{
App.Current.Dispatcher.BeginInvoke((Action)(() =>
{
spaceItemsC.Clear();
foreach (var item in info3)
{
spaceItemsC.Add(item);
}
AreaC_SpaceInfo = spaceItemsC;
}));
}
});

@ -130,6 +130,7 @@
<ComboBox x:Name="AreaComboBox" SelectedItem="{Binding Area}" HorizontalAlignment="Left" VerticalAlignment="Top" Width="120" FontSize="25" Foreground="White" Margin="367,42,0,0">
<ComboBoxItem Content="A" Foreground="Blue"/>
<ComboBoxItem Content="B" Foreground="Blue"/>
<ComboBoxItem Content="C" Foreground="Blue"/>
</ComboBox>
<Label Content="产品编码:" Foreground="White" FontSize="22" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="509,42,0,0" />

@ -128,12 +128,20 @@
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="9.5*"/>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="6*"/>
<ColumnDefinition Width="3*"/>
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" Text="提示信息:" Foreground="White" FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Grid.Column="1" Text="{Binding Msg}" Foreground="White" FontSize="20" VerticalAlignment="Center"/>
<Button Grid.Column="2" Content="{Binding InStoreAmount}" FontSize="18" CommandParameter="{Binding Name,ElementName=Exit}" Style="{StaticResource BUTTON_AGREE}" Width="150" Height="40" Background="Transparent" Margin="0,0,10,0"/>
<Grid Grid.Column="2">
<StackPanel Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Right" Orientation="Horizontal" Margin="10,0,30,0">
<Button Content="异常入库" FontSize="18" x:Name="Minimized" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Minimized}" Style="{StaticResource BUTTON_AGREE}" Width="150" Height="40" Background="#FF9900" BorderBrush="#FF9900" Margin="0,0,10,0" Click="Minimized_Click"/>
<Button Content="转向设置" FontSize="18" x:Name="Exit" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Exit}" Style="{StaticResource BUTTON_AGREE}" Width="150" Height="40" Background="#5283D7" BorderBrush="#5283D7" Margin="0,0,10,0" Click="Exit_Click"/>
<Button Content="{Binding InStoreAmount}" FontSize="18" CommandParameter="{Binding Name,ElementName=Exit}" Style="{StaticResource BUTTON_AGREE}" Width="150" Height="40" Background="Transparent" Margin="0,0,10,0"/>
</StackPanel>
</Grid>
</Grid>
</Border>
<Border Grid.Row="2" BorderBrush="#1157b9" BorderThickness="1" Margin="0,5,0,5">
@ -143,14 +151,11 @@
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" Text="C区域" Foreground="White" FontSize="30" VerticalAlignment="Center" Margin="30 0 0 0"/>
<TextBlock Grid.Column="1" Text="B区域" Foreground="White" FontSize="30" VerticalAlignment="Center" Margin="30 0 0 0"/>
<StackPanel Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Right" Orientation="Horizontal" Margin="10,0,30,0">
<Button Content="异常入库" FontSize="18" x:Name="Minimized" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Minimized}" Style="{StaticResource BUTTON_AGREE}" Width="150" Height="40" Background="#FF9900" BorderBrush="#FF9900" Margin="0,0,10,0" Click="Minimized_Click"/>
<Button Content="转向设置" FontSize="18" x:Name="Exit" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Exit}" Style="{StaticResource BUTTON_AGREE}" Width="150" Height="40" Background="#5283D7" BorderBrush="#5283D7" Margin="0,0,10,0" Click="Exit_Click"/>
</StackPanel>
<TextBlock Grid.Column="2" Text="A区域" Foreground="White" FontSize="30" VerticalAlignment="Center" Margin="30 0 0 0"/>
</Grid>
</Border>
@ -161,11 +166,11 @@
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Border Grid.Column="0" x:Name="areaA_outerBorder" BorderBrush="#1254AB" BorderThickness="2" CornerRadius="5" Margin="0,0,5,0" >
<Border Grid.Column="0" x:Name="areaC_outerBorder" BorderBrush="#1254AB" BorderThickness="2" CornerRadius="5" Margin="0,0,5,0" >
<Border.Effect>
<DropShadowEffect Color="#1254AB" Direction="270" BlurRadius="10" ShadowDepth="5" Opacity="0.5"/>
</Border.Effect>
<ItemsControl Grid.Column="0" ItemsSource="{Binding AreaA_SpaceInfo}" VerticalAlignment="Top" HorizontalAlignment="Center">
<ItemsControl Grid.Column="0" ItemsSource="{Binding AreaC_SpaceInfo}" VerticalAlignment="Top" HorizontalAlignment="Center">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<WrapPanel Orientation="Vertical"></WrapPanel>
@ -173,24 +178,24 @@
</ItemsControl.ItemsPanel>
<ItemsControl.ItemTemplate>
<DataTemplate>
<ContentControl x:Name="ctrl" Width="{Binding ActualWidth, ElementName=areaA_outerBorder}" Margin="5,5">
<ContentControl x:Name="ctrl" Width="{Binding ActualWidth, ElementName=areaC_outerBorder}" Margin="5,5">
<ContentControl.Style>
<Style TargetType="ContentControl">
<Setter Property="Height" Value="35" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate>
<Border Background="#4D96E0" >
<Border Background="#4D96E0" x:Name="borderName" >
<!--<Label Content="{Binding SpaceName}" FontSize="18" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center"/>-->
<Button VerticalAlignment="Center" HorizontalAlignment="Left" Command="{Binding DataContext.UpdateInStoreFlagCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding ObjId}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
<Grid>
<WrapPanel Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Left" >
<TextBlock Text="{Binding SpaceCode}" Foreground="White" FontSize="18" FontWeight="Bold" Margin="80 0 30 0" VerticalAlignment="Center" HorizontalAlignment="Left"/>
<Button Width="{Binding Path=ActualWidth, ElementName=borderName}" Command="{Binding DataContext.UpdateInStoreFlagCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding ObjId}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
<WrapPanel Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Left" Width="{Binding Path=ActualWidth, ElementName=borderName}" >
<TextBlock Text="{Binding SpaceCode}" Width="100" Foreground="White" FontSize="18" FontWeight="Bold" Margin="0 0 30 0" VerticalAlignment="Center" HorizontalAlignment="Left"/>
<TextBlock Text="{Binding typeNameA}" Foreground="White" FontSize="18" FontWeight="Bold" />
<TextBlock Text="{Binding typeNameA}" Foreground="White" FontSize="18" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Left" />
</WrapPanel>
</Grid>
</WrapPanel>
</Button>
</Border>
</ControlTemplate>
@ -208,11 +213,11 @@
</ItemsControl.ItemTemplate>
</ItemsControl>
</Border>
<Border Grid.Column="1" x:Name="areaAB_outerBorder" BorderBrush="#1254AB" BorderThickness="2" CornerRadius="5" Margin="0,0,5,0" >
<Border Grid.Column="1" x:Name="areaB_outerBorder" BorderBrush="#1254AB" BorderThickness="2" CornerRadius="5" Margin="0,0,5,0" >
<Border.Effect>
<DropShadowEffect Color="#1254AB" Direction="270" BlurRadius="10" ShadowDepth="5" Opacity="0.5"/>
</Border.Effect>
<ItemsControl Grid.Column="0" ItemsSource="{Binding AreaA_SpaceInfo}" VerticalAlignment="Top" HorizontalAlignment="Center">
<ItemsControl Grid.Column="0" ItemsSource="{Binding AreaB_SpaceInfo}" VerticalAlignment="Top" HorizontalAlignment="Center">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<WrapPanel Orientation="Vertical"></WrapPanel>
@ -220,24 +225,24 @@
</ItemsControl.ItemsPanel>
<ItemsControl.ItemTemplate>
<DataTemplate>
<ContentControl x:Name="ctrl" Width="{Binding ActualWidth, ElementName=areaA_outerBorder}" Margin="5,5">
<ContentControl x:Name="ctrl" Width="{Binding ActualWidth, ElementName=areaB_outerBorder}" Margin="5,5">
<ContentControl.Style>
<Style TargetType="ContentControl">
<Setter Property="Height" Value="35" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate>
<Border Background="#4D96E0" >
<Border Background="#4D96E0" x:Name="borderName1" >
<!--<Label Content="{Binding SpaceName}" FontSize="18" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center"/>-->
<Button VerticalAlignment="Center" HorizontalAlignment="Left" Command="{Binding DataContext.UpdateInStoreFlagCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding ObjId}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
<Grid>
<WrapPanel Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Left" >
<TextBlock Text="{Binding SpaceCode}" Foreground="White" FontSize="18" FontWeight="Bold" Margin="80 0 30 0" VerticalAlignment="Center" HorizontalAlignment="Left"/>
<Button Width="{Binding Path=ActualWidth, ElementName=borderName1}" Command="{Binding DataContext.UpdateInStoreFlagCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding ObjId}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
<TextBlock Text="{Binding typeNameA}" Foreground="White" FontSize="18" FontWeight="Bold" />
<WrapPanel Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Left" Width="{Binding Path=ActualWidth, ElementName=borderName1}" >
<TextBlock Text="{Binding SpaceCode}" Width="100" Foreground="White" FontSize="18" FontWeight="Bold" Margin="0 0 30 0" VerticalAlignment="Center" HorizontalAlignment="Left"/>
<TextBlock Text="{Binding typeNameA}" Foreground="White" FontSize="18" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Left" />
</WrapPanel>
</WrapPanel>
</Grid>
</Button>
</Border>
</ControlTemplate>
@ -255,7 +260,7 @@
</ItemsControl.ItemTemplate>
</ItemsControl>
</Border>
<Border Grid.Column="2" x:Name="areaC_outerBorder" BorderBrush="#1254AB" BorderThickness="2" CornerRadius="5" Margin="0,0,5,0" >
<Border Grid.Column="2" x:Name="areaA_outerBorder" BorderBrush="#1254AB" BorderThickness="2" CornerRadius="5" >
<Border.Effect>
<DropShadowEffect Color="#1254AB" Direction="270" BlurRadius="10" ShadowDepth="5" Opacity="0.5"/>
</Border.Effect>
@ -274,17 +279,17 @@
<Setter Property="Template">
<Setter.Value>
<ControlTemplate>
<Border Background="#4D96E0" >
<Border Background="#4D96E0" x:Name="borderName2" >
<!--<Label Content="{Binding SpaceName}" FontSize="18" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center"/>-->
<Button VerticalAlignment="Center" HorizontalAlignment="Left" Command="{Binding DataContext.UpdateInStoreFlagCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding ObjId}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
<Grid>
<WrapPanel Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Left" >
<TextBlock Text="{Binding SpaceCode}" Foreground="White" FontSize="18" FontWeight="Bold" Margin="80 0 30 0" VerticalAlignment="Center" HorizontalAlignment="Left"/>
<Button Width="{Binding Path=ActualWidth, ElementName=borderName2}" Command="{Binding DataContext.UpdateInStoreFlagCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding ObjId}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
<TextBlock Text="{Binding typeNameA}" Foreground="White" FontSize="18" FontWeight="Bold" />
<WrapPanel Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Left" Width="{Binding Path=ActualWidth, ElementName=borderName2}" >
<TextBlock Text="{Binding SpaceCode}" Width="100" Foreground="White" FontSize="18" FontWeight="Bold" Margin="0 0 30 0" VerticalAlignment="Center" HorizontalAlignment="Left"/>
<TextBlock Text="{Binding typeNameA}" Foreground="White" FontSize="18" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Left" />
</WrapPanel>
</WrapPanel>
</Grid>
</Button>
</Border>
</ControlTemplate>
@ -316,7 +321,8 @@
</Grid.RowDefinitions>
<Border Grid.Row="0" BorderBrush="#1254AB" BorderThickness="0" Margin="0,0,0,5">
--><!--<Grid>
-->
<!--<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition/>
@ -333,7 +339,8 @@
<Border Grid.Column="2" >
<Button Content="异常入库" FontSize="16" x:Name="Minimized" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Minimized}" Style="{StaticResource BUTTON_AGREE}" Width="100" Height="30" Background="#FF9900" BorderBrush="#FF9900" />
</Border>
</Grid>--><!--
</Grid>-->
<!--
<StackPanel Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Left" Orientation="Horizontal" Margin="10,0,0,0">
<Button Content="异常入库" FontSize="18" x:Name="Minimized" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Minimized}" Style="{StaticResource BUTTON_AGREE}" Width="150" Height="40" Background="#FF9900" BorderBrush="#FF9900" Margin="0,0,10,0" Click="Minimized_Click"/>
<Button Content="转向设置" FontSize="18" x:Name="Exit" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Exit}" Style="{StaticResource BUTTON_AGREE}" Width="150" Height="40" Background="#5283D7" BorderBrush="#5283D7" Margin="0,0,10,0" Click="Exit_Click"/>
@ -344,15 +351,20 @@
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="6*"/>
--><!--<ColumnDefinition Width="4*"/>--><!--
-->
<!--<ColumnDefinition Width="4*"/>-->
<!--
</Grid.ColumnDefinitions>
--><!--<DataGrid Grid.Column="0" Name="DG" ItemsSource="{Binding InstoreTask}" Background="Transparent"
-->
<!--<DataGrid Grid.Column="0" Name="DG" ItemsSource="{Binding InstoreTask}" Background="Transparent"
FontSize="20" ColumnHeaderHeight="35"
RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0"
GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden"
ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False"
Foreground="#FFFFFF" >
--><!--resourceStyle 399行修改选中字体颜色--><!--
-->
<!--resourceStyle 399行修改选中字体颜色-->
<!--
<DataGrid.Columns>
<DataGridTextColumn Binding="{Binding taskCode}" Header="序号" Width="1*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding materialCode}" Header="物料编码" Width="2*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
@ -361,12 +373,14 @@
<DataGridTextColumn Binding="{Binding createTime,StringFormat=\{0:MM月dd日 HH:mm\}}" Header="扫描时间" Width="2*" IsReadOnly="True" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
</DataGrid.Columns>
</DataGrid>--><!--
</DataGrid>-->
<!--
<Border Grid.Column="0" BorderBrush="Red" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="2,25,2,2">
<ContentControl Content="{Binding InStoreTaskContent}"/>
</Border>
--><!--日志信息-->
<!--<Border Grid.Column="1" BorderBrush="#1254AB" BorderThickness="2" CornerRadius="5" Background="Transparent" Margin="1,0,0,0">
-->
<!--日志信息-->
<!--<Border Grid.Column="1" BorderBrush="#1254AB" BorderThickness="2" CornerRadius="5" Background="Transparent" Margin="1,0,0,0">
<Border.Effect>
<DropShadowEffect Color="#1254AB" Direction="270" BlurRadius="10" ShadowDepth="5" Opacity="0.5"/>
</Border.Effect>
@ -380,17 +394,22 @@
<TextBlock Text="系统监控" FontSize="20" FontWeight="Bold" Foreground="#0288d1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
--><!--日志信息--><!--
-->
<!--日志信息-->
<!--
<Border Grid.Row="1" BorderBrush="Green" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="1,1,5,5">
<ListBox x:Name="listBox" ItemsSource="{Binding LogInfoListBox}" FontSize="15" Foreground="#FFFFFF" Background="Transparent" BorderBrush="Transparent" ScrollViewer.HorizontalScrollBarVisibility="Hidden" ScrollViewer.VerticalScrollBarVisibility="Hidden"/>
</Border>
</Grid>
</Border>--><!--
</Border>-->
<!--
</Grid>
</Border>
</Grid>
</Border>
--><!--<Border Grid.Row="1" BorderBrush="#1157b9" BorderThickness="2" Margin="0,5,0,0"></Border>--><!--
-->
<!--<Border Grid.Row="1" BorderBrush="#1157b9" BorderThickness="2" Margin="0,5,0,0"></Border>-->
<!--
<Border Grid.Row="1" x:Name="areaB_outerBorder" BorderBrush="#1254AB" BorderThickness="2" CornerRadius="5" Margin="0,0,0,0" >
<Border.Effect>
<DropShadowEffect Color="#1254AB" Direction="270" BlurRadius="10" ShadowDepth="5" Opacity="0.5"/>
@ -411,11 +430,15 @@
<Setter.Value>
<ControlTemplate>
<StackPanel Background="#4D96E0" Height="{Binding ActualHeight, ElementName=areaB_outerBorder}" Orientation="Vertical">
--><!--<Label Content="{Binding SpaceName}" FontSize="18" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center"/>--><!--
-->
<!--<Label Content="{Binding SpaceName}" FontSize="18" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center"/>-->
<!--
<Button Height="{Binding ActualHeight, ElementName=areaB_outerBorder}" Command="{Binding DataContext.UpdateInStoreFlagCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding ObjId}" Style="{StaticResource BUTTON_AGREE}" BorderBrush="Transparent" BorderThickness="0" Background="Transparent">
<TextBlock Text="{Binding typeNameA}" Foreground="White" FontSize="18" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center" TextWrapping="Wrap"/>
--><!--MaterialType--><!--
-->
<!--MaterialType-->
<!--
</Button>
</StackPanel>
</ControlTemplate>

@ -118,9 +118,7 @@
"UpdateTime": "2023-08-07 16:45:45.0530000"
}
],
"StationInfo": {
"StationCode": "1010"
},
"Startup": {
"Cors": {
"PolicyName": "CorsIpAccess", //
@ -181,13 +179,18 @@
"ScannerServer": [
{
"Id": 1,
"Ip": "10.10.92.230", // 192.168.1.19",
"Name": "PalletizStoreCodeA"
"Ip": "10.10.92.240", // 192.168.1.19",
"Name": "ScannerA"
},
{
"Id": 2,
"Ip": "10.10.92.231", //"192.168.1.20",
"Name": "APalletizStoreCodeB2"
"Ip": "10.10.92.241", //"192.168.1.20",
"Name": "ScannerB"
},
{
"Id": 3,
"Ip": "10.10.92.242", // 192.168.1.19",
"Name": "ScannerC"
}
],
"PLCServer": [
@ -208,13 +211,16 @@
"Port": 2015
}
],
"StationInfo": {
"StationCode": "2222"
},
"StoreInfo": {
"StationCode": "1010",
"StationCode": "2222",
"StationName": "成品分垛库",
"PalletizStoreCodeA": "FDK-001",
"PalletizStoreCodeB": "FDK-002",
"ProductlineCode": "CX_02",
"StoreCode": "FDK-001"
"ProductlineCode": "CX_01",
"StoreCode": "FDK-002"
},
"IpRateLimiting": {
"EnableEndpointRateLimiting": false, //False: globally executed, true: executed for each

Loading…
Cancel
Save