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 1/5] =?UTF-8?q?=E2=88=9A2=E3=80=81=E7=89=A9=E6=96=99?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=EF=BC=8C=E5=BC=B9=E7=AA=97=E5=8C=B9=E9=85=8D?= =?UTF-8?q?=E6=9C=80=E6=96=B0=E7=9A=84=E8=8B=B1=E6=96=87=E6=8F=8F=E8=BF=B0?= =?UTF-8?q?=20=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(); + } } From f1b0f1a9da89b9d60ee48150f439ea8fc5a1c28d Mon Sep 17 00:00:00 2001 From: 10001392 <1055202292@qq.com> Date: Thu, 26 Sep 2024 14:49:12 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E7=89=A9=E6=96=99=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E9=80=89=E5=A1=AB=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=20=E9=80=9A=E7=94=A8=E7=A8=8B=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/user/material/MaterialMainApi.java | 12 ++++++++++++ .../material/pojo/dto/MaterialMainDTO.java | 6 ++++++ .../pojo/entity/MaterialMainEntity.java | 7 +++++++ .../material/pojo/vo/MaterialMainVO.java | 6 ++++++ .../material/service/MaterialMainService.java | 18 ++++++++++++++++++ 5 files changed, 49 insertions(+) diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/api/user/material/MaterialMainApi.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/api/user/material/MaterialMainApi.java index c7f09d5b..3629c974 100644 --- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/api/user/material/MaterialMainApi.java +++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/api/user/material/MaterialMainApi.java @@ -403,6 +403,18 @@ public class MaterialMainApi extends BaseApi { return materialMainService.updateProjectType(paramDto); } + /** + * 更新 + * 申请人才允许更新 + * @param paramDto + * @return + */ + @PostMapping("updateGeneralLevel") + @ApiOperation("更新通用程度") + public ResultVO updateGeneralLevel(@RequestBody MaterialMainDTO paramDto) { + return materialMainService.updateGeneralLevel(paramDto); + } + /** * 手动执行计算推荐度 */ diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/dto/MaterialMainDTO.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/dto/MaterialMainDTO.java index 7206d25a..1190e0bf 100644 --- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/dto/MaterialMainDTO.java +++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/dto/MaterialMainDTO.java @@ -190,5 +190,11 @@ public class MaterialMainDTO implements Serializable { @ApiModelProperty(value = "申请部门") private String applyDeptName; + /** + * 通用程度 + */ + @ApiModelProperty("通用程度") + private String generalLevel; + private static final long serialVersionUID = 1L; } diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/entity/MaterialMainEntity.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/entity/MaterialMainEntity.java index 1ff6c005..ef684677 100644 --- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/entity/MaterialMainEntity.java +++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/entity/MaterialMainEntity.java @@ -369,6 +369,13 @@ public class MaterialMainEntity implements Serializable { @ApiModelProperty(value = "近两年使用量（新）") private BigDecimal twoYearsUsage; + /** + * 通用程度 + */ + @TableField(value = "general_level") + @ApiModelProperty("通用程度") + private String generalLevel; + private static final long serialVersionUID = 1L; } 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 f60446c2..b7d8aecf 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 @@ -441,6 +441,12 @@ public class MaterialMainVO implements Serializable { @ApiModelProperty(value = "项目类别") private String projectType; + /** + * 通用程度 + */ + @ApiModelProperty("通用程度") + private String generalLevel; + // 变更弹窗字段 start /** * 变更人 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 c52dd775..72c0b24b 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 @@ -2335,6 +2335,24 @@ public class MaterialMainService extends ServiceImpl updateGeneralLevel(MaterialMainDTO paramDto) { + // 暂且和更新项目类别权限一致 + if (!checkUpdateProjectTypeByDept(paramDto)) { + return ResultVO.error("无法更新本部门外申请物料的通用程度"); + } + MaterialMainEntity entity = new MaterialMainEntity(); + entity.setRowId(paramDto.getRowId()); + entity.setGeneralLevel(paramDto.getGeneralLevel()); + this.updateById(entity); + return ResultVO.success(); + } + /** * 通过部门判断是否有修改项目类别的权限，以下满足一个即可： * 1、自己申请的物料 From 775fbf15e273a194f373914ef0316a1b01b349a5 Mon Sep 17 00:00:00 2001 From: 10001392 <1055202292@qq.com> Date: Thu, 26 Sep 2024 17:19:57 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E7=89=A9=E6=96=99=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=EF=BC=8C=E9=87=87=E8=B4=AD=E5=A4=A7=E7=B1=BB=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nflg/product/material/service/MaterialExcelService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2c7d50eb..feda5cfa 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 @@ -558,7 +558,7 @@ public class MaterialExcelService { // 11、51 && 一次性物料，新申请，则运算起始时间为申请日期一年之后 if ((materialCategoryCode.startsWith("10") || materialCategoryCode.startsWith("50")) - && to.getReuseOfOnceState() == 1) { + && ObjectUtil.isNotEmpty(to.getReuseOfOnceState()) && to.getReuseOfOnceState() == 1) { Date startDate = Date.from(LocalDate.now().plusYears(1L).atStartOfDay().atZone(ZoneId.systemDefault()).toInstant()); to.setFreezeCalcStart(startDate); } From 9e83b3ab31cdb647cf421bfc7cdc8319385d0e7c Mon Sep 17 00:00:00 2001 From: 10001392 <1055202292@qq.com> Date: Tue, 8 Oct 2024 09:57:49 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E3=80=90=E7=89=A9=E6=96=99=E4=B8=BB?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E3=80=91=20=E2=88=9A1=E3=80=81=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E5=AF=BC=E5=85=A5=E4=B8=8B=E8=BD=BD=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E9=97=AE=E9=A2=98=20=E2=88=9A2=E3=80=81?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=8F=98=E6=9B=B4=E6=A8=A1=E6=9D=BF=EF=BC=8C?= =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E2=80=9C=E6=9B=BF=E4=BB=A3=E7=89=A9=E6=96=99?= =?UTF-8?q?=E2=80=9D=E6=98=AF=E5=90=A6=E4=BC=A0=E7=BB=99OA=E7=9A=84?= =?UTF-8?q?=E5=88=A4=E6=96=AD=20=E2=88=9A3=E3=80=81=E7=89=A9=E6=96=99?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=EF=BC=8C=E5=A6=82=E6=9E=9C=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=98=AF=E5=86=BB=E7=BB=93=E6=88=96=E5=AE=8C=E5=85=A8=E5=BC=83?= =?UTF-8?q?=E7=94=A8=EF=BC=8C=E6=98=BE=E7=A4=BA=E6=9C=80=E6=96=B0=E4=B8=80?= =?UTF-8?q?=E6=AC=A1=E5=8F=98=E6=9B=B4=E5=8E=9F=E5=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/user/material/MaterialUpdateBillApi.java | 15 +++++++++++++++ .../service/MaterialUpdateToOAService.java | 10 +++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) 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 1f9759cb..42785841 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 @@ -1,5 +1,7 @@ package com.nflg.product.material.api.user.material; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.convert.Convert; import com.baomidou.mybatisplus.core.metadata.IPage; import com.nflg.product.base.core.api.BaseApi; import com.nflg.product.base.core.exception.NflgBusinessException; @@ -209,4 +211,17 @@ public class MaterialUpdateBillApi extends BaseApi { public ResultVO materialUpdateBillService(@RequestParam("attrValueCn") String attrValueCn, @RequestParam("type") String type) { return materialUpdateBillService.materialUpdateBillService(attrValueCn, type); } + + @GetMapping("getCurrentUpdateReason") + @ApiOperation("获取最近一次变更情况") + public ResultVO getCurrentUpdateReason(@RequestParam("materialNo") String materialNo) { + List list = materialUpdateBillService.lambdaQuery() + .eq(MaterialUpdateBillEntity::getMaterialNo, materialNo) + .orderByDesc(MaterialUpdateBillEntity::getCreatedTime) + .list(); + if (CollectionUtil.isNotEmpty(list)) { + return ResultVO.success(Convert.convert(MaterialUpdateBillVO.class, list.get(0))); + } + return ResultVO.success(); + } } diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialUpdateToOAService.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialUpdateToOAService.java index 85714fad..7ef2cdd7 100644 --- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialUpdateToOAService.java +++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialUpdateToOAService.java @@ -101,9 +101,17 @@ public class MaterialUpdateToOAService { material.put("UPDATEREASON", u.getUpdateResion()); material.put("OLDMAKTX", u.getOldMaterialDesc()); material.put("OLDTYPEMAKTX", u.getOldCategoryNameTree()); + if (StringUtils.isNotEmpty(u.getReplaceMaterialNo())) { - material.put("Ftdwl", u.getReplaceMaterialNo()); + MaterialMainEntity materialMainEntity = materialMainService.lambdaQuery().eq(MaterialMainEntity::getMaterialNo, u.getMaterialNo()).one(); + MaterialMainEntity replaceMaterialMainEntity = materialMainService.lambdaQuery().eq(MaterialMainEntity::getMaterialNo, u.getReplaceMaterialNo()).one(); + boolean flag = Objects.nonNull(replaceMaterialMainEntity); + boolean flagJudge = materialMainEntity.getMaterialUnit().equals(replaceMaterialMainEntity.getMaterialUnit()); + if (flag && flagJudge) { + material.put("Ftdwl", u.getReplaceMaterialNo()); + } } + list.add(material); }); result.put("List", list); From 22bd790f3d89249a39d0cabdf4a009cc8c2bfcd4 Mon Sep 17 00:00:00 2001 From: 10001392 <1055202292@qq.com> Date: Tue, 8 Oct 2024 17:05:57 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E3=80=90=E7=89=A9=E6=96=99=E4=B8=BB?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E3=80=91=201=E3=80=81=E7=89=A9=E6=96=99?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=E8=AF=A6=E6=83=85=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=8E=9F=E7=89=A9=E6=96=99=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=202=E3=80=81hana=E6=9C=80=E8=BF=91=E9=87=87=E8=B4=AD=E4=BB=B7?= =?UTF-8?q?=E6=A0=BC=E5=85=AC=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nflg/product/material/pojo/vo/MaterialMainVO.java | 11 +++++++++++ .../product/material/service/MaterialMainService.java | 2 +- .../material/service/MaterialUpdateBillService.java | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) 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 b7d8aecf..0c8ffbf9 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 @@ -473,5 +473,16 @@ public class MaterialMainVO implements Serializable { @ApiModelProperty(value = "变更生效时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateEffectTime; + + /** + * 旧物料状态 1:正常 2:禁止采购 3:售后专用 4:冻结 5:完全弃用 + */ + @ApiModelProperty(value = "旧物料状态 1:正常(激活) 2:禁止采购 3:售后专用 4:禁用(冻结) 5:完全弃用") + @ExcelColumn("旧物料状态 1:禁用 0：启用") + private Integer oldMaterialState; + + @ApiModelProperty(value = "旧物料状态名称") + @ExcelColumn("旧物料状态名称") + private Integer oldMaterialStateName; // 变更弹窗字段 end } 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 72c0b24b..9cd8b8a0 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 @@ -1914,7 +1914,7 @@ public class MaterialMainService extends ServiceImpl