From 7dd919b6934ca96d5f1add4d5707a85bb2a305ab Mon Sep 17 00:00:00 2001 From: anthonywj Date: Sun, 2 Apr 2023 18:21:27 +0800 Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=EF=BC=8C=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=EF=BC=8C=E6=8E=92=E5=BA=8F=E7=AD=89=E7=9B=B8=E5=85=B3=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/constant/Constant.java | 2 + .../basic/UdiRelevanceController.java | 8 ++- .../controller/basic/UdiRlSupController.java | 2 +- .../api/entity/basic/UdiProductEntity.java | 4 ++ .../glxp/api/entity/basic/UdiRlSupEntity.java | 70 ++++++++++++++++++- .../inout/impl/IoOrderServiceImpl.java | 5 ++ 6 files changed, 85 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/glxp/api/constant/Constant.java b/src/main/java/com/glxp/api/constant/Constant.java index 01695824..294d245a 100644 --- a/src/main/java/com/glxp/api/constant/Constant.java +++ b/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"; + /**前端页面查询相关单据类型标识*/ diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java index a55facd0..d341451f 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/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 { diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java index 3c6aaae2..5a2e04a3 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java +++ b/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("选入成功！"); } diff --git a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java index e408cc71..482f7195 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java +++ b/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; diff --git a/src/main/java/com/glxp/api/entity/basic/UdiRlSupEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiRlSupEntity.java index 74874e17..86194d5e 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiRlSupEntity.java +++ b/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; + + } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index d27e05fd..ecacc744 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/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; }