From eaa71f78a08bae7c3472ef864fd481d8b733cb05 Mon Sep 17 00:00:00 2001 From: wangziyangyang <707231019@qq.com> Date: Tue, 9 Mar 2021 15:42:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=98=E7=89=B9=E5=9B=BE?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/controller/SpOrderController.java | 35 ++++++++----------- .../templates/order/production/list.ftl | 4 +-- 2 files changed, 17 insertions(+), 22 deletions(-) diff --git a/mes/src/main/java/com/wangziyang/mes/order/controller/SpOrderController.java b/mes/src/main/java/com/wangziyang/mes/order/controller/SpOrderController.java index 5550a08..f05c9f4 100644 --- a/mes/src/main/java/com/wangziyang/mes/order/controller/SpOrderController.java +++ b/mes/src/main/java/com/wangziyang/mes/order/controller/SpOrderController.java @@ -126,33 +126,28 @@ public class SpOrderController extends BaseController { @ResponseBody @RequestMapping(value = "/gantt/list", method = RequestMethod.POST, produces = "application/json") public Result getListGantt(Map params) throws Exception { + //刚特图总数据 List> result = new ArrayList<>(); + //具体的订单信息 for (int i = 0; i < 20; i++) { Map map = new HashMap<>(8); - map.put("id", "id" + (i + 1)); + Map value = new HashMap<>(8); + List> values = new ArrayList<>(); if (i % 2 == 0) { - map.put("name", "物料编码" + (i + 1)); - map.put("desc", "计划："); + map.put("id", "id" + (i + 1)); + map.put("name", "除湿器一线：工单号" + (i + 1)); + map.put("desc", "计划数量："); + value.put("from", "/Date(" + System.currentTimeMillis() + ")/"); + value.put("to", "/Date(" + (System.currentTimeMillis() + 2000000000) + ")/"); + value.put("label", "黑科除湿器"); + value.put("desc", "完工进度100%"); + value.put("customClass", "ganttGreen"); + value.put("dataObj", "1"); + values.add(value); } else { - map.put("desc", "实际："); + map.put("desc", "完工数量：0"); } map.put("cssClass", "redLabel"); - - List> values = new ArrayList<>(); - Map value = new HashMap<>(8); - value.put("from", "/Date(" + System.currentTimeMillis() + ")/"); - value.put("to", "/Date(" + (System.currentTimeMillis() + 1000000000) + ")/"); - value.put("label", "黑科除湿器"); - value.put("desc", "我的甘特图..."); - value.put("customClass", "ganttGreen"); - if (i == 1) { - value.put("customClass", "ganttOrange"); - } - if (i == 2) { - value.put("customClass", "ganttRed"); - } - value.put("dataObj", "1"); - values.add(value); map.put("values", values); result.add(map); } diff --git a/mes/src/main/resources/templates/order/production/list.ftl b/mes/src/main/resources/templates/order/production/list.ftl index fa90a97..71fcd2d 100644 --- a/mes/src/main/resources/templates/order/production/list.ftl +++ b/mes/src/main/resources/templates/order/production/list.ftl @@ -2,7 +2,7 @@ - 系统角色列表 + 派工界面 @@ -99,7 +99,7 @@ maxScale: "months", minScale: "days", waitText: "请稍后...", - itemsPerPage: 10, + itemsPerPage: 15, tnTitle1: '物料编码', tnTitle2: '计划/实际', onItemClick: function (data) {