diff --git a/DM_Weight.sln b/DM_Weight.sln index 9c198ec..2a27474 100644 --- a/DM_Weight.sln +++ b/DM_Weight.sln @@ -8,13 +8,19 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {439FA76B-F874-40DB-BAF2-E3647CD55B10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {439FA76B-F874-40DB-BAF2-E3647CD55B10}.Debug|Any CPU.Build.0 = Debug|Any CPU + {439FA76B-F874-40DB-BAF2-E3647CD55B10}.Debug|x64.ActiveCfg = Debug|x64 + {439FA76B-F874-40DB-BAF2-E3647CD55B10}.Debug|x64.Build.0 = Debug|x64 {439FA76B-F874-40DB-BAF2-E3647CD55B10}.Release|Any CPU.ActiveCfg = Release|Any CPU {439FA76B-F874-40DB-BAF2-E3647CD55B10}.Release|Any CPU.Build.0 = Release|Any CPU + {439FA76B-F874-40DB-BAF2-E3647CD55B10}.Release|x64.ActiveCfg = Release|x64 + {439FA76B-F874-40DB-BAF2-E3647CD55B10}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/DM_Weight/App.config b/DM_Weight/App.config index fd51ad6..1036a6a 100644 --- a/DM_Weight/App.config +++ b/DM_Weight/App.config @@ -3,7 +3,7 @@ - + - + @@ -40,7 +40,7 @@ - + diff --git a/DM_Weight/DM_Weight.csproj b/DM_Weight/DM_Weight.csproj index befe853..255bfcf 100644 --- a/DM_Weight/DM_Weight.csproj +++ b/DM_Weight/DM_Weight.csproj @@ -8,6 +8,7 @@ 毒麻管理程序 Images\favicon.ico + AnyCPU;x64 diff --git a/DM_Weight/ViewModels/MainWindowViewModel.cs b/DM_Weight/ViewModels/MainWindowViewModel.cs index 17af269..048f8f4 100644 --- a/DM_Weight/ViewModels/MainWindowViewModel.cs +++ b/DM_Weight/ViewModels/MainWindowViewModel.cs @@ -88,11 +88,11 @@ namespace DM_Weight.ViewModels _regionManager.RequestNavigate("MainRegion", "BeforeLogin"); })); - //string bAutoWriteNum = ConfigurationManager.AppSettings["AutoWriteNum"] ?? "false"; - //if (bAutoWriteNum == "true") - //{ - // Task.Factory.StartNew(() => BindStock()); - //} + string bAutoWriteNum = ConfigurationManager.AppSettings["AutoWriteNum"] ?? "false"; + if (bAutoWriteNum == "true") + { + Task.Factory.StartNew(() => BindStock()); + } } void doMyPrismEvent2(AlertMsg msg) diff --git a/DM_Weight/ViewModels/MultiOrderTakeDialogViewModel.cs b/DM_Weight/ViewModels/MultiOrderTakeDialogViewModel.cs index cb0d367..99d0950 100644 --- a/DM_Weight/ViewModels/MultiOrderTakeDialogViewModel.cs +++ b/DM_Weight/ViewModels/MultiOrderTakeDialogViewModel.cs @@ -491,7 +491,8 @@ namespace DM_Weight.ViewModels ManunoQuantity = nowChannels.FindAll(it2 => it2.ManuNo == it.ManuNo).Sum(it => it.Quantity), SupplierDept = ConfigurationManager.AppSettings["receiveDept"].ToString(), ReceiveDept = OrderInfo[j].DeptName, - GetId = orderDetail.OrderId + GetId = orderDetail.OrderId, + ReceivePerson= ReceivePerson }).ExecuteCommand(); logger.Info("Insertable MachineRecord");