值班柜只有开一个抽屉的权限
This commit is contained in:
		
							parent
							
								
									7b2f72db15
								
							
						
					
					
						commit
						5ab35c846c
					
				| 
						 | 
					@ -3,7 +3,7 @@
 | 
				
			||||||
  <connectionStrings>
 | 
					  <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;database=wpf_dm_program;userid=root;password=qq1223" />-->
 | 
				
			||||||
	<add name="database" connectionString="server=127.0.0.1;port=3306;database=sanya_xianchang2;userid=root;password=root" />
 | 
						<add name="database" connectionString="server=127.0.0.1;port=3306;database=sanya_xx;userid=root;password=root" />
 | 
				
			||||||
  </connectionStrings>
 | 
					  </connectionStrings>
 | 
				
			||||||
	<!--<runtime>
 | 
						<!--<runtime>
 | 
				
			||||||
		--><!--配置之后,Appdomain.CurrentDomain.UnhandledException 事件的 IsTerminating 就变成了 false 啦!也就是说,程序并不会因为这次的异常而崩溃退出。--><!--
 | 
							--><!--配置之后,Appdomain.CurrentDomain.UnhandledException 事件的 IsTerminating 就变成了 false 啦!也就是说,程序并不会因为这次的异常而崩溃退出。--><!--
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -229,8 +229,8 @@ namespace DM_Weight.ViewModels
 | 
				
			||||||
            var list = SqlSugarHelper.Db.Queryable<ChannelStock>()
 | 
					            var list = SqlSugarHelper.Db.Queryable<ChannelStock>()
 | 
				
			||||||
        .Includes<DrugInfo>(cs => cs.DrugInfo)
 | 
					        .Includes<DrugInfo>(cs => cs.DrugInfo)
 | 
				
			||||||
        .WhereIF(DrawerNo > 0, cs => cs.DrawerNo == DrawerNo)
 | 
					        .WhereIF(DrawerNo > 0, cs => cs.DrawerNo == DrawerNo)
 | 
				
			||||||
        .WhereIF(App.SingleModel, cs => cs.DrawerNo <= 2) //单人登录开前8个抽屉,双人登录开后8个抽屉
 | 
					        .WhereIF(App.SingleModel, cs => cs.DrawerNo <= 1) //单人登录开前8个抽屉,双人登录开后8个抽屉
 | 
				
			||||||
        .WhereIF(!(App.SingleModel), cs => cs.DrawerNo > 2)
 | 
					        .WhereIF(!(App.SingleModel), cs => cs.DrawerNo > 1)
 | 
				
			||||||
        .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1"))
 | 
					        .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1"))
 | 
				
			||||||
        .OrderBy(cs => cs.DrawerNo)
 | 
					        .OrderBy(cs => cs.DrawerNo)
 | 
				
			||||||
        .OrderBy(cs => cs.ColNo)
 | 
					        .OrderBy(cs => cs.ColNo)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -258,8 +258,8 @@ namespace DM_Weight.ViewModels
 | 
				
			||||||
            int totalCount = 0;
 | 
					            int totalCount = 0;
 | 
				
			||||||
            var list = SqlSugarHelper.Db.Queryable<ChannelList>()
 | 
					            var list = SqlSugarHelper.Db.Queryable<ChannelList>()
 | 
				
			||||||
                .Includes<DrugInfo>(cl => cl.Drug)
 | 
					                .Includes<DrugInfo>(cl => cl.Drug)
 | 
				
			||||||
                .WhereIF(App.SingleModel, cl => cl.DrawerNo <= 2) //单人登录开前8个抽屉,双人登录开后8个抽屉
 | 
					                .WhereIF(App.SingleModel, cl => cl.DrawerNo <= 1) //单人登录开前8个抽屉,双人登录开后8个抽屉
 | 
				
			||||||
                .WhereIF(!(App.SingleModel), cl => cl.DrawerNo > 2)
 | 
					                .WhereIF(!(App.SingleModel), cl => cl.DrawerNo > 1)
 | 
				
			||||||
                .Includes<ChannelStock>(cs => cs.channelStocks)
 | 
					                .Includes<ChannelStock>(cs => cs.channelStocks)
 | 
				
			||||||
                .WhereIF(DrawerNo > 0, cl => cl.DrawerNo == DrawerNo)
 | 
					                .WhereIF(DrawerNo > 0, cl => cl.DrawerNo == DrawerNo)
 | 
				
			||||||
                .Where(cl => cl.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1"))
 | 
					                .Where(cl => cl.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1"))
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -159,8 +159,8 @@ namespace DM_Weight.ViewModels
 | 
				
			||||||
            List<CheckRecordStock> checkList = SqlSugarHelper.Db.Queryable<CheckRecordStock>()
 | 
					            List<CheckRecordStock> checkList = SqlSugarHelper.Db.Queryable<CheckRecordStock>()
 | 
				
			||||||
                .Includes<DrugInfo>(cs => cs.DrugInfo)
 | 
					                .Includes<DrugInfo>(cs => cs.DrugInfo)
 | 
				
			||||||
                .Where(cs => cs.optdate == OptDate).OrderByDescending(cs => cs.optdate)
 | 
					                .Where(cs => cs.optdate == OptDate).OrderByDescending(cs => cs.optdate)
 | 
				
			||||||
                .WhereIF(App.SingleModel, cs => cs.rowNo <= 2) //单人登录开前2个抽屉,双人登录开后14个抽屉
 | 
					                .WhereIF(App.SingleModel, cs => cs.rowNo <= 1) //单人登录开前2个抽屉,双人登录开后14个抽屉
 | 
				
			||||||
                .WhereIF(!(App.SingleModel), cs => cs.rowNo > 2)
 | 
					                .WhereIF(!(App.SingleModel), cs => cs.rowNo > 1)
 | 
				
			||||||
                .ToList();
 | 
					                .ToList();
 | 
				
			||||||
            ICollectionView vw = CollectionViewSource.GetDefaultView(checkList);
 | 
					            ICollectionView vw = CollectionViewSource.GetDefaultView(checkList);
 | 
				
			||||||
            vw.GroupDescriptions.Add(new PropertyGroupDescription("DrugInfo"));
 | 
					            vw.GroupDescriptions.Add(new PropertyGroupDescription("DrugInfo"));
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -574,8 +574,8 @@ namespace DM_Weight.ViewModels
 | 
				
			||||||
                .Where(cs => cs.DrawerType == 1)
 | 
					                .Where(cs => cs.DrawerType == 1)
 | 
				
			||||||
                .Where(cs => cs.DrugId != null)
 | 
					                .Where(cs => cs.DrugId != null)
 | 
				
			||||||
                .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1"))
 | 
					                .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1"))
 | 
				
			||||||
                .WhereIF(App.SingleModel, cs => cs.DrawerNo <= 2) //单人登录开前8个抽屉,双人登录开后8个抽屉
 | 
					                .WhereIF(App.SingleModel, cs => cs.DrawerNo <= 1) //单人登录开前8个抽屉,双人登录开后8个抽屉
 | 
				
			||||||
                .WhereIF(!(App.SingleModel), cs => cs.DrawerNo > 2)
 | 
					                .WhereIF(!(App.SingleModel), cs => cs.DrawerNo > 1)
 | 
				
			||||||
                .WhereIF(!String.IsNullOrEmpty(SearchValue), cs => cs.DrugInfo.DrugName == SearchValue)
 | 
					                .WhereIF(!String.IsNullOrEmpty(SearchValue), cs => cs.DrugInfo.DrugName == SearchValue)
 | 
				
			||||||
                .OrderBy(cs => cs.DrawerNo)
 | 
					                .OrderBy(cs => cs.DrawerNo)
 | 
				
			||||||
                .OrderBy(cs => cs.ColNo)
 | 
					                .OrderBy(cs => cs.ColNo)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -722,8 +722,8 @@ namespace DM_Weight.ViewModels
 | 
				
			||||||
                .Where(cs => cs.DrawerType == 1)
 | 
					                .Where(cs => cs.DrawerType == 1)
 | 
				
			||||||
                .Where(cs => cs.DrugId != null)
 | 
					                .Where(cs => cs.DrugId != null)
 | 
				
			||||||
                .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1"))
 | 
					                .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1"))
 | 
				
			||||||
                .WhereIF(App.SingleModel, cs => cs.DrawerNo <= 2) //单人登录开前8个抽屉,双人登录开后8个抽屉
 | 
					                .WhereIF(App.SingleModel, cs => cs.DrawerNo <= 1) //单人登录开前8个抽屉,双人登录开后8个抽屉
 | 
				
			||||||
                .WhereIF(!(App.SingleModel), cs => cs.DrawerNo > 2)
 | 
					                .WhereIF(!(App.SingleModel), cs => cs.DrawerNo > 1)
 | 
				
			||||||
                .WhereIF(!String.IsNullOrEmpty(SearchValue), cs => cs.DrugInfo.DrugName == SearchValue)
 | 
					                .WhereIF(!String.IsNullOrEmpty(SearchValue), cs => cs.DrugInfo.DrugName == SearchValue)
 | 
				
			||||||
                .OrderBy(cs => cs.DrawerNo)
 | 
					                .OrderBy(cs => cs.DrawerNo)
 | 
				
			||||||
                //.OrderByDescending(cs => cs.DrawerNo)
 | 
					                //.OrderByDescending(cs => cs.DrawerNo)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -198,8 +198,8 @@ namespace DM_Weight.ViewModels
 | 
				
			||||||
                    .WhereIF(!string.IsNullOrEmpty(orderDetail.SetEffDate), cs => cs.EffDate.Equals(orderDetail.SetEffDate))
 | 
					                    .WhereIF(!string.IsNullOrEmpty(orderDetail.SetEffDate), cs => cs.EffDate.Equals(orderDetail.SetEffDate))
 | 
				
			||||||
                    .WhereIF(!string.IsNullOrEmpty(orderDetail.SetManuNo), cs => cs.ManuNo.Equals(orderDetail.SetManuNo))
 | 
					                    .WhereIF(!string.IsNullOrEmpty(orderDetail.SetManuNo), cs => cs.ManuNo.Equals(orderDetail.SetManuNo))
 | 
				
			||||||
                    .Where(cs => cs.DrugId == orderDetail.DrugId)
 | 
					                    .Where(cs => cs.DrugId == orderDetail.DrugId)
 | 
				
			||||||
                     .WhereIF(App.SingleModel, cs => cs.DrawerNo <= 2) //单人登录开前2个抽屉,双人登录开后14个抽屉
 | 
					                     .WhereIF(App.SingleModel, cs => cs.DrawerNo <= 1) //单人登录开前2个抽屉,双人登录开后14个抽屉
 | 
				
			||||||
                    .WhereIF(!(App.SingleModel), cs => cs.DrawerNo > 2)
 | 
					                    .WhereIF(!(App.SingleModel), cs => cs.DrawerNo > 1)
 | 
				
			||||||
                    .OrderBy(cs => cs.EffDate)
 | 
					                    .OrderBy(cs => cs.EffDate)
 | 
				
			||||||
                    .OrderBy(cs => cs.DrawerNo)
 | 
					                    .OrderBy(cs => cs.DrawerNo)
 | 
				
			||||||
                    .OrderBy(cs => cs.ManuNo)
 | 
					                    .OrderBy(cs => cs.ManuNo)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -207,8 +207,8 @@ namespace DM_Weight.ViewModels
 | 
				
			||||||
                    .WhereIF(!string.IsNullOrEmpty(orderDetail.SetEffDate), cs => cs.EffDate.Equals(orderDetail.SetEffDate))
 | 
					                    .WhereIF(!string.IsNullOrEmpty(orderDetail.SetEffDate), cs => cs.EffDate.Equals(orderDetail.SetEffDate))
 | 
				
			||||||
                    .WhereIF(!string.IsNullOrEmpty(orderDetail.SetManuNo), cs => cs.ManuNo.Equals(orderDetail.SetManuNo))
 | 
					                    .WhereIF(!string.IsNullOrEmpty(orderDetail.SetManuNo), cs => cs.ManuNo.Equals(orderDetail.SetManuNo))
 | 
				
			||||||
                    .Where(cs => cs.DrugId == orderDetail.DrugId)
 | 
					                    .Where(cs => cs.DrugId == orderDetail.DrugId)
 | 
				
			||||||
                    .WhereIF(App.SingleModel, cs => cs.DrawerNo <= 2) //单人登录开前2个抽屉,双人登录开后14个抽屉
 | 
					                    .WhereIF(App.SingleModel, cs => cs.DrawerNo <= 1) //单人登录开前2个抽屉,双人登录开后14个抽屉
 | 
				
			||||||
                    .WhereIF(!(App.SingleModel), cs => cs.DrawerNo > 2)
 | 
					                    .WhereIF(!(App.SingleModel), cs => cs.DrawerNo > 1)
 | 
				
			||||||
                    .OrderBy(cs => cs.EffDate)
 | 
					                    .OrderBy(cs => cs.EffDate)
 | 
				
			||||||
                    .OrderBy(cs => cs.DrawerNo)
 | 
					                    .OrderBy(cs => cs.DrawerNo)
 | 
				
			||||||
                    .OrderBy(cs => cs.ManuNo)
 | 
					                    .OrderBy(cs => cs.ManuNo)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -219,8 +219,8 @@ namespace DM_Weight.ViewModels
 | 
				
			||||||
            List<OrderInfo> queryData = SqlSugarHelper.Db.Queryable<OrderInfo>()
 | 
					            List<OrderInfo> queryData = SqlSugarHelper.Db.Queryable<OrderInfo>()
 | 
				
			||||||
                .InnerJoin<OrderDetail>((oi, od) => oi.OrderNo == od.OrderNo)
 | 
					                .InnerJoin<OrderDetail>((oi, od) => oi.OrderNo == od.OrderNo)
 | 
				
			||||||
                .InnerJoin(SqlSugarHelper.Db.Queryable<ChannelStock>().Where(cs => cs.DrawerType == 1)
 | 
					                .InnerJoin(SqlSugarHelper.Db.Queryable<ChannelStock>().Where(cs => cs.DrawerType == 1)
 | 
				
			||||||
                                                                      .WhereIF(App.SingleModel, cs => cs.DrawerNo <= 2) //单人登录开前8个抽屉,双人登录开后8个抽屉
 | 
					                                                                      .WhereIF(App.SingleModel, cs => cs.DrawerNo <= 1) //单人登录开前8个抽屉,双人登录开后8个抽屉
 | 
				
			||||||
                                                                      .WhereIF(!(App.SingleModel), cs => cs.DrawerNo > 2)
 | 
					                                                                      .WhereIF(!(App.SingleModel), cs => cs.DrawerNo > 1)
 | 
				
			||||||
                                                                      .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1")).GroupBy(cs => cs.DrugId), (oi, od, t) => od.DrugId == t.DrugId)
 | 
					                                                                      .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1")).GroupBy(cs => cs.DrugId), (oi, od, t) => od.DrugId == t.DrugId)
 | 
				
			||||||
                .WhereIF(OrderDate != null, oi => oi.OrderDate.ToString("yyyy-MM-dd") == OrderDate)
 | 
					                .WhereIF(OrderDate != null, oi => oi.OrderDate.ToString("yyyy-MM-dd") == OrderDate)
 | 
				
			||||||
                .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("OrderNo"), oi => oi.OrderNo == SearchValue)
 | 
					                .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("OrderNo"), oi => oi.OrderNo == SearchValue)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -184,8 +184,8 @@ namespace DM_Weight.ViewModels
 | 
				
			||||||
                .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("DrugName"), (mr) => mr.DrugInfo.DrugName.Contains(SearchValue))
 | 
					                .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("DrugName"), (mr) => mr.DrugInfo.DrugName.Contains(SearchValue))
 | 
				
			||||||
                .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("PyCode"), (mr) => mr.DrugInfo.PyCode.Contains(SearchValue))
 | 
					                .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("PyCode"), (mr) => mr.DrugInfo.PyCode.Contains(SearchValue))
 | 
				
			||||||
                .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("DrugBarcode"), (mr) => mr.DrugInfo.DrugBarcode.Contains(SearchValue))
 | 
					                .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("DrugBarcode"), (mr) => mr.DrugInfo.DrugBarcode.Contains(SearchValue))
 | 
				
			||||||
                .WhereIF(App.SingleModel, cs => cs.DrawerNo <= 2) //单人登录开前8个抽屉,双人登录开后8个抽屉
 | 
					                .WhereIF(App.SingleModel, cs => cs.DrawerNo <= 1) //单人登录开前8个抽屉,双人登录开后8个抽屉
 | 
				
			||||||
                .WhereIF(!(App.SingleModel), cs => cs.DrawerNo > 2)
 | 
					                .WhereIF(!(App.SingleModel), cs => cs.DrawerNo > 1)
 | 
				
			||||||
                .OrderBy(mr => mr.OperationTime)
 | 
					                .OrderBy(mr => mr.OperationTime)
 | 
				
			||||||
                .ToList();
 | 
					                .ToList();
 | 
				
			||||||
            MachineRecords = queryData;
 | 
					            MachineRecords = queryData;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -105,8 +105,8 @@ namespace DM_Weight.ViewModels
 | 
				
			||||||
            Channels = SqlSugarHelper.Db.Queryable<ChannelStock>()
 | 
					            Channels = SqlSugarHelper.Db.Queryable<ChannelStock>()
 | 
				
			||||||
                .LeftJoin<DrugInfo>((cs,di) => cs.DrugId == di.DrugId.ToString())
 | 
					                .LeftJoin<DrugInfo>((cs,di) => cs.DrugId == di.DrugId.ToString())
 | 
				
			||||||
                .Where((cs) => cs.DrawerType != 1)
 | 
					                .Where((cs) => cs.DrawerType != 1)
 | 
				
			||||||
                .WhereIF(App.SingleModel, cs => cs.DrawerNo <= 2) //单人登录开前8个抽屉,双人登录开后8个抽屉
 | 
					                .WhereIF(App.SingleModel, cs => cs.DrawerNo <= 1) //单人登录开前8个抽屉,双人登录开后8个抽屉
 | 
				
			||||||
                .WhereIF(!(App.SingleModel), cs => cs.DrawerNo > 2)
 | 
					                .WhereIF(!(App.SingleModel), cs => cs.DrawerNo > 1)
 | 
				
			||||||
                .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1"))
 | 
					                .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1"))
 | 
				
			||||||
                .Select((cs, di) => new ChannelStock{
 | 
					                .Select((cs, di) => new ChannelStock{
 | 
				
			||||||
                    CanReturnQuantity = SqlFunc.Subqueryable<MachineRecord>().Where(mr => mr.DrugId == cs.DrugId&&mr.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1")).Where(mr => mr.Type == 2).Where(mr => mr.Status != 2).Select(mr => SqlFunc.IsNull(SqlFunc.AggregateSumNoNull(mr.Quantity - mr.ReturnQuantity1 - mr.ReturnQuantity2), 0)) ,
 | 
					                    CanReturnQuantity = SqlFunc.Subqueryable<MachineRecord>().Where(mr => mr.DrugId == cs.DrugId&&mr.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1")).Where(mr => mr.Type == 2).Where(mr => mr.Status != 2).Select(mr => SqlFunc.IsNull(SqlFunc.AggregateSumNoNull(mr.Quantity - mr.ReturnQuantity1 - mr.ReturnQuantity2), 0)) ,
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -212,8 +212,8 @@ namespace DM_Weight.ViewModels
 | 
				
			||||||
            //ChannelStocks = queryData;
 | 
					            //ChannelStocks = queryData;
 | 
				
			||||||
            List<DrugInfo> q = SqlSugarHelper.Db.Queryable<DrugInfo>()
 | 
					            List<DrugInfo> q = SqlSugarHelper.Db.Queryable<DrugInfo>()
 | 
				
			||||||
                .Includes<ChannelStock>(di => di.channelStocks.Where(cs => cs.DrawerType == 1)
 | 
					                .Includes<ChannelStock>(di => di.channelStocks.Where(cs => cs.DrawerType == 1)
 | 
				
			||||||
                                                              .WhereIF(App.SingleModel, cs => cs.DrawerNo <= 2) //单人登录开前8个抽屉,双人登录开后8个抽屉
 | 
					                                                              .WhereIF(App.SingleModel, cs => cs.DrawerNo <= 1) //单人登录开前8个抽屉,双人登录开后8个抽屉
 | 
				
			||||||
                                                              .WhereIF(!(App.SingleModel), cs => cs.DrawerNo > 2)
 | 
					                                                              .WhereIF(!(App.SingleModel), cs => cs.DrawerNo > 1)
 | 
				
			||||||
                                                              .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1") && cs.DrugId != null).OrderBy(cs => cs.DrawerNo).OrderBy(cs => cs.ColNo).ToList())
 | 
					                                                              .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1") && cs.DrugId != null).OrderBy(cs => cs.DrawerNo).OrderBy(cs => cs.ColNo).ToList())
 | 
				
			||||||
                .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("DrugId"), (cs) => cs.DrugId.Contains(SearchValue))
 | 
					                .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("DrugId"), (cs) => cs.DrugId.Contains(SearchValue))
 | 
				
			||||||
                .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("DrugName"), (cs) => cs.DrugName.Contains(SearchValue))
 | 
					                .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("DrugName"), (cs) => cs.DrugName.Contains(SearchValue))
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -197,8 +197,8 @@ namespace DM_Weight.ViewModels
 | 
				
			||||||
            //ChannelStocks = queryData;
 | 
					            //ChannelStocks = queryData;
 | 
				
			||||||
            List<DrugInfo> q = SqlSugarHelper.Db.Queryable<DrugInfo>()
 | 
					            List<DrugInfo> q = SqlSugarHelper.Db.Queryable<DrugInfo>()
 | 
				
			||||||
                .Includes<ChannelStock>(di => di.channelStocks.Where(cs => cs.DrawerType == 1)
 | 
					                .Includes<ChannelStock>(di => di.channelStocks.Where(cs => cs.DrawerType == 1)
 | 
				
			||||||
                .WhereIF(App.SingleModel, cs => cs.DrawerNo <= 2 ) //单人登录开前8个抽屉,双人登录开后8个抽屉
 | 
					                .WhereIF(App.SingleModel, cs => cs.DrawerNo <= 1 ) //单人登录开前8个抽屉,双人登录开后8个抽屉
 | 
				
			||||||
                .WhereIF(!(App.SingleModel), cs => cs.DrawerNo > 2 )
 | 
					                .WhereIF(!(App.SingleModel), cs => cs.DrawerNo > 1 )
 | 
				
			||||||
                .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1") && cs.DrugId != null&&cs.Quantity>0).OrderBy(cs => cs.DrawerNo).OrderBy(cs => cs.ColNo).ToList())
 | 
					                .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1") && cs.DrugId != null&&cs.Quantity>0).OrderBy(cs => cs.DrawerNo).OrderBy(cs => cs.ColNo).ToList())
 | 
				
			||||||
             .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("DrugId"), (cs) => cs.DrugId.Contains(SearchValue))
 | 
					             .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("DrugId"), (cs) => cs.DrugId.Contains(SearchValue))
 | 
				
			||||||
                .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("DrugName"), (cs) => cs.DrugName.Contains(SearchValue))
 | 
					                .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("DrugName"), (cs) => cs.DrugName.Contains(SearchValue))
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -243,8 +243,8 @@ namespace DM_Weight.ViewModels
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            List<DrugInfo> q = SqlSugarHelper.Db.Queryable<DrugInfo>()
 | 
					            List<DrugInfo> q = SqlSugarHelper.Db.Queryable<DrugInfo>()
 | 
				
			||||||
               .Includes<ChannelStock>(di => di.channelStocks.Where(cs => cs.DrawerType == 1)
 | 
					               .Includes<ChannelStock>(di => di.channelStocks.Where(cs => cs.DrawerType == 1)
 | 
				
			||||||
                                                             .WhereIF(App.SingleModel, cs => cs.DrawerNo <= 2) //单人登录开前8个抽屉,双人登录开后8个抽屉
 | 
					                                                             .WhereIF(App.SingleModel, cs => cs.DrawerNo <= 1) //单人登录开前8个抽屉,双人登录开后8个抽屉
 | 
				
			||||||
                                                             .WhereIF(!(App.SingleModel), cs => cs.DrawerNo > 2)
 | 
					                                                             .WhereIF(!(App.SingleModel), cs => cs.DrawerNo > 1)
 | 
				
			||||||
                                                             .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1") && cs.DrugId != null).OrderBy(cs => cs.DrawerNo).OrderBy(cs => cs.ColNo).ToList())
 | 
					                                                             .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1") && cs.DrugId != null).OrderBy(cs => cs.DrawerNo).OrderBy(cs => cs.ColNo).ToList())
 | 
				
			||||||
               .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("DrugId"), (cs) => cs.DrugId.Contains(SearchValue))
 | 
					               .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("DrugId"), (cs) => cs.DrugId.Contains(SearchValue))
 | 
				
			||||||
               .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("DrugName"), (cs) => cs.DrugName.Contains(SearchValue))
 | 
					               .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("DrugName"), (cs) => cs.DrugName.Contains(SearchValue))
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue