更新报表及模板
This commit is contained in:
parent
b95d42d39d
commit
e41db97fd0
|
|
@ -381,7 +381,7 @@ namespace DM_Weight.Report
|
|||
DATE_FORMAT(ab.create_date,'%Y/%m/%d') AS YearMD,ab.manu_no AS ManuNo,DATE_FORMAT(ab.eff_date,'%Y%m%d') AS effDate,IF(ab.type=1,ab.add_quantity,'') AS InQuantity,ab.shoushuJian AS shoushuJian,
|
||||
re.Patient_name AS PName,re.sex AS Sex,re.age AS Age,re.use_dose AS UseDose,re.residual_dose AS ResidualDose,re.create_time AS DiposalTime
|
||||
,re.operator_name, ab.manu_stock AS Stock,ab.total_stock AS empty,ab.total_stock,UL.User_name AS SendUser,
|
||||
UL2.User_name AS InCheckUser,
|
||||
IF(ab.type=1,UL.User_name,UL2.User_name) AS InCheckUser,
|
||||
re.supervisor_name AS CheckUser,ab.manu_stock,ab.total_stock,ab.user_id1,ab.user_id2,ab.out_Quantity
|
||||
,DB.BASEQUANTITY AS BaseQuantity,oi.Patient_id AS ZYH,oi.dept_name AS KS,re.anaesthetist_name AS YS,
|
||||
IF(ab.`type`=1,'',UL.User_name) AS emptyUser
|
||||
|
|
|
|||
|
|
@ -187,6 +187,10 @@
|
|||
},
|
||||
{
|
||||
"Name":"空瓶回收人",
|
||||
"Width":1.5875
|
||||
},
|
||||
{
|
||||
"Name":"Column7",
|
||||
"Width":1.61396
|
||||
},
|
||||
{
|
||||
|
|
@ -280,6 +284,9 @@
|
|||
"Column":"空瓶回收人",
|
||||
"DataField":"空瓶回收人"
|
||||
},
|
||||
{
|
||||
"Column":"Column7"
|
||||
},
|
||||
{
|
||||
"Column":"实物",
|
||||
"DataField":"实物"
|
||||
|
|
@ -485,18 +492,6 @@
|
|||
},
|
||||
"TextAlign":"MiddleCenter",
|
||||
"Text":"复核人"
|
||||
},
|
||||
{
|
||||
"GroupTitle":false,
|
||||
"Column":"空瓶回收人",
|
||||
"Font":{
|
||||
"Name":"宋体",
|
||||
"Size":120000,
|
||||
"Bold":true,
|
||||
"Charset":134
|
||||
},
|
||||
"TextAlign":"MiddleCenter",
|
||||
"Text":"空瓶\r\n回收人"
|
||||
}
|
||||
],
|
||||
"Font":{
|
||||
|
|
@ -508,6 +503,44 @@
|
|||
"TextAlign":"MiddleCenter",
|
||||
"Text":"使用"
|
||||
},
|
||||
{
|
||||
"GroupTitle":true,
|
||||
"Name":"Column6",
|
||||
"ColumnTitleCell":[
|
||||
{
|
||||
"GroupTitle":false,
|
||||
"Column":"空瓶回收人",
|
||||
"Font":{
|
||||
"Name":"宋体",
|
||||
"Size":120000,
|
||||
"Bold":true,
|
||||
"Charset":134
|
||||
},
|
||||
"TextAlign":"MiddleCenter",
|
||||
"Text":"回收人"
|
||||
},
|
||||
{
|
||||
"GroupTitle":false,
|
||||
"Column":"Column7",
|
||||
"Font":{
|
||||
"Name":"宋体",
|
||||
"Size":120000,
|
||||
"Bold":true,
|
||||
"Charset":134
|
||||
},
|
||||
"TextAlign":"MiddleCenter",
|
||||
"Text":"药房\r\n回收人"
|
||||
}
|
||||
],
|
||||
"Font":{
|
||||
"Name":"宋体",
|
||||
"Size":120000,
|
||||
"Bold":true,
|
||||
"Charset":134
|
||||
},
|
||||
"TextAlign":"MiddleCenter",
|
||||
"Text":"空瓶回收"
|
||||
},
|
||||
{
|
||||
"GroupTitle":true,
|
||||
"Name":"Column3",
|
||||
|
|
@ -546,10 +579,6 @@
|
|||
"TextAlign":"MiddleCenter",
|
||||
"Text":"结存数"
|
||||
},
|
||||
{
|
||||
"GroupTitle":true,
|
||||
"Name":"Column4",
|
||||
"ColumnTitleCell":[
|
||||
{
|
||||
"GroupTitle":false,
|
||||
"Column":"发药人",
|
||||
|
|
@ -561,17 +590,11 @@
|
|||
},
|
||||
"TextAlign":"MiddleCenter",
|
||||
"Text":"发药人"
|
||||
}
|
||||
],
|
||||
"Font":{
|
||||
"Name":"宋体",
|
||||
"Size":120000,
|
||||
"Bold":true,
|
||||
"Charset":134
|
||||
},
|
||||
"TextAlign":"MiddleCenter",
|
||||
"Text":"领药人"
|
||||
},
|
||||
{
|
||||
"GroupTitle":true,
|
||||
"Name":"Column5",
|
||||
"ColumnTitleCell":[
|
||||
{
|
||||
"GroupTitle":false,
|
||||
"Column":"Column2",
|
||||
|
|
@ -584,6 +607,16 @@
|
|||
"TextAlign":"MiddleCenter",
|
||||
"Text":"复核人"
|
||||
}
|
||||
],
|
||||
"Font":{
|
||||
"Name":"宋体",
|
||||
"Size":120000,
|
||||
"Bold":true,
|
||||
"Charset":134
|
||||
},
|
||||
"TextAlign":"MiddleCenter",
|
||||
"Text":"领药人"
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
|
|
@ -624,7 +657,7 @@
|
|||
"Charset":134
|
||||
},
|
||||
"TextAlign":"MiddleCenter",
|
||||
"Text":"湘谭县人民医院麻醉药品、麻精神药品专用账本（手术室）"
|
||||
"Text":"湘谭县人民医院麻醉药品、精神药品专用账册、使用登记册（手术室）"
|
||||
}
|
||||
],
|
||||
"RepeatOnPage":true
|
||||
|
|
|
|||
|
|
@ -283,7 +283,8 @@ namespace DM_Weight.ViewModels
|
|||
int colNoCount = SqlSugarHelper.Db.Queryable<ChannelList>()
|
||||
.Where(cs => cs.MachineId == ConfigurationManager.AppSettings["machineId"].ToString() && cs.DrawerNo == DrawerNo + 1)
|
||||
.Max(cs => cs.ColNo);
|
||||
string chnguid = $"DM5_{(DrawerNo + 1)}_{(colNoCount+1)}_{DrugInfo.DrugId}";
|
||||
//string chnguid = $"DM5_{(DrawerNo + 1)}_{(colNoCount+1)}_{DrugInfo.DrugId}";
|
||||
string chnguid = $"DM5_{(DrawerNo + 1)}_{DrugInfo.DrugId}";
|
||||
SqlSugarHelper.Db.Insertable(new ChannelList()
|
||||
{
|
||||
Id = chnguid,
|
||||
|
|
@ -364,6 +365,12 @@ namespace DM_Weight.ViewModels
|
|||
}
|
||||
if (_ChannelList != null)
|
||||
{
|
||||
if(_channelList.channelStocks.Where(cs=>cs.Quantity>0).Count() > 0)
|
||||
{
|
||||
SnackbarBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#b71c1c"));
|
||||
SnackbarMessageQueue.Enqueue("药品还有库存不能操作解绑");
|
||||
return;
|
||||
}
|
||||
//解绑选定行的单个药品
|
||||
SqlSugarHelper.Db.Deleteable(_ChannelList.channelStocks).ExecuteCommand();
|
||||
//解绑ChannelList表中的药品
|
||||
|
|
@ -444,8 +451,8 @@ namespace DM_Weight.ViewModels
|
|||
_ChannelList.channelStocks[0].NeedNum = 0;
|
||||
}
|
||||
_ChannelList.BaseQuantity = baseQty;
|
||||
_ChannelList.channelStocks[0].BaseQuantity = baseQty;
|
||||
int iUpdate = SqlSugarHelper.Db.Updateable<ChannelStock>(_ChannelList.channelStocks[0]).ExecuteCommand();
|
||||
//_ChannelList.channelStocks[0].BaseQuantity = baseQty;
|
||||
//int iUpdate = SqlSugarHelper.Db.Updateable<ChannelStock>(_ChannelList.channelStocks[0]).ExecuteCommand();
|
||||
_ChannelList.channelStocks.ForEach(cs=>cs.BaseQuantity= baseQty);
|
||||
int iBaseUpdate= SqlSugarHelper.Db.Updateable(_ChannelList.channelStocks).UpdateColumns(cs => cs.BaseQuantity).ExecuteCommand();
|
||||
|
||||
|
|
@ -453,7 +460,7 @@ namespace DM_Weight.ViewModels
|
|||
int iUpdateChannelList = SqlSugarHelper.Db.Updateable<ChannelList>()
|
||||
.SetColumns(it => new ChannelList() { BaseQuantity = baseQty })
|
||||
.Where(it => it.Id == _ChannelList.Id).ExecuteCommand();
|
||||
if (iUpdate > 0 && iUpdateChannelList > 0)
|
||||
if (iBaseUpdate > 0 && iUpdateChannelList > 0)
|
||||
{
|
||||
|
||||
SnackbarBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#00e676"));
|
||||
|
|
|
|||
|
|
@ -458,6 +458,7 @@ namespace DM_Weight.ViewModels
|
|||
|
||||
void CheckOrderAction()
|
||||
{
|
||||
logger.Info($"管理员{HomeWindowViewModel.Operator?.Nickname}开始确认手麻单");
|
||||
var confirmData = OrderInfoList.Where(oi => oi.ItemIsChecked == true).ToList();
|
||||
if (confirmData.Count > 0)
|
||||
{
|
||||
|
|
@ -506,10 +507,12 @@ namespace DM_Weight.ViewModels
|
|||
if (cs == null)
|
||||
{
|
||||
empChannelStock += $"{oi.OrderNo},{oi._OrderDetail.DrugId},{oi._OrderDetail.SetManuNo};";
|
||||
logger.Info($"手麻单{oi.OrderNo}对药品批次{oi._OrderDetail.DrugId}-{oi._OrderDetail.SetManuNo}在{drawerNo}手术间无库存");
|
||||
continue;
|
||||
}
|
||||
cs.Quantity = cs.Quantity - oi._OrderDetail.Quantity;
|
||||
cs.NeedNum = cs.NeedNum + oi._OrderDetail.Quantity;
|
||||
cs.NeedNum = cs.NeedNum>0? cs.NeedNum + oi._OrderDetail.Quantity: cs.NeedNum;
|
||||
logger.Info($"更新手术间{cs.DrawerNo}药品{cs.DrugId}批次{cs.ManuNo}库存为{cs.Quantity}，需补药数量为{cs.NeedNum}");
|
||||
// 更新数据 库存信息
|
||||
SqlSugarHelper.Db.Updateable(cs).UpdateColumns(it => new { it.Quantity, it.NeedNum }).ExecuteCommand();
|
||||
|
||||
|
|
@ -716,6 +719,7 @@ namespace DM_Weight.ViewModels
|
|||
_eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
|
||||
}
|
||||
|
||||
logger.Info($"管理员{HomeWindowViewModel.Operator?.Nickname}结束确认手麻单");
|
||||
}
|
||||
/// <summary>
|
||||
/// 选择药箱，打开药箱
|
||||
|
|
|
|||
|
|
@ -167,8 +167,8 @@ namespace DM_Weight.ViewModels
|
|||
ManuNo = it.ManuNo,
|
||||
EffDate = it.EffDate,
|
||||
Id = it.Id,
|
||||
//NeedNum=0,
|
||||
//AddToJJNum=0
|
||||
NeedNum=0,
|
||||
AddToJJNum=0
|
||||
}).UpdateColumns(it => new { it.Quantity, it.ManuNo, it.EffDate,it.NeedNum,it.AddToJJNum }).ExecuteCommand();
|
||||
|
||||
//SqlSugarHelper.Db.Updateable(new ChannelList()
|
||||
|
|
|
|||
Loading…
Reference in New Issue