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

Merge branch 'XiangTan_Ji' of http://27.128.204.251:9999/maqiao/HKC into XiangTan_Ji

This commit is contained in:
maqiao 2025-09-25 16:21:15 +08:00
parent 150da75771 abae0a0d61
commit 47ff174544
5 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DM_Weight/App.config
View File

@ -3,7 +3,7 @@
<connectionStrings>
<!-- 数据库连接字符串 -->
<!--<add name="database" connectionString="server=127.0.0.1;database=wpf_dm_program;userid=root;password=qq1223" />-->
<add name="database" connectionString="server=127.0.0.1;port=3306;database=xiangtan_mazuike_xx;userid=root;password=root" />
<add name="database" connectionString="server=192.168.50.84;port=3306;database=xiangtan_mazuike_xx;userid=root;password=root" />
</connectionStrings>
<!--<runtime>
-->
@ -42,7 +42,7 @@
<!-- 无操作退出录像时间，单位秒，为0时不退出录像 -->
<add key="stopRecord" value="180"/>
<add key="gridConnectionString" value="MYSQL; Database=xiangtan_mazuike_xx; Password=root; Port=3306; Server=127.0.0.1; User=root;"/>
<add key="gridConnectionString" value="MYSQL; Database=xiangtan_mazuike_xx; Password=root; Port=3306; Server=192.168.50.84; User=root;"/>
<!-- 查询处方是orderNo还是orderGroupNo -->
<add key="OrderNoName" value="orderNo" />
<!-- 后门耗材板地址 没有则填写0-->

4
DM_Weight/Models/DrugBase.cs
View File

@ -15,7 +15,7 @@ namespace DM_Weight.Models
public class DrugBase:BindableBase
{
private int _baseId = 0;
[SugarColumn(ColumnName = "id", IsPrimaryKey = true)]
[SugarColumn(ColumnName = "baseid", IsPrimaryKey = true)]
public int BaseId { get=> _baseId; set { SetProperty(ref _baseId, value); } }
private string _drugId;
[SugarColumn(ColumnName = "drugid")]
@ -24,7 +24,7 @@ namespace DM_Weight.Models
[SugarColumn(ColumnName = "machine_id")]
public string MachineId { get => _machineId; set { SetProperty(ref _machineId, value); } }
private int _baseQuantity = 0;
[SugarColumn(ColumnName = "base_quantity")]
[SugarColumn(ColumnName = "basequantity")]
public int BaseQuantity { get=>_baseQuantity; set{ SetProperty(ref _baseQuantity, value); } }
}

2
DM_Weight/Models/DrugInfo.cs
View File

@ -84,7 +84,7 @@ namespace DM_Weight.Models
public int? StockQuantity { get; set; }
private DrugBase _base;
[Navigate(NavigateType.OneToOne, nameof(DrugBase.DrugId), nameof(DrugId))]
[Navigate(NavigateType.OneToOne, nameof(DrugBase.DrugId), nameof(DrugId),whereSql:" machine_id='DM1'")]
public DrugBase drugBase
{
get=> _base;

3
DM_Weight/ReportTemp/account_book_temp_new.grf
View File

@ -132,7 +132,8 @@
"Visible":false
},
{
"Name":"科室"
"Name":"科室",
"Visible":false
},
{
"Name":"患者姓名",

7
DM_Weight/ViewModels/DrugListWindowViewModel.cs
View File

@ -283,7 +283,8 @@ namespace DM_Weight.ViewModels
}
else
{
SqlSugarHelper.Db.Updateable(new DrugBase() { BaseQuantity = SelectedDrug.drugBase.BaseQuantity }).UpdateColumns(bs => new { bs.BaseQuantity }).Where(bs => bs.BaseId == SelectedDrug.drugBase.BaseId).ExecuteCommand();
drugBase.BaseQuantity = SelectedDrug.drugBase.BaseQuantity;
SqlSugarHelper.Db.Updateable(drugBase).UpdateColumns(bs => new { bs.BaseQuantity }).Where(bs => bs.BaseId == SelectedDrug.drugBase.BaseId).ExecuteCommand();
}
}
});
@ -306,7 +307,7 @@ namespace DM_Weight.ViewModels
_eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
}
RequestData();
}, () => SelectedDrug.DrugId==null).ObservesProperty(() => SelectedDrug);
}, () => SelectedDrug.DrugId!=null).ObservesProperty(() => SelectedDrug);
}
public DelegateCommand AddManuCommand
@ -322,7 +323,7 @@ namespace DM_Weight.ViewModels
GetManuNos();
}
}, () => SelectedDrug.DrugId == null).ObservesProperty(() => SelectedDrug);
}, () => SelectedDrug.DrugId != null).ObservesProperty(() => SelectedDrug);
}
public DelegateCommand EditManuCommand