Merge remote-tracking branch 'origin/master'

src/main/java/com/glxp/api/controller/basic/BasicHospTypeController.java

@@ -1,6 +1,7 @@
 package com.glxp.api.controller.basic;
 
 
+import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.annotation.Log;
 import com.glxp.api.common.enums.ResultEnum;
@@ -8,6 +9,7 @@ import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.BusinessType;
 import com.glxp.api.entity.basic.BasicHospTypeEntity;
+import com.glxp.api.entity.basic.UdiEntity;
 import com.glxp.api.req.basic.BasicHospTypeFilterRequest;
 import com.glxp.api.req.basic.BasicHospTypeRequest;
 import com.glxp.api.req.basic.FilterUdiRelRequest;
@@ -15,7 +17,9 @@ import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.basic.BasicHospTypeResponse;
 import com.glxp.api.res.basic.UdiRelevanceResponse;
 import com.glxp.api.service.basic.BasicHospTypeService;
+import com.glxp.api.service.basic.UdiRelevanceService;
 import com.glxp.api.util.StringUtils;
+import com.glxp.api.util.udi.FilterUdiUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -32,8 +36,6 @@ public class BasicHospTypeController {
     BasicHospTypeService basicHospTypeService;
 
 
-
-
     @GetMapping("/udiwms/basic/hosp/type/filter")
     public BaseResponse filterBasicUnitMaintain(BasicHospTypeFilterRequest basicHospTypeFilterRequest, BindingResult bindingResult) {
 
@@ -122,10 +124,33 @@ public class BasicHospTypeController {
         return ResultVOUtils.success();
     }
 
+    @Resource
+    UdiRelevanceService udiRelevanceService;
+
     @GetMapping("/udiwms/basic/hosp/type/bindList")
     public BaseResponse bindList(FilterUdiRelRequest filterUdiRelRequest) {
 
+        if (StrUtil.isNotEmpty(filterUdiRelRequest.getUdiCode())) {
+            UdiEntity udiEntity = FilterUdiUtils.getUdi(filterUdiRelRequest.getUdiCode());
+            if (udiEntity != null) {
+                filterUdiRelRequest.setNameCode(udiEntity.getUdi());
+                filterUdiRelRequest.setUnionCode(udiEntity.getUdi());
+            }
+        }
+        //如果输入DI标识，精确找到不同层级对应的产品信息
+        if (StrUtil.isNotEmpty(filterUdiRelRequest.getUnionCode())) {
+            FilterUdiRelRequest filterUdiInfoRequest = new FilterUdiRelRequest();
+            filterUdiInfoRequest.setNameCode(filterUdiRelRequest.getUnionCode());
+            List<UdiRelevanceResponse> temps = udiRelevanceService.filterUdiGp(filterUdiInfoRequest);
+            if (temps != null && temps.size() > 0) {
+                filterUdiRelRequest.setOriginUuid(temps.get(0).getOriginUuid());
+                filterUdiRelRequest.setNameCode(filterUdiInfoRequest.getNameCode());
+                filterUdiRelRequest.setUnionCode(null);
+            }
+        } else {
+            //只查找主标识产品信息
             filterUdiRelRequest.setDiType(1);
+        }
         List<UdiRelevanceResponse> udiRelevanceResponses = basicHospTypeService.filterUdiGp(filterUdiRelRequest);
         PageInfo<UdiRelevanceResponse> pageInfo = new PageInfo<>(udiRelevanceResponses);
         PageSimpleResponse<UdiRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();

src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java

@@ -40,6 +40,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
@@ -681,7 +682,8 @@ public class UdiRelevanceController extends BaseController {
         if (udiProductEntity.getRelSupId() != null) {
             UdiRlSupEntity udiRlSupEntity = new UdiRlSupEntity();
             udiRlSupEntity.setUpdateTime(new Date());
-            udiRlSupEntity.setId(udiProductEntity.getId());
+            udiRlSupEntity.setPrice(new BigDecimal(udiProductEntity.getPrice()));
+            udiRlSupEntity.setId(udiProductEntity.getRelSupId());
             udiRlSupService.updateCompanyProductRelevance(udiRlSupEntity);
         }
         if (falg) {

src/main/java/com/glxp/api/res/thrsys/ThrProductsAddDiResponse.java

@@ -32,6 +32,10 @@ public class ThrProductsAddDiResponse extends ThrProductsAddDiEntity {
 
     private String companyName;
 
+    /**
+     * 规格型号
+     */
+    private String standard;
 
     private String price;
     private String basicPrductRemak1;

src/main/java/com/glxp/api/service/basic/UdiRlSupService.java

@@ -30,6 +30,8 @@ public interface UdiRlSupService {
 
     int updateCompanyProductRelevance(UdiRlSupEntity companyCertEntity);
 
+    int updateCompanyProductRelevanceByUdiFk(UdiRlSupEntity companyCertEntity);
+
     boolean insertCompanyProductRelevance(UdiRlSupEntity companyCertEntity);
 
     boolean deleteById(String id);

src/main/java/com/glxp/api/service/basic/impl/UdiRlSupServiceImpl.java

@@ -1,5 +1,6 @@
 package com.glxp.api.service.basic.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.dao.basic.UdiRlSupDao;
 import com.glxp.api.entity.basic.UdiRlSupEntity;
@@ -103,6 +104,13 @@ public class UdiRlSupServiceImpl implements UdiRlSupService {
         return udiRlSupDao.updateById(udiRlSupEntity);
     }
 
+    @Override
+    public int updateCompanyProductRelevanceByUdiFk(UdiRlSupEntity companyCertEntity) {
+        QueryWrapper<UdiRlSupEntity> ew=new QueryWrapper<>();
+        ew.eq("udiRlIdFk",companyCertEntity.getUdiRlIdFk());
+        return udiRlSupDao.update(companyCertEntity,ew);
+    }
+
     @Override
     public boolean insertCompanyProductRelevance(UdiRlSupEntity udiRlSupEntity) {
         return udiRlSupDao.insertCompanyProductRelevance(udiRlSupEntity);

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

@@ -38,6 +38,13 @@ public class ThrProductsAddDiServiceImpl implements ThrProductsAddDiService {
             PageHelper.offsetPage(offset, filterThrProductsRequest.getLimit());
         }
         List<ThrProductsAddDiResponse> thrProductsAddDiResponses = thrProductsAddDiDao.filterThrProductsList(filterThrProductsRequest);
+
+        if (CollUtil.isNotEmpty(thrProductsAddDiResponses)) {
+            thrProductsAddDiResponses.forEach(thrProductsAddDiResponse -> {
+                thrProductsAddDiResponse.setStandard(thrProductsAddDiResponse.getSpec());
+                thrProductsAddDiResponse.setZczbhhzbapzbh(thrProductsAddDiResponse.getRegisterNo());
+            });
+        }
         return thrProductsAddDiResponses;
     }
 
@@ -103,6 +110,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 +137,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/basic/UdiRelevanceDao.xml

@@ -407,6 +407,9 @@
             <if test="originUuid != null and originUuid != ''">
                 and originUuid = #{originUuid}
             </if>
+            <if test="manufactory != null and manufactory != ''">
+                and manufactory LIKE concat('%',#{manufactory},'%')
+            </if>
         </where>
         ORDER BY modifyTime DESC
     </select>

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

src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml

@@ -150,7 +150,8 @@
 
     <select id="filterThrProductsList" parameterType="com.glxp.api.req.thrsys.FilterThrProductsRequest"
             resultType="com.glxp.api.res.thrsys.ThrProductsAddDiResponse">
-        SELECT tdi.*, bc.name companyName
+        SELECT tdi.*,
+               bc.name        companyName
         FROM thr_products_add_di tdi
                  left join basic_corp bc on tdi.customerId = bc.erpId
         <where>