改了太多 记不住了

BBWY.Client/App.xaml.cs

@@ -34,6 +34,8 @@ namespace BBWY.Client
             //齐越山鸡
             userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTM1MzMwMzI4ODkyMTQ5NzYwIiwidGVhbUlkIjoiMTUxNjk3NDI1MDU0MjUwMTg4OCIsInNvblRlYW1JZHMiOiIxNDM2Mjg4NTAwMjM1MjQzNTIwIiwiZXhwIjoxNjk0NjY5NjkxfQ.cSwro-7bGwOu92YejH9JhMenTai7Mvf99i2paQCmxIw";
 
+            //齐越悠仁
+            //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNDM5OTEyMzAxODIwOTA3NTIwIiwidGVhbUlkIjoiMTQzOTg5ODU5MzE3MDI5NjgzMiIsInNvblRlYW1JZHMiOiIiLCJleHAiOjE2OTQ4NjU2NjR9.yQlRKUnnXl4cEzvqRwd-BSktGuW6-AAHLuCicp7f-EM";
             //齐越小戴
             //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNDM5OTEyNjg0MDk4MTYyNjg4IiwidGVhbUlkIjoiMTQzOTg5ODY0MDU0OTE1NDgxNiIsInNvblRlYW1JZHMiOiIiLCJleHAiOjE2OTQ0OTQ1MDZ9.LxA_vc_YyXxgQjSQi4XVg2B-fdvAz3mIT0Bgg3Uuul8";
             //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNDE1OTMxMjU4NjEzMDEwNDMyIiwidGVhbUlkIjoiMTQxNDkzNTcwNDQ2MjQzMDIwOCIsInNvblRlYW1JZHMiOiIiLCJleHAiOjE2OTQxMDY1MjV9.XeMruS0YkwI7B6nODGe-vbdUqA_PSAt4EacfRAHIjV0"; //齐越文魁

BBWY.Client/Models/APIModel/Response/FinancialTerminal/AuditPayBillResponse.cs

@@ -22,6 +22,8 @@ namespace BBWY.Client.Models
 
 		public DateTime? CreateTime { get; set; }
 
+		public DateTime? OrderStartTime { get; set; }
+
 		/// <summary>
 		/// 支出金额
 		/// </summary>

BBWY.Client/Models/APIModel/Response/Shop/ShopResponse.cs

@@ -39,4 +39,11 @@ namespace BBWY.Client.Models
 
         public IList<ShopResponse> ShopList { get; set; }
     }
+
+    public class DepartmentResponse2
+    {
+        public string DepartmentId { get; set; }
+
+        public string DepartmentName { get; set; }
+    }
 }

BBWY.Client/Models/APIModel/Response/User/MDSUserResponse.cs

@@ -1,4 +1,6 @@
-namespace BBWY.Client.Models
+using System.Collections.Generic;
+
+namespace BBWY.Client.Models
 {
     public class MDSUserResponse
     {
@@ -9,5 +11,7 @@
         public string UserName { get; set; }
 
         public string UserNick { get; set; }
+
+        public IList<DepartmentResponse2> SonDepartmentList { get; set; }
     }
 }

BBWY.Client/Models/FinancialTerminal/ProcurementAudit/AuditPayBill.cs

@@ -102,5 +102,7 @@ namespace BBWY.Client.Models
         /// 错误信息
         /// </summary>
         public string ErrorMessage { get => errorMessage; set { Set(ref errorMessage, value); } }
+
+        public DateTime? OrderStartTime { get; set; }
     }
 }

BBWY.Client/Models/User/User.cs

@@ -17,8 +17,11 @@ namespace BBWY.Client.Models
 
         public string TeamName { get; set; }
 
+        public string SonDepartmentNames { get; set; }
+
         public Shop Shop { get => shop; set { Set(ref shop, value); } }
 
         public IList<Department> DepartmentList { get; set; }
+
     }
 }

BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs

@@ -102,6 +102,8 @@ namespace BBWY.Client.ViewModels
 
         public ICommand SaveCommand { get; set; }
 
+        public ICommand ExportCommand { get; set; }
+
         public Shop SelectResultShop { get => selectResultShop; set { Set(ref selectResultShop, value); } }
 
         public bool NoMatchPurchaseOrder { get => noMatchPurchaseOrder; set { Set(ref noMatchPurchaseOrder, value); } }
@@ -122,6 +124,7 @@ namespace BBWY.Client.ViewModels
             SearchLocalCommand = new RelayCommand(SearchLocal);
             ClearLocalConditionCommand = new RelayCommand(() => ClearLocalCondition());
             SaveCommand = new RelayCommand(Save);
+            ExportCommand = new RelayCommand(Export);
             this.purchaseOrderService = purchaseOrderService;
             this.financialTerminalService = financialTerminalService;
 
@@ -236,11 +239,11 @@ namespace BBWY.Client.ViewModels
 
                     if (relationPurchaseOrder == null)
                     {
-                        if (payBill.IncomeAmount > 0 && StartDate.Day == 1)
+                        //if (payBill.IncomeAmount > 0 && StartDate.Day == 1)
-                        {
+                        //{
-                            payBill.AuditCapitalType = AuditCapitalType.上月商品退款;
+                        //    payBill.AuditCapitalType = AuditCapitalType.上月商品退款;
-                            continue;
+                        //    continue;
-                        }
+                        //}
 
                         if (payBill.IsSupportMerchantOrderNo)
                         {
@@ -372,6 +375,7 @@ namespace BBWY.Client.ViewModels
             }
 
             var payBillNo = "";
+            var list = new List<AuditPayBill>();
             try
             {
                 foreach (var line in importResult.Lines)
@@ -381,7 +385,7 @@ namespace BBWY.Client.ViewModels
                     var incomeAmount = decimal.Parse(array[6].FormatString());
                     var expenditureAmount = decimal.Parse(array[7].FormatString());
                     payBillNo = array[0].FormatString();
-                    if (AuditPayBillList.Any(p => p.PayBillNo == payBillNo))
+                    if (list.Any(p => p.PayBillNo == payBillNo))
                         continue;
                     var payBill = new AuditPayBill()
                     {
@@ -416,8 +420,11 @@ namespace BBWY.Client.ViewModels
                         payBill.IsSupportMerchantOrderNo = true;
                     }
 
-                    AuditPayBillList.Add(payBill);
+                    list.Add(payBill);
                 }
+                list = list.OrderByDescending(p => p.PayBillNo).ToList();
+                foreach (var p in list)
+                    AuditPayBillList.Add(p);
             }
             catch (Exception ex)
             {
@@ -508,5 +515,14 @@ namespace BBWY.Client.ViewModels
             });
 
         }
+
+        private void Export()
+        {
+            if (ShowAuditPayBillList.Count == 0)
+                return;
+            var list = ShowAuditPayBillList.Select(p => p.ToString()).ToList();
+            list.Add("");
+
+        }
     }
 }

BBWY.Client/ViewModels/MainViewModel.cs

@@ -160,8 +160,11 @@ namespace BBWY.Client.ViewModels
                     throw new Exception($"获取磨刀石用户信息失败 {mdsUserResponse.Msg}");
 
                 GlobalContext.User = mdsUserResponse.Data.Map<User>();
+                if (mdsUserResponse.Data.SonDepartmentList != null && mdsUserResponse.Data.SonDepartmentList.Count > 0)
+                    GlobalContext.User.SonDepartmentNames = string.Join(',', mdsUserResponse.Data.SonDepartmentList.Select(sd => sd.DepartmentName));
+
 #if RELEASE
-                if (!managerDepartment.Contains(GlobalContext.User.TeamName)) //非管理账号,屏蔽财务端
+                if (!managerDepartment.Contains(GlobalContext.User.TeamName) && !managerDepartment.Any(m => GlobalContext.User.SonDepartmentNames.Contains(m))) //非管理账号,屏蔽财务端
                 {
                     App.Current.Dispatcher.Invoke(() =>
                     {
@@ -172,7 +175,15 @@ namespace BBWY.Client.ViewModels
 #endif
                 IList<Department> departmentList = null;
 
-                if (!managerDepartment.Contains(GlobalContext.User.TeamName))
+                if (managerDepartment.Contains(GlobalContext.User.TeamName) || managerDepartment.Any(m => GlobalContext.User.SonDepartmentNames.Contains(m)))
+                {
+                    ShowShopChoosePanel = true;
+                    var response = shopService.GetDepartmentList();
+                    if (!response.Success)
+                        throw new Exception(response.Msg);
+                    departmentList = response.Data.Map<IList<Department>>();
+                }
+                else
                 {
                     var response = mdsApiService.GetShopDetailList();
                     if (!response.Success)
@@ -189,14 +200,6 @@ namespace BBWY.Client.ViewModels
                     else
                         ShowShopChoosePanel = true;
                 }
-                else
-                {
-                    ShowShopChoosePanel = true;
-                    var response = shopService.GetDepartmentList();
-                    if (!response.Success)
-                        throw new Exception(response.Msg);
-                    departmentList = response.Data.Map<IList<Department>>();
-                }
 
                 GlobalContext.User.DepartmentList = departmentList;
                 App.Current.Dispatcher.Invoke(() =>

BBWY.Client/ViewModels/Purchase/1688PreviewPurchaseViewModel.cs

@@ -17,6 +17,7 @@ namespace BBWY.Client.ViewModels
     public class _1688PreviewPurchaseViewModel : BaseVM
     {
         public ICommand FastCreateOrderCommand { get; set; }
+        public ICommand PreviewOrderCommand { get; set; }
 
         public IList<PurchaseSchemeProductSku> PurchaseSchemeProductSkuList { get; set; }
 
@@ -87,6 +88,7 @@ namespace BBWY.Client.ViewModels
             PurchaseSchemeProductSkuList = new ObservableCollection<PurchaseSchemeProductSku>();
             purchaseSchemeList = new List<PurchaseScheme>();
             FastCreateOrderCommand = new RelayCommand(FastCreateOrder);
+            PreviewOrderCommand = new RelayCommand(PreviewOrder);
             this.globalContext = globalContext;
             this.orderListViewModel = orderListViewModel;
             //PurchaseOrderMode = PurchaseOrderMode.代发;
@@ -266,7 +268,23 @@ namespace BBWY.Client.ViewModels
         private void OnDelayTriggerExecute(string key)
         {
             if (string.IsNullOrEmpty(key))
+            {
+                IsLoading = false;
+                return;
+            }
+               
+            if (string.IsNullOrEmpty(ContactName) ||
+                string.IsNullOrEmpty(Address) ||
+                string.IsNullOrEmpty(Mobile) ||
+                string.IsNullOrEmpty(Province) ||
+                string.IsNullOrEmpty(City) ||
+                string.IsNullOrEmpty(County))
+            {
+                IsLoading = false;
+                MessageBox.Show("缺少完整的收货信息", "提示");
                 return;
+            }
+
             IsLoading = true;
             Task.Factory.StartNew(() => purchaseOrderService.PreviewPurchaseOrder(new Consignee()
             {
@@ -358,5 +376,10 @@ namespace BBWY.Client.ViewModels
                       GalaSoft.MvvmLight.Messaging.Messenger.Default.Send<object>(null, "OnlinePurchase_Close");
                   });
         }
+
+        private void PreviewOrder()
+        {
+            OnDelayTriggerExecute(Guid.NewGuid().ToString());
+        }
     }
 }

BBWY.Client/Views/FinancialTerminal/ProcurementAudit.xaml

@@ -34,7 +34,8 @@
                 <RowDefinition Height="5"/>
                 <RowDefinition Height="30"/>
                 <RowDefinition Height="5"/>
-                <RowDefinition Height="auto"/>
+                <RowDefinition Height="40"/>
+                <RowDefinition Height="5"/>
                 <RowDefinition/>
             </Grid.RowDefinitions>
             <Border Background="{StaticResource Border.Background}" Padding="5,0">
@@ -149,6 +150,14 @@
                               IsChecked="{Binding NoChooseFundType,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
                               FocusVisualStyle="{x:Null}" Margin="5,0,0,0"/>
 
+                  
+                </StackPanel>
+
+               
+            </Grid>
+
+            <Grid Grid.Row="6" Background="{StaticResource Border.Background}">
+                <StackPanel Orientation="Horizontal">
                     <TextBlock Text="店铺名称" VerticalAlignment="Center" Margin="5,0,0,0"/>
                     <ComboBox Margin="5,0,0,0" ItemsSource="{Binding SelectedDepartment.ShopList}"
                               SelectedItem="{Binding SelectResultShop,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
@@ -174,10 +183,8 @@
                 </StackPanel>
             </Grid>
 
-
-
             <DataGrid ItemsSource="{Binding ShowAuditPayBillList}"
-                      Grid.Row="7"
+                      Grid.Row="8"
                       Visibility="{Binding IsShowPayBillPanel,Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}"
                       BorderThickness="1,1,0,0"
                       BorderBrush="{StaticResource Border.Brush}"

BBWY.Client/Views/Purchase/1688Purchase.xaml

@@ -123,15 +123,18 @@
             <Run Text="{Binding TotalAmount,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}" Foreground="#EC808D"/>
             <Run Text="元"/>
         </TextBlock>
-        <StackPanel Orientation="Horizontal" Grid.Row="4" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,100,0">
+        <StackPanel Orientation="Horizontal" Grid.Row="4" VerticalAlignment="Center" HorizontalAlignment="Right">
             <RadioButton Content="批发" Padding="0" VerticalContentAlignment="Center"
                          GroupName="OrderMode"
                          IsChecked="{Binding PurchaseOrderMode,Converter={StaticResource enumToBooleanConverter},ConverterParameter={x:Static cmodel:PurchaseOrderMode.批发}}"/>
             <RadioButton Content="分销" Padding="0" VerticalContentAlignment="Center" Margin="5,0,0,0"
                          GroupName="OrderMode"
                          IsChecked="{Binding PurchaseOrderMode,Converter={StaticResource enumToBooleanConverter},ConverterParameter={x:Static cmodel:PurchaseOrderMode.代发}}"/>
+
+            <c:BButton Content="预览订单" Width="80" HorizontalAlignment="Right" Margin="5,0,0,0"
+                   Command="{Binding PreviewOrderCommand}" Background="#1CC2A2"/>
+            <c:BButton Content="提交订单" Width="80" HorizontalAlignment="Right" 
+                   Command="{Binding FastCreateOrderCommand}" Margin="0,0,5,0"/>
         </StackPanel>
-        <c:BButton Content="提交订单" Grid.Row="4" Width="80" HorizontalAlignment="Right" Margin="0,0,5,0"
-                   Command="{Binding FastCreateOrderCommand}"/>
     </Grid>
 </c:BWindow>

BBWY.Server.API/Controllers/OrderSyncController.cs

@@ -1,4 +1,5 @@
 using BBWY.Server.Business;
+using BBWY.Server.Model.Dto;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 
@@ -32,5 +33,15 @@ namespace BBWY.Server.API.Controllers
         {
             orderSyncBusiness.SyncOrder(shopId, orderId, null, null);
         }
+
+        /// <summary>
+        /// 根据日期同步
+        /// </summary>
+        /// <param name="syncOrderByDateRequest"></param>
+        [HttpPost]
+        public void SyncOrderByDate([FromBody]SyncOrderByDateRequest syncOrderByDateRequest)
+        { 
+            orderSyncBusiness.SyncOrderByDate(syncOrderByDateRequest);
+        }
     }
 }

BBWY.Server.Business/FinancialTerminal/FinancialTerminalBusiness.cs

@@ -19,7 +19,7 @@ namespace BBWY.Server.Business
             request.EndDate = request.EndDate.Date.AddDays(1).AddSeconds(-1);
             return fsql.Select<AuditPayBill>().Where(apb => apb.ImportShopIds == request.ImportShopIds &&
                                                             apb.PayTime >= request.StartDate &&
-                                                            apb.PayTime <= request.EndDate).ToList<AuditPayBillResponse>();
+                                                            apb.PayTime <= request.EndDate).OrderByDescending(b => b.PayTime).ToList<AuditPayBillResponse>();
         }
 
         public bool IsExistAuditPayBill(QueryAuditPayBillRequest request)

BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs

@@ -96,7 +96,7 @@ namespace BBWY.Server.Business
                                                                    .Set(po => po.SingleFirstFreight, editPurchaseOrderRequest.SingleFirstFreight)
                                                                    .Set(po => po.SingleInStorageAmount, editPurchaseOrderRequest.SingleInStorageAmount)
                                                                    .Set(po => po.SingleOutStorageAmount, editPurchaseOrderRequest.SingleOutStorageAmount)
-                                                                   .Set(po=> po.SingleRefundInStorageAmount,editPurchaseOrderRequest.SingleRefundInStorageAmount)
+                                                                   .Set(po => po.SingleRefundInStorageAmount, editPurchaseOrderRequest.SingleRefundInStorageAmount)
                                                                    .Set(po => po.SingleConsumableAmount, editPurchaseOrderRequest.SingleConsumableAmount)
                                                                    .Set(po => po.SingleStorageAmount, editPurchaseOrderRequest.SingleStorageAmount)
                                                                    .Set(po => po.SingleDeliveryFreight, editPurchaseOrderRequest.SingleDeliveryFreight)
@@ -336,7 +336,8 @@ namespace BBWY.Server.Business
                                                               MerchantOrderId = ods.MerchantOrderId,
                                                               ShopId = o.ShopId,
                                                               PurchaseTime = ods.CreateTime,
-                                                              PurchasePlatform = ods.PurchasePlatform
+                                                              PurchasePlatform = ods.PurchasePlatform,
+                                                              OrderStartTime = o.StartTime
                                                           });
         }
 

BBWY.Server.Model/Db/FinancialTerminal/AuditPayBill.cs

@@ -11,13 +11,13 @@ namespace BBWY.Server.Model.Db
         /// <summary>
         /// 账单流水号
         /// </summary>
-		[ Column(IsPrimary = true)]
+        [Column(IsPrimary = true)]
         public long PayBillNo { get; set; }
 
         /// <summary>
         /// 归属店铺
         /// </summary>
-		[ Column(StringLength = 50)]
+        [Column(StringLength = 50)]
         public string BelongShop { get; set; }
 
         /// <summary>
@@ -25,19 +25,22 @@ namespace BBWY.Server.Model.Db
         /// </summary>
         public long? BelongShopId { get; set; }
 
-		[ Column(DbType = "datetime")]
+        [Column(DbType = "datetime")]
         public DateTime? CreateTime { get; set; }
 
+        [Column(DbType = "datetime")]
+        public DateTime? OrderStartTime { get; set; }
+
         /// <summary>
         /// 支出金额
         /// </summary>
-		[ Column(DbType = "decimal(18,2)")]
+        [Column(DbType = "decimal(18,2)")]
         public decimal? ExpenditureAmount { get; set; }
 
         /// <summary>
         /// 收入金额
         /// </summary>
-		[ Column(DbType = "decimal(18,2)")]
+        [Column(DbType = "decimal(18,2)")]
         public decimal? IncomeAmount { get; set; }
 
         /// <summary>
@@ -61,13 +64,13 @@ namespace BBWY.Server.Model.Db
         /// <summary>
         /// 账单类型
         /// </summary>
-		[ Column(DbType = "int(1)",MapType = typeof(int?))]
+        [Column(DbType = "int(1)", MapType = typeof(int?))]
         public Enums.PayBillType? PayBillType { get; set; }
 
         /// <summary>
         /// 支付时间
         /// </summary>
-		[ Column(DbType = "datetime")]
+        [Column(DbType = "datetime")]
         public DateTime? PayTime { get; set; }
 
         /// <summary>
@@ -79,13 +82,13 @@ namespace BBWY.Server.Model.Db
         /// <summary>
         /// 关联采购订单号
         /// </summary>
-		[ Column(StringLength = 100)]
+        [Column(StringLength = 100)]
         public string RelationPurchaseOrderId { get; set; }
 
         /// <summary>
         /// 关联平台订单Id
         /// </summary>
-		[ Column(StringLength = 50, IsNullable = false)]
+        [Column(StringLength = 50, IsNullable = false)]
         public string RelationShopOrderId { get; set; }
 
         /// <summary>
@@ -108,7 +111,7 @@ namespace BBWY.Server.Model.Db
         public string ErrorMessage { get; set; }
 
         [Column(DbType = "int(1)", MapType = typeof(int?))]
-		public Enums.AuditCapitalType? AuditCapitalType { get; set;}
+        public Enums.AuditCapitalType? AuditCapitalType { get; set; }
     }
 
 }

BBWY.Server.Model/Dto/Response/PurchaseOrder/AuditPurchaseOrderResponse.cs

@@ -22,5 +22,7 @@ namespace BBWY.Server.Model.Dto
         /// 采购平台
         /// </summary>
         public Enums.Platform? PurchasePlatform { get; set; }
+
+        public DateTime? OrderStartTime { get; set; }
     }
 }