|  |  | @ -127,14 +127,15 @@ | 
			
		
	
		
		
			
				
					
					|  |  |  |                sup_company.companyName      supName, |  |  |  |                sup_company.companyName      supName, | 
			
		
	
		
		
			
				
					
					|  |  |  |                sup_manufacturer.companyName manufacturerName, |  |  |  |                sup_manufacturer.companyName manufacturerName, | 
			
		
	
		
		
			
				
					
					|  |  |  |                sup_manufacturer.companyName, |  |  |  |                sup_manufacturer.companyName, | 
			
		
	
		
		
			
				
					
					|  |  |  |                sup_manufacturer.agentName |  |  |  |                sup_manufacturer.agentName, | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |                basic_products.ggxh | 
			
		
	
		
		
			
				
					
					|  |  |  |         FROM sup_product |  |  |  |         FROM sup_product | 
			
		
	
		
		
			
				
					
					|  |  |  |                      inner join sup_company |  |  |  |                      inner join sup_company | 
			
		
	
		
		
			
				
					
					|  |  |  |                 on sup_product.customerId = sup_company.customerId |  |  |  |                 on sup_product.customerId = sup_company.customerId | 
			
		
	
		
		
			
				
					
					|  |  |  |                      INNER JOIN sup_manufacturer |  |  |  |                      INNER JOIN sup_manufacturer | 
			
		
	
		
		
			
				
					
					|  |  |  |                 on sup_manufacturer.manufacturerId = |  |  |  |                 on sup_manufacturer.manufacturerId = | 
			
		
	
		
		
			
				
					
					|  |  |  |                    sup_product.manufacturerIdFk |  |  |  |                    sup_product.manufacturerIdFk | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  |         INNER  join  basic_products on basic_products.cpmctymc = sup_product.recordProductName and basic_products.manufactory = sup_product.manufactory | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  |         <where> |  |  |  |         <where> | 
			
		
	
		
		
			
				
					
					|  |  |  |             <if test="id != null and id != ''"> |  |  |  |             <if test="id != null and id != ''"> | 
			
		
	
		
		
			
				
					
					|  |  |  |                 and sup_product.id = #{id} |  |  |  |                 and sup_product.id = #{id} | 
			
		
	
	
		
		
			
				
					|  |  | @ -181,6 +182,7 @@ | 
			
		
	
		
		
			
				
					
					|  |  |  |                 and (sup_product.auditStatus = 1 or sup_product.auditStatus = 4) |  |  |  |                 and (sup_product.auditStatus = 1 or sup_product.auditStatus = 4) | 
			
		
	
		
		
			
				
					
					|  |  |  |             </if> |  |  |  |             </if> | 
			
		
	
		
		
			
				
					
					|  |  |  |         </where> |  |  |  |         </where> | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |         GROUP BY cpmctymc, manufactory,ggxh | 
			
		
	
		
		
			
				
					
					|  |  |  |     </select> |  |  |  |     </select> | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |     <update id="modifyRegistration" parameterType="com.glxp.api.entity.purchase.SupProductEntity"> |  |  |  |     <update id="modifyRegistration" parameterType="com.glxp.api.entity.purchase.SupProductEntity"> | 
			
		
	
	
		
		
			
				
					|  |  | @ -390,7 +392,7 @@ | 
			
		
	
		
		
			
				
					
					|  |  |  |         WHERE enterpriseId = #{enterpriseId} |  |  |  |         WHERE enterpriseId = #{enterpriseId} | 
			
		
	
		
		
			
				
					
					|  |  |  |     </delete> |  |  |  |     </delete> | 
			
		
	
		
		
			
				
					
					|  |  |  |     <select id="findProduct" parameterType="com.glxp.api.entity.purchase.SupProductEntity" |  |  |  |     <select id="findProduct" parameterType="com.glxp.api.entity.purchase.SupProductEntity" | 
			
		
	
		
		
			
				
					
					|  |  |  |             resultType="java.lang.Integer" > |  |  |  |             resultType="java.lang.Integer"> | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  |         SELECT count(*) |  |  |  |         SELECT count(*) | 
			
		
	
		
		
			
				
					
					|  |  |  |         FROM sup_product |  |  |  |         FROM sup_product | 
			
		
	
		
		
			
				
					
					|  |  |  |                      inner join sup_company |  |  |  |                      inner join sup_company | 
			
		
	
	
		
		
			
				
					|  |  | @ -398,9 +400,9 @@ | 
			
		
	
		
		
			
				
					
					|  |  |  |                      INNER JOIN sup_manufacturer |  |  |  |                      INNER JOIN sup_manufacturer | 
			
		
	
		
		
			
				
					
					|  |  |  |                 on sup_manufacturer.manufacturerId = |  |  |  |                 on sup_manufacturer.manufacturerId = | 
			
		
	
		
		
			
				
					
					|  |  |  |                    sup_product.manufacturerIdFk |  |  |  |                    sup_product.manufacturerIdFk | 
			
		
	
		
		
			
				
					
					|  |  |  |         WHERE  sup_manufacturer.companyName=(SELECT companyName FROM sup_manufacturer WHERE manufacturerId = #{manufacturerIdFk}) |  |  |  |         WHERE sup_manufacturer.companyName = | 
			
				
				
			
		
	
		
		
			
				
					
					|  |  |  |           and recordCode=#{recordCode} and recordProductName=#{recordProductName} |  |  |  |               (SELECT companyName FROM sup_manufacturer WHERE manufacturerId = #{manufacturerIdFk}) | 
			
				
				
			
		
	
		
		
	
		
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |           and recordCode = #{recordCode} | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |           and recordProductName = #{recordProductName} | 
			
		
	
		
		
			
				
					
					|  |  |  |     </select> |  |  |  |     </select> | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  | </mapper> |  |  |  | </mapper> | 
			
		
	
	
		
		
			
				
					|  |  | 
 |