Commit 59298a39 authored by 李驰骋's avatar 李驰骋

物料综合看板BUG修复

parent 9c98ce6a
......@@ -24,7 +24,7 @@ public class ErpDataDto {
InventoryTrend inventoryTrend;
@ApiModelProperty("销售出库计划")
List<SalesOutboundPlan> salesOutboundPlanList;
List<SalesOutboundPlan> salesOutboundPlanList=new ArrayList<>();
@Data
public static class InventoryTrend{
......@@ -42,7 +42,9 @@ public class ErpDataDto {
String outApplyNo;
@ApiModelProperty("产品名称")
String itemName;
@JsonFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty("产品名称")
String itemNo;
@JsonFormat(pattern = "yyyyMMdd")
@ApiModelProperty("计划出库时间")
Date planOutDate;
@ApiModelProperty("计划数量")
......
......@@ -52,7 +52,11 @@ public class KanbanMaterialService {
private ErpKanbanService erpKanbanService;
public ErpDataDto getErpData(){
return erpKanbanService.getMaterialStat().getData();
ErpDataDto rst = erpKanbanService.getMaterialStat().getData();
rst.getSalesOutboundPlanList().forEach(s->{
s.setItemName(s.getItemNo());
});
return rst;
}
public MesDataDto getMesData(){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment