界面，查询，排序等相关问题修改

src/main/java/com/glxp/api/constant/Constant.java

@@ -215,6 +215,8 @@ public class Constant {
 
     public static final String ORDER_STATUS_INVOICE = "supInvoice";
 
+    public static final String ORDER_STATUS_INCODE = "supInCode";
+
     /**前端页面查询相关单据类型标识*/
 
 

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

@@ -188,7 +188,6 @@ public class UdiRelevanceController extends BaseController {
     }
 
 
-
     //资质证书选入产品列表  产品名称，生产企业过滤
     @AuthRuleAnnotation("")
     @GetMapping("/udi/cert/filterUdi")
@@ -667,8 +666,13 @@ public class UdiRelevanceController extends BaseController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-
         boolean falg = udiProductService.updateUdiInfoById(udiProductEntity);
+        if (udiProductEntity.getRelSupId() != null) {
+            UdiRlSupEntity udiRlSupEntity = new UdiRlSupEntity();
+            udiRlSupEntity.setUpdateTime(new Date());
+            udiRlSupEntity.setId(udiProductEntity.getId());
+            udiRlSupService.updateCompanyProductRelevance(udiRlSupEntity);
+        }
         if (falg) {
             return ResultVOUtils.success("更新成功");
         } else {

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

@@ -237,7 +237,7 @@ public class UdiRlSupController extends BaseController {
         udiRelevanceEntity.setLockStatus(1);
         udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
         UdiProductEntity udiProductEntity = new UdiProductEntity();
-        BeanUtils.copyProperties(udiInfoExportRequest.getSupplementRequest(),udiProductEntity);
+        BeanUtils.copyProperties(udiInfoExportRequest.getSupplementRequest(), udiProductEntity);
         udiProductService.insertUdiInfo(udiProductEntity);
         return ResultVOUtils.success("选入成功！");
     }

src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java

@@ -79,6 +79,9 @@ public class UdiProductEntity {
     private String supId;
 
 
+    private Integer relSupId;
+
+
     public Boolean getAllowNoBatch() {
         if (allowNoBatch == null)
             return false;
@@ -96,6 +99,7 @@ public class UdiProductEntity {
             return false;
         return allowNoProduct;
     }
+
     public Boolean getAllowNoSerial() {
         if (allowNoSerial == null)
             return false;

src/main/java/com/glxp/api/entity/basic/UdiRlSupEntity.java

@@ -1,5 +1,9 @@
 package com.glxp.api.entity.basic;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -9,21 +13,81 @@ import java.util.Date;
  * 供应商关联耗材字典表
  */
 @Data
+@TableName("company_product_relevance")
 public class UdiRlSupEntity {
 
+
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
+
+    /**
+     * 客户ID
+     */
+    @TableField(value = "customerId")
     private String customerId;
+
+    @TableField(value = "productId")
     private String productId;
+
+    @TableField(value = "enterpriseId")
     private String enterpriseId;
+
+    @TableField(value = "registrationId")
     private String registrationId;
+
+    /**
+     * 审核状态 1：通过，2：不通过，3：反审
+     */
+    @TableField(value = "auditStatus")
     private String auditStatus;
+
+    /**
+     * 产品UUID
+     */
+    @TableField(value = "productUuid")
     private String productUuid;
-    private String udiRlIdFk;
+
+    /**
+     * 基础信息维护表关联主键
+     */
+    @TableField(value = "udiRlIdFk")
+    private Long udiRlIdFk;
+
+    /**
+     * 往来单位ID外键
+     */
+    @TableField(value = "unitFk")
     private String unitFk;
+
+    /**
+     * 价格
+     */
+    @TableField(value = "price")
     private BigDecimal price;
 
-    private Date createTime;
+    /**
-    private Date updateTime;
+     * 创建人
+     */
+    @TableField(value = "`createUser`")
     private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime")
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    @TableField(value = "updateUser")
     private String updateUser;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime")
+    private Date updateTime;
+
+
 }

src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java

@@ -542,6 +542,11 @@ public class IoOrderServiceImpl implements IoOrderService {
                 filterOrderRequest.setStatuses(Arrays.asList(5, 10, 7));
                 filterOrderRequest.setDealStatuses(Arrays.asList(3, 4));
                 break;
+
+            case Constant.ORDER_STATUS_INCODE:
+                filterOrderRequest.setStatuses(Arrays.asList(1, 3, 5, 10, 7));
+                filterOrderRequest.setDealStatuses(Arrays.asList(1, 2, 3, 4));
+                break;
             default:
                 break;
         }