From 0ea814178760df0b4eec4ad0f42419b116974a2b Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Fri, 7 Apr 2023 16:24:58 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=90=86=E4=BA=BA?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=97=A0=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=202.=E4=BF=AE=E5=A4=8D=E7=89=A9=E8=B5=84=E5=85=A5=E9=99=A2?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E4=BB=B7=E6=A0=BC=E7=AD=89=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=9C=AA=E5=B1=95=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ThrProductsAddDiServiceImpl.java     | 13 ++++
 .../mybatis/mapper/purchase/SupProductDao.xml | 64 ++++++++++++++++---
 2 files changed, 68 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiServiceImpl.java
index be32c993..8ff946db 100644
--- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiServiceImpl.java
+++ b/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;
     }
 
diff --git a/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml b/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml
index f8a89e87..8fe545e1 100644
--- a/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml
+++ b/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml
@@ -77,17 +77,63 @@
 
     <select id="getRegistration" parameterType="com.glxp.api.req.purchase.FilterPoductRequest"
             resultType="com.glxp.api.res.purchase.SupProductResponse">
-        SELECT sup_product.*,
-               sup_company.companyName
-                                            supName,
+        SELECT sup_product.id,
+               sup_product.productId,
+               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
-                     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
 
         <where>
             <if test="id != null and id != ''">