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

Merge branch 'secondMaster' of http://27.128.204.251:9999/maqiao/HuNan_DM into secondMaster

This commit is contained in:
maqiao 2024-08-20 10:40:35 +08:00
parent 5451dd490a 134f15941a
commit 85360a675c
4 changed files with 1438 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -362,4 +362,3 @@ MigrationBackup/
# Fody - auto-generated XML schema # Fody - auto-generated XML schema
FodyWeavers.xsd FodyWeavers.xsd
/readme.txt /readme.txt
/DM_Weight/Port/PortUtil.cs

2
DM_Weight/App.config
View File

@ -24,7 +24,7 @@
<!-- 登录顺序,指定先登录的人的名称有效值，只有在登录模式等于2时才会生效； 发药人：【operator】审核人：【reviewer】 --> <!-- 登录顺序,指定先登录的人的名称有效值，只有在登录模式等于2时才会生效； 发药人：【operator】审核人：【reviewer】 -->
<add key="firstLogin" value="operator" /> <add key="firstLogin" value="operator" />
<!-- 按处方还药或者按取药记录还药 1:处方2：药品--> <!-- 按处方还药或者按取药记录还药 1:处方2：药品-->
<add key="returnDrugMode" value="1" /> <add key="returnDrugMode" value="2" />
<!-- 自动退出时间，单位秒，为0时不自动退出 --> <!-- 自动退出时间，单位秒，为0时不自动退出 -->
<add key="autoExit" value="300"/> <add key="autoExit" value="300"/>
<!--报表数据库连接--> <!--报表数据库连接-->

1435
DM_Weight/Port/PortUtil.cs Normal file
View File

File diff suppressed because it is too large Load Diff

3
DM_Weight/ViewModels/InvoiceInNewWindowViewModel.cs
View File

@ -533,7 +533,7 @@ namespace DM_Weight.ViewModels
if (!_isFinishClick) if (!_isFinishClick)
{ {
_isFinishClick = true; _isFinishClick = true;
List<ChannelStock> record = ChannelStocks.ToList(); List<ChannelStock> record = ChannelStocks.Where(it=>it.AddQuantity>0).ToList();
string InvoiceId = SelectedInvoice.InvoiceNo; string InvoiceId = SelectedInvoice.InvoiceNo;
var f = SqlSugarHelper.Db.UseTran(() => var f = SqlSugarHelper.Db.UseTran(() =>
{ {
@ -569,6 +569,7 @@ namespace DM_Weight.ViewModels
List<ChannelStock> csCount = SqlSugarHelper.Db.Queryable<ChannelStock>().Where(cs => cs.DrawerNo == it.DrawerNo && cs.ColNo == it.ColNo && cs.ManuNo == it.ManuNo && cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1") && cs.Quantity > 0).ToList(); List<ChannelStock> csCount = SqlSugarHelper.Db.Queryable<ChannelStock>().Where(cs => cs.DrawerNo == it.DrawerNo && cs.ColNo == it.ColNo && cs.ManuNo == it.ManuNo && cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1") && cs.Quantity > 0).ToList();
if (csCount.Count > 0) if (csCount.Count > 0)
{ {
logger.Info($"批号重复:{it.DrawerNo}-{it.ColNo}-{it.ManuNo}");
//repeatList.Add(it.ManuNo); //repeatList.Add(it.ManuNo);
//stockRepeats.Add(it); //stockRepeats.Add(it);
continue; continue;