From f95a3de3946ec859eac31c3f4b9bf23c232a44d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com> Date: Mon, 27 Nov 2023 19:37:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=9F=E5=A7=8BBOM=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bomnew/pojo/entity/BomNewOriginalChildEntity.java | 7 +++++++ .../nflg/product/bomnew/pojo/vo/BaseMaterialVO.java | 6 ++++++ .../nflg/product/bomnew/pojo/vo/BomOriginalListVO.java | 3 +++ .../bomnew/service/BomNewOriginalParentService.java | 10 +++++++--- .../mapper/master/BomNewOriginalChildMapper.xml | 3 ++- .../resources/mapper/master/MaterialMainMapper.xml | 2 +- 6 files changed, 26 insertions(+), 5 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewOriginalChildEntity.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewOriginalChildEntity.java index 0243b95d..96d891a4 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewOriginalChildEntity.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewOriginalChildEntity.java @@ -106,6 +106,13 @@ public class BomNewOriginalChildEntity implements Serializable { @ApiModelProperty("创建人") private String createdBy; + /** + * 处理状态：1=待处理、2=已处理 + */ + @TableField(value = "edit_status") + @ApiModelProperty(value = "处理状态：1=待处理、2=已处理") + private Integer editStatus; + public BigDecimal getTotalWeight() { return NumberUtil.mul(this.getUnitWeight(), this.num); } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BaseMaterialVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BaseMaterialVO.java index a871cd6b..bbf3c6be 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BaseMaterialVO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BaseMaterialVO.java @@ -3,6 +3,8 @@ package com.nflg.product.bomnew.pojo.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * * @author 大米 @@ -11,6 +13,10 @@ import lombok.Data; @Data public class BaseMaterialVO { + + @ApiModelProperty("物料主数据行ID") + private List materialRowId; + @ApiModelProperty("物料编码") private String materialNo; diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomOriginalListVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomOriginalListVO.java index 2d9db8cd..45baf96f 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomOriginalListVO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomOriginalListVO.java @@ -1,6 +1,7 @@ package com.nflg.product.bomnew.pojo.vo; +import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -170,5 +171,7 @@ public class BomOriginalListVO extends BaseMaterialVO { + + private static final long serialVersionUID = 1L; } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java index e4487dba..6af58d85 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java @@ -76,7 +76,10 @@ public class BomNewOriginalParentService extends ServiceImpl getOriginalBomListPage(OriginalBomQuery query) { - return this.getBaseMapper().getOriginalBomListPage(new Page<>(query.getPage(), query.getPageSize()), query,SessionUtil.getUserCode()); + Page result = this.getBaseMapper().getOriginalBomListPage(new Page<>(query.getPage(), query.getPageSize()), query, SessionUtil.getUserCode()); + + materialMainService.intiMaterialInfo(result.getRecords()); + return result; } @@ -124,6 +127,7 @@ public class BomNewOriginalParentService extends ServiceImpl getChild(Long rowId) { + BomOriginalPlmParentEntity parent = originalPlmParentService.getBaseMapper().selectById(rowId); List parentChild = this.getBaseMapper().getParentChild(rowId); materialMainService.intiMaterialInfo(parentChild); if (CollUtil.isNotEmpty(parentChild)) { @@ -136,7 +140,6 @@ public class BomNewOriginalParentService extends ServiceImpl + - row_id, parent_row_id, order_number, drawing_no, material_no, material_name, material_desc, unit_weight, num, total_weight ,remark,created_by + row_id, parent_row_id, order_number, drawing_no, material_no, material_name, material_desc, unit_weight, num, total_weight ,remark,created_by ,edit_status diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/MaterialMainMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/MaterialMainMapper.xml index b291cff8..225616ea 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/MaterialMainMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/MaterialMainMapper.xml @@ -70,7 +70,7 @@