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

还空瓶时写数量记录为记录行数量而不是归还的总数

This commit is contained in:
maqiao 2025-06-05 11:21:25 +08:00
parent 2e13275890
commit 6a9d8e0aeb
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DM_Weight/App.config
View File

@ -28,7 +28,7 @@
<!-- 自动退出时间，单位秒，为0时不自动退出 --> <!-- 自动退出时间，单位秒，为0时不自动退出 -->
<add key="autoExit" value="0"/> <add key="autoExit" value="0"/>
<!--报表数据库连接--> <!--报表数据库连接-->
<add key="gridConnectionString" value="MYSQL; Database=sanya_xianchang; Password=root; Port=3306; Server=127.0.0.1; User=root;"/> <add key="gridConnectionString" value="MYSQL; Database=sanya_xianchang2; Password=root; Port=3306; Server=127.0.0.1; User=root;"/>
<!-- 查询处方是orderNo还是orderGroupNo --> <!-- 查询处方是orderNo还是orderGroupNo -->
<add key="OrderNoName" value="orderNo" /> <add key="OrderNoName" value="orderNo" />
<!-- 后门耗材板地址 没有则填写0--> <!-- 后门耗材板地址 没有则填写0-->

2
DM_Weight/Report/GridReportUtil.cs
View File

@ -347,7 +347,7 @@ namespace DM_Weight.Report
inner join drug_info di on dm.drug_id=di.drug_id inner join drug_info di on dm.drug_id=di.drug_id
where dm.type=32 and dm.machine_id = '{p_machine_id}' and dm.operation_time>'{p_startDate}' and dm.operation_time<'{p_endDate}'"; where dm.type=32 and dm.machine_id = '{p_machine_id}' and dm.operation_time>'{p_startDate}' and dm.operation_time<'{p_endDate}'";
SQL += " order by dm.operation_time,di.drug_id"; SQL += " order by di.drug_id,dm.operation_time";
Report.DetailGrid.Recordset.ConnectionString = gridConnectionString; Report.DetailGrid.Recordset.ConnectionString = gridConnectionString;
Report.DetailGrid.Recordset.QuerySQL = SQL; Report.DetailGrid.Recordset.QuerySQL = SQL;

9
DM_Weight/ReportTemp/return_empty.grf
View File

@ -72,7 +72,7 @@
}, },
{ {
"Name":"患者姓名", "Name":"患者姓名",
"Width":3.78354 "Width":1.98438
}, },
{ {
"Name":"使用科室", "Name":"使用科室",
@ -84,7 +84,7 @@
}, },
{ {
"Name":"批次", "Name":"批次",
"Width":1.79917 "Width":3.20146
}, },
{ {
"Name":"交回人", "Name":"交回人",
@ -96,7 +96,7 @@
} }
], ],
"ColumnContent":{ "ColumnContent":{
"Height":4.78896, "Height":1.19063,
"ColumnContentCell":[ "ColumnContentCell":[
{ {
"Column":"Column2", "Column":"Column2",
@ -137,7 +137,7 @@
}, },
"ColumnTitle":{ "ColumnTitle":{
"Height":1.40229, "Height":1.40229,
"RepeatStyle":"OnPage", "RepeatStyle":"OnGroupHeaderPage",
"ColumnTitleCell":[ "ColumnTitleCell":[
{ {
"GroupTitle":true, "GroupTitle":true,
@ -253,6 +253,7 @@
"Name":"Group2", "Name":"Group2",
"ByFields":"drug_id", "ByFields":"drug_id",
"GroupHeader":{ "GroupHeader":{
"NewPage":"Before",
"PrintGridBorder":false, "PrintGridBorder":false,
"RepeatOnPage":true, "RepeatOnPage":true,
"Control":[ "Control":[

2
DM_Weight/ViewModels/ReturnEmptyDialogViewModel.cs
View File

@ -397,7 +397,7 @@ namespace DM_Weight.ViewModels
ReturnPerson = ReturnPerson, ReturnPerson = ReturnPerson,
ReceivePerson = ReceivePerson, ReceivePerson = ReceivePerson,
OperationTime = DateTime.Now, OperationTime = DateTime.Now,
Quantity = ReturnQuantity, Quantity =_MachineRecord.Quantity, //ReturnQuantity,
Type = 32, Type = 32,
InvoiceId = _MachineRecord.InvoiceId, //InvoiceId, InvoiceId = _MachineRecord.InvoiceId, //InvoiceId,
GetId = _MachineRecord.Id, GetId = _MachineRecord.Id,