From e52ba640d14d79570345aa766dacbd15c7bad1cf Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期三, 06 四月 2022 12:59:21 +0800
Subject: [PATCH] .
---
src/main/webapp/static/js/projectPlan/projectPlan.js | 18 +++---
src/main/webapp/views/item/item.html | 1
src/main/webapp/static/js/itemTable.js | 3
src/main/webapp/static/js/tableData.js | 2
src/main/webapp/views/projectPlan/projectPlan.html | 4
src/main/java/zy/cloud/wms/manager/controller/ItemController.java | 44 ++++++++++++--
src/main/webapp/views/login.html | 34 +++++-----
src/main/webapp/static/js/item/item.js | 33 ++++++++++
8 files changed, 100 insertions(+), 39 deletions(-)
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 5f3d349..01e0660 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
@@ -15,14 +15,8 @@
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 zy.cloud.wms.manager.entity.*;
+import zy.cloud.wms.manager.service.*;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -34,6 +28,8 @@
private ItemService itemService;
@Autowired
private ProjectPlanService planService;
+ @Autowired
+ private FlowStatusService flowStatusService;
@RequestMapping(value = "/item/{id}/auth")
@ManagerAuth
@@ -239,4 +235,36 @@
return R.ok();
}
+ /**
+ * 鍒濆鍖栫敓鎴愰」鐩妭鐐�
+ * @param param
+ * @return
+ */
+ @RequestMapping(value = "/item/initPlan/auth")
+ @ManagerAuth
+ public R initPlan(@RequestParam("id") String param){
+ if (param != null){
+ List<ProjectPlan> projectPlans = planService.selectList(new EntityWrapper<ProjectPlan>().eq("item_id",param));
+ if(!Cools.isEmpty(projectPlans) && projectPlans.size()>0){
+ return R.error("璇ラ」鐩凡鏈夎妭鐐硅鍒�");
+ }
+ List<FlowStatus> flowStatuses = flowStatusService.selectList(new EntityWrapper<FlowStatus>());
+ if(!Cools.isEmpty(flowStatuses) && flowStatuses.size()>0){
+ for(FlowStatus flowStatus : flowStatuses){
+ ProjectPlan projectPlan = new ProjectPlan();
+ projectPlan.setItemId(Long.parseLong(param));
+ projectPlan.setWeightNum(flowStatus.getWeightNum());
+ projectPlan.setFlowId(flowStatus.getId());
+ planService.insert(projectPlan);
+ }
+ } else {
+ return R.error("椤圭洰璁″垝鑺傜偣鍩虹鏁版嵁涓虹┖");
+ }
+ } else {
+ return R.error("椤圭洰鍙傛暟閿欒");
+ }
+
+ return R.ok();
+ }
+
}
diff --git a/src/main/webapp/static/js/item/item.js b/src/main/webapp/static/js/item/item.js
index cdd15b8..19d2df9 100644
--- a/src/main/webapp/static/js/item/item.js
+++ b/src/main/webapp/static/js/item/item.js
@@ -49,7 +49,7 @@
// ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
,{field: 'memo', align: 'center',title: '澶囨敞'}
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:180}
]],
request: {
pageName: 'curr',
@@ -159,6 +159,9 @@
var ids = [data.id];
del(ids);
break;
+ case "initPlan":
+ initPlan(data.id);
+ break;
}
});
@@ -228,6 +231,34 @@
});
}
+ /* 鍒濆鍖栭」鐩妭鐐� */
+ function initPlan(id) {
+ layer.confirm('纭畾瑕佺敓鎴愯椤圭洰璁″垝鑺傜偣鍚楋紵', {
+ skin: 'layui-layer-admin',
+ shade: .1
+ }, function (i) {
+ layer.close(i);
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/item/initPlan/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {id: id},
+ 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) {
diff --git a/src/main/webapp/static/js/itemTable.js b/src/main/webapp/static/js/itemTable.js
index 8c5c063..f02b773 100644
--- a/src/main/webapp/static/js/itemTable.js
+++ b/src/main/webapp/static/js/itemTable.js
@@ -37,7 +37,8 @@
'</p>'].join(''),*/
defaultToolbar: [],
cols: [[
- {field: 'id', title: '缂栧彿', width: 70, align: 'center'},
+ {field: 'uuid', title: '璁㈠崟鍙�', width: 100, align: 'center'},
+ {field: 'inUuid', title: '椤圭洰缂栧彿'},
{field: 'name', title: '椤圭洰鍚嶇О'}
]],
done: function (res, curr, count) {
diff --git a/src/main/webapp/static/js/projectPlan/projectPlan.js b/src/main/webapp/static/js/projectPlan/projectPlan.js
index 3c2fd9d..c4adcfa 100644
--- a/src/main/webapp/static/js/projectPlan/projectPlan.js
+++ b/src/main/webapp/static/js/projectPlan/projectPlan.js
@@ -33,20 +33,20 @@
{type: 'checkbox', hide:true}
// ,{field: 'id', align: 'center',title: '鍞竴ID'}
,{field: 'itemId$', align: 'center',title: '椤圭洰鍚嶇О'}
- ,{field: 'flowId$', align: 'center',title: '鑺傜偣鍚嶇О'}
- ,{field: 'weightNum', align: 'center',title: '鏉冮噸鍊�'}
+ ,{field: 'flowId$', align: 'center',title: '鑺傜偣鍚嶇О', width:180}
+ ,{field: 'weightNum', align: 'center',title: '鏉冮噸鍊�', hide:true}
// ,{field: 'flowId', align: 'center',title: '鑺傜偣ID'}
- ,{field: 'startTime$', align: 'center',title: '璁″垝寮�濮嬫椂闂�'}
- ,{field: 'endTime$', align: 'center',title: '璁″垝缁撴潫鏃堕棿'}
- ,{field: 'realStartTime$', align: 'center',title: '瀹為檯寮�濮嬫椂闂�'}
- ,{field: 'realEndTime$', align: 'center',title: '瀹為檯缁撴潫鏃堕棿'}
- ,{field: 'delay', align: 'center',title: '寤舵湡澶╂暟'}
+ ,{field: 'startTime$', align: 'center',title: '璁″垝寮�濮嬫椂闂�', width:115}
+ ,{field: 'endTime$', align: 'center',title: '璁″垝缁撴潫鏃堕棿', width:115}
+ ,{field: 'realStartTime$', align: 'center',title: '瀹為檯寮�濮嬫椂闂�', width:115}
+ ,{field: 'realEndTime$', align: 'center',title: '瀹為檯缁撴潫鏃堕棿', width:115}
+ ,{field: 'delay', align: 'center',title: '寤舵湡澶╂暟', width:90}
,{field: 'delayReason', align: 'center',title: '寤舵湡鍘熷洜'}
,{field: 'memo', align: 'center',title: '澶囨敞'}
,{field: 'dutyDepartment', align: 'center',title: '璐ｄ换閮ㄩ棬'}
- ,{field: 'dutyMan', align: 'center',title: '璐ｄ换浜�'}
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
+ ,{field: 'dutyMan', align: 'center',title: '璐ｄ换浜�', width:80}
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:70}
]],
request: {
pageName: 'curr',
diff --git a/src/main/webapp/static/js/tableData.js b/src/main/webapp/static/js/tableData.js
index 1eebd15..524eba0 100644
--- a/src/main/webapp/static/js/tableData.js
+++ b/src/main/webapp/static/js/tableData.js
@@ -72,7 +72,7 @@
data:{},
success:function(res){
if(res.code==200){
- console.log(res)
+ // console.log(res)
data=res.data
// 鍒ゆ柇鏃堕棿鏄惁鏈塶ull 鏈塶ull鐨勬敼涓� ""
for(var i = 0;i<data.length;i++){
diff --git a/src/main/webapp/views/item/item.html b/src/main/webapp/views/item/item.html
index 8190698..4a6c989 100644
--- a/src/main/webapp/views/item/item.html
+++ b/src/main/webapp/views/item/item.html
@@ -41,6 +41,7 @@
<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-primary layui-btn-xs btn-edit" lay-event="initPlan">鐢熸垚璁″垝鑺傜偣</a>
<!-- <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">绂佺敤</a>-->
</script>
diff --git a/src/main/webapp/views/login.html b/src/main/webapp/views/login.html
index 7177d4a..156e667 100644
--- a/src/main/webapp/views/login.html
+++ b/src/main/webapp/views/login.html
@@ -148,13 +148,13 @@
<label class="layui-icon layui-icon-password"></label>
<input type="password" id="password" name="password" placeholder="璇疯緭鍏ョ櫥褰曞瘑鐮�" autocomplete="off" class="layui-input">
</div>
- <div id="code-box" class="layui-form-item">
- <label class="layui-icon layui-icon-vercode"></label>
- <input type="text" id="code" name="code" placeholder="鍥惧舰楠岃瘉鐮�" autocomplete="off" class="layui-input verification captcha">
- <div class="captcha-img" style="margin-right: 5px">
- <img id="codeImg" title="鐪嬩笉娓咃紵鐐瑰嚮鎹竴寮犮��">
- </div>
- </div>
+<!-- <div id="code-box" class="layui-form-item">-->
+<!-- <label class="layui-icon layui-icon-vercode"></label>-->
+<!-- <input type="text" id="code" name="code" placeholder="鍥惧舰楠岃瘉鐮�" autocomplete="off" class="layui-input verification captcha">-->
+<!-- <div class="captcha-img" style="margin-right: 5px">-->
+<!-- <img id="codeImg" title="鐪嬩笉娓咃紵鐐瑰嚮鎹竴寮犮��">-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-form-item">
<input type="checkbox" id="rememberPwd" value="true" lay-skin="primary" title="璁颁綇瀵嗙爜">
</div>
@@ -251,16 +251,16 @@
notice.msg('瀵嗙爜涓嶈兘涓虹┖', {icon: 2});
return false;
}
- if (data.code === '' && codeSwitch === 'Y') {
- $("#code").focus();
- notice.msg('楠岃瘉鐮佷笉鑳戒负绌�', {icon: 2});
- return false;
- }
- if (sessionStorage.getItem("code").toUpperCase() !== data.code.toUpperCase() && codeSwitch==='Y'){
- $("#code").focus();
- notice.msg('楠岃瘉鐮侀敊璇�', {icon: 2});
- return false;
- }
+ // if (data.code === '' && codeSwitch === 'Y') {
+ // $("#code").focus();
+ // notice.msg('楠岃瘉鐮佷笉鑳戒负绌�', {icon: 2});
+ // return false;
+ // }
+ // if (sessionStorage.getItem("code").toUpperCase() !== data.code.toUpperCase() && codeSwitch==='Y'){
+ // $("#code").focus();
+ // notice.msg('楠岃瘉鐮侀敊璇�', {icon: 2});
+ // return false;
+ // }
var user = {
username: data.username,
password: hex_md5(data.password)
diff --git a/src/main/webapp/views/projectPlan/projectPlan.html b/src/main/webapp/views/projectPlan/projectPlan.html
index ef5aeea..37849bf 100644
--- a/src/main/webapp/views/projectPlan/projectPlan.html
+++ b/src/main/webapp/views/projectPlan/projectPlan.html
@@ -90,7 +90,7 @@
<div class="layui-col-md9">
<div class="layui-card">
<div class="layui-card-body" style="padding: 10px;">
- <form class="layui-form toolbar">
+ <div class="layui-form toolbar">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">缂栧彿:</label>
@@ -104,7 +104,7 @@
</button>
</div>
</div>
- </form>
+ </div>
<table class="layui-hide" id="projectPlan" lay-filter="projectPlan"></table>
</div>
</div>
--
Gitblit v1.9.1