From ee340a3da3159fad86bde4437b42dd6600e317bc Mon Sep 17 00:00:00 2001
From: wangziyangyang <707231019@qq.com>
Date: Wed, 1 Jul 2020 18:09:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91=E7=94=9F=E4=BA=A7=E8=AE=A2?=
=?UTF-8?q?=E5=8D=95=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../order/controller/SpOrderController.java | 46 +-
.../static/lib/gantt/css/img/close.png | Bin 0 -> 1308 bytes
.../static/lib/gantt/css/img/grid.png | Bin 0 -> 122 bytes
.../static/lib/gantt/css/img/icon_sprite.png | Bin 0 -> 683 bytes
.../static/lib/gantt/css/img/loader_bg.png | Bin 0 -> 160 bytes
.../lib/gantt/css/img/slider_handle.png | Bin 0 -> 1041 bytes
.../resources/static/lib/gantt/css/style.css | 474 +++++
.../resources/static/lib/gantt/index.html | 180 ++
.../static/lib/gantt/js/jquery.fn.gantt.js | 1794 +++++++++++++++++
.../templates/order/production/list.ftl | 73 +-
10 files changed, 2561 insertions(+), 6 deletions(-)
create mode 100644 mes/src/main/resources/static/lib/gantt/css/img/close.png
create mode 100644 mes/src/main/resources/static/lib/gantt/css/img/grid.png
create mode 100644 mes/src/main/resources/static/lib/gantt/css/img/icon_sprite.png
create mode 100644 mes/src/main/resources/static/lib/gantt/css/img/loader_bg.png
create mode 100644 mes/src/main/resources/static/lib/gantt/css/img/slider_handle.png
create mode 100644 mes/src/main/resources/static/lib/gantt/css/style.css
create mode 100644 mes/src/main/resources/static/lib/gantt/index.html
create mode 100644 mes/src/main/resources/static/lib/gantt/js/jquery.fn.gantt.js
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 aca7b4e..c79e577 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
@@ -17,10 +17,12 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
*
@@ -120,4 +122,40 @@ public class SpOrderController extends BaseController {
iSpOrderService.removeById(req.getId());
return Result.success();
}
+
+ @ResponseBody
+ @RequestMapping(value = "/gantt/list", method = RequestMethod.POST, produces = "application/json")
+ public Result getListGantt(Map params) throws Exception {
+ List