扫码单据资质证书校验

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

@@ -25,6 +25,7 @@ import com.glxp.api.entity.inout.*;
 import com.glxp.api.entity.inv.InvPreInProductDetailEntity;
 import com.glxp.api.entity.inv.InvPreProductDetailEntity;
 import com.glxp.api.entity.inv.InvPreinDetailEntity;
+import com.glxp.api.entity.purchase.SupProductEntity;
 import com.glxp.api.entity.system.SystemParamConfigEntity;
 import com.glxp.api.req.basic.CompanyProductRelevanceRequest;
 import com.glxp.api.req.inout.AddEnterCodeRequest;
@@ -147,6 +148,8 @@ public class IoCodeTempController extends BaseController {
         return ResultVOUtils.success("上传成功，等待后台处理");
     }
 
+    @Resource
+    SupProductService supProductService;
 
     //前端扫码完整性校验
     @AuthRuleAnnotation("")
@@ -751,15 +754,13 @@ public class IoCodeTempController extends BaseController {
 
             BaseResponse baseResponse = checkRelId(codeEnttity, unitFk);
 
-            //判断证书是否过期
-//            if (codeEnttity.getRelId() != null && bussinessTypeEntity.isCheckCertExpire()) {
-//
-//                SupProductEntity supProductEntity = supProductService.findByRelIdFk(codeEnttity.getRelId() + "");
-//                if(supProductEntity!=null){
-//
-//                }
-//                if (DateUtil.)
-//            }
+            if (bussinessTypeEntity.getCheckCertExpire() == 2 && udiRelevanceResponse.isNeedCert()) {
+                SupProductEntity supProductEntity = supProductService.findByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory(), "");
+                if (supProductEntity != null && (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS || supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE_PASS)) {
+                } else {
+                    return ResultVOUtils.error(500, "产品资质证书未通过审核！");
+                }
+            }
 
             BaseResponse invRes = checkInv(bussinessTypeEntity, codeEnttity);
             if (invRes != null) {

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

@@ -163,18 +163,14 @@ public class IoOrderDetailBizController extends BaseController {
         }
         for (AddBizProductReqeust item : datas) {
             UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectSupGroupById(item.getRelId(), addBizProductReqeust.getSupId());
-
-//            todo 查询产品是否已经通过认证
             BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction());
             if (bussinessTypeEntity.getCheckCertExpire() == 2 && udiRelevanceResponse.isNeedCert()) {
                 SupProductEntity supProductEntity = supProductService.findByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory(), "");
                 if (supProductEntity != null && (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS || supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE_PASS)) {
-
                 } else {
                     return ResultVOUtils.error(500, "产品资质证书未通过审核！");
                 }
             }
-
             if (bussinessTypeEntity.isVailDispatch()) {
                 if (!udiRelevanceResponse.isDispatch()) {
                     return ResultVOUtils.error(500, "该产品不可配送，请联系院方！");