pengcong001
/
bbwy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1

AddValidOverTime
506583276@qq.com 2 years ago
parent
fcef5e1402
commit
071f36ce83
9 changed files with 63 additions and 78 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      BBWY.Client/Models/APIModel/Request/BarCodeRequest.cs
  2. 8
      BBWY.Client/Models/Enums.cs
  3. 9
      BBWY.Client/Models/PackTask/BarCodeModel.cs
  4. 11
      BBWY.Client/Models/PackTask/PackTaskModel.cs
  5. 1
      BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs
  6. 36
      BBWY.Client/Views/PackTask/BarcodeControl.xaml
  7. 62
      BBWY.Client/Views/PackTask/SetBarCode.xaml
  8. 3
      BBWY.Client/Views/PackTask/SetBarCode.xaml.cs
  9. 1
      BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs

8
BBWY.Client/Models/APIModel/Request/BarCodeRequest.cs
View File

@ -43,9 +43,9 @@ namespace BBWY.Client.Models.APIModel.Request
/// </summary> /// </summary>
public BarcodeLabelModel LabelModel { get; set; } public BarcodeLabelModel LabelModel { get; set; }
///// <summary> /// <summary>
///// 型号 /// 店铺名
///// </summary> /// </summary>
//public string ModelNo { get; set; } public string ShopName { get; set; }
} }
} }

8
BBWY.Client/Models/Enums.cs
View File

@ -310,10 +310,10 @@
/// 精简模板 /// 精简模板
/// </summary> /// </summary>
精简模板 = 1, 精简模板 = 1,
/// <summary> ///// <summary>
/// 无型号模板 ///// 无型号模板
/// </summary> ///// </summary>
无型号模板 = 2 //无型号模板 = 2
} }

9
BBWY.Client/Models/PackTask/BarCodeModel.cs
View File

@ -49,15 +49,6 @@ namespace BBWY.Client.Models
public string SkuId { get => skuId; set { Set(ref skuId, value); } } public string SkuId { get => skuId; set { Set(ref skuId, value); } }
private string modelNo;
/// <summary>
/// 型号
/// </summary>
public string ModelNo { get => modelNo; set { Set(ref modelNo, value); } }
private BarcodeLabelModel labelModel= BarcodeLabelModel.精简模板; private BarcodeLabelModel labelModel= BarcodeLabelModel.精简模板;
/// <summary> /// <summary>
/// 模板标签 /// 模板标签

11
BBWY.Client/Models/PackTask/PackTaskModel.cs
View File

@ -6,6 +6,7 @@ using BBWY.Client.ViewModels.PackTask;
using BBWY.Client.Views.PackTask; using BBWY.Client.Views.PackTask;
using BBWY.Client.Views.QualityTask; using BBWY.Client.Views.QualityTask;
using GalaSoft.MvvmLight.Command; using GalaSoft.MvvmLight.Command;
using NPOI.Util;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@ -110,15 +111,7 @@ namespace BBWY.Client.Models
return; return;
} }
LookBarCodeWindow look = new LookBarCodeWindow(); LookBarCodeWindow look = new LookBarCodeWindow();
look.SetData(new BarCodeModel look.SetData(BarCodeModel.Copy());
{
Brand = BarCodeModel.Brand,
BrandName = BarCodeModel.BrandName,
LabelModel = BarCodeModel.LabelModel,
ProductNo = BarCodeModel.ProductNo,
SkuId = BarCodeModel.SkuId,
SkuName = BarCodeModel.SkuName
});
look.Show(); look.Show();
} }

1
BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs
View File

@ -338,6 +338,7 @@ namespace BBWY.Client.ViewModels.PackTask
BarCodeModel.Brand = Brand; BarCodeModel.Brand = Brand;
BarCodeModel.SkuId = SkuId; BarCodeModel.SkuId = SkuId;
BarCodeModel.SkuName = SkuName; BarCodeModel.SkuName = SkuName;
BarCodeModel.ShopName = globalContext.User.Shop.ShopName;
} }
if (!string.IsNullOrEmpty(BrandName)) if (!string.IsNullOrEmpty(BrandName))
BarCodeModel.BrandName = BrandName; BarCodeModel.BrandName = BrandName;

36
BBWY.Client/Views/PackTask/BarcodeControl.xaml
View File

@ -9,28 +9,27 @@
<Grid DataContext="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:BarcodeControl}}}"> <Grid DataContext="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:BarcodeControl}}}">
<DockPanel Grid.Row="1"> <DockPanel Grid.Row="1">
<Border Name="jingjian" Visibility="{Binding model.LabelModel,Converter={StaticResource objConverter},ConverterParameter=精简模板:Visible:Collapsed}" BorderBrush="{StaticResource Border.Brush}" BorderThickness="1" Height="220" Margin="1"> <Border Name="jingjian" Visibility="{Binding model.LabelModel,Converter={StaticResource objConverter},ConverterParameter=精简模板:Visible:Collapsed}" BorderBrush="{StaticResource Border.Brush}" BorderThickness="1" Height="220" Margin="1">
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical" >
<TextBlock Margin="10,25,10,0" FontSize="15" FontWeight="Black" > <TextBlock Margin="10,10,10,5" FontSize="15" FontWeight="Black" >
<Run Text="品名:"/> <Run Text="品名:"/>
<Run Text="{Binding model.BrandName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/> <Run Text="{Binding model.BrandName}"/>
</TextBlock> </TextBlock>
<TextBlock Margin="10,25,10,0" FontSize="15" FontWeight="Black" > <TextBlock Margin="10,10,10,5" FontSize="15" FontWeight="Black" >
<Run Text="规格:"/> <Run Text="规格:"/>
<Run Text="{Binding model.SkuName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/> <Run Text="{Binding model.SkuName}"/>
</TextBlock> </TextBlock>
<Image Source="/resources/images/barcode.png" Margin="10,25,10,0"/> <TextBlock Margin="10,10,10,5" FontSize="15" FontWeight="Black" >
<Run Text="店铺:"/>
<Run Text="{Binding model.ShopName}"/>
</TextBlock>
<Image Source="/resources/images/barcode.png" Margin="10,10,10,0"/>
<TextBlock Text="POP" HorizontalAlignment="Center" Margin="10,0,10,0" FontSize="15" FontWeight="Black" > <TextBlock Text="POP" HorizontalAlignment="Center" Margin="10,0,10,0" FontSize="15" FontWeight="Black" >
<Run Text="{Binding model.SkuId,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/> <Run Text="{Binding model.SkuId}"/>
</TextBlock> </TextBlock>
</StackPanel> </StackPanel>
</Border> </Border>
<Border Name="biaozhun" Visibility="{Binding model.LabelModel,Converter={StaticResource objConverter},ConverterParameter=标准模板:Visible:Collapsed}" BorderBrush="{StaticResource Border.Brush}" BorderThickness="1" Height="220" Margin="1"> <Border Name="biaozhun" Visibility="{Binding model.LabelModel,Converter={StaticResource objConverter},ConverterParameter=标准模板:Visible:Collapsed}" BorderBrush="{StaticResource Border.Brush}" BorderThickness="1" Height="220" Margin="1">
<StackPanel Orientation="Vertical" > <StackPanel Orientation="Vertical" >
<TextBlock Margin="10,10,10,0" FontSize="15" FontWeight="Black" >
<Run Text="品牌:"/>
<Run Text="{Binding model.Brand,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
</TextBlock>
<TextBlock Margin="10,10,10,0" FontSize="15" FontWeight="Black" > <TextBlock Margin="10,10,10,0" FontSize="15" FontWeight="Black" >
<Run Text="品名:"/> <Run Text="品名:"/>
<Run Text="{Binding model.BrandName}"/> <Run Text="{Binding model.BrandName}"/>
@ -43,6 +42,10 @@
<Run Text="规格:"/> <Run Text="规格:"/>
<Run Text="{Binding model.SkuName}"/> <Run Text="{Binding model.SkuName}"/>
</TextBlock> </TextBlock>
<TextBlock Margin="10,10,10,0" FontSize="15" FontWeight="Black" >
<Run Text="店铺:"/>
<Run Text="{Binding model.ShopName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
</TextBlock>
<Image Source="/resources/images/barcode.png" Margin="10,10,10,0"/> <Image Source="/resources/images/barcode.png" Margin="10,10,10,0"/>
<TextBlock Text="POP" HorizontalAlignment="Center" Margin="10,0,10,0" FontSize="15" FontWeight="Black" > <TextBlock Text="POP" HorizontalAlignment="Center" Margin="10,0,10,0" FontSize="15" FontWeight="Black" >
<Run Text="{Binding model.SkuId}"/> <Run Text="{Binding model.SkuId}"/>
@ -51,10 +54,7 @@
</Border> </Border>
<Border Name="wuxinghao" Visibility="{Binding model.LabelModel,Converter={StaticResource objConverter},ConverterParameter=无型号模板:Visible:Collapsed}" BorderBrush="{StaticResource Border.Brush}" BorderThickness="1" Height="220" Margin="1"> <Border Name="wuxinghao" Visibility="{Binding model.LabelModel,Converter={StaticResource objConverter},ConverterParameter=无型号模板:Visible:Collapsed}" BorderBrush="{StaticResource Border.Brush}" BorderThickness="1" Height="220" Margin="1">
<StackPanel Orientation="Vertical" > <StackPanel Orientation="Vertical" >
<TextBlock Margin="10,10,10,5" FontSize="15" FontWeight="Black" >
<Run Text="品牌:"/>
<Run Text="{Binding model.Brand}"/>
</TextBlock>
<TextBlock Margin="10,10,10,5" FontSize="15" FontWeight="Black" > <TextBlock Margin="10,10,10,5" FontSize="15" FontWeight="Black" >
<Run Text="品名:"/> <Run Text="品名:"/>
<Run Text="{Binding model.BrandName}"/> <Run Text="{Binding model.BrandName}"/>
@ -63,6 +63,10 @@
<Run Text="规格:"/> <Run Text="规格:"/>
<Run Text="{Binding model.SkuName}"/> <Run Text="{Binding model.SkuName}"/>
</TextBlock> </TextBlock>
<TextBlock Margin="10,10,10,5" FontSize="15" FontWeight="Black" >
<Run Text="店铺:"/>
<Run Text="{Binding model.ShopName}"/>
</TextBlock>
<Image Source="/resources/images/barcode.png" Margin="10,10,10,0"/> <Image Source="/resources/images/barcode.png" Margin="10,10,10,0"/>
<TextBlock Text="POP" HorizontalAlignment="Center" Margin="10,0,10,0" FontSize="15" FontWeight="Black" > <TextBlock Text="POP" HorizontalAlignment="Center" Margin="10,0,10,0" FontSize="15" FontWeight="Black" >
<Run Text="{Binding model.SkuId}"/> <Run Text="{Binding model.SkuId}"/>

62
BBWY.Client/Views/PackTask/SetBarCode.xaml
View File

@ -8,7 +8,7 @@
mc:Ignorable="d" mc:Ignorable="d"
Style="{StaticResource bwstyle}" Style="{StaticResource bwstyle}"
xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls" xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"
Height="651" Width="577" Height="380" Width="577"
xmlns:b="http://schemas.microsoft.com/xaml/behaviors" xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
xmlns:ctr="clr-namespace:BBWY.Client.Converters" xmlns:ctr="clr-namespace:BBWY.Client.Converters"
xmlns:cmodel="clr-namespace:BBWY.Client.Models" xmlns:cmodel="clr-namespace:BBWY.Client.Models"
@ -31,49 +31,44 @@
</Border> </Border>
<Grid Grid.Row="1"> <Grid Grid.Row="1">
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/> <ColumnDefinition/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<StackPanel Orientation="Vertical" > <StackPanel Orientation="Vertical" >
<!--{Binding CertificateModel.IsLogo,Converter={StaticResource objConverter},ConverterParameter=1:true:false}-->
<RadioButton GroupName="bar" IsChecked="{Binding BarCodeModel.LabelModel,Converter={StaticResource enumToBooleanConverter},ConverterParameter={x:Static cmodel:BarcodeLabelModel.精简模板}}" Command="{Binding BarLabelCheckCommand}" CommandParameter="{x:Static cmodel:BarcodeLabelModel.精简模板}" Content="精简" Margin="10,10,0,0" Height="30" VerticalAlignment="Top"/> <RadioButton GroupName="bar" IsChecked="{Binding BarCodeModel.LabelModel,Converter={StaticResource enumToBooleanConverter},ConverterParameter={x:Static cmodel:BarcodeLabelModel.精简模板}}" Content="精简" Command="{Binding BarLabelCheckCommand}" CommandParameter="{x:Static cmodel:BarcodeLabelModel.精简模板}" Margin="10,10,0,0" Height="30" VerticalAlignment="Top"/>
<Border BorderBrush="{StaticResource Border.Brush}" BorderThickness="1" Height="220" Margin="5"> <Border BorderBrush="{StaticResource Border.Brush}" BorderThickness="1" Height="220" Margin="5">
<StackPanel Orientation="Vertical" > <StackPanel Orientation="Vertical" >
<TextBlock Margin="10,25,10,0" FontSize="15" FontWeight="Black" >
<TextBlock Margin="10,20,10,10" FontSize="15" FontWeight="Black" >
<Run Text="品名:"/> <Run Text="品名:"/>
<Run Text="{Binding BarCodeModel.BrandName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/> <Run Text="{Binding BarCodeModel.BrandName}"/>
</TextBlock> </TextBlock>
<TextBlock Margin="10,25,10,0" FontSize="15" FontWeight="Black" > <TextBlock Margin="10" FontSize="15" FontWeight="Black" >
<Run Text="规格:"/> <Run Text="规格:"/>
<Run Text="{Binding BarCodeModel.SkuName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/> <Run Text="{Binding BarCodeModel.SkuName}"/>
</TextBlock>
<TextBlock Margin="10,10,10,0" FontSize="15" FontWeight="Black" >
<Run Text="店铺:"/>
<Run Text="{Binding BarCodeModel.ShopName}"/>
</TextBlock> </TextBlock>
<Image Source="/resources/images/barcode.png" Margin="10,25,10,0"/> <Image Source="/resources/images/barcode.png" Margin="10,10,10,0"/>
<TextBlock Text="POP" HorizontalAlignment="Center" Margin="10,0,10,0" FontSize="15" FontWeight="Black" > <TextBlock Text="POP" HorizontalAlignment="Center" Margin="10,0,10,0" FontSize="15" FontWeight="Black" >
<Run Text="{Binding BarCodeModel.SkuId,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/> <Run Text="{Binding BarCodeModel.SkuId}"/>
</TextBlock> </TextBlock>
</StackPanel> </StackPanel>
</Border> </Border>
</StackPanel> </StackPanel>
<StackPanel Grid.Column="1" Orientation="Vertical" > <StackPanel Grid.Column="1" Orientation="Vertical" >
<RadioButton GroupName="bar" IsChecked="{Binding BarCodeModel.LabelModel,Converter={StaticResource enumToBooleanConverter},ConverterParameter={x:Static cmodel:BarcodeLabelModel.标准模板}}" Content="标准" Command="{Binding BarLabelCheckCommand}" CommandParameter="{x:Static cmodel:BarcodeLabelModel.标准模板}" Margin="10,10,0,0" Height="30" VerticalAlignment="Top"/> <RadioButton GroupName="bar" IsChecked="{Binding BarCodeModel.LabelModel,Converter={StaticResource enumToBooleanConverter},ConverterParameter={x:Static cmodel:BarcodeLabelModel.标准模板}}" Content="标准" Command="{Binding BarLabelCheckCommand}" CommandParameter="{x:Static cmodel:BarcodeLabelModel.标准模板}" Margin="10,10,0,0" Height="30" VerticalAlignment="Top"/>
<Border BorderBrush="{StaticResource Border.Brush}" BorderThickness="1" Height="220" Margin="5"> <Border BorderBrush="{StaticResource Border.Brush}" BorderThickness="1" Height="220" Margin="5">
<StackPanel Orientation="Vertical" > <StackPanel Orientation="Vertical" >
<TextBlock Margin="10,10,10,0" FontSize="15" FontWeight="Black" >
<Run Text="品牌:"/>
<Run Text="{Binding BarCodeModel.Brand}"/>
</TextBlock>
<TextBlock Margin="10,10,10,0" FontSize="15" FontWeight="Black" > <TextBlock Margin="10,10,10,0" FontSize="15" FontWeight="Black" >
<Run Text="品名:"/> <Run Text="品名:"/>
<Run Text="{Binding BarCodeModel.BrandName}"/> <Run Text="{Binding BarCodeModel.BrandName}"/>
@ -86,6 +81,10 @@
<Run Text="规格:"/> <Run Text="规格:"/>
<Run Text="{Binding BarCodeModel.SkuName}"/> <Run Text="{Binding BarCodeModel.SkuName}"/>
</TextBlock> </TextBlock>
<TextBlock Margin="10,10,10,0" FontSize="15" FontWeight="Black" >
<Run Text="店铺:"/>
<Run Text="{Binding BarCodeModel.ShopName}"/>
</TextBlock>
<Image Source="/resources/images/barcode.png" Margin="10,10,10,0"/> <Image Source="/resources/images/barcode.png" Margin="10,10,10,0"/>
<TextBlock Text="POP" HorizontalAlignment="Center" Margin="10,0,10,0" FontSize="15" FontWeight="Black" > <TextBlock Text="POP" HorizontalAlignment="Center" Margin="10,0,10,0" FontSize="15" FontWeight="Black" >
<Run Text="{Binding BarCodeModel.SkuId}"/> <Run Text="{Binding BarCodeModel.SkuId}"/>
@ -99,15 +98,12 @@
</StackPanel> </StackPanel>
<StackPanel Grid.Column="0" Grid.Row="1" Orientation="Vertical" > <!--<StackPanel Grid.Column="0" Grid.Row="0" Orientation="Vertical" >
<RadioButton GroupName="bar" IsChecked="{Binding BarCodeModel.LabelModel,Converter={StaticResource enumToBooleanConverter},ConverterParameter={x:Static cmodel:BarcodeLabelModel.无型号模板}}" Content="无型号" Command="{Binding BarLabelCheckCommand}" CommandParameter="{x:Static cmodel:BarcodeLabelModel.无型号模板}" Margin="10,10,0,0" Height="30" VerticalAlignment="Top"/> <RadioButton GroupName="bar" IsChecked="{Binding BarCodeModel.LabelModel,Converter={StaticResource enumToBooleanConverter},ConverterParameter={x:Static cmodel:BarcodeLabelModel.精简模板}}" Content="精简" Command="{Binding BarLabelCheckCommand}" CommandParameter="{x:Static cmodel:BarcodeLabelModel.精简模板}" Margin="10,10,0,0" Height="30" VerticalAlignment="Top"/>
<Border BorderBrush="{StaticResource Border.Brush}" BorderThickness="1" Height="220" Margin="5"> <Border BorderBrush="{StaticResource Border.Brush}" BorderThickness="1" Height="220" Margin="5">
<StackPanel Orientation="Vertical" > <StackPanel Orientation="Vertical" >
<TextBlock Margin="10,10,10,0" FontSize="15" FontWeight="Black" >
<Run Text="品牌:"/>
<Run Text="{Binding BarCodeModel.Brand}"/>
</TextBlock>
<TextBlock Margin="10,20,10,10" FontSize="15" FontWeight="Black" > <TextBlock Margin="10,20,10,10" FontSize="15" FontWeight="Black" >
<Run Text="品名:"/> <Run Text="品名:"/>
<Run Text="{Binding BarCodeModel.BrandName}"/> <Run Text="{Binding BarCodeModel.BrandName}"/>
@ -117,18 +113,18 @@
<Run Text="规格:"/> <Run Text="规格:"/>
<Run Text="{Binding BarCodeModel.SkuName}"/> <Run Text="{Binding BarCodeModel.SkuName}"/>
</TextBlock> </TextBlock>
<TextBlock Margin="10,10,10,0" FontSize="15" FontWeight="Black" >
<Run Text="店铺:"/>
<Run Text="{Binding BarCodeModel.ShopName}"/>
</TextBlock>
<Image Source="/resources/images/barcode.png" Margin="10,10,10,0"/> <Image Source="/resources/images/barcode.png" Margin="10,10,10,0"/>
<TextBlock Text="POP" HorizontalAlignment="Center" Margin="10,0,10,0" FontSize="15" FontWeight="Black" > <TextBlock Text="POP" HorizontalAlignment="Center" Margin="10,0,10,0" FontSize="15" FontWeight="Black" >
<Run Text="{Binding BarCodeModel.SkuId}"/> <Run Text="{Binding BarCodeModel.SkuId}"/>
</TextBlock> </TextBlock>
</StackPanel> </StackPanel>
</Border> </Border>
</StackPanel> </StackPanel>-->
</Grid> </Grid>

3
BBWY.Client/Views/PackTask/SetBarCode.xaml.cs
View File

@ -60,7 +60,8 @@ namespace BBWY.Client.Views.PackTask
ProductNo = BarCodeModel.ProductNo, ProductNo = BarCodeModel.ProductNo,
SkuId = BarCodeModel.SkuId, SkuId = BarCodeModel.SkuId,
SkuName = BarCodeModel.SkuName, SkuName = BarCodeModel.SkuName,
LabelModel = BarCodeModel.LabelModel LabelModel = BarCodeModel.LabelModel,
ShopName = BarCodeModel.ShopName,
}); });
if (resData == null) if (resData == null)

1
BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
View File

@ -973,7 +973,6 @@ namespace BBWY.Server.Business
if (payOrderResponse.Success) if (payOrderResponse.Success)
{ {
var order = fsql.Select<PurchaseOrderV2>().Where(p => p.Id == request.OrderId).ToOne(); var order = fsql.Select<PurchaseOrderV2>().Where(p => p.Id == request.OrderId).ToOne();
fsql.Update<PurchaseOrderV2>(order) fsql.Update<PurchaseOrderV2>(order)
.Set(a => a.OrderState, payOrderResponse.PurchaseOrderState) .Set(a => a.OrderState, payOrderResponse.PurchaseOrderState)
.ExecuteAffrows(); .ExecuteAffrows();

Write Preview
Loading…
Cancel
Save