From 76870060450374f0e5c91b84cafa3ea21b5ea2a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Wed, 25 Sep 2024 15:04:21 +0800
Subject: [PATCH] =?UTF-8?q?bom-=E6=9F=A5=E7=9C=8B=E5=8F=98=E6=9B=B4?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/bomnew/api/user/BomReportApi.java | 12 ++++--
 .../product/bomnew/pojo/vo/UpdateLogVO.java   | 42 +++++++++++++++++++
 .../bomnew/service/ForwardReportService.java  |  5 +++
 3 files changed, 55 insertions(+), 4 deletions(-)
 create mode 100644 nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/UpdateLogVO.java

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomReportApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomReportApi.java
index f8c86720..1277b47d 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomReportApi.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomReportApi.java
@@ -21,12 +21,10 @@ import com.nflg.product.bomnew.util.EecExcelUtil;
 import com.nflg.product.bomnew.util.VUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import nflg.product.common.constant.STATE;
 import nflg.product.common.vo.ResultVO;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.ttzero.excel.entity.ListSheet;
 
 import javax.annotation.Resource;
@@ -127,6 +125,12 @@ public class BomReportApi extends BaseApi {
         return ResultVO.success(forwardReportService.factoryBomType(query));
     }
 
+    @PostMapping("getUpdateLog")
+    @ApiOperation("bom-变更记录（和上一版本对比）")
+    public ResultVO<List<UpdateLogVO>> getUpdateLog(@ApiParam("bom版本RowId") @RequestParam("bomRowId") Long bomRowId) {
+        return ResultVO.success(forwardReportService.getUpdateLog(bomRowId));
+    }
+
 
     @PostMapping("compareReport")
     @ApiOperation("bom-比对")
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/UpdateLogVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/UpdateLogVO.java
new file mode 100644
index 00000000..29b39741
--- /dev/null
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/UpdateLogVO.java
@@ -0,0 +1,42 @@
+package com.nflg.product.bomnew.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 版本变更-记录VO
+ */
+@Data
+public class UpdateLogVO {
+
+    @ApiModelProperty(value = "序号")
+    private String orderNumber;
+
+    @ApiModelProperty("项目类别")
+    private String projectType;
+
+    @ApiModelProperty("物料编码")
+    private String materialNo;
+
+    @ApiModelProperty("物料名称")
+    private String materialName;
+
+    @ApiModelProperty("物料描述")
+    private String materialDesc;
+
+    @ApiModelProperty(value = "数量")
+    private BigDecimal num;
+
+    @ApiModelProperty("单位")
+    private String materialUnit;
+
+    @ApiModelProperty("排序字符串")
+    private String orderStr;
+
+    @ApiModelProperty("操作类型")
+    private String  opType;
+
+
+}
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/ForwardReportService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/ForwardReportService.java
index d670d798..3806ff9b 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/ForwardReportService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/ForwardReportService.java
@@ -402,4 +402,9 @@ public class ForwardReportService {
     }
 
 
+    public List<UpdateLogVO>    getUpdateLog(Long bomRowId){
+
+    }
+
+
 }