修复拍单后到再次读单前,拍单时间显示错误问题。
This commit is contained in:
1 parent
8d9ed2f451
commit
5528d82d43
3 files changed
+309
-10
No files matched your search
@@ -39,11 +39,11 @@ using Work.BaseForms;
|
||||
using static System.Windows.Forms.VisualStyles.VisualStyleElement.StartPanel;
|
||||
|
||||
namespace TemuKJD.ToolForms
|
||||
{
|
||||
|
||||
{
|
||||
public partial class PddMobileBuyOrderForm : BaseGeneralForm
|
||||
{
|
||||
public oms_wei_external_procurement_log_info AbnormalTransitWarehouseOrderInfo { get; set; } = null;
|
||||
public pddFrontGoods3List pddFrontGoodsLite = new pddFrontGoods3List();
|
||||
|
||||
public bool IsAutoBuy { get; set; } = true;
|
||||
public bool IsFormLoad { get; set; } = false;
|
||||
@@ -402,7 +402,10 @@ namespace TemuKJD.ToolForms
|
||||
{
|
||||
MatchTransitWarehouse(sendProvince);
|
||||
}
|
||||
});
|
||||
|
||||
MatchProdAllSkus(data);
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
// 订单详情页面 获取关联信息和拍单信息(已拍过单但是因某种原因未成功绑定仓库)
|
||||
@@ -828,8 +831,50 @@ namespace TemuKJD.ToolForms
|
||||
}));
|
||||
}
|
||||
}
|
||||
|
||||
private void ShopLoginForm_FormClosed(object sender, FormClosedEventArgs e)
|
||||
|
||||
|
||||
void MatchProdAllSkus(string data)
|
||||
{
|
||||
var skusStrLst = BaseRegex.GetJsonArrStrJson(ref data, "skus");
|
||||
skusStrLst = skusStrLst.OrderByDescending(s => s.Length).ToList();
|
||||
pddFrontGoodsLite.skus = JsonHelper.DeserializeJsonToList<frontSkuInfo3>(skusStrLst?.FirstOrDefault());
|
||||
pddFrontGoodsLite.goodsName = BaseRegex.GetStringJson(ref data, "goodsName");
|
||||
pddFrontGoodsLite.goodsId = BaseRegex.GetLongJson(ref data, "goodsId");
|
||||
pddFrontGoodsLite.mallName = BaseRegex.GetStringJson(ref data, "mallName");
|
||||
pddFrontGoodsLite.mallId = BaseRegex.GetLongJson(ref data, "mallId");
|
||||
|
||||
|
||||
//bool isAutoGetWarehouse = false;
|
||||
//foreach (var item in this.cmbTransitWarehouse.Items)
|
||||
//{
|
||||
// TransitWarehouseParam warehouseParam = TransitWarehouseData.TransitWarehouseList.FirstOrDefault(t => t.TransName + " " + t.TransDetailAddress == item.ParseToString());
|
||||
// if (warehouseParam == null)
|
||||
// {
|
||||
// continue;
|
||||
// }
|
||||
// if (warehouseParam.TransDetailAddress.Contains(data))
|
||||
// {
|
||||
// Invoke(new Action(() =>
|
||||
// {
|
||||
// cmbTransitWarehouse.Text = warehouseParam.TransName + " " + warehouseParam.TransDetailAddress;
|
||||
// }));
|
||||
// transitWarehouse = warehouseParam;
|
||||
// isAutoGetWarehouse = true;
|
||||
// break;
|
||||
// }
|
||||
//}
|
||||
//if (!isAutoGetWarehouse)
|
||||
//{
|
||||
// //黄导家庭父母5天训练营-《父母5天成为孩子成长的引路人》+《不内卷养育》2本书
|
||||
// Invoke(new Action(() =>
|
||||
// {
|
||||
// cmbTransitWarehouse.Text = "";
|
||||
// BaseMsgForm.ShowError("匹配仓库失败,请手动选择");
|
||||
// }));
|
||||
//}
|
||||
}
|
||||
|
||||
private void ShopLoginForm_FormClosed(object sender, FormClosedEventArgs e)
|
||||
{
|
||||
//OnSaveComplete(shop);
|
||||
Task.Run(() => {
|
||||
@@ -871,8 +916,8 @@ namespace TemuKJD.ToolForms
|
||||
|
||||
}
|
||||
|
||||
|
||||
var url = BaseClass.Build29WxObjString("order/wx_add_mdy_buy_prod_map");
|
||||
string url;
|
||||
// 保存sku及商品关联信息
|
||||
var data = UserLogin.GetSignaturex()
|
||||
+ "&spu_code=" + GetHtml.UrlEncodeUtf8(txtUpSpuCode.Text.Trim())
|
||||
+ "&sku_code=" + GetHtml.UrlEncodeUtf8(txtUpSkuCode.Text.Trim())
|
||||
@@ -883,7 +928,24 @@ namespace TemuKJD.ToolForms
|
||||
+ "&map_sku_id=" + txtMapSkuId.Text.Trim()
|
||||
+ "&map_send_address=" + txtSendProvince.Text.Trim()
|
||||
+ "&transit_warehouse_id=" + transitWarehouse?.TransId;
|
||||
var result = GetHtml.PostUtf8(url, data);
|
||||
if (this.pddFrontGoodsLite != null && this.pddFrontGoodsLite.goodsId.ParseToString() == txtMapGoodsId.Text.Trim())
|
||||
{
|
||||
//// 保存商品关联信息
|
||||
//data += "&map_skus=" + GetHtml.UrlEncodeUtf8(JsonHelper.SerializeObject(pddFrontGoodsLite));
|
||||
//url = BaseClass.Build29WxObjString("order/wx_add_mdy_buy_prod_map_skus");
|
||||
//var skusRst = GetHtml.PostUtf8(url, data);
|
||||
//if (!skusRst.Contains("\"code\":200"))
|
||||
// skusRst = GetHtml.PostUtf8(url, data);
|
||||
|
||||
//// 存完立即测试读取
|
||||
////wx_get_buy_pord_map_skus
|
||||
//var dataTest = UserLogin.GetSignaturex() + "&spu_codes=" + GetHtml.UrlEncodeUtf8(txtUpSpuCode.Text.Trim());
|
||||
//dataTest += "&main_user_name=" + BaseClass.MainUserName;
|
||||
//url = BaseClass.Build29WxObjString("order/wx_get_buy_pord_map_skus");
|
||||
//var dataTestRst = GetHtml.PostUtf8(url, dataTest);
|
||||
}
|
||||
url = BaseClass.Build29WxObjString("order/wx_add_mdy_buy_prod_map");
|
||||
var result = GetHtml.PostUtf8(url, data);
|
||||
if (!result.Contains("\"code\":200"))
|
||||
result = GetHtml.PostUtf8(url, data);
|
||||
if (!result.Contains("\"code\":200"))
|
||||
@@ -938,8 +1000,6 @@ namespace TemuKJD.ToolForms
|
||||
BaseMsgForm.ShowInfo("保存成功!");
|
||||
this.Close();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
private async void btnManualUpdateBuyOrder_Click(object sender, EventArgs e)
|
||||
@@ -1065,6 +1125,7 @@ namespace TemuKJD.ToolForms
|
||||
out_amount = (txtBuyPrice.Text.ParseToDecimal() * 100).ParseToInt(),
|
||||
out_order_no = txtBuyOrderId.Text.Trim(),
|
||||
purchaser_note = body["purchaserNote"].ParseToString(),
|
||||
created_time = DateTime.Now,
|
||||
});
|
||||
orderItem.SetOrderItemTextProperty();
|
||||
// 利润计算重置为最小值,控件Resource更新时将计算利润
|
||||
|
||||
Reference in new issue
Block a user