From 100c6fe49c85cc84e86c5f45f9621d77e08d253f Mon Sep 17 00:00:00 2001 From: wangshaoyang <18303387296@139.com> Date: Mon, 29 Apr 2019 15:26:05 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8D=95No.1432591=E3=80=81?= =?UTF-8?q?=E3=80=90=E4=BB=93=E5=BA=93=E5=AE=A2=E6=88=B7=E7=AB=AF=E3=80=91?= =?UTF-8?q?=E7=9A=84=E2=80=98=E7=99=BD=E6=9D=A1=E5=8F=91=E8=B4=A7=E2=80=99?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E2=80=98=E9=85=8D=E8=B4=A7=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E2=80=99=20=E6=8F=90=E7=A4=BA=E8=B0=83=E6=95=B4=EF=BC=9B2?= =?UTF-8?q?=E3=80=81=E3=80=90=E4=BB=93=E5=BA=93=E5=AE=A2=E6=88=B7=E7=AB=AF?= =?UTF-8?q?=E3=80=91=E7=9A=84=E2=80=98=E7=99=BD=E6=9D=A1=E5=8F=91=E8=B4=A7?= =?UTF-8?q?=E2=80=99=E2=80=98=E9=B2=9C=E5=93=81=E5=8F=91=E8=B4=A7=E2=80=99?= =?UTF-8?q?=E7=9A=84=E5=B7=A6=E8=BE=B9=E7=9A=84=E5=AE=A2=E6=88=B7=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E8=B0=83=E6=95=B4=E3=80=82=E2=80=98=E7=99=BD=E6=9D=A1?= =?UTF-8?q?=E5=8F=91=E8=B4=A7=E2=80=99=E2=80=98=E7=99=BD=E6=9D=A1=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E2=80=99=E2=80=98=E9=B2=9C=E5=93=81=E9=85=8D=E8=B4=A7?= =?UTF-8?q?=E2=80=99=E2=80=98=E9=B2=9C=E5=93=81=E5=8F=91=E8=B4=A7=E2=80=99?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=B8=AD=E2=80=98=E5=AD=98=E8=B4=A7=E2=80=99?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=B0=83=E6=95=B4=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- B3DealerClient/BL/CarcassSaleOutBL.cs | 2 +- .../CarcassInStoreWindow_/CarcassInStoreWindow.xaml | 2 +- .../CarcassSaleOutWindow_/CarcassSaleOutWindow.xaml | 4 ++-- .../CarcassSaleOutWindow.xaml.cs | 13 +++++++++---- .../FreshInStoreWindow_/FreshInStoreWindow.xaml | 2 +- .../FreshSaleOutWindow_/FreshSaleOutWindow.xaml | 4 ++-- 6 files changed, 16 insertions(+), 11 deletions(-) diff --git a/B3DealerClient/BL/CarcassSaleOutBL.cs b/B3DealerClient/BL/CarcassSaleOutBL.cs index 2db0038..03a685e 100644 --- a/B3DealerClient/BL/CarcassSaleOutBL.cs +++ b/B3DealerClient/BL/CarcassSaleOutBL.cs @@ -29,7 +29,7 @@ namespace B3DealerClient.BL if (list.Count == 0) return; var query = new DQueryDom(new JoinAlias(typeof(CarcassSaleOut_Record))); - query.Where.Conditions.Add(DQCondition.InList(DQExpression.Field("DetailID"), list.Select(x => DQExpression.Value(x.ID)).ToArray())); + query.Where.Conditions.Add(DQCondition.InList(DQExpression.Field("DetailID"), list.Select(x => DQExpression.Value(x.DetailID)).ToArray())); query.Columns.Add(DQSelectColumn.Field("DetailID")); query.Columns.Add(DQSelectColumn.Sum("NetWeight")); query.Columns.Add(DQSelectColumn.Sum("SecondNumber")); diff --git a/B3DealerClient/Windows/CarcassInStoreWindow_/CarcassInStoreWindow.xaml b/B3DealerClient/Windows/CarcassInStoreWindow_/CarcassInStoreWindow.xaml index 164a351..4c616ab 100644 --- a/B3DealerClient/Windows/CarcassInStoreWindow_/CarcassInStoreWindow.xaml +++ b/B3DealerClient/Windows/CarcassInStoreWindow_/CarcassInStoreWindow.xaml @@ -185,7 +185,7 @@ - + diff --git a/B3DealerClient/Windows/CarcassSaleOutWindow_/CarcassSaleOutWindow.xaml b/B3DealerClient/Windows/CarcassSaleOutWindow_/CarcassSaleOutWindow.xaml index 01d3267..eb2c244 100644 --- a/B3DealerClient/Windows/CarcassSaleOutWindow_/CarcassSaleOutWindow.xaml +++ b/B3DealerClient/Windows/CarcassSaleOutWindow_/CarcassSaleOutWindow.xaml @@ -69,7 +69,7 @@ @@ -153,7 +153,7 @@ - + diff --git a/B3DealerClient/Windows/CarcassSaleOutWindow_/CarcassSaleOutWindow.xaml.cs b/B3DealerClient/Windows/CarcassSaleOutWindow_/CarcassSaleOutWindow.xaml.cs index 73fd58c..67c434e 100644 --- a/B3DealerClient/Windows/CarcassSaleOutWindow_/CarcassSaleOutWindow.xaml.cs +++ b/B3DealerClient/Windows/CarcassSaleOutWindow_/CarcassSaleOutWindow.xaml.cs @@ -288,20 +288,25 @@ namespace B3DealerClient.Windows.CarcassSaleOutWindow_ var targets = context.DmoList.Where(x => x.ID == context.Dmo.ID); var needConfirm = targets.Any(x => (x.AlreadyNumber ?? 0) == 0 || (x.SecondNumber ?? 0) == 0); + bool isShow = false; if (needConfirm) { var confirm = MessageBox.Show("存在未配货的明细，确认配货完成？", "配货完成确认", MessageBoxButton.OKCancel, MessageBoxImage.Question); if (confirm != MessageBoxResult.OK) return; + isShow = true; } - var r = MessageBox.Show("确认配货完成？", "配货完成确认", MessageBoxButton.OKCancel, MessageBoxImage.Question); - if (r != MessageBoxResult.OK) - return; + if (!isShow) + { + var r = MessageBox.Show("确认配货完成？", "配货完成确认", MessageBoxButton.OKCancel, MessageBoxImage.Question); + if (r != MessageBoxResult.OK) + return; + } CarcassSaleOutBL.FinishAssign(context.Dmo.ID); foreach (var item in targets) item.AssignFinished = true; context.Dmo = context.Dmo; - MessageBox.Show("配货完成"); + //MessageBox.Show("配货完成"); } private void weightUnit_Click(object sender, RoutedEventArgs e) diff --git a/B3DealerClient/Windows/FreshInStoreWindow_/FreshInStoreWindow.xaml b/B3DealerClient/Windows/FreshInStoreWindow_/FreshInStoreWindow.xaml index cea2966..7999223 100644 --- a/B3DealerClient/Windows/FreshInStoreWindow_/FreshInStoreWindow.xaml +++ b/B3DealerClient/Windows/FreshInStoreWindow_/FreshInStoreWindow.xaml @@ -162,7 +162,7 @@ - + diff --git a/B3DealerClient/Windows/FreshSaleOutWindow_/FreshSaleOutWindow.xaml b/B3DealerClient/Windows/FreshSaleOutWindow_/FreshSaleOutWindow.xaml index 4498745..d896dda 100644 --- a/B3DealerClient/Windows/FreshSaleOutWindow_/FreshSaleOutWindow.xaml +++ b/B3DealerClient/Windows/FreshSaleOutWindow_/FreshSaleOutWindow.xaml @@ -67,7 +67,7 @@ @@ -144,7 +144,7 @@ - +