1

BBWYB.Client/APIServices/PackPurchaseTaskService.cs

@@ -98,12 +98,28 @@ namespace BBWYB.Client.APIServices
         {
 
             return SendRequest<ProductSkuResponse>(globalContext.QKApiHost, $"api/PackTask/SearchProduct?skuId={skuId}&ShopId={globalContext.User.Shop.ShopId}", null, null, HttpMethod.Get);
-            // HttpClientHelper helper = new HttpClientHelper(globalContext.QKApiHost);
 
-            //string url = $"{globalContext.QKApiHost}/api/PackTask/SearchProduct?skuId={skuId}&ShopId={globalContext.User.Shop.ShopId}";
-            //var data = helper.Get(url);
+        }
+
+        public ApiResponse<bool> UpdateOrderPackState(string skuId, string orderId)
+        {
+
+            return SendRequest<bool>(globalContext.QKApiHost, $"api/PackPurchaseTask/UpdateOrderPackState", new {
+                skuId,
+                orderId
+            }, null, HttpMethod.Post);
+
+        }
+
+        public ApiResponse<bool> IsExitQikuTask(string skuId, string orderId)
+        {
+
+            return SendRequest<bool>(globalContext.QKApiHost, $"api/PackPurchaseTask/IsExitQikuTask", new
+            {
+                skuId,
+                orderId
+            }, null, HttpMethod.Post);
 
-            //return JsonConvert.DeserializeObject<ApiResponse<ProductSkuResponse>>(data);
         }
 
     }

BBWYB.Client/ViewModels/Order/OrderViewModel.cs

@@ -67,7 +67,7 @@ namespace BBWYB.Client.ViewModels
 
         public ICommand EditPackConfigCommand { get; set; }
 
-        public OrderViewModel(GlobalContext globalContext, OrderService orderService)
+        public OrderViewModel(GlobalContext globalContext, OrderService orderService, PackPurchaseTaskService packPurchaseTaskService)
         {
             OrderList = new ObservableCollection<Order>();
             SetOrderStateCommand = new RelayCommand<OrderState?>(SetOrderState);
@@ -98,14 +98,33 @@ namespace BBWYB.Client.ViewModels
             this.globalContext = globalContext;
             this.orderService = orderService;
             Task.Factory.StartNew(() => LoadOrder(PageIndex));
+            PackPurchaseTaskService = packPurchaseTaskService;
         }
 
+        PackPurchaseTaskService PackPurchaseTaskService;
         private void EditPackConfig(Object obj)
         {
+            var objList = (object[])obj;
+            var OriginShopName = (string)objList[0];
+            OrderSku order = (OrderSku)objList[1];
 
-            ViewModelLocator view = new ();
-            var updatePackTask =      view.UpdatePurchaseTask;
+            var res = PackPurchaseTaskService.IsExitQikuTask(order.SkuId, order.OrderId);
+            if (res == null || !res.Success)
+            {
+                MessageBox.Show("网络异常!查不到任务");
+                return;
+            }
+            if (!res.Data)
+            {
+                MessageBox.Show("打包任务,不存在或已被删除,请重新发起任务!");
+                return;
+            }  
+            
+
+            ViewModelLocator view = new();
+            var updatePackTask = view.UpdatePurchaseTask;
             updatePackTask.SearchSku(obj);
+
             UpdatePurchaseTaskWindow packTask = new();
 
             packTask.ShowDialog();

BBWYB.Client/ViewModels/PackPurchaseTask/UpdatePurchaseTaskViewModel.cs

@@ -295,7 +295,7 @@ namespace BBWYB.Client.ViewModels
             this.packPurchaseTaskService = packPurchaseTaskService;
             this.productService = productService;
             this.globalContext = globalContext;
-             CreateTaskCommand = new RelayCommand<object>(CreateTask);
+            CreateTaskCommand = new RelayCommand<object>(CreateTask);
             OpenSkuDetailCommand = new RelayCommand<object>(OpenSkuDetail);
             SetBarCodeCommand = new RelayCommand(SetBarCode);
             SetCertificateCommand = new RelayCommand<Models.PackPurchaseTask.PurchaseSku>(SetCertificate);
@@ -384,11 +384,11 @@ namespace BBWYB.Client.ViewModels
 
             if (model.CerDTO == null)
             {
-                model.CerDTO =  new CertificateModel{
-                ProductNo = ProductNo,
-                Brand = Brand,
-                SkuId = SkuId,
-                PurchaseSkuId =model.PurchaseSkuId
+                model.CerDTO = new CertificateModel {
+                    ProductNo = ProductNo,
+                    Brand = Brand,
+                    SkuId = SkuId,
+                    PurchaseSkuId = model.PurchaseSkuId
 
                 };
             }
@@ -396,12 +396,12 @@ namespace BBWYB.Client.ViewModels
                 model.CerDTO.BrandName = BrandName;
 
             SetCerWindow setCerWindow = new SetCerWindow();
-            setCerWindow.LoadData(model.IsNeedCer,model.CerDTO, packPurchaseTaskService, spuCertificateModel, IsSetSpuCertificate);
+            setCerWindow.LoadData(model.IsNeedCer, model.CerDTO, packPurchaseTaskService, spuCertificateModel, IsSetSpuCertificate);
             setCerWindow.SaveResult = (s, PackCerState) =>
             {
                 var skus = PurchaseSkuList.SingleOrDefault(p => p.PurchaseSkuId == s.PurchaseSkuId);
                 skus.CerDTO = s;
-                skus.IsSetCertificate =false;
+                skus.IsSetCertificate = false;
                 skus.IsNeedCer = PackCerState == PackCerState.合格证信息;
                 IsNeedCertificateModel = Need.需要;
             };
@@ -412,7 +412,7 @@ namespace BBWYB.Client.ViewModels
         /// <summary>
         /// 查看合格证
         /// </summary>
-        private void LookCer(string  id)
+        private void LookCer(string id)
         {
             LookCerWindow lookCerWindow = new LookCerWindow(PurchaseSkuList.SingleOrDefault(p => p.PurchaseSkuId == id).CerDTO);
             lookCerWindow.Show();

BBWYB.Client/Views/Order/OrderList.xaml

@@ -723,7 +723,8 @@
                                             <DataTemplate>
                                                 <Grid Width="{Binding ActualWidth,ElementName=lbSet}" MinHeight="90">
                                                     <StackPanel  Orientation="Vertical"  Grid.Column="7"  VerticalAlignment="Center"  HorizontalAlignment="Center">
-                                                        <StackPanel Orientation="Horizontal" DataContext="{Binding DataContext,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox},AncestorLevel=1}}">
+                                                        <!--DataContext="{Binding DataContext,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox},AncestorLevel=1}}"-->
+                                                        <StackPanel Orientation="Horizontal" DataContext="{Binding DataContext,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox},AncestorLevel=1}}" >
                                                             <c:BButton Content="取消" Style="{StaticResource LinkButton}"
                                                    Command="{Binding DataContext.CancelOrderCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"
                                                    CommandParameter="{Binding Id}">
@@ -731,8 +732,8 @@
                                                                 <c:BButton.Visibility>
                                                                     <MultiBinding Converter="{StaticResource mobjConverter}"
                                                               ConverterParameter="已取消;true:|:Collapsed:Visible:1">
-                                                                        <Binding Path="OrderState" />
-                                                                        <Binding Path="IsPurchased"/>
+                                                                        <Binding Path="OrderState"  />
+                                                                        <Binding Path="IsPurchased"  />
                                                                     </MultiBinding>
                                                                 </c:BButton.Visibility>
                                                             </c:BButton>

BBWYB.Server.Business/Order/OrderBusiness.cs

@@ -54,7 +54,7 @@ namespace BBWYB.Server.Business
                 }
 
                 select = select.WhereIf(request.OrderState != null && request.OrderState != Enums.OrderState.待配置, (o, ocs, oct) => o.OrderState == request.OrderState)
-                               .WhereIf(request.OrderState == Enums.OrderState.待配置, (o, ocs, oct) =>o.OrderState != Enums.OrderState.已取消)//&&o.OrderState> Enums.OrderState.等待采购 
+                               .WhereIf(request.OrderState == Enums.OrderState.待配置, (o, ocs, oct) =>o.OrderState != Enums.OrderState.已取消&&o.PackConfigState!=null)//&&o.OrderState> Enums.OrderState.等待采购 
                                .WhereIf(request.StartDate != null, (o, ocs, oct) => o.StartTime >= request.StartDate)
                                .WhereIf(request.EndDate != null, (o, ocs, oct) => o.StartTime <= request.EndDate)
                                .WhereIf(!string.IsNullOrEmpty(request.ClientOrderId), (o, ocs, oct) => o.ClientOrderId == request.ClientOrderId)
@@ -113,7 +113,7 @@ namespace BBWYB.Server.Business
                 Profit = oct.Profit,
                 PurchaseAmount = oct.PurchaseAmount,
                 IsManualEdited = oct.IsManualEdited,
-                //PackConfigState= o.PackConfigState,
+                PackConfigState= o.PackConfigState,
             };
         }
 

BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs

@@ -217,6 +217,8 @@ namespace BBWYB.Server.Business
                     OrderProductParamList = orderProductParamList
                 });
 
+
+
                 var purchaseOrderSimpleInfo = client.QueryOrderDetail(new PP_QueryOrderDetailRequest()
                 {
                     AppKey = purchaseAccount.AppKey,
@@ -242,8 +244,29 @@ namespace BBWYB.Server.Business
                         SchemeId = cargoParam.SchemeId,
                         SourceSkuId = orderSku?.BelongSkuId
                     });
+                    try
+                    {
+                        var qikuResponse = restApiService.SendRequest("http://qiku.qiyue666.com/",
+                                                                              "api/PurchaseTask/UpdateOrderPackState",
+                                                                              new
+                                                                              {
+                                                                                  SkuId = orderSku?.BelongSkuId,
+                                                                                  OrderId = request.OrderId
+                                                                              },
+                                                                              null,
+                                                                              HttpMethod.Post);
+                        if (qikuResponse.StatusCode != System.Net.HttpStatusCode.OK)
+                            throw new Exception(qikuResponse.Content);
+                    }
+                    catch
+                    {
+                    }
                 }
 
+
+
+
+
                 totalPurchaseAmount += purchaseOrderSimpleInfo.TotalAmount;
 
                 var belongSkuGroups = cargoParamGroup.CargoParamList.GroupBy(p => p.BelongSkuId);