chfei/29WxOrder
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复关联失败问题 继续优化读单

Browse Source
This commit is contained in:
wule committed 2026-10-18 17:18:30 +08:00
1 parent a786ba6ce9
commit 7df2cc0957
5 files changed
+135 -55
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
+1 -1
View File
@@ -508,7 +508,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
var pddBuyMapLst = buyMapList.Where(m => m.platform == "pdd").ToList();
item.PddBuyMap = pddBuyMapLst.FirstOrDefault(b => b.sku_code == item.out_sku_id && b.spu_code == item.out_product_id);
if (item.PddBuyMap == null)
item.PddBuyMap = pddBuyMapLst.FirstOrDefault(b => b.sku_code == item.SkuAttrStr && b.spu_code == item.out_product_id);
item.PddBuyMap = pddBuyMapLst.FirstOrDefault(b => b.sku_code == item.SkuAttrStr && b.spu_code == item.out_product_id);
if (item.PddBuyMap == null)
item.PddBuyMap = pddBuyMapLst.FirstOrDefault(b => b.sku_code == item.out_sku_id && b.spu_code == item.product_id);
if (item.PddBuyMap == null)
29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml
+13 -16
View File
@@ -702,7 +702,7 @@
BorderBrush="{Binding TransitRefundStatusBackColor}"
BorderThickness="1"
CornerRadius="2"
Visibility="{Binding TransitRefundStatusStr, Converter={StaticResource HasTextVisibility}}">
Visibility="{Binding TransitRefundStatusStrVisibility}">
<TextBlock
x:Name="txtRefundStatus"
MinWidth="20"
@@ -722,7 +722,7 @@
Title="采购单号："
Cursor="Hand"
Foreground="#0099ff"
Visibility="{Binding ItemTransitOrderWithVoid.OutOrderNumStr, Converter={StaticResource HasTextVisibility}}">
Visibility="{Binding ItemTransitOutOrderNoStrVisibility}">
<WrapPanel Orientation="Horizontal">
<uc:UcWaterMarkTextBox1
x:Name="txtTransitOrderNumStr"
@@ -746,8 +746,7 @@
Background="Transparent"
Cursor="Hand"
MouseLeftButtonDown="Path_MouseLeftButtonDown"
Tag="{Binding order_id}"
Visibility="{Binding ElementName=txtTransitOrderBuyerStr, Path=Text, Converter={StaticResource HasTextVisibility}}">
Tag="{Binding order_id}">
<Path
Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z"
Fill="{StaticResource PageLinkBrush}"
@@ -762,7 +761,7 @@
x:Name="wpBuyTime"
Title="采购时间："
Foreground="{Binding OutOrderTimeQualifiedBrush}"
Visibility="{Binding ElementName=txtOutOrderTimeQualifiedStr, Path=Text, Converter={StaticResource HasTextVisibility}}">
Visibility="{Binding OutOrderTimeQualifiedStrVisibility}">
<uc:UcWaterMarkTextBox1
x:Name="txtOutOrderTimeQualifiedStr"
Margin="-2,0"
@@ -781,7 +780,7 @@
<wpf:TitleContent
Title="取号物流："
Foreground="{StaticResource PageOkBrush}"
Visibility="{Binding TransitOrderWaybillToWareHouseStr, Converter={StaticResource HasTextVisibility}}">
Visibility="{Binding TransitOrderWaybillToWareHouseStrVisibility}">
<uc:UcWaterMarkTextBox1
Margin="-2,0"
Padding="0"
@@ -811,7 +810,7 @@
</wpf:TitleContent>
<!-- 仓库物流 -->
<wpf:TitleContent Title="仓库物流：" Visibility="{Binding TransitOrderWaybillFromWareHouseStr, Converter={StaticResource HasTextVisibility}}">
<wpf:TitleContent Title="仓库物流：" Visibility="{Binding TransitOrderWaybillFromWareHouseStrVisibility}">
<WrapPanel>
<uc:UcWaterMarkTextBox1
Margin="-2,0"
@@ -835,7 +834,7 @@
</wpf:TitleContent>
<!-- 仓库物流 -->
<wpf:TitleContent Title="补发物流：" Visibility="{Binding TransitExtraPackageWaybillStr, Converter={StaticResource HasTextVisibility}}">
<wpf:TitleContent Title="补发物流：" Visibility="{Binding TransitExtraPackageWaybillStrVisibility}">
<WrapPanel>
<uc:UcWaterMarkTextBox1
Margin="-2,0"
@@ -855,7 +854,7 @@
Click="btnVoidTransitExtraOrder_Click"
Content="{Binding TransitExtraPackageWaybillBtnStr}"
Style="{StaticResource LinkButton}"
Visibility="{Binding TransitExtraPackageWaybillBtnStr, Converter={StaticResource HasTextVisibility}}" />
Visibility="{Binding TransitExtraPackageWaybillBtnStrVisibility}" />
</WrapPanel>
</wpf:TitleContent>
@@ -942,7 +941,7 @@
<wpf:TitleContent
x:Name="wpDirectBuyTime"
Title="外采时间："
Visibility="{Binding ElementName=txtDirectOrderBuyTimeStr, Path=Text, Converter={StaticResource HasTextVisibility}}">
Visibility="{Binding DirectOrderBuyTimeStrVisibility}">
<uc:UcWaterMarkTextBox1
x:Name="txtDirectOrderBuyTimeStr"
Margin="-2,2"
@@ -1293,7 +1292,7 @@
</wpf:TitleContent>
<!-- 总店地址 -->
<wpf:TitleContent Title="总店地址：" Visibility="{Binding PddBuyerAfterSaleAddressStr, Converter={StaticResource HasTextVisibility}}">
<wpf:TitleContent Title="总店地址：" Visibility="{Binding PddBuyerAfterSaleAddressStrVisibility}">
<WrapPanel Orientation="Horizontal">
<uc:UcWaterMarkTextBox1
x:Name="txtBuyerRefundAddress"
@@ -1303,10 +1302,9 @@
Background="Transparent"
BorderThickness="1"
IsReadOnly="True"
Text="{Binding PddBuyerAfterSaleAddressStr, Converter={StaticResource TextEllipsisConverter}}"
Text="{Binding PddBuyerAfterSaleAddressShortStr}"
TextWrapping="Wrap"
ToolTip="{Binding PddBuyerAfterSaleAddressStr}"
Visibility="{Binding Text, RelativeSource={RelativeSource Self}, Converter={StaticResource HasTextVisibility}}"
WaterMark="总店退货地址" />
<Border
Width="12"
@@ -1326,7 +1324,7 @@
</wpf:TitleContent>
<!-- 直发总店 -->
<wpf:TitleContent Title="直发总店：" Visibility="{Binding DirectPddBuyerAfterSaleAddressStr, Converter={StaticResource HasTextVisibility}}">
<wpf:TitleContent Title="直发总店：" Visibility="{Binding DirectPddBuyerAfterSaleAddressStrVisibility}">
<WrapPanel Orientation="Horizontal">
<uc:UcWaterMarkTextBox1
x:Name="txtDirectBuyerRefundAddress"
@@ -1336,10 +1334,9 @@
Background="Transparent"
BorderThickness="1"
IsReadOnly="True"
Text="{Binding DirectPddBuyerAfterSaleAddressStr, Converter={StaticResource TextEllipsisConverter}}"
Text="{Binding DirectPddBuyerAfterSaleAddressShortStr}"
TextWrapping="Wrap"
ToolTip="{Binding DirectPddBuyerAfterSaleAddressStr}"
Visibility="{Binding Text, RelativeSource={RelativeSource Self}, Converter={StaticResource HasTextVisibility}}"
WaterMark="总店退货地址" />
<Border
Width="12"
AllBase/ImageBuild.cs
+8 -7
View File
@@ -5,6 +5,7 @@ using System.Drawing.Imaging;
using System.IO;
using System.Net;
using System.Runtime.InteropServices;
using System.Threading;
using System.Windows.Forms;
using System.Windows.Media.Imaging;
@@ -388,11 +389,6 @@ namespace AllBase
public static BitmapImage LoadBitmipImageFromUrl(string url, int? width = 0, int? height = 0)
{
BitmapImage bitmap = new BitmapImage();
if (width != null && height != null)
{
bitmap.DecodePixelWidth = 100;
bitmap.DecodePixelHeight = 100;
}
try
{
@@ -403,11 +399,16 @@ namespace AllBase
{
stream.Position = 0; // 重置流的位置到开始处
bitmap.BeginInit();
bitmap.CreateOptions = BitmapCreateOptions.PreservePixelFormat;
if (width != null && height != null)
{
bitmap.DecodePixelWidth = width.Value;
bitmap.DecodePixelHeight = height.Value;
}
bitmap.CreateOptions = BitmapCreateOptions.PreservePixelFormat;
bitmap.CacheOption = BitmapCacheOption.OnLoad; // 或者使用 BitmapCacheOption.OnLoad 以减少内存使用
bitmap.UriSource = null; // 清除可能的旧UriSource，防止缓存问题
bitmap.StreamSource = stream;
bitmap.EndInit();
bitmap.EndInit();
bitmap.Freeze(); // 防止后续更改，提高性能
}
}
AllBase/Model/DBModel/oms_wei_order_item_info.cs
+112 -31
View File
@@ -272,12 +272,17 @@ namespace AllBase.Model.DBModel
{
get { return this.GetValue(x => x.ItemTransitOrderWithVoid); }
set { this.SetValue(x => x.ItemTransitOrderWithVoid, value); }
}
}
public Visibility ItemTransitOutOrderBuyerStrVisibility
{
get { return this.GetValue(x => x.ItemTransitOutOrderBuyerStrVisibility); }
set { this.SetValue(x => x.ItemTransitOutOrderBuyerStrVisibility, value); }
}
public Visibility ItemTransitOutOrderNoStrVisibility
{
get { return this.GetValue(x => x.ItemTransitOutOrderNoStrVisibility); }
set { this.SetValue(x => x.ItemTransitOutOrderNoStrVisibility, value); }
}
public List<oms_wei_external_procurement_after_sale_info> ItemTransitOrderAfterSales { get; set; } = new List<oms_wei_external_procurement_after_sale_info>();
public oms_wei_external_procurement_after_sale_info ItemTransitOrderAfterSale
{
@@ -309,12 +314,22 @@ namespace AllBase.Model.DBModel
public string TransitExtraPackageWaybillStr
{
get { return this.GetValue(x => x.TransitExtraPackageWaybillStr); }
set { this.SetValue(x => x.TransitExtraPackageWaybillStr, value); }
set { this.SetValue(x => x.TransitExtraPackageWaybillStr, value); TransitExtraPackageWaybillStrVisibility = string.IsNullOrWhiteSpace(value) ? Visibility.Collapsed : Visibility.Visible; }
}
public Visibility TransitExtraPackageWaybillStrVisibility
{
get { return this.GetValue(x => x.TransitExtraPackageWaybillStrVisibility); }
set { this.SetValue(x => x.TransitExtraPackageWaybillStrVisibility, value); }
}
public string TransitExtraPackageWaybillBtnStr
{
get { return this.GetValue(x => x.TransitExtraPackageWaybillBtnStr); }
set { this.SetValue(x => x.TransitExtraPackageWaybillBtnStr, value); }
set { this.SetValue(x => x.TransitExtraPackageWaybillBtnStr, value); TransitExtraPackageWaybillBtnStrVisibility = string.IsNullOrWhiteSpace(value) ? Visibility.Collapsed : Visibility.Visible; }
}
public Visibility TransitExtraPackageWaybillBtnStrVisibility
{
get { return this.GetValue(x => x.TransitExtraPackageWaybillBtnStrVisibility); }
set { this.SetValue(x => x.TransitExtraPackageWaybillBtnStrVisibility, value); }
}
public List<order_pdd_buyer_order> PddBuyerOrders { get; set; } = new List<order_pdd_buyer_order>();
public order_pdd_buyer_order PddBuyerOrder
@@ -336,7 +351,26 @@ namespace AllBase.Model.DBModel
public string PddBuyerAfterSaleAddressStr
{
get { return this.GetValue(x => x.PddBuyerAfterSaleAddressStr); }
set { this.SetValue(x => x.PddBuyerAfterSaleAddressStr, value); }
set
{
this.SetValue(x => x.PddBuyerAfterSaleAddressStr, value);
PddBuyerAfterSaleAddressStrVisibility = string.IsNullOrWhiteSpace(value) ? Visibility.Collapsed : Visibility.Visible;
if (value.ParseToString().Length > 19)
PddBuyerAfterSaleAddressShortStr = string.Join("", value.ParseToString().Take(19)) + "…";
else
PddBuyerAfterSaleAddressShortStr = value.ParseToString();
}
}
public string PddBuyerAfterSaleAddressShortStr
{
get { return this.GetValue(x => x.PddBuyerAfterSaleAddressShortStr); }
set { this.SetValue(x => x.PddBuyerAfterSaleAddressShortStr, value); }
}
public Visibility PddBuyerAfterSaleAddressStrVisibility
{
get { return this.GetValue(x => x.PddBuyerAfterSaleAddressStrVisibility); }
set { this.SetValue(x => x.PddBuyerAfterSaleAddressStrVisibility, value); }
}
@@ -539,14 +573,19 @@ namespace AllBase.Model.DBModel
/// 拍单物流编号
/// </summary>
public string TransitOrderWaybillToWareHouseStr
{
get { return this.GetValue(x => x.TransitOrderWaybillToWareHouseStr); }
set { this.SetValue(x => x.TransitOrderWaybillToWareHouseStr, value); }
}
/// <summary>
/// 提前取号物流编号（虚拟）
/// </summary>
public string TransitOrderWaybillFakeStr
{
get { return this.GetValue(x => x.TransitOrderWaybillToWareHouseStr); }
set { this.SetValue(x => x.TransitOrderWaybillToWareHouseStr, value); TransitOrderWaybillToWareHouseStrVisibility = string.IsNullOrWhiteSpace(value) ? Visibility.Collapsed : Visibility.Visible; }
}
public Visibility TransitOrderWaybillToWareHouseStrVisibility
{
get { return this.GetValue(x => x.TransitOrderWaybillToWareHouseStrVisibility); }
set { this.SetValue(x => x.TransitOrderWaybillToWareHouseStrVisibility, value); }
}
/// <summary>
/// 提前取号物流编号（虚拟）
/// </summary>
public string TransitOrderWaybillFakeStr
{
get { return this.GetValue(x => x.TransitOrderWaybillFakeStr); }
set { this.SetValue(x => x.TransitOrderWaybillFakeStr, value); }
@@ -557,7 +596,12 @@ namespace AllBase.Model.DBModel
public string TransitOrderWaybillFromWareHouseStr
{
get { return this.GetValue(x => x.TransitOrderWaybillFromWareHouseStr); }
set { this.SetValue(x => x.TransitOrderWaybillFromWareHouseStr, value); }
set { this.SetValue(x => x.TransitOrderWaybillFromWareHouseStr, value); TransitOrderWaybillFromWareHouseStrVisibility = string.IsNullOrWhiteSpace(value) ? Visibility.Collapsed : Visibility.Visible; }
}
public Visibility TransitOrderWaybillFromWareHouseStrVisibility
{
get { return this.GetValue(x => x.TransitOrderWaybillFromWareHouseStrVisibility); }
set { this.SetValue(x => x.TransitOrderWaybillFromWareHouseStrVisibility, value); }
}
public string TransitWarehouseAfterSaleWayBillStr
{
@@ -788,20 +832,25 @@ namespace AllBase.Model.DBModel
get { return this.GetValue(x => x.WarehouseWaybillStatusBackColor); }
set { this.SetValue(x => x.WarehouseWaybillStatusBackColor, value); }
}
#endregion
#endregion
/// <summary>
/// 中转仓表买手售后字段文字显示
/// </summary>
public string TransitRefundStatusStr
/// <summary>
/// 中转仓表买手售后字段文字显示
/// </summary>
public string TransitRefundStatusStr
{
get { return this.GetValue(x => x.TransitRefundStatusStr); }
set { this.SetValue(x => x.TransitRefundStatusStr, value); }
set { this.SetValue(x => x.TransitRefundStatusStr, value); TransitRefundStatusStrVisibility = string.IsNullOrWhiteSpace(value) ? Visibility.Collapsed : Visibility.Visible; }
}
/// <summary>
/// 中转仓表买手售后字段文字显示背景颜色
/// </summary>
public SolidColorBrush TransitRefundStatusBackColor
public Visibility TransitRefundStatusStrVisibility
{
get { return this.GetValue(x => x.TransitRefundStatusStrVisibility); }
set { this.SetValue(x => x.TransitRefundStatusStrVisibility, value); }
}
/// <summary>
/// 中转仓表买手售后字段文字显示背景颜色
/// </summary>
public SolidColorBrush TransitRefundStatusBackColor
{
get { return this.GetValue(x => x.TransitRefundStatusBackColor); }
set { this.SetValue(x => x.TransitRefundStatusBackColor, value); }
@@ -860,13 +909,18 @@ namespace AllBase.Model.DBModel
else
TransitRefundVoidStatusStr = "";
}
// 仓库采购时间是否达标字段
public string OutOrderTimeQualifiedStr
public string OutOrderTimeQualifiedStr
{
get { return this.GetValue(x => x.OutOrderTimeQualifiedStr); }
set { this.SetValue(x => x.OutOrderTimeQualifiedStr, value); }
set { this.SetValue(x => x.OutOrderTimeQualifiedStr, value); OutOrderTimeQualifiedStrVisibility = string.IsNullOrWhiteSpace(value) ? Visibility.Collapsed : Visibility.Visible; }
}
public Visibility OutOrderTimeQualifiedStrVisibility
{
get { return this.GetValue(x => x.OutOrderTimeQualifiedStrVisibility); }
set { this.SetValue(x => x.OutOrderTimeQualifiedStrVisibility, value); }
}
void SetOutOrderTimeQualifiedStr()
{
@@ -1020,7 +1074,12 @@ namespace AllBase.Model.DBModel
public string DirectOrderBuyTimeStr
{
get { return this.GetValue(x => x.DirectOrderBuyTimeStr); }
set { this.SetValue(x => x.DirectOrderBuyTimeStr, value); }
set { this.SetValue(x => x.DirectOrderBuyTimeStr, value); DirectOrderBuyTimeStrVisibility = string.IsNullOrWhiteSpace(value) ? Visibility.Collapsed : Visibility.Visible; }
}
public Visibility DirectOrderBuyTimeStrVisibility
{
get { return this.GetValue(x => x.DirectOrderBuyTimeStrVisibility); }
set { this.SetValue(x => x.DirectOrderBuyTimeStrVisibility, value); }
}
@@ -1043,7 +1102,25 @@ namespace AllBase.Model.DBModel
public string DirectPddBuyerAfterSaleAddressStr
{
get { return this.GetValue(x => x.DirectPddBuyerAfterSaleAddressStr); }
set { this.SetValue(x => x.DirectPddBuyerAfterSaleAddressStr, value); }
set
{
this.SetValue(x => x.DirectPddBuyerAfterSaleAddressStr, value);
if (value.ParseToString().Length > 19)
DirectPddBuyerAfterSaleAddressShortStr = string.Join("", value.ParseToString().Take(19)) + "…";
else
DirectPddBuyerAfterSaleAddressShortStr = value.ParseToString();
DirectPddBuyerAfterSaleAddressStrVisibility = string.IsNullOrWhiteSpace(value) ? Visibility.Collapsed : Visibility.Visible;
}
}
public string DirectPddBuyerAfterSaleAddressShortStr
{
get { return this.GetValue(x => x.DirectPddBuyerAfterSaleAddressShortStr); }
set { this.SetValue(x => x.DirectPddBuyerAfterSaleAddressShortStr, value); }
}
public Visibility DirectPddBuyerAfterSaleAddressStrVisibility
{
get { return this.GetValue(x => x.DirectPddBuyerAfterSaleAddressStrVisibility); }
set { this.SetValue(x => x.DirectPddBuyerAfterSaleAddressStrVisibility, value); }
}
public string DirectRefundStatusStr
{
@@ -1450,7 +1527,11 @@ namespace AllBase.Model.DBModel
/// <summary>
/// sku属性JSON
/// </summary>
public string sku_attrs { get; set; }
public string sku_attrs
{
get { return this.GetValue(x => x.sku_attrs); }
set { this.SetValue(x => x.sku_attrs, value); SetSkuAttrStr(); }
}
/// <summary>
/// sku实付总价，取estimate_price和change_price中较小值
/// </summary>
@@ -1572,7 +1653,6 @@ namespace AllBase.Model.DBModel
// }));
//}
this.SetSkuAttrStr();
this.SetItemRefund();
this.SetTransitOrder();
this.SetDirectOrder();
@@ -1596,6 +1676,7 @@ namespace AllBase.Model.DBModel
tOrder.SetOutOrderBuyerStr();
}
ItemTransitOutOrderBuyerStrVisibility = (ItemTransitOrderWithVoid?.OutOrderBuyerStr).IsNullOrEmpty() ? Visibility.Collapsed : Visibility.Visible;
ItemTransitOutOrderNoStrVisibility = (ItemTransitOrderWithVoid?.OutOrderNumStr).IsNullOrEmpty() ? Visibility.Collapsed : Visibility.Visible;
}
}
Work/_29Tools/Forms/PddMobileBuyOrderForm.cs
+1
View File
@@ -1181,6 +1181,7 @@ namespace TemuKJD.ToolForms
}
}
}
//time=1792314251&code=22107EDBDC132F485500B33B4C58CFDB&code_version=1&version=329&user_name=13367632144&path=29wx&spu_code=10001462916616&sku_code=%e7%bb%bf%e8%89%b2%e6%8c%8e%e5%8c%85%e5%b0%8f%e9%bb%91%e7%8c%ab%e6%8c%82%e4%bb%b6&main_user_name=13367632144&map_goods_name=超萌小黑猫挂件手工编织毛绒公仔多色礼物送朋友&map_spec_name=【大眼猫】挎包绿&map_goods_id=984310168545&map_sku_id=1941546612897&map_send_address=&transit_warehouse_id=XDYSHANDC
url = BaseClass.Build29WxObjString("order/wx_add_mdy_buy_prod_map");
var result = await GetHtml.PostUtf8Async(url, data);
if (!result.Contains("\"code\":200"))