From 5cfc095c29c1d87525e2553e69dd879604316e9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 4 Jun 2024 17:03:33 +0800 Subject: [PATCH 1/6] =?UTF-8?q?feat(pbom):=20=E5=A2=9E=E5=8A=A0source?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/bomnew/pojo/entity/BomNewPbomChildEntity.java | 7 +++++++ .../product/bomnew/pojo/entity/BomNewPbomParentEntity.java | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewPbomChildEntity.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewPbomChildEntity.java index 23b5dd8c..f11d21f0 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewPbomChildEntity.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewPbomChildEntity.java @@ -232,6 +232,13 @@ public class BomNewPbomChildEntity implements Serializable { @ApiModelProperty("BOM-版本rowId(parent表rowId关联)") private Long bomVersionRowId; + /** + * 来源 1-ebom转换 2-dqbom转换 3-从SAP导入 + */ + @TableField(value = "source") + @ApiModelProperty(value = "来源 1-ebom转换 2-dqbom转换 3-从SAP导入") + private Integer source; + private static final long serialVersionUID = -76633783850936076L; } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewPbomParentEntity.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewPbomParentEntity.java index 5d922c23..08edaf96 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewPbomParentEntity.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewPbomParentEntity.java @@ -362,6 +362,13 @@ public class BomNewPbomParentEntity implements Serializable { @ApiModelProperty(value = "创建人所属部门rowId") private Long deptRowId; + /** + * 来源 1-ebom转换 2-dqbom转换 3-从SAP导入 + */ + @TableField(value = "source") + @ApiModelProperty(value = "来源 1-ebom转换 2-dqbom转换 3-从SAP导入") + private Integer source; + private static final long serialVersionUID = -31999878274445137L; } From 8719140089c4e845f6fabe88b1df140a5ce84377 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 4 Jun 2024 17:33:29 +0800 Subject: [PATCH 2/6] =?UTF-8?q?fix(ebom):=20=E5=B7=A5=E4=BD=9C=E8=A1=A8?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=97=B6=E5=8F=AA=E6=90=9C=E7=B4=A2=E8=8D=89?= =?UTF-8?q?=E7=A8=BF=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bomnew/mapper/master/BomNewEbomParentMapper.java | 2 +- .../product/bomnew/service/BomNewEbomParentService.java | 2 +- .../main/resources/mapper/master/BomNewEbomParentMapper.xml | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java index 77cf2477..e2991942 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java @@ -86,7 +86,7 @@ public interface BomNewEbomParentMapper extends BaseMapper getChildren(Long bomRowId, int type); - List getBom(String materialNo, String drawingNo); + List getBom(Integer state, String materialNo, String drawingNo); List getVOById(Long parentRowId); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java index 29355798..d3aeb713 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java @@ -2241,7 +2241,7 @@ public class BomNewEbomParentService extends ServiceImpl boms = this.getBaseMapper().getBom(query.getMaterialNo(), query.getDrawingNo()); + List boms = this.getBaseMapper().getBom(0, query.getMaterialNo(), query.getDrawingNo()); boms.removeIf(c -> Objects.equals(c.getLastVersionIs(), 0) || Objects.equals(c.getStatus(), EBomStatusEnum.PUBLISHED.getValue())); boms.forEach(this::buildChildren); roots.addAll(boms.stream().filter(b -> b.getRootIs() == 0 && b.getUserRootIs() == 0 && b.getRootIsForWaitReview() == 0).map(this::buildParent).flatMap(List::stream).collect(Collectors.toList())); diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml index cd42cfff..c46a8458 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml @@ -464,6 +464,12 @@ AND b.drawing_no = #{drawingNo} + + AND a.status < 4 + + + AND a.status = 4 + ORDER BY b.order_number From 16ddc6855b39c10366f77840e41434636777a7d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 5 Jun 2024 08:50:25 +0800 Subject: [PATCH 3/6] =?UTF-8?q?optimize(ebom):=20=E8=BD=ACpbom=E6=97=B6?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=BC=96=E8=BE=91=E7=8A=B6=E6=80=81=E4=B8=BA?= =?UTF-8?q?=E5=B7=B2=E5=A4=84=E7=90=86=EF=BC=8C=E5=90=8C=E6=97=B6=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E4=B8=8B=E7=BA=A7=E8=8A=82=E7=82=B9=E7=9A=84child?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=8A=B6=E6=80=81=E4=B8=BA=E5=B7=B2=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/bomnew/service/BomNewEbomParentService.java | 5 ----- .../resources/mapper/master/BomNewEbomParentMapper.xml | 9 +++++++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java index d3aeb713..0724a9c3 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java @@ -51,7 +51,6 @@ import java.io.OutputStream; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.*; -import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; import java.util.concurrent.ForkJoinPool; import java.util.concurrent.ForkJoinTask; @@ -946,10 +945,6 @@ public class BomNewEbomParentService extends ServiceImpl { - importToSAP(bomRowId); - }); } } diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml index c46a8458..18b0d035 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml @@ -309,10 +309,15 @@ - update t_bom_new_ebom_parent set status=#{status} , convert_to_ebom_time=now() where row_id in + update t_bom_new_ebom_parent set status=#{status} , convert_to_ebom_time=now(),edit_status=2,exception_status=1 + where row_id in #{item} - + ; + UPDATE t_bom_new_ebom_child SET edit_status=2 WHERE parent_row_id IN + + #{item} + ; From 0695f98d4c8046a3cb11786614302da3d97c4853 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 5 Jun 2024 09:59:22 +0800 Subject: [PATCH 4/6] =?UTF-8?q?optimize:=20=E7=BC=93=E5=AD=98=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/nflg/product/bomnew/api/user/CacheApi.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/CacheApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/CacheApi.java index a977cd9c..b308a548 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/CacheApi.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/CacheApi.java @@ -2,7 +2,6 @@ package com.nflg.product.bomnew.api.user; import cn.hutool.core.util.StrUtil; import com.nflg.product.base.core.api.BaseApi; -import com.nflg.product.base.core.conmon.util.SessionUtil; import com.nflg.product.bomnew.pojo.dto.CacheDTO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -65,6 +64,6 @@ public class CacheApi extends BaseApi { } private String buildKey(String key) { - return StrUtil.format("{}:{}:{}", PREFIX, SessionUtil.getUserCode(), key); + return StrUtil.format("{}:{}", PREFIX, key); } } From 114753d40dc9bc219c5ccb6f9a4a0949955d4033 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 5 Jun 2024 10:26:42 +0800 Subject: [PATCH 5/6] =?UTF-8?q?optimize:=20=E7=BC=93=E5=AD=98=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/nflg/product/bomnew/api/user/CacheApi.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/CacheApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/CacheApi.java index b308a548..3ff34aea 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/CacheApi.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/CacheApi.java @@ -22,7 +22,7 @@ import javax.validation.Valid; @RequestMapping("bom/new/cache") public class CacheApi extends BaseApi { - private static final String PREFIX = "frontend:"; + private static final String PREFIX = "frontend"; @Resource private RedisTemplate redisTemplate; From 8e30de33c4cf6d8c376191d052d2236fc49a83be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 5 Jun 2024 10:56:30 +0800 Subject: [PATCH 6/6] =?UTF-8?q?optimize:=20=E7=BC=93=E5=AD=98=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nflg/product/bomnew/api/user/CacheApi.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/CacheApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/CacheApi.java index 3ff34aea..82328cdc 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/CacheApi.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/CacheApi.java @@ -1,6 +1,7 @@ package com.nflg.product.bomnew.api.user; import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSON; import com.nflg.product.base.core.api.BaseApi; import com.nflg.product.bomnew.pojo.dto.CacheDTO; import io.swagger.annotations.Api; @@ -12,6 +13,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.Valid; +import java.util.Objects; /** * @author 曹鹏飞 @@ -29,13 +31,12 @@ public class CacheApi extends BaseApi { /** * 设置用户缓存 - * @param key 缓存key - * @param content 缓存内容 + * @param data 缓存数据 * @return */ @PostMapping("set") @ApiOperation("设置缓存") - public ResultVO setCache(@Valid @RequestBody CacheDTO data) { + public ResultVO setCache(@Valid @RequestBody CacheDTO data) { redisTemplate.boundValueOps(buildKey(data.key)).set(data.value); return ResultVO.success(); } @@ -48,17 +49,22 @@ public class CacheApi extends BaseApi { @GetMapping("get") @ApiOperation("获取缓存") public ResultVO getCache(@Valid @RequestParam @NonNull String key) { - return ResultVO.success(redisTemplate.boundValueOps(buildKey(key)).get()); + Object o = redisTemplate.boundValueOps(buildKey(key)).get(); + if (Objects.isNull(o)) { + return ResultVO.success(); + } else { + return ResultVO.success(JSON.toJSONString(o)); + } } /** * 删除用户缓存 - * @param key 缓存key + * @param data 缓存数据 * @return */ @DeleteMapping("del") @ApiOperation("删除缓存") - public ResultVO delCache(@Valid @RequestBody CacheDTO data) { + public ResultVO delCache(@Valid @RequestBody CacheDTO data) { redisTemplate.delete(buildKey(data.key)); return ResultVO.success(); }