From b6a0a22dd22e8afb84f527b35723118d7097a41f Mon Sep 17 00:00:00 2001
From: "506583276@qq.com" <506583276@qq.com>
Date: Fri, 19 May 2023 18:18:53 +0800
Subject: [PATCH] 1
---
.../PackPurchaseTask/ConfigPackResponse.cs | 41 -------------------
.../PackPurchaseTask/ProductSkuResponse.cs | 10 +++--
.../ViewModels/Order/OrderViewModel.cs | 6 ++-
BBWYB.Client/Views/Order/OrderList.xaml | 6 +--
.../Views/PackPurchaseTask/SetCerControl.xaml | 3 +-
.../Views/PackPurchaseTask/SetCerWindow.xaml | 3 --
BBWYB.Server.Business/Order/OrderBusiness.cs | 16 ++++++++
7 files changed, 29 insertions(+), 56 deletions(-)
diff --git a/BBWYB.Client/Models/APIModel/Response/PackPurchaseTask/ConfigPackResponse.cs b/BBWYB.Client/Models/APIModel/Response/PackPurchaseTask/ConfigPackResponse.cs
index dad4af1..27bc0f6 100644
--- a/BBWYB.Client/Models/APIModel/Response/PackPurchaseTask/ConfigPackResponse.cs
+++ b/BBWYB.Client/Models/APIModel/Response/PackPurchaseTask/ConfigPackResponse.cs
@@ -12,48 +12,7 @@ namespace BBWYB.Client.Models.APIModel
///
public class ConfigPackResponse
{
- /////
- ///// 货号品名
- /////
- //public string BrandName { get; set; }
- /////
- ///// 组合类型（单件=0，多件=1）
- /////
- //public int PackType { get; set; }
-
- /////
- ///// 基础包装（快递袋=0，纸箱=1，麻袋=2）
- /////
- //public int BasicPack { get; set; }
-
- /////
- ///// 增量耗材
- /////
- //public string Increment1 { get; set; }
-
- /////
- ///// 合格证位置（外部包装=0，产品包装=1）
- /////
- //public int? CertificatePosition { get; set; }
-
- /////
- ///// sku配件商品名称
- /////
- //public string SkuGoodsTitle { get; set; }
-
- /////
- ///// 配件数量
- /////
- //public int GoodsNumber { get; set; }
- /////
- ///// 是否需要条形码
- /////
- //public bool? NeedBar { get; set; }
- /////
- ///// 是否需要合格证
- /////
- //public bool? NeedCer { get; set; }
///
/// 配件列表
///
diff --git a/BBWYB.Client/Models/APIModel/Response/PackPurchaseTask/ProductSkuResponse.cs b/BBWYB.Client/Models/APIModel/Response/PackPurchaseTask/ProductSkuResponse.cs
index a710ba6..6d341b3 100644
--- a/BBWYB.Client/Models/APIModel/Response/PackPurchaseTask/ProductSkuResponse.cs
+++ b/BBWYB.Client/Models/APIModel/Response/PackPurchaseTask/ProductSkuResponse.cs
@@ -61,9 +61,7 @@ namespace BBWYB.Client.Models.APIModel
}
public class PackConfig
- {
-
-
+ {
///
/// skuid
///
@@ -131,6 +129,12 @@ namespace BBWYB.Client.Models.APIModel
public bool NeedBar { get; set; }
public bool NeedCer { get; set; }
+
+
+ /////
+ ///// 采购方案id
+ /////
+ //public string SkuPurchaseSchemeId { get; set; }
}
}
diff --git a/BBWYB.Client/ViewModels/Order/OrderViewModel.cs b/BBWYB.Client/ViewModels/Order/OrderViewModel.cs
index 6623014..05d7cab 100644
--- a/BBWYB.Client/ViewModels/Order/OrderViewModel.cs
+++ b/BBWYB.Client/ViewModels/Order/OrderViewModel.cs
@@ -107,8 +107,7 @@ namespace BBWYB.Client.ViewModels
var objList = (object[])obj;
var OriginShopName = (string)objList[0];
OrderSku order = (OrderSku)objList[1];
-
- var res = PackPurchaseTaskService.IsExitQikuTask(order.SkuId, order.OrderId);
+ var res = PackPurchaseTaskService.IsExitQikuTask(order.BelongSkuId, order.OrderId);
if (res == null || !res.Success)
{
MessageBox.Show("网络异常!查不到任务");
@@ -124,7 +123,10 @@ namespace BBWYB.Client.ViewModels
ViewModelLocator view = new();
var updatePackTask = view.UpdatePurchaseTask;
updatePackTask.SearchSku(obj);
+ updatePackTask.ReflashWindow = () => {
+ Task.Factory.StartNew(() => LoadOrder(PageIndex));
+ };
UpdatePurchaseTaskWindow packTask = new();
packTask.ShowDialog();
diff --git a/BBWYB.Client/Views/Order/OrderList.xaml b/BBWYB.Client/Views/Order/OrderList.xaml
index bc3dcec..4365cc6 100644
--- a/BBWYB.Client/Views/Order/OrderList.xaml
+++ b/BBWYB.Client/Views/Order/OrderList.xaml
@@ -410,11 +410,7 @@
Style="{StaticResource LinkButton}"
Visibility="{Binding OrderState,ConverterParameter=已取消:Collapsed:Visible,Converter={StaticResource objConverter}}"/>
-
+
diff --git a/BBWYB.Client/Views/PackPurchaseTask/SetCerControl.xaml b/BBWYB.Client/Views/PackPurchaseTask/SetCerControl.xaml
index ab6904c..bb1cf7b 100644
--- a/BBWYB.Client/Views/PackPurchaseTask/SetCerControl.xaml
+++ b/BBWYB.Client/Views/PackPurchaseTask/SetCerControl.xaml
@@ -6,8 +6,7 @@
xmlns:local="clr-namespace:BBWYB.Client.Views.PackPurchaseTask"
xmlns:cmodel="clr-namespace:BBWYB.Client.Models"
xmlns:c="clr-namespace:SJ.Controls;assembly=SJ.Controls"
- mc:Ignorable="d" Background="White"
-
+ mc:Ignorable="d" Background="White"
d:DesignHeight="700" d:DesignWidth="820">
diff --git a/BBWYB.Client/Views/PackPurchaseTask/SetCerWindow.xaml b/BBWYB.Client/Views/PackPurchaseTask/SetCerWindow.xaml
index 62845cf..3410e98 100644
--- a/BBWYB.Client/Views/PackPurchaseTask/SetCerWindow.xaml
+++ b/BBWYB.Client/Views/PackPurchaseTask/SetCerWindow.xaml
@@ -19,9 +19,6 @@
MaxButtonVisibility="Collapsed"
RightButtonGroupMargin="0,5,5,0">
-
-
-
diff --git a/BBWYB.Server.Business/Order/OrderBusiness.cs b/BBWYB.Server.Business/Order/OrderBusiness.cs
index 4fc103e..8dbd5a7 100644
--- a/BBWYB.Server.Business/Order/OrderBusiness.cs
+++ b/BBWYB.Server.Business/Order/OrderBusiness.cs
@@ -237,6 +237,22 @@ namespace BBWYB.Server.Business
new { sql = sql.AESEncrypt() },
new Dictionary() { { "Authorization", $"{mdsToken}" } },
HttpMethod.Post);
+
+ try
+ {
+ //取消齐库的任务
+ var qikuResponse = restApiService.SendRequest("http://qiku.qiyue666.com/",
+ $"/api/PackPurchaseTask/CancelOrderPackTask?orderId={request.OrderId}",
+ null,
+ null,
+ HttpMethod.Post);
+ if (qikuResponse.StatusCode != System.Net.HttpStatusCode.OK)
+ throw new Exception(qikuResponse.Content);
+ }
+ catch (Exception ex)
+ {
+ nLogManager.GetLogger($"取消打包任务-{request.OrderId}").Error(ex, JsonConvert.SerializeObject(request));
+ }
}
public void EditPrice(OP_EditPriceRequest request)