diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/api/user/material/MaterialDeadStockApi.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/api/user/material/MaterialDeadStockApi.java index 0ac4120c..41d59089 100644 --- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/api/user/material/MaterialDeadStockApi.java +++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/api/user/material/MaterialDeadStockApi.java @@ -59,7 +59,7 @@ public class MaterialDeadStockApi extends BaseApi { @PostMapping("saveDeadStock") @ApiOperation("保存呆滞库存记录") - public ResultVO saveDeadStock(@RequestBody List deadStockList){ + public ResultVO> saveDeadStock(@RequestBody List deadStockList){ return ResultVO.success(materialDeadStockService.saveDeadStock(deadStockList)); } diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/entity/MaterialDeadStockEntity.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/entity/MaterialDeadStockEntity.java index 84d90b50..615720c3 100644 --- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/entity/MaterialDeadStockEntity.java +++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/entity/MaterialDeadStockEntity.java @@ -1,9 +1,7 @@ package com.nflg.product.material.pojo.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; + import java.io.Serializable; import java.time.LocalDateTime; @@ -104,25 +102,25 @@ public class MaterialDeadStockEntity implements Serializable { /** * 创建人编码 */ - @TableField(value = "created_by") + @TableField(value = "created_by",fill = FieldFill.INSERT) private String createdBy; /** * 创建时间 */ - @TableField(value = "created_time") + @TableField(value = "created_time",fill = FieldFill.INSERT) private LocalDateTime createdTime; /** * 修改人编码 */ - @TableField(value = "update_by") + @TableField(value = "update_by",fill = FieldFill.UPDATE) private String updateBy; /** * 修改时间 */ - @TableField(value = "update_time") + @TableField(value = "update_time",fill = FieldFill.UPDATE) private LocalDateTime updateTime; @TableField(exist = false) diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/vo/MaterialDeadStockVo.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/vo/MaterialDeadStockVo.java index 446167bd..509f3bd3 100644 --- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/vo/MaterialDeadStockVo.java +++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/vo/MaterialDeadStockVo.java @@ -1,5 +1,6 @@ package com.nflg.product.material.pojo.vo; +import com.baomidou.mybatisplus.annotation.TableField; import com.nflg.product.material.pojo.sop.SopStockVo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -20,6 +21,15 @@ public class MaterialDeadStockVo implements Serializable { @ApiModelProperty(value = "rowId") private Long rowId; + @ApiModelProperty(value = "werks") + private String werks; + + @ApiModelProperty(value = "lgort") + private String lgort; + + @ApiModelProperty(value = "matnr") + private String matnr; + @ApiModelProperty(value = "事业部") private String deptName; @@ -40,4 +50,6 @@ public class MaterialDeadStockVo implements Serializable { @ApiModelProperty(value = "计划订单id") private String orderPlanId; + + } \ No newline at end of file diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialDeadStockService.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialDeadStockService.java index 14e73c4d..c74a8947 100644 --- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialDeadStockService.java +++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialDeadStockService.java @@ -48,7 +48,7 @@ public class MaterialDeadStockService extends ServiceImpl deadStockList){ + public List saveDeadStock(@RequestBody List deadStockList){ //采购组通知rtx Set purchaseSet = new HashSet<>(); deadStockList.forEach(deadStock -> { @@ -79,7 +79,7 @@ public class MaterialDeadStockService extends ServiceImpl orderPlanList(){