呆滞库存记录修改
This commit is contained in:
parent
890c1a8352
commit
b50abe81dd
|
|
@ -59,7 +59,7 @@ public class MaterialDeadStockApi extends BaseApi {
|
|||
|
||||
@PostMapping("saveDeadStock")
|
||||
@ApiOperation("保存呆滞库存记录")
|
||||
public ResultVO<Boolean> saveDeadStock(@RequestBody List<MaterialDeadStockEntity> deadStockList){
|
||||
public ResultVO<List<MaterialDeadStockEntity>> saveDeadStock(@RequestBody List<MaterialDeadStockEntity> deadStockList){
|
||||
return ResultVO.success(materialDeadStockService.saveDeadStock(deadStockList));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -48,7 +48,7 @@ public class MaterialDeadStockService extends ServiceImpl<MaterialDeadStockMapp
|
|||
private String profiles;
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public Boolean saveDeadStock(@RequestBody List<MaterialDeadStockEntity> deadStockList){
|
||||
public List<MaterialDeadStockEntity> saveDeadStock(@RequestBody List<MaterialDeadStockEntity> deadStockList){
|
||||
//采购组通知rtx
|
||||
Set<String> purchaseSet = new HashSet<>();
|
||||
deadStockList.forEach(deadStock -> {
|
||||
|
|
@ -79,7 +79,7 @@ public class MaterialDeadStockService extends ServiceImpl<MaterialDeadStockMapp
|
|||
.map(MaterialNoticeRtx::getRtx).collect(Collectors.joining(","));
|
||||
httpUtils.rtxMessage(profiles,title,msg,receiver);
|
||||
}
|
||||
return true;
|
||||
return deadStockList;
|
||||
}
|
||||
|
||||
public List<MaterialOrderPlanVo> orderPlanList(){
|
||||
|
|
|
|||
Loading…
Reference in New Issue