wanghan 5 maanden geleden
bovenliggende
commit
3160940563
1 gewijzigde bestanden met toevoegingen van 57 en 61 verwijderingen
  1. 57 61
      LogForceTestApp.Modules.MainModule/ViewModels/MainPageViewModel.cs

+ 57 - 61
LogForceTestApp.Modules.MainModule/ViewModels/MainPageViewModel.cs

@@ -1598,12 +1598,6 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
         {
             try
             {
-                //if (string.IsNullOrWhiteSpace(SelectedOrderName))
-                //{
-
-                //}
-                //else
-                //{
                 fbarcode.Clear();
                 Quest(Order);
 
@@ -1616,72 +1610,74 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
                         plannum = list.FAuxQty.ToString();
                         plan = Math.Round(Convert.ToDouble(plannum));
                         WriteLog("切换订单成功");
+                        try
+                        {
+                            var ps = _repository.GetFirstDefault<ProStatus>(c => c.OrdNoS == Order);
+                            if (ps == null)
+                            {
+                                var outp = new ProStatus()
+                                {
+                                    Id = Guid.NewGuid(),
+                                    OrdNoS = Order,
+                                    PlanS = plan,
+                                    RealityS = 0,
+                                    OkS = 0,
+                                    NgS = 0,
+                                    ErrS = 0
+                                };
+                                _repository.Add(outp);
+                                //
+                                //打印产品码
+                                var t_pda = customRepo.GetAllQuery<t_PDABarCodeSign>(c => c.FBillNo == Order);
+                                if (t_pda != null)
+                                {
+                                    for (int i = 0; i < t_pda.Count; i++)
+                                    {
+                                        fbarcode.Add(t_pda[i].FBarCode);
+                                        tcpService.Send("192.168.10.15", "print:" + fbarcode[i]);
+                                    }
+                                }
+                                //
+                                DateTime dt = DateTime.Today;
+                                var allnumbers = _repository.GetFirstDefault<AllNumber>(c => c.DateA == dt);
+                                if (allnumbers != null)
+                                {
+                                    allnumbers.PlanA = allnumbers.PlanA + plan;
+                                    _repository.Update(allnumbers);
+                                }
+                                else
+                                {
+                                    var al = new AllNumber()
+                                    {
+                                        Id = Guid.NewGuid(),
+                                        DateA = DateTime.Today,
+                                        PlanA = plan,
+                                        RealityA = 0,
+                                        OkA = 0,
+                                        NgA = 0,
+                                        ErrA = 0
+                                    };
+                                    _repository.Add(al);
+                                }
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            WriteLog("OrderEnter2:" + ex.Message, LogType.Error);
+                        }
                     }
                     else
                     {
                         WriteLog("订单错误", LogType.Error);
                     }
 
-                    var t_pda = customRepo.GetAllQuery<t_PDABarCodeSign>(c => c.FBillNo == Order);
-                    if (t_pda != null)
-                    {
-                        for (int i = 0; i < t_pda.Count; i++)
-                        {
-                            fbarcode.Add(t_pda[i].FBarCode);
-                            tcpService.Send("192.168.10.15", "print:" + fbarcode[i]);
-                        }
-                    }
+                   
                 }
                 catch (Exception ex)
                 {
                     WriteLog("OrderEnter1:" + ex.Message, LogType.Error);
                 }
-                try
-                {
-                    var ps = _repository.GetFirstDefault<ProStatus>(c => c.OrdNoS == Order);
-                    if (ps == null)
-                    {
-                        var outp = new ProStatus()
-                        {
-                            Id = Guid.NewGuid(),
-                            OrdNoS = Order,
-                            PlanS = plan,
-                            RealityS = 0,
-                            OkS = 0,
-                            NgS = 0,
-                            ErrS = 0
-                        };
-                        _repository.Add(outp);
-
-
-                        DateTime dt = DateTime.Today;
-                        var allnumbers = _repository.GetFirstDefault<AllNumber>(c => c.DateA == dt);
-                        if (allnumbers != null)
-                        {
-                            allnumbers.PlanA = allnumbers.PlanA + plan;
-                            _repository.Update(allnumbers);
-                        }
-                        else
-                        {
-                            var al = new AllNumber()
-                            {
-                                Id = Guid.NewGuid(),
-                                DateA = DateTime.Today,
-                                PlanA = plan,
-                                RealityA = 0,
-                                OkA = 0,
-                                NgA = 0,
-                                ErrA = 0
-                            };
-                            _repository.Add(al);
-                        }
-                    }
-                }
-                catch (Exception ex)
-                {
-                    WriteLog("OrderEnter2:" + ex.Message, LogType.Error);
-                }
-                //}
+                
             }
             catch (Exception ex)
             {