From 1b81a44e010578f325ddc19f08d009f8f740507a Mon Sep 17 00:00:00 2001 From: luoliming Date: Wed, 6 Dec 2023 21:59:28 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/bomnew/pojo/entity/BomNewOriginalChildEntity.java | 4 ++++ .../service/domain/OriginalBom/OriginalBomDetailTask.java | 3 ++- .../resources/mapper/master/BomNewOriginalChildMapper.xml | 3 ++- 3 files changed, 8 insertions(+), 2 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 b87c9a09..c0229e53 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 @@ -117,6 +117,10 @@ public class BomNewOriginalChildEntity implements Serializable { @ApiModelProperty(value = "处理状态：1=待处理、2=已处理") private Integer editStatus; + + @ApiModelProperty("状态 1=待转换、2=已转") + private Integer status; + 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/service/domain/OriginalBom/OriginalBomDetailTask.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomDetailTask.java index 6799a0f5..7c2921ec 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomDetailTask.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomDetailTask.java @@ -16,6 +16,7 @@ import lombok.Setter; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.concurrent.RecursiveTask; import java.util.stream.Collectors; @@ -92,7 +93,7 @@ public class OriginalBomDetailTask extends RecursiveTask result.addAll(bomDetail); if (CollUtil.isNotEmpty(bomDetail)) { - List collect = bomDetail.stream().filter(u -> u.getStatus().equals(1)).collect(Collectors.toList()); + List collect = bomDetail.stream().filter(u -> Objects.isNull(u.getStatus())|| u.getStatus().equals(1)).collect(Collectors.toList()); levelNumAdd(collect.size()); List childBowIds = bomDetail.stream().filter(u-> u.getChildBomRowId()!=null && u.getChildBomRowId() > 0).map(u->u.getChildBomRowId()).collect(Collectors.toList()); if(CollUtil.isNotEmpty(childBowIds)) { diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalChildMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalChildMapper.xml index 11bc5722..068010b4 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalChildMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalChildMapper.xml @@ -18,7 +18,8 @@ - + + From 5add5d42155a1b567e045e344a941ca2de993875 Mon Sep 17 00:00:00 2001 From: luoliming Date: Wed, 6 Dec 2023 23:29:38 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/bomnew/service/BomNewOriginalParentService.java | 4 ++-- .../bomnew/service/domain/OriginalBom/BaseConvert.java | 6 +++--- .../resources/mapper/master/BomNewOriginalParentMapper.xml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) 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 3b48f4ca..5208af32 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 @@ -155,8 +155,8 @@ public class BomNewOriginalParentService extends ServiceImpl - and created_time between #{query.startDate} and #{query.endDate} + and created_time between #{query.startDate} and DATE_ADD(#{query.endDate}, INTERVAL 1 DAY) From 6e39ab8e392565d475b03eb0bbcbd3af5d702e70 Mon Sep 17 00:00:00 2001 From: luoliming Date: Thu, 7 Dec 2023 00:01:52 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/master/BomNewOriginalParentMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalParentMapper.xml index d8ca5462..433adcbe 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalParentMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalParentMapper.xml @@ -69,7 +69,7 @@ From 056f9080931fe68fc1bae6c07f09b1bd3af3ed0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com> Date: Thu, 7 Dec 2023 09:47:56 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dexcel=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E7=BC=BA=E6=9D=90=E6=96=99=EF=BC=8C=E5=BA=8F=E5=8F=B7=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/bomnew/pojo/dto/BomNewOriginalExcelDTO.java | 1 + .../bomnew/pojo/entity/BomNewOriginalChildEntity.java | 7 ++++++- .../bomnew/service/BomNewOriginalParentService.java | 7 ++++++- .../bomnew/service/domain/OriginalBom/BaseConvert.java | 4 +++- .../resources/mapper/master/BomNewOriginalChildMapper.xml | 3 ++- 5 files changed, 18 insertions(+), 4 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/BomNewOriginalExcelDTO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/BomNewOriginalExcelDTO.java index b8697cbb..7d65549d 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/BomNewOriginalExcelDTO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/BomNewOriginalExcelDTO.java @@ -79,6 +79,7 @@ public class BomNewOriginalExcelDTO extends BaseImportExcelDTO { @ApiModelProperty("物料列表") private String materialCategoryCode; + public String getCreatedBy() { return SessionUtil.getUserCode(); } 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 c0229e53..5fee5768 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 @@ -117,10 +117,15 @@ public class BomNewOriginalChildEntity implements Serializable { @ApiModelProperty(value = "处理状态：1=待处理、2=已处理") private Integer editStatus; - + @TableField(value = "status") @ApiModelProperty("状态 1=待转换、2=已转") private Integer status; + + @TableField(value = "material_texture") + @ApiModelProperty("材料/材质") + private String materialTexture; + 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/service/BomNewOriginalParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java index 5208af32..884a33d9 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 @@ -401,6 +401,11 @@ public class BomNewOriginalParentService extends ServiceImpl chileds = excelContext.stream().filter(u -> u.getParentKey().equals(data.getLevelNo() + "-" + data.getRowNum())).collect(Collectors.toList()); if (CollUtil.isNotEmpty(chileds)) { + int i=1; + for (BomNewOriginalExcelDTO ch : chileds) { + ch.setOrderNo(i); + i++; + } convert.convertOriginalBomFromExcel(Convert.convert(BomOriginalPlmBomVO.class, data), Convert.toList(BomOriginalPlmBomVO.class, chileds)); if (CollUtil.isNotEmpty(convert.getResultParent())) { @@ -416,7 +421,7 @@ 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,created_time ,edit_status + row_id, parent_row_id, order_number, drawing_no, material_no, material_name, material_desc, unit_weight, num, total_weight ,remark,created_by,created_time ,edit_status ,material_texture