maqiao
/
XiangTan_DM
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

报表查询条件添加时间选择

This commit is contained in:
马巧 2025-07-28 15:16:43 +08:00
parent f7391b5506
commit e1629fbdc7
18 changed files with 398 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DM_Weight/App.xaml.cs
View File

@ -269,6 +269,8 @@ namespace DM_Weight
//交接柜加药页面 //交接柜加药页面
containerRegistry.RegisterForNavigation<AddToJiaoJieNewWindow, AddToJiaoJieNewWindowViewModel>(); containerRegistry.RegisterForNavigation<AddToJiaoJieNewWindow, AddToJiaoJieNewWindowViewModel>();
containerRegistry.RegisterDialog<DatetimeDialog>();
containerRegistry.RegisterForNavigation<DatetimeDialog, DatetimeDialogViewModel>();
} }
} }

45
DM_Weight/ReportTemp/account_use_temp.grf
View File

@ -115,6 +115,10 @@
"Name":"手术间", "Name":"手术间",
"Width":1.00542 "Width":1.00542
}, },
{
"Name":"Column1",
"Width":2.35479
},
{ {
"Name":"病人姓名", "Name":"病人姓名",
"Width":1.79917 "Width":1.79917
@ -157,11 +161,8 @@
}, },
{ {
"Name":"空安瓿药房接收者", "Name":"空安瓿药房接收者",
"Width":1.61396 "Width":1.61396,
}, "Visible":false
{
"Name":"Column1",
"Width":2.35479
} }
], ],
"ColumnContent":{ "ColumnContent":{
@ -194,6 +195,11 @@
"TextAlign":"MiddleCenter", "TextAlign":"MiddleCenter",
"DataField":"手术间" "DataField":"手术间"
}, },
{
"Column":"Column1",
"TextAlign":"MiddleCenter",
"DataField":"住院号"
},
{ {
"Column":"病人姓名", "Column":"病人姓名",
"TextAlign":"MiddleCenter", "TextAlign":"MiddleCenter",
@ -247,11 +253,6 @@
"Column":"空安瓿药房接收者", "Column":"空安瓿药房接收者",
"TextAlign":"MiddleCenter", "TextAlign":"MiddleCenter",
"DataField":"空安瓿药房接收者" "DataField":"空安瓿药房接收者"
},
{
"Column":"Column1",
"TextAlign":"MiddleCenter",
"DataField":"住院号"
} }
] ]
}, },
@ -319,6 +320,18 @@
"TextAlign":"MiddleCenter", "TextAlign":"MiddleCenter",
"Text":"手\r\n术\r\n间" "Text":"手\r\n术\r\n间"
}, },
{
"GroupTitle":false,
"Column":"Column1",
"Font":{
"Name":"宋体",
"Size":105000,
"Bold":true,
"Charset":134
},
"TextAlign":"MiddleCenter",
"Text":"住院号"
},
{ {
"GroupTitle":false, "GroupTitle":false,
"Column":"病人姓名", "Column":"病人姓名",
@ -450,18 +463,6 @@
}, },
"TextAlign":"MiddleCenter", "TextAlign":"MiddleCenter",
"Text":"空安瓿\r\n药房\r\n接收者" "Text":"空安瓿\r\n药房\r\n接收者"
},
{
"GroupTitle":false,
"Column":"Column1",
"Font":{
"Name":"宋体",
"Size":105000,
"Bold":true,
"Charset":134
},
"TextAlign":"MiddleCenter",
"Text":"住院号"
} }
] ]
} }

3
DM_Weight/ViewModels/ApplyInStockWindowViewModel.cs
View File

@ -655,6 +655,7 @@ namespace DM_Weight.ViewModels
UserId2 = HomeWindowViewModel.Reviewer?.Id, UserId2 = HomeWindowViewModel.Reviewer?.Id,
MachineId = ConfigurationManager.AppSettings["machineId"].ToString(), MachineId = ConfigurationManager.AppSettings["machineId"].ToString(),
CreateDate = DateTime.Now.ToString("yyyy-MM-dd"), CreateDate = DateTime.Now.ToString("yyyy-MM-dd"),
CreateTime = DateTime.Now,
//CreateTime = DateTime.Now, //CreateTime = DateTime.Now,
InvoiceNo = SelectDrugPleaseClaim.PleaseNo InvoiceNo = SelectDrugPleaseClaim.PleaseNo
@ -687,6 +688,7 @@ namespace DM_Weight.ViewModels
UserId2 = HomeWindowViewModel.Reviewer?.Id, UserId2 = HomeWindowViewModel.Reviewer?.Id,
MachineId = ConfigurationManager.AppSettings["machineId"].ToString(), MachineId = ConfigurationManager.AppSettings["machineId"].ToString(),
CreateDate = DateTime.Now.ToString("yyyy-MM-dd"), CreateDate = DateTime.Now.ToString("yyyy-MM-dd"),
CreateTime = DateTime.Now,
InvoiceNo = "日结存" InvoiceNo = "日结存"
}).ExecuteCommand(); }).ExecuteCommand();
if (iDayResult <= 0) if (iDayResult <= 0)
@ -720,6 +722,7 @@ namespace DM_Weight.ViewModels
UserId2 = HomeWindowViewModel.Reviewer?.Id, UserId2 = HomeWindowViewModel.Reviewer?.Id,
MachineId = ConfigurationManager.AppSettings["machineId"].ToString(), MachineId = ConfigurationManager.AppSettings["machineId"].ToString(),
CreateDate = DateTime.Now.ToString("yyyy-MM-dd"), CreateDate = DateTime.Now.ToString("yyyy-MM-dd"),
CreateTime = DateTime.Now,
InvoiceNo = "总结存" InvoiceNo = "总结存"
}).ExecuteCommand(); }).ExecuteCommand();
if (iTotalResult <= 0) if (iTotalResult <= 0)

73
DM_Weight/ViewModels/DatetimeDialogViewModel.cs Normal file
View File

@ -0,0 +1,73 @@
using DM_Weight.Models;
using DM_Weight.msg;
using Prism.Commands;
using Prism.Mvvm;
using Prism.Services.Dialogs;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DM_Weight.ViewModels
{
internal class DatetimeDialogViewModel : BindableBase, IDialogAware
{
public string Title => throw new NotImplementedException();
public event Action<IDialogResult> RequestClose;
private DateTime? _date = new DateTime();
public DateTime? Date
{
get => _date;
set
{
SetProperty(ref _date, value);
}
}
private DateTime? _time = new DateTime();
public DateTime? Time
{
get => _time;
set
{
SetProperty(ref _time, value);
}
}
public bool CanCloseDialog()
{
return true;
}
public void OnDialogClosed()
{
}
string typeS;
public void OnDialogOpened(IDialogParameters parameters)
{
DateTime o = parameters.GetValue<DateTime>("DateTime");
typeS = parameters.GetValue<string>("Type");
Date = o;
Time = o;
}
public DelegateCommand CloseAction
{
get => new DelegateCommand(() =>
{
var datetime=new DateTime(Date?.Year ?? DateTime.Now.Year, Date?.Month ?? DateTime.Now.Month, Date?.Day ?? DateTime.Now.Day,
Time?.Hour ?? DateTime.Now.Hour, Time?.Minute ?? DateTime.Now.Minute, Time?.Second ?? DateTime.Now.Second);
var result = new DialogResult(ButtonResult.OK, new DialogParameters
{
{ "DateTime", datetime },
{"Type",typeS }
});
RequestClose?.Invoke(result);
});
}
}
}

8
DM_Weight/ViewModels/DrawerAddDrugWindowViewModel.cs
View File

@ -255,7 +255,7 @@ namespace DM_Weight.ViewModels
CreateDate = DateTime.Now.ToString("yyyy-MM-dd"), CreateDate = DateTime.Now.ToString("yyyy-MM-dd"),
CreateTime = DateTime.Now, CreateTime = DateTime.Now,
TotalStock = nowChannels.Sum(itx => itx.Quantity), TotalStock = nowChannels.Sum(itx => itx.Quantity),
ManuStock = nowChannels.Where(itx => itx.ManuNo == it.ManuNo && itx.EffDate == it.EffDate).Sum(itx => itx.Quantity) ManuStock = nowChannels.Where(itx => itx.ManuNo == it.ManuNo && itx.EffDate == it.EffDate).Sum(itx => itx.Quantity),
}).ExecuteCommand(); }).ExecuteCommand();
//修改凌晨生成的日结存数据 //修改凌晨生成的日结存数据
AccountBookG2 accountBookG2Day = SqlSugarHelper.Db.Queryable<AccountBookG2>() AccountBookG2 accountBookG2Day = SqlSugarHelper.Db.Queryable<AccountBookG2>()
@ -267,6 +267,7 @@ namespace DM_Weight.ViewModels
if (accountBookG2Day != null) if (accountBookG2Day != null)
{ {
accountBookG2Day.ManuStock = accountBookG2Day.ManuStock + it.AddQuantity; accountBookG2Day.ManuStock = accountBookG2Day.ManuStock + it.AddQuantity;
accountBookG2Day.AddQuantity = accountBookG2Day.AddQuantity + it.AddQuantity;
SqlSugarHelper.Db.Updateable(accountBookG2Day).ExecuteCommand(); SqlSugarHelper.Db.Updateable(accountBookG2Day).ExecuteCommand();
} }
else else
@ -285,7 +286,9 @@ namespace DM_Weight.ViewModels
UserId2 = HomeWindowViewModel.Reviewer?.Id, UserId2 = HomeWindowViewModel.Reviewer?.Id,
MachineId = ConfigurationManager.AppSettings["machineId"].ToString(), MachineId = ConfigurationManager.AppSettings["machineId"].ToString(),
CreateDate = DateTime.Now.ToString("yyyy-MM-dd"), CreateDate = DateTime.Now.ToString("yyyy-MM-dd"),
InvoiceNo = "日结存" CreateTime=DateTime.Now,
InvoiceNo = "日结存",
AddQuantity=it.AddQuantity
}).ExecuteCommand(); }).ExecuteCommand();
if (iDayResult <= 0) if (iDayResult <= 0)
{ {
@ -317,6 +320,7 @@ namespace DM_Weight.ViewModels
UserId2 = HomeWindowViewModel.Reviewer?.Id, UserId2 = HomeWindowViewModel.Reviewer?.Id,
MachineId = ConfigurationManager.AppSettings["machineId"].ToString(), MachineId = ConfigurationManager.AppSettings["machineId"].ToString(),
CreateDate = DateTime.Now.ToString("yyyy-MM-dd"), CreateDate = DateTime.Now.ToString("yyyy-MM-dd"),
CreateTime = DateTime.Now,
InvoiceNo = "总结存" InvoiceNo = "总结存"
}).ExecuteCommand(); }).ExecuteCommand();
if (iTotalResult <= 0) if (iTotalResult <= 0)

8
DM_Weight/ViewModels/DrawerTakeDrugWindowViewModel.cs
View File

@ -266,6 +266,7 @@ namespace DM_Weight.ViewModels
if (accountBookG2Day != null) if (accountBookG2Day != null)
{ {
accountBookG2Day.ManuStock = accountBookG2Day.ManuStock - it.TakeQuantity; accountBookG2Day.ManuStock = accountBookG2Day.ManuStock - it.TakeQuantity;
accountBookG2Day.OutQuantity = accountBookG2Day.OutQuantity + accountBookG2Day.OutQuantity;
SqlSugarHelper.Db.Updateable(accountBookG2Day).ExecuteCommand(); SqlSugarHelper.Db.Updateable(accountBookG2Day).ExecuteCommand();
} }
else else
@ -284,7 +285,9 @@ namespace DM_Weight.ViewModels
UserId2 = HomeWindowViewModel.Reviewer?.Id, UserId2 = HomeWindowViewModel.Reviewer?.Id,
MachineId = ConfigurationManager.AppSettings["machineId"].ToString(), MachineId = ConfigurationManager.AppSettings["machineId"].ToString(),
CreateDate = DateTime.Now.ToString("yyyy-MM-dd"), CreateDate = DateTime.Now.ToString("yyyy-MM-dd"),
InvoiceNo = "日结存" CreateTime = DateTime.Now,
InvoiceNo = "日结存",
OutQuantity=it.TakeQuantity
}).ExecuteCommand(); }).ExecuteCommand();
if (iDayResult <= 0) if (iDayResult <= 0)
{ {
@ -299,7 +302,7 @@ namespace DM_Weight.ViewModels
.Where(ab => ab.CreateDate == DateTime.Now.ToString("yyyy-MM-dd")).First(); .Where(ab => ab.CreateDate == DateTime.Now.ToString("yyyy-MM-dd")).First();
if (accountBookG2Total != null) if (accountBookG2Total != null)
{ {
accountBookG2Total.TotalStock = accountBookG2Total.TotalStock - it.TakeQuantity; accountBookG2Total.TotalStock = accountBookG2Total.TotalStock - it.TakeQuantity;
SqlSugarHelper.Db.Updateable(accountBookG2Total).ExecuteCommand(); SqlSugarHelper.Db.Updateable(accountBookG2Total).ExecuteCommand();
} }
else else
@ -316,6 +319,7 @@ namespace DM_Weight.ViewModels
UserId2 = HomeWindowViewModel.Reviewer?.Id, UserId2 = HomeWindowViewModel.Reviewer?.Id,
MachineId = ConfigurationManager.AppSettings["machineId"].ToString(), MachineId = ConfigurationManager.AppSettings["machineId"].ToString(),
CreateDate = DateTime.Now.ToString("yyyy-MM-dd"), CreateDate = DateTime.Now.ToString("yyyy-MM-dd"),
CreateTime = DateTime.Now,
InvoiceNo = "总结存" InvoiceNo = "总结存"
}).ExecuteCommand(); }).ExecuteCommand();
if (iTotalResult <= 0) if (iTotalResult <= 0)

9
DM_Weight/ViewModels/InvoiceAddDialogViewModel.cs
View File

@ -318,6 +318,7 @@ namespace DM_Weight.ViewModels
if (accountBookG2Day != null) if (accountBookG2Day != null)
{ {
accountBookG2Day.ManuStock = accountBookG2Day.ManuStock + it.AddQuantity; accountBookG2Day.ManuStock = accountBookG2Day.ManuStock + it.AddQuantity;
accountBookG2Day.AddQuantity = accountBookG2Day.AddQuantity + it.AddQuantity;
SqlSugarHelper.Db.Updateable(accountBookG2Day).ExecuteCommand(); SqlSugarHelper.Db.Updateable(accountBookG2Day).ExecuteCommand();
} }
else else
@ -336,7 +337,9 @@ namespace DM_Weight.ViewModels
UserId2 = HomeWindowViewModel.Reviewer?.Id, UserId2 = HomeWindowViewModel.Reviewer?.Id,
MachineId = ConfigurationManager.AppSettings["machineId"].ToString(), MachineId = ConfigurationManager.AppSettings["machineId"].ToString(),
CreateDate = DateTime.Now.ToString("yyyy-MM-dd"), CreateDate = DateTime.Now.ToString("yyyy-MM-dd"),
InvoiceNo = "日结存" CreateTime=DateTime.Now,
InvoiceNo = "日结存",
AddQuantity=it.AddQuantity
}).ExecuteCommand(); }).ExecuteCommand();
if (iDayResult <= 0) if (iDayResult <= 0)
{ {
@ -368,7 +371,9 @@ namespace DM_Weight.ViewModels
UserId2 = HomeWindowViewModel.Reviewer?.Id, UserId2 = HomeWindowViewModel.Reviewer?.Id,
MachineId = ConfigurationManager.AppSettings["machineId"].ToString(), MachineId = ConfigurationManager.AppSettings["machineId"].ToString(),
CreateDate = DateTime.Now.ToString("yyyy-MM-dd"), CreateDate = DateTime.Now.ToString("yyyy-MM-dd"),
InvoiceNo = "总结存" CreateTime = DateTime.Now,
InvoiceNo = "总结存",
AddQuantity = it.AddQuantity
}).ExecuteCommand(); }).ExecuteCommand();
if (iTotalResult <= 0) if (iTotalResult <= 0)
{ {

6
DM_Weight/ViewModels/InvoiceTakeDialogViewModel.cs
View File

@ -372,6 +372,7 @@ namespace DM_Weight.ViewModels
if (accountBookG2Day != null) if (accountBookG2Day != null)
{ {
accountBookG2Day.ManuStock = accountBookG2Day.ManuStock - it.TakeQuantity; accountBookG2Day.ManuStock = accountBookG2Day.ManuStock - it.TakeQuantity;
accountBookG2Day.OutQuantity = accountBookG2Day.OutQuantity + it.TakeQuantity;
SqlSugarHelper.Db.Updateable(accountBookG2Day).ExecuteCommand(); SqlSugarHelper.Db.Updateable(accountBookG2Day).ExecuteCommand();
} }
else else
@ -390,7 +391,9 @@ namespace DM_Weight.ViewModels
UserId2 = HomeWindowViewModel.Reviewer?.Id, UserId2 = HomeWindowViewModel.Reviewer?.Id,
MachineId = ConfigurationManager.AppSettings["machineId"].ToString(), MachineId = ConfigurationManager.AppSettings["machineId"].ToString(),
CreateDate = DateTime.Now.ToString("yyyy-MM-dd"), CreateDate = DateTime.Now.ToString("yyyy-MM-dd"),
InvoiceNo = "日结存" CreateTime = DateTime.Now,
InvoiceNo = "日结存",
OutQuantity=it.TakeQuantity
}).ExecuteCommand(); }).ExecuteCommand();
if (iDayResult <= 0) if (iDayResult <= 0)
{ {
@ -422,6 +425,7 @@ namespace DM_Weight.ViewModels
UserId2 = HomeWindowViewModel.Reviewer?.Id, UserId2 = HomeWindowViewModel.Reviewer?.Id,
MachineId = ConfigurationManager.AppSettings["machineId"].ToString(), MachineId = ConfigurationManager.AppSettings["machineId"].ToString(),
CreateDate = DateTime.Now.ToString("yyyy-MM-dd"), CreateDate = DateTime.Now.ToString("yyyy-MM-dd"),
CreateTime = DateTime.Now,
InvoiceNo = "总结存" InvoiceNo = "总结存"
}).ExecuteCommand(); }).ExecuteCommand();
if (iTotalResult <= 0) if (iTotalResult <= 0)

6
DM_Weight/ViewModels/OrderReturnDialogViewModel.cs
View File

@ -368,6 +368,7 @@ namespace DM_Weight.ViewModels
if (accountBookG2Day != null) if (accountBookG2Day != null)
{ {
accountBookG2Day.ManuStock = accountBookG2Day.ManuStock + it.ReturnQuantity; accountBookG2Day.ManuStock = accountBookG2Day.ManuStock + it.ReturnQuantity;
accountBookG2Day.AddQuantity = accountBookG2Day.AddQuantity + it.ReturnQuantity;
SqlSugarHelper.Db.Updateable(accountBookG2Day).ExecuteCommand(); SqlSugarHelper.Db.Updateable(accountBookG2Day).ExecuteCommand();
} }
else else
@ -386,7 +387,9 @@ namespace DM_Weight.ViewModels
UserId2 = HomeWindowViewModel.Reviewer?.Id, UserId2 = HomeWindowViewModel.Reviewer?.Id,
MachineId = ConfigurationManager.AppSettings["machineId"].ToString(), MachineId = ConfigurationManager.AppSettings["machineId"].ToString(),
CreateDate = DateTime.Now.ToString("yyyy-MM-dd"), CreateDate = DateTime.Now.ToString("yyyy-MM-dd"),
InvoiceNo = "日结存" CreateTime = DateTime.Now,
InvoiceNo = "日结存",
AddQuantity= it.ReturnQuantity
}).ExecuteCommand(); }).ExecuteCommand();
if (iDayResult <= 0) if (iDayResult <= 0)
{ {
@ -418,6 +421,7 @@ namespace DM_Weight.ViewModels
UserId2 = HomeWindowViewModel.Reviewer?.Id, UserId2 = HomeWindowViewModel.Reviewer?.Id,
MachineId = ConfigurationManager.AppSettings["machineId"].ToString(), MachineId = ConfigurationManager.AppSettings["machineId"].ToString(),
CreateDate = DateTime.Now.ToString("yyyy-MM-dd"), CreateDate = DateTime.Now.ToString("yyyy-MM-dd"),
CreateTime = DateTime.Now,
InvoiceNo = "总结存" InvoiceNo = "总结存"
}).ExecuteCommand(); }).ExecuteCommand();
if (iTotalResult <= 0) if (iTotalResult <= 0)

6
DM_Weight/ViewModels/OrderTakeDialogViewModel.cs
View File

@ -391,6 +391,7 @@ namespace DM_Weight.ViewModels
if (accountBookG2Day != null) if (accountBookG2Day != null)
{ {
accountBookG2Day.ManuStock = accountBookG2Day.ManuStock - it.TakeQuantity; accountBookG2Day.ManuStock = accountBookG2Day.ManuStock - it.TakeQuantity;
accountBookG2Day.OutQuantity = accountBookG2Day.OutQuantity + it.TakeQuantity;
SqlSugarHelper.Db.Updateable(accountBookG2Day).ExecuteCommand(); SqlSugarHelper.Db.Updateable(accountBookG2Day).ExecuteCommand();
} }
else else
@ -409,7 +410,9 @@ namespace DM_Weight.ViewModels
UserId2 = HomeWindowViewModel.Reviewer?.Id, UserId2 = HomeWindowViewModel.Reviewer?.Id,
MachineId = ConfigurationManager.AppSettings["machineId"].ToString(), MachineId = ConfigurationManager.AppSettings["machineId"].ToString(),
CreateDate = DateTime.Now.ToString("yyyy-MM-dd"), CreateDate = DateTime.Now.ToString("yyyy-MM-dd"),
InvoiceNo = "日结存" CreateTime = DateTime.Now,
InvoiceNo = "日结存",
OutQuantity=it.TakeQuantity
}).ExecuteCommand(); }).ExecuteCommand();
if(iDayResult<=0) if(iDayResult<=0)
{ {
@ -441,6 +444,7 @@ namespace DM_Weight.ViewModels
UserId2 = HomeWindowViewModel.Reviewer?.Id, UserId2 = HomeWindowViewModel.Reviewer?.Id,
MachineId = ConfigurationManager.AppSettings["machineId"].ToString(), MachineId = ConfigurationManager.AppSettings["machineId"].ToString(),
CreateDate = DateTime.Now.ToString("yyyy-MM-dd"), CreateDate = DateTime.Now.ToString("yyyy-MM-dd"),
CreateTime = DateTime.Now,
InvoiceNo = "总结存" InvoiceNo = "总结存"
}).ExecuteCommand(); }).ExecuteCommand();
if (iTotalResult <= 0) if (iTotalResult <= 0)

47
DM_Weight/ViewModels/PickersViewModel.cs Normal file
View File

@ -0,0 +1,47 @@
using Prism.Mvvm;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DM_Weight.ViewModels
{
internal class PickersViewModel:BindableBase
{
private DateTime _date;
private DateTime _time;
private string? _validatingTime;
private DateTime? _futureValidatingDate;
public PickersViewModel()
{
Date = DateTime.Now;
Time = DateTime.Now;
}
public DateTime Date
{
get => _date;
set => SetProperty(ref _date, value);
}
public DateTime Time
{
get => _time;
set => SetProperty(ref _time, value);
}
public string? ValidatingTime
{
get => _validatingTime;
set => SetProperty(ref _validatingTime, value);
}
public DateTime? FutureValidatingDate
{
get => _futureValidatingDate;
set => SetProperty(ref _futureValidatingDate, value);
}
}
}

6
DM_Weight/ViewModels/ReturnDrugDialogViewModel.cs
View File

@ -300,6 +300,7 @@ namespace DM_Weight.ViewModels
if (accountBookG2Day != null) if (accountBookG2Day != null)
{ {
accountBookG2Day.ManuStock = accountBookG2Day.ManuStock + ChannelStock.ReturnQuantity; accountBookG2Day.ManuStock = accountBookG2Day.ManuStock + ChannelStock.ReturnQuantity;
accountBookG2Day.AddQuantity = accountBookG2Day.AddQuantity + ChannelStock.ReturnQuantity;
SqlSugarHelper.Db.Updateable(accountBookG2Day).ExecuteCommand(); SqlSugarHelper.Db.Updateable(accountBookG2Day).ExecuteCommand();
} }
else else
@ -318,7 +319,9 @@ namespace DM_Weight.ViewModels
UserId2 = HomeWindowViewModel.Reviewer?.Id, UserId2 = HomeWindowViewModel.Reviewer?.Id,
MachineId = ConfigurationManager.AppSettings["machineId"].ToString(), MachineId = ConfigurationManager.AppSettings["machineId"].ToString(),
CreateDate = DateTime.Now.ToString("yyyy-MM-dd"), CreateDate = DateTime.Now.ToString("yyyy-MM-dd"),
InvoiceNo = "日结存" CreateTime = DateTime.Now,
InvoiceNo = "日结存",
AddQuantity=ChannelStock.ReturnQuantity
}).ExecuteCommand(); }).ExecuteCommand();
if (iDayResult <= 0) if (iDayResult <= 0)
{ {
@ -350,6 +353,7 @@ namespace DM_Weight.ViewModels
UserId2 = HomeWindowViewModel.Reviewer?.Id, UserId2 = HomeWindowViewModel.Reviewer?.Id,
MachineId = ConfigurationManager.AppSettings["machineId"].ToString(), MachineId = ConfigurationManager.AppSettings["machineId"].ToString(),
CreateDate = DateTime.Now.ToString("yyyy-MM-dd"), CreateDate = DateTime.Now.ToString("yyyy-MM-dd"),
CreateTime = DateTime.Now,
InvoiceNo = "总结存" InvoiceNo = "总结存"
}).ExecuteCommand(); }).ExecuteCommand();
if (iTotalResult <= 0) if (iTotalResult <= 0)

6
DM_Weight/ViewModels/SelfAddDialogViewModel.cs
View File

@ -298,6 +298,7 @@ namespace DM_Weight.ViewModels
if (accountBookG2Day != null) if (accountBookG2Day != null)
{ {
accountBookG2Day.ManuStock = accountBookG2Day.ManuStock + it.AddQuantity; accountBookG2Day.ManuStock = accountBookG2Day.ManuStock + it.AddQuantity;
accountBookG2Day.AddQuantity = accountBookG2Day.AddQuantity + it.AddQuantity;
SqlSugarHelper.Db.Updateable(accountBookG2Day).ExecuteCommand(); SqlSugarHelper.Db.Updateable(accountBookG2Day).ExecuteCommand();
} }
else else
@ -316,7 +317,9 @@ namespace DM_Weight.ViewModels
UserId2 = HomeWindowViewModel.Reviewer?.Id, UserId2 = HomeWindowViewModel.Reviewer?.Id,
MachineId = ConfigurationManager.AppSettings["machineId"].ToString(), MachineId = ConfigurationManager.AppSettings["machineId"].ToString(),
CreateDate = DateTime.Now.ToString("yyyy-MM-dd"), CreateDate = DateTime.Now.ToString("yyyy-MM-dd"),
InvoiceNo = "日结存" CreateTime = DateTime.Now,
InvoiceNo = "日结存",
AddQuantity=it.AddQuantity
}).ExecuteCommand(); }).ExecuteCommand();
if (iDayResult <= 0) if (iDayResult <= 0)
{ {
@ -349,6 +352,7 @@ namespace DM_Weight.ViewModels
UserId2 = HomeWindowViewModel.Reviewer?.Id, UserId2 = HomeWindowViewModel.Reviewer?.Id,
MachineId = ConfigurationManager.AppSettings["machineId"].ToString(), MachineId = ConfigurationManager.AppSettings["machineId"].ToString(),
CreateDate = DateTime.Now.ToString("yyyy-MM-dd"), CreateDate = DateTime.Now.ToString("yyyy-MM-dd"),
CreateTime = DateTime.Now,
InvoiceNo = "总结存" InvoiceNo = "总结存"
}).ExecuteCommand(); }).ExecuteCommand();
if (iTotalResult <= 0) if (iTotalResult <= 0)

6
DM_Weight/ViewModels/SelfTakeDialogViewModel.cs
View File

@ -276,6 +276,7 @@ namespace DM_Weight.ViewModels
if (accountBookG2Day != null) if (accountBookG2Day != null)
{ {
accountBookG2Day.ManuStock = accountBookG2Day.ManuStock - it.TakeQuantity; accountBookG2Day.ManuStock = accountBookG2Day.ManuStock - it.TakeQuantity;
accountBookG2Day.OutQuantity = accountBookG2Day.OutQuantity - it.TakeQuantity;
SqlSugarHelper.Db.Updateable(accountBookG2Day).ExecuteCommand(); SqlSugarHelper.Db.Updateable(accountBookG2Day).ExecuteCommand();
} }
else else
@ -294,7 +295,9 @@ namespace DM_Weight.ViewModels
UserId2 = HomeWindowViewModel.Reviewer?.Id, UserId2 = HomeWindowViewModel.Reviewer?.Id,
MachineId = ConfigurationManager.AppSettings["machineId"].ToString(), MachineId = ConfigurationManager.AppSettings["machineId"].ToString(),
CreateDate = DateTime.Now.ToString("yyyy-MM-dd"), CreateDate = DateTime.Now.ToString("yyyy-MM-dd"),
InvoiceNo = "日结存" CreateTime = DateTime.Now,
InvoiceNo = "日结存",
OutQuantity=it.TakeQuantity
}).ExecuteCommand(); }).ExecuteCommand();
if (iDayResult <= 0) if (iDayResult <= 0)
{ {
@ -326,6 +329,7 @@ namespace DM_Weight.ViewModels
UserId2 = HomeWindowViewModel.Reviewer?.Id, UserId2 = HomeWindowViewModel.Reviewer?.Id,
MachineId = ConfigurationManager.AppSettings["machineId"].ToString(), MachineId = ConfigurationManager.AppSettings["machineId"].ToString(),
CreateDate = DateTime.Now.ToString("yyyy-MM-dd"), CreateDate = DateTime.Now.ToString("yyyy-MM-dd"),
CreateTime = DateTime.Now,
InvoiceNo = "总结存" InvoiceNo = "总结存"
}).ExecuteCommand(); }).ExecuteCommand();
if (iTotalResult <= 0) if (iTotalResult <= 0)

65
DM_Weight/ViewModels/UseAccountWindowViewModel.cs
View File

@ -4,9 +4,11 @@ using DM_Weight.util;
using Prism.Commands; using Prism.Commands;
using Prism.Mvvm; using Prism.Mvvm;
using Prism.Regions; using Prism.Regions;
using Prism.Services.Dialogs;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Configuration; using System.Configuration;
using System.DirectoryServices.ActiveDirectory;
using System.Drawing.Printing; using System.Drawing.Printing;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
@ -16,23 +18,16 @@ namespace DM_Weight.ViewModels
{ {
public class UseAccountWindowViewModel : BindableBase, INavigationAware public class UseAccountWindowViewModel : BindableBase, INavigationAware
{ {
private DateTime? _startDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day); private DateTime? _startDate =DateTime.Now;
private DateTime? nowDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day); private DateTime? nowDate = DateTime.Now;
public DateTime? StartDate public DateTime? StartDate
{ {
get => _startDate; get => _startDate;
set set
{ {
if (value != null) SetProperty(ref _startDate, value);
{
SetProperty(ref _startDate, new DateTime(value?.Year ?? 0, value?.Month ?? 0, value?.Day ?? 0));
}
else
{
SetProperty(ref _startDate, value);
}
} }
} }
@ -42,16 +37,8 @@ namespace DM_Weight.ViewModels
{ {
get => _endDate; get => _endDate;
set set
{ {
if (value != null) SetProperty(ref _endDate, value);
{
TimeSpan ershisi = new TimeSpan(23, 59, 59);
SetProperty(ref _endDate, new DateTime(value?.Year ?? 0, value?.Month ?? 0, value?.Day ?? 0, 23, 59, 59));
}
else
{
SetProperty(ref _endDate, value);
}
} }
} }
private string _name; private string _name;
@ -94,7 +81,11 @@ namespace DM_Weight.ViewModels
{ {
return (long)(DateTime.UtcNow - Jan1st1970).TotalMilliseconds; return (long)(DateTime.UtcNow - Jan1st1970).TotalMilliseconds;
} }
IDialogService _dialogService;
public UseAccountWindowViewModel(IDialogService dialogService)
{
_dialogService = dialogService;
}
public void OnNavigatedTo(NavigationContext navigationContext) public void OnNavigatedTo(NavigationContext navigationContext)
{ {
//绑定用户信息 //绑定用户信息
@ -123,5 +114,35 @@ namespace DM_Weight.ViewModels
} }
public bool KeepAlive => true; public bool KeepAlive => true;
public DelegateCommand<string> SelectTimeAction
{
get=> new DelegateCommand<string>(async (s) =>
{
// 此处延时1毫秒，等待页面渲染
await Task.Delay(TimeSpan.FromMilliseconds(1));
DialogParameters dialogParameters = new DialogParameters();
dialogParameters.Add("DateTime", StartDate);
dialogParameters.Add("Type", s);
DialogServiceExtensions.ShowDialogHost(_dialogService, "DatetimeDialog", dialogParameters, DoDialogResult, "RootDialog");
});
}
private void DoDialogResult(IDialogResult dialogResult)
{
// 委托 被动执行 被子窗口执行
// dialogResult 第一方面可以拿到任意参数 第二方面 可判断关闭状态
if (dialogResult.Result == ButtonResult.OK)
{
if (dialogResult.Parameters.GetValue<string?>("Type").Equals("1"))
{
StartDate = dialogResult.Parameters.GetValue<DateTime?>("DateTime");
}
else
{
EndDate= dialogResult.Parameters.GetValue<DateTime?>("DateTime");
}
}
//MessageBox.Show("返回值：" + dialogResult.Result.ToString());
}
} }
} }

36
DM_Weight/Views/Dialog/DatetimeDialog.xaml Normal file
View File

@ -0,0 +1,36 @@
<UserControl x:Class="DM_Weight.Views.Dialog.DatetimeDialog"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:DM_Weight.Views.Dialog"
xmlns:system="clr-namespace:System;assembly=mscorlib"
xmlns:prism="http://prismlibrary.com/"
prism:ViewModelLocator.AutoWireViewModel="True"
xmlns:convert="clr-namespace:DM_Weight.Converter"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<Grid>
<Grid Margin="-1">
<Grid.RowDefinitions>
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<StackPanel Grid.Row="0" Orientation="Horizontal">
<Calendar x:Name="CombinedCalendar" SelectedDate="{Binding Date}" Margin="-1 -4 -1 0" />
<materialDesign:Clock Time="{Binding Time}" x:Name="CombinedClock" DisplayAutomation="CycleWithSeconds" Is24Hours="True" />
</StackPanel>
<StackPanel Grid.Row="1" Margin="8" HorizontalAlignment="Right" Orientation="Horizontal">
<Button Style="{StaticResource MaterialDesignFlatButton}" Command="{Binding CloseAction}" CommandParameter="1" Content="确认" />
<Button Style="{StaticResource MaterialDesignFlatButton}" Command="{x:Static materialDesign:DialogHost.CloseDialogCommand}" Content="取消">
<Button.CommandParameter>
<system:Boolean xmlns:system="clr-namespace:System;assembly=mscorlib">
False
</system:Boolean>
</Button.CommandParameter>
</Button>
</StackPanel>
</Grid>
</Grid>
</UserControl>

28
DM_Weight/Views/Dialog/DatetimeDialog.xaml.cs Normal file
View File

@ -0,0 +1,28 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace DM_Weight.Views.Dialog
{
/// <summary>
/// DatetimeDialog.xaml 的交互逻辑
/// </summary>
public partial class DatetimeDialog : UserControl
{
public DatetimeDialog()
{
InitializeComponent();
}
}
}

116
DM_Weight/Views/UseAccountWindow.xaml
View File

@ -8,18 +8,19 @@
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800"> d:DesignHeight="450" d:DesignWidth="800">
<UserControl.Resources> <UserControl.Resources>
<Style x:Key="st" TargetType="GridViewColumnHeader"> <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource MaterialDesignTextBox}">
<Style.Setters> <Setter Property="Margin" Value="0,8" />
<Setter Property="Height"> <Setter Property="VerticalAlignment" Value="Center" />
<Setter.Value>55</Setter.Value> </Style>
</Setter>
<Setter Property="Background"> <Style x:Key="FieldIcon" TargetType="materialDesign:PackIcon">
<Setter.Value>#31ccec</Setter.Value> <Setter Property="DockPanel.Dock" Value="Right" />
</Setter> <Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Foreground"> </Style>
<Setter.Value>white</Setter.Value>
</Setter> <Style x:Key="FieldDockPanel" TargetType="DockPanel">
</Style.Setters> <Setter Property="Margin" Value="0,0,8,16" />
<Setter Property="VerticalAlignment" Value="Bottom" />
</Style> </Style>
</UserControl.Resources> </UserControl.Resources>
<Grid> <Grid>
@ -34,18 +35,89 @@
<ColumnDefinition Width="2*"/> <ColumnDefinition Width="2*"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Left"> <StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Left">
<DatePicker <DockPanel Style="{StaticResource FieldDockPanel}">
SelectedDate="{Binding StartDate, TargetNullValue=''}" <TextBox Style="{StaticResource MaterialDesignOutlinedTextBox}" x:Name="startDataBox" materialDesign:HintAssist.Hint="开始时间"
Margin="6 0 0 0" Text="{Binding StartDate,StringFormat='yyyy-MM-dd HH:mm:ss'}" Margin="6 0 0 0" >
materialDesign:HintAssist.Hint="开始时间"
Style="{StaticResource MaterialDesignOutlinedDatePicker}" </TextBox>
/> <Button
<DatePicker Style="{StaticResource MaterialDesignIconForegroundButton}" Command="{Binding SelectTimeAction}" CommandParameter="1" >
<materialDesign:PackIcon Width="40" Height="40" Kind="CalendarRange" Style="{StaticResource FieldIcon}" Foreground="{Binding ElementName=startDataBox, Path=BorderBrush}"/>
</Button>
</DockPanel>
<DockPanel Style="{StaticResource FieldDockPanel}">
<TextBox Style="{StaticResource MaterialDesignOutlinedTextBox}" x:Name="endDataBox" materialDesign:HintAssist.Hint="结束时间"
Text="{Binding EndDate,StringFormat='yyyy-MM-dd HH:mm:ss'}" Margin="6 0 0 0" >
</TextBox>
<Button
Style="{StaticResource MaterialDesignIconForegroundButton}" Command="{Binding SelectTimeAction}" CommandParameter="2" >
<materialDesign:PackIcon Width="40" Height="40" Kind="CalendarRange" Style="{StaticResource FieldIcon}" Foreground="{Binding ElementName=endDataBox, Path=BorderBrush}"/>
</Button>
</DockPanel>
<!-- <DatePicker
SelectedDate="{Binding EndDate}" SelectedDate="{Binding EndDate}"
Margin="6 0 0 0" Margin="6 0 0 0"
materialDesign:HintAssist.Hint="结束时间" materialDesign:HintAssist.Hint="结束时间"
Style="{StaticResource MaterialDesignOutlinedDatePicker}" Style="{StaticResource MaterialDesignOutlinedDatePicker}"
/> />-->
<!--<Button Content="选择时间" Command="{Binding SelectTimeAction}" CommandParameter="1"/>-->
<!--<StackPanel Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" FontSize="24" >
<TextBlock.Text>
<MultiBinding StringFormat="{}{0:yyyy-MM-dd} {1:HH:mm:ss}">
<Binding Path="startCalenderDate"/>
<Binding Path="startCalenderTime"/>
</MultiBinding>
</TextBlock.Text>
</TextBlock>
<Button Margin="8 0 0 0" Content="开始时间" Command="{x:Static materialDesign:DialogHost.OpenDialogCommand}">
<Button.CommandParameter>
<Grid Margin="-1">
<Grid.RowDefinitions>
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<StackPanel Grid.Row="0" Orientation="Horizontal">
<Calendar x:Name="CombinedCalendar" SelectedDate="{Binding startCalenderDate}" Margin="-1 -4 -1 0" />
<materialDesign:Clock Time="{Binding startCalenderTime}" x:Name="CombinedClock" DisplayAutomation="CycleWithSeconds" Is24Hours="True" />
</StackPanel>
<StackPanel Grid.Row="1" Margin="8" HorizontalAlignment="Right" Orientation="Horizontal">
<Button Style="{StaticResource MaterialDesignFlatButton}" Command="{x:Static materialDesign:DialogHost.CloseDialogCommand}" CommandParameter="1" Content="确认" />
</StackPanel>
</Grid>
</Button.CommandParameter>
</Button>
</StackPanel>
<StackPanel Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" FontSize="24" >
<TextBlock.Text>
<MultiBinding StringFormat="{}{0:yyyy-MM-dd} {1:HH:mm:ss}">
<Binding Path="endCalenderDate"/>
<Binding Path="endCalenderTime"/>
</MultiBinding>
</TextBlock.Text>
</TextBlock>
<Button Margin="8 0 0 0" Content="结束时间" Command="{x:Static materialDesign:DialogHost.OpenDialogCommand}">
<Button.CommandParameter>
<Grid Margin="-1">
<Grid.RowDefinitions>
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<StackPanel Grid.Row="0" Orientation="Horizontal">
<Calendar SelectedDate="{Binding endCalenderDate}" x:Name="CombinedCalendar2" Margin="-1 -4 -1 0" />
<materialDesign:Clock Time="{Binding endCalenderTime}" x:Name="CombinedClock2" DisplayAutomation="CycleWithSeconds" Is24Hours="True" />
</StackPanel>
<StackPanel Grid.Row="1" Margin="8" HorizontalAlignment="Right" Orientation="Horizontal">
<Button Style="{StaticResource MaterialDesignFlatButton}" Command="{x:Static materialDesign:DialogHost.CloseDialogCommand}" CommandParameter="1" Content="确认" />
</StackPanel>
</Grid>
</Button.CommandParameter>
</Button>
</StackPanel>-->
<!--<TextBox Margin="6 0 0 0" Text="{Binding Name, UpdateSourceTrigger=PropertyChanged}" materialDesign:HintAssist.Hint="麻醉师姓名" <!--<TextBox Margin="6 0 0 0" Text="{Binding Name, UpdateSourceTrigger=PropertyChanged}" materialDesign:HintAssist.Hint="麻醉师姓名"
materialDesign:HintAssist.IsFloating="True" Width="100"/>--> materialDesign:HintAssist.IsFloating="True" Width="100"/>-->
<ComboBox Width="130" <ComboBox Width="130"
@ -61,9 +133,9 @@
materialDesign:HintAssist.Hint="手术间" materialDesign:HintAssist.Hint="手术间"
ItemsSource="{Binding Boxs}" ItemsSource="{Binding Boxs}"
SelectedItem="{Binding Box}" SelectedItem="{Binding Box}"
IsEditable="True" IsTextSearchEnabled="False"/> IsEditable="True" IsTextSearchEnabled="False" Cursor=""/>
</StackPanel> </StackPanel>
<StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right"> <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right" Cursor="">
<Button <Button
Margin="0 0 13 0" Margin="0 0 13 0"
VerticalAlignment="Center" VerticalAlignment="Center"