diff --git a/DM_Weight/ReportTemp/account_book_new.grf b/DM_Weight/ReportTemp/account_book_new.grf new file mode 100644 index 0000000..ae73058 --- /dev/null +++ b/DM_Weight/ReportTemp/account_book_new.grf @@ -0,0 +1,496 @@ +{ + "Version":"6.8.1.1", + "Font":{ + "Name":"宋体", + "Size":105000, + "Weight":400, + "Charset":134 + }, + "Printer":{ + "LeftMargin":0.3175, + "TopMargin":1, + "RightMargin":0.3969 + }, + "DetailGrid":{ + "CenterView":true, + "Recordset":{ + "QuerySQL":"SELECT \r\n dmr.`drawer_no` AS drawerNo,\r\n dmr.`col_no` AS colNo,\r\n dmr.`type` AS `type`,\r\n CONCAT(dmr.`quantity`,IF(dmr.`type`=32,\"(空瓶)\",\"\")) AS quantity,\r\n dmr.`manu_no` AS manuNo,\r\n dmr.`eff_date` AS effDate,\r\n dmr.`operation_time` AS operationTime,\r\n di.`drug_name` AS drugName,\r\n di.`drug_spec` AS drugSpec,\r\n di.`pack_unit` AS packUnit,\r\n di.`manufactory` AS manuFactory,\r\n di.`max_stock` AS baseQuantity,\r\n dmr.`drug_id` AS drugId,\r\n ul.`user_name` AS nickname\r\nFROM\r\n dm_machine_record dmr\r\nLEFT JOIN drug_info di ON di.`drug_id` = dmr.`drug_id`\r\nLEFT JOIN user_list ul ON ul.`id` = dmr.`Operator`\r\nWHERE dmr.`type` in (31, 32)\r\n AND dmr.`machine_id` = :machine_id\r\n AND dmr.`operation_time` > :startDate\r\n AND dmr.`operation_time` < :endDate", + "Field":[ + { + "Name":"药品名称", + "DBFieldName":"drug_name" + }, + { + "Name":"年月日", + "DBFieldName":"YearMD" + }, + { + "Name":"批号", + "DBFieldName":"manu_no" + }, + { + "Name":"效期", + "Type":"DateTime", + "Format":"yyyy/MM/dd", + "DBFieldName":"effDate" + }, + { + "Name":"期初数", + "DBFieldName":"BeforeQuantity" + }, + { + "Name":"领取数", + "DBFieldName":"InQuantity" + }, + { + "Name":"总数", + "DBFieldName":"TotalQuantity" + }, + { + "Name":"各专柜", + "DBFieldName":"TotalQuanttiy" + }, + { + "Name":"数量", + "DBFieldName":"Quantity" + }, + { + "Name":"领取药房", + "DBFieldName":"InStorage" + }, + { + "Name":"药房发药人", + "DBFieldName":"StorageUser" + }, + { + "Name":"手术室领药人", + "DBFieldName":"OperationIn" + }, + { + "Name":"手术室核对人", + "DBFieldName":"OperationCheck" + }, + { + "Name":"规格", + "DBFieldName":"DrugSpec" + }, + { + "Name":"大单位", + "DBFieldName":"BigUnit" + }, + { + "Name":"小单位", + "DBFieldName":"SmallUnit" + }, + { + "Name":"基数", + "DBFieldName":"BaseQuantity" + } + ] + }, + "Column":[ + { + "Name":"年月日" + }, + { + "Name":"批次", + "Width":1.79917 + }, + { + "Name":"有效期" + }, + { + "Name":"期初数" + }, + { + "Name":"领取数" + }, + { + "Name":"总数" + }, + { + "Name":"各专柜" + }, + { + "Name":"数量" + }, + { + "Name":"领取药房" + }, + { + "Name":"药房发药人" + }, + { + "Name":"手术室领药人" + }, + { + "Name":"手术室核对人" + } + ], + "ColumnContent":{ + "Height":2.01083, + "ColumnContentCell":[ + { + "Column":"年月日", + "TextAlign":"MiddleCenter", + "DataField":"年月日" + }, + { + "Column":"批次", + "TextAlign":"MiddleCenter", + "DataField":"批号" + }, + { + "Column":"有效期", + "TextAlign":"MiddleCenter", + "DataField":"效期" + }, + { + "Column":"期初数", + "TextAlign":"MiddleCenter", + "DataField":"期初数" + }, + { + "Column":"领取数", + "TextAlign":"MiddleCenter", + "DataField":"领取数" + }, + { + "Column":"总数", + "TextAlign":"MiddleCenter", + "DataField":"总数" + }, + { + "Column":"各专柜", + "TextAlign":"MiddleCenter", + "DataField":"各专柜" + }, + { + "Column":"数量", + "TextAlign":"MiddleCenter", + "DataField":"数量" + }, + { + "Column":"领取药房", + "TextAlign":"MiddleCenter", + "DataField":"领取药房" + }, + { + "Column":"药房发药人", + "TextAlign":"MiddleCenter", + "DataField":"药房发药人" + }, + { + "Column":"手术室领药人", + "TextAlign":"MiddleCenter", + "DataField":"手术室领药人" + }, + { + "Column":"手术室核对人", + "TextAlign":"MiddleCenter", + "DataField":"手术室核对人" + } + ] + }, + "ColumnTitle":{ + "Height":1.40229, + "RepeatStyle":"OnGroupHeaderPage", + "ColumnTitleCell":[ + { + "GroupTitle":false, + "Column":"年月日", + "Font":{ + "Name":"宋体", + "Size":120000, + "Bold":true, + "Charset":134 + }, + "TextAlign":"MiddleCenter", + "Text":"年月日" + }, + { + "GroupTitle":false, + "Column":"批次", + "Font":{ + "Name":"宋体", + "Size":120000, + "Bold":true, + "Charset":134 + }, + "TextAlign":"MiddleCenter", + "Text":"批号" + }, + { + "GroupTitle":false, + "Column":"有效期", + "Font":{ + "Name":"宋体", + "Size":120000, + "Bold":true, + "Charset":134 + }, + "TextAlign":"MiddleCenter", + "Text":"有效期" + }, + { + "GroupTitle":false, + "Column":"期初数", + "Font":{ + "Name":"宋体", + "Size":120000, + "Bold":true, + "Charset":134 + }, + "TextAlign":"MiddleCenter", + "Text":"期初数" + }, + { + "GroupTitle":false, + "Column":"领取数", + "Font":{ + "Name":"宋体", + "Size":120000, + "Bold":true, + "Charset":134 + }, + "TextAlign":"MiddleCenter", + "Text":"领取数" + }, + { + "GroupTitle":true, + "Name":"Column1", + "ColumnTitleCell":[ + { + "GroupTitle":false, + "Column":"总数", + "Font":{ + "Name":"宋体", + "Size":120000, + "Bold":true, + "Charset":134 + }, + "TextAlign":"MiddleCenter", + "Text":"总数" + }, + { + "GroupTitle":false, + "Column":"各专柜", + "Font":{ + "Name":"宋体", + "Size":120000, + "Bold":true, + "Charset":134 + }, + "TextAlign":"MiddleCenter", + "Text":"各专柜" + }, + { + "GroupTitle":false, + "Column":"数量", + "Font":{ + "Name":"宋体", + "Size":120000, + "Bold":true, + "Charset":134 + }, + "TextAlign":"MiddleCenter", + "Text":"数量" + } + ], + "Font":{ + "Name":"宋体", + "Size":120000, + "Bold":true, + "Charset":134 + }, + "TextAlign":"MiddleCenter", + "Text":"结存" + }, + { + "GroupTitle":false, + "Column":"领取药房", + "Font":{ + "Name":"宋体", + "Size":120000, + "Bold":true, + "Charset":134 + }, + "TextAlign":"MiddleCenter", + "Text":"领取药房" + }, + { + "GroupTitle":false, + "Column":"药房发药人", + "Font":{ + "Name":"宋体", + "Size":120000, + "Bold":true, + "Charset":134 + }, + "TextAlign":"MiddleCenter", + "Text":"药房\r\n发药人" + }, + { + "GroupTitle":false, + "Column":"手术室领药人", + "Font":{ + "Name":"宋体", + "Size":120000, + "Bold":true, + "Charset":134 + }, + "TextAlign":"MiddleCenter", + "Text":"手术室\r\n领药人" + }, + { + "GroupTitle":false, + "Column":"手术室核对人", + "Font":{ + "Name":"宋体", + "Size":120000, + "Bold":true, + "Charset":134 + }, + "TextAlign":"MiddleCenter", + "Text":"手术室\r\n核对人" + } + ] + } + }, + "PageHeader":{ + "Height":0 + }, + "Parameter":[ + { + "Name":"startDate", + "DataType":"DateTime", + "Format":"yyyy-MM-dd hh:mm:ss", + "Value":"2023/1/1" + }, + { + "Name":"endDate", + "DataType":"DateTime", + "Format":"yyyy-MM-dd hh:mm:ss", + "Value":"2023/4/28 23:59:59" + }, + { + "Name":"machine_id", + "Value":"DM1" + } + ], + "ReportHeader":[ + { + "Name":"ReportHeader1", + "Height":3.41313, + "Control":[ + { + "Type":"MemoBox", + "Name":"MemoBox2", + "Left":0.396875, + "Top":0.211667, + "Width":19.6056, + "Height":1.19063, + "Font":{ + "Name":"宋体", + "Size":217500, + "Bold":true, + "Charset":134 + }, + "TextAlign":"MiddleCenter", + "Text":"手术麻醉科[#药品名称#]专用账册" + }, + { + "Type":"StaticBox", + "Name":"StaticBox21", + "Left":5.3975, + "Top":1.905, + "Width":1.11125, + "Height":0.978958, + "Font":{ + "Name":"宋体", + "Size":105000, + "Bold":true, + "Charset":134 + }, + "Text":"规格：" + }, + { + "Type":"FieldBox", + "Name":"FieldBox12", + "Left":6.48229, + "Top":1.905, + "Width":1.74625, + "Height":0.978958, + "Font":{ + "Name":"宋体", + "Size":105000, + "Bold":true, + "Charset":134 + }, + "DataField":"规格" + }, + { + "Type":"StaticBox", + "Name":"StaticBox22", + "Left":9.12813, + "Top":1.905, + "Width":1.21708, + "Height":0.978958, + "Font":{ + "Name":"宋体", + "Size":105000, + "Bold":true, + "Charset":134 + }, + "Text":"单位：" + }, + { + "Type":"FieldBox", + "Name":"FieldBox13", + "Left":10.3188, + "Top":1.905, + "Width":1.42875, + "Height":0.978958, + "Font":{ + "Name":"宋体", + "Size":105000, + "Bold":true, + "Charset":134 + }, + "DataField":"大单位" + }, + { + "Type":"StaticBox", + "Name":"StaticBox23", + "Left":12.1179, + "Top":1.905, + "Width":1.32292, + "Height":0.978958, + "Font":{ + "Name":"宋体", + "Size":105000, + "Bold":true, + "Charset":134 + }, + "Text":"基数：" + }, + { + "Type":"FieldBox", + "Name":"FieldBox14", + "Left":13.626, + "Top":1.905, + "Width":1.29646, + "Height":0.978958, + "Font":{ + "Name":"宋体", + "Size":105000, + "Bold":true, + "Charset":134 + }, + "DataField":"基数" + } + ], + "RepeatOnPage":true + } + ] +} \ No newline at end of file diff --git a/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs b/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs index 00db46a..2b06a20 100644 --- a/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs +++ b/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs @@ -461,6 +461,7 @@ namespace DM_Weight.ViewModels //newStock.Chnguid = jiaoStock.Chnguid; //newStock.BaseQuantity = jiaoStock.BaseQuantity; newStock.ManuNo = Jiaojie_ChannelStocks[i].ManuNo; + newStock.EffDate = Jiaojie_ChannelStocks[i].EffDate; newStock.DrawerNo = Jiaojie_ChannelStocks[i].DrawerNo; newStock.DrugId = Jiaojie_ChannelStocks[i].DrugId; newStock.AddToJJNum = addNum; @@ -485,6 +486,7 @@ namespace DM_Weight.ViewModels //newStock.Chnguid = jiaoStock.Chnguid; //newStock.BaseQuantity = jiaoStock.BaseQuantity; newStock.ManuNo = Jiaojie_ChannelStocks[i].ManuNo; + newStock.EffDate=Jiaojie_ChannelStocks[i].EffDate; newStock.DrawerNo = Jiaojie_ChannelStocks[i].DrawerNo; newStock.DrugId = Jiaojie_ChannelStocks[i].DrugId; newStock.AddToJJNum = Jiaojie_ChannelStocks[i].NeedNum; @@ -509,6 +511,7 @@ namespace DM_Weight.ViewModels newStock.DrawerNo = Jiaojie_ChannelStocks[i].DrawerNo; newStock.DrugId = Jiaojie_ChannelStocks[i].DrugId; newStock.ManuNo = csStock.ManuNo; + newStock.EffDate = csStock.EffDate; newStock.AddToJJNum = csStock.TakeQuantity; newStock.Id = Guid.NewGuid().ToString(); newStock.MachineId = Jiaojie_ChannelStocks[i].MachineId; @@ -527,6 +530,7 @@ namespace DM_Weight.ViewModels newStock.DrawerNo = Jiaojie_ChannelStocks[i].DrawerNo; newStock.DrugId = Jiaojie_ChannelStocks[i].DrugId; newStock.ManuNo = csStock.ManuNo; + newStock.EffDate=csStock.EffDate; newStock.AddToJJNum = Jiaojie_ChannelStocks[i].NeedNum; newStock.NeedNum = 0; newStock.Id = Guid.NewGuid().ToString();