物料综合看板BUG修复

mes/src/main/java/com/ximai/mes/kanban/dto/material/ErpDataDto.java

@@ -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("计划数量")

mes/src/main/java/com/ximai/mes/kanban/service/KanbanMaterialService.java

@@ -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(){