From b0cad62370ea92482ed8c6871d553148e1693f76 Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Tue, 19 Nov 2024 13:27:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E6=8E=A5=E6=9F=9C=E5=8A=A0=E8=8D=AF?=
=?UTF-8?q?=E5=AE=8C=E6=88=90=E6=9B=B4=E6=96=B0=E4=BA=A4=E6=8E=A5=E6=9F=9C?=
=?UTF-8?q?=E8=A1=A5=E8=8D=AF=E6=95=B0=E6=8D=AE=E7=8A=B6=E6=80=81=E4=B8=BA?=
=?UTF-8?q?=E5=B7=B2=E5=8F=96=E8=8D=AF=E6=9C=AA=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
DM_Weight/Converter/StockStatusConverter.cs | 47 ++++++++++++++++++
DM_Weight/Models/ChannelList.cs | 2 +-
.../ViewModels/AddToJiaoJieDialogViewModel.cs | 49 ++++++++++++-------
.../ViewModels/AddToJiaoJieWindowViewModel.cs | 10 +++-
DM_Weight/Views/AddToJiaoJieWindow.xaml | 5 +-
5 files changed, 93 insertions(+), 20 deletions(-)
create mode 100644 DM_Weight/Converter/StockStatusConverter.cs
diff --git a/DM_Weight/Converter/StockStatusConverter.cs b/DM_Weight/Converter/StockStatusConverter.cs
new file mode 100644
index 0000000..cb18a15
--- /dev/null
+++ b/DM_Weight/Converter/StockStatusConverter.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace DM_Weight.Converter
+{
+ internal class StockStatusConverter : IValueConverter
+ {
+ //是否给交接柜补药已补药的则不可勾选，未补药的可勾选以进行补药：0未补1已补
+ public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ int status = int.Parse(value.ToString());
+ if (parameter.ToString() == "EnableState")
+ {
+ if (status == 0)
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+ if (parameter.ToString() == "TextState")
+ {
+ if (status == 0)
+ {
+ return "未取药";
+ }
+ else
+ {
+ return "已取药待入库";
+ }
+ }
+ return "";
+ }
+
+ public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ throw new NotImplementedException();
+ }
+ }
+}
diff --git a/DM_Weight/Models/ChannelList.cs b/DM_Weight/Models/ChannelList.cs
index 9e332df..2cc704f 100644
--- a/DM_Weight/Models/ChannelList.cs
+++ b/DM_Weight/Models/ChannelList.cs
@@ -84,7 +84,7 @@ namespace DM_Weight.Models
[SugarColumn(ColumnName = "board_type")]
public int BoardType { get; set; }
///
- ///
+ /// 用于标识是否给交接柜补药：0未补1已补
/// 默认值: 1
///
[SugarColumn(ColumnName = "state")]
diff --git a/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs b/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs
index 764df77..114b89b 100644
--- a/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs
+++ b/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs
@@ -351,23 +351,23 @@ namespace DM_Weight.ViewModels
Id = it.Id,
}).UpdateColumns(it => new { it.Quantity, it.ManuNo, it.EffDate }).ExecuteCommand();
- //更新 交接柜 库存信息
- List jiaojie = Jiaojie_ChannelStocks.Where(cs => cs.DrugId == it.DrugId).ToList();
- if (jiaojie != null && jiaojie.Count > 0)
- {
- for (int j = 0; j < jiaojie.Count; j++)
- {
- // 更新数据 交接柜 库存信息
- ChannelStock jiaojie_it = jiaojie[j];
- SqlSugarHelper.Db.Updateable(new ChannelStock()
- {
- Quantity = jiaojie_it.BaseQuantity,
- //ManuNo = it.ManuNo,
- //EffDate = it.EffDate,
- Id = jiaojie_it.Id,
- }).UpdateColumns(jiaojie_it => new { jiaojie_it.Quantity }).ExecuteCommand();
- }
- }
+ ////更新 交接柜 库存信息
+ //List jiaojie = Jiaojie_ChannelStocks.Where(cs => cs.DrugId == it.DrugId).ToList();
+ //if (jiaojie != null && jiaojie.Count > 0)
+ //{
+ // for (int j = 0; j < jiaojie.Count; j++)
+ // {
+ // // 更新数据 交接柜 库存信息
+ // ChannelStock jiaojie_it = jiaojie[j];
+ // SqlSugarHelper.Db.Updateable(new ChannelStock()
+ // {
+ // Quantity = jiaojie_it.BaseQuantity,
+ // //ManuNo = it.ManuNo,
+ // //EffDate = it.EffDate,
+ // Id = jiaojie_it.Id,
+ // }).UpdateColumns(jiaojie_it => new { jiaojie_it.Quantity }).ExecuteCommand();
+ // }
+ //}
// 保存数据 出库记录
@@ -414,6 +414,21 @@ namespace DM_Weight.ViewModels
}).ExecuteCommand();
}
}
+ //更新交接柜状态为 已取药未入库（等在交接柜入库后再更新交接柜库存）
+ List jiaojie = Jiaojie_ChannelStocks.GroupBy(cs => cs.DrawerNo).Select(cs => cs.FirstOrDefault()).ToList();
+ if (jiaojie != null && jiaojie.Count > 0)
+ {
+ for (int j = 0; j < jiaojie.Count; j++)
+ {
+ ChannelStock jiaojie_it = jiaojie[j];
+ //更新交接柜状态为 已取药未入库
+ SqlSugarHelper.Db.Updateable(new ChannelList()
+ {
+ State = 1,
+ Id = jiaojie_it.ChannelLst.Id
+ }).UpdateColumns(it => it.State).ExecuteCommand();
+ }
+ }
return true;
});
if (f.Data)
diff --git a/DM_Weight/ViewModels/AddToJiaoJieWindowViewModel.cs b/DM_Weight/ViewModels/AddToJiaoJieWindowViewModel.cs
index f931139..d5561ea 100644
--- a/DM_Weight/ViewModels/AddToJiaoJieWindowViewModel.cs
+++ b/DM_Weight/ViewModels/AddToJiaoJieWindowViewModel.cs
@@ -465,7 +465,15 @@ namespace DM_Weight.ViewModels
{
if (channelStock != null)
{
- channelStock.ChannelLst.IsSelected = !channelStock.ChannelLst.IsSelected;
+ //channelStock.ChannelLst.IsSelected = !channelStock.ChannelLst.IsSelected;
+ if (channelStock.ChannelLst.State == 0)
+ {
+ channelStock.ChannelLst.IsSelected = !channelStock.ChannelLst.IsSelected;
+ }
+ else
+ {
+ return;
+ }
if (channelStock != null && ChannelStocks != null)
{
ChannelStocks = ChannelStocks.Select(x =>
diff --git a/DM_Weight/Views/AddToJiaoJieWindow.xaml b/DM_Weight/Views/AddToJiaoJieWindow.xaml
index 5de7e1f..0dd4914 100644
--- a/DM_Weight/Views/AddToJiaoJieWindow.xaml
+++ b/DM_Weight/Views/AddToJiaoJieWindow.xaml
@@ -20,6 +20,7 @@
+
@@ -147,7 +148,7 @@
materialDesign:ExpanderAssist.HeaderBackground="PaleTurquoise" Expanded="Expander_Expanded" Collapsed="Expander_Collapsed">
-
+
@@ -167,6 +168,8 @@
+
+