diff --git a/src/main/java/com/glxp/api/res/purchase/SupProductResponse.java b/src/main/java/com/glxp/api/res/purchase/SupProductResponse.java index 7f362ebbf..5f356730c 100644 --- a/src/main/java/com/glxp/api/res/purchase/SupProductResponse.java +++ b/src/main/java/com/glxp/api/res/purchase/SupProductResponse.java @@ -10,6 +10,7 @@ public class SupProductResponse extends SupProductEntity { private String supName; + private String ggxh; private String manufacturerName; private String createUser; private Date createTime; diff --git a/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml b/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml index c3cbd0e0b..04a47ceab 100644 --- a/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml @@ -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 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 and sup_product.id = #{id} @@ -181,6 +182,7 @@ and (sup_product.auditStatus = 1 or sup_product.auditStatus = 4) + GROUP BY cpmctymc, manufactory,ggxh @@ -390,17 +392,17 @@ WHERE enterpriseId = #{enterpriseId} - -