liulb
/
AUCMA_SCADA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

new

Browse Source
dev
liulb@mesnac.com 1 year ago
parent 9ef89aa1b8
commit af79883b44
9 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File

6
Admin.Core.Repository/Repository_New/BaseBomInfoRepository.cs
Unescape Escape View File

@ -5,11 +5,11 @@ using Admin.Core.Repository;
namespace Admin.Core.IRepository namespace Admin.Core.IRepository
{ {
/// <summary> /// <summary>
/// OrderBomInfoRepository /// BaseBomInfoRepository
/// </summary> /// </summary>
public class OrderBomInfoRepository : BaseRepository<OrderBomInfo>, IOrderBomInfoRepository public class BaseBomInfoRepository : BaseRepository<BaseBomInfo>, IBaseBomInfoRepository
{ {
public OrderBomInfoRepository(IUnitOfWork unitOfWork) : base(unitOfWork) public BaseBomInfoRepository(IUnitOfWork unitOfWork) : base(unitOfWork)
{ {
} }
} }

18
Admin.Core.Repository/Repository_New/OrderBomInfoRepository.cs
Unescape Escape View File

@ -0,0 +1,18 @@
using Admin.Core.IRepository;
using Admin.Core.Model;
using Admin.Core.Model.Model_New;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Admin.Core.Repository
{
public class OrderBomInfoRepository : BaseRepository<OrderBomInfo>, IOrderBomInfoRepository
{
public OrderBomInfoRepository(IUnitOfWork unitOfWork) : base(unitOfWork)
{
}
}
}

2
Admin.Core.Service/Service_New/BaseOrderInfoServices.cs
Unescape Escape View File

@ -23,7 +23,7 @@ namespace Admin.Core.Service
private readonly IPrintOrderInfoRepository _printOrderInfoRepository; private readonly IPrintOrderInfoRepository _printOrderInfoRepository;
private readonly IBaseOrderInfoRepository _baseOrderInfoRepository; private readonly IBaseOrderInfoRepository _baseOrderInfoRepository;
private readonly IOrderBomInfoRepository _orderBomInfoRepository; private readonly IOrderBomInfoRepository _orderBomInfoRepository;
//private readonly IBaseBomInfoRepository _baseBomInfoRepository;
private readonly IBaseRepository<BaseTest> baseRepository; private readonly IBaseRepository<BaseTest> baseRepository;

1
Admin.Core.Tasks/QuartzNet/JobFactory.cs
Unescape Escape View File

@ -2,6 +2,7 @@
using Quartz; using Quartz;
using Quartz.Spi; using Quartz.Spi;
using System; using System;
using System.Threading.Tasks;
namespace Admin.Core.Tasks namespace Admin.Core.Tasks
{ {

6
Aucma.Core.BoxFoam/Startup.cs
Unescape Escape View File

@ -61,7 +61,7 @@ namespace Aucma.Core.BoxFoam
AddServices(services); AddServices(services);
//任务调度 //任务调度
services.AddJobSetup(); //services.AddJobSetup();
//支持编码大全 例如:支持 System.Text.Encoding.GetEncoding("GB2312") System.Text.Encoding.GetEncoding("GB18030") //支持编码大全 例如:支持 System.Text.Encoding.GetEncoding("GB2312") System.Text.Encoding.GetEncoding("GB18030")
Encoding.RegisterProvider(CodePagesEncodingProvider.Instance); Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
@ -83,7 +83,7 @@ namespace Aucma.Core.BoxFoam
/// </summary> /// </summary>
/// <param name="app"></param> /// <param name="app"></param>
/// <param name="env"></param> /// <param name="env"></param>
public void Configure(IApplicationBuilder app, ISysTasksQzService tasksQzService, ISchedulerCenter schedulerCenter) public void Configure(IApplicationBuilder app)//, ISysTasksQzService tasksQzService, ISchedulerCenter schedulerCenter
{ {
// 使用静态文件 // 使用静态文件
app.UseStaticFiles(); app.UseStaticFiles();
@ -91,7 +91,7 @@ namespace Aucma.Core.BoxFoam
//app.UseAuthorization(); //app.UseAuthorization();
// 开启QuartzNetJob调度服务 // 开启QuartzNetJob调度服务
app.UseQuartzJobMildd(tasksQzService, schedulerCenter); //app.UseQuartzJobMildd(tasksQzService, schedulerCenter);
} }

19
Aucma.Core.PrintTo/Views/IndexPage.xaml
Unescape Escape View File

@ -115,7 +115,7 @@
<ColumnDefinition /> <ColumnDefinition />
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBox Grid.RowSpan="2" Height="Auto" Margin="0" Padding="0" VerticalAlignment="Stretch" <TextBox Grid.RowSpan="2" Height="Auto" Margin="0" Padding="0" VerticalAlignment="Stretch" BorderBrush="White"
VerticalContentAlignment="Center" Text="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=Value}"> VerticalContentAlignment="Center" Text="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=Value}">
<!-- 给TextBox绑定上下命令 --> <!-- 给TextBox绑定上下命令 -->
<TextBox.InputBindings> <TextBox.InputBindings>
@ -162,7 +162,7 @@
<TextBox x:Name="queryParam" Text="" Style="{x:Null}" Width="200" HorizontalAlignment="Left" VerticalContentAlignment="Center" /> <TextBox x:Name="queryParam" Text="" Style="{x:Null}" Width="200" HorizontalAlignment="Left" VerticalContentAlignment="Center" />
<Button Content="查询" Background="#4285DE" Margin="9,0,4,0" Width="100" Command="{Binding QueryStringCommand}" CommandParameter="{Binding ElementName=queryParam,Path=Text}"/> <Button Content="查询" Background="#4285DE" Margin="9,0,4,0" Width="100" Command="{Binding QueryStringCommand}" CommandParameter="{Binding ElementName=queryParam,Path=Text}"/>
</WrapPanel> </WrapPanel>
<UniformGrid Grid.Row="1" Margin="5 5 0 0" x:Name="HeightPanel"> <UniformGrid Grid.Row="1" Margin="0 5 0 0" x:Name="HeightPanel">
<!-- <!--
AlternationCount="2" 表示两行交替显示背景色； AlternationCount="2" 表示两行交替显示背景色；
AutoGenerateColumns="False" 表示不让DataGrid自动生成列。如果设置成true，则效果： 多出了不需要的列； AutoGenerateColumns="False" 表示不让DataGrid自动生成列。如果设置成true，则效果： 多出了不需要的列；
@ -191,7 +191,7 @@
</Grid> </Grid>
</Border> </Border>
</UniformGrid> </UniformGrid>
<UniformGrid Grid.Column="1" Margin="0 5 3 5"> <UniformGrid Grid.Column="1" Margin="0 10 3 5">
<Border BorderBrush="#0288d1" BorderThickness="1" Margin="0 0 0 5" CornerRadius="5"> <Border BorderBrush="#0288d1" BorderThickness="1" Margin="0 0 0 5" CornerRadius="5">
<Grid Margin="0 30"> <Grid Margin="0 30">
<Grid.RowDefinitions> <Grid.RowDefinitions>
@ -205,26 +205,25 @@
<WrapPanel Grid.Row="0" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0 15"> <WrapPanel Grid.Row="0" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0 15">
<TextBlock Text="产品编码" FontSize="15" Foreground="white" HorizontalAlignment="Center" VerticalAlignment="Center" /> <TextBlock Text="产品编码" FontSize="15" Foreground="white" HorizontalAlignment="Center" VerticalAlignment="Center" />
<TextBox x:Name="ProductNo" Foreground="white" Text="{Binding SelectedItem.ProductCode, ElementName=dgvMH}" IsReadOnly="True" Margin="15 0 0 0 " FontSize="15" VerticalContentAlignment="Center" HorizontalContentAlignment="Left" Width="400" <TextBox x:Name="ProductNo" Foreground="white" BorderBrush="White" Text="{Binding SelectedItem.ProductCode, ElementName=dgvMH}" IsReadOnly="True" Margin="15 0 0 0 " FontSize="15" VerticalContentAlignment="Center" HorizontalContentAlignment="Left" Width="400"
materialDesign:HintAssist.Hint="产品编码" /> materialDesign:HintAssist.Hint="产品编码" />
</WrapPanel> </WrapPanel>
<WrapPanel Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0 15"> <WrapPanel Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0 15">
<TextBlock Text="产品名称" FontSize="15" Foreground="white" HorizontalAlignment="Center" VerticalAlignment="Center" /> <TextBlock Text="产品名称" FontSize="15" Foreground="white" HorizontalAlignment="Center" VerticalAlignment="Center" />
<TextBox x:Name="ProductName" Foreground="white" Text="{Binding SelectedItem.ProductName, ElementName=dgvMH}" IsReadOnly="True" Margin="15 0 0 0" FontSize="15" VerticalContentAlignment="Center" HorizontalContentAlignment="Left" Width="{Binding Path=ActualWidth, ElementName=ProductNo}" <TextBox x:Name="ProductName" Foreground="white" BorderBrush="White" Text="{Binding SelectedItem.ProductName, ElementName=dgvMH}" IsReadOnly="True" Margin="15 0 0 0" FontSize="15" VerticalContentAlignment="Center" HorizontalContentAlignment="Left" Width="{Binding Path=ActualWidth, ElementName=ProductNo}"
materialDesign:HintAssist.Hint="产品名称" /> materialDesign:HintAssist.Hint="产品名称" />
</WrapPanel> </WrapPanel>
<WrapPanel Grid.Row="2" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0 15"> <WrapPanel Grid.Row="2" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0 15">
<TextBlock Text="物料名称" FontSize="15" Foreground="white" HorizontalAlignment="Center" VerticalAlignment="Center" /> <TextBlock Text="物料名称" FontSize="15" Foreground="white" HorizontalAlignment="Center" VerticalAlignment="Center" />
<TextBox x:Name="MaterialName" Foreground="white" Text="{Binding SelectedItem.MaterialName, ElementName=dgvMH}" IsReadOnly="True" Margin="15 0 0 0" FontSize="15" VerticalContentAlignment="Center" HorizontalContentAlignment="Left" Width="{Binding Path=ActualWidth, ElementName=ProductNo}" <TextBox x:Name="MaterialName" Foreground="white" BorderBrush="White" Text="{Binding SelectedItem.MaterialName, ElementName=dgvMH}" IsReadOnly="True" Margin="15 0 0 0" FontSize="15" VerticalContentAlignment="Center" HorizontalContentAlignment="Left" Width="{Binding Path=ActualWidth, ElementName=ProductNo}"
materialDesign:HintAssist.Hint="物料名称" /> materialDesign:HintAssist.Hint="物料名称" />
</WrapPanel> </WrapPanel>
<WrapPanel Grid.Row="3" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0 15"> <WrapPanel Grid.Row="3" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0 15">
<TextBlock Text="打印数量" FontSize="15" Foreground="white" HorizontalAlignment="Center" VerticalAlignment="Center" /> <TextBlock Text="打印数量" FontSize="15" Foreground="white" HorizontalAlignment="Center" VerticalAlignment="Center" />
<!--<TextBox x:Name="PlanAmount" Foreground="white" Text="{Binding SelectedItem.StandardAmount, ElementName=dgvMH}" Margin="15 0 0 0" FontSize="15" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Width="{Binding Path=ActualWidth, ElementName=ProductNo}" <Slider x:Name="PlanAmount" Minimum="0" Maximum="500" BorderBrush="White" Value="{Binding SelectedItem.StandardAmount, ElementName=dgvMH}" Foreground="white" Height="30" VerticalContentAlignment="Center"
materialDesign:HintAssist.Hint="打印数量"/>--> HorizontalContentAlignment="Left" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="15 0 0 0" FontSize="15" Width="340"/>
<Slider x:Name="PlanAmount" Minimum="0" Maximum="500" Value="{Binding SelectedItem.StandardAmount, ElementName=dgvMH}" Foreground="white" Height="30" VerticalContentAlignment="Center" HorizontalContentAlignment="Left" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="15 0 0 0" FontSize="15" Width="340"/> <TextBlock Text="1~500" Width="50" Margin="10 0 0 0" Foreground="White" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center" />
<TextBlock Text="1~500" Width="50" Margin="10 0 0 0" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center" />
</WrapPanel> </WrapPanel>
<Border Grid.Row="4" BorderBrush="#0288d1" BorderThickness="1" CornerRadius="5" Margin="100 5" > <Border Grid.Row="4" BorderBrush="#0288d1" BorderThickness="1" CornerRadius="5" Margin="100 5" >
<StackPanel > <StackPanel >

4
Aucma.Core.PrintTo/Views/PrintToDevView.xaml
Unescape Escape View File

@ -5,8 +5,8 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Aucma.Core.PrintTo.Views" xmlns:local="clr-namespace:Aucma.Core.PrintTo.Views"
mc:Ignorable="d" mc:Ignorable="d"
Background="#0C4CA3" Name="window" Background="#0C4CA3" Name="window"
Title="打印" Height="500" Width="500" WindowStartupLocation="CenterScreen" WindowStyle="None"> Title="二维码打印" Height="700" Width="700" WindowStartupLocation="CenterScreen" WindowStyle="None">
<Grid Margin="15"> <Grid Margin="15">
<Grid.RowDefinitions> <Grid.RowDefinitions>

BIN
HwControlLib/bin/Debug/net6.0-windows/HwControlLib.dll
View File

Binary file not shown.

BIN
HwControlLib/bin/Debug/net6.0-windows/HwControlLib.pdb
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save