1

BBWYB.Client/Models/APIModel/Response/PackPurchaseTask/ConfigPackResponse.cs

@@ -12,48 +12,7 @@ namespace BBWYB.Client.Models.APIModel
     /// </summary>
     public class ConfigPackResponse
     {
-        ///// <summary>
-        ///// 货号品名
-        ///// </summary>
-        //public string BrandName { get; set; }
-        ///// <summary>
-        ///// 组合类型（单件=0，多件=1）
-        ///// </summary>
-        //public int PackType { get; set; }
 
-
-        ///// <summary>
-        ///// 基础包装（快递袋=0，纸箱=1，麻袋=2）
-        ///// </summary>
-        //public int BasicPack { get; set; }
-
-        ///// <summary>
-        ///// 增量耗材
-        ///// </summary>
-        //public string Increment1 { get; set; }
-
-        ///// <summary>
-        ///// 合格证位置（外部包装=0，产品包装=1）
-        ///// </summary>
-        //public int? CertificatePosition { get; set; }
-
-        ///// <summary>
-        ///// sku配件商品名称
-        ///// </summary>
-        //public string SkuGoodsTitle { get; set; }
-
-        ///// <summary>
-        ///// 配件数量
-        ///// </summary>
-        //public int GoodsNumber { get; set; }
-        ///// <summary>
-        ///// 是否需要条形码
-        ///// </summary>
-        //public bool? NeedBar { get; set; }
-        ///// <summary>
-        ///// 是否需要合格证
-        ///// </summary>
-        //public bool? NeedCer { get; set; }
         /// <summary>
         /// 配件列表
         /// </summary>

BBWYB.Client/Models/APIModel/Response/PackPurchaseTask/ProductSkuResponse.cs

@@ -61,9 +61,7 @@ namespace BBWYB.Client.Models.APIModel
 
     }
     public class PackConfig
-    {
-
-
+    {    
         /// <summary>
         /// skuid
         /// </summary>
@@ -131,6 +129,12 @@ namespace BBWYB.Client.Models.APIModel
         public bool NeedBar { get; set; }
 
         public bool NeedCer { get; set; }
+
+
+        ///// <summary>
+        ///// 采购方案id
+        ///// </summary>
+        //public string SkuPurchaseSchemeId { get; set; }
     }
 
 }

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();

BBWYB.Client/Views/Order/OrderList.xaml

@@ -410,11 +410,7 @@
                                                    Style="{StaticResource LinkButton}"
                                                    Visibility="{Binding OrderState,ConverterParameter=已取消:Collapsed:Visible,Converter={StaticResource objConverter}}"/>
 
-                                        <c:BButton Content="配置" Margin="5,0,0,0"
-                                                   Command="{Binding DataContext.EditPackConfigCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}"
-                                                   CommandParameter="{Binding }"     
-                                                   Style="{StaticResource LinkButton}"
-                                                   Visibility="{Binding PackConfigState ,ConverterParameter=#null:Collapsed:Visible,Converter={StaticResource objConverter}}"/>
+                                       
                                     </StackPanel>
                                 </Grid>
                                 <Grid Grid.Row="1">

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">
     <Grid DataContext="{Binding RelativeSource={RelativeSource Mode=FindAncestor,  AncestorType={x:Type local:SetCerControl}}}">
         <Grid.RowDefinitions>

BBWYB.Client/Views/PackPurchaseTask/SetCerWindow.xaml

@@ -19,9 +19,6 @@
         MaxButtonVisibility="Collapsed"
         RightButtonGroupMargin="0,5,5,0">
     <!--   DataContext="{Binding CreateSetBarCodeView,Source={StaticResource Locator}}"-->
-    <Window.Resources>
-
-    </Window.Resources>
     <Grid DataContext="{Binding RelativeSource={RelativeSource Mode=FindAncestor,  AncestorType={x:Type local:SetCerWindow}}}">
 
         <Grid.RowDefinitions>

BBWYB.Server.Business/Order/OrderBusiness.cs

@@ -237,6 +237,22 @@ namespace BBWYB.Server.Business
                                        new { sql = sql.AESEncrypt() },
                                        new Dictionary<string, string>() { { "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)