From 5b53ccc3d0e46773c3fa58751935df331d562af4 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期三, 12 一月 2022 21:25:24 +0800
Subject: [PATCH] 改完项目管理和项目节点管理功能
---
src/main/webapp/static/js/projectPlan/projectPlan.js | 4
src/main/java/zy/cloud/wms/manager/controller/CstmrController.java | 20 +
src/main/java/zy/cloud/wms/manager/entity/FlowsDTO.java | 15
src/main/java/zy/cloud/wms/manager/entity/ProjectPlan.java | 28 +
src/main/java/zy/cloud/wms/manager/controller/FlowStatusController.java | 17
src/main/webapp/views/item/item.html | 45 ++
src/main/webapp/static/js/diff/diff.js | 277 +++++++++++++++
src/main/java/zy/cloud/wms/manager/service/ItemService.java | 1
src/main/webapp/static/js/flowStatus/flowStatus.js | 6
src/main/webapp/views/flowStatus/flowStatus.html | 6
src/main/java/zy/cloud/wms/manager/service/impl/ItemServiceImpl.java | 40 ++
src/main/java/zy/cloud/wms/manager/entity/Item.java | 31 +
src/main/java/zy/cloud/wms/manager/controller/ItemController.java | 52 +-
src/main/java/zy/cloud/wms/manager/entity/ItemsDTO.java | 16
src/main/webapp/static/js/cool.js | 3
src/main/java/zy/cloud/wms/manager/controller/ProjectTypeController.java | 19 +
src/main/webapp/views/diff/diff.html | 191 ++++++++++
src/main/resources/mapper/ItemMapper.xml | 1
src/main/java/zy/cloud/wms/manager/mapper/ItemMapper.java | 4
src/main/java/zy/cloud/wms/system/controller/UserController.java | 33
src/main/java/zy/cloud/wms/manager/entity/FlowStatus.java | 17
src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java | 149 +++++++-
src/main/webapp/views/projectPlan/projectPlan.html | 38 +
src/main/webapp/static/js/item/item.js | 8
24 files changed, 915 insertions(+), 106 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/CstmrController.java b/src/main/java/zy/cloud/wms/manager/controller/CstmrController.java
index 44e6716..348b897 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/CstmrController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/CstmrController.java
@@ -131,4 +131,24 @@
return R.ok();
}
+ /**
+ * 杩斿洖缁欏墠绔偣鍑讳笅鎷夋鐨勬暟鎹�
+ * @return
+ */
+ @RequestMapping("/cstmrUuid/auth")
+ public R cstmrUuid(){
+ List<Cstmr> cstmrs = cstmrService.selectList(null);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (Cstmr cstmr : cstmrs) {
+ Map<String,Object> content = new HashMap<>();
+ content.put("id",cstmr.getId());
+ content.put("value",cstmr.getName());
+ result.add(content);
+ }
+
+
+
+ return R.ok(result);
+ }
+
}
diff --git a/src/main/java/zy/cloud/wms/manager/controller/FlowStatusController.java b/src/main/java/zy/cloud/wms/manager/controller/FlowStatusController.java
index 696796d..047a228 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/FlowStatusController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/FlowStatusController.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
+import zy.cloud.wms.manager.entity.Cstmr;
import zy.cloud.wms.manager.entity.FlowStatus;
import zy.cloud.wms.manager.service.FlowStatusService;
import com.core.annotations.ManagerAuth;
@@ -123,4 +124,20 @@
return R.ok();
}
+ /**
+ * 鍗曞嚮input涔嬪悗寮瑰嚭鐨勯�夋嫨妗�
+ * @return
+ */
+ @RequestMapping("/flowId/auth")
+ public R getAllFlowIds(){
+ List<FlowStatus> flowStatuses = flowStatusService.selectList(null);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (FlowStatus flowStatus : flowStatuses) {
+ Map<String,Object> content = new HashMap<>();
+ content.put("id",flowStatus.getId());
+ content.put("value",flowStatus.getName());
+ result.add(content);
+ }
+ return R.ok(result);
+ }
}
diff --git a/src/main/java/zy/cloud/wms/manager/controller/ItemController.java b/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
index 5644309..c8ee4df 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
@@ -10,14 +10,17 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.core.exception.CoolException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import zy.cloud.wms.common.web.BaseController;
import zy.cloud.wms.manager.entity.Cstmr;
import zy.cloud.wms.manager.entity.Item;
+import zy.cloud.wms.manager.entity.ProjectPlan;
import zy.cloud.wms.manager.entity.ProjectType;
import zy.cloud.wms.manager.service.CstmrService;
import zy.cloud.wms.manager.service.ItemService;
+import zy.cloud.wms.manager.service.ProjectPlanService;
import zy.cloud.wms.manager.service.ProjectTypeService;
import java.util.*;
@@ -28,9 +31,7 @@
@Autowired
private ItemService itemService;
@Autowired
- private CstmrService cstmrService;
- @Autowired
- private ProjectTypeService projectTypeService;
+ private ProjectPlanService planService;
@RequestMapping(value = "/item/{id}/auth")
@ManagerAuth
@@ -49,6 +50,7 @@
excludeTrash(param);
convert(param, wrapper);
hostEq(wrapper);
+ wrapper.orderBy("status",false);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
return R.ok(itemService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -73,19 +75,14 @@
if (Cools.isEmpty(item)) {
return R.error("鍙傛暟涓虹┖,璇疯仈绯荤鐞嗗憳");
}
- Cstmr user_code = cstmrService.selectOne(new EntityWrapper<Cstmr>()
- .eq("user_code", item.getCstmrUuid()));
- if (!Cools.isEmpty(user_code)) {
- item.setCstmr(user_code.getName());
- }else {
- return R.error("鍙傛暟閿欒,璇疯緭鍏ユ纭殑瀹㈡埛缂栧彿");
+
+ if (!item.getType().equals("1")) {
+ throw new CoolException("鐩墠浠呮敮鎸侀泦鎴愰」鐩�");
}
- ProjectType id = projectTypeService.selectOne(new EntityWrapper<ProjectType>()
- .eq("id", item.getType()));
- if (!Cools.isEmpty(id)) {
- item.setType(id.getTypeName());
- }else {
- return R.error("鍙傛暟閿欒,鎵句笉鍒拌椤圭洰绫诲瀷");
+ Item name = itemService.selectOne(new EntityWrapper<Item>()
+ .eq("name", item.getName()));
+ if (!Cools.isEmpty(name)) {
+ throw new CoolException("涓嶅彲鏈夐噸澶嶉」鐩悕");
}
item.setHostId(getHostId());
@@ -94,7 +91,7 @@
item.setStatus(1);
item.setUpdateBy(getUserId());
item.setUpdateTime(new Date());
- itemService.insert(item);
+ itemService.insertAll(item);
return R.ok();
}
@@ -104,23 +101,10 @@
if (Cools.isEmpty(item)) {
return R.error("鍙傛暟涓虹┖,璇疯仈绯荤鐞嗗憳");
}
- Cstmr user_code = cstmrService.selectOne(new EntityWrapper<Cstmr>()
- .eq("user_code", item.getCstmrUuid()));
- if (!Cools.isEmpty(user_code)) {
- item.setCstmr(user_code.getName());
- }else {
- return R.error("鍙傛暟閿欒,璇疯緭鍏ユ纭殑瀹㈡埛缂栧彿");
+
+ if (!item.getType().equals("1")) {
+ throw new CoolException("鐩墠浠呮敮鎸侀泦鎴愰」鐩�");
}
- ProjectType id = projectTypeService.selectOne(new EntityWrapper<ProjectType>()
- .eq("id", item.getType()));
- if (!Cools.isEmpty(id)) {
- item.setType(id.getTypeName());
- }else {
- return R.error("鍙傛暟閿欒,鎵句笉鍒拌椤圭洰绫诲瀷");
- }
-// if (Cools.isEmpty(item) || null==item.getUuid()){
-// return R.error();
-// }
item.setUpdateBy(getUserId());
item.setUpdateTime(new Date());
itemService.updateById(item);
@@ -130,10 +114,14 @@
@RequestMapping(value = "/item/delete/auth")
@ManagerAuth
public R delete(@RequestParam("ids[]") String param){
+
if (param != null){
itemService.delete(new EntityWrapper<Item>()
.eq("id",param));
+ planService.delete(new EntityWrapper<ProjectPlan>()
+ .eq("item_id",param));
}
+
// List<Item> list = JSONArray.parseArray(param, Item.class);
// if (Cools.isEmpty(list)){
// return R.error();
diff --git a/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java b/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
index 4f48cf5..ce70745 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
@@ -1,16 +1,12 @@
package zy.cloud.wms.manager.controller;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
import com.core.exception.CoolException;
-import zy.cloud.wms.manager.entity.FlowStatus;
-import zy.cloud.wms.manager.entity.Item;
-import zy.cloud.wms.manager.entity.Node;
-import zy.cloud.wms.manager.entity.ProjectPlan;
+import zy.cloud.wms.manager.entity.*;
import zy.cloud.wms.manager.service.FlowStatusService;
import zy.cloud.wms.manager.service.ItemService;
import zy.cloud.wms.manager.service.ProjectPlanService;
@@ -40,6 +36,8 @@
return R.ok(projectPlanService.selectById(String.valueOf(id)));
}
+
+
@RequestMapping(value = "/projectPlan/list/auth")
@ManagerAuth
public R list(@RequestParam(defaultValue = "1") Integer curr,
@@ -55,6 +53,7 @@
excludeTrash(param);
convert(param, wrapper);
wrapper.orderBy("weight_num");
+
// if (!Cools.isEmpty(orderByField)) {
// wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
// }
@@ -106,25 +105,10 @@
return R.error();
}
- ProjectPlan checkExist = projectPlanService.selectOne(new EntityWrapper<ProjectPlan>()
- .eq("item_id", projectPlan.getItemId())
- .eq("weight_num", projectPlan.getWeightNum()));
- if (!Cools.isEmpty(checkExist)) {
- throw new CoolException("鏉冮噸鍊煎啿绐�,璇锋鏌�");
- }
- FlowStatus id = flowStatusService.selectOne(new EntityWrapper<FlowStatus>()
- .eq("id", projectPlan.getFlowId()));
- if (!Cools.isEmpty(id)) {
- projectPlan.setFlowName(id.getName());
- }else {
- throw new CoolException("鏃犳硶閫氳繃鑺傜偣ID鎵惧埌瀵瑰簲鑺傜偣");
- }
projectPlan.setModifyTime(new Date());
projectPlan.setModifyId(getUserId());
- projectPlanService.update(projectPlan,new EntityWrapper<ProjectPlan>()
- .eq("item_id",projectPlan.getItemId())
- .eq("weight_num",projectPlan.getWeightNum()));
-// projectPlanService.updateById(projectPlan);
+
+ projectPlanService.updateById(projectPlan);
return R.ok();
}
@@ -174,10 +158,12 @@
return R.ok();
}
+
@RequestMapping("/projectPlan/allProjects")
public R allProjects() {
- List<Item> items = itemService.selectList(null);
+ List<Item> items = itemService.selectList(new EntityWrapper<Item>()
+ .eq("status","1"));
List<Map<String, Object>> result = new ArrayList<>();
for (Item item : items) {
@@ -190,4 +176,121 @@
}
+ /**
+ * 鑾峰彇寤舵湡椤圭洰
+ * @param curr
+ * @param limit
+ * @param orderByField
+ * @param orderByType
+ * @param param
+ * @return
+ */
+
+ @RequestMapping("/projectPlan/diffProjects")
+ public R diffProjects(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param){
+ String name = (String) param.get("id");
+
+ Wrapper<ProjectPlan> condition = new EntityWrapper<ProjectPlan>();
+ if (!Cools.isEmpty(name)) {
+ Item targetItem = itemService.selectOne(new EntityWrapper<Item>()
+ .like("name", name));
+
+ if (!Cools.isEmpty(targetItem)) {
+
+ condition
+ .eq("item_id",targetItem.getId())
+ .and()
+ .gt("delay", 0)
+ .or()
+ .isNotNull("delay_reason")
+ .and()
+ .ne("delay_reason", "")
+ .and()
+ .eq("item_id",targetItem.getId());
+ }else {
+ return R.ok(new Page<>(curr,limit));
+ }
+
+ }else {
+ condition
+ .gt("delay", 0)
+ .or()
+ .isNotNull("delay_reason")
+ .and()
+ .ne("delay_reason", "");
+ }
+ Page<ProjectPlan> projectPlanPage = projectPlanService.selectPage(new Page<>(curr, limit), condition);
+ return R.ok(projectPlanPage);
+ }
+
+ /**
+ * 鎵撳嵃鏂规硶
+ * @param param
+ * @return
+ */
+ @RequestMapping("/projectPlan/diffProjects/export")
+ public R diffExport(@RequestBody JSONObject param){
+
+// EntityWrapper<ProjectPlan> wrapper = new EntityWrapper<>();
+// hostEq(wrapper);
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+// Map<String, Object> map = excludeTrash(param.getJSONObject("item"));
+// convert(map, wrapper);
+// List<ProjectPlan> projectPlans = projectPlanService.selectList(wrapper);
+
+ Wrapper<ProjectPlan> condition = new EntityWrapper<ProjectPlan>()
+ .gt("delay", 0)
+ .or()
+ .isNotNull("delay_reason")
+ .and()
+ .ne("delay_reason", "");
+ List<ProjectPlan> projectPlans = projectPlanService.selectList(condition);
+ return R.ok(exportSupport(projectPlans, fields));
+ }
+
+ /**
+ * 杩斿洖鎵�鏈夎妭鐐圭被鍨嬬粰灏忔潹鍐欑殑鍓嶇
+ * @return
+ */
+ @RequestMapping("/projectPlan/flowStatus")
+ public R flowStatus(){
+ EntityWrapper<FlowStatus> wrapper = new EntityWrapper<>();
+ wrapper.orderBy("weight_num");
+ List<FlowStatus> flowStatuses = flowStatusService.selectList(wrapper);
+
+ return R.ok().add(flowStatuses);
+ }
+
+ /**
+ * 杩斿洖缁欏皬鏉ㄥ墠绔暟鎹�
+ * @return
+ */
+ @RequestMapping("/projectPlan/toFront")
+ public R toFront(){
+ List<Item> items = itemService.selectList(new EntityWrapper<Item>()
+ .eq("status","1"));
+ List<ItemsDTO> itemsDTOs = new ArrayList<>();
+ for (Item item : items) {
+ ItemsDTO itemsDTO = new ItemsDTO();
+
+ itemsDTO.setId(item.getName());
+ itemsDTO.setStartDay(item.getStartTime());
+ itemsDTO.setEndDay(item.getEndTime());
+ List<ProjectPlan> allPlans = projectPlanService.selectList(new EntityWrapper<ProjectPlan>()
+ .eq("item_id", item.getId()));
+ for (ProjectPlan projectPlan : allPlans) {
+ projectPlan.setFlowName(projectPlan.getFlowId$());
+ }
+
+ itemsDTO.setNodes(allPlans);
+ itemsDTOs.add(itemsDTO);
+ }
+ return R.ok().add(itemsDTOs);
+ }
+
+
}
diff --git a/src/main/java/zy/cloud/wms/manager/controller/ProjectTypeController.java b/src/main/java/zy/cloud/wms/manager/controller/ProjectTypeController.java
index 320fd9b..d7dc3b5 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ProjectTypeController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ProjectTypeController.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
+import zy.cloud.wms.manager.entity.Cstmr;
import zy.cloud.wms.manager.entity.ProjectType;
import zy.cloud.wms.manager.service.ProjectTypeService;
import com.core.annotations.ManagerAuth;
@@ -123,4 +124,22 @@
return R.ok();
}
+ /**
+ * 杩斿洖缁欏墠绔偣鍑讳笅鎷夋鐨勬暟鎹�
+ * @return
+ */
+ @RequestMapping("/type/auth")
+ public R getProjectType(){
+ List<ProjectType> projectTypes = projectTypeService.selectList(null);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (ProjectType projectType : projectTypes) {
+ Map<String,Object> content = new HashMap<>();
+ content.put("id",projectType.getId());
+ content.put("value",projectType.getTypeName());
+ result.add(content);
+ }
+
+
+ return R.ok(result);
+ }
}
diff --git a/src/main/java/zy/cloud/wms/manager/entity/FlowStatus.java b/src/main/java/zy/cloud/wms/manager/entity/FlowStatus.java
index 18f2f6e..1a96f61 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/FlowStatus.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/FlowStatus.java
@@ -1,5 +1,6 @@
package zy.cloud.wms.manager.entity;
+import com.baomidou.mybatisplus.annotations.TableField;
import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
@@ -11,8 +12,13 @@
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
import java.io.Serializable;
+@Data
+@NoArgsConstructor
@TableName("sys_flow_status")
public class FlowStatus implements Serializable {
@@ -52,16 +58,9 @@
@ApiModelProperty(value= "")
private String str3;
- public FlowStatus() {}
+ @TableField("weight_num")
+ private Integer weightNum;
- public FlowStatus(Integer type,String name,String memo,String str1,String str2,String str3) {
- this.type = type;
- this.name = name;
- this.memo = memo;
- this.str1 = str1;
- this.str2 = str2;
- this.str3 = str3;
- }
// FlowStatus flowStatus = new FlowStatus(
// null, // 鑺傜偣绫诲瀷
diff --git a/src/main/java/zy/cloud/wms/manager/entity/FlowsDTO.java b/src/main/java/zy/cloud/wms/manager/entity/FlowsDTO.java
new file mode 100644
index 0000000..aed8424
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/entity/FlowsDTO.java
@@ -0,0 +1,15 @@
+package zy.cloud.wms.manager.entity;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@NoArgsConstructor
+public class FlowsDTO {
+ private String name;
+ private Date deadline;
+ private Date realDeadline;
+ private int extraDay;
+}
diff --git a/src/main/java/zy/cloud/wms/manager/entity/Item.java b/src/main/java/zy/cloud/wms/manager/entity/Item.java
index de67d78..06374f4 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/Item.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/Item.java
@@ -4,11 +4,14 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
+import zy.cloud.wms.manager.service.CstmrService;
+import zy.cloud.wms.manager.service.ProjectTypeService;
import zy.cloud.wms.system.entity.Host;
import zy.cloud.wms.system.entity.User;
import zy.cloud.wms.system.service.HostService;
@@ -102,7 +105,7 @@
/**
* 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 瀹岀粨 ")
private Integer status;
/**
@@ -163,6 +166,9 @@
@TableField("duty_man")
private String dutyMan;
+ @TableField("origin_area")
+ private String originArea;
+
public Item() {}
@@ -213,6 +219,7 @@
public String getUuid() {
return uuid;
}
+
public void setUuid(String uuid) {
this.uuid = uuid;
@@ -306,7 +313,7 @@
case 1:
return "姝ｅ父";
case 0:
- return "绂佺敤";
+ return "瀹岀粨";
default:
return String.valueOf(this.status);
}
@@ -360,6 +367,25 @@
}
return null;
}
+ public String getCstmrUuid$(){
+ CstmrService bean = SpringUtils.getBean(CstmrService.class);
+ Cstmr id = bean.selectOne(new EntityWrapper<Cstmr>()
+ .eq("id", this.cstmrUuid));
+ if (!Cools.isEmpty(id)) {
+ return id.getName();
+ }
+ return null;
+ }
+
+ public String getType$(){
+ ProjectTypeService bean = SpringUtils.getBean(ProjectTypeService.class);
+ ProjectType id = bean.selectOne(new EntityWrapper<ProjectType>()
+ .eq("id", this.type));
+ if (!Cools.isEmpty(id)) {
+ return id.getTypeName();
+ }
+ return null;
+ }
public void setUpdateBy(Long updateBy) {
this.updateBy = updateBy;
@@ -389,4 +415,5 @@
}
+
}
diff --git a/src/main/java/zy/cloud/wms/manager/entity/ItemsDTO.java b/src/main/java/zy/cloud/wms/manager/entity/ItemsDTO.java
new file mode 100644
index 0000000..02844b4
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/entity/ItemsDTO.java
@@ -0,0 +1,16 @@
+package zy.cloud.wms.manager.entity;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+public class ItemsDTO {
+ private String id;
+ private Date startDay;
+ private Date endDay;
+ private List<ProjectPlan> nodes;
+}
diff --git a/src/main/java/zy/cloud/wms/manager/entity/ProjectPlan.java b/src/main/java/zy/cloud/wms/manager/entity/ProjectPlan.java
index 2082bd8..179c69c 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/ProjectPlan.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/ProjectPlan.java
@@ -1,6 +1,9 @@
package zy.cloud.wms.manager.entity;
-import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.core.common.SpringUtils;
+import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
@@ -37,6 +40,9 @@
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotations.TableName;
+import zy.cloud.wms.manager.service.FlowStatusService;
+import zy.cloud.wms.manager.service.ItemService;
+
import java.io.Serializable;
@Data
@@ -198,6 +204,7 @@
// null, // 淇敼浜篿d
// null // 鑺傜偣鍚嶇О
// );
+
public Long getId() {
return id;
@@ -385,5 +392,24 @@
this.flowName = flowName;
}
+ public String getItemId$(){
+ ItemService itemService = SpringUtils.getBean(ItemService.class);
+ Item id = itemService.selectOne(new EntityWrapper<Item>()
+ .eq("id", this.getItemId()));
+ if (!Cools.isEmpty(id)) {
+ return id.getName();
+ }else {
+ return null;
+ }
+ }
+ public String getFlowId$(){
+ FlowStatusService bean = SpringUtils.getBean(FlowStatusService.class);
+ FlowStatus id = bean.selectOne(new EntityWrapper<FlowStatus>()
+ .eq("id", this.flowId));
+ if (!Cools.isEmpty(id)) {
+ return id.getName();
+ }
+ return null;
+ }
}
diff --git a/src/main/java/zy/cloud/wms/manager/mapper/ItemMapper.java b/src/main/java/zy/cloud/wms/manager/mapper/ItemMapper.java
index a59fc7e..a7765da 100644
--- a/src/main/java/zy/cloud/wms/manager/mapper/ItemMapper.java
+++ b/src/main/java/zy/cloud/wms/manager/mapper/ItemMapper.java
@@ -1,5 +1,8 @@
package zy.cloud.wms.manager.mapper;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Options;
+import org.apache.ibatis.annotations.Param;
import zy.cloud.wms.manager.entity.Item;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
@@ -9,4 +12,5 @@
@Repository
public interface ItemMapper extends BaseMapper<Item> {
+
}
diff --git a/src/main/java/zy/cloud/wms/manager/service/ItemService.java b/src/main/java/zy/cloud/wms/manager/service/ItemService.java
index dbcd5ea..3c65362 100644
--- a/src/main/java/zy/cloud/wms/manager/service/ItemService.java
+++ b/src/main/java/zy/cloud/wms/manager/service/ItemService.java
@@ -7,4 +7,5 @@
Item selectByName(String name);
+ void insertAll(Item item);
}
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/ItemServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/ItemServiceImpl.java
index fd56670..a427bb8 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/ItemServiceImpl.java
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/ItemServiceImpl.java
@@ -1,14 +1,29 @@
package zy.cloud.wms.manager.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import zy.cloud.wms.manager.entity.FlowStatus;
+import zy.cloud.wms.manager.entity.ProjectPlan;
+import zy.cloud.wms.manager.entity.ProjectType;
import zy.cloud.wms.manager.mapper.ItemMapper;
import zy.cloud.wms.manager.entity.Item;
+import zy.cloud.wms.manager.service.FlowStatusService;
import zy.cloud.wms.manager.service.ItemService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
+import zy.cloud.wms.manager.service.ProjectPlanService;
+import zy.cloud.wms.manager.service.ProjectTypeService;
+
+import java.util.Date;
+import java.util.List;
@Service("itemService")
public class ItemServiceImpl extends ServiceImpl<ItemMapper, Item> implements ItemService {
+ @Autowired
+ private ProjectPlanService planService;
+ @Autowired
+ private FlowStatusService flowStatusService;
@Override
public Item selectByName(String name) {
@@ -16,4 +31,29 @@
item.setName(name);
return this.selectOne(new EntityWrapper<>(item));
}
+
+ @Transactional
+ @Override
+ public void insertAll(Item item) {
+ this.insert(item);
+ List<FlowStatus> allTypes = flowStatusService.selectList(new EntityWrapper<FlowStatus>()
+ .eq("type", item.getType())
+ .orderBy("weight_num",true));
+ for (FlowStatus oneType : allTypes) {
+ ProjectPlan projectPlan = new ProjectPlan();
+ projectPlan.setItemId(item.getId());
+ projectPlan.setWeightNum(oneType.getWeightNum());
+ projectPlan.setFlowId(oneType.getId());
+ projectPlan.setStartTime(item.getStartTime());
+ projectPlan.setEndTime(item.getEndTime());
+ projectPlan.setRealStartTime(null);
+ projectPlan.setRealEndTime(null);
+ projectPlan.setCreateId(item.getCreateBy());
+ projectPlan.setCreateTime(item.getCreateTime());
+ projectPlan.setModifyId(item.getUpdateBy());
+ projectPlan.setModifyTime(item.getUpdateTime());
+ planService.insert(projectPlan);
+ }
+
+ }
}
diff --git a/src/main/java/zy/cloud/wms/system/controller/UserController.java b/src/main/java/zy/cloud/wms/system/controller/UserController.java
index 01fe02b..7dc4433 100644
--- a/src/main/java/zy/cloud/wms/system/controller/UserController.java
+++ b/src/main/java/zy/cloud/wms/system/controller/UserController.java
@@ -35,11 +35,11 @@
@RequestMapping(value = "/user/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<User> wrapper = new EntityWrapper<>();
convert(param, wrapper);
@@ -69,10 +69,10 @@
return R.ok(userService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -87,7 +87,7 @@
@ManagerAuth(memo = "绯荤粺鐢ㄦ埛娣诲姞")
public R add(User user) {
user.setNickname(user.getUsername());
- if (userService.selectCount(new EntityWrapper<User>().eq("mobile", user.getMobile()))>0) {
+ if (userService.selectCount(new EntityWrapper<User>().eq("mobile", user.getMobile())) > 0) {
return R.error("鎵嬫満鍙峰凡瀛樺湪");
}
user.setStatus(1);
@@ -98,8 +98,8 @@
@RequestMapping(value = "/user/update/auth")
@ManagerAuth(memo = "绯荤粺鐢ㄦ埛淇敼")
- public R update(User user){
- if (Cools.isEmpty(user) || null==user.getId()){
+ public R update(User user) {
+ if (Cools.isEmpty(user) || null == user.getId()) {
return R.error();
}
int count = userService.selectCount(new EntityWrapper<User>().ne("id", user.getId()).eq("username", user.getUsername()));
@@ -113,11 +113,11 @@
@RequestMapping(value = "/user/delete/auth")
@ManagerAuth
@Transactional
- public R deleteBatch(@RequestParam(value = "ids[]") Long[] ids){
- if (Cools.isEmpty((Object) ids)){
+ public R deleteBatch(@RequestParam(value = "ids[]") Long[] ids) {
+ if (Cools.isEmpty((Object) ids)) {
return R.error();
}
- for (Long id : ids){
+ for (Long id : ids) {
if (!userService.deleteById(id)) {
throw new CoolException("鏈嶅姟鍣ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
}
@@ -127,7 +127,7 @@
@RequestMapping(value = "/user/export/auth")
@ManagerAuth(memo = "绯荤粺鐢ㄦ埛瀵煎嚭")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<User> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("user"));
@@ -143,7 +143,7 @@
wrapper.like("username", condition);
Page<User> page = userService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (User user : page.getRecords()){
+ for (User user : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", user.getId());
map.put("value", user.getNickname());
@@ -152,4 +152,5 @@
return R.ok(result);
}
+
}
diff --git a/src/main/resources/mapper/ItemMapper.xml b/src/main/resources/mapper/ItemMapper.xml
index d1d3a65..a5ba666 100644
--- a/src/main/resources/mapper/ItemMapper.xml
+++ b/src/main/resources/mapper/ItemMapper.xml
@@ -24,4 +24,5 @@
</resultMap>
+
</mapper>
diff --git a/src/main/webapp/static/js/cool.js b/src/main/webapp/static/js/cool.js
index 03ebe7a..96d9aef 100644
--- a/src/main/webapp/static/js/cool.js
+++ b/src/main/webapp/static/js/cool.js
@@ -37,7 +37,9 @@
defaultOption.title = "";
selectDom.appendChild(defaultOption);
selectDom.style.display='none';
+
$.ajax({
+
url: baseUrl+"/"+getForeignKeyQuery(val)+"/auth",
headers: {'token': localStorage.getItem('token')},
data: {condition: inputDomVal},
@@ -48,6 +50,7 @@
var list = res.data;
for (var i=0;i<list.length;i++){
var option = new Option(list[i].value, i);
+
option.title = list[i].id;
selectDom.options[i+1] = option;
}
diff --git a/src/main/webapp/static/js/diff/diff.js b/src/main/webapp/static/js/diff/diff.js
new file mode 100644
index 0000000..a4a911b
--- /dev/null
+++ b/src/main/webapp/static/js/diff/diff.js
@@ -0,0 +1,277 @@
+var pageCurr;
+layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin'], function(){
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var layDate = layui.laydate;
+ var form = layui.form;
+ var admin = layui.admin;
+
+ // 鏁版嵁娓叉煋
+ tableIns = table.render({
+ elem: '#item',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/projectPlan/diffProjects',
+ // url: baseUrl+'/projectPlan/list/auth',
+ page: true,
+ limit: 16,
+ limits: [16, 30, 50, 100, 200, 500],
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ cols: [[
+ {type: 'checkbox'}
+ // ,{field: 'id', align: 'center',title: '鍞竴ID'}
+ ,{field: 'itemId$', align: 'center',title: '椤圭洰鍚嶇О'}
+ ,{field: 'flowName', align: 'center',title: '鑺傜偣鍚嶇О'}
+ // ,{field: 'weightNum', align: 'center',title: '鏉冮噸鍊�'}
+ // ,{field: 'flowId', align: 'center',title: '鑺傜偣ID'}
+ ,{field: 'delay', align: 'center',title: '寤舵湡澶╂暟'}
+ ,{field: 'delayReason', align: 'center',title: '寤舵湡鍘熷洜'}
+ ,{field: 'dutyDepartment', align: 'center',title: '璐ｄ换閮ㄩ棬'}
+ ,{field: 'dutyMan', align: 'center',title: '璐ｄ换浜�'}
+ ,{field: 'startTime$', align: 'center',title: '璁″垝寮�濮嬫椂闂�'}
+ ,{field: 'endTime$', align: 'center',title: '璁″垝缁撴潫鏃堕棿'}
+ ,{field: 'realStartTime$', align: 'center',title: '瀹為檯寮�濮嬫椂闂�'}
+ ,{field: 'realEndTime$', align: 'center',title: '瀹為檯缁撴潫鏃堕棿'}
+ ,{field: 'memo', align: 'center',title: '澶囨敞'}
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
+ ]],
+ request: {
+ pageName: 'curr',
+ pageSize: 'limit'
+ },
+ parseData: function (res) {
+ return {
+ 'code': res.code,
+ 'msg': res.msg,
+ 'count': res.data.total,
+ 'data': res.data.records
+ }
+ },
+ response: {
+ statusCode: 200
+ },
+ done: function(res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ limit();
+ }
+ });
+
+ // 鐩戝惉鎺掑簭浜嬩欢
+ table.on('sort(item)', function (obj) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ searchData['orderByField'] = obj.field;
+ searchData['orderByType'] = obj.type;
+ tableIns.reload({
+ where: searchData,
+ page: {curr: 1}
+ });
+ });
+
+ // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(item)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id).data;
+ switch(obj.event) {
+ case 'addData':
+ showEditModel();
+ break;
+ case 'deleteData':
+ if (checkStatus.length === 0) {
+ layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+ return;
+ }
+ var ids = checkStatus.map(function (d) {
+ return d.id;
+ });
+ del(ids);
+ break;
+ case 'exportData':
+ layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+ var titles=[];
+ var fields=[];
+ obj.config.cols[0].map(function (col) {
+ if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
+ titles.push(col.title);
+ fields.push(col.field);
+ }
+ });
+ var exportData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ exportData[this.name] = this.value;
+ });
+ var param = {
+ 'item': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/projectPlan/diffProjects/export",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(param),
+ dataType:'json',
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ layer.closeAll();
+ if (res.code === 200) {
+ table.exportFile(titles,res.data,'xls');
+ } else if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ });
+ });
+ break;
+ }
+ });
+
+ // 鐩戝惉琛屽伐鍏蜂簨浠�
+ table.on('tool(item)', function(obj){
+ var data = obj.data;
+ switch (obj.event) {
+ case 'edit':
+ showEditModel(data);
+ break;
+ case "del":
+ var ids = [data.id];
+ del(ids);
+ break;
+ }
+ });
+
+ /* 寮圭獥 - 鏂板銆佷慨鏀� */
+ function showEditModel(mData) {
+ admin.open({
+ type: 1,
+ area: '600px',
+ title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
+ content: $('#editDialog').html(),
+ success: function (layero, dIndex) {
+ layDateRender();
+ form.val('detail', mData);
+ form.on('submit(editSubmit)', function (data) {
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/item/"+(mData?'update':'add')+"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: data.field,
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.close(dIndex);
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ return false;
+ });
+ $(layero).children('.layui-layer-content').css('overflow', 'visible');
+ layui.form.render('select');
+ }
+ });
+ }
+
+ /* 鍒犻櫎 */
+ function del(ids) {
+ layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
+ skin: 'layui-layer-admin',
+ shade: .1
+ }, function (i) {
+ layer.close(i);
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/item/delete/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {ids: ids},
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ }
+
+ // 鎼滅储
+ form.on('submit(search)', function (data) {
+ pageCurr = 1;
+ tableReload(false);
+ });
+
+ // 閲嶇疆
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+
+ // 鏃堕棿閫夋嫨鍣�
+ function layDateRender() {
+ layDate.render({
+ elem: '#startTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#endTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#createTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#updateTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#realStartTime\\$'
+ ,type: 'datetime'
+ });
+ layDate.render({
+ elem: '#realEndTime\\$'
+ ,type: 'datetime'
+ });
+ }
+ layDateRender();
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(document).on('click','#data-detail-close', function () {
+ parent.layer.closeAll();
+});
+
+function tableReload(child) {
+ var searchData = {};
+
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+
+ });
+ tableIns.reload({
+ where: searchData,
+ page: {curr: pageCurr}
+ });
+}
diff --git a/src/main/webapp/static/js/flowStatus/flowStatus.js b/src/main/webapp/static/js/flowStatus/flowStatus.js
index 2198ddd..6e5a668 100644
--- a/src/main/webapp/static/js/flowStatus/flowStatus.js
+++ b/src/main/webapp/static/js/flowStatus/flowStatus.js
@@ -21,10 +21,12 @@
cellMinWidth: 50,
cols: [[
{type: 'checkbox'}
- ,{field: 'id', align: 'center',title: '鍞竴id'}
+ ,{field: 'id', align: 'center',title: '鍞竴id',width: 100}
,{field: 'type', align: 'center',title: '鑺傜偣绫诲瀷', hide:true}
+ ,{field: 'weightNum', align: 'center',title: '鏉冮噸鍊�', width: 100}
,{field: 'name', align: 'center',title: '鑺傜偣鍚嶇О'}
- ,{field: 'memo', align: 'center',title: '澶囨敞', width: 100}
+
+ ,{field: 'memo', align: 'center',title: '澶囨敞', width: 300}
// ,{field: 'str1', align: 'center',title: ''}
// ,{field: 'str2', align: 'center',title: ''}
// ,{field: 'str3', align: 'center',title: ''}
diff --git a/src/main/webapp/static/js/item/item.js b/src/main/webapp/static/js/item/item.js
index 47cd5ad..b995313 100644
--- a/src/main/webapp/static/js/item/item.js
+++ b/src/main/webapp/static/js/item/item.js
@@ -27,18 +27,19 @@
,{field: 'name', align: 'center',title: '椤圭洰鍚嶇О'}
,{field: 'inUuid', align: 'center',title: '鍐呴儴缂栧彿', hide: true}
// ,{field: 'cstmrUuid', align: 'center',title: '瀹㈡埛缂栧彿'}
- ,{field: 'cstmr', align: 'center',title: '瀹㈡埛鍚嶇О'}
+ ,{field: 'cstmrUuid$', align: 'center',title: '瀹㈡埛鍚嶇О'}
// ,{field: 'member', align: 'center',title: '椤圭洰鎴愬憳'}
// ,{field: 'leader', align: 'center',title: '椤圭洰缁忕悊'}
,{field: 'startTime$', align: 'center',title: '璁″垝寮�濮嬫椂闂�'}
,{field: 'endTime$', align: 'center',title: '璁″垝缁撴潫鏃堕棿'}
,{field: 'realStartTime', align: 'center', title: '瀹為檯寮�濮嬫椂闂�'}
,{field: 'realEndTime', align: 'center', title: '瀹為檯缁撴潫鏃堕棿'}
- ,{field: 'type', align: 'center', title: '椤圭洰绫诲瀷'}
+ ,{field: 'type$', align: 'center', title: '椤圭洰绫诲瀷'}
+ ,{field: 'originArea', align: 'center', title: '鐢熶骇鍦�'}
,{field: 'realMonth', align: 'center', title: '鏃堕棿璺ㄥ害(鏈�)'}
,{field: 'dutyMan', align: 'center', title: '璐ｄ换浜�'}
,{field: 'dutyDepartment', align: 'center', title: '璐ｄ换閮ㄩ棬'}
- // ,{field: 'status$', align: 'center',title: '鐘舵��'}
+ ,{field: 'status$', align: 'center',title: '鐘舵��'}
// ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'}
// ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
// ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
@@ -168,6 +169,7 @@
layDateRender();
form.val('detail', mData);
form.on('submit(editSubmit)', function (data) {
+
var loadIndex = layer.load(2);
$.ajax({
url: baseUrl+"/item/"+(mData?'update':'add')+"/auth",
diff --git a/src/main/webapp/static/js/projectPlan/projectPlan.js b/src/main/webapp/static/js/projectPlan/projectPlan.js
index ab05220..dbc6db2 100644
--- a/src/main/webapp/static/js/projectPlan/projectPlan.js
+++ b/src/main/webapp/static/js/projectPlan/projectPlan.js
@@ -27,10 +27,10 @@
},
cols: [[
- {type: 'checkbox'}
+ {type: 'checkbox', hide:true}
// ,{field: 'id', align: 'center',title: '鍞竴ID'}
// ,{field: 'itemId', align: 'center',title: '椤圭洰ID'}
- ,{field: 'flowName', align: 'center',title: '鑺傜偣鍚嶇О'}
+ ,{field: 'flowId$', align: 'center',title: '鑺傜偣鍚嶇О'}
,{field: 'weightNum', align: 'center',title: '鏉冮噸鍊�'}
// ,{field: 'flowId', align: 'center',title: '鑺傜偣ID'}
diff --git a/src/main/webapp/views/diff/diff.html b/src/main/webapp/views/diff/diff.html
new file mode 100644
index 0000000..9d2b68a
--- /dev/null
+++ b/src/main/webapp/views/diff/diff.html
@@ -0,0 +1,191 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title></title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+ <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+ <link rel="stylesheet" href="../../static/css/common.css" media="all">
+</head>
+<body>
+
+<!-- 鎼滅储鏍� -->
+<div id="search-box" class="layui-form layui-card-header">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="id" placeholder="璇疯緭鍏�" autocomplete="off">
+ </div>
+
+ </div>
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
+ <!-- 寰呮坊鍔� -->
+ <div id="data-search-btn" class="layui-btn-container layui-form-item">
+ <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
+ <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>
+ </div>
+</div>
+
+<!-- 琛ㄦ牸 -->
+<div class="layui-form">
+ <table class="layui-hide" id="item" lay-filter="item"></table>
+</div>
+<script type="text/html" id="toolbar">
+ <div class="layui-btn-container">
+<!-- <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>-->
+<!-- <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>-->
+ <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="margin-top: 10px">瀵煎嚭</button>
+ </div>
+</script>
+
+<script type="text/html" id="operate">
+ <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+</script>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/diff/diff.js" charset="utf-8"></script>
+</body>
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="editDialog">
+ <form id="detail" lay-filter="detail" class="layui-form admin-form">
+ <input name="id" type="hidden">
+ <div class="layui-row">
+ <div class="layui-col-md12">
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">椤圭洰缂栧彿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="uuid" placeholder="璇疯緭鍏ラ」鐩紪鍙�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">椤圭洰鍚嶇О: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="name" placeholder="璇疯緭鍏ラ」鐩悕绉�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍐呴儴缂栧彿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="inUuid" placeholder="璇疯緭鍏ュ唴閮ㄧ紪鍙�">
+ </div>
+ </div>
+
+
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">瀹㈡埛缂栧彿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="cstmrUuid" placeholder="璇疯緭鍏ュ鎴峰悕绉�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">瀹㈡埛: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="cstmr" placeholder="璇疯緭鍏ュ鎴�">-->
+<!-- </div>-->
+<!-- </div>-->
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">璁″垝寮�濮嬫椂闂�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="startTime" id="startTime$" placeholder="璇疯緭鍏ュ紑濮嬫椂闂�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">璁″垝缁撴潫鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="endTime" id="endTime$" placeholder="璇疯緭鍏ョ粨鏉熸椂闂�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">瀹為檯寮�濮嬫椂闂�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="realStartTime" id="realStartTime$" placeholder="鍙┖濉�,绛夊緟鐪熷疄椤圭洰鍚姩鍐嶅～">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">瀹為檯缁撴潫鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="realEndTime" id="realEndTime$" placeholder="鍙┖濉�,绛夊緟鐪熷疄椤圭洰缁撴潫鍐嶅～">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">椤圭洰绫诲瀷: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="type" placeholder="璇疯緭鍏ラ」鐩被鍨�" lay-vertype="tips" lay-verify="required" type="number">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐘舵��: </label>
+ <div class="layui-input-block">
+ <select name="status">
+ <option value="">璇烽�夋嫨鐘舵��</option>
+ <option value="1">姝ｅ父</option>
+ <option value="0">绂佺敤</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鏃堕棿璺ㄥ害: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="realMonth" id="realMonth$" placeholder="濉啓鏁板瓧鏈堜唤" type="number">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">璐ｄ换浜�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="dutyMan" id="dutyMan$" placeholder="璇疯緭鍏ヨ矗浠讳汉">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">璐ｄ换閮ㄩ棬: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="dutyDepartment" id="dutyDepartment$" placeholder="璇疯緭鍏ヨ矗浠婚儴闂�">
+ </div>
+ </div>
+
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">娣诲姞浜哄憳: </label>-->
+<!-- <div class="layui-input-block cool-auto-complete">-->
+<!-- <input class="layui-input" name="createBy" placeholder="璇疯緭鍏ユ坊鍔犱汉鍛�" style="display: none">-->
+<!-- <input id="createBy$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ユ坊鍔犱汉鍛�" onfocus=this.blur()>-->
+<!-- <div class="cool-auto-complete-window">-->
+<!-- <input class="cool-auto-complete-window-input" data-key="userQueryBycreateBy" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
+<!-- <select class="cool-auto-complete-window-select" data-key="userQueryBycreateBySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
+
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">娣诲姞鏃堕棿: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="createTime" id="createTime$" placeholder="璇疯緭鍏ユ坊鍔犳椂闂�">-->
+<!-- </div>-->
+<!-- </div>-->
+ <div class="layui-form-item">
+ <label class="layui-form-label">澶囨敞: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="memo" placeholder="璇疯緭鍏ュ娉�">
+ </div>
+ </div>
+ </div>
+ </div>
+ <hr class="layui-bg-gray">
+ <div class="layui-form-item text-right">
+ <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ </div>
+ </form>
+</script>
+</html>
+
diff --git a/src/main/webapp/views/flowStatus/flowStatus.html b/src/main/webapp/views/flowStatus/flowStatus.html
index 2e37146..8bd3393 100644
--- a/src/main/webapp/views/flowStatus/flowStatus.html
+++ b/src/main/webapp/views/flowStatus/flowStatus.html
@@ -69,6 +69,12 @@
</div>
</div>
<div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">鏉冮噸鍊�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="weightNum" placeholder="璇疯緭鍏ユ潈閲嶅��" lay-verify="required" lay-vertype="tips" type="number">
+ </div>
+ </div>
+ <div class="layui-form-item">
<label class="layui-form-label">澶囨敞: </label>
<div class="layui-input-block">
<input class="layui-input" name="memo" placeholder="璇疯緭鍏ュ娉�">
diff --git a/src/main/webapp/views/item/item.html b/src/main/webapp/views/item/item.html
index 5fc56f9..c1821a1 100644
--- a/src/main/webapp/views/item/item.html
+++ b/src/main/webapp/views/item/item.html
@@ -68,6 +68,8 @@
<input class="layui-input" name="name" placeholder="璇疯緭鍏ラ」鐩悕绉�" lay-vertype="tips" lay-verify="required">
</div>
</div>
+
+
<div class="layui-form-item">
<label class="layui-form-label">鍐呴儴缂栧彿: </label>
<div class="layui-input-block">
@@ -76,12 +78,26 @@
</div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label layui-form-required">瀹㈡埛缂栧彿: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="cstmrUuid" placeholder="璇疯緭鍏ュ鎴峰悕绉�" lay-vertype="tips" lay-verify="required">-->
+<!-- </div>-->
+<!-- </div>-->
+
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">瀹㈡埛缂栧彿: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="cstmrUuid" placeholder="璇疯緭鍏ュ鎴峰悕绉�" lay-vertype="tips" lay-verify="required">
+ <label class="layui-form-label layui-form-required">瀹㈡埛鍚嶇О: </label>
+ <div class="layui-input-block cool-auto-complete">
+ <input id="cstmrUuid" class="layui-input" name="cstmrUuid" placeholder="璇疯緭鍏ュ鎴峰悕绉�" style="display: none" lay-vertype="tips" lay-verify="required">
+ <input id="cstmrUuid$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ユ坊鍔犱汉鍛�" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="cstmrUuidBycstmrUuid" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="cstmrUuidBycstmrUuidSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
</div>
</div>
+
<!-- <div class="layui-form-item">-->
<!-- <label class="layui-form-label">瀹㈡埛: </label>-->
<!-- <div class="layui-input-block">-->
@@ -114,8 +130,27 @@
</div>
<div class="layui-form-item">
<label class="layui-form-label layui-form-required">椤圭洰绫诲瀷: </label>
+ <div class="layui-input-block cool-auto-complete">
+ <input class="layui-input" name="type" placeholder="璇疯緭鍏ュ鎴峰悕绉�" style="display: none" lay-vertype="tips" lay-verify="required">
+<!-- <input id="createBy$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ラ」鐩被鍨�" onfocus=this.blur()>-->
+ <input id="type$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ラ」鐩被鍨�" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="typeBycreateBy" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="typeBycreateBySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label layui-form-required">椤圭洰绫诲瀷: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="type" placeholder="璇疯緭鍏ラ」鐩被鍨�" lay-vertype="tips" lay-verify="required" type="number">-->
+<!-- </div>-->
+<!-- </div>-->
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">鐢熶骇鍦�: </label>
<div class="layui-input-block">
- <input class="layui-input" name="type" placeholder="璇疯緭鍏ラ」鐩被鍨�" lay-vertype="tips" lay-verify="required" type="number">
+ <input class="layui-input" name="originArea" placeholder="璇疯緭鍏ョ敓浜у湴" lay-vertype="tips" lay-verify="required">
</div>
</div>
<div class="layui-form-item">
@@ -124,7 +159,7 @@
<select name="status">
<option value="">璇烽�夋嫨鐘舵��</option>
<option value="1">姝ｅ父</option>
- <option value="0">绂佺敤</option>
+ <option value="0">瀹岀粨</option>
</select>
</div>
</div>
diff --git a/src/main/webapp/views/projectPlan/projectPlan.html b/src/main/webapp/views/projectPlan/projectPlan.html
index 3159314..654763f 100644
--- a/src/main/webapp/views/projectPlan/projectPlan.html
+++ b/src/main/webapp/views/projectPlan/projectPlan.html
@@ -41,15 +41,15 @@
</div>
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
- <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
- <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
- <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
+<!-- <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>-->
+<!-- <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>-->
+ <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="margin-top: 10px; margin-right:20px" >瀵煎嚭</button>
</div>
</script>
<script type="text/html" id="operate">
<a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
- <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+<!-- <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>-->
</script>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
@@ -71,6 +71,20 @@
<!-- <input class="layui-input" name="itemId" placeholder="璇疯緭鍏ラ」鐩甀D" lay-vertype="tips" lay-verify="required">-->
<!-- </div>-->
<!-- </div>-->
+
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">鑺傜偣鍚嶇О: </label>
+ <div class="layui-input-block cool-auto-complete">
+ <input id="flowId" class="layui-input" name="flowId" placeholder="璇疯緭鍏ュ鎴峰悕绉�" style="display: none" lay-vertype="tips" lay-verify="required">
+ <input id="flowId$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ユ坊鍔犱汉鍛�" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="flowIdByflowId" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="flowIdByflowIdSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+
<div class="layui-form-item">
<label class="layui-form-label layui-form-required">鏉冮噸鍊�: </label>
<div class="layui-input-block">
@@ -78,13 +92,15 @@
lay-verify="required">
</div>
</div>
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">鑺傜偣ID: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="flowId" placeholder="璇疯緭鍏ヨ妭鐐笽D" lay-vertype="tips"
- lay-verify="required">
- </div>
- </div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label layui-form-required">鑺傜偣ID: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="flowId" placeholder="璇疯緭鍏ヨ妭鐐笽D" lay-vertype="tips"-->
+<!-- lay-verify="required">-->
+<!-- </div>-->
+<!-- </div>-->
+
+
<div class="layui-form-item">
<label class="layui-form-label layui-form-required">璁″垝寮�濮嬫椂闂�: </label>
<div class="layui-input-block">
--
Gitblit v1.9.1