账册中生成日结存修改参数由查询列表中的值改为变量
This commit is contained in:
		
							parent
							
								
									2ac87cd83e
								
							
						
					
					
						commit
						db6d0200cc
					
				| 
						 | 
					@ -28,7 +28,7 @@
 | 
				
			||||||
		<!-- 自动退出时间,单位秒,为0时不自动退出 -->
 | 
							<!-- 自动退出时间,单位秒,为0时不自动退出 -->
 | 
				
			||||||
		<add key="autoExit" value="0"/>
 | 
							<add key="autoExit" value="0"/>
 | 
				
			||||||
		<!--报表数据库连接-->
 | 
							<!--报表数据库连接-->
 | 
				
			||||||
		<add key="gridConnectionString" value="MYSQL; Database=hunanxianchang_db; Password=root; Port=3306; Server=127.0.0.1; User=root;"/>
 | 
							<add key="gridConnectionString" value="MYSQL; Database=sanya_xianchang; Password=root; Port=3306; Server=127.0.0.1; User=root;"/>
 | 
				
			||||||
		<!-- 查询处方是orderNo还是orderGroupNo -->
 | 
							<!-- 查询处方是orderNo还是orderGroupNo -->
 | 
				
			||||||
		<add key="OrderNoName" value="orderNo" />
 | 
							<add key="OrderNoName" value="orderNo" />
 | 
				
			||||||
		<!-- 后门耗材板地址 没有则填写0-->
 | 
							<!-- 后门耗材板地址 没有则填写0-->
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -304,8 +304,9 @@ namespace DM_Weight.ViewModels
 | 
				
			||||||
                        //账册中没有记录则把库存中的所有数据都要生成一条账册记录
 | 
					                        //账册中没有记录则把库存中的所有数据都要生成一条账册记录
 | 
				
			||||||
                        // 保存数据 出/入库记录
 | 
					                        // 保存数据 出/入库记录
 | 
				
			||||||
                        // 获取药品总库存
 | 
					                        // 获取药品总库存
 | 
				
			||||||
 | 
					                        string drugId= channelStockList[i].DrugId;
 | 
				
			||||||
                        int channelStockQuantity = SqlSugarHelper.Db.Queryable<ChannelStock>()
 | 
					                        int channelStockQuantity = SqlSugarHelper.Db.Queryable<ChannelStock>()
 | 
				
			||||||
                            .Where(cs => cs.DrugId.Equals(channelStockList[i].DrugId)).Sum(it => it.Quantity);
 | 
					                            .Where(cs => cs.DrugId.Equals(drugId)).Sum(it => it.Quantity);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                        string InvoiceId = "Account_" + CurrentTimeMillis();
 | 
					                        string InvoiceId = "Account_" + CurrentTimeMillis();
 | 
				
			||||||
| 
						 | 
					@ -314,7 +315,7 @@ namespace DM_Weight.ViewModels
 | 
				
			||||||
                            MachineId = channelStockList[i].MachineId,
 | 
					                            MachineId = channelStockList[i].MachineId,
 | 
				
			||||||
                            DrawerNo = 0,//channelStockList[i].DrawerNo,
 | 
					                            DrawerNo = 0,//channelStockList[i].DrawerNo,
 | 
				
			||||||
                            ColNo = 0,//channelStockList[i].ColNo,
 | 
					                            ColNo = 0,//channelStockList[i].ColNo,
 | 
				
			||||||
                            DrugId = channelStockList[i].DrugId,
 | 
					                            DrugId = drugId,
 | 
				
			||||||
                            ManuNo = "",// channelStockList[i].ManuNo,
 | 
					                            ManuNo = "",// channelStockList[i].ManuNo,
 | 
				
			||||||
                            EffDate = null,// !String.IsNullOrEmpty(channelStockList[i].EffDate) ? DateTime.ParseExact(channelStockList[i].EffDate, "yyyy-MM-dd", System.Globalization.CultureInfo.CurrentCulture) : null,
 | 
					                            EffDate = null,// !String.IsNullOrEmpty(channelStockList[i].EffDate) ? DateTime.ParseExact(channelStockList[i].EffDate, "yyyy-MM-dd", System.Globalization.CultureInfo.CurrentCulture) : null,
 | 
				
			||||||
                            Operator = HomeWindowViewModel.Operator?.Id,
 | 
					                            Operator = HomeWindowViewModel.Operator?.Id,
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue