From c83b5b51b16229f9ec0c5aa9d3477871954dacd9 Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Tue, 10 Dec 2024 18:01:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E8=8D=AF=E3=80=81=E5=8A=A0=E8=8D=AF?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0=E4=B8=8B=E6=8B=89=E5=85=A5?=
=?UTF-8?q?=E5=BA=93=E5=AD=98=E4=B8=8D=E5=85=A5=E5=BA=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
DM_Weight/Models/UseFor.cs | 24 +++++++++++
.../ViewModels/AddDrugControlViewModel.cs | 29 +++++++++++++-
.../CheckStockNewWindowViewModel.cs | 30 +++++++++++++-
.../DrawerAddDrugWindowViewModel.cs | 30 +++++++++++++-
.../DrawerTakeDrugWindowViewModel.cs | 30 +++++++++++++-
.../ViewModels/SelfAddDialogViewModel.cs | 29 +++++++++++++-
.../ViewModels/SelfTakeDialogViewModel.cs | 40 ++++++++++++++++---
DM_Weight/Views/AddDrugControl.xaml | 8 ++++
DM_Weight/Views/CheckStockNewWindow.xaml | 7 ++++
DM_Weight/Views/Dialog/SelfAddDialog.xaml | 7 ++++
DM_Weight/Views/Dialog/SelfTakeDialog.xaml | 8 ++++
DM_Weight/Views/DrawerAddDrugWindow.xaml | 8 +++-
DM_Weight/Views/DrawerTakeDrugWindow.xaml | 7 ++++
13 files changed, 245 insertions(+), 12 deletions(-)
create mode 100644 DM_Weight/Models/UseFor.cs
diff --git a/DM_Weight/Models/UseFor.cs b/DM_Weight/Models/UseFor.cs
new file mode 100644
index 0000000..1b2909f
--- /dev/null
+++ b/DM_Weight/Models/UseFor.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DM_Weight.Models
+{
+ ///
+ /// 取药或加药用途字段（如果是补库存则不加入到报表中）
+ ///
+ public class UseFor
+ {
+ ///
+ /// 96不用于入账册
+ ///
+ public int UseId { get; set; }
+ ///
+ /// （入账册/不入账册）
+ ///
+ public string UseName { get; set; }
+
+ }
+}
diff --git a/DM_Weight/ViewModels/AddDrugControlViewModel.cs b/DM_Weight/ViewModels/AddDrugControlViewModel.cs
index 0ecb968..30a7fca 100644
--- a/DM_Weight/ViewModels/AddDrugControlViewModel.cs
+++ b/DM_Weight/ViewModels/AddDrugControlViewModel.cs
@@ -25,6 +25,33 @@ namespace DM_Weight.ViewModels
{
public class AddDrugControlViewModel : BindableBase, IConfirmNavigationRequest, IRegionMemberLifetime
{
+ public static List SelectUseList = new()
+ {
+ new UseFor{UseId=0,UseName="入账册"},
+ new UseFor { UseId = 96, UseName = "不入账册" }
+ };
+ private List _selects = SelectUseList;
+
+ public List Selects
+ {
+ get { return _selects; }
+ set
+ {
+ SetProperty(ref _selects, value);
+ }
+ }
+ private UseFor _selectedItem = SelectUseList[0];
+ ///
+ /// 取药或加药用途字段
+ ///
+ public UseFor SelectedItem
+ {
+ get { return _selectedItem; }
+ set
+ {
+ SetProperty(ref _selectedItem, value);
+ }
+ }
private readonly ILog logger = LogManager.GetLogger(typeof(AddDrugControlViewModel));
private List _drawerNoList = new List();
public static AddDrugControlViewModel vm;
@@ -324,7 +351,7 @@ namespace DM_Weight.ViewModels
Reviewer = HomeWindowViewModel.Reviewer?.Id,
OperationTime = DateTime.Now,
Quantity = it.AddQuantity,
- Type = 1,
+ Type = SelectedItem.UseId == 0 ? 1 : SelectedItem.UseId,
InvoiceId = InvoiceId,
StockQuantity = nowChannels.Sum(it => it.Quantity),
ManunoQuantity = nowChannels.FindAll(it2 => it2.ManuNo == it.ManuNo).Sum(it => it.Quantity)
diff --git a/DM_Weight/ViewModels/CheckStockNewWindowViewModel.cs b/DM_Weight/ViewModels/CheckStockNewWindowViewModel.cs
index 10cb57e..c571784 100644
--- a/DM_Weight/ViewModels/CheckStockNewWindowViewModel.cs
+++ b/DM_Weight/ViewModels/CheckStockNewWindowViewModel.cs
@@ -26,6 +26,34 @@ namespace DM_Weight.ViewModels
{
public class CheckStockNewWindowViewModel : BindableBase, IConfirmNavigationRequest, IRegionMemberLifetime
{
+ public static List SelectUseList = new()
+ {
+
+ new UseFor{UseId=0,UseName="入账册"},
+ new UseFor { UseId = 96, UseName = "不入账册" }
+ };
+ private List _selectsUseFor = SelectUseList;
+
+ public List SelectsUseFor
+ {
+ get { return _selectsUseFor; }
+ set
+ {
+ SetProperty(ref _selectsUseFor, value);
+ }
+ }
+ private UseFor _selectedItemUseFor = SelectUseList[0];
+ ///
+ /// 取药或加药用途字段
+ ///
+ public UseFor SelectedItemUseFor
+ {
+ get { return _selectedItemUseFor; }
+ set
+ {
+ SetProperty(ref _selectedItemUseFor, value);
+ }
+ }
//public static CheckStockNewWindowViewModel vm;
private readonly ILog logger = LogManager.GetLogger(typeof(CheckStockNewWindowViewModel));
public string drugId;
@@ -438,7 +466,7 @@ namespace DM_Weight.ViewModels
Reviewer = HomeWindowViewModel.Reviewer?.Id,
OperationTime = DateTime.Now,
Quantity = it.CheckQuantity - it.Quantity,
- Type = 4,
+ Type = SelectedItemUseFor.UseId == 0 ? 4 : SelectedItemUseFor.UseId,
InvoiceId = InvoiceId,
StockQuantity = nowChannels.Sum(it => it.Quantity),
CheckQuantity = it.CheckQuantity,
diff --git a/DM_Weight/ViewModels/DrawerAddDrugWindowViewModel.cs b/DM_Weight/ViewModels/DrawerAddDrugWindowViewModel.cs
index bd535dd..47de232 100644
--- a/DM_Weight/ViewModels/DrawerAddDrugWindowViewModel.cs
+++ b/DM_Weight/ViewModels/DrawerAddDrugWindowViewModel.cs
@@ -22,6 +22,34 @@ namespace DM_Weight.ViewModels
{
public class DrawerAddDrugWindowViewModel : BindableBase, IConfirmNavigationRequest, IRegionMemberLifetime
{
+ public static List SelectUseList = new()
+ {
+
+ new UseFor{UseId=0,UseName="入账册"},
+ new UseFor { UseId = 96, UseName = "不入账册" }
+ };
+ private List _selectsUseFor = SelectUseList;
+
+ public List SelectsUseFor
+ {
+ get { return _selectsUseFor; }
+ set
+ {
+ SetProperty(ref _selectsUseFor, value);
+ }
+ }
+ private UseFor _selectedItemUseFor = SelectUseList[0];
+ ///
+ /// 取药或加药用途字段
+ ///
+ public UseFor SelectedItemUseFor
+ {
+ get { return _selectedItemUseFor; }
+ set
+ {
+ SetProperty(ref _selectedItemUseFor, value);
+ }
+ }
private readonly ILog logger = LogManager.GetLogger(typeof(DrawerAddDrugWindowViewModel));
private List _drawerNoList = new List();
@@ -276,7 +304,7 @@ namespace DM_Weight.ViewModels
Reviewer = HomeWindowViewModel.Reviewer?.Id,
OperationTime = DateTime.Now,
Quantity = it.AddQuantity,
- Type = 1,
+ Type = SelectedItemUseFor.UseId==0? 1:SelectedItemUseFor.UseId,
InvoiceId = InvoiceId,
StockQuantity = nowChannels.Sum(it => it.Quantity),
ManunoQuantity = nowChannels.FindAll(it2 => it2.ManuNo == it.ManuNo).Sum(it => it.Quantity),
diff --git a/DM_Weight/ViewModels/DrawerTakeDrugWindowViewModel.cs b/DM_Weight/ViewModels/DrawerTakeDrugWindowViewModel.cs
index 43b88d0..ac1bb3c 100644
--- a/DM_Weight/ViewModels/DrawerTakeDrugWindowViewModel.cs
+++ b/DM_Weight/ViewModels/DrawerTakeDrugWindowViewModel.cs
@@ -26,6 +26,34 @@ namespace DM_Weight.ViewModels
{
public class DrawerTakeDrugWindowViewModel : BindableBase, IConfirmNavigationRequest, IRegionMemberLifetime
{
+ public static List SelectUseList = new()
+ {
+
+ new UseFor{UseId=0,UseName="入账册"},
+ new UseFor { UseId = 96, UseName = "不入账册" }
+ };
+ private List _selectsUseFor = SelectUseList;
+
+ public List SelectsUseFor
+ {
+ get { return _selectsUseFor; }
+ set
+ {
+ SetProperty(ref _selectsUseFor, value);
+ }
+ }
+ private UseFor _selectedItemUseFor = SelectUseList[0];
+ ///
+ /// 取药或加药用途字段
+ ///
+ public UseFor SelectedItemUseFor
+ {
+ get { return _selectedItemUseFor; }
+ set
+ {
+ SetProperty(ref _selectedItemUseFor, value);
+ }
+ }
private readonly ILog logger = LogManager.GetLogger(typeof(DrawerTakeDrugWindowViewModel));
private List _channelStocks = new List();
@@ -253,7 +281,7 @@ namespace DM_Weight.ViewModels
Reviewer = HomeWindowViewModel.Reviewer?.Id,
OperationTime = DateTime.Now,
Quantity = it.TakeQuantity,
- Type = 2,
+ Type = SelectedItemUseFor.UseId==0? 2: SelectedItemUseFor.UseId,
InvoiceId = InvoiceId,
StockQuantity = nowChannels.Sum(it => it.Quantity),
ManunoQuantity = nowChannels.FindAll(it2 => it2.ManuNo == it.ManuNo).Sum(it => it.Quantity),
diff --git a/DM_Weight/ViewModels/SelfAddDialogViewModel.cs b/DM_Weight/ViewModels/SelfAddDialogViewModel.cs
index 4e50021..2b3f932 100644
--- a/DM_Weight/ViewModels/SelfAddDialogViewModel.cs
+++ b/DM_Weight/ViewModels/SelfAddDialogViewModel.cs
@@ -25,7 +25,34 @@ namespace DM_Weight.ViewModels
{
public class SelfAddDialogViewModel : BindableBase, IDialogAware, IRegionMemberLifetime
{
+ public static List SelectUseList = new()
+ {
+ new UseFor{UseId=0,UseName="入账册"},
+ new UseFor { UseId = 96, UseName = "不入账册" }
+ };
+ private List _selectsUseFor = SelectUseList;
+
+ public List SelectsUseFor
+ {
+ get { return _selectsUseFor; }
+ set
+ {
+ SetProperty(ref _selectsUseFor, value);
+ }
+ }
+ private UseFor _selectedItemUseFor = SelectUseList[0];
+ ///
+ /// 取药或加药用途字段
+ ///
+ public UseFor SelectedItemUseFor
+ {
+ get { return _selectedItemUseFor; }
+ set
+ {
+ SetProperty(ref _selectedItemUseFor, value);
+ }
+ }
private readonly ILog logger = LogManager.GetLogger(typeof(SelfAddDialogViewModel));
public string Title => "自选加药";
@@ -349,7 +376,7 @@ namespace DM_Weight.ViewModels
Reviewer = HomeWindowViewModel.Reviewer?.Id,
OperationTime = DateTime.Now,
Quantity = it.AddQuantity,
- Type = 1,
+ Type = SelectedItemUseFor.UseId == 0 ? 1 : SelectedItemUseFor.UseId,
InvoiceId = InvoiceId,
StockQuantity = nowChannels.Sum(it => it.Quantity),
ManunoQuantity = nowChannels.FindAll(it2 => it2.ManuNo == it.ManuNo).Sum(it => it.Quantity),
diff --git a/DM_Weight/ViewModels/SelfTakeDialogViewModel.cs b/DM_Weight/ViewModels/SelfTakeDialogViewModel.cs
index ee525ff..c7f60cf 100644
--- a/DM_Weight/ViewModels/SelfTakeDialogViewModel.cs
+++ b/DM_Weight/ViewModels/SelfTakeDialogViewModel.cs
@@ -18,19 +18,47 @@ using DM_Weight.util;
using System.Threading;
using SqlSugar;
using System.Configuration;
+using DM_Weight.select;
namespace DM_Weight.ViewModels
{
public class SelfTakeDialogViewModel : BindableBase, IDialogAware, IRegionMemberLifetime
{
+ public static List SelectUseList = new()
+ {
+ new UseFor{UseId=0,UseName="入账册"},
+ new UseFor { UseId = 96, UseName = "不入账册" }
+ };
+ private List _selects = SelectUseList;
+
+ public List Selects
+ {
+ get { return _selects; }
+ set
+ {
+ SetProperty(ref _selects, value);
+ }
+ }
+ private UseFor _selectedItem = SelectUseList[0];
+ ///
+ /// 取药或加药用途字段
+ ///
+ public UseFor SelectedItem
+ {
+ get { return _selectedItem; }
+ set
+ {
+ SetProperty(ref _selectedItem, value);
+ }
+ }
private readonly ILog logger = LogManager.GetLogger(typeof(SelfTakeDialogViewModel));
public string Title => "自选取药";
public event Action RequestClose;
private static readonly DateTime Jan1st1970 = new DateTime
- (1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
+ (1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
private string WindowName = "SelfTakeWindow";
@@ -238,7 +266,7 @@ namespace DM_Weight.ViewModels
ChannelStock copy = TransExpV2.Trans(channelStocks[i]);
singleChannels.Add(copy);
}
- singleChannels= singleChannels
+ singleChannels = singleChannels
.GroupBy(it => new { it.DrawerNo, it.ColNo })
.Select(it =>
{
@@ -250,7 +278,7 @@ namespace DM_Weight.ViewModels
.ToList()
.FindAll(it => it.BoardType != 1);
-
+
// 发送取药数量
singleChannels.ForEach(it =>
{
@@ -308,7 +336,7 @@ namespace DM_Weight.ViewModels
OperationTime = DateTime.Now,
Quantity = it.TakeQuantity,
Reviewer = HomeWindowViewModel.Reviewer?.Id,
- Type = 2,
+ Type = SelectedItem.UseId==0? 2: SelectedItem.UseId,
InvoiceId = InvoiceId,
StockQuantity = nowChannels.Sum(it => it.Quantity),
ManunoQuantity = nowChannels.FindAll(it2 => it2.ManuNo == it.ManuNo).Sum(it => it.Quantity),
@@ -323,7 +351,7 @@ namespace DM_Weight.ViewModels
// 更新屏显库存
//List singleChannels = record.FindAll(it => it.BoardType != 1);
List singleChannels = ChannelStocks.Where(it => it.BoardType != 1)
- .GroupBy(it =>new { it.DrawerNo, it.ColNo })
+ .GroupBy(it => new { it.DrawerNo, it.ColNo })
.Select(it =>
{
var ret = it.First();
@@ -341,7 +369,7 @@ namespace DM_Weight.ViewModels
// _portUtil.WriteQuantity(it.DrawerNo, it.ColNo, it.Quantity - it.TakeQuantity);
// });
//}
- if(singleChannels!=null&&singleChannels.Count>0)
+ if (singleChannels != null && singleChannels.Count > 0)
{
for (int i = 0; i < singleChannels.Count; i++)
{
diff --git a/DM_Weight/Views/AddDrugControl.xaml b/DM_Weight/Views/AddDrugControl.xaml
index d318830..56c13c0 100644
--- a/DM_Weight/Views/AddDrugControl.xaml
+++ b/DM_Weight/Views/AddDrugControl.xaml
@@ -175,6 +175,14 @@
materialDesign:ButtonProgressAssist.IsIndeterminate="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnLoading}"
Style="{StaticResource MaterialDesignOutlinedLightButton}"
Content="加药" />
+
+
+
+
-
+
+