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

修改凌晨生成的日结时间为当天的23：59：59

This commit is contained in:
maqiao 2025-10-29 11:44:42 +08:00
parent 2c0d79d1dd
commit fd8cc27d34
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DM_Weight/ReportTemp/account_book_new.grf
View File

@ -23,7 +23,7 @@
}, },
{ {
"Name":"日期", "Name":"日期",
"DBFieldName":"YearMD" "DBFieldName":"oldYearMD"
}, },
{ {
"Name":"批号", "Name":"批号",

4
DM_Weight/ViewModels/CheckOrderNewWindowNewViewModel.cs
View File

@ -613,7 +613,7 @@ namespace DM_Weight.ViewModels
accountBookG2Day.UseDose =!string.IsNullOrEmpty(accountBookG2Day.UseDose)?(Convert.ToInt32(accountBookG2Day.UseDose) + Convert.ToInt32(oi.UseDose)).ToString(): oi.UseDose; accountBookG2Day.UseDose =!string.IsNullOrEmpty(accountBookG2Day.UseDose)?(Convert.ToInt32(accountBookG2Day.UseDose) + Convert.ToInt32(oi.UseDose)).ToString(): oi.UseDose;
accountBookG2Day.ResidualDose = !string.IsNullOrEmpty(accountBookG2Day.ResidualDose) ? (Convert.ToInt32(accountBookG2Day.ResidualDose) + Convert.ToInt32(oi.ResidualDose)).ToString(): oi.ResidualDose; accountBookG2Day.ResidualDose = !string.IsNullOrEmpty(accountBookG2Day.ResidualDose) ? (Convert.ToInt32(accountBookG2Day.ResidualDose) + Convert.ToInt32(oi.ResidualDose)).ToString(): oi.ResidualDose;
accountBookG2Day.TotalStock = (accountBookEmpty != null ? (accountBookEmpty.TotalStock > 0 ? accountBookEmpty.TotalStock : 0) : 0) + oi.Quantity; accountBookG2Day.TotalStock = (accountBookEmpty != null ? (accountBookEmpty.TotalStock > 0 ? accountBookEmpty.TotalStock : 0) : 0) + oi.Quantity;
accountBookG2Day.CreateTime = DateTime.Now; accountBookG2Day.CreateTime =new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 23, 59, 59);
SqlSugarHelper.Db.Updateable(accountBookG2Day).ExecuteCommand(); SqlSugarHelper.Db.Updateable(accountBookG2Day).ExecuteCommand();
manuStock = accountBookG2Day.ManuStock; manuStock = accountBookG2Day.ManuStock;
} }
@ -633,7 +633,7 @@ namespace DM_Weight.ViewModels
UserId2 = HomeWindowViewModel.Reviewer?.Id, UserId2 = HomeWindowViewModel.Reviewer?.Id,
MachineId = ConfigurationManager.AppSettings["dm_machineId"].ToString(), MachineId = ConfigurationManager.AppSettings["dm_machineId"].ToString(),
CreateDate = DateTime.Now.ToString("yyyy-MM-dd"), CreateDate = DateTime.Now.ToString("yyyy-MM-dd"),
CreateTime = DateTime.Now, CreateTime = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 23, 59, 59),
InvoiceNo = "日结存", InvoiceNo = "日结存",
OutQuantity = oi.Quantity, OutQuantity = oi.Quantity,
UseDose=oi.UseDose, UseDose=oi.UseDose,

3
DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs
View File

@ -580,6 +580,7 @@ namespace DM_Weight.ViewModels
accountBookG2Day.UseDose = (Convert.ToSingle(accountBookG2Day.UseDose!=null? accountBookG2Day.UseDose:0) + Convert.ToSingle(oi._OrderDetail.surgicalResidual.UseDose!=null? oi._OrderDetail.surgicalResidual.UseDose:0)).ToString(); accountBookG2Day.UseDose = (Convert.ToSingle(accountBookG2Day.UseDose!=null? accountBookG2Day.UseDose:0) + Convert.ToSingle(oi._OrderDetail.surgicalResidual.UseDose!=null? oi._OrderDetail.surgicalResidual.UseDose:0)).ToString();
accountBookG2Day.ResidualDose = (Convert.ToSingle(accountBookG2Day.ResidualDose!=null? accountBookG2Day.ResidualDose:0) + Convert.ToSingle(oi._OrderDetail.surgicalResidual.ResidualDose!=null? oi._OrderDetail.surgicalResidual.ResidualDose:0)).ToString(); accountBookG2Day.ResidualDose = (Convert.ToSingle(accountBookG2Day.ResidualDose!=null? accountBookG2Day.ResidualDose:0) + Convert.ToSingle(oi._OrderDetail.surgicalResidual.ResidualDose!=null? oi._OrderDetail.surgicalResidual.ResidualDose:0)).ToString();
accountBookG2Day.TotalStock = (accountBookEmpty != null ? (accountBookEmpty.TotalStock > 0 ? accountBookEmpty.TotalStock : 0) : 0) + oi._OrderDetail.Quantity; accountBookG2Day.TotalStock = (accountBookEmpty != null ? (accountBookEmpty.TotalStock > 0 ? accountBookEmpty.TotalStock : 0) : 0) + oi._OrderDetail.Quantity;
accountBookG2Day.CreateTime = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 23, 59, 59);
SqlSugarHelper.Db.Updateable(accountBookG2Day).ExecuteCommand(); SqlSugarHelper.Db.Updateable(accountBookG2Day).ExecuteCommand();
manuStock = accountBookG2Day.ManuStock; manuStock = accountBookG2Day.ManuStock;
} }
@ -599,7 +600,7 @@ namespace DM_Weight.ViewModels
UserId2 = HomeWindowViewModel.Reviewer?.Id, UserId2 = HomeWindowViewModel.Reviewer?.Id,
MachineId = ConfigurationManager.AppSettings["dm_machineId"].ToString(), MachineId = ConfigurationManager.AppSettings["dm_machineId"].ToString(),
CreateDate = DateTime.Now.ToString("yyyy-MM-dd"), CreateDate = DateTime.Now.ToString("yyyy-MM-dd"),
CreateTime = DateTime.Now, CreateTime = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 23, 59, 59),
InvoiceNo = "日结存", InvoiceNo = "日结存",
OutQuantity = oi._OrderDetail.Quantity, OutQuantity = oi._OrderDetail.Quantity,
UseDose = oi._OrderDetail.surgicalResidual.UseDose, UseDose = oi._OrderDetail.surgicalResidual.UseDose,

5
DM_Weight/ViewModels/CheckStockWindowViewModel.cs
View File

@ -228,6 +228,7 @@ namespace DM_Weight.ViewModels
//负数直接记0 //负数直接记0
accountBookG2Day.TotalStock = (accountBookEmpty != null ? (accountBookEmpty.TotalStock > 0 && accountBookEmpty.TotalStock > (it.CheckQuantity - it.Quantity) ? accountBookEmpty.TotalStock - (it.CheckQuantity - it.Quantity) : 0) : 0); accountBookG2Day.TotalStock = (accountBookEmpty != null ? (accountBookEmpty.TotalStock > 0 && accountBookEmpty.TotalStock > (it.CheckQuantity - it.Quantity) ? accountBookEmpty.TotalStock - (it.CheckQuantity - it.Quantity) : 0) : 0);
accountBookG2Day.CreateTime = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 23, 59, 59);
SqlSugarHelper.Db.Updateable(accountBookG2Day).ExecuteCommand(); SqlSugarHelper.Db.Updateable(accountBookG2Day).ExecuteCommand();
manuStock = accountBookG2Day.ManuStock; manuStock = accountBookG2Day.ManuStock;
} }
@ -247,7 +248,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 = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 23, 59, 59),
InvoiceNo = "日结存", InvoiceNo = "日结存",
AddQuantity = (it.CheckQuantity - it.Quantity) AddQuantity = (it.CheckQuantity - it.Quantity)
}).ExecuteCommand(); }).ExecuteCommand();
@ -305,7 +306,7 @@ namespace DM_Weight.ViewModels
UserId2 = HomeWindowViewModel.Reviewer?.Id, UserId2 = HomeWindowViewModel.Reviewer?.Id,
MachineId = ConfigurationManager.AppSettings["dm_machineId"].ToString(), MachineId = ConfigurationManager.AppSettings["dm_machineId"].ToString(),
CreateDate = DateTime.Now.ToString("yyyy-MM-dd"), CreateDate = DateTime.Now.ToString("yyyy-MM-dd"),
CreateTime = DateTime.Now, CreateTime = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 23, 59, 59),
InvoiceNo = "日结存", InvoiceNo = "日结存",
OutQuantity = (it.Quantity - it.CheckQuantity), OutQuantity = (it.Quantity - it.CheckQuantity),
//UseDose = oi._OrderDetail.surgicalResidual.UseDose, //UseDose = oi._OrderDetail.surgicalResidual.UseDose,