1优化拍单逻辑 2优化部分文件位置命名等

This commit is contained in:
wule committed 2026-06-25 16:45:28 +08:00
1 parent 34c51c6fcd
commit 1e27c0b1e1
65 files changed
+2594 -268

No files matched your search

+16 -7
View File
@@ -1,7 +1,7 @@
using AllBase;
using AllBase.Helper;
using AllBase.Model;
using AllBase.Model.Params;
using AllBase.Model.Local;
using AllBase.Model.Result;
using CefSharp;
using CefSharp.WinForms;
@@ -64,6 +64,8 @@ namespace TemuKJD.ToolForms
this.Height = SystemInformation.WorkingArea.Height - 80;
this.CenterToScreen();
//splitContainer1.Dock = DockStyle.Fill;
if (CloseAfterSecond > 0)
{
Task.Run(() =>
@@ -96,7 +98,7 @@ namespace TemuKJD.ToolForms
this.txtShopSkuId.Text = orderItem.sku_id;
this.txtShopGoodsId.Text = orderItem.product_id;
this.txtUpSpuCode.Text = orderItem.out_product_id;
this.txtUpSkuCode.Text = orderItem.out_sku_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;
this.txtShopOrderItemCnt.Text = orderItem.sku_cnt.ParseToString();
@@ -140,14 +142,14 @@ namespace TemuKJD.ToolForms
{
//cefWebBrowser = CEFBrowser.CreateChromiumWebBrowser("about:blank", false);
if (!string.IsNullOrEmpty(InitUrl))
cefWebBrowser = CEFBrowser.CreateChromiumWebBrowser(InitUrl, false);
cefWebBrowser = CEFBrowser.CreateChromiumWebBrowser(InitUrl, true, true);
else
cefWebBrowser = CEFBrowser.CreateChromiumWebBrowser(shopMainUrl, false);
CustomResourceRequestHandlerLocal resourceRequestHandler = new CustomResourceRequestHandlerLocal();
LocalResourceRequestHandler resourceRequestHandler = new LocalResourceRequestHandler();
resourceRequestHandler.ResourceLoadCompleteEvent += RequestHandler_ResourceLoadComplete;
resourceRequestHandler.BeforeResourceLoadEvent += RequestHandler_BeforeResourceLoad;
cefWebBrowser.RequestHandler = new CustomRequestHandler(resourceRequestHandler);
var lifeSapnHandler = new LifeSpanHandlerLocal(PopWindowType.SelfWindow);
var lifeSapnHandler = new LocalLifeSpanHandler(PopWindowType.SelfWindow);
cefWebBrowser.LifeSpanHandler = lifeSapnHandler;
cefWebBrowser.KeyboardHandler = new KeyboardHandler();
cefWebBrowser.FrameLoadEnd += CefWebBrowser_FrameLoadEnd;
@@ -193,7 +195,8 @@ namespace TemuKJD.ToolForms
// cef138必须init后方可设置或删除cookie
while (!cefWebBrowser.IsBrowserInitialized || !cefWebBrowser.GetBrowser().MainFrame.IsValid)
Thread.Sleep(20);
CEFBrowser.DeleteCookie(cefWebBrowser.GetCookieManager(null));
CEFBrowser.DeleteCookie(cefWebBrowser.GetCookieManager(null), "mobile.yangkeduo.com");
CEFBrowser.DeleteCookie(cefWebBrowser.GetCookieManager(null), "yangkeduo.com");
//if (cookieLst.Any(c => c.Value.StartsWith("windows_1")))
// cefWebBrowser.ExecuteScriptAsync("navigator.__defineGetter__('userAgent', function() { return 'Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.5.40.8 Safari/537.36 PddWorkbench-Online PddBrowser pdd_windows_version/3.0.3.12'; });");
@@ -553,7 +556,8 @@ 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)
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.buy_map = map;
@@ -636,5 +640,10 @@ namespace TemuKJD.ToolForms
pictureBox1.Size = new Size(100, 100);
}
}
private void btnJumpOrderList_Click(object sender, EventArgs e)
{
cefWebBrowser.Load("https://mobile.yangkeduo.com/orders.html");
}
}
}
+152 -105
View File
@@ -83,6 +83,8 @@
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();
((System.ComponentModel.ISupportInitialize)(this.pbCloseBase)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel2.SuspendLayout();
@@ -92,6 +94,7 @@
this.splitContainer2.Panel2.SuspendLayout();
this.splitContainer2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.panel1.SuspendLayout();
this.SuspendLayout();
//
// pbCloseBase
@@ -101,68 +104,24 @@
//
// splitContainer1
//
this.splitContainer1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.splitContainer1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
this.splitContainer1.Location = new System.Drawing.Point(0, 0);
this.splitContainer1.Location = new System.Drawing.Point(3, 4);
this.splitContainer1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.splitContainer1.Name = "splitContainer1";
this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal;
this.splitContainer1.Panel1MinSize = 0;
//
// splitContainer1.Panel2
//
this.splitContainer1.Panel2.BackColor = System.Drawing.Color.White;
this.splitContainer1.Panel2.Controls.Add(this.chkChangeWarehouseAddress);
this.splitContainer1.Panel2.Controls.Add(this.pictureBox1);
this.splitContainer1.Panel2.Controls.Add(this.txtBuySkuName);
this.splitContainer1.Panel2.Controls.Add(this.label20);
this.splitContainer1.Panel2.Controls.Add(this.label6);
this.splitContainer1.Panel2.Controls.Add(this.label21);
this.splitContainer1.Panel2.Controls.Add(this.cmbTransitWarehouse);
this.splitContainer1.Panel2.Controls.Add(this.label15);
this.splitContainer1.Panel2.Controls.Add(this.txtShopOrderItemPrice);
this.splitContainer1.Panel2.Controls.Add(this.txtBuySkuId);
this.splitContainer1.Panel2.Controls.Add(this.label16);
this.splitContainer1.Panel2.Controls.Add(this.txtBuyOrderId);
this.splitContainer1.Panel2.Controls.Add(this.txtShopOrderItemCnt);
this.splitContainer1.Panel2.Controls.Add(this.label22);
this.splitContainer1.Panel2.Controls.Add(this.label17);
this.splitContainer1.Panel2.Controls.Add(this.label19);
this.splitContainer1.Panel2.Controls.Add(this.btnManualUpdateTransitWarehouse);
this.splitContainer1.Panel2.Controls.Add(this.label23);
this.splitContainer1.Panel2.Controls.Add(this.label18);
this.splitContainer1.Panel2.Controls.Add(this.txtBuyCnt);
this.splitContainer1.Panel2.Controls.Add(this.txtBuyGoodsId);
this.splitContainer1.Panel2.Controls.Add(this.txtShopSpecName);
this.splitContainer1.Panel2.Controls.Add(this.txtBuyGoodsName);
this.splitContainer1.Panel2.Controls.Add(this.label14);
this.splitContainer1.Panel2.Controls.Add(this.txtBuyPrice);
this.splitContainer1.Panel2.Controls.Add(this.label13);
this.splitContainer1.Panel2.Controls.Add(this.label24);
this.splitContainer1.Panel2.Controls.Add(this.txtUpSpuCode);
this.splitContainer1.Panel2.Controls.Add(this.label12);
this.splitContainer1.Panel2.Controls.Add(this.txtUpSkuCode);
this.splitContainer1.Panel2.Controls.Add(this.label11);
this.splitContainer1.Panel2.Controls.Add(this.txtShopSkuId);
this.splitContainer1.Panel2.Controls.Add(this.label10);
this.splitContainer1.Panel2.Controls.Add(this.label9);
this.splitContainer1.Panel2.Controls.Add(this.txtShopGoodsId);
this.splitContainer1.Panel2.Controls.Add(this.label8);
this.splitContainer1.Panel2.Controls.Add(this.txtShopGoodsName);
this.splitContainer1.Panel2.Controls.Add(this.label7);
this.splitContainer1.Panel2.Controls.Add(this.btnManualUpdateBuyOrder);
this.splitContainer1.Panel2.Controls.Add(this.txtMapSkuName);
this.splitContainer1.Panel2.Controls.Add(this.label5);
this.splitContainer1.Panel2.Controls.Add(this.btnManualUpdateSendProvince);
this.splitContainer1.Panel2.Controls.Add(this.txtMapSkuId);
this.splitContainer1.Panel2.Controls.Add(this.label4);
this.splitContainer1.Panel2.Controls.Add(this.label3);
this.splitContainer1.Panel2.Controls.Add(this.txtMapGoodsId);
this.splitContainer1.Panel2.Controls.Add(this.txtMapGoodsName);
this.splitContainer1.Panel2.Controls.Add(this.label2);
this.splitContainer1.Panel2.Controls.Add(this.label1);
this.splitContainer1.Panel2.Controls.Add(this.txtSendProvince);
this.splitContainer1.Size = new System.Drawing.Size(1358, 704);
this.splitContainer1.SplitterDistance = 868;
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.SplitterWidth = 3;
this.splitContainer1.TabIndex = 4;
//
@@ -171,7 +130,7 @@
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(83, 347);
this.txtBuySkuName.Location = new System.Drawing.Point(85, 352);
this.txtBuySkuName.Name = "txtBuySkuName";
this.txtBuySkuName.Size = new System.Drawing.Size(388, 23);
this.txtBuySkuName.TabIndex = 848;
@@ -179,7 +138,7 @@
// label21
//
this.label21.AutoSize = true;
this.label21.Location = new System.Drawing.Point(27, 349);
this.label21.Location = new System.Drawing.Point(29, 354);
this.label21.Name = "label21";
this.label21.Size = new System.Drawing.Size(56, 17);
this.label21.TabIndex = 847;
@@ -190,7 +149,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(319, 376);
this.txtBuySkuId.Location = new System.Drawing.Point(321, 381);
this.txtBuySkuId.Name = "txtBuySkuId";
this.txtBuySkuId.Size = new System.Drawing.Size(152, 23);
this.txtBuySkuId.TabIndex = 846;
@@ -198,7 +157,7 @@
// label22
//
this.label22.AutoSize = true;
this.label22.Location = new System.Drawing.Point(250, 379);
this.label22.Location = new System.Drawing.Point(252, 384);
this.label22.Name = "label22";
this.label22.Size = new System.Drawing.Size(69, 17);
this.label22.TabIndex = 845;
@@ -207,7 +166,7 @@
// label23
//
this.label23.AutoSize = true;
this.label23.Location = new System.Drawing.Point(14, 379);
this.label23.Location = new System.Drawing.Point(16, 384);
this.label23.Name = "label23";
this.label23.Size = new System.Drawing.Size(69, 17);
this.label23.TabIndex = 844;
@@ -216,7 +175,7 @@
// txtBuyGoodsId
//
this.txtBuyGoodsId.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.txtBuyGoodsId.Location = new System.Drawing.Point(83, 376);
this.txtBuyGoodsId.Location = new System.Drawing.Point(85, 381);
this.txtBuyGoodsId.Name = "txtBuyGoodsId";
this.txtBuyGoodsId.Size = new System.Drawing.Size(152, 23);
this.txtBuyGoodsId.TabIndex = 843;
@@ -226,7 +185,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(83, 318);
this.txtBuyGoodsName.Location = new System.Drawing.Point(85, 323);
this.txtBuyGoodsName.Name = "txtBuyGoodsName";
this.txtBuyGoodsName.Size = new System.Drawing.Size(388, 23);
this.txtBuyGoodsName.TabIndex = 842;
@@ -234,7 +193,7 @@
// label24
//
this.label24.AutoSize = true;
this.label24.Location = new System.Drawing.Point(27, 321);
this.label24.Location = new System.Drawing.Point(29, 326);
this.label24.Name = "label24";
this.label24.Size = new System.Drawing.Size(56, 17);
this.label24.TabIndex = 841;
@@ -244,7 +203,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(27, 294);
this.label6.Location = new System.Drawing.Point(29, 299);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(68, 17);
this.label6.TabIndex = 840;
@@ -254,7 +213,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(39, 632);
this.label20.Location = new System.Drawing.Point(41, 631);
this.label20.Name = "label20";
this.label20.Size = new System.Drawing.Size(44, 17);
this.label20.TabIndex = 839;
@@ -265,7 +224,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(83, 628);
this.cmbTransitWarehouse.Location = new System.Drawing.Point(85, 627);
this.cmbTransitWarehouse.Name = "cmbTransitWarehouse";
this.cmbTransitWarehouse.Size = new System.Drawing.Size(388, 25);
this.cmbTransitWarehouse.TabIndex = 838;
@@ -275,7 +234,7 @@
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(319, 405);
this.txtBuyPrice.Location = new System.Drawing.Point(321, 410);
this.txtBuyPrice.Name = "txtBuyPrice";
this.txtBuyPrice.ReadOnly = true;
this.txtBuyPrice.Size = new System.Drawing.Size(152, 23);
@@ -284,7 +243,7 @@
// label18
//
this.label18.AutoSize = true;
this.label18.Location = new System.Drawing.Point(263, 408);
this.label18.Location = new System.Drawing.Point(265, 413);
this.label18.Name = "label18";
this.label18.Size = new System.Drawing.Size(56, 17);
this.label18.TabIndex = 836;
@@ -293,7 +252,7 @@
// txtBuyCnt
//
this.txtBuyCnt.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.txtBuyCnt.Location = new System.Drawing.Point(83, 405);
this.txtBuyCnt.Location = new System.Drawing.Point(85, 410);
this.txtBuyCnt.Name = "txtBuyCnt";
this.txtBuyCnt.Size = new System.Drawing.Size(152, 23);
this.txtBuyCnt.TabIndex = 835;
@@ -301,7 +260,7 @@
// label19
//
this.label19.AutoSize = true;
this.label19.Location = new System.Drawing.Point(27, 408);
this.label19.Location = new System.Drawing.Point(29, 413);
this.label19.Name = "label19";
this.label19.Size = new System.Drawing.Size(56, 17);
this.label19.TabIndex = 834;
@@ -312,7 +271,7 @@
this.txtShopOrderItemPrice.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.txtShopOrderItemPrice.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.txtShopOrderItemPrice.Location = new System.Drawing.Point(319, 254);
this.txtShopOrderItemPrice.Location = new System.Drawing.Point(321, 259);
this.txtShopOrderItemPrice.Name = "txtShopOrderItemPrice";
this.txtShopOrderItemPrice.Size = new System.Drawing.Size(152, 23);
this.txtShopOrderItemPrice.TabIndex = 833;
@@ -320,7 +279,7 @@
// label16
//
this.label16.AutoSize = true;
this.label16.Location = new System.Drawing.Point(287, 257);
this.label16.Location = new System.Drawing.Point(289, 262);
this.label16.Name = "label16";
this.label16.Size = new System.Drawing.Size(32, 17);
this.label16.TabIndex = 832;
@@ -329,7 +288,7 @@
// txtShopOrderItemCnt
//
this.txtShopOrderItemCnt.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.txtShopOrderItemCnt.Location = new System.Drawing.Point(83, 254);
this.txtShopOrderItemCnt.Location = new System.Drawing.Point(85, 259);
this.txtShopOrderItemCnt.Name = "txtShopOrderItemCnt";
this.txtShopOrderItemCnt.Size = new System.Drawing.Size(152, 23);
this.txtShopOrderItemCnt.TabIndex = 831;
@@ -337,7 +296,7 @@
// label17
//
this.label17.AutoSize = true;
this.label17.Location = new System.Drawing.Point(51, 257);
this.label17.Location = new System.Drawing.Point(53, 262);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(32, 17);
this.label17.TabIndex = 830;
@@ -348,7 +307,7 @@
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(83, 434);
this.txtBuyOrderId.Location = new System.Drawing.Point(85, 439);
this.txtBuyOrderId.Name = "txtBuyOrderId";
this.txtBuyOrderId.ReadOnly = true;
this.txtBuyOrderId.Size = new System.Drawing.Size(388, 23);
@@ -357,7 +316,7 @@
// label15
//
this.label15.AutoSize = true;
this.label15.Location = new System.Drawing.Point(15, 437);
this.label15.Location = new System.Drawing.Point(17, 442);
this.label15.Name = "label15";
this.label15.Size = new System.Drawing.Size(68, 17);
this.label15.TabIndex = 828;
@@ -370,7 +329,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(357, 659);
this.btnManualUpdateTransitWarehouse.Location = new System.Drawing.Point(359, 658);
this.btnManualUpdateTransitWarehouse.Name = "btnManualUpdateTransitWarehouse";
this.btnManualUpdateTransitWarehouse.Size = new System.Drawing.Size(114, 23);
this.btnManualUpdateTransitWarehouse.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -393,7 +352,7 @@
this.txtShopSpecName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.txtShopSpecName.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.txtShopSpecName.Location = new System.Drawing.Point(83, 167);
this.txtShopSpecName.Location = new System.Drawing.Point(85, 172);
this.txtShopSpecName.Name = "txtShopSpecName";
this.txtShopSpecName.Size = new System.Drawing.Size(388, 23);
this.txtShopSpecName.TabIndex = 817;
@@ -401,7 +360,7 @@
// label14
//
this.label14.AutoSize = true;
this.label14.Location = new System.Drawing.Point(27, 170);
this.label14.Location = new System.Drawing.Point(29, 175);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(56, 17);
this.label14.TabIndex = 816;
@@ -412,7 +371,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(27, 488);
this.label13.Location = new System.Drawing.Point(29, 487);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(92, 17);
this.label13.TabIndex = 815;
@@ -421,7 +380,7 @@
// txtUpSpuCode
//
this.txtUpSpuCode.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.txtUpSpuCode.Location = new System.Drawing.Point(83, 225);
this.txtUpSpuCode.Location = new System.Drawing.Point(85, 230);
this.txtUpSpuCode.Name = "txtUpSpuCode";
this.txtUpSpuCode.Size = new System.Drawing.Size(152, 23);
this.txtUpSpuCode.TabIndex = 814;
@@ -429,7 +388,7 @@
// label12
//
this.label12.AutoSize = true;
this.label12.Location = new System.Drawing.Point(239, 228);
this.label12.Location = new System.Drawing.Point(241, 233);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(80, 17);
this.label12.TabIndex = 813;
@@ -440,7 +399,7 @@
this.txtUpSkuCode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.txtUpSkuCode.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.txtUpSkuCode.Location = new System.Drawing.Point(319, 225);
this.txtUpSkuCode.Location = new System.Drawing.Point(321, 230);
this.txtUpSkuCode.Name = "txtUpSkuCode";
this.txtUpSkuCode.Size = new System.Drawing.Size(152, 23);
this.txtUpSkuCode.TabIndex = 812;
@@ -448,7 +407,7 @@
// label11
//
this.label11.AutoSize = true;
this.label11.Location = new System.Drawing.Point(3, 228);
this.label11.Location = new System.Drawing.Point(5, 233);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(80, 17);
this.label11.TabIndex = 811;
@@ -459,7 +418,7 @@
this.txtShopSkuId.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.txtShopSkuId.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.txtShopSkuId.Location = new System.Drawing.Point(319, 196);
this.txtShopSkuId.Location = new System.Drawing.Point(321, 201);
this.txtShopSkuId.Name = "txtShopSkuId";
this.txtShopSkuId.Size = new System.Drawing.Size(152, 23);
this.txtShopSkuId.TabIndex = 810;
@@ -467,7 +426,7 @@
// label10
//
this.label10.AutoSize = true;
this.label10.Location = new System.Drawing.Point(250, 199);
this.label10.Location = new System.Drawing.Point(252, 204);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(69, 17);
this.label10.TabIndex = 809;
@@ -476,7 +435,7 @@
// label9
//
this.label9.AutoSize = true;
this.label9.Location = new System.Drawing.Point(14, 199);
this.label9.Location = new System.Drawing.Point(16, 204);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(69, 17);
this.label9.TabIndex = 808;
@@ -485,7 +444,7 @@
// txtShopGoodsId
//
this.txtShopGoodsId.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.txtShopGoodsId.Location = new System.Drawing.Point(83, 196);
this.txtShopGoodsId.Location = new System.Drawing.Point(85, 201);
this.txtShopGoodsId.Name = "txtShopGoodsId";
this.txtShopGoodsId.Size = new System.Drawing.Size(152, 23);
this.txtShopGoodsId.TabIndex = 807;
@@ -494,7 +453,7 @@
//
this.label8.AutoSize = true;
this.label8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label8.Location = new System.Drawing.Point(27, 114);
this.label8.Location = new System.Drawing.Point(29, 119);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(92, 17);
this.label8.TabIndex = 806;
@@ -505,7 +464,7 @@
this.txtShopGoodsName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.txtShopGoodsName.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.txtShopGoodsName.Location = new System.Drawing.Point(83, 138);
this.txtShopGoodsName.Location = new System.Drawing.Point(85, 143);
this.txtShopGoodsName.Name = "txtShopGoodsName";
this.txtShopGoodsName.Size = new System.Drawing.Size(388, 23);
this.txtShopGoodsName.TabIndex = 805;
@@ -513,7 +472,7 @@
// label7
//
this.label7.AutoSize = true;
this.label7.Location = new System.Drawing.Point(27, 141);
this.label7.Location = new System.Drawing.Point(29, 146);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(56, 17);
this.label7.TabIndex = 804;
@@ -526,7 +485,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(357, 463);
this.btnManualUpdateBuyOrder.Location = new System.Drawing.Point(359, 468);
this.btnManualUpdateBuyOrder.Name = "btnManualUpdateBuyOrder";
this.btnManualUpdateBuyOrder.Size = new System.Drawing.Size(114, 23);
this.btnManualUpdateBuyOrder.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -549,7 +508,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(83, 541);
this.txtMapSkuName.Location = new System.Drawing.Point(85, 540);
this.txtMapSkuName.Name = "txtMapSkuName";
this.txtMapSkuName.Size = new System.Drawing.Size(388, 23);
this.txtMapSkuName.TabIndex = 794;
@@ -558,7 +517,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(27, 543);
this.label5.Location = new System.Drawing.Point(29, 542);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(56, 17);
this.label5.TabIndex = 793;
@@ -571,7 +530,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(357, 599);
this.btnManualUpdateSendProvince.Location = new System.Drawing.Point(359, 598);
this.btnManualUpdateSendProvince.Name = "btnManualUpdateSendProvince";
this.btnManualUpdateSendProvince.Size = new System.Drawing.Size(114, 23);
this.btnManualUpdateSendProvince.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -594,7 +553,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(319, 570);
this.txtMapSkuId.Location = new System.Drawing.Point(321, 569);
this.txtMapSkuId.Name = "txtMapSkuId";
this.txtMapSkuId.Size = new System.Drawing.Size(152, 23);
this.txtMapSkuId.TabIndex = 474;
@@ -603,7 +562,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(250, 573);
this.label4.Location = new System.Drawing.Point(252, 572);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(69, 17);
this.label4.TabIndex = 473;
@@ -613,7 +572,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(14, 573);
this.label3.Location = new System.Drawing.Point(16, 572);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(69, 17);
this.label3.TabIndex = 472;
@@ -623,7 +582,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(83, 570);
this.txtMapGoodsId.Location = new System.Drawing.Point(85, 569);
this.txtMapGoodsId.Name = "txtMapGoodsId";
this.txtMapGoodsId.Size = new System.Drawing.Size(152, 23);
this.txtMapGoodsId.TabIndex = 471;
@@ -633,7 +592,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(83, 512);
this.txtMapGoodsName.Location = new System.Drawing.Point(85, 511);
this.txtMapGoodsName.Name = "txtMapGoodsName";
this.txtMapGoodsName.Size = new System.Drawing.Size(388, 23);
this.txtMapGoodsName.TabIndex = 470;
@@ -642,7 +601,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(27, 515);
this.label2.Location = new System.Drawing.Point(29, 514);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(56, 17);
this.label2.TabIndex = 469;
@@ -652,7 +611,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(39, 602);
this.label1.Location = new System.Drawing.Point(41, 601);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(44, 17);
this.label1.TabIndex = 468;
@@ -663,7 +622,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(83, 599);
this.txtSendProvince.Location = new System.Drawing.Point(85, 598);
this.txtSendProvince.Name = "txtSendProvince";
this.txtSendProvince.Size = new System.Drawing.Size(268, 23);
this.txtSendProvince.TabIndex = 467;
@@ -683,6 +642,7 @@
//
// splitContainer2.Panel2
//
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.SplitterDistance = 26;
@@ -703,7 +663,7 @@
// pictureBox1
//
this.pictureBox1.Anchor = System.Windows.Forms.AnchorStyles.Top;
this.pictureBox1.Location = new System.Drawing.Point(30, 7);
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;
@@ -716,13 +676,97 @@
this.chkChangeWarehouseAddress.AutoSize = true;
this.chkChangeWarehouseAddress.Checked = true;
this.chkChangeWarehouseAddress.CheckState = System.Windows.Forms.CheckState.Checked;
this.chkChangeWarehouseAddress.Location = new System.Drawing.Point(307, 6);
this.chkChangeWarehouseAddress.Location = new System.Drawing.Point(309, 11);
this.chkChangeWarehouseAddress.Name = "chkChangeWarehouseAddress";
this.chkChangeWarehouseAddress.Size = new System.Drawing.Size(171, 21);
this.chkChangeWarehouseAddress.TabIndex = 859;
this.chkChangeWarehouseAddress.Text = "保存地址时替换为云仓地址";
this.chkChangeWarehouseAddress.UseVisualStyleBackColor = true;
//
// panel1
//
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);
//
// PddMobileBuyOrderForm
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -740,7 +784,6 @@
this.Controls.SetChildIndex(this.splitContainer2, 0);
((System.ComponentModel.ISupportInitialize)(this.pbCloseBase)).EndInit();
this.splitContainer1.Panel2.ResumeLayout(false);
this.splitContainer1.Panel2.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
this.splitContainer1.ResumeLayout(false);
this.splitContainer2.Panel1.ResumeLayout(false);
@@ -749,6 +792,8 @@
((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
this.splitContainer2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
this.ResumeLayout(false);
}
@@ -808,5 +853,7 @@
private System.Windows.Forms.ComboBox cmbTransitWarehouse;
private System.Windows.Forms.PictureBox pictureBox1;
private Work.UserComponents.UcCheckBox chkChangeWarehouseAddress;
private System.Windows.Forms.Panel panel1;
private DevComponents.DotNetBar.PanelEx btnJumpOrderList;
}
}
+3 -2
View File
@@ -1,5 +1,6 @@
using AllBase;
using AllBase.Helper;
using AllBase.Model.Local;
using AllBase.Model.Result;
using CefSharp;
using CefSharp.WinForms;
@@ -100,11 +101,11 @@ namespace TemuKJD.ToolForms
cefWebBrowser = CEFBrowser.CreateChromiumWebBrowser(InitUrl, false);
else
cefWebBrowser = CEFBrowser.CreateChromiumWebBrowser(shopMainUrl, false);
CustomResourceRequestHandlerLocal resourceRequestHandler = new CustomResourceRequestHandlerLocal();
LocalResourceRequestHandler resourceRequestHandler = new LocalResourceRequestHandler();
resourceRequestHandler.ResourceLoadCompleteEvent += RequestHandler_ResourceLoadComplete;
resourceRequestHandler.BeforeResourceLoadEvent += RequestHandler_BeforeResourceLoad;
cefWebBrowser.RequestHandler = new CustomRequestHandler(resourceRequestHandler);
var lifeSapnHandler = new LifeSpanHandlerLocal(PopWindowType.SelfWindow);
var lifeSapnHandler = new LocalLifeSpanHandler(PopWindowType.SelfWindow);
cefWebBrowser.LifeSpanHandler = lifeSapnHandler;
cefWebBrowser.KeyboardHandler = new KeyboardHandler();
cefWebBrowser.FrameLoadEnd += CefWebBrowser_FrameLoadEnd;