修改买手单号状态
This commit is contained in:
wule committed
1 parent
1e27c0b1e1
commit
adde7e6fca
22 files changed
+6451
-514
No files matched your search
+10
-10
@@ -1,7 +1,7 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio Version 16
|
||||
VisualStudioVersion = 16.0.36128.20
|
||||
# Visual Studio Version 17
|
||||
VisualStudioVersion = 17.14.36221.1 d17.14
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "29WxOrderAllBase", "AllBase\29WxOrderAllBase.csproj", "{6461D807-B1C8-45F0-B388-E0CA1A418DE0}"
|
||||
EndProject
|
||||
@@ -31,8 +31,8 @@ Global
|
||||
{6461D807-B1C8-45F0-B388-E0CA1A418DE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{6461D807-B1C8-45F0-B388-E0CA1A418DE0}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
|
||||
{6461D807-B1C8-45F0-B388-E0CA1A418DE0}.Debug|Mixed Platforms.Build.0 = Debug|x86
|
||||
{6461D807-B1C8-45F0-B388-E0CA1A418DE0}.Debug|x64.ActiveCfg = Debug|x86
|
||||
{6461D807-B1C8-45F0-B388-E0CA1A418DE0}.Debug|x64.Build.0 = Debug|x86
|
||||
{6461D807-B1C8-45F0-B388-E0CA1A418DE0}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{6461D807-B1C8-45F0-B388-E0CA1A418DE0}.Debug|x64.Build.0 = Debug|x64
|
||||
{6461D807-B1C8-45F0-B388-E0CA1A418DE0}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{6461D807-B1C8-45F0-B388-E0CA1A418DE0}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{6461D807-B1C8-45F0-B388-E0CA1A418DE0}.Release|Any CPU.ActiveCfg = Release|x86
|
||||
@@ -47,8 +47,8 @@ Global
|
||||
{D51A1BB0-17BB-44C3-9129-1F3187E82729}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{D51A1BB0-17BB-44C3-9129-1F3187E82729}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
|
||||
{D51A1BB0-17BB-44C3-9129-1F3187E82729}.Debug|Mixed Platforms.Build.0 = Debug|x86
|
||||
{D51A1BB0-17BB-44C3-9129-1F3187E82729}.Debug|x64.ActiveCfg = Debug|x86
|
||||
{D51A1BB0-17BB-44C3-9129-1F3187E82729}.Debug|x64.Build.0 = Debug|x86
|
||||
{D51A1BB0-17BB-44C3-9129-1F3187E82729}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{D51A1BB0-17BB-44C3-9129-1F3187E82729}.Debug|x64.Build.0 = Debug|x64
|
||||
{D51A1BB0-17BB-44C3-9129-1F3187E82729}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{D51A1BB0-17BB-44C3-9129-1F3187E82729}.Debug|x86.Build.0 = Debug|x86
|
||||
{D51A1BB0-17BB-44C3-9129-1F3187E82729}.Release|Any CPU.ActiveCfg = Release|x86
|
||||
@@ -63,8 +63,8 @@ Global
|
||||
{1AD45D66-6872-4522-ACF0-04E2C0514048}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{1AD45D66-6872-4522-ACF0-04E2C0514048}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
|
||||
{1AD45D66-6872-4522-ACF0-04E2C0514048}.Debug|Mixed Platforms.Build.0 = Debug|x86
|
||||
{1AD45D66-6872-4522-ACF0-04E2C0514048}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{1AD45D66-6872-4522-ACF0-04E2C0514048}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{1AD45D66-6872-4522-ACF0-04E2C0514048}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{1AD45D66-6872-4522-ACF0-04E2C0514048}.Debug|x64.Build.0 = Debug|x64
|
||||
{1AD45D66-6872-4522-ACF0-04E2C0514048}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{1AD45D66-6872-4522-ACF0-04E2C0514048}.Debug|x86.Build.0 = Debug|x86
|
||||
{1AD45D66-6872-4522-ACF0-04E2C0514048}.Release|Any CPU.ActiveCfg = Release|x86
|
||||
@@ -79,8 +79,8 @@ Global
|
||||
{D7884375-E42F-4B89-AA3A-D8E75508D8C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{D7884375-E42F-4B89-AA3A-D8E75508D8C7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||
{D7884375-E42F-4B89-AA3A-D8E75508D8C7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
||||
{D7884375-E42F-4B89-AA3A-D8E75508D8C7}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{D7884375-E42F-4B89-AA3A-D8E75508D8C7}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{D7884375-E42F-4B89-AA3A-D8E75508D8C7}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{D7884375-E42F-4B89-AA3A-D8E75508D8C7}.Debug|x64.Build.0 = Debug|x64
|
||||
{D7884375-E42F-4B89-AA3A-D8E75508D8C7}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{D7884375-E42F-4B89-AA3A-D8E75508D8C7}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{D7884375-E42F-4B89-AA3A-D8E75508D8C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<OutputPath>bin\x64\Debug\</OutputPath>
|
||||
<OutputPath>..\bin\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<DebugType>full</DebugType>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
@@ -63,7 +63,7 @@
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<OutputPath>..\..\KJD Cef138\Bin\</OutputPath>
|
||||
<OutputPath>..\Bin\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<DebugType>full</DebugType>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
|
||||
@@ -57,6 +57,26 @@
|
||||
<PropertyGroup>
|
||||
<ApplicationIcon>29wx.ico</ApplicationIcon>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<OutputPath>..\bin\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<DebugType>full</DebugType>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<LangVersion>7.3</LangVersion>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<Prefer32Bit>true</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
|
||||
<OutputPath>bin\x64\Release\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<Optimize>true</Optimize>
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<LangVersion>7.3</LangVersion>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<Prefer32Bit>true</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="CefSharp, Version=138.0.340.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CefSharp.Common.138.0.340\lib\net462\CefSharp.dll</HintPath>
|
||||
|
||||
@@ -1,11 +1,14 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Globalization;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Net;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Data;
|
||||
using System.Windows.Media.Imaging;
|
||||
using Work;
|
||||
|
||||
namespace _29WxOrderWpf.Converters
|
||||
{
|
||||
@@ -15,7 +18,20 @@ namespace _29WxOrderWpf.Converters
|
||||
{
|
||||
if (value is string url && Uri.IsWellFormedUriString(url, UriKind.Absolute))
|
||||
{
|
||||
return new BitmapImage(new Uri(url));
|
||||
try
|
||||
{
|
||||
// 直接加载绑定如果遇到有问题的网络图片会直接崩溃。
|
||||
//var bitMap = new BitmapImage(new Uri(url));
|
||||
var bitMap = LoadImageFromUrl(url);
|
||||
return bitMap;
|
||||
//string errStr = "";
|
||||
//var bitmapImg = GetUrlImg(url, out errStr);
|
||||
//return bitmapImg;
|
||||
}
|
||||
catch
|
||||
{
|
||||
|
||||
}
|
||||
//return Task.Run(() => new BitmapImage(new Uri(url))); // 使用 Task.Run 来异步加载图片。
|
||||
}
|
||||
return null;
|
||||
@@ -25,5 +41,38 @@ namespace _29WxOrderWpf.Converters
|
||||
{
|
||||
throw new NotImplementedException(); // 不需要反向转换，所以不实现。
|
||||
}
|
||||
|
||||
|
||||
public BitmapImage LoadImageFromUrl(string url)
|
||||
{
|
||||
BitmapImage bitmap = new BitmapImage();
|
||||
|
||||
try
|
||||
{
|
||||
using (WebClient webClient = new WebClient())
|
||||
{
|
||||
// 下载图片数据到内存流
|
||||
using (MemoryStream stream = new MemoryStream(webClient.DownloadData(url)))
|
||||
{
|
||||
stream.Position = 0; // 重置流的位置到开始处
|
||||
bitmap.BeginInit();
|
||||
bitmap.CreateOptions = BitmapCreateOptions.PreservePixelFormat;
|
||||
bitmap.CacheOption = BitmapCacheOption.OnLoad; // 或者使用 BitmapCacheOption.OnLoad 以减少内存使用
|
||||
bitmap.UriSource = null; // 清除可能的旧UriSource，防止缓存问题
|
||||
bitmap.StreamSource = stream;
|
||||
bitmap.EndInit();
|
||||
bitmap.Freeze(); // 防止后续更改，提高性能
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
// 处理异常，例如打印错误信息或设置一个默认图片等
|
||||
//Console.WriteLine("Error loading image: " + ex.Message);
|
||||
return null;
|
||||
}
|
||||
|
||||
return bitmap;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -6,49 +6,158 @@
|
||||
xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.BuyerCtrls"
|
||||
mc:Ignorable="d" Loaded="UserControl_Loaded"
|
||||
d:DesignHeight="450" d:DesignWidth="1000">
|
||||
<Grid Background="White">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="40"></RowDefinition>
|
||||
<RowDefinition Height="*"></RowDefinition>
|
||||
</Grid.RowDefinitions>
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition></ColumnDefinition>
|
||||
<ColumnDefinition Width="*"></ColumnDefinition>
|
||||
</Grid.ColumnDefinitions>
|
||||
<CheckBox Content="自动读买手单" x:Name="chkAutoReadBuyerOrder" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" HorizontalAlignment="Left"
|
||||
Margin="6,0" VerticalAlignment="Center" Checked="chkAutoReadBuyerOrder_CheckedChanged" Unchecked="chkAutoReadBuyerOrder_CheckedChanged" IsChecked="True"/>
|
||||
<Border BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1,1,0,1" CornerRadius="5,0,0,5" Background="White">
|
||||
|
||||
<TextBox x:Name="txtUrlAddress" Grid.Column="2" Margin="8,0,20,0" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1" Height="28"
|
||||
VerticalContentAlignment="Center" Style="{StaticResource BaseRoundCornerTextBoxStyle}"/>
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="40"></RowDefinition>
|
||||
<RowDefinition Height="*"></RowDefinition>
|
||||
</Grid.RowDefinitions>
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="auto"></ColumnDefinition>
|
||||
<ColumnDefinition Width="*"></ColumnDefinition>
|
||||
<ColumnDefinition Width="auto"></ColumnDefinition>
|
||||
</Grid.ColumnDefinitions>
|
||||
<WrapPanel VerticalAlignment="Center">
|
||||
|
||||
<CheckBox Content="自动读买手单" x:Name="chkAutoReadBuyerOrder" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" HorizontalAlignment="Left"
|
||||
Margin="6,0" VerticalAlignment="Center" Checked="chkAutoReadBuyerOrder_CheckedChanged" Unchecked="chkAutoReadBuyerOrder_CheckedChanged" IsChecked="true"/>
|
||||
|
||||
<CheckBox Content="隐藏无微信订单的买手单" x:Name="chkHideNoWxIdOrder" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" HorizontalAlignment="Left"
|
||||
Margin="6,0" VerticalAlignment="Center" Checked="chkHideNoWxIdOrder_CheckedChanged" Unchecked="chkHideNoWxIdOrder_CheckedChanged" IsChecked="True"/>
|
||||
<CheckBox Content="未发货单自动售后" x:Name="chkAutoAfterSale" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" HorizontalAlignment="Left" Visibility="Collapsed"
|
||||
Margin="6,0" VerticalAlignment="Center" IsChecked="True"/>
|
||||
<Button Grid.Column="8" x:Name="btnSearch" Style="{StaticResource BasePageButtonStyle}" Margin="4,0,0,0" Content="刷新订单" Width="118" Height="24" Click="btnSearch_Click"/>
|
||||
</WrapPanel>
|
||||
|
||||
<TextBox x:Name="txtFilter" Grid.Column="1" Margin="28,0,8,0" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1" Height="28"
|
||||
VerticalContentAlignment="Center" Style="{StaticResource BaseRoundCornerTextBoxStyle}" />
|
||||
<Button Grid.Column="2" x:Name="btnFilter" Style="{StaticResource BasePageButtonStyle}" Margin="4,0,8,0" Content="过滤" Width="50" Height="24" Click="btnFilter_Click"/>
|
||||
</Grid>
|
||||
<Grid Grid.Row="1" Background="LightGray" x:Name="GridCef">
|
||||
|
||||
</Grid>
|
||||
<Grid Grid.Row="1" VerticalAlignment="Bottom" Visibility="Visible" Height="300" Margin="4" Background="White">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="40"></RowDefinition>
|
||||
<RowDefinition Height="*"></RowDefinition>
|
||||
</Grid.RowDefinitions>
|
||||
<Label Content="正在操作：" VerticalAlignment="Center" x:Name="lblMsg"></Label>
|
||||
<DataGrid Grid.Row="1" RowHeight="50" AutoGenerateColumns = "False" HorizontalGridLinesBrush="{StaticResource HorizontalGridLinesBrush}" x:Name="dgBuyerOrder" RowHeaderWidth="0"
|
||||
VerticalGridLinesBrush="{StaticResource VerticalGridLinesBrush}" CanUserDeleteRows="False" CanUserAddRows="False" ColumnHeaderHeight="30" LoadingRow="dgBuyerOrder_LoadingRow">
|
||||
<DataGrid.Columns>
|
||||
<DataGridTextColumn Binding="{Binding Header, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}, Mode=FindAncestor}}" CanUserSort="False" Header="序列" IsReadOnly="True" Width="40">
|
||||
<DataGridTextColumn.ElementStyle>
|
||||
<Style TargetType="TextBlock">
|
||||
<Setter Property="TextWrapping" Value="Wrap"/>
|
||||
<Setter Property="VerticalAlignment" Value="Center"/>
|
||||
<Setter Property="Margin" Value="5"/>
|
||||
</Style>
|
||||
</DataGridTextColumn.ElementStyle>
|
||||
</DataGridTextColumn>
|
||||
<DataGridTextColumn Width="1.5*" Header="拍单订单号" Binding="{Binding order_sn}">
|
||||
<DataGridTextColumn.ElementStyle>
|
||||
<Style TargetType="TextBlock">
|
||||
<Setter Property="TextWrapping" Value="Wrap"/>
|
||||
<Setter Property="VerticalAlignment" Value="Center"/>
|
||||
<Setter Property="Margin" Value="5"/>
|
||||
</Style>
|
||||
</DataGridTextColumn.ElementStyle>
|
||||
</DataGridTextColumn>
|
||||
<DataGridTextColumn Width="1.5*" Header="店铺订单号" Binding="{Binding ShopOrderIdStr}">
|
||||
<DataGridTextColumn.ElementStyle>
|
||||
<Style TargetType="TextBlock">
|
||||
<Setter Property="TextWrapping" Value="Wrap"/>
|
||||
<Setter Property="VerticalAlignment" Value="Center"/>
|
||||
<Setter Property="Margin" Value="5"/>
|
||||
</Style>
|
||||
</DataGridTextColumn.ElementStyle>
|
||||
</DataGridTextColumn>
|
||||
<DataGridTextColumn Width="1*" Header="买手名称" Binding="{Binding buyerName}">
|
||||
<DataGridTextColumn.ElementStyle>
|
||||
<Style TargetType="TextBlock">
|
||||
<Setter Property="TextWrapping" Value="Wrap"/>
|
||||
<Setter Property="VerticalAlignment" Value="Center"/>
|
||||
<Setter Property="Margin" Value="5"/>
|
||||
</Style>
|
||||
</DataGridTextColumn.ElementStyle>
|
||||
</DataGridTextColumn>
|
||||
<DataGridTextColumn Width="0.8*" Header="拍单时间" Binding="{Binding OrderTimeStr}">
|
||||
<DataGridTextColumn.ElementStyle>
|
||||
<Style TargetType="TextBlock">
|
||||
<Setter Property="TextWrapping" Value="Wrap"/>
|
||||
<Setter Property="VerticalAlignment" Value="Center"/>
|
||||
<Setter Property="Margin" Value="5"/>
|
||||
</Style>
|
||||
</DataGridTextColumn.ElementStyle>
|
||||
</DataGridTextColumn>
|
||||
<DataGridTextColumn Width="1.8*" Header="商品信息" Binding="{Binding ProdInfoStr}">
|
||||
<DataGridTextColumn.ElementStyle>
|
||||
<Style TargetType="TextBlock">
|
||||
<Setter Property="TextWrapping" Value="Wrap"/>
|
||||
<Setter Property="VerticalAlignment" Value="Center"/>
|
||||
<Setter Property="Margin" Value="5"/>
|
||||
</Style>
|
||||
</DataGridTextColumn.ElementStyle>
|
||||
</DataGridTextColumn>
|
||||
<DataGridTextColumn Width="0.8*" Header="金额" Binding="{Binding AmoutValue}">
|
||||
<DataGridTextColumn.ElementStyle>
|
||||
<Style TargetType="TextBlock">
|
||||
<Setter Property="TextWrapping" Value="Wrap"/>
|
||||
<Setter Property="VerticalAlignment" Value="Center"/>
|
||||
<Setter Property="Margin" Value="5"/>
|
||||
</Style>
|
||||
</DataGridTextColumn.ElementStyle>
|
||||
</DataGridTextColumn>
|
||||
<DataGridTextColumn Width="1*" Header="订单状态" Binding="{Binding order_status_prompt}">
|
||||
<DataGridTextColumn.ElementStyle>
|
||||
<Style TargetType="TextBlock">
|
||||
<Setter Property="TextWrapping" Value="Wrap"/>
|
||||
<Setter Property="VerticalAlignment" Value="Center"/>
|
||||
<Setter Property="Margin" Value="5"/>
|
||||
</Style>
|
||||
</DataGridTextColumn.ElementStyle>
|
||||
</DataGridTextColumn>
|
||||
<DataGridTextColumn Width="1*" Header="物流名称" Binding="{Binding outExpressCompanyCode}">
|
||||
<!--outExpressCompanyName-->
|
||||
<DataGridTextColumn.ElementStyle>
|
||||
<Style TargetType="TextBlock">
|
||||
<Setter Property="TextWrapping" Value="Wrap"/>
|
||||
<Setter Property="VerticalAlignment" Value="Center"/>
|
||||
<Setter Property="Margin" Value="5"/>
|
||||
</Style>
|
||||
</DataGridTextColumn.ElementStyle>
|
||||
</DataGridTextColumn>
|
||||
<DataGridTextColumn Width="1*" Header="物流单号" Binding="{Binding tracking_number}">
|
||||
<DataGridTextColumn.ElementStyle>
|
||||
<Style TargetType="TextBlock">
|
||||
<Setter Property="TextWrapping" Value="Wrap"/>
|
||||
<Setter Property="VerticalAlignment" Value="Center"/>
|
||||
<Setter Property="Margin" Value="5"/>
|
||||
</Style>
|
||||
</DataGridTextColumn.ElementStyle>
|
||||
</DataGridTextColumn>
|
||||
<DataGridTextColumn Width="1*" Header="订单信息" Binding="{Binding sendStatus}">
|
||||
<DataGridTextColumn.ElementStyle>
|
||||
<Style TargetType="TextBlock">
|
||||
<Setter Property="TextWrapping" Value="Wrap"/>
|
||||
<Setter Property="VerticalAlignment" Value="Center"/>
|
||||
<Setter Property="Margin" Value="5"/>
|
||||
</Style>
|
||||
</DataGridTextColumn.ElementStyle>
|
||||
</DataGridTextColumn>
|
||||
<DataGridTemplateColumn Width="0.6*" Header="手动发送" x:Name="colSendBuyerOrder" >
|
||||
<DataGridTemplateColumn.CellTemplate>
|
||||
<DataTemplate>
|
||||
<Button Grid.Column="1" Grid.Row="2" x:Name="btnSendBuyerOrder" VerticalAlignment="Center" Background="Transparent" HorizontalAlignment="Center" Foreground="#409eff" BorderBrush="Transparent"
|
||||
Margin="4,0,0,0" Content="发送" Click="btnSendBuyerOrder_Click" Visibility="{Binding ShopOrderIdStr, Converter={StaticResource HasTextVisibility}}"></Button>
|
||||
</DataTemplate>
|
||||
</DataGridTemplateColumn.CellTemplate>
|
||||
</DataGridTemplateColumn>
|
||||
</DataGrid.Columns>
|
||||
</DataGrid>
|
||||
</Grid>
|
||||
</Grid>
|
||||
<Grid Grid.Row="1" Background="LightGray" x:Name="GridCef">
|
||||
|
||||
</Grid>
|
||||
<Grid Grid.Row="1" VerticalAlignment="Bottom" Visibility="Visible">
|
||||
<DataGrid Height="300" RowHeight="50" AutoGenerateColumns = "False" HorizontalGridLinesBrush="{StaticResource HorizontalGridLinesBrush}"
|
||||
VerticalGridLinesBrush="{StaticResource VerticalGridLinesBrush}" CanUserDeleteRows="False" CanUserAddRows="False" ColumnHeaderHeight="30">
|
||||
<DataGrid.Columns>
|
||||
<DataGridTextColumn Width="0.5*" Header="" Binding="{Binding order_id}"></DataGridTextColumn>
|
||||
<DataGridTextColumn Width="1*" Header="买手名称" Binding="{Binding order_id}"></DataGridTextColumn>
|
||||
<DataGridTextColumn Width="1.5*" Header="拍单订单号"></DataGridTextColumn>
|
||||
<DataGridTextColumn Width="0.8*" Header="拍单时间"></DataGridTextColumn>
|
||||
<DataGridTextColumn Width="1.8*" Header="商品信息"></DataGridTextColumn>
|
||||
<DataGridTextColumn Width="0.8*" Header="金额"></DataGridTextColumn>
|
||||
<DataGridTextColumn Width="1*" Header="订单状态"></DataGridTextColumn>
|
||||
<DataGridTextColumn Width="1*" Header="物流名称"></DataGridTextColumn>
|
||||
<DataGridTextColumn Width="1*" Header="物流单号"></DataGridTextColumn>
|
||||
<DataGridTextColumn Width="1*" Header="订单信息"></DataGridTextColumn>
|
||||
<DataGridTemplateColumn Width="0.6*" Header="手动发送" x:Name="colSendBuyerOrder" >
|
||||
<DataGridTemplateColumn.CellTemplate>
|
||||
<DataTemplate>
|
||||
<Button Grid.Column="1" Grid.Row="2" x:Name="btnSendBuyerOrder" Background="Transparent" HorizontalAlignment="Center" Foreground="#409eff" BorderBrush="Transparent"
|
||||
Margin="4,0,0,0" Content="发送" Click="btnSendBuyerOrder_Click"></Button>
|
||||
</DataTemplate>
|
||||
</DataGridTemplateColumn.CellTemplate>
|
||||
</DataGridTemplateColumn>
|
||||
</DataGrid.Columns>
|
||||
</DataGrid>
|
||||
</Grid>
|
||||
</Grid>
|
||||
</Border>
|
||||
</UserControl>
|
||||
File diff suppressed because it is too large.
Load diff
@@ -13,8 +13,8 @@
|
||||
|
||||
<Grid Background="{StaticResource ListCtrlBackColorBrush}">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="50"></RowDefinition>
|
||||
<RowDefinition Height="40"></RowDefinition>
|
||||
<RowDefinition Height="45"></RowDefinition>
|
||||
<RowDefinition Height="auto"></RowDefinition>
|
||||
<RowDefinition Height="40"></RowDefinition>
|
||||
<RowDefinition Height="*"></RowDefinition>
|
||||
<RowDefinition Height="40"></RowDefinition>
|
||||
@@ -27,8 +27,8 @@
|
||||
<ColumnDefinition Width="Auto"></ColumnDefinition>
|
||||
<ColumnDefinition Width="*"></ColumnDefinition>
|
||||
<ColumnDefinition Width="Auto"></ColumnDefinition>
|
||||
<ColumnDefinition Width="*"></ColumnDefinition>
|
||||
<ColumnDefinition Width="*"></ColumnDefinition>
|
||||
<ColumnDefinition Width="0.8*"></ColumnDefinition>
|
||||
<ColumnDefinition Width="0.8*"></ColumnDefinition>
|
||||
<ColumnDefinition Width="Auto"></ColumnDefinition>
|
||||
<ColumnDefinition Width="Auto"></ColumnDefinition>
|
||||
<ColumnDefinition Width="Auto"></ColumnDefinition>
|
||||
@@ -63,7 +63,7 @@
|
||||
|
||||
<Button Grid.Column="8" x:Name="btnFilter" Style="{StaticResource BasePageButtonStyle}" Margin="4,0,0,0" Content="过滤" Width="48" Height="24" Click="btnFilter_Click"/>
|
||||
<Button Grid.Column="9" x:Name="btnSearch" Style="{StaticResource BasePageButtonStyle}" Margin="4,0,4,0" Content="读单" Width="48" Height="24" Click="btnSearch_Click"/>
|
||||
<Image x:Name="imgLoading" Grid.Column="10" Source="{StaticResource imgLoadingPic}" Width="20" Height="20" Margin="0,15,0,15">
|
||||
<Image x:Name="imgLoading" Grid.Column="10" Source="{StaticResource imgLoadingPic}" Width="20" Height="20" Margin="0">
|
||||
<Image.RenderTransform>
|
||||
<RotateTransform Angle="45" CenterX="10" CenterY="10"/>
|
||||
</Image.RenderTransform>
|
||||
@@ -84,32 +84,73 @@
|
||||
</Image.Triggers>
|
||||
</Image>
|
||||
</Grid>
|
||||
|
||||
<Grid x:Name="gridListHeader" Margin="12,0" Grid.Row="1">
|
||||
<TabControl x:Name="tabOrderType" Height="24" FontSize="16" VerticalAlignment="Bottom" SelectionChanged="tabOrderType_SelectionChanged" >
|
||||
<TabItem Header="待采购">
|
||||
<Grid Background="#FF33E5E5"/>
|
||||
</TabItem>
|
||||
<TabItem Header="待发货">
|
||||
<Grid Background="#FFE5E5E5"/>
|
||||
</TabItem>
|
||||
<TabItem Header="待收货">
|
||||
<Border Background="#FFE5E5E5" CornerRadius="5"/>
|
||||
</TabItem>
|
||||
<TabItem Header="退款单" Foreground="#FF6666">
|
||||
<Grid Background="#FFE5E5E5"/>
|
||||
</TabItem>
|
||||
<TabItem Header="全部订单">
|
||||
<Grid Background="#FFE5E5E5"/>
|
||||
</TabItem>
|
||||
|
||||
<Grid x:Name="gridListHeader" Margin="8,2,8,0" Grid.Row="1">
|
||||
<TabControl x:Name="tabOrderType" VerticalAlignment="Stretch" FontSize="16" SelectionChanged="tabOrderType_SelectionChanged" >
|
||||
<TabControl.Resources>
|
||||
<Style TargetType="{x:Type TabControl}">
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="{x:Type TabControl}">
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="*"/>
|
||||
</Grid.RowDefinitions>
|
||||
<Border Grid.Row="1" Background="#f8f8f9" BorderThickness="1,1,1,0" BorderBrush="#e0e0e0" MinHeight="4" CornerRadius="0,4,0,0">
|
||||
<ContentPresenter x:Name="PART_SelectedContentHost" ContentSource="SelectedContent"/>
|
||||
</Border>
|
||||
<Border HorizontalAlignment="Left" Background="#e8e8e9" BorderBrush="#e1e1e1" BorderThickness="1,1,1,0" CornerRadius="4,4,0,0" Margin="0,0,0,0">
|
||||
<TabPanel x:Name="HeaderPanel" Background="Transparent" IsItemsHost="True"/>
|
||||
</Border>
|
||||
</Grid>
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
<Style TargetType="TabItem">
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="TabItem">
|
||||
<Border Name="Border" BorderThickness="1,1,1,0" CornerRadius="4,4,0,0" Margin="-1,-2,-1,0">
|
||||
<ContentPresenter x:Name="ContentSite" VerticalAlignment="Center" HorizontalAlignment="Center" ContentSource="Header" Margin="10,5"/>
|
||||
</Border>
|
||||
<ControlTemplate.Triggers>
|
||||
<Trigger Property="IsSelected" Value="True">
|
||||
<Setter TargetName="Border" Property="Background" Value="#f8f8f9"/>
|
||||
<Setter TargetName="Border" Property="BorderBrush" Value="#e0e0e0"/>
|
||||
<Setter TargetName="Border" Property="Margin" Value="-1,-3,-1,-1"/>
|
||||
<Setter Property="Foreground" Value="{StaticResource pageColorBrush}"/>
|
||||
<Setter Property="Panel.ZIndex" Value="100"/>
|
||||
</Trigger>
|
||||
<Trigger Property="IsSelected" Value="False">
|
||||
<Setter TargetName="Border" Property="Background" Value="Transparent"/>
|
||||
<Setter Property="Foreground" Value="#999999"/>
|
||||
</Trigger>
|
||||
</ControlTemplate.Triggers>
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
</TabControl.Resources>
|
||||
<TabItem Header="待采购" BorderBrush="Transparent" Background="Transparent">
|
||||
<Border BorderBrush="#e0e0e0" BorderThickness="0,0,0,1" Margin="4,0,4,4">
|
||||
<CheckBox Content="未关联拍单" x:Name="chkNoMapProdOnly" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center" Margin="6,8" Checked="chkNoMapProdOnly_Checked" Unchecked="chkNoMapProdOnly_Checked"/>
|
||||
</Border>
|
||||
</TabItem >
|
||||
<TabItem Header="待发货"></TabItem>
|
||||
<TabItem Header="待收货" BorderBrush="Transparent" Background="Transparent"> </TabItem>
|
||||
<TabItem Header="退款单" Foreground="#FF6666" BorderBrush="Transparent" Background="Transparent"> </TabItem>
|
||||
<TabItem Header="全部订单" BorderBrush="Transparent" Background="Transparent"> </TabItem>
|
||||
<!--<TabItem Header="发货异常">
|
||||
<Grid Background="#FFE5E5E5"/>
|
||||
</TabItem>-->
|
||||
</TabControl>
|
||||
</Grid>
|
||||
<Grid x:Name="lstTitle" Grid.Row="2" Margin="12,0,16,0" Background="{StaticResource ListHeadBackColorBrush}">
|
||||
<Grid x:Name="lstTitle" Grid.Row="2" Margin="8,0,8,0" Background="{StaticResource ListHeadBackColorBrush}">
|
||||
<Border BorderThickness="0,0,1,0" BorderBrush="{StaticResource ListHeadBorderColorBrush}">
|
||||
<DataGrid Margin="0,0,18,0" x:Name="dgOrderHeader" Grid.ColumnSpan="100" AutoGenerateColumns="False" CanUserReorderColumns="False"
|
||||
<DataGrid Margin="0,0,30,0" x:Name="dgOrderHeader" Grid.ColumnSpan="100" AutoGenerateColumns="False" CanUserReorderColumns="False"
|
||||
ColumnHeaderHeight="{Binding ElementName=lstTitle, Path=ActualHeight}" BorderThickness="0"
|
||||
ColumnDisplayIndexChanged="dgOrderHeader_ColumnDisplayIndexChanged"
|
||||
LayoutUpdated="dgOrderHeader_LayoutUpdated">
|
||||
@@ -144,7 +185,7 @@
|
||||
</DataGrid>
|
||||
</Border>
|
||||
</Grid>
|
||||
<ListBox BorderThickness="0" ItemsSource="{Binding lstFilterOrder}" Grid.Row="3" HorizontalContentAlignment="Stretch" x:Name="lbxOrder" Margin="0,0,0,4"
|
||||
<ListBox BorderThickness="0" ItemsSource="{Binding lstFilterOrder}" Grid.Row="3" HorizontalContentAlignment="Stretch" x:Name="lbxOrder" Margin="7,0,7,0"
|
||||
ScrollViewer.CanContentScroll="True" VirtualizingPanel.ScrollUnit="Pixel">
|
||||
<!--使用自定义属性模板去除ListBox高亮显示框-->
|
||||
<ListBox.ItemContainerStyle>
|
||||
|
||||
@@ -71,6 +71,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
GlobalConfig.lstOrder.SortDesc(o => o.order_id.ParseToLong());
|
||||
}
|
||||
|
||||
|
||||
public bool hasReadOrder = false;
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
@@ -191,7 +193,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
// 读取关联拍单商品
|
||||
var urlMap = BaseClass.Build29WxObjString("order/wx_get_buy_prod_map");
|
||||
var dataMap = UserLogin.GetSignaturex()
|
||||
+ "&spu_codes=" + string.Join(",", orderItems.Select(oi => oi.out_product_id));
|
||||
+ "&spu_codes=" + string.Join(",", orderItems.Select(oi => oi.out_product_id)) + "," + string.Join(",", orderItems.Select(oi => oi.product_id));
|
||||
dataMap += "&main_user_name=" + BaseClass.MainUserName;
|
||||
var resultMap = GetHtml.PostUtf8(urlMap, dataMap);
|
||||
if (string.IsNullOrEmpty(resultMap) || !resultMap.Contains("\"code\":200"))
|
||||
@@ -226,8 +228,15 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
item.buy_map = byuMapList.FirstOrDefault(b => b.sku_code == item.out_sku_id && b.spu_code == item.out_product_id);
|
||||
if (item.buy_map == null)
|
||||
item.buy_map = byuMapList.FirstOrDefault(b => b.sku_code == item.sku_attr_str && b.spu_code == item.out_product_id);
|
||||
if (item.buy_map == null)
|
||||
item.buy_map = byuMapList.FirstOrDefault(b => b.sku_code == item.out_sku_id && b.spu_code == item.product_id);
|
||||
if (item.buy_map == null)
|
||||
item.buy_map = byuMapList.FirstOrDefault(b => b.sku_code == item.sku_attr_str && b.spu_code == item.product_id);
|
||||
|
||||
item.item_transit_orders.AddRange(transitOrderList.Where(t => t.order_no == item.order_id && t.order_sku_id == item.sku_id));
|
||||
if (item.item_order.order_items.Count > 1)
|
||||
item.item_transit_orders.AddRange(transitOrderList.Where(t => t.order_no == item.order_id && t.order_sku_id == item.sku_id));
|
||||
else
|
||||
item.item_transit_orders.AddRange(transitOrderList.Where(t => t.order_no == item.order_id));
|
||||
}
|
||||
//装载订单售后详情
|
||||
order.refunds = new ObservableCollection<oms_wei_refund_info>();
|
||||
@@ -275,6 +284,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
}
|
||||
}
|
||||
|
||||
hasReadOrder = true;
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
imgLoading.Visibility = Visibility.Hidden;
|
||||
@@ -387,9 +397,12 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
{
|
||||
return true;
|
||||
}
|
||||
if (headerStr.StartsWith("待采购") && !order.IsWaitBuy)
|
||||
if (headerStr.StartsWith("待采购"))
|
||||
{
|
||||
return true;
|
||||
if (!order.IsWaitBuy)
|
||||
return true;
|
||||
if (chkNoMapProdOnly.IsChecked == true && order.order_items.All(oi => oi.buy_map != null))
|
||||
return true;
|
||||
}
|
||||
if (headerStr.StartsWith("待发货") && !order.IsWaitSend)
|
||||
{
|
||||
@@ -508,5 +521,10 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
{
|
||||
FilterOrders();
|
||||
}
|
||||
|
||||
private void chkNoMapProdOnly_Checked(object sender, RoutedEventArgs e)
|
||||
{
|
||||
FilterOrders();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -7,7 +7,7 @@
|
||||
xmlns:uc="clr-namespace:_29WxOrderWpf.UserControls"
|
||||
mc:Ignorable="d"
|
||||
d:DesignHeight="230" d:DesignWidth="1200">
|
||||
<Border Margin="12,12,12,0" HorizontalAlignment="Stretch" VerticalAlignment="Center" BorderThickness="1"
|
||||
<Border Margin="0,12,8,0" HorizontalAlignment="Stretch" VerticalAlignment="Center" BorderThickness="1"
|
||||
BorderBrush="{StaticResource ListRowBorderColorBrush}" CornerRadius="10">
|
||||
<Border.Style>
|
||||
<!-- 鼠标进入或悬停Border时切换颜色（悬停时Border的填充控件必须有填充Border，所在层级不限，仅填充透明Grid则触发器无效） -->
|
||||
|
||||
@@ -18,6 +18,7 @@ using System.Windows.Media.Imaging;
|
||||
using System.Windows.Navigation;
|
||||
using System.Windows.Shapes;
|
||||
using TemuKJD.ToolForms;
|
||||
using static System.Net.WebRequestMethods;
|
||||
|
||||
namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
{
|
||||
@@ -80,19 +81,29 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
|
||||
//所有订单页面
|
||||
buyOrderForm.InitUrl = "https://mobile.yangkeduo.com/orders.html"; //"?type=0&comment_tab=1&combine_orders=1&main_orders=1&refer_page_name=personal&refer_page_id=10001_1782219035613_a9ulipk4k3&refer_page_sn=10001";
|
||||
buyOrderForm.pnlBuy.Visible = false;
|
||||
|
||||
//已有拍单关联的跳的到订单确认界面
|
||||
if (orderItem.buy_map != null)
|
||||
{
|
||||
buyOrderForm.InitUrl = "https://mobile.yangkeduo.com/order_checkout.html?sku_id=" + orderItem.buy_map.map_sku_id +
|
||||
"&group_id=1" + Randomx.GetNumber(11) + "&goods_id=" + orderItem.buy_map.map_goods_id + "&goods_number=" + +orderItem.sku_cnt +
|
||||
"&page_from=101&detail_id=" + Randomx.GetNumber(11) + "&_oak_rcto=YW" +
|
||||
Randomx.GetWordNumber("JvLXvJ8Fx9mUIW34yn103TOlATJGk5PaZshD6pY1bsVrsIjWdxWwjCoNX3IGT".Length) + "_VWkP5_q-1QNqGg" +
|
||||
"&order_extra_type=1&refer_page_element=open_btn&source_channel=0&refer_page_name=goods_detail" +
|
||||
"&refer_page_id=10014_" + BaseClass.DateTimeToTimestampSeconds(DateTime.Now) + Randomx.GetNumber(3) + "_tny5ifswls&refer_page_sn=10014";
|
||||
//buyOrderForm.InitUrl = "https://mobile.yangkeduo.com/order_checkout.html?sku_id=" + orderItem.buy_map.map_sku_id +
|
||||
// "&group_id=1" + Randomx.GetNumber(11) + "&goods_id=" + orderItem.buy_map.map_goods_id + "&goods_number=" + +orderItem.sku_cnt +
|
||||
// "&page_from=101&detail_id=" + Randomx.GetNumber(11) + "&_oak_rcto=YW" +
|
||||
// Randomx.GetWordNumber("JvLXvJ8Fx9mUIW34yn103TOlATJGk5PaZshD6pY1bsVrsIjWdxWwjCoNX3IGT".Length) + "_VWkP5_q-1QNqGg" +
|
||||
// "&order_extra_type=1&refer_page_element=open_btn&source_channel=0&refer_page_name=goods_detail" +
|
||||
// "&refer_page_id=10014_" + BaseClass.DateTimeToTimestampSeconds(DateTime.Now) + Randomx.GetNumber(3) + "_tny5ifswls&refer_page_sn=10014";
|
||||
|
||||
buyOrderForm.InitUrl = "https://mobile.yangkeduo.com/order_checkout.html?sku_id=" + orderItem.buy_map.map_sku_id +
|
||||
"&group_id=1" + Randomx.GetNumber(11) + "&goods_id=" + orderItem.buy_map.map_goods_id + "&goods_number=" + +orderItem.sku_cnt +
|
||||
"&group_id=1" + Randomx.GetNumber(11) + "&goods_id=" + orderItem.buy_map.map_goods_id + "&goods_number=" + orderItem.sku_cnt +
|
||||
"&page_from=101";
|
||||
|
||||
//buyOrderForm.InitUrl = "https://mobile.yangkeduo.com/order_checkout.html?sku_id=" + orderItem.buy_map.map_sku_id +
|
||||
// "&group_id=1" + Randomx.GetNumber(11) + "&goods_id=" + orderItem.buy_map.map_goods_id + "&goods_number=" + orderItem.sku_cnt +
|
||||
// "&page_from=0&refer_page_element=open_btn&source_channel=0&refer_page_name=goods_detail&refer_page_id=10014_" +
|
||||
// BaseClass.DateTimeToTimestampSeconds(DateTime.Now) + Randomx.GetNumber(3) + "_" + Randomx.GetWordNumber(10) + "&refer_page_sn=10014";
|
||||
|
||||
buyOrderForm.pnlBuy.Visible = true;
|
||||
buyOrderForm.pnlMap.Visible = false;
|
||||
}
|
||||
buyOrderForm.ShowDialog();
|
||||
}
|
||||
|
||||
@@ -25,6 +25,8 @@
|
||||
<Image Source="{StaticResource main29WeixinIcon}" Height="50" Width="50" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="4"></Image>
|
||||
<Label x:Name="lblAppName" FontSize="20" Margin="0,0,0,0" Foreground="{StaticResource mainColorLightBrush}" HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center" VerticalContentAlignment="Center" Content="拍单软件" Grid.Column="1"></Label>
|
||||
<Label x:Name="lblVersion" FontSize="12" Margin="0,4,80,0" Foreground="{StaticResource mainColorLightBrush}" HorizontalAlignment="Right"
|
||||
VerticalAlignment="Top" VerticalContentAlignment="Center" Content="版本信息" Opacity="0.7" Grid.Column="4"></Label>
|
||||
</Grid>
|
||||
<Grid x:Name="gridContainer" Grid.Row="1" Background="White" Margin="2,0,2,2">
|
||||
<Grid.ColumnDefinitions>
|
||||
@@ -32,7 +34,7 @@
|
||||
<ColumnDefinition Width="*"></ColumnDefinition>
|
||||
</Grid.ColumnDefinitions>
|
||||
<orderctrls:OrderListCtrl x:Name="orderListCtrl" Grid.Column="1" Visibility="Collapsed"></orderctrls:OrderListCtrl>
|
||||
<buyerctrls:PDDBuyerOrderReadCtrl x:Name="pddBuyerOrderReadCtrl" Grid.Column="1" Visibility="Collapsed" Panel.ZIndex="-1" Width="800" HorizontalAlignment="Right" Margin="0,40,0,0"></buyerctrls:PDDBuyerOrderReadCtrl>
|
||||
<buyerctrls:PDDBuyerOrderReadCtrl x:Name="pddBuyerOrderReadCtrl" Grid.Column="1" Visibility="Collapsed" Panel.ZIndex="-1" Width="1200" HorizontalAlignment="Right" Margin="0,50,0,0"></buyerctrls:PDDBuyerOrderReadCtrl>
|
||||
<buyerctrls:PDDBuyerSelectCtrl x:Name="pddBuyerSelectCtrl" Visibility="Collapsed" Width="280" Grid.Column="1" VerticalAlignment="Top" HorizontalAlignment="Right" Margin="8"/>
|
||||
<Grid x:Name="gridUser" Visibility="Hidden" Grid.ColumnSpan="2" Background="#7F000000">
|
||||
<Border CornerRadius="4" Width="500" Height="600" Background="White">
|
||||
|
||||
@@ -68,6 +68,8 @@ namespace _29WxOrderWpf
|
||||
|
||||
if (loginWindow.IsLogin)
|
||||
{
|
||||
lblVersion.Content = BaseClass.ToolName + " V" + BaseClass.Varsion + " - " + BaseClass.NickName;
|
||||
|
||||
//shopListCtrl.Visibility = Visibility.Visible;
|
||||
orderListCtrl.Visibility = Visibility.Visible;
|
||||
pddBuyerOrderReadCtrl.Visibility = Visibility.Visible;
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<OutputPath>..\..\KJD Cef138\Bin\</OutputPath>
|
||||
<OutputPath>..\Bin\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
<DebugType>full</DebugType>
|
||||
@@ -80,6 +80,31 @@
|
||||
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
||||
<CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<OutputPath>..\bin\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
<DebugType>full</DebugType>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<UseVSHostingProcess>false</UseVSHostingProcess>
|
||||
<LangVersion>7.3</LangVersion>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
||||
<CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
|
||||
<OutputPath>bin\x64\Release\</OutputPath>
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
<Optimize>true</Optimize>
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<UseVSHostingProcess>false</UseVSHostingProcess>
|
||||
<LangVersion>7.3</LangVersion>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
||||
<CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="BouncyCastle.Crypto, Version=1.8.6.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Portable.BouncyCastle.1.8.6\lib\net40\BouncyCastle.Crypto.dll</HintPath>
|
||||
|
||||
+41
-2
@@ -8,6 +8,7 @@ using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
using System.Drawing;
|
||||
using System.IO;
|
||||
using System.Security.Cryptography;
|
||||
using System.Text;
|
||||
using System.Threading;
|
||||
@@ -21,7 +22,7 @@ namespace AllBase
|
||||
/// 版本ID
|
||||
/// </summary>
|
||||
|
||||
public static int VersionCount = 100;
|
||||
public static int VersionCount = 109;
|
||||
|
||||
public static string ServerUrl { get; set; } = "http://1.13.195.131:9000";
|
||||
public static string DebugUrl { get; set; } = "http://localhost:9000";
|
||||
@@ -631,6 +632,17 @@ namespace AllBase
|
||||
return (int)(time - startTime).TotalSeconds;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// C#格式时间转换为Unix时间戳(毫秒)
|
||||
/// </summary>
|
||||
/// <param name="time"></param>
|
||||
/// <returns></returns>
|
||||
public static long DateTimeToTimestampMilliseconds(DateTime time)
|
||||
{
|
||||
System.DateTime startTime = TimeZone.CurrentTimeZone.ToLocalTime(new System.DateTime(1970, 1, 1));
|
||||
return (long)(time - startTime).TotalMilliseconds;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 计算字节长度
|
||||
/// </summary>
|
||||
@@ -756,6 +768,29 @@ namespace AllBase
|
||||
return Convert.ToInt64(BitConverter.ToString(new MD5CryptoServiceProvider().ComputeHash(Encoding.Default.GetBytes(url)), 4, 8).Replace("-", ""), 16);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取文件MD5值
|
||||
/// </summary>
|
||||
/// <param name="FilePath"></param>
|
||||
/// <returns></returns>
|
||||
public static string GetFileMd5(string FilePath)
|
||||
{
|
||||
try
|
||||
{
|
||||
FileStream get_file = new FileStream(FilePath, FileMode.Open, FileAccess.Read, FileShare.Read);
|
||||
System.Security.Cryptography.MD5CryptoServiceProvider get_md5 = new System.Security.Cryptography.MD5CryptoServiceProvider();
|
||||
byte[] hash_byte = get_md5.ComputeHash(get_file);
|
||||
string resule = System.BitConverter.ToString(hash_byte);
|
||||
resule = resule.Replace("-", "");
|
||||
get_file.Close();
|
||||
return resule;
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
return e.ToString();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 签名算法
|
||||
/// </summary>
|
||||
@@ -812,6 +847,11 @@ namespace AllBase
|
||||
return LoginApiUrl + "index.php?obj=" + BaseClass.MainPath + "/" + file;
|
||||
}
|
||||
|
||||
public static string BuildDefaultObjString(string file, bool IsLoginDef = false)
|
||||
{
|
||||
return LoginApiUrl + "/" + file + "?obj=" + "/" + file;
|
||||
}
|
||||
|
||||
public static string Build29WxObjString(string file, bool IsLoginDef = false)
|
||||
{
|
||||
return LoginApiUrl + "/wxxd_" + file + "?obj=" + BaseClass.MainPath + "/wxxd_" + file;
|
||||
@@ -842,7 +882,6 @@ namespace AllBase
|
||||
}
|
||||
return word;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public class KeyValueBase
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
*/
|
||||
|
||||
using System;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Text.RegularExpressions;
|
||||
|
||||
@@ -639,6 +640,144 @@ namespace AllBase
|
||||
return temp;
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 获取字符串值，多个参数，返回第一个匹配的
|
||||
/// </summary>
|
||||
/// <param name="html"></param>
|
||||
/// <param name="reg"></param>
|
||||
/// <returns></returns>
|
||||
public static string GetStringJsonByRegs(ref string html, string defaultValue, params string[] regs)
|
||||
{
|
||||
foreach (var reg in regs)
|
||||
{
|
||||
string temp = GetMatchRegexString(html, @"[""]" + reg + @"[""][\s]*:[\s]*[""]([^""]+?)[""]");
|
||||
if (temp != null)
|
||||
return temp;
|
||||
temp = GetMatchRegexString(html, @"[""]" + reg + @"[""][\s]*:[\s]*[""]([^""]*?)[""]");
|
||||
if (temp != null)
|
||||
return temp;
|
||||
temp = GetMatchRegexString(html, @"[']" + reg + @"['][\s]*:[\s]*[']([^']*?)[']");
|
||||
if (temp != null)
|
||||
return temp;
|
||||
temp = GetMatchRegexString(html, @"['""]" + reg + @"['""][\s]*:[\s]*([\d]+)");
|
||||
if (temp != null)
|
||||
return temp;
|
||||
}
|
||||
return defaultValue;
|
||||
}
|
||||
|
||||
public static string GetOneJsonObjStrJson(ref string html, string reg)
|
||||
{
|
||||
return GetJsonObjStrJson(ref html, reg).FirstOrDefault();
|
||||
}
|
||||
|
||||
public static System.Collections.Generic.List<string> GetJsonObjStrJson(ref string html, string reg, int level = 0)
|
||||
{
|
||||
var startTime = DateTime.Now;
|
||||
|
||||
System.Collections.Generic.List<string> rstLst = new System.Collections.Generic.List<string>();
|
||||
if (html == null)
|
||||
return rstLst;
|
||||
|
||||
string htmlTmp = html.Replace("\\{", "\\这里是正花括号占位符").Replace("\\}", "\\这里是反花括号占位符").Replace("\"" + reg + "\": {", "\"" + reg + "\":{");
|
||||
|
||||
retry:
|
||||
string lvStr = "";
|
||||
if (level == 1)
|
||||
{
|
||||
lvStr += "\"";
|
||||
}
|
||||
var index1 = htmlTmp.IndexOf("\"" + reg + "\":" + lvStr + "{");
|
||||
if (index1 < 0)
|
||||
return rstLst;
|
||||
|
||||
htmlTmp = htmlTmp.Substring(index1 + ("\"" + reg + "\":" + lvStr + "{").Length - 1);
|
||||
// 括号计数
|
||||
int braceNum = 0;
|
||||
//string rst = "{";
|
||||
//while (htmlTmp.Length > 0)
|
||||
for (int i = 0; i < htmlTmp.Length; i++)
|
||||
{
|
||||
//rst += htmlTmp.Substring(0, 1);
|
||||
//if (htmlTmp.StartsWith("{"))
|
||||
// braceNum++;
|
||||
//else if (htmlTmp.StartsWith("}"))
|
||||
// braceNum--;
|
||||
if (htmlTmp[i] == '{')
|
||||
braceNum++;
|
||||
else if (htmlTmp[i] == '}')
|
||||
braceNum--;
|
||||
//htmlTmp = htmlTmp.Substring(1);
|
||||
if (braceNum == 0)
|
||||
{
|
||||
var endTime1 = DateTime.Now;
|
||||
if ((endTime1 - startTime).TotalSeconds > 1)
|
||||
{
|
||||
}
|
||||
rstLst.Add(htmlTmp.Substring(0, i + 1).Replace("\\这里是正花括号占位符", "\\{").Replace("\\这里是反花括号占位符", "\\}"));
|
||||
htmlTmp = htmlTmp.Substring(i + 1);
|
||||
//rstLst.Add(rst.Replace("\\这里是正花括号占位符", "\\{").Replace("\\这里是反花括号占位符", "\\}"));
|
||||
break;
|
||||
}
|
||||
|
||||
// 循环完了还没结果返回空列表
|
||||
if (i == htmlTmp.Length - 1)
|
||||
return rstLst;
|
||||
}
|
||||
if (htmlTmp.Length > 0)
|
||||
goto retry;
|
||||
|
||||
var endTime2 = DateTime.Now;
|
||||
if ((endTime2 - startTime).TotalSeconds > 1)
|
||||
{
|
||||
}
|
||||
return rstLst;
|
||||
}
|
||||
|
||||
public static System.Collections.Generic.List<string> GetJsonArrStrJson(ref string html, string reg)
|
||||
{
|
||||
var startTime = DateTime.Now;
|
||||
System.Collections.Generic.List<string> rstLst = new System.Collections.Generic.List<string>();
|
||||
if (html == null)
|
||||
return rstLst;
|
||||
|
||||
string htmlTmp = html.Replace("\\[", "\\这里是正方括号占位符").Replace("\\]", "\\这里是反方括号占位符").Replace("\"" + reg + "\": [", "\"" + reg + "\":[");
|
||||
|
||||
retry:
|
||||
var index1 = htmlTmp.IndexOf("\"" + reg + "\":[");
|
||||
if (index1 < 0)
|
||||
return rstLst;
|
||||
|
||||
htmlTmp = htmlTmp.Substring(index1 + ("\"" + reg + "\":[").Length);
|
||||
// 括号计数
|
||||
int braceNum = 1;
|
||||
string rst = "[";
|
||||
while (htmlTmp.Length > 0)
|
||||
{
|
||||
rst += htmlTmp.Substring(0, 1);
|
||||
if (htmlTmp.StartsWith("["))
|
||||
braceNum++;
|
||||
else if (htmlTmp.StartsWith("]"))
|
||||
braceNum--;
|
||||
htmlTmp = htmlTmp.Substring(1);
|
||||
if (braceNum == 0)
|
||||
{
|
||||
rstLst.Add(rst.Replace("\\这里是正方括号占位符", "\\[").Replace("\\这里是反方括号占位符", "\\]"));
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (htmlTmp.Length > 0)
|
||||
goto retry;
|
||||
|
||||
var endTime = DateTime.Now;
|
||||
if ((endTime - startTime).TotalSeconds > 1)
|
||||
{
|
||||
}
|
||||
return rstLst;
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 获取值
|
||||
/// </summary>
|
||||
|
||||
@@ -22,6 +22,26 @@ namespace AllBase.Model.Local
|
||||
public string buyer_account { get; set; }
|
||||
public int? out_amount { get; set; }
|
||||
public string purchaser_note { get; set; }
|
||||
public string express_1_company { get; set; }
|
||||
public string express_1_waybill { get; set; }
|
||||
public string express_2_company { get; set; }
|
||||
public string express_2_waybill { get; set; }
|
||||
public string refund_status { get; set; }
|
||||
public DateTime pickup_time { get; set; }
|
||||
/// <summary>
|
||||
/// 中转仓状态：0 未使用，1 已创建，2 创建失败
|
||||
/// </summary>
|
||||
public int? transfer_warehouse_status { get; set; }
|
||||
public string raw_message { get; set; }
|
||||
public DateTime created_time { get; set; }
|
||||
public DateTime updated_time { get; set; }
|
||||
public string platform { get; set; }
|
||||
public string order_platform_code { get; set; }
|
||||
public string order_code { get; set; }
|
||||
/// <summary>
|
||||
/// 1正常取号 2提前取号
|
||||
/// </summary>
|
||||
public int? pre_allocated_order_no { get; set; }
|
||||
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,8 @@
|
||||
using System;
|
||||
using AllBase.Model.Local;
|
||||
using AllBase.Model.MvvmBaseClasses;
|
||||
using NaiBa.Util.Extension;
|
||||
using NaiBa.Util.Model;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
@@ -6,19 +10,13 @@ using System.Threading.Tasks;
|
||||
|
||||
namespace AllBase.Model.Result
|
||||
{
|
||||
public class PddBuyerOrderLiteInfo
|
||||
public class PddBuyerOrderLiteInfo : PropertyNotifyObject
|
||||
{
|
||||
//平台快递编码 微信快递名称 PDD
|
||||
//EMS EMS 邮政快递包裹
|
||||
//EMS EMS 邮政电商标快
|
||||
//JTSD 极兔速递 极兔速递
|
||||
//STO 申通快递 申通快递
|
||||
//YD 韵达速递 韵达快递
|
||||
//YTO 圆通速递 圆通快递
|
||||
//ZTO 中通快递 中通快递
|
||||
//BTWL 百世快运
|
||||
//HTKY 百世快递
|
||||
|
||||
/// <summary>
|
||||
/// 获取中转仓物流公司编码
|
||||
/// </summary>
|
||||
/// <param name="expressCompanyName"></param>
|
||||
/// <returns></returns>
|
||||
public static string GetPddToTransitWarehouseExpressCompanyCode(string expressCompanyName)
|
||||
{
|
||||
if (expressCompanyName == null || expressCompanyName == "") return "";
|
||||
@@ -37,14 +35,24 @@ namespace AllBase.Model.Result
|
||||
if (expressCompanyName.Contains("京东大件物流")) return "JDKD";
|
||||
if (expressCompanyName.Contains("极兔速递")) return "JTSD";
|
||||
if (expressCompanyName.Contains("极兔快递")) return "JTSD";
|
||||
return "";
|
||||
|
||||
|
||||
//SF 顺丰 //EMS 邮政快递 //YTO 圆通 //ZTO 中通 //HTKY 百世 //STO 申通 //YUNDA 韵达 //JDKD 京东快递 //JTSD 极兔
|
||||
return "OTHER";
|
||||
//SF 顺丰 //EMS 邮政快递 //YTO 圆通 //ZTO 中通 //HTKY 百世 //STO 申通 //YUNDA 韵达 //JDKD 京东快递 //JTSD 极兔
|
||||
|
||||
|
||||
}
|
||||
|
||||
// 微信快递编码
|
||||
//平台快递编码 微信快递名称 PDD
|
||||
//EMS EMS 邮政快递包裹
|
||||
//EMS EMS 邮政电商标快
|
||||
//JTSD 极兔速递 极兔速递
|
||||
//STO 申通快递 申通快递
|
||||
//YD 韵达速递 韵达快递
|
||||
//YTO 圆通速递 圆通快递
|
||||
//ZTO 中通快递 中通快递
|
||||
//BTWL 百世快运
|
||||
//HTKY 百世快递
|
||||
|
||||
public static string GetPddToWxExpressCompanyCode(string expressCompanyName)
|
||||
{
|
||||
if (expressCompanyName == null || expressCompanyName == "") return "";
|
||||
@@ -86,13 +94,137 @@ namespace AllBase.Model.Result
|
||||
if (expressCompanyName.Contains("其他快递")) return "OTHER";
|
||||
return "";
|
||||
}
|
||||
|
||||
public string ShopOrderIdStr
|
||||
{
|
||||
get { return this.GetValue(x => x.ShopOrderIdStr); }
|
||||
set { this.SetValue(x => x.ShopOrderIdStr, value); }
|
||||
}
|
||||
public string ShopOrderSkuIdStr
|
||||
{
|
||||
get { return this.GetValue(x => x.ShopOrderSkuIdStr); }
|
||||
set { this.SetValue(x => x.ShopOrderSkuIdStr, value); }
|
||||
}
|
||||
public string ShopOrderSkuNameStr
|
||||
{
|
||||
get { return this.GetValue(x => x.ShopOrderSkuNameStr); }
|
||||
set { this.SetValue(x => x.ShopOrderSkuNameStr, value); }
|
||||
}
|
||||
public string TransitWarehouseIdStr
|
||||
{
|
||||
get { return this.GetValue(x => x.TransitWarehouseIdStr); }
|
||||
set { this.SetValue(x => x.TransitWarehouseIdStr, value); }
|
||||
}
|
||||
// 拍单物流
|
||||
public string Express1CompanyStr
|
||||
{
|
||||
get { return this.GetValue(x => x.Express1CompanyStr); }
|
||||
set { this.SetValue(x => x.Express1CompanyStr, value); }
|
||||
}
|
||||
public string Express1WaybillStr
|
||||
{
|
||||
get { return this.GetValue(x => x.Express1WaybillStr); }
|
||||
set { this.SetValue(x => x.Express1WaybillStr, value); }
|
||||
}
|
||||
// 中转仓物流
|
||||
public string Express2CompanyStr
|
||||
{
|
||||
get { return this.GetValue(x => x.Express2CompanyStr); }
|
||||
set { this.SetValue(x => x.Express2CompanyStr, value); }
|
||||
}
|
||||
public string Express2WaybillStr
|
||||
{
|
||||
get { return this.GetValue(x => x.Express2WaybillStr); }
|
||||
set { this.SetValue(x => x.Express2WaybillStr, value); }
|
||||
}
|
||||
/// <summary>
|
||||
/// 中转仓状态：0 未使用，1 已创建，2 创建失败 ?3 已提交创建
|
||||
/// </summary>
|
||||
public string TransferWareHouseStatus
|
||||
{
|
||||
get { return this.GetValue(x => x.TransferWareHouseStatus); }
|
||||
set { this.SetValue(x => x.TransferWareHouseStatus, value); }
|
||||
}
|
||||
/// <summary>
|
||||
/// 1正常取号 2提前取号
|
||||
/// </summary>
|
||||
public string PreAllocatedOrderNoStr
|
||||
{
|
||||
get { return this.GetValue(x => x.PreAllocatedOrderNoStr); }
|
||||
set { this.SetValue(x => x.PreAllocatedOrderNoStr, value); }
|
||||
}
|
||||
public string TransitOrderStatus
|
||||
{
|
||||
get
|
||||
{
|
||||
if ((TransferWareHouseStatus == "1" || TransferWareHouseStatus == "3") &&
|
||||
//Express1CompanyStr == this.outExpressCompanyCode && !this.outExpressCompanyCode.IsNullOrEmpty() &&
|
||||
Express1WaybillStr == this.tracking_number && !this.tracking_number.IsNullOrEmpty())
|
||||
{
|
||||
return "已取号";
|
||||
}
|
||||
if (string.IsNullOrEmpty(Express1CompanyStr) && string.IsNullOrEmpty(Express1WaybillStr) &&
|
||||
!string.IsNullOrEmpty(Express2CompanyStr) && !string.IsNullOrEmpty(Express2WaybillStr))
|
||||
{
|
||||
return "提前取号";
|
||||
}
|
||||
if (/*!string.IsNullOrEmpty(Express1CompanyStr) && Express1CompanyStr != this.outExpressCompanyCode && !this.outExpressCompanyCode.IsNullOrEmpty() &&*/
|
||||
!string.IsNullOrEmpty(Express1WaybillStr) && Express1WaybillStr != this.tracking_number && !this.tracking_number.IsNullOrEmpty())
|
||||
{
|
||||
return "提前取号";
|
||||
}
|
||||
if ((TransferWareHouseStatus == "1" || TransferWareHouseStatus == "3") && (string.IsNullOrEmpty(Express1CompanyStr) || string.IsNullOrEmpty(Express1WaybillStr)))
|
||||
{
|
||||
return "提前取号";
|
||||
}
|
||||
if (TransferWareHouseStatus == "0" && !string.IsNullOrEmpty(Express1CompanyStr) && Express1CompanyStr == outExpressCompanyCode &&
|
||||
!string.IsNullOrEmpty(Express1WaybillStr) && Express1WaybillStr == tracking_number)
|
||||
{
|
||||
return "已提交";
|
||||
}
|
||||
if (TransferWareHouseStatus == "2" && !string.IsNullOrEmpty(Express1CompanyStr) && Express1CompanyStr == outExpressCompanyCode &&
|
||||
!string.IsNullOrEmpty(Express1WaybillStr) && Express1WaybillStr == tracking_number)
|
||||
{
|
||||
return "取号失败";
|
||||
}
|
||||
return "";
|
||||
}
|
||||
set { }
|
||||
}
|
||||
|
||||
|
||||
public string OrderTimeStr
|
||||
{
|
||||
get { return BaseClass.StampToDateTime(order_time.ParseToInt()).ToString("yy-MM-dd HH:mm:ss"); }
|
||||
set { }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 商品信息
|
||||
/// </summary>
|
||||
public string ProdInfoStr
|
||||
{
|
||||
get { return order_Goods == null ? "" : string.Join("\r\n", order_Goods.Select(g => g.goods_name + " x" + g.goods_number)); }
|
||||
set { }
|
||||
}
|
||||
|
||||
public decimal AmoutValue
|
||||
{
|
||||
get { return order_amount.ParseToInt() * 0.01m; }
|
||||
set { }
|
||||
}
|
||||
|
||||
|
||||
public string outExpressCompanyMsg { get; set; } // 物流公司名称，可以尝试直接从列表中匹配
|
||||
/// <summary>
|
||||
/// 中转仓物流公司编码
|
||||
/// </summary>
|
||||
public string outExpressCompanyCode
|
||||
{
|
||||
get
|
||||
{
|
||||
return GetPddToWxExpressCompanyCode(outExpressCompanyName);
|
||||
//return GetPddToWxExpressCompanyCode(outExpressCompanyName);
|
||||
return GetPddToTransitWarehouseExpressCompanyCode(outExpressCompanyName);
|
||||
}
|
||||
}
|
||||
public string outExpressCompanyName
|
||||
@@ -120,14 +252,20 @@ namespace AllBase.Model.Result
|
||||
return "物流名称获取失败";
|
||||
}
|
||||
}
|
||||
public string sendStatus { get; set; } = "";
|
||||
public string sendStatus
|
||||
{
|
||||
get { return this.GetValue(x => x.sendStatus); }
|
||||
set { this.SetValue(x => x.sendStatus, value); }
|
||||
}
|
||||
/// <summary>
|
||||
/// 微信退款单状态
|
||||
/// </summary>
|
||||
public string wxRefundStatus { get; set; } = "";
|
||||
public string buyerId { get; set; } // 买手Id
|
||||
public string buyerName { get; set; } // 买手名称
|
||||
|
||||
/// <summary>
|
||||
/// 买手订单号
|
||||
/// </summary>
|
||||
public string order_sn { get; set; } // "260409-440915730042665",
|
||||
public string parent_order_sn { get; set; } // "",
|
||||
public int? order_amount { get; set; } // 2090,
|
||||
@@ -136,6 +274,9 @@ namespace AllBase.Model.Result
|
||||
public int? service_amount { get; set; } // 0,
|
||||
public string display_amount { get; set; } // 2090 实付款
|
||||
public long? order_time { get; set; } // 1775731637
|
||||
/// <summary>
|
||||
/// 物流单号
|
||||
/// </summary>
|
||||
public string tracking_number { get; set; } // "JT5474027114111", 物流单号
|
||||
public string order_link_url { get; set; } // "order.html?order_sn=260408-386657164922665&page_from=1",
|
||||
|
||||
|
||||
@@ -60,6 +60,25 @@
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<OutputPath>..\bin\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<DebugType>full</DebugType>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<LangVersion>7.3</LangVersion>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
|
||||
<OutputPath>bin\x64\Release\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<Optimize>true</Optimize>
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<LangVersion>7.3</LangVersion>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="CefSharp, Version=138.0.340.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CefSharp.Common.138.0.340\lib\net462\CefSharp.dll</HintPath>
|
||||
|
||||
+69
-6
@@ -1,17 +1,18 @@
|
||||
using System;
|
||||
using AllBase;
|
||||
using NaiBa.Util.Extension;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
using System.Drawing;
|
||||
using System.Drawing.Text;
|
||||
using System.IO;
|
||||
using System.Management;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Text;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Forms;
|
||||
using System.Xml;
|
||||
using AllBase;
|
||||
|
||||
using System.Drawing.Text;
|
||||
using System.Drawing;
|
||||
using System.Runtime.InteropServices;
|
||||
using Work.Api;
|
||||
|
||||
namespace Work
|
||||
@@ -34,6 +35,7 @@ namespace Work
|
||||
BaseClass.IsMainCompany = true;
|
||||
}
|
||||
BaseClass.IsBuyer = FileBase.Exists(Application.StartupPath + "\\buyer.ini");
|
||||
Task.Run(() => { CheckUpdate(); });
|
||||
//new Thread(Update).Start();//--------检查更新
|
||||
//new Thread(GetAuthConfig).Start();
|
||||
//new Thread(new JumpUpProductNew().Ini).Start();
|
||||
@@ -182,6 +184,67 @@ namespace Work
|
||||
Process.GetCurrentProcess().Kill();
|
||||
}
|
||||
|
||||
public static void CheckUpdate()
|
||||
{
|
||||
try
|
||||
{
|
||||
// while (true)
|
||||
{
|
||||
string updatefilepath = System.Environment.CurrentDirectory + "\\Update.exe";
|
||||
var url = BaseClass.BuildDefaultObjString("update/get_wx_finder_order_update");
|
||||
//url = BaseClass.BuildDefaultObjString("update/get_update");
|
||||
var data = UserLogin.GetSignaturex();
|
||||
var html = GetHtml.PostUtf8(url, data);
|
||||
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||
return;
|
||||
|
||||
var updateExeChk = BaseRegex.GetStringJson(ref html, "exe_check").ParseToString();
|
||||
var updateExeAddress = BaseRegex.GetStringJson(ref html, "exe_address");
|
||||
var newVersion = BaseRegex.GetIntJson(ref html, "next_version").ParseToInt();
|
||||
var updateFileAddress = BaseRegex.GetStringJson(ref html, "file_address");
|
||||
//updateFileAddress = updateFileAddress.Replace(newVersion.ParseToString(), BaseClass.MainPath + newVersion);
|
||||
|
||||
|
||||
if (File.Exists(updatefilepath))
|
||||
{
|
||||
string fc = BaseClass.GetFileMd5(updatefilepath);
|
||||
if (fc != updateExeChk)
|
||||
{
|
||||
NaiBa.Util.Helper.HttpHelper.DownloadFile(updateExeAddress, updatefilepath);
|
||||
}
|
||||
}
|
||||
else // 如果自动更新exe文件不存在，则强制更新exe文件
|
||||
NaiBa.Util.Helper.HttpHelper.DownloadFile(updateExeAddress, updatefilepath);
|
||||
|
||||
if (newVersion > BaseClass.VersionCount)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (File.Exists(updatefilepath))
|
||||
{
|
||||
string fileName = Path.GetFileName(Process.GetCurrentProcess().MainModule.FileName);
|
||||
|
||||
string arguments = "-" + fileName + "\r\n" + BaseClass.VersionCount + "\r\n" + newVersion + "\r\n" + updateFileAddress;
|
||||
|
||||
//File.WriteAllText(System.Environment.CurrentDirectory + "\\UpdateConfig.ini", arguments);
|
||||
|
||||
Process.Start(updatefilepath, arguments);
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
//BaseMsgForm.ShowError(ex.Message);
|
||||
}
|
||||
}
|
||||
//Thread.Sleep(1000 * 60 * 60);
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
//BaseMsgForm.ShowError(ex.Message);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取文件MD5值
|
||||
/// </summary>
|
||||
|
||||
@@ -13,6 +13,7 @@ using NaiBa.CefHelper;
|
||||
using NaiBa.CefHelper.Handler;
|
||||
using NaiBa.Util.Enum;
|
||||
using NaiBa.Util.Extension;
|
||||
using NaiBa.Util.Model;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
@@ -91,13 +92,14 @@ namespace TemuKJD.ToolForms
|
||||
if (transitWarehouse != null)
|
||||
{
|
||||
cmbTransitWarehouse.Text = transitWarehouse?.TransName + " " + transitWarehouse?.TransDetailAddress;
|
||||
txtBuyTransitWarehouse.Text = transitWarehouse?.TransDetailAddress;
|
||||
}
|
||||
}
|
||||
|
||||
pictureBox1.ImageLocation = orderItem.thumb_img;
|
||||
this.txtShopSkuId.Text = orderItem.sku_id;
|
||||
this.txtShopGoodsId.Text = orderItem.product_id;
|
||||
this.txtUpSpuCode.Text = orderItem.out_product_id;
|
||||
this.txtUpSpuCode.Text = orderItem.out_product_id.IsNullOrEmpty() ? orderItem.product_id : orderItem.out_product_id;
|
||||
this.txtUpSkuCode.Text = orderItem.out_sku_id.IsNullOrEmpty() ? orderItem.sku_attr_str : orderItem.out_sku_id;
|
||||
this.txtShopGoodsName.Text = orderItem.title;
|
||||
this.txtShopSpecName.Text = orderItem.sku_attr_str;
|
||||
@@ -107,15 +109,6 @@ namespace TemuKJD.ToolForms
|
||||
|
||||
foreach (var warehouse in TransitWarehouseData.TransitWarehouseList)
|
||||
{
|
||||
//var rb = new RadioButton
|
||||
//{
|
||||
// Text = warehouse.TransName + warehouse.TransDetailAddress,
|
||||
// Tag = warehouse,
|
||||
// AutoSize = true,
|
||||
//};
|
||||
//rb.CheckedChanged += Rb_CheckedChanged;
|
||||
//this.flowLayoutPanel1.Controls.Add(rb);
|
||||
|
||||
this.cmbTransitWarehouse.Items.Add(warehouse.TransName + " " + warehouse.TransDetailAddress);
|
||||
}
|
||||
|
||||
@@ -256,6 +249,8 @@ namespace TemuKJD.ToolForms
|
||||
jObj["name"] = WaybillHelper.LastName[Randomx.GetId(WaybillHelper.LastName.Count)] + (Randomx.GetId(2) == 1 ? "先生" : "女士");
|
||||
postData = JsonHelper.SerializeObject(jObj);
|
||||
request.PostData.Elements[0].Bytes = System.Text.Encoding.UTF8.GetBytes(postData);
|
||||
|
||||
HasChangeAddress = true;
|
||||
}
|
||||
|
||||
return false;
|
||||
@@ -310,21 +305,34 @@ namespace TemuKJD.ToolForms
|
||||
var oneGoodsPrice = BaseRegex.GetIntJson(ref data, "goodsPrice");
|
||||
var buyCnt = BaseRegex.GetIntJson(ref data, "goodsNumber");
|
||||
var buyPrice = BaseRegex.GetIntJson(ref data, "payAmount");
|
||||
var orderSn = BaseRegex.GetIntJson(ref data, "orderSn");
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
// 自动填写关联信息界面
|
||||
this.txtMapGoodsId.Text = goodsId.ParseToString();
|
||||
this.txtMapSkuId.Text = skuId.ParseToString();
|
||||
this.txtMapGoodsName.Text = goodsName;
|
||||
this.txtMapSkuName.Text = spec;
|
||||
this.txtSendProvince.Text = "";
|
||||
this.cmbTransitWarehouse.Text = "";
|
||||
|
||||
// 自动填写拍单信息界面
|
||||
this.txtBuyGoodsId.Text = goodsId.ParseToString();
|
||||
this.txtBuySkuId.Text = skuId.ParseToString();
|
||||
this.txtBuyGoodsName.Text = goodsName;
|
||||
this.txtBuySkuName.Text = spec;
|
||||
this.txtBuyCnt.Text = buyCnt.ParseToString();
|
||||
this.txtBuyPrice.Text = (buyPrice * 0.01m).ParseToString();
|
||||
}));
|
||||
});
|
||||
}
|
||||
|
||||
// 待提交订单确认界面
|
||||
//"https://mobile.yangkeduo.com/proxy/api/api/morgan/confirm/render?pdduid=8161628055192"
|
||||
//https://mobile.yangkeduo.com/order_checkout.html?sku_id=
|
||||
//https://mobile.yangkeduo.com/order_checkout.html?sku_id=1917755178967&group_id=168599782729&goods_id=966934985983&goods_number=1&page_from=0&detail_id=27322663212&_oak_rcto=YWJun7Qe7qhenWIlxgKO3uhsoi0WMIkr6Sb3iSrTsNPiwo_AHzvFVWwZ36KSfBTSAX-QF_CD92G9rA&order_extra_type=1&refer_page_element=open_btn&source_channel=0&refer_page_name=goods_detail&refer_page_id=10014_1782220402115_blxn1wofgo&refer_page_sn=10014
|
||||
//https://mobile.yangkeduo.com/order_checkout.html?sku_id=1914416497946&group_id=168211384489&goods_id=964481496910&goods_number=2&page_from=23&detail_id=27475863056&_oc_refer_ad=0&_oak_rcto=YWJQMioxuzYiHEIW34yn103Toi0WMIkr6SaYUDjBkmkvOAtI8c-ZcKMw36KSfBTSAX-QF_CD92G9rA&order_extra_type=1&refer_page_element=open_btn&source_channel=0&_x_query=%E4%B8%AD%E5%9B%BD%E5%8F%A4%E4%BB%A3%E7%AE%97%E6%9C%AF%E6%B3%95%E8%80%81%E7%89%88%E6%9C%AC%E6%B4%AA%E4%B8%95%E8%B0%9F%E8%91%97%E5%91%BD%E7%90%86%E5%AD%A6%E7%A0%94%E7%A9%B6%E5%85%A5%E9%97%A8%E9%A3%8E%E6%B0%B4%E5%AD%A6%E4%B9%A6%E7%B1%8D%E5%85%A5%E9%97%A8%E5%B1%85%E5%AE%B6&refer_page_name=goods_detail&refer_page_id=10014_1782275100226_pojdmxgpty&refer_page_sn=10014
|
||||
if (url.StartsWith("https://mobile.yangkeduo.com/proxy/api/api/morgan/confirm/render?pdduid="))
|
||||
if (responseData.Contains("\"goods_id\"") && (url.StartsWith("https://mobile.yangkeduo.com/proxy/api/api/morgan/confirm/render?pdduid=") || url.Contains("sku_id")))
|
||||
{
|
||||
Task.Run(() =>
|
||||
{
|
||||
@@ -335,15 +343,20 @@ namespace TemuKJD.ToolForms
|
||||
var goodsId = BaseRegex.GetLongJson(ref data, "goods_id");
|
||||
var skuId = BaseRegex.GetLongJson(ref data, "sku_id");
|
||||
var goodsName = BaseRegex.GetStringJson(ref data, "goods_name");
|
||||
var specifications = BaseRegex.GetMatchRegexString(ref data, @"""specifications"":\[([^']+?)\]");
|
||||
var spec = "";
|
||||
var specMatch = BaseRegex.GetMatchRegex(ref data, @"""spec_value"":""([^']+?)""");
|
||||
foreach (var match in specMatch)
|
||||
if (string.IsNullOrEmpty(goodsName))
|
||||
goodsName = BaseRegex.GetStringJson(ref data, "goodsName");
|
||||
var specifications = BaseRegex.GetMatchRegexString(ref data, @"""specifications"":\[([^']*?)\]");
|
||||
var spec = string.IsNullOrEmpty(specifications) ? "" : specifications;
|
||||
if (spec.IsNullOrEmpty())
|
||||
{
|
||||
var matchStr = match.ParseToString();
|
||||
spec += ("," + BaseRegex.GetStringJson(ref matchStr, "spec_value"));
|
||||
var specMatch = BaseRegex.GetMatchRegex(ref data, @"""spec_value"":""([^']+?)""");
|
||||
foreach (var match in specMatch)
|
||||
{
|
||||
var matchStr = match.ParseToString();
|
||||
spec += ("," + BaseRegex.GetStringJson(ref matchStr, "spec_value"));
|
||||
}
|
||||
spec = spec.Trim(',');
|
||||
}
|
||||
spec = spec.Trim(',');
|
||||
var oneGoodsPrice = BaseRegex.GetIntJson(ref data, "goodsPrice");
|
||||
var buyCnt = BaseRegex.GetIntJson(ref data, "goods_number");
|
||||
var buyPrice = BaseRegex.GetIntJson(ref data, "pay_price");
|
||||
@@ -360,13 +373,14 @@ namespace TemuKJD.ToolForms
|
||||
// 自动修改收货地址为中转仓
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
if (cmbTransitWarehouse.Text.Trim().Length > 0 && IsChangeAddress == false && HasChangeAddress == false)
|
||||
var transit = TransitWarehouseData.TransitWarehouseList.FirstOrDefault(t => t.TransDetailAddress == txtBuyTransitWarehouse.Text.Trim());
|
||||
if (transit != null && IsChangeAddress == false && HasChangeAddress == false)
|
||||
{
|
||||
Task.Run(() =>
|
||||
{
|
||||
IsChangeAddress = true;
|
||||
Thread.Sleep(1000);
|
||||
ChangeAddress();
|
||||
ChangeAddress(transit);
|
||||
IsChangeAddress = false;
|
||||
|
||||
});
|
||||
@@ -392,28 +406,68 @@ namespace TemuKJD.ToolForms
|
||||
|
||||
bool IsChangeAddress = false;
|
||||
bool HasChangeAddress = false;
|
||||
public string ChangeAddress()
|
||||
public string ChangeAddress(TransitWarehouseParam transit)
|
||||
{
|
||||
//var host = cefWebBrowser.GetBrowser().GetHost();
|
||||
//var client = cefWebBrowser.GetDevToolsClient();
|
||||
//if (host == null || client == null)
|
||||
//{
|
||||
// return "页面未加载";
|
||||
//}
|
||||
Thread.Sleep(1000);
|
||||
var host = cefWebBrowser.GetBrowser().GetHost();
|
||||
var client = cefWebBrowser.GetDevToolsClient();
|
||||
if (host == null || client == null)
|
||||
{
|
||||
return "页面未加载";
|
||||
}
|
||||
|
||||
//// 点击图片搜索图标
|
||||
//var jsStr1 = @"(function() { var spans = document.getElementsByTagName('span');
|
||||
// for (i=0; i< spans.length;i++){
|
||||
// var span = spans[i];
|
||||
// if (span.outerHTML.indexOf('el_image_search_button') >= 0) {
|
||||
// span.click();
|
||||
// break;
|
||||
// }
|
||||
// }
|
||||
// })();";
|
||||
//var ts1 = client.Runtime.EvaluateAsync(jsStr1, null, true, null, null, true, null, true);
|
||||
//ts1.Wait(5000);
|
||||
//Thread.Sleep(Randomx.GetId(1500, 3000));
|
||||
// 点击图片搜索图标
|
||||
var jsStr1 = @"(function() { var element = document.getElementsByClassName('oc-address-info')[0];
|
||||
//for (i=0; i< elements.length;i++){
|
||||
// var element = elements[i];
|
||||
// if (element.outerHTML.indexOf('当前收货地址为') >= 0) {
|
||||
element.click();
|
||||
// break;
|
||||
// }
|
||||
//}
|
||||
})();";
|
||||
var ts1 = client.Runtime.EvaluateAsync(jsStr1, null, true, null, null, true, null, true);
|
||||
ts1.Wait(5000);
|
||||
Thread.Sleep(Randomx.GetId(1500, 2500));
|
||||
|
||||
jsStr1 = @"(function() { var elements = document.getElementsByTagName('span');
|
||||
for (i=0; i< elements.length;i++){
|
||||
var element = elements[i];
|
||||
if (element.innerHTML.indexOf('修改') == 0) {
|
||||
element.click();
|
||||
break;
|
||||
}
|
||||
}
|
||||
})();";
|
||||
ts1 = client.Runtime.EvaluateAsync(jsStr1, null, true, null, null, true, null, true);
|
||||
ts1.Wait(5000);
|
||||
Thread.Sleep(Randomx.GetId(1500, 2500));
|
||||
|
||||
jsStr1 = @"(function() { var elements = document.getElementsByTagName('span');
|
||||
for (i=0; i< elements.length;i++){
|
||||
var element = elements[i];
|
||||
if (element.innerHTML.indexOf('保存') == 0) {
|
||||
element.click();
|
||||
break;
|
||||
}
|
||||
}
|
||||
})();";
|
||||
ts1 = client.Runtime.EvaluateAsync(jsStr1, null, true, null, null, true, null, true);
|
||||
ts1.Wait(5000);
|
||||
Thread.Sleep(Randomx.GetId(1500, 2500));
|
||||
|
||||
jsStr1 = @"(function() { var elements = document.getElementsByTagName('div');
|
||||
for (i = elements.length - 1; i >= 0; i--){
|
||||
var element = elements[i];
|
||||
if (element.innerHTML.indexOf('" + txtBuyTransitWarehouse.Text.Trim() + @"') >= 0) {
|
||||
element.click();
|
||||
break;
|
||||
}
|
||||
}
|
||||
})();";
|
||||
ts1 = client.Runtime.EvaluateAsync(jsStr1, null, true, null, null, true, null, true);
|
||||
ts1.Wait(5000);
|
||||
Thread.Sleep(Randomx.GetId(1500, 2500));
|
||||
|
||||
return "";
|
||||
}
|
||||
@@ -515,7 +569,7 @@ namespace TemuKJD.ToolForms
|
||||
var url = BaseClass.Build29WxObjString("order/wx_add_mdy_buy_prod_map");
|
||||
var data = UserLogin.GetSignaturex()
|
||||
+ "&spu_code=" + txtUpSpuCode.Text.Trim()
|
||||
+ "&sku_code=" + txtUpSkuCode.Text.Trim()
|
||||
+ "&sku_code=" + GetHtml.UrlEncodeUtf8(txtUpSkuCode.Text.Trim())
|
||||
+ "&main_user_name=" + BaseClass.MainUserName
|
||||
+ "&map_goods_name=" + txtMapGoodsName.Text.Trim()
|
||||
+ "&map_spec_name=" + txtMapSkuName.Text.Trim()
|
||||
@@ -535,7 +589,7 @@ namespace TemuKJD.ToolForms
|
||||
var urlMap = BaseClass.Build29WxObjString("order/wx_get_buy_prod_map");
|
||||
var dataMap = UserLogin.GetSignaturex()
|
||||
+ "&spu_codes=" + txtUpSpuCode.Text.Trim();
|
||||
dataMap += "&sku_codes=" + txtUpSkuCode.Text.Trim();
|
||||
//dataMap += "&sku_codes=" + txtUpSkuCode.Text.Trim();
|
||||
dataMap += "&main_user_name=" + BaseClass.MainUserName;
|
||||
var resultMap = GetHtml.PostUtf8(urlMap, dataMap);
|
||||
if (string.IsNullOrEmpty(resultMap) || !resultMap.Contains("\"code\":200"))
|
||||
@@ -547,7 +601,7 @@ namespace TemuKJD.ToolForms
|
||||
{
|
||||
List<WXBuyMapInfo> buyMapList = new List<WXBuyMapInfo>();
|
||||
try { buyMapList = JsonHelper.DeserializeJsonToList<WXBuyMapInfo>(JObject.Parse(resultMap)["data"].ParseToString()); } catch { }
|
||||
var map = buyMapList.FirstOrDefault();
|
||||
var map = buyMapList.FirstOrDefault(b => b.spu_code == txtUpSpuCode.Text.Trim() && b.sku_code == txtUpSkuCode.Text.Trim());
|
||||
if (map != null)
|
||||
{
|
||||
foreach (var order in GlobalConfig.lstOrder)
|
||||
@@ -557,7 +611,9 @@ namespace TemuKJD.ToolForms
|
||||
foreach (var item in order.order_items)
|
||||
{
|
||||
if ((item.out_product_id == map.spu_code && item.out_sku_id == map.sku_code) ||
|
||||
(item.out_product_id == map.spu_code && item.sku_attr_str == map.sku_code))
|
||||
(item.out_product_id == map.spu_code && item.sku_attr_str == map.sku_code) ||
|
||||
(item.product_id == map.spu_code && item.out_sku_id == map.sku_code) ||
|
||||
(item.product_id == map.spu_code && item.sku_attr_str == map.sku_code))
|
||||
{
|
||||
item.buy_map = map;
|
||||
|
||||
@@ -581,11 +637,27 @@ namespace TemuKJD.ToolForms
|
||||
|
||||
private void btnManualUpdateBuyOrder_Click(object sender, EventArgs e)
|
||||
{
|
||||
if (string.IsNullOrEmpty(txtBuyOrderId.Text))
|
||||
if (string.IsNullOrEmpty(txtBuyTransitWarehouse.Text.Trim()))
|
||||
{
|
||||
BaseMsgForm.ShowError("缺少中转地址");
|
||||
return;
|
||||
}
|
||||
var transit = TransitWarehouseData.TransitWarehouseList.FirstOrDefault(t => t.TransDetailAddress == txtBuyTransitWarehouse.Text.Trim());
|
||||
if (transit == null)
|
||||
{
|
||||
BaseMsgForm.ShowError("中转地址对应的中转仓不存在，请核对");
|
||||
return;
|
||||
}
|
||||
if (string.IsNullOrEmpty(txtBuyOrderId.Text.Trim()))
|
||||
{
|
||||
BaseMsgForm.ShowError("缺少拍单订单号，请拍单后再提交");
|
||||
return;
|
||||
}
|
||||
if ((txtBuyPrice.Text.ParseToDecimal() * 100).ParseToInt().IsNullOrZero())
|
||||
{
|
||||
BaseMsgForm.ShowError("缺少拍单金额，请拍单后再提交");
|
||||
return;
|
||||
}
|
||||
|
||||
JObject body = new JObject();
|
||||
body["orderNo"] = orderItem.order_id;
|
||||
@@ -596,7 +668,7 @@ namespace TemuKJD.ToolForms
|
||||
body["purchaserNote"] = BaseClass.NickName;
|
||||
body["express1Company"] = ""; // 物流公司编号
|
||||
body["express1Waybill"] = ""; // 物流编号
|
||||
body["platform"] = transitWarehouse.TransId; // 中转仓ID
|
||||
body["platform"] = transit.TransId; // 中转仓ID
|
||||
body["orderPlatformCode"] = "WEISHOP";
|
||||
var url = "https://po.e57.cn/prod-api/api/oms-api/externalProcurement/saveOrUpdate";
|
||||
var dataStr = JsonHelper.SerializeObject(body);
|
||||
@@ -645,5 +717,10 @@ namespace TemuKJD.ToolForms
|
||||
{
|
||||
cefWebBrowser.Load("https://mobile.yangkeduo.com/orders.html");
|
||||
}
|
||||
|
||||
private void btnReMap_Click(object sender, EventArgs e)
|
||||
{
|
||||
pnlMap.Visible = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
+214
-133
@@ -31,6 +31,7 @@
|
||||
this.components = new System.ComponentModel.Container();
|
||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PddMobileBuyOrderForm));
|
||||
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
|
||||
this.btnJumpOrderList = new DevComponents.DotNetBar.PanelEx();
|
||||
this.txtBuySkuName = new System.Windows.Forms.TextBox();
|
||||
this.label21 = new System.Windows.Forms.Label();
|
||||
this.txtBuySkuId = new System.Windows.Forms.TextBox();
|
||||
@@ -81,10 +82,14 @@
|
||||
this.txtSendProvince = new System.Windows.Forms.TextBox();
|
||||
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
|
||||
this.txtAddress = new System.Windows.Forms.TextBox();
|
||||
this.pictureBox1 = new System.Windows.Forms.PictureBox();
|
||||
this.chkChangeWarehouseAddress = new Work.UserComponents.UcCheckBox(this.components);
|
||||
this.panel1 = new System.Windows.Forms.Panel();
|
||||
this.btnJumpOrderList = new DevComponents.DotNetBar.PanelEx();
|
||||
this.pnlBuy = new System.Windows.Forms.Panel();
|
||||
this.btnReMap = new DevComponents.DotNetBar.PanelEx();
|
||||
this.label25 = new System.Windows.Forms.Label();
|
||||
this.txtBuyTransitWarehouse = new System.Windows.Forms.TextBox();
|
||||
this.pnlMap = new System.Windows.Forms.Panel();
|
||||
this.chkChangeWarehouseAddress = new Work.UserComponents.UcCheckBox(this.components);
|
||||
this.pictureBox1 = new System.Windows.Forms.PictureBox();
|
||||
((System.ComponentModel.ISupportInitialize)(this.pbCloseBase)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
|
||||
this.splitContainer1.Panel2.SuspendLayout();
|
||||
@@ -93,8 +98,10 @@
|
||||
this.splitContainer2.Panel1.SuspendLayout();
|
||||
this.splitContainer2.Panel2.SuspendLayout();
|
||||
this.splitContainer2.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
|
||||
this.panel1.SuspendLayout();
|
||||
this.pnlBuy.SuspendLayout();
|
||||
this.pnlMap.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// pbCloseBase
|
||||
@@ -120,17 +127,42 @@
|
||||
this.splitContainer1.Panel2.BackColor = System.Drawing.Color.White;
|
||||
this.splitContainer1.Panel2.Controls.Add(this.btnJumpOrderList);
|
||||
this.splitContainer1.Panel2MinSize = 0;
|
||||
this.splitContainer1.Size = new System.Drawing.Size(864, 696);
|
||||
this.splitContainer1.SplitterDistance = 667;
|
||||
this.splitContainer1.Size = new System.Drawing.Size(864, 728);
|
||||
this.splitContainer1.SplitterDistance = 700;
|
||||
this.splitContainer1.SplitterWidth = 3;
|
||||
this.splitContainer1.TabIndex = 4;
|
||||
//
|
||||
// btnJumpOrderList
|
||||
//
|
||||
this.btnJumpOrderList.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.btnJumpOrderList.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.btnJumpOrderList.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnJumpOrderList.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnJumpOrderList.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnJumpOrderList.Location = new System.Drawing.Point(0, 2);
|
||||
this.btnJumpOrderList.Name = "btnJumpOrderList";
|
||||
this.btnJumpOrderList.Size = new System.Drawing.Size(114, 23);
|
||||
this.btnJumpOrderList.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnJumpOrderList.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(152)))), ((int)(((byte)(99)))), ((int)(((byte)(143)))));
|
||||
this.btnJumpOrderList.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(152)))), ((int)(((byte)(99)))), ((int)(((byte)(143)))));
|
||||
this.btnJumpOrderList.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
|
||||
this.btnJumpOrderList.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
|
||||
this.btnJumpOrderList.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
|
||||
this.btnJumpOrderList.Style.ForeColor.Color = System.Drawing.Color.White;
|
||||
this.btnJumpOrderList.Style.GradientAngle = 90;
|
||||
this.btnJumpOrderList.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnJumpOrderList.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(107)))), ((int)(((byte)(83)))), ((int)(((byte)(147)))));
|
||||
this.btnJumpOrderList.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(107)))), ((int)(((byte)(83)))), ((int)(((byte)(147)))));
|
||||
this.btnJumpOrderList.TabIndex = 807;
|
||||
this.btnJumpOrderList.Text = "去订单列表页";
|
||||
this.btnJumpOrderList.Click += new System.EventHandler(this.btnJumpOrderList_Click);
|
||||
//
|
||||
// txtBuySkuName
|
||||
//
|
||||
this.txtBuySkuName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.txtBuySkuName.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
||||
this.txtBuySkuName.Location = new System.Drawing.Point(85, 352);
|
||||
this.txtBuySkuName.Location = new System.Drawing.Point(74, 52);
|
||||
this.txtBuySkuName.Name = "txtBuySkuName";
|
||||
this.txtBuySkuName.Size = new System.Drawing.Size(388, 23);
|
||||
this.txtBuySkuName.TabIndex = 848;
|
||||
@@ -138,7 +170,7 @@
|
||||
// label21
|
||||
//
|
||||
this.label21.AutoSize = true;
|
||||
this.label21.Location = new System.Drawing.Point(29, 354);
|
||||
this.label21.Location = new System.Drawing.Point(18, 54);
|
||||
this.label21.Name = "label21";
|
||||
this.label21.Size = new System.Drawing.Size(56, 17);
|
||||
this.label21.TabIndex = 847;
|
||||
@@ -149,7 +181,7 @@
|
||||
this.txtBuySkuId.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.txtBuySkuId.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
||||
this.txtBuySkuId.Location = new System.Drawing.Point(321, 381);
|
||||
this.txtBuySkuId.Location = new System.Drawing.Point(310, 81);
|
||||
this.txtBuySkuId.Name = "txtBuySkuId";
|
||||
this.txtBuySkuId.Size = new System.Drawing.Size(152, 23);
|
||||
this.txtBuySkuId.TabIndex = 846;
|
||||
@@ -157,7 +189,7 @@
|
||||
// label22
|
||||
//
|
||||
this.label22.AutoSize = true;
|
||||
this.label22.Location = new System.Drawing.Point(252, 384);
|
||||
this.label22.Location = new System.Drawing.Point(241, 84);
|
||||
this.label22.Name = "label22";
|
||||
this.label22.Size = new System.Drawing.Size(69, 17);
|
||||
this.label22.TabIndex = 845;
|
||||
@@ -166,7 +198,7 @@
|
||||
// label23
|
||||
//
|
||||
this.label23.AutoSize = true;
|
||||
this.label23.Location = new System.Drawing.Point(16, 384);
|
||||
this.label23.Location = new System.Drawing.Point(5, 84);
|
||||
this.label23.Name = "label23";
|
||||
this.label23.Size = new System.Drawing.Size(69, 17);
|
||||
this.label23.TabIndex = 844;
|
||||
@@ -175,7 +207,7 @@
|
||||
// txtBuyGoodsId
|
||||
//
|
||||
this.txtBuyGoodsId.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
||||
this.txtBuyGoodsId.Location = new System.Drawing.Point(85, 381);
|
||||
this.txtBuyGoodsId.Location = new System.Drawing.Point(74, 81);
|
||||
this.txtBuyGoodsId.Name = "txtBuyGoodsId";
|
||||
this.txtBuyGoodsId.Size = new System.Drawing.Size(152, 23);
|
||||
this.txtBuyGoodsId.TabIndex = 843;
|
||||
@@ -185,7 +217,7 @@
|
||||
this.txtBuyGoodsName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.txtBuyGoodsName.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
||||
this.txtBuyGoodsName.Location = new System.Drawing.Point(85, 323);
|
||||
this.txtBuyGoodsName.Location = new System.Drawing.Point(74, 23);
|
||||
this.txtBuyGoodsName.Name = "txtBuyGoodsName";
|
||||
this.txtBuyGoodsName.Size = new System.Drawing.Size(388, 23);
|
||||
this.txtBuyGoodsName.TabIndex = 842;
|
||||
@@ -193,7 +225,7 @@
|
||||
// label24
|
||||
//
|
||||
this.label24.AutoSize = true;
|
||||
this.label24.Location = new System.Drawing.Point(29, 326);
|
||||
this.label24.Location = new System.Drawing.Point(18, 26);
|
||||
this.label24.Name = "label24";
|
||||
this.label24.Size = new System.Drawing.Size(56, 17);
|
||||
this.label24.TabIndex = 841;
|
||||
@@ -203,7 +235,7 @@
|
||||
//
|
||||
this.label6.AutoSize = true;
|
||||
this.label6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.label6.Location = new System.Drawing.Point(29, 299);
|
||||
this.label6.Location = new System.Drawing.Point(18, 1);
|
||||
this.label6.Name = "label6";
|
||||
this.label6.Size = new System.Drawing.Size(68, 17);
|
||||
this.label6.TabIndex = 840;
|
||||
@@ -213,7 +245,7 @@
|
||||
//
|
||||
this.label20.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
|
||||
this.label20.AutoSize = true;
|
||||
this.label20.Location = new System.Drawing.Point(41, 631);
|
||||
this.label20.Location = new System.Drawing.Point(30, 148);
|
||||
this.label20.Name = "label20";
|
||||
this.label20.Size = new System.Drawing.Size(44, 17);
|
||||
this.label20.TabIndex = 839;
|
||||
@@ -224,7 +256,7 @@
|
||||
this.cmbTransitWarehouse.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.cmbTransitWarehouse.FormattingEnabled = true;
|
||||
this.cmbTransitWarehouse.Location = new System.Drawing.Point(85, 627);
|
||||
this.cmbTransitWarehouse.Location = new System.Drawing.Point(74, 144);
|
||||
this.cmbTransitWarehouse.Name = "cmbTransitWarehouse";
|
||||
this.cmbTransitWarehouse.Size = new System.Drawing.Size(388, 25);
|
||||
this.cmbTransitWarehouse.TabIndex = 838;
|
||||
@@ -234,16 +266,15 @@
|
||||
this.txtBuyPrice.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.txtBuyPrice.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
||||
this.txtBuyPrice.Location = new System.Drawing.Point(321, 410);
|
||||
this.txtBuyPrice.Location = new System.Drawing.Point(310, 110);
|
||||
this.txtBuyPrice.Name = "txtBuyPrice";
|
||||
this.txtBuyPrice.ReadOnly = true;
|
||||
this.txtBuyPrice.Size = new System.Drawing.Size(152, 23);
|
||||
this.txtBuyPrice.TabIndex = 837;
|
||||
//
|
||||
// label18
|
||||
//
|
||||
this.label18.AutoSize = true;
|
||||
this.label18.Location = new System.Drawing.Point(265, 413);
|
||||
this.label18.Location = new System.Drawing.Point(254, 113);
|
||||
this.label18.Name = "label18";
|
||||
this.label18.Size = new System.Drawing.Size(56, 17);
|
||||
this.label18.TabIndex = 836;
|
||||
@@ -252,7 +283,7 @@
|
||||
// txtBuyCnt
|
||||
//
|
||||
this.txtBuyCnt.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
||||
this.txtBuyCnt.Location = new System.Drawing.Point(85, 410);
|
||||
this.txtBuyCnt.Location = new System.Drawing.Point(74, 110);
|
||||
this.txtBuyCnt.Name = "txtBuyCnt";
|
||||
this.txtBuyCnt.Size = new System.Drawing.Size(152, 23);
|
||||
this.txtBuyCnt.TabIndex = 835;
|
||||
@@ -260,7 +291,7 @@
|
||||
// label19
|
||||
//
|
||||
this.label19.AutoSize = true;
|
||||
this.label19.Location = new System.Drawing.Point(29, 413);
|
||||
this.label19.Location = new System.Drawing.Point(18, 113);
|
||||
this.label19.Name = "label19";
|
||||
this.label19.Size = new System.Drawing.Size(56, 17);
|
||||
this.label19.TabIndex = 834;
|
||||
@@ -307,16 +338,15 @@
|
||||
this.txtBuyOrderId.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.txtBuyOrderId.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
||||
this.txtBuyOrderId.Location = new System.Drawing.Point(85, 439);
|
||||
this.txtBuyOrderId.Location = new System.Drawing.Point(74, 139);
|
||||
this.txtBuyOrderId.Name = "txtBuyOrderId";
|
||||
this.txtBuyOrderId.ReadOnly = true;
|
||||
this.txtBuyOrderId.Size = new System.Drawing.Size(388, 23);
|
||||
this.txtBuyOrderId.TabIndex = 829;
|
||||
//
|
||||
// label15
|
||||
//
|
||||
this.label15.AutoSize = true;
|
||||
this.label15.Location = new System.Drawing.Point(17, 442);
|
||||
this.label15.Location = new System.Drawing.Point(6, 142);
|
||||
this.label15.Name = "label15";
|
||||
this.label15.Size = new System.Drawing.Size(68, 17);
|
||||
this.label15.TabIndex = 828;
|
||||
@@ -329,7 +359,7 @@
|
||||
this.btnManualUpdateTransitWarehouse.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnManualUpdateTransitWarehouse.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnManualUpdateTransitWarehouse.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnManualUpdateTransitWarehouse.Location = new System.Drawing.Point(359, 658);
|
||||
this.btnManualUpdateTransitWarehouse.Location = new System.Drawing.Point(348, 175);
|
||||
this.btnManualUpdateTransitWarehouse.Name = "btnManualUpdateTransitWarehouse";
|
||||
this.btnManualUpdateTransitWarehouse.Size = new System.Drawing.Size(114, 23);
|
||||
this.btnManualUpdateTransitWarehouse.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
@@ -371,7 +401,7 @@
|
||||
this.label13.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
|
||||
this.label13.AutoSize = true;
|
||||
this.label13.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.label13.Location = new System.Drawing.Point(29, 487);
|
||||
this.label13.Location = new System.Drawing.Point(18, 4);
|
||||
this.label13.Name = "label13";
|
||||
this.label13.Size = new System.Drawing.Size(92, 17);
|
||||
this.label13.TabIndex = 815;
|
||||
@@ -485,7 +515,7 @@
|
||||
this.btnManualUpdateBuyOrder.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnManualUpdateBuyOrder.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnManualUpdateBuyOrder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnManualUpdateBuyOrder.Location = new System.Drawing.Point(359, 468);
|
||||
this.btnManualUpdateBuyOrder.Location = new System.Drawing.Point(348, 198);
|
||||
this.btnManualUpdateBuyOrder.Name = "btnManualUpdateBuyOrder";
|
||||
this.btnManualUpdateBuyOrder.Size = new System.Drawing.Size(114, 23);
|
||||
this.btnManualUpdateBuyOrder.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
@@ -508,7 +538,7 @@
|
||||
this.txtMapSkuName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.txtMapSkuName.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
||||
this.txtMapSkuName.Location = new System.Drawing.Point(85, 540);
|
||||
this.txtMapSkuName.Location = new System.Drawing.Point(74, 57);
|
||||
this.txtMapSkuName.Name = "txtMapSkuName";
|
||||
this.txtMapSkuName.Size = new System.Drawing.Size(388, 23);
|
||||
this.txtMapSkuName.TabIndex = 794;
|
||||
@@ -517,7 +547,7 @@
|
||||
//
|
||||
this.label5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
|
||||
this.label5.AutoSize = true;
|
||||
this.label5.Location = new System.Drawing.Point(29, 542);
|
||||
this.label5.Location = new System.Drawing.Point(18, 59);
|
||||
this.label5.Name = "label5";
|
||||
this.label5.Size = new System.Drawing.Size(56, 17);
|
||||
this.label5.TabIndex = 793;
|
||||
@@ -530,7 +560,7 @@
|
||||
this.btnManualUpdateSendProvince.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnManualUpdateSendProvince.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnManualUpdateSendProvince.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnManualUpdateSendProvince.Location = new System.Drawing.Point(359, 598);
|
||||
this.btnManualUpdateSendProvince.Location = new System.Drawing.Point(348, 115);
|
||||
this.btnManualUpdateSendProvince.Name = "btnManualUpdateSendProvince";
|
||||
this.btnManualUpdateSendProvince.Size = new System.Drawing.Size(114, 23);
|
||||
this.btnManualUpdateSendProvince.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
@@ -553,7 +583,7 @@
|
||||
this.txtMapSkuId.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.txtMapSkuId.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
||||
this.txtMapSkuId.Location = new System.Drawing.Point(321, 569);
|
||||
this.txtMapSkuId.Location = new System.Drawing.Point(310, 86);
|
||||
this.txtMapSkuId.Name = "txtMapSkuId";
|
||||
this.txtMapSkuId.Size = new System.Drawing.Size(152, 23);
|
||||
this.txtMapSkuId.TabIndex = 474;
|
||||
@@ -562,7 +592,7 @@
|
||||
//
|
||||
this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
|
||||
this.label4.AutoSize = true;
|
||||
this.label4.Location = new System.Drawing.Point(252, 572);
|
||||
this.label4.Location = new System.Drawing.Point(241, 89);
|
||||
this.label4.Name = "label4";
|
||||
this.label4.Size = new System.Drawing.Size(69, 17);
|
||||
this.label4.TabIndex = 473;
|
||||
@@ -572,7 +602,7 @@
|
||||
//
|
||||
this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
|
||||
this.label3.AutoSize = true;
|
||||
this.label3.Location = new System.Drawing.Point(16, 572);
|
||||
this.label3.Location = new System.Drawing.Point(5, 89);
|
||||
this.label3.Name = "label3";
|
||||
this.label3.Size = new System.Drawing.Size(69, 17);
|
||||
this.label3.TabIndex = 472;
|
||||
@@ -582,7 +612,7 @@
|
||||
//
|
||||
this.txtMapGoodsId.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
|
||||
this.txtMapGoodsId.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
||||
this.txtMapGoodsId.Location = new System.Drawing.Point(85, 569);
|
||||
this.txtMapGoodsId.Location = new System.Drawing.Point(74, 86);
|
||||
this.txtMapGoodsId.Name = "txtMapGoodsId";
|
||||
this.txtMapGoodsId.Size = new System.Drawing.Size(152, 23);
|
||||
this.txtMapGoodsId.TabIndex = 471;
|
||||
@@ -592,7 +622,7 @@
|
||||
this.txtMapGoodsName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.txtMapGoodsName.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
||||
this.txtMapGoodsName.Location = new System.Drawing.Point(85, 511);
|
||||
this.txtMapGoodsName.Location = new System.Drawing.Point(74, 28);
|
||||
this.txtMapGoodsName.Name = "txtMapGoodsName";
|
||||
this.txtMapGoodsName.Size = new System.Drawing.Size(388, 23);
|
||||
this.txtMapGoodsName.TabIndex = 470;
|
||||
@@ -601,7 +631,7 @@
|
||||
//
|
||||
this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
|
||||
this.label2.AutoSize = true;
|
||||
this.label2.Location = new System.Drawing.Point(29, 514);
|
||||
this.label2.Location = new System.Drawing.Point(18, 31);
|
||||
this.label2.Name = "label2";
|
||||
this.label2.Size = new System.Drawing.Size(56, 17);
|
||||
this.label2.TabIndex = 469;
|
||||
@@ -611,7 +641,7 @@
|
||||
//
|
||||
this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
|
||||
this.label1.AutoSize = true;
|
||||
this.label1.Location = new System.Drawing.Point(41, 601);
|
||||
this.label1.Location = new System.Drawing.Point(30, 118);
|
||||
this.label1.Name = "label1";
|
||||
this.label1.Size = new System.Drawing.Size(44, 17);
|
||||
this.label1.TabIndex = 468;
|
||||
@@ -622,7 +652,7 @@
|
||||
this.txtSendProvince.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.txtSendProvince.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
||||
this.txtSendProvince.Location = new System.Drawing.Point(85, 598);
|
||||
this.txtSendProvince.Location = new System.Drawing.Point(74, 115);
|
||||
this.txtSendProvince.Name = "txtSendProvince";
|
||||
this.txtSendProvince.Size = new System.Drawing.Size(268, 23);
|
||||
this.txtSendProvince.TabIndex = 467;
|
||||
@@ -644,7 +674,7 @@
|
||||
//
|
||||
this.splitContainer2.Panel2.Controls.Add(this.panel1);
|
||||
this.splitContainer2.Panel2.Controls.Add(this.splitContainer1);
|
||||
this.splitContainer2.Size = new System.Drawing.Size(1358, 734);
|
||||
this.splitContainer2.Size = new System.Drawing.Size(1358, 766);
|
||||
this.splitContainer2.SplitterDistance = 26;
|
||||
this.splitContainer2.TabIndex = 5;
|
||||
//
|
||||
@@ -660,16 +690,131 @@
|
||||
this.txtAddress.TabIndex = 7;
|
||||
this.txtAddress.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtAddress_KeyDown);
|
||||
//
|
||||
// pictureBox1
|
||||
// panel1
|
||||
//
|
||||
this.pictureBox1.Anchor = System.Windows.Forms.AnchorStyles.Top;
|
||||
this.pictureBox1.Location = new System.Drawing.Point(32, 12);
|
||||
this.pictureBox1.Name = "pictureBox1";
|
||||
this.pictureBox1.Size = new System.Drawing.Size(100, 100);
|
||||
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
|
||||
this.pictureBox1.TabIndex = 858;
|
||||
this.pictureBox1.TabStop = false;
|
||||
this.pictureBox1.Click += new System.EventHandler(this.pictureBox1_Click);
|
||||
this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.panel1.Controls.Add(this.pnlBuy);
|
||||
this.panel1.Controls.Add(this.pnlMap);
|
||||
this.panel1.Controls.Add(this.chkChangeWarehouseAddress);
|
||||
this.panel1.Controls.Add(this.pictureBox1);
|
||||
this.panel1.Controls.Add(this.txtShopOrderItemPrice);
|
||||
this.panel1.Controls.Add(this.txtShopOrderItemCnt);
|
||||
this.panel1.Controls.Add(this.label16);
|
||||
this.panel1.Controls.Add(this.label17);
|
||||
this.panel1.Controls.Add(this.label7);
|
||||
this.panel1.Controls.Add(this.txtShopGoodsName);
|
||||
this.panel1.Controls.Add(this.txtShopSpecName);
|
||||
this.panel1.Controls.Add(this.label8);
|
||||
this.panel1.Controls.Add(this.txtShopGoodsId);
|
||||
this.panel1.Controls.Add(this.label14);
|
||||
this.panel1.Controls.Add(this.label9);
|
||||
this.panel1.Controls.Add(this.label10);
|
||||
this.panel1.Controls.Add(this.txtShopSkuId);
|
||||
this.panel1.Controls.Add(this.label11);
|
||||
this.panel1.Controls.Add(this.txtUpSpuCode);
|
||||
this.panel1.Controls.Add(this.txtUpSkuCode);
|
||||
this.panel1.Controls.Add(this.label12);
|
||||
this.panel1.Location = new System.Drawing.Point(867, 3);
|
||||
this.panel1.Name = "panel1";
|
||||
this.panel1.Size = new System.Drawing.Size(487, 730);
|
||||
this.panel1.TabIndex = 0;
|
||||
//
|
||||
// pnlBuy
|
||||
//
|
||||
this.pnlBuy.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.pnlBuy.Controls.Add(this.btnReMap);
|
||||
this.pnlBuy.Controls.Add(this.label25);
|
||||
this.pnlBuy.Controls.Add(this.txtBuyTransitWarehouse);
|
||||
this.pnlBuy.Controls.Add(this.txtBuySkuName);
|
||||
this.pnlBuy.Controls.Add(this.label6);
|
||||
this.pnlBuy.Controls.Add(this.label21);
|
||||
this.pnlBuy.Controls.Add(this.label15);
|
||||
this.pnlBuy.Controls.Add(this.txtBuySkuId);
|
||||
this.pnlBuy.Controls.Add(this.txtBuyOrderId);
|
||||
this.pnlBuy.Controls.Add(this.label22);
|
||||
this.pnlBuy.Controls.Add(this.label19);
|
||||
this.pnlBuy.Controls.Add(this.label18);
|
||||
this.pnlBuy.Controls.Add(this.label23);
|
||||
this.pnlBuy.Controls.Add(this.btnManualUpdateBuyOrder);
|
||||
this.pnlBuy.Controls.Add(this.txtBuyCnt);
|
||||
this.pnlBuy.Controls.Add(this.txtBuyGoodsId);
|
||||
this.pnlBuy.Controls.Add(this.txtBuyGoodsName);
|
||||
this.pnlBuy.Controls.Add(this.txtBuyPrice);
|
||||
this.pnlBuy.Controls.Add(this.label24);
|
||||
this.pnlBuy.Location = new System.Drawing.Point(12, 291);
|
||||
this.pnlBuy.Name = "pnlBuy";
|
||||
this.pnlBuy.Size = new System.Drawing.Size(468, 226);
|
||||
this.pnlBuy.TabIndex = 872;
|
||||
//
|
||||
// btnReMap
|
||||
//
|
||||
this.btnReMap.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.btnReMap.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.btnReMap.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnReMap.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnReMap.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnReMap.Location = new System.Drawing.Point(9, 198);
|
||||
this.btnReMap.Name = "btnReMap";
|
||||
this.btnReMap.Size = new System.Drawing.Size(114, 23);
|
||||
this.btnReMap.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnReMap.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(245)))), ((int)(((byte)(235)))), ((int)(((byte)(255)))));
|
||||
this.btnReMap.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(245)))), ((int)(((byte)(235)))), ((int)(((byte)(255)))));
|
||||
this.btnReMap.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
|
||||
this.btnReMap.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(152)))), ((int)(((byte)(99)))), ((int)(((byte)(143)))));
|
||||
this.btnReMap.Style.ForeColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(152)))), ((int)(((byte)(99)))), ((int)(((byte)(143)))));
|
||||
this.btnReMap.Style.GradientAngle = 90;
|
||||
this.btnReMap.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnReMap.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(107)))), ((int)(((byte)(83)))), ((int)(((byte)(147)))));
|
||||
this.btnReMap.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(107)))), ((int)(((byte)(83)))), ((int)(((byte)(147)))));
|
||||
this.btnReMap.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
|
||||
this.btnReMap.TabIndex = 877;
|
||||
this.btnReMap.Text = "重新关联商品";
|
||||
this.btnReMap.Click += new System.EventHandler(this.btnReMap_Click);
|
||||
//
|
||||
// label25
|
||||
//
|
||||
this.label25.AutoSize = true;
|
||||
this.label25.Location = new System.Drawing.Point(18, 172);
|
||||
this.label25.Name = "label25";
|
||||
this.label25.Size = new System.Drawing.Size(56, 17);
|
||||
this.label25.TabIndex = 869;
|
||||
this.label25.Text = "中转地址";
|
||||
//
|
||||
// txtBuyTransitWarehouse
|
||||
//
|
||||
this.txtBuyTransitWarehouse.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.txtBuyTransitWarehouse.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
||||
this.txtBuyTransitWarehouse.Location = new System.Drawing.Point(74, 169);
|
||||
this.txtBuyTransitWarehouse.Name = "txtBuyTransitWarehouse";
|
||||
this.txtBuyTransitWarehouse.Size = new System.Drawing.Size(388, 23);
|
||||
this.txtBuyTransitWarehouse.TabIndex = 870;
|
||||
//
|
||||
// pnlMap
|
||||
//
|
||||
this.pnlMap.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.pnlMap.Controls.Add(this.txtSendProvince);
|
||||
this.pnlMap.Controls.Add(this.label13);
|
||||
this.pnlMap.Controls.Add(this.label20);
|
||||
this.pnlMap.Controls.Add(this.label1);
|
||||
this.pnlMap.Controls.Add(this.txtMapGoodsName);
|
||||
this.pnlMap.Controls.Add(this.btnManualUpdateSendProvince);
|
||||
this.pnlMap.Controls.Add(this.label2);
|
||||
this.pnlMap.Controls.Add(this.label3);
|
||||
this.pnlMap.Controls.Add(this.txtMapSkuId);
|
||||
this.pnlMap.Controls.Add(this.label4);
|
||||
this.pnlMap.Controls.Add(this.label5);
|
||||
this.pnlMap.Controls.Add(this.btnManualUpdateTransitWarehouse);
|
||||
this.pnlMap.Controls.Add(this.cmbTransitWarehouse);
|
||||
this.pnlMap.Controls.Add(this.txtMapGoodsId);
|
||||
this.pnlMap.Controls.Add(this.txtMapSkuName);
|
||||
this.pnlMap.Location = new System.Drawing.Point(12, 521);
|
||||
this.pnlMap.Name = "pnlMap";
|
||||
this.pnlMap.Size = new System.Drawing.Size(468, 203);
|
||||
this.pnlMap.TabIndex = 871;
|
||||
//
|
||||
// chkChangeWarehouseAddress
|
||||
//
|
||||
@@ -683,94 +828,21 @@
|
||||
this.chkChangeWarehouseAddress.Text = "保存地址时替换为云仓地址";
|
||||
this.chkChangeWarehouseAddress.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// panel1
|
||||
// pictureBox1
|
||||
//
|
||||
this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.panel1.Controls.Add(this.chkChangeWarehouseAddress);
|
||||
this.panel1.Controls.Add(this.pictureBox1);
|
||||
this.panel1.Controls.Add(this.txtSendProvince);
|
||||
this.panel1.Controls.Add(this.txtBuySkuName);
|
||||
this.panel1.Controls.Add(this.label1);
|
||||
this.panel1.Controls.Add(this.label20);
|
||||
this.panel1.Controls.Add(this.label2);
|
||||
this.panel1.Controls.Add(this.label6);
|
||||
this.panel1.Controls.Add(this.txtMapGoodsName);
|
||||
this.panel1.Controls.Add(this.label21);
|
||||
this.panel1.Controls.Add(this.txtMapGoodsId);
|
||||
this.panel1.Controls.Add(this.cmbTransitWarehouse);
|
||||
this.panel1.Controls.Add(this.label3);
|
||||
this.panel1.Controls.Add(this.label15);
|
||||
this.panel1.Controls.Add(this.label4);
|
||||
this.panel1.Controls.Add(this.txtShopOrderItemPrice);
|
||||
this.panel1.Controls.Add(this.txtMapSkuId);
|
||||
this.panel1.Controls.Add(this.txtBuySkuId);
|
||||
this.panel1.Controls.Add(this.txtShopOrderItemCnt);
|
||||
this.panel1.Controls.Add(this.label16);
|
||||
this.panel1.Controls.Add(this.txtBuyOrderId);
|
||||
this.panel1.Controls.Add(this.btnManualUpdateSendProvince);
|
||||
this.panel1.Controls.Add(this.label22);
|
||||
this.panel1.Controls.Add(this.label5);
|
||||
this.panel1.Controls.Add(this.label17);
|
||||
this.panel1.Controls.Add(this.txtMapSkuName);
|
||||
this.panel1.Controls.Add(this.label19);
|
||||
this.panel1.Controls.Add(this.label18);
|
||||
this.panel1.Controls.Add(this.btnManualUpdateTransitWarehouse);
|
||||
this.panel1.Controls.Add(this.label23);
|
||||
this.panel1.Controls.Add(this.btnManualUpdateBuyOrder);
|
||||
this.panel1.Controls.Add(this.txtBuyCnt);
|
||||
this.panel1.Controls.Add(this.label7);
|
||||
this.panel1.Controls.Add(this.txtBuyGoodsId);
|
||||
this.panel1.Controls.Add(this.txtShopGoodsName);
|
||||
this.panel1.Controls.Add(this.txtShopSpecName);
|
||||
this.panel1.Controls.Add(this.label8);
|
||||
this.panel1.Controls.Add(this.txtBuyGoodsName);
|
||||
this.panel1.Controls.Add(this.txtShopGoodsId);
|
||||
this.panel1.Controls.Add(this.label14);
|
||||
this.panel1.Controls.Add(this.label9);
|
||||
this.panel1.Controls.Add(this.txtBuyPrice);
|
||||
this.panel1.Controls.Add(this.label10);
|
||||
this.panel1.Controls.Add(this.label13);
|
||||
this.panel1.Controls.Add(this.txtShopSkuId);
|
||||
this.panel1.Controls.Add(this.label24);
|
||||
this.panel1.Controls.Add(this.label11);
|
||||
this.panel1.Controls.Add(this.txtUpSpuCode);
|
||||
this.panel1.Controls.Add(this.txtUpSkuCode);
|
||||
this.panel1.Controls.Add(this.label12);
|
||||
this.panel1.Location = new System.Drawing.Point(868, 3);
|
||||
this.panel1.Name = "panel1";
|
||||
this.panel1.Size = new System.Drawing.Size(487, 698);
|
||||
this.panel1.TabIndex = 0;
|
||||
//
|
||||
// btnJumpOrderList
|
||||
//
|
||||
this.btnJumpOrderList.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.btnJumpOrderList.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.btnJumpOrderList.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnJumpOrderList.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnJumpOrderList.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnJumpOrderList.Location = new System.Drawing.Point(0, 2);
|
||||
this.btnJumpOrderList.Name = "btnJumpOrderList";
|
||||
this.btnJumpOrderList.Size = new System.Drawing.Size(114, 23);
|
||||
this.btnJumpOrderList.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnJumpOrderList.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(152)))), ((int)(((byte)(99)))), ((int)(((byte)(143)))));
|
||||
this.btnJumpOrderList.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(152)))), ((int)(((byte)(99)))), ((int)(((byte)(143)))));
|
||||
this.btnJumpOrderList.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
|
||||
this.btnJumpOrderList.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
|
||||
this.btnJumpOrderList.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
|
||||
this.btnJumpOrderList.Style.ForeColor.Color = System.Drawing.Color.White;
|
||||
this.btnJumpOrderList.Style.GradientAngle = 90;
|
||||
this.btnJumpOrderList.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnJumpOrderList.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(107)))), ((int)(((byte)(83)))), ((int)(((byte)(147)))));
|
||||
this.btnJumpOrderList.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(107)))), ((int)(((byte)(83)))), ((int)(((byte)(147)))));
|
||||
this.btnJumpOrderList.TabIndex = 807;
|
||||
this.btnJumpOrderList.Text = "去订单列表页";
|
||||
this.btnJumpOrderList.Click += new System.EventHandler(this.btnJumpOrderList_Click);
|
||||
this.pictureBox1.Anchor = System.Windows.Forms.AnchorStyles.Top;
|
||||
this.pictureBox1.Location = new System.Drawing.Point(32, 12);
|
||||
this.pictureBox1.Name = "pictureBox1";
|
||||
this.pictureBox1.Size = new System.Drawing.Size(100, 100);
|
||||
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
|
||||
this.pictureBox1.TabIndex = 858;
|
||||
this.pictureBox1.TabStop = false;
|
||||
this.pictureBox1.Click += new System.EventHandler(this.pictureBox1_Click);
|
||||
//
|
||||
// PddMobileBuyOrderForm
|
||||
//
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
|
||||
this.ClientSize = new System.Drawing.Size(1360, 768);
|
||||
this.ClientSize = new System.Drawing.Size(1360, 800);
|
||||
this.Controls.Add(this.splitContainer2);
|
||||
this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
|
||||
@@ -791,9 +863,13 @@
|
||||
this.splitContainer2.Panel2.ResumeLayout(false);
|
||||
((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
|
||||
this.splitContainer2.ResumeLayout(false);
|
||||
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
|
||||
this.panel1.ResumeLayout(false);
|
||||
this.panel1.PerformLayout();
|
||||
this.pnlBuy.ResumeLayout(false);
|
||||
this.pnlBuy.PerformLayout();
|
||||
this.pnlMap.ResumeLayout(false);
|
||||
this.pnlMap.PerformLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
|
||||
this.ResumeLayout(false);
|
||||
|
||||
}
|
||||
@@ -855,5 +931,10 @@
|
||||
private Work.UserComponents.UcCheckBox chkChangeWarehouseAddress;
|
||||
private System.Windows.Forms.Panel panel1;
|
||||
private DevComponents.DotNetBar.PanelEx btnJumpOrderList;
|
||||
private System.Windows.Forms.Label label25;
|
||||
private System.Windows.Forms.TextBox txtBuyTransitWarehouse;
|
||||
public System.Windows.Forms.Panel pnlBuy;
|
||||
public System.Windows.Forms.Panel pnlMap;
|
||||
private DevComponents.DotNetBar.PanelEx btnReMap;
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large.
Load diff
Reference in new issue
Block a user