Merge remote-tracking branch 'origin/master'

src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiServiceImpl.java

@@ -103,6 +103,16 @@ public class ThrProductsAddDiServiceImpl implements ThrProductsAddDiService {
             thrProductsAddDiEntity.setRegisterNo(productInfoEntity.getZczbhhzbapzbh());
             thrProductsAddDiEntity.setYlqxzcrbarmc(productInfoEntity.getYlqxzcrbarmc());
             thrProductsAddDiEntity.setZczbhhzbapzbh(productInfoEntity.getZczbhhzbapzbh());
+
+            //设置编辑区参数
+            thrProductsAddDiEntity.setSptm(thrDiProductsRequest.getSptm());
+            thrProductsAddDiEntity.setYbbm(thrDiProductsRequest.getYbbm());
+            thrProductsAddDiEntity.setMeasname(thrDiProductsRequest.getMeasname());
+            thrProductsAddDiEntity.setManufactory(thrDiProductsRequest.getManufactory());
+            thrProductsAddDiEntity.setSpmc(thrDiProductsRequest.getSpmc());
+            thrProductsAddDiEntity.setCpms(thrDiProductsRequest.getCpms());
+            thrProductsAddDiEntity.setPrice(thrDiProductsRequest.getPrice());
+
             thrProductsAddDiEntity.setCreateTime(date);
             thrProductsAddDiEntity.setUpdateTime(new Date());
             thrProductsAddDiEntity.setStatus(1); //未审核
@@ -120,6 +130,9 @@ public class ThrProductsAddDiServiceImpl implements ThrProductsAddDiService {
         udiInfoResponse.setYbbm(thrProductsAddDiEntity.getYbbm());
         udiInfoResponse.setManufactory(thrProductsAddDiEntity.getManufactory());
         udiInfoResponse.setCpms(thrProductsAddDiEntity.getCpms());
+        udiInfoResponse.setMeasname(thrProductsAddDiEntity.getMeasname());
+        udiInfoResponse.setManufactory(thrProductsAddDiEntity.getManufactory());
+        udiInfoResponse.setPrice(thrProductsAddDiEntity.getPrice());
        return udiInfoResponse;
     }
 

src/main/resources/mybatis/mapper/purchase/SupProductDao.xml

@@ -77,11 +77,57 @@
 
     <select id="getRegistration" parameterType="com.glxp.api.req.purchase.FilterPoductRequest"
             resultType="com.glxp.api.res.purchase.SupProductResponse">
-        SELECT sup_product.*,
+        SELECT sup_product.id,
-               sup_company.companyName
+               sup_product.productId,
-                                            supName,
+               sup_product.enterpriseId,
+               sup_product.recordCode,
+               sup_product.recordProductName,
+               sup_product.productManageType,
+               sup_product.recordPeopleName,
+               sup_product.recordPeopleArea,
+               sup_product.recordPeopleAreaCode,
+               sup_product.recordPeopleAddress,
+               sup_product.productType,
+               sup_product.productDirectoryCode,
+               sup_product.agentArea,
+               sup_product.agentAreaCode,
+               sup_product.agentAddress,
+               sup_product.instructions,
+               sup_product.productAddress,
+               sup_product.recordText,
+               sup_product.placeOrigin,
+               sup_product.productionRegion,
+               sup_product.productionCompanyName,
+               sup_product.afterSale,
+               sup_product.specification,
+               sup_product.structure,
+               sup_product.scope,
+               sup_product.other,
+               sup_product.filePath,
+               sup_product.manufacturerIdFk,
+               sup_product.customerId,
+               sup_product.auditStatus,
+               sup_product.auditComment,
+               sup_product.sptm,
+               sup_product.ybbm,
+               sup_product.measname,
+               sup_product.cpms,
+               sup_product.relIdFk,
+               sup_product.hchzsb,
+               sup_product.remark,
+               sup_product.createUser,
+               sup_product.createTime,
+               sup_product.updateUser,
+               sup_product.updateTime,
+               sup_product.manufactory,
+               sup_product.allowNoBatch,
+               sup_product.allowNoExpire,
+               sup_product.allowNoProduct,
+               sup_product.allowNoSerial,
+               sup_company.companyName      supName,
                sup_manufacturer.companyName manufacturerName,
-               sup_manufacturer.companyName
+               sup_manufacturer.companyName,
+               sup_manufacturer.agentName
         FROM sup_product
                  inner join sup_company
                             on sup_product.customerId = sup_company.customerId