From 582ccdc66a19187c82a45b89c9ba8757b59e71e6 Mon Sep 17 00:00:00 2001 From: 10001392 <1055202292@qq.com> Date: Thu, 26 Sep 2024 08:48:26 +0800 Subject: [PATCH] =?UTF-8?q?=E2=88=9A2=E3=80=81=E7=89=A9=E6=96=99=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=EF=BC=8C=E5=BC=B9=E7=AA=97=E5=8C=B9=E9=85=8D=E6=9C=80?= =?UTF-8?q?=E6=96=B0=E7=9A=84=E8=8B=B1=E6=96=87=E6=8F=8F=E8=BF=B0=20?= =?UTF-8?q?=E2=88=9A3=E3=80=81=E7=89=A9=E6=96=99=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=EF=BC=8C=E5=BC=B9=E7=AA=97=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=9A=E5=8F=98=E6=9B=B4=E4=BA=BA=E3=80=81=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E3=80=81=E7=94=B3=E8=AF=B7=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E3=80=81=E5=8F=98=E6=9B=B4=E7=94=9F=E6=95=88?= =?UTF-8?q?=E6=97=B6=E9=97=B4=204=E3=80=81=E7=89=A9=E6=96=99=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=EF=BC=8C=E5=A2=9E=E5=8A=A0=E9=80=89=E5=A1=AB=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=20=E9=80=9A=E7=94=A8=E7=A8=8B=E5=BA=A6=EF=BC=9B?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=A1=B9=E7=9B=AE=E7=B1=BB=E5=88=AB=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/material/MaterialUpdateBillApi.java | 11 ++++++ .../material/pojo/vo/MaterialMainVO.java | 30 ++++++++++++++++ .../service/MaterialExcelService.java | 4 +-- .../material/service/MaterialMainService.java | 10 +++--- .../service/MaterialUpdateBillService.java | 36 +++++++++++++++++-- 5 files changed, 82 insertions(+), 9 deletions(-) diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/api/user/material/MaterialUpdateBillApi.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/api/user/material/MaterialUpdateBillApi.java index 244adbae..1f9759cb 100644 --- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/api/user/material/MaterialUpdateBillApi.java +++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/api/user/material/MaterialUpdateBillApi.java @@ -6,6 +6,7 @@ import com.nflg.product.base.core.exception.NflgBusinessException; import com.nflg.product.material.pojo.dto.MaterialStateUpExcelDTO; import com.nflg.product.material.pojo.dto.MaterialUpdateBillDTO; import com.nflg.product.material.pojo.dto.TwentyMaterialTemplateExcelDTO; +import com.nflg.product.material.pojo.entity.MaterialAttrValueI18nEntity; import com.nflg.product.material.pojo.entity.MaterialUpdateBillEntity; import com.nflg.product.material.pojo.entity.MaterialUpdateImportTaskEntity; import com.nflg.product.material.pojo.query.MaterialUpdateBillQuery; @@ -198,4 +199,14 @@ public class MaterialUpdateBillApi extends BaseApi { public ResultVO> getMaterialUpdateImportTaskList() { return ResultVO.success(materialUpdateBillService.getMaterialUpdateImportTaskList()); } + + /** + * 获取制作物料名称国际化表 + * @param + */ + @GetMapping("getI18nForUpdate") + @ApiOperation("获取制作物料名称国际化表") + public ResultVO materialUpdateBillService(@RequestParam("attrValueCn") String attrValueCn, @RequestParam("type") String type) { + return materialUpdateBillService.materialUpdateBillService(attrValueCn, type); + } } diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/vo/MaterialMainVO.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/vo/MaterialMainVO.java index d0989b84..f60446c2 100644 --- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/vo/MaterialMainVO.java +++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/vo/MaterialMainVO.java @@ -1,6 +1,7 @@ package com.nflg.product.material.pojo.vo; import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.nflg.product.material.pojo.dto.MaterialMainAttrDTO; import com.nflg.product.material.pojo.entity.MaterialFilesEntity; import io.swagger.annotations.ApiModel; @@ -12,6 +13,7 @@ import org.ttzero.excel.annotation.ExcelColumn; import java.io.Serializable; import java.time.LocalDateTime; import java.util.ArrayList; +import java.util.Date; import java.util.List; /** @@ -438,4 +440,32 @@ public class MaterialMainVO implements Serializable { */ @ApiModelProperty(value = "项目类别") private String projectType; + + // 变更弹窗字段 start + /** + * 变更人 + */ + @ApiModelProperty(value = "变更人") + private String updateCreatedByName; + + /** + * 变更部门 + */ + @ApiModelProperty(value = "变更部门") + private String updateApplyDeptName; + + /** + * 申请变更时间 + */ + @ApiModelProperty(value = "申请变更时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date updateCreatedTime; + + /** + * 变更生效时间 + */ + @ApiModelProperty(value = "变更生效时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date updateEffectTime; + // 变更弹窗字段 end } diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialExcelService.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialExcelService.java index 73418531..2c7d50eb 100644 --- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialExcelService.java +++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialExcelService.java @@ -238,8 +238,8 @@ public class MaterialExcelService { throw new NflgBusinessException(STATE.ParamErr, StrUtil.join(",", diff).concat("分类代码在系统中不存在")); } - // 校验项目类别 - checkProjectType(datas); +// // 校验项目类别 +// checkProjectType(datas); //验证21 物料 check21Droring(datas); diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialMainService.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialMainService.java index 05057f9a..c52dd775 100644 --- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialMainService.java +++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialMainService.java @@ -1325,10 +1325,10 @@ public class MaterialMainService extends ServiceImpl projectTypeResult = checkProjectType(materialCategoryEntity.getRelCategoryCode(), paramDto); - if (Objects.nonNull(projectTypeResult)) { - return projectTypeResult; - } +// ResultVO projectTypeResult = checkProjectType(materialCategoryEntity.getRelCategoryCode(), paramDto); +// if (Objects.nonNull(projectTypeResult)) { +// return projectTypeResult; +// } // 工具工装，只验证图号是否重名，不验证前缀 if (materialCategoryEntity.getRelCategoryCode().equals(MaterialRelCategoryCodeEnum.relCategoryCode_71.getRelCategoryCode())) { @@ -1602,7 +1602,7 @@ public class MaterialMainService extends ServiceImpl getMaterialUpdateImportTaskList() { return materialUpdateImportTaskMapper.getMaterialUpdateImportTaskList(SessionUtil.getUserCode()); } + + public ResultVO materialUpdateBillService(String attrValueCn, String type) { + // 查询制作物料英文 + if ("20".equals(type)) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(MaterialAttrValueI18n21Entity::getAttrValueCn, attrValueCn).eq(MaterialAttrValueI18n21Entity::getEnableState, 1); + MaterialAttrValueI18n21Entity i18n21Entity = materialAttrValueI18n21Mapper.selectOne(queryWrapper); + return ResultVO.success(Convert.convert(MaterialAttrValueI18nEntity.class, i18n21Entity)); + } else { + // 查询采购物料英文 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(MaterialAttrValueEntity::getAttrRowId, 1).eq(MaterialAttrValueEntity::getAttrValueName, attrValueCn); + MaterialAttrValueEntity materialAttrValueEntity = materialAttrValueMapper.selectOne(queryWrapper); + if (ObjectUtil.isNotEmpty(materialAttrValueEntity)) { + LambdaQueryWrapper i18nQueryWrapper = new LambdaQueryWrapper<>(); + i18nQueryWrapper.eq(MaterialAttrValueI18nEntity::getAttrValueRowId, materialAttrValueEntity.getRowId()); + return ResultVO.success(materialAttrValueI18nMapper.selectOne(i18nQueryWrapper)); + } + } + return ResultVO.success(); + } }