资质证书校验问题相关修改

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

@@ -199,8 +199,6 @@ public class UdiContrastController {
         } else {
             return ResultVOUtils.error(500, "更新失败！");
         }
-
-
     }
 
 

src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java

@@ -763,7 +763,7 @@ public class IoCodeTempController extends BaseController {
             BaseResponse baseResponse = checkRelId(codeEnttity, unitFk);
 
             if (bussinessTypeEntity.getCheckCertExpire() == 2 && udiRelevanceResponse.isNeedCert()) {
-                SupProductEntity supProductEntity = supProductService.findByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory(), "");
+                SupProductEntity supProductEntity = supProductService.findExitByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory());
                 if (supProductEntity != null && (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS || supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE_PASS)) {
                     List<SupCertEntity> supCertEntities = supCertService.findByProductId(supProductEntity.getProductId());
                     if (CollUtil.isNotEmpty(supCertEntities)) {
@@ -774,9 +774,14 @@ public class IoCodeTempController extends BaseController {
                             }
                         }
                     }
+                } else {
+                    if (supProductEntity == null) {
+                        return ResultVOUtils.error(500, "产品资质证书未维护！");
                     } else {
                         return ResultVOUtils.error(500, "产品资质证书未通过审核！");
                     }
+
+                }
             }
 
             BaseResponse invRes = checkInv(bussinessTypeEntity, codeEnttity);

src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java

@@ -167,7 +167,7 @@ public class IoOrderDetailBizController extends BaseController {
             UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectSupGroupById(item.getRelId(), addBizProductReqeust.getSupId());
             BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction());
             if (bussinessTypeEntity.getCheckCertExpire() == 2 && udiRelevanceResponse.isNeedCert()) {
-                SupProductEntity supProductEntity = supProductService.findByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory(), "");
+                SupProductEntity supProductEntity = supProductService.findExitByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory());
 
                 if (supProductEntity != null && (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS || supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE_PASS)) {
                     List<SupCertEntity> supCertEntities = supCertService.findByProductId(supProductEntity.getProductId());

src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java

@@ -215,8 +215,11 @@ public class ThrProductsController {
 //                    udiProductEntity.setGgxh(thrProductsEntity.getStandard());
                 udiProductService.updateUdiInfo(udiProductEntity);
             }
-
         }
+
+
+        //todo  若产品信息
+
         return ResultVOUtils.success("修改成功！");
     }
 

src/main/java/com/glxp/api/dao/purchase/SupProductDao.java

@@ -30,4 +30,6 @@ public interface SupProductDao extends BaseMapperPlus<SupProductDao, SupProductE
     boolean deleteById(@Param("id") String id);
 
     boolean deleteByEnterpriseId(@Param("enterpriseId") String enterpriseId);
+
+    SupProductEntity findByManufactury(@Param("cpmctymc") String cpmctymc, @Param("manufactory") String manufactory);
 }

src/main/java/com/glxp/api/service/purchase/SupProductService.java

@@ -20,6 +20,8 @@ public interface SupProductService extends IService<SupProductEntity> {
 
     SupProductEntity findByManufactury(String cpmctymc, String manufactory, String manufacturerIdFk);
 
+    SupProductEntity findExitByManufactury(String cpmctymc, String manufactory);
+
     SupProductResponse findByPassByReCert(String registerCert);
 
     SupProductResponse findJoinRegistration(Long id);

src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java

@@ -102,6 +102,11 @@ public class SupProductServiceImpl extends ServiceImpl<SupProductDao, SupProduct
         else return null;
     }
 
+    @Override
+    public SupProductEntity findExitByManufactury(String cpmctymc, String manufactory) {
+        return supProductDao.findByManufactury(cpmctymc, manufactory);
+    }
+
     @Override
     public SupProductEntity findRegistrationByName(String recordProductName) {
         return supProductDao.findRegistrationByName(recordProductName);

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

@@ -389,4 +389,12 @@
         FROM sup_product
         WHERE enterpriseId = #{enterpriseId}
     </delete>
+    <select id="findByManufactury" parameterType="Map"
+            resultType="com.glxp.api.entity.purchase.SupProductEntity">
+        select sup_product.*
+        from sup_product
+                     INNER JOIN sup_manufacturer on sup_product.manufacturerIdFk = sup_manufacturer.manufacturerId
+        WHERE sup_manufacturer.companyName = #{manufactory}
+          and sup_product.recordProductName = #{cpmctymc}
+    </select>
 </mapper>

src/main/resources/schemas/schema_v2.1.sql

@@ -438,6 +438,6 @@ CALL Pro_Temp_ColumnWork('io_order', 'rmDeptCode', 'varchar(255)', 1);
 CALL Pro_Temp_ColumnWork('io_order', 'rmInvCode', 'varchar(255)', 1);
 
 CALL Pro_Temp_ColumnWork('io_order', 'outSickInfo', 'varchar(255)', 1);
-
+CALL Pro_Temp_ColumnWork('inv_inner_order_detail', 'nameCode', 'varchar(255)', 1);
 CALL Pro_Temp_ColumnWork('inv_inner_order_detail', 'nameCode',
                          'varchar(255) ', 1);