Compare commits
	
		
			No commits in common. "f5ad39f3623a7b35b1b8b153caaf01183c5c22f6" and "d8a226b7ed9a9ef11b6c66c6b99416654bc872e5" have entirely different histories.
		
	
	
		
			f5ad39f362
			...
			d8a226b7ed
		
	
		| 
						 | 
				
			
			@ -1,7 +1,7 @@
 | 
			
		|||
<?xml version="1.0" encoding="utf-8" ?>
 | 
			
		||||
<configuration>
 | 
			
		||||
	<connectionStrings>
 | 
			
		||||
		<add name="dbConnect" connectionString="server=127.0.0.1;user id=root;password=qq1223;database=xtTest;Convert Zero Datetime=True;Allow Zero Datetime=True;Charset=utf8" />
 | 
			
		||||
		<add name="dbConnect" connectionString="server=127.0.0.1;user id=root;password=root;database=xiangtan_mazuike_xx;Convert Zero Datetime=True;Allow Zero Datetime=True;Charset=utf8" />
 | 
			
		||||
	</connectionStrings>
 | 
			
		||||
	<appSettings>
 | 
			
		||||
		<!-- 设备id -->
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,7 +1,7 @@
 | 
			
		|||
<Project Sdk="Microsoft.NET.Sdk">
 | 
			
		||||
 | 
			
		||||
  <PropertyGroup>
 | 
			
		||||
    <OutputType>WinExe</OutputType>
 | 
			
		||||
    <OutputType>Exe</OutputType>
 | 
			
		||||
    <TargetFramework>net6.0</TargetFramework>
 | 
			
		||||
    <ImplicitUsings>enable</ImplicitUsings>
 | 
			
		||||
    <Nullable>enable</Nullable>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -114,7 +114,7 @@ public class CreateClass
 | 
			
		|||
                        //1)查询库存,为每一个批次的药品生成日结存数据
 | 
			
		||||
                        string sql = $@"SELECT machine_id,drug_id,manu_no,eff_date,IF(sum(quantity) IS null,0,sum(quantity)) manuQuantity,(SELECT IF(sum(quantity)is NULL,0,sum(quantity)) from channel_stock tCS WHERE  MACHINE_ID in('DM3','DM5') and drawer_type=1 and   quantity>0 and tCS.drug_id=bCS.drug_id) totalQuantity
 | 
			
		||||
                                        FROM channel_stock bCS
 | 
			
		||||
                                        WHERE MACHINE_ID in('DM3','DM5') and drawer_type=1 and   quantity>0 GROUP BY drug_id,manu_no";
 | 
			
		||||
                                        WHERE MACHINE_ID in('DM3','DM5') and drawer_type=1 and   quantity>0 GROUP BY drug_id,manu_no,eff_date";
 | 
			
		||||
                        DataSet dsQuantity = SqlHelper.ExecuteQuery(sql);
 | 
			
		||||
                        if (dsQuantity != null && dsQuantity.Tables[0] != null && dsQuantity.Tables[0].Rows.Count > 0)
 | 
			
		||||
                        {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue