1

BBWY.Client/Models/APIModel/Request/QualityTaskRequest.cs

@@ -93,5 +93,10 @@ namespace BBWY.Client.Models.APIModel.Request
         /// </summary>
         public DateTime? PreCompeteTime { get; set; }
 
+        /// <summary>
+        /// 地拖摆放编号
+        /// </summary>
+        public int? FloorDragNumber { get; set; }
+
     }
 }

BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs

@@ -95,6 +95,18 @@ namespace BBWY.Client.ViewModels
         public ObservableCollection<string> AvailabilityList { get => availabilityList; set { Set(ref availabilityList, value); } }
 
 
+        private int floorDragNumber;
+        public int FloorDragNumber { get => floorDragNumber; set { Set(ref floorDragNumber, value); } }
+
+        private ObservableCollection<int> floorDragNumberList = new ObservableCollection<int>
+        {
+
+        };
+        public ObservableCollection<int> FloorDragNumberList { get => floorDragNumberList; set { Set(ref floorDragNumberList, value); } }
+
+
+
+
         private ObservableCollection<string> preCompeteTimeDayList = new ObservableCollection<string>
         {
 
@@ -394,6 +406,11 @@ namespace BBWY.Client.ViewModels
         private void CompeteQualityTask(object obj)
         {
 
+            if (FloorDragNumber <= 0)
+            {
+                MessageBox.Show($"请选择摆放地拖编号");
+                return;
+            }
 
             if (GoodProductQuantity > ArrivalQuantity)
             {
@@ -423,7 +440,8 @@ namespace BBWY.Client.ViewModels
                 SkuId = SkuId,
                 IsNeedBar = IsNeedBarCode == Need.需要,
                 IsNeedCer = IsNeedCertificateModel == Need.需要,
-                TaskId = TaskId
+                TaskId = TaskId,
+                FloorDragNumber = FloorDragNumber
             };
             if (IsNeedBarCode == Need.需要)
             {
@@ -441,11 +459,11 @@ namespace BBWY.Client.ViewModels
                     MessageBox.Show("无可用的合格证打印！");
                     return;
                 }
-                //if (PurchaseSkuList.Where(p => p.IsSetCertificate).Count() > 0)
+                if (PurchaseSkuList.Where(p => p.IsSetCertificate).Count() > 0)
-                //{
+                {
-                //    MessageBox.Show("存在未确认的合格证,请先完成确认！");
+                    MessageBox.Show("存在未确认的合格证,请先完成确认！");
-                //    return;
+                    return;
-                //}
+                }
                 if (PurchaseSkuList.Where(p => p.IsNeedCer && p.CerDTO.Id > 0).Count() <= 0)
                 {
                     MessageBox.Show("无可选的合格证打印！");
@@ -457,9 +475,79 @@ namespace BBWY.Client.ViewModels
 
             int hour = Convert.ToInt32(PreCompeteTimeHour.Replace("点前", ""));
 
-            var date = Convert.ToDateTime(PreCompeteTimeDay);
 
-            request.PreCompeteTime = date.AddHours(hour);
+            DateTime date = DateTime.Now;
+
+            switch (preCompeteTimeDay)
+            {
+                case "今天":
+                    date = DateTime.Now;
+                    break;
+                case "明天":
+                    date = DateTime.Now.AddDays(1);
+                    break;
+                case "后天":
+                    date = DateTime.Now.AddDays(2);
+                    break;
+                default:
+                    break;
+            }
+
+            //date = Convert.ToDateTime(PreCompeteTimeDay);
+
+
+            var competeTime = date.Date.AddHours(hour);
+
+
+
+            if (competeTime<DateTime.Now)
+            {
+                MessageBox.Show($"预计完成时间不能小于当前时间,请重新选择预计完成时间");
+                return;
+            }
+
+
+            var now = DateTime.Now;
+            if (now.Hour < 12)
+            {
+                if (competeTime> now.AddDays(1).Date.AddHours(12))
+                {
+                    MessageBox.Show($"预计完成时间不能超过明天12点,请重新选择预计完成时间");
+                    return;
+                }
+
+
+            }
+            else if (now.Hour < 18)
+            {
+                if (competeTime > now.AddDays(1).Date.AddHours(18))
+                {
+                    MessageBox.Show($"预计完成时间不能超过明天18点,请重新选择预计完成时间");
+                    return;
+                }
+            }
+            else if (now.Hour < 22)
+            {
+                if (competeTime > now.AddDays(1).Date.AddHours(22))
+                {
+                    MessageBox.Show($"预计完成时间不能超过明天22点,请重新选择预计完成时间");
+                    return;
+                }
+            }
+            else
+            {
+                if (competeTime > now.AddDays(2).Date.AddHours(12))
+                {
+                    MessageBox.Show($"预计完成时间不能超过后天12点,请重新选择预计完成时间");
+                    return;
+                }
+            }
+
+
+
+
+
+            request.PreCompeteTime = competeTime;
 
 
             var competeRes = packPurchaseTaskService.CompeteQualityTask(request);
@@ -487,7 +575,7 @@ namespace BBWY.Client.ViewModels
             catch
             {
 
-       
+
             }
 
 
@@ -606,6 +694,7 @@ namespace BBWY.Client.ViewModels
         /// </summary>
         public void SearchSku(PackTaskModel model)
         {
+
             InitData();
             TaskId = model.TaskId;
             OrderId = model.OrderId;
@@ -688,7 +777,7 @@ namespace BBWY.Client.ViewModels
                             IsNeedCer = item.IsNeedCer,
                             PurchaseSkuId = item.PurchaseSkuId,
                             CerDTO = item.CerDTO,
-                            IsSetCertificate = item.IsSetCertificate,
+                            IsSetCertificate = item.IsNeedCer,
                         });
                     }));
                     //PurchaseSkuList.Add(item);
@@ -706,17 +795,61 @@ namespace BBWY.Client.ViewModels
         public Action ReflashWindow { get; set; }
         public void InitData()
         {
+            FloorDragNumber = 0;
             PurchaseSkuList = new ObservableCollection<PurchaseSku>();
             WareHourseList = new ObservableCollection<WareHourseDTO>();
             PreCompeteTimeDayList = new ObservableCollection<string>();
+            FloorDragNumberList = new ObservableCollection<int>();
 
-            var date = DateTime.Now.Date;
+            for (int i = 0; i < 30; i++)
-            for (int i = 0; i < 7; i++)
             {
-                PreCompeteTimeDayList.Add(date.AddDays(i).ToString("yyyy-MM-dd"));
+                App.Current.Dispatcher.Invoke((Action)(() =>
+                {
+
+                    FloorDragNumberList.Add(i + 1);
+                }));
+
             }
 
-            PreCompeteTimeDay = date.ToString("yyyy-MM-dd");
+            var nowTime = DateTime.Now;
+            var hour = nowTime.Hour;
+
+
+
+            if (hour<12)
+            {
+                PreCompeteTimeDayList.Add("今天");
+                PreCompeteTimeDayList.Add("明天");
+
+                PreCompeteTimeDay = "今天";
+                PreCompeteTimeHour = "12点前";
+
+            }
+            else if (hour<18)
+            {
+                PreCompeteTimeDayList.Add("今天");
+                PreCompeteTimeDayList.Add("明天");
+                PreCompeteTimeDay = "今天";
+                PreCompeteTimeHour = "18点前";
+            }
+            else if (hour < 22)
+            {
+                PreCompeteTimeDayList.Add("今天");
+                PreCompeteTimeDayList.Add("明天");
+                PreCompeteTimeHour = "22点前";
+            }
+            else
+            {
+                PreCompeteTimeDayList.Add("今天");
+                PreCompeteTimeDayList.Add("明天");
+                PreCompeteTimeDayList.Add("后天");
+                PreCompeteTimeDay = "明天";
+                PreCompeteTimeHour = "12点前";
+            }
+
+
+
+
 
             IsSetBarCode = true;
             SkuTitle = "";
@@ -724,11 +857,7 @@ namespace BBWY.Client.ViewModels
             GoodsNumber = 0;
             PackType = PackType.单件;
             BasicPack = BasicPack.快递袋;
-            // Availability = (TaskState.)config.Availability;
-            //MarkMessage = config.MarkMessage;
             CertificatePosition = CertificatePosition.无;
-            // Increment1 = config.Increment1;
-
             IsNeedBarCode = Need.需要;
             IsNeedCertificateModel = Need.不需要;
         }

BBWY.Client/Views/QualityTask/QualityWindow.xaml

@@ -112,7 +112,7 @@
                     <TextBlock Text="任务信息"  Margin="20 10" FontSize="13" FontWeight="Bold" HorizontalAlignment="Left" />
                     <Grid>
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="480"/>
+                            <ColumnDefinition Width="520"/>
                             <ColumnDefinition/>
                         </Grid.ColumnDefinitions>
                         <StackPanel Orientation="Vertical" Margin="20 10  " HorizontalAlignment="Left">
@@ -136,7 +136,7 @@
                                     <Run Text="份数:"/>
                                     <Run Text="{Binding WareHourseCount,Mode=TwoWay}"/>
                                 </TextBlock>
-                                <StackPanel Orientation="Horizontal" Margin="45 0 0 0" Height="30">
+                                <StackPanel Orientation="Horizontal" Margin="10 0 0 0" Height="30">
                                     <TextBlock Text="预计完成时间: " VerticalAlignment="Center" />
                                     <Border BorderBrush="{StaticResource Border.Brush}"  Height="30" BorderThickness="1">
                                         <hc:ComboBox BorderThickness="0" ItemsSource="{Binding PreCompeteTimeDayList}" SelectedIndex="0"  Text="{Binding PreCompeteTimeDay}">
@@ -149,7 +149,14 @@
                                         </hc:ComboBox>
                                     </Border>
                                 </StackPanel>
+                                <StackPanel Orientation="Horizontal">
+                                    <TextBlock Style="{StaticResource middleTextBlock}" Text="摆放地托编号:" Margin="10 0 0 0"/>
+                                    <Border BorderBrush="{StaticResource Border.Brush}"  Height="30" BorderThickness="1">
+                                        <hc:ComboBox Width="80" BorderThickness="0" ItemsSource="{Binding FloorDragNumberList}" SelectedIndex="0"   Text="{Binding FloorDragNumber}">
 
+                                        </hc:ComboBox>
+                                    </Border>
+                                </StackPanel>
 
                             </StackPanel>
                         </StackPanel>
@@ -268,7 +275,7 @@
                                                         <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" 
                             Visibility="{Binding  IsSetCertificate, Converter={StaticResource objConverter}, ConverterParameter=false:Visible:Collapsed }">
                                                             <c:BButton Content="查看" Style="{StaticResource LinkButton}" Width="35"  Height="15" 
-                                                               CommandParameter="{Binding PurchaseSkuId}" 
+                                                               CommandParameter="{Binding CerDTO}" 
                                                                Command="{Binding DataContext. LookCerCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"/>
                                                             <c:BButton Content="修改" Style="{StaticResource LinkButton}" Width="35"  Height="15" CommandParameter="{Binding }"  
                                                                Command="{Binding DataContext.SetCertificateCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"