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

Compare commits

base: maqiao:0ae94e65ef974bd96a225df43642c7bb0804b8ad
Branches Tags
maqiao:master
maqiao:SanYa_ZhuYuan
maqiao:SanYa
maqiao:secondMaster
..
compare: maqiao:4d26252cad8909f1f61fc3becde50145b8be3a7d
Branches Tags
maqiao:SanYa_ZhuYuan
maqiao:SanYa
maqiao:secondMaster
maqiao:master

No commits in common. "0ae94e65ef974bd96a225df43642c7bb0804b8ad" and "4d26252cad8909f1f61fc3becde50145b8be3a7d" have entirely different histories.
0ae94e65ef ... 4d26252cad

3 changed files with 1506 additions and 56 deletions
Show Stats 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

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

File diff suppressed because it is too large Load Diff

83
DM_Weight/ViewModels/InvoiceInNewWindowViewModel.cs
View File

@ -308,7 +308,7 @@ namespace DM_Weight.ViewModels
//.Includes(cl => cl.channelStocks, dr => dr.DrugInfo, d => d.DrugManuNos) //.Includes(cl => cl.channelStocks, dr => dr.DrugInfo, d => d.DrugManuNos)
.Where(cl => cl.DrugId == invoices[i].DrugId && cl.MachineId == (ConfigurationManager.AppSettings["machineId"] ?? "DM1")).ToList(); .Where(cl => cl.DrugId == invoices[i].DrugId && cl.MachineId == (ConfigurationManager.AppSettings["machineId"] ?? "DM1")).ToList();
ChannelList channelLst = channelL.Count > 0 ? channelL[0] : null; ChannelList channelLst = channelL.Count > 0 ? channelL[0] : null;
if (channelL.Count <= 0) if (channelLst == null || channelLst.Id is null)
{ {
//药品未绑定库位，需要先绑药 //药品未绑定库位，需要先绑药
//AlertMsg alertMsg = new AlertMsg //AlertMsg alertMsg = new AlertMsg
@ -343,45 +343,18 @@ namespace DM_Weight.ViewModels
_eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg); _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
continue; continue;
} }
//没有根据药品绑定库位写入数据 ChannelStock stock = new ChannelStock();
for (int k = 0; k < channelL.Count; k++) //没有库存写入一条数据
{ stock.MachineId = ConfigurationManager.AppSettings["machineId"] ?? "DM1";
stock.DrawerNo = channelLst.DrawerNo;
ChannelStock stock = new ChannelStock(); stock.BoardType = channelLst.BoardType;
stock.MachineId = ConfigurationManager.AppSettings["machineId"] ?? "DM1"; stock.DrawerType = channelLst.DrawerType;
stock.DrawerNo = channelL[k].DrawerNo; stock.ColNo = channelLst.ColNo;
stock.BoardType = channelL[k].BoardType; stock.DrugId = channelLst.DrugId;
stock.DrawerType = channelL[k].DrawerType; stock.ManuNo = invoicesManuNo[j].DrugManuNo;
stock.ColNo = channelL[k].ColNo; stock.EffDate = manuNoList[0].EffDate;
stock.DrugId = channelL[k].DrugId; stock.Chnguid = channelLst.Id;
stock.ManuNo = invoicesManuNo[j].DrugManuNo; stockList.Add(stock);
stock.EffDate = manuNoList[0].EffDate;
stock.Chnguid = channelL[k].Id;
stockList.Add(stock);
}
}
else
{
//药品有库存，则除了将对应药品批次数据列出来外，还要将当前已绑定的药品下添加上该批次
for (int k = 0; k < channelL.Count; k++)
{
//有库存且批次抽屉库位与将要插入的批次抽屉库位一致则跳过
if(stockList.Where(t=>t.ManuNo== invoicesManuNo[j].DrugManuNo&&t.ColNo== channelL[k].ColNo&&t.DrawerNo== channelL[k].DrawerNo).FirstOrDefault()!=null)
{
continue;
}
ChannelStock stock = new ChannelStock();
stock.MachineId = ConfigurationManager.AppSettings["machineId"] ?? "DM1";
stock.DrawerNo = channelL[k].DrawerNo;
stock.BoardType = channelL[k].BoardType;
stock.DrawerType = channelL[k].DrawerType;
stock.ColNo = channelL[k].ColNo;
stock.DrugId = channelL[k].DrugId;
stock.ManuNo = invoicesManuNo[j].DrugManuNo;
stock.EffDate = manuNoList[0].EffDate;
stock.Chnguid = channelL[k].Id;
stockList.Add(stock);
}
} }
//stock.AddQuantity = invoicesManuNo[j].quantity; //stock.AddQuantity = invoicesManuNo[j].quantity;
//stockList.ForEach(s => s.AddQuantity = invoicesManuNo[j].quantity); //stockList.ForEach(s => s.AddQuantity = invoicesManuNo[j].quantity);
@ -662,22 +635,22 @@ namespace DM_Weight.ViewModels
{ {
//if (singleChannels[i].BoardType == 5) //if (singleChannels[i].BoardType == 5)
//{ //{
List<ChannelStock> channelStockEffDate = SqlSugarHelper.Db.Queryable<ChannelStock>() List<ChannelStock> channelStockEffDate = SqlSugarHelper.Db.Queryable<ChannelStock>()
.Where(cs => cs.MachineId == singleChannels[i].MachineId) .Where(cs => cs.MachineId == singleChannels[i].MachineId)
.Where(cs => cs.DrawerNo == singleChannels[i].DrawerNo) .Where(cs => cs.DrawerNo == singleChannels[i].DrawerNo)
.Where(cs => cs.ColNo == singleChannels[i].ColNo) .Where(cs => cs.ColNo == singleChannels[i].ColNo)
.Where(cs => cs.Quantity > 0) .Where(cs=>cs.Quantity>0)
.OrderBy(cs => cs.EffDate).ToList(); .OrderBy(cs => cs.EffDate).ToList();
int totalQuantity = channelStockEffDate.Sum(it => it.Quantity); int totalQuantity = channelStockEffDate.Sum(it => it.Quantity);
//将库位多批次的总库存数更新标签 //将库位多批次的总库存数更新标签
_portUtil.WriteQuantity(channelStockEffDate[0].DrawerNo, channelStockEffDate[0].ColNo, totalQuantity); _portUtil.WriteQuantity(channelStockEffDate[0].DrawerNo, channelStockEffDate[0].ColNo, totalQuantity);
Thread.Sleep(200); Thread.Sleep(200);
_portUtil.WriteChannelInfo(6, channelStockEffDate[0].EffDate == null ? "" : channelStockEffDate[0].EffDate, channelStockEffDate[0].DrawerNo, channelStockEffDate[0].ColNo); _portUtil.WriteChannelInfo(6, channelStockEffDate[0].EffDate == null ? "" : channelStockEffDate[0].EffDate, channelStockEffDate[0].DrawerNo, channelStockEffDate[0].ColNo);
Thread.Sleep(200); Thread.Sleep(200);
_portUtil.WriteChannelInfo(5, channelStockEffDate[0].ManuNo, channelStockEffDate[0].DrawerNo, channelStockEffDate[0].ColNo); _portUtil.WriteChannelInfo(5, channelStockEffDate[0].ManuNo, channelStockEffDate[0].DrawerNo, channelStockEffDate[0].ColNo);
Thread.Sleep(200); Thread.Sleep(200);
_portUtil.ShowContent(channelStockEffDate[0].DrawerNo, channelStockEffDate[0].ColNo); _portUtil.ShowContent(channelStockEffDate[0].DrawerNo, channelStockEffDate[0].ColNo);
//} //}
} }
} }