From cf22fb461f13b7136807fc5272e8ef254ff29db4 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期二, 11 一月 2022 10:01:32 +0800
Subject: [PATCH] 完成提交
---
src/main/webapp/static/js/projectPlan/projectPlan.js | 16 ++
src/main/java/zy/cloud/wms/manager/entity/ProjectPlan.java | 57 ++++-------
src/main/webapp/views/item/item.html | 2
src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java | 58 ++++++++++-
src/main/webapp/views/projectPlan/projectPlan.html | 119 ++++++++++++-----------
version/db/zypms20220111.bak | 0
6 files changed, 146 insertions(+), 106 deletions(-)
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 8641548..4f48cf5 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
@@ -6,9 +6,12 @@
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.service.FlowStatusService;
import zy.cloud.wms.manager.service.ItemService;
import zy.cloud.wms.manager.service.ProjectPlanService;
import com.core.annotations.ManagerAuth;
@@ -28,6 +31,8 @@
private ProjectPlanService projectPlanService;
@Autowired
private ItemService itemService;
+ @Autowired
+ private FlowStatusService flowStatusService;
@RequestMapping(value = "/projectPlan/{id}/auth")
@ManagerAuth
@@ -41,16 +46,18 @@
@RequestParam(defaultValue = "10") Integer limit,
@RequestParam(required = false) String orderByField,
@RequestParam(required = false) String orderByType,
- @RequestParam Map<String, Object> param,
- @RequestParam String target) {
- param.remove("target");
+ @RequestParam Map<String, Object> param) {
+ String target = (String) param.get("items");
+ param.remove("items");
+
EntityWrapper<ProjectPlan> wrapper = new EntityWrapper<>();
wrapper.eq("item_id",target);
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)) {
- wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
- }
+ wrapper.orderBy("weight_num");
+// if (!Cools.isEmpty(orderByField)) {
+// wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+// }
return R.ok(projectPlanService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -70,6 +77,23 @@
@RequestMapping(value = "/projectPlan/add/auth")
@ManagerAuth
public R add(ProjectPlan projectPlan) {
+
+
+ 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.setCreateId(getUserId());
+ projectPlan.setModifyId(getUserId());
projectPlanService.insert(projectPlan);
return R.ok();
}
@@ -77,10 +101,30 @@
@RequestMapping(value = "/projectPlan/update/auth")
@ManagerAuth
public R update(ProjectPlan projectPlan) {
+
if (Cools.isEmpty(projectPlan) || null == projectPlan.getId()) {
return R.error();
}
- projectPlanService.updateById(projectPlan);
+
+ 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);
return R.ok();
}
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 402305c..2082bd8 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/ProjectPlan.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/ProjectPlan.java
@@ -10,6 +10,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -38,6 +39,7 @@
import com.baomidou.mybatisplus.annotations.TableName;
import java.io.Serializable;
+@Data
@TableName("sys_project_plan")
public class ProjectPlan implements Serializable {
@@ -46,6 +48,7 @@
/**
* 鍞竴ID
*/
+ @TableId(value = "id",type = IdType.AUTO)
@ApiModelProperty(value= "鍞竴ID")
private Long id;
@@ -150,7 +153,7 @@
*/
@ApiModelProperty(value= "鍒涘缓浜篿d")
@TableField("create_id")
- private Integer createId;
+ private Long createId;
/**
* 淇敼鏃堕棿
@@ -165,7 +168,7 @@
*/
@ApiModelProperty(value= "淇敼浜篿d")
@TableField("modify_id")
- private Integer modifyId;
+ private Long modifyId;
/**
* 鑺傜偣鍚嶇О
@@ -175,26 +178,6 @@
private String flowName;
public ProjectPlan() {}
-
- public ProjectPlan(Long itemId,Integer weightNum,Integer flowId,Date startTime,Date realStartTime,Date endTime,Date realEndTime,Integer delay,String delayReason,String memo,String dutyDepartment,String dutyMan,Date createTime,Integer createId,Date modifyTime,Integer modifyId,String flowName) {
- this.itemId = itemId;
- this.weightNum = weightNum;
- this.flowId = flowId;
- this.startTime = startTime;
- this.realStartTime = realStartTime;
- this.endTime = endTime;
- this.realEndTime = realEndTime;
- this.delay = delay;
- this.delayReason = delayReason;
- this.memo = memo;
- this.dutyDepartment = dutyDepartment;
- this.dutyMan = dutyMan;
- this.createTime = createTime;
- this.createId = createId;
- this.modifyTime = modifyTime;
- this.modifyId = modifyId;
- this.flowName = flowName;
- }
// ProjectPlan projectPlan = new ProjectPlan(
// null, // 椤圭洰ID[闈炵┖]
@@ -363,13 +346,13 @@
this.createTime = createTime;
}
- public Integer getCreateId() {
- return createId;
- }
-
- public void setCreateId(Integer createId) {
- this.createId = createId;
- }
+// public Integer getCreateId() {
+// return createId;
+// }
+//
+// public void setCreateId(Integer createId) {
+// this.createId = createId;
+// }
public Date getModifyTime() {
return modifyTime;
@@ -385,14 +368,14 @@
public void setModifyTime(Date modifyTime) {
this.modifyTime = modifyTime;
}
-
- public Integer getModifyId() {
- return modifyId;
- }
-
- public void setModifyId(Integer modifyId) {
- this.modifyId = modifyId;
- }
+//
+// public Integer getModifyId() {
+// return modifyId;
+// }
+//
+// public void setModifyId(Integer modifyId) {
+// this.modifyId = modifyId;
+// }
public String getFlowName() {
return flowName;
diff --git a/src/main/webapp/static/js/projectPlan/projectPlan.js b/src/main/webapp/static/js/projectPlan/projectPlan.js
index 38f7715..ab05220 100644
--- a/src/main/webapp/static/js/projectPlan/projectPlan.js
+++ b/src/main/webapp/static/js/projectPlan/projectPlan.js
@@ -1,5 +1,5 @@
var pageCurr;
-var firstId;
+var items;
getItems();
layui.config({
@@ -23,7 +23,7 @@
toolbar: '#toolbar',
cellMinWidth: 50,
where: {
- target: firstId
+ items: items
},
cols: [[
@@ -81,6 +81,11 @@
where: searchData,
page: {curr: 1}
});
+ });
+
+ form.on('select(items)',function (data) {
+ items = data.value
+ tableReload();
});
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
@@ -157,6 +162,7 @@
/* 寮圭獥 - 鏂板銆佷慨鏀� */
function showEditModel(mData) {
+
admin.open({
type: 1,
area: '600px',
@@ -166,6 +172,7 @@
layDateRender();
form.val('detail', mData);
form.on('submit(editSubmit)', function (data) {
+ data.field.itemId = items
var loadIndex = layer.load(2);
$.ajax({
@@ -288,7 +295,7 @@
if (res.data != null) {
// console.log(res.data[0].key)
- firstId = res.data[0].key;
+ items = res.data[0].key;
var tpl = $("#parentNodeGroup").html();
var template = Handlebars.compile(tpl);
var html = template(res);
@@ -296,4 +303,5 @@
}
});
-}
\ No newline at end of file
+}
+
diff --git a/src/main/webapp/views/item/item.html b/src/main/webapp/views/item/item.html
index 7299baf..5fc56f9 100644
--- a/src/main/webapp/views/item/item.html
+++ b/src/main/webapp/views/item/item.html
@@ -115,7 +115,7 @@
<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">
+ <input class="layui-input" name="type" placeholder="璇疯緭鍏ラ」鐩被鍨�" lay-vertype="tips" lay-verify="required" type="number">
</div>
</div>
<div class="layui-form-item">
diff --git a/src/main/webapp/views/projectPlan/projectPlan.html b/src/main/webapp/views/projectPlan/projectPlan.html
index 4c30103..3159314 100644
--- a/src/main/webapp/views/projectPlan/projectPlan.html
+++ b/src/main/webapp/views/projectPlan/projectPlan.html
@@ -19,20 +19,20 @@
<div class="layui-inline">
<label class="layui-form-label">褰撳墠椤圭洰: </label>
<div class="layui-input-inline">
- <select id="items" name="items" lay-search="">
+ <select id="items" name="items" lay-search="" lay-filter="items">
</select>
</div>
</div>
-<!-- <div class="layui-inline">-->
-<!-- <div class="layui-input-inline">-->
-<!-- <input class="layui-input" type="text" name="id" 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 class="layui-inline">-->
+ <!-- <div class="layui-input-inline">-->
+ <!-- <input class="layui-input" type="text" name="id" 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>
<!-- 琛ㄦ牸 -->
@@ -65,34 +65,38 @@
<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">椤圭洰ID: </label>-->
-<!-- <div class="layui-input-block">-->
-<!-- <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">椤圭洰ID: </label>-->
+ <!-- <div class="layui-input-block">-->
+ <!-- <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">
- <input class="layui-input" name="weightNum" placeholder="璇疯緭鍏ユ潈閲岻D" lay-vertype="tips" lay-verify="required">
+ <input class="layui-input" name="weightNum" 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">
+ <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">
- <input class="layui-input" name="startTime" id="startTime$" placeholder="璇疯緭鍏ヨ鍒掑紑濮嬫椂闂�" lay-vertype="tips" lay-verify="required">
+ <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">
+ <input class="layui-input" name="endTime" id="endTime$" placeholder="璇疯緭鍏ヨ鍒掔粨鏉熸椂闂�"
+ lay-vertype="tips" lay-verify="required">
</div>
</div>
<div class="layui-form-item">
@@ -138,43 +142,44 @@
<input class="layui-input" name="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="createTime" id="createTime$" placeholder="璇疯緭鍏ュ垱寤烘椂闂�">-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="layui-form-item">-->
-<!-- <label class="layui-form-label">鍒涘缓浜篿d: </label>-->
-<!-- <div class="layui-input-block">-->
-<!-- <input class="layui-input" name="createId" placeholder="璇疯緭鍏ュ垱寤轰汉id">-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="layui-form-item">-->
-<!-- <label class="layui-form-label">淇敼鏃堕棿: </label>-->
-<!-- <div class="layui-input-block">-->
-<!-- <input class="layui-input" name="modifyTime" id="modifyTime$" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�">-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="layui-form-item">-->
-<!-- <label class="layui-form-label">淇敼浜篿d: </label>-->
-<!-- <div class="layui-input-block">-->
-<!-- <input class="layui-input" name="modifyId" placeholder="璇疯緭鍏ヤ慨鏀逛汉id">-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="layui-form-item">-->
-<!-- <label class="layui-form-label">鑺傜偣鍚嶇О: </label>-->
-<!-- <div class="layui-input-block">-->
-<!-- <input class="layui-input" name="flowName" placeholder="璇疯緭鍏ヨ妭鐐瑰悕绉�">-->
-<!-- </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">鍒涘缓浜篿d: </label>-->
+ <!-- <div class="layui-input-block">-->
+ <!-- <input class="layui-input" name="createId" placeholder="璇疯緭鍏ュ垱寤轰汉id">-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!-- <div class="layui-form-item">-->
+ <!-- <label class="layui-form-label">淇敼鏃堕棿: </label>-->
+ <!-- <div class="layui-input-block">-->
+ <!-- <input class="layui-input" name="modifyTime" id="modifyTime$" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�">-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!-- <div class="layui-form-item">-->
+ <!-- <label class="layui-form-label">淇敼浜篿d: </label>-->
+ <!-- <div class="layui-input-block">-->
+ <!-- <input class="layui-input" name="modifyId" placeholder="璇疯緭鍏ヤ慨鏀逛汉id">-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!-- <div class="layui-form-item">-->
+ <!-- <label class="layui-form-label">鑺傜偣鍚嶇О: </label>-->
+ <!-- <div class="layui-input-block">-->
+ <!-- <input class="layui-input" name="flowName" 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>-->
+ </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>
</div>
</form>
</script>
diff --git a/version/db/wms_saas20220105.bak b/version/db/zypms20220111.bak
similarity index 91%
rename from version/db/wms_saas20220105.bak
rename to version/db/zypms20220111.bak
index c61129c..298d262 100644
--- a/version/db/wms_saas20220105.bak
+++ b/version/db/zypms20220111.bak
Binary files differ
--
Gitblit v1.9.1