jdsku仓库查询新增可选仓库明细,bbwy展示对接人和打包人

BBWY.Client/BBWYAppSettings.json

@@ -4,6 +4,6 @@
   "MDSApiHost": "http://mdsapi.qiyue666.com",
   "JOSApiHost": "",
   "1688ApiHost": "",
-  //"QKApiHost": "http://localhost:8080"
+  "QKApiHost": "http://localhost:8080"
-  "QKApiHost": "http://qiku.qiyue666.com"
+  // "QKApiHost": "http://qiku.qiyue666.com"
 }

BBWY.Client/GlobalContext.cs

@@ -13,7 +13,7 @@ namespace BBWY.Client
         {
             ShopServiceGroupList = new List<string>();
             ShopServiceGroupLowerList = new List<string>();
-            ClientVersion = "10187";
+            ClientVersion = "10188";
         }
 
         private User user;

BBWY.Client/Views/PackTask/WaitPackageControl.xaml

@@ -249,7 +249,7 @@
                                                                    Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
                                                                    CommandParameter="{Binding ShopName}"
                                                                    Margin=" 5,0,0,0"/>
-                                    <StackPanel Orientation="Horizontal" Visibility="{Binding OrderId, Converter={StaticResource objConverter},ConverterParameter=#null:Visible:Collapsed}">
+                                    <StackPanel Orientation="Horizontal" >
                                         <TextBlock  VerticalAlignment="Center" Text="对接人:" Margin="16,0,0,0"  />
                                         <TextBlock  VerticalAlignment="Center" Text="{Binding AcceptName}" Margin="5,0,0,0" />
                                     </StackPanel>
@@ -480,7 +480,7 @@
                             </Grid>-->
                                 <Grid Grid.Column="8">
 
-                                    <Grid>
+                                    <StackPanel Orientation="Vertical" VerticalAlignment="Center" >
 
                                         <StackPanel Orientation="Horizontal" VerticalAlignment="Center"  HorizontalAlignment="Center"
                                                 Visibility="{Binding FeesItemResponse,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible   }"
@@ -510,7 +510,22 @@
                                                 </Path.ToolTip>
                                             </Path>
                                         </StackPanel>
-                                    </Grid>
+
+                                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0 10 0 0 ">
+
+
+                                            <TextBlock  Foreground="{StaticResource Text.Gray}" TextTrimming="CharacterEllipsis">
+                                                <TextBlock.ToolTip>
+                                                    <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
+                                                        <TextBlock Text="{Binding PackUser}"/>
+                                                    </ToolTip>
+                                                </TextBlock.ToolTip>
+                                                <Run Text="包装员:"/>
+                                                <Run Text="{Binding PackUser}"/>
+                                            </TextBlock>
+
+                                        </StackPanel>
+                                    </StackPanel>
                                 </Grid>
 
                                 <Grid Grid.Column="9">

BBWY.Client/Views/SealBox/SealBoxPolicyDetailsWindow.xaml

@@ -40,6 +40,9 @@
                 <TextBlock Text="仓库:" Margin="50 0 0 0"/>
                 <TextBlock Text="{Binding WareName}"/>
 
+                <TextBlock Text="对接人:" Margin="50 0 0 0"/>
+                <TextBlock Text="{Binding AcceptUserName}"/>
+
             </StackPanel>
 
             <Grid Grid.Row="2" >

BBWY.Client/Views/SealBox/SealBoxPolicyDetailsWindow.xaml.cs

@@ -24,13 +24,14 @@ namespace BBWY.Client.Views.SealBox
     /// </summary>
     public partial class SealBoxPolicyDetailsWindow : BWindow
     {
-        public SealBoxPolicyDetailsWindow(List<WareSealBoxSku> sealBoxSkus, string shopName, string wareName, long sealBoxId)
+        public SealBoxPolicyDetailsWindow(List<WareSealBoxSku> sealBoxSkus, string shopName, string wareName, long sealBoxId,string acceptUserName)
         {
             InitializeComponent();
             this.DataContext = this;
             SealBoxSkus = sealBoxSkus;
             ShopName = shopName;
             WareName = wareName;
+            AcceptUserName = acceptUserName;
             SealBoxId = sealBoxId;
             this.UpdateLayout();
         }
@@ -43,6 +44,9 @@ namespace BBWY.Client.Views.SealBox
         public string ShopName { get; set; }
         public string WareName { get; set; }
 
+
+        public string AcceptUserName { get; set; }
+
         public long SealBoxId { get; set; }
 
         public void PrintBox(string printName)

BBWY.Client/Views/SealBox/SealBoxPrintDetailsWindow.xaml.cs

@@ -149,7 +149,8 @@ namespace BBWY.Client.Views.SealBox
         {
             App.Current.Dispatcher.Invoke(new Action(() =>
             {
-                SealBoxPolicyDetailsWindow policyDetailsWindow = new SealBoxPolicyDetailsWindow(sealBoxSkus, SealBoxModel.ShopName, SealBoxModel.WareName, SealBoxModel.SealBoxId);
+                SealBoxPolicyDetailsWindow policyDetailsWindow = new SealBoxPolicyDetailsWindow(sealBoxSkus, SealBoxModel.ShopName, SealBoxModel.WareName, SealBoxModel.SealBoxId, SealBoxModel.AcceptUserName);
+                //policyDetailsWindow.Show();
                 policyDetailsWindow.PrintBox(PrintName);
             }));
        

BBWY.Server.Business/PlatformSDK/JDBusiness.cs

@@ -3,6 +3,7 @@ using BBWY.Common.Models;
 using BBWY.JDSDK.Request;
 using BBWY.Server.Model;
 using BBWY.Server.Model.Dto;
+using BBWY.Server.Model.Dto.Request.JD;
 using Jd.ACES;
 using Jd.ACES.Common;
 using Jd.Api;
@@ -725,12 +726,12 @@ namespace BBWY.Server.Business
             return (JArray)res.Json["jingdong_eclp_master_queryWarehouse_responce"]["querywarehouse_result"];
         }
 
-        public override JArray GetStockNumBySku(SearchProductSkuRequest request)
+        public override JArray GetStockNumBySku(GetStockNumBySkuRequest request)
         {
             var jdClient = GetJdClient(request.AppKey, request.AppSecret);
             var req = new StockReadFindSkuStockRequest();
 
-
+            req.field = string.Join(",", request.Field);
             req.skuId = long.Parse(request.Sku); // 10036238533172;  //京仓sku
             var res = jdClient.Execute(req, request.AppToken, DateTime.Now.ToLocalTime());
 

BBWY.Server.Business/PlatformSDK/PlatformSDKBusiness.cs

@@ -1,5 +1,6 @@
 using BBWY.Server.Model;
 using BBWY.Server.Model.Dto;
+using BBWY.Server.Model.Dto.Request.JD;
 using Microsoft.Extensions.Caching.Memory;
 using Newtonsoft.Json.Linq;
 using NLog;
@@ -163,7 +164,7 @@ namespace BBWY.Server.Business
             throw new NotImplementedException();
         }
 
-        public virtual JArray GetStockNumBySku(SearchProductSkuRequest request)
+        public virtual JArray GetStockNumBySku(GetStockNumBySkuRequest request)
         {
             throw new NotImplementedException();
         }

BBWY.Server.Model/Dto/Request/JD/GetStockNumBySkuRequest.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace BBWY.Server.Model.Dto.Request.JD
+{
+    public class GetStockNumBySkuRequest : PlatformRequest
+    {
+        /// <summary>
+        /// 多个Sku逗号间隔
+        /// </summary>
+        public string Sku { get; set; }
+
+        public string[] Field { get; set; }
+    }
+}

BBWY.Server.Model/Dto/Request/Product/SearchProductSkuRequest.cs

@@ -28,5 +28,7 @@ namespace BBWY.Server.Model.Dto
         /// 检查环节
         /// </summary>
         public string CheckStep { get; set; }
+
+        public string[] Field { get; set; }
     }
 }

JD.API/Controllers/PlatformSDKController.cs

@@ -1,6 +1,7 @@
 using BBWY.Server.Business;
 using BBWY.Server.Model;
 using BBWY.Server.Model.Dto;
+using BBWY.Server.Model.Dto.Request.JD;
 using JD.API.Filters;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json.Linq;
@@ -293,7 +294,7 @@ namespace JD.API.API.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost]
-        public JArray GetStockNumBySku([FromBody] SearchProductSkuRequest request)
+        public JArray GetStockNumBySku([FromBody] GetStockNumBySkuRequest request)
         {
             return platformSDKBusinessList.FirstOrDefault(p => p.Platform == request.Platform).GetStockNumBySku(request);
         }