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