From b48f062e32e2a20ec06d1c9cfa69c294d60d608c Mon Sep 17 00:00:00 2001 From: maqiao <625215135@qq.com> Date: Mon, 13 Nov 2023 14:09:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=BD=E5=B1=89=E7=BB=91=E5=AE=9A=E5=A4=9A?= =?UTF-8?q?=E6=89=B9=E6=AC=A1=E9=A1=B5=E9=9D=A2=20=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E7=9A=84channel=5FStock=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=EF=BC=8C=E4=BB=A5=E5=85=8D=E6=9B=B4=E6=96=B0=E5=B1=8F=E6=98=BE?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=97=B6=E6=9B=B4=E6=96=B0=E4=BA=86=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ViewModels/AddDrugControlViewModel.cs | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/DM_Weight/ViewModels/AddDrugControlViewModel.cs b/DM_Weight/ViewModels/AddDrugControlViewModel.cs index 9592bee..bbdaff2 100644 --- a/DM_Weight/ViewModels/AddDrugControlViewModel.cs +++ b/DM_Weight/ViewModels/AddDrugControlViewModel.cs @@ -319,21 +319,11 @@ namespace DM_Weight.ViewModels } else { - //if (repeatList.Count > 0) - //{ - // AlertMsg alertMsg = new AlertMsg - // { - // Message = $"该抽屉已存在此药品批次{string.Join(',', repeatList)},请选择其他批次", - // Type = MsgType.ERROR - // }; - // _eventAggregator.GetEvent().Publish(alertMsg); - //} if (f.Data) { string msg = string.Empty; MsgType type = MsgType.SUCCESS; - //if (repeatList.Count > 0) if (stockRepeats.Count > 0) { msg = $"该抽屉下批次{string.Join(',', stockRepeats.Select(r => r.ManuNo).ToArray())}已存在,不可重复添加,其他批次加药完成,库存已更新"; @@ -419,7 +409,6 @@ namespace DM_Weight.ViewModels cls.DrugInfo = channelLS.Drug; if (channelLS.channelStocks.Count > 0) { - //drugManu = channelLS.channelStocks[0].DrugInfo.DrugManuNos[0]; cls.drugManuNo = channelLS.channelStocks[0].drugManuNo; } else @@ -449,13 +438,6 @@ namespace DM_Weight.ViewModels cls.ColNo = channelLS.ColNo; cls.DrugId = channelLS.DrugId; cls.AddQuantity = 0; - //string sqlStr = @"select drug_id,manu_no,manu_date,eff_date from drug_manu_no where drug_id=@drugId - // and manu_no not in(select manu_no from channel_stock where drug_id=@drugId) "; - //cls.DrugInfo.DrugManuNos=SqlSugarHelper.Db.SqlQueryable(sqlStr).AddParameters(new - //{ - // drugId = channelLS.DrugId - //}) - //.Select(it => new DrugManuNo()).ToList(); List stockList = new List(); stockList.AddRange(channelLS.channelStocks); stockList.Add(cls);