From 24f998b69143b99846b646d05ecf185058ae5072 Mon Sep 17 00:00:00 2001 From: wang..123 <brook_w@163.com> Date: 星期五, 25 三月 2022 10:43:44 +0800 Subject: [PATCH] # --- src/main/webapp/static/js/itemBusiness/itemBusiness.js | 4 +- src/main/webapp/static/js/itemManager/itemManager.js | 4 +- src/main/webapp/views/item/item.html | 8 ++-- src/main/webapp/views/itemManager/itemManager.html | 8 ++-- src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java | 54 +++++++++++++++++++++++++-- src/main/webapp/views/itemBusiness/itemBusiness.html | 4 +- src/main/webapp/static/js/item/item.js | 4 +- 7 files changed, 66 insertions(+), 20 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 a379794..e107a13 100644 --- a/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java +++ b/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java @@ -301,15 +301,61 @@ itemsDTO.setPlaninAmt(item.getPlaninAmt()); itemsDTO.setRealinAmt(item.getRealinAmt()); itemsDTO.setType(item.getType()); + + //add + Integer type = Integer.parseInt(item.getType()); + List<ProjectPlan> allPlans = projectPlanService.selectList(new EntityWrapper<ProjectPlan>() .eq("item_id", item.getId())); for (ProjectPlan projectPlan : allPlans) { FlowsDTO flowsDTO = new FlowsDTO(); flowsDTO.setName(projectPlan.getFlowId$()); - flowsDTO.setStartTime(projectPlan.getStartTime$()); - flowsDTO.setEndTime$(projectPlan.getEndTime$()); - flowsDTO.setRealStartTime$(projectPlan.getRealStartTime$()); - flowsDTO.setRealEndTime$(projectPlan.getRealEndTime$()); + if(type==5) { + if(projectPlan.getFlowId()>=8 && projectPlan.getFlowId()<11){ + flowsDTO.setStartTime("-"); + flowsDTO.setEndTime$("-"); + }else{ + flowsDTO.setStartTime(projectPlan.getStartTime$()); + flowsDTO.setEndTime$(projectPlan.getEndTime$()); + flowsDTO.setRealStartTime$(projectPlan.getRealStartTime$()); + flowsDTO.setRealEndTime$(projectPlan.getRealEndTime$()); + } + }else if(type==1 || type==2 || type==6 || type==9) { + if((projectPlan.getFlowId()>=8&&projectPlan.getFlowId()<11) || projectPlan.getFlowId()==2 || projectPlan.getFlowId()==6){ + flowsDTO.setStartTime("-"); + flowsDTO.setEndTime$("-"); + }else{ + flowsDTO.setStartTime(projectPlan.getStartTime$()); + flowsDTO.setEndTime$(projectPlan.getEndTime$()); + flowsDTO.setRealStartTime$(projectPlan.getRealStartTime$()); + flowsDTO.setRealEndTime$(projectPlan.getRealEndTime$()); + } + }else if(type==3 || type==8){ + if((projectPlan.getFlowId()>=8&&projectPlan.getFlowId()<11) || projectPlan.getFlowId()==6){ + flowsDTO.setStartTime("-"); + flowsDTO.setEndTime$("-"); + }else{ + flowsDTO.setStartTime(projectPlan.getStartTime$()); + flowsDTO.setEndTime$(projectPlan.getEndTime$()); + flowsDTO.setRealStartTime$(projectPlan.getRealStartTime$()); + flowsDTO.setRealEndTime$(projectPlan.getRealEndTime$()); + } + } else if(type==4){ + if((projectPlan.getFlowId()>=8&&projectPlan.getFlowId()<11) || projectPlan.getFlowId()==6){ + flowsDTO.setStartTime("-"); + flowsDTO.setEndTime$("-"); + }else{ + flowsDTO.setStartTime(projectPlan.getStartTime$()); + flowsDTO.setEndTime$(projectPlan.getEndTime$()); + flowsDTO.setRealStartTime$(projectPlan.getRealStartTime$()); + flowsDTO.setRealEndTime$(projectPlan.getRealEndTime$()); + } + }else if(type==10){ + flowsDTO.setStartTime(projectPlan.getStartTime$()); + flowsDTO.setEndTime$(projectPlan.getEndTime$()); + flowsDTO.setRealStartTime$(projectPlan.getRealStartTime$()); + flowsDTO.setRealEndTime$(projectPlan.getRealEndTime$()); + } flows.add(flowsDTO); } itemsDTO.setNodes(flows); diff --git a/src/main/webapp/static/js/item/item.js b/src/main/webapp/static/js/item/item.js index e40e58d..cdd15b8 100644 --- a/src/main/webapp/static/js/item/item.js +++ b/src/main/webapp/static/js/item/item.js @@ -24,9 +24,9 @@ {type: 'checkbox'} // ,{field: 'id', align: 'center',title: 'ID'} // ,{field: 'hostId', align: 'center',title: ''} - ,{field: 'uuid', align: 'center',title: '椤圭洰缂栧彿'} + ,{field: 'uuid', align: 'center',title: '璁㈠崟鍙�'} ,{field: 'name', align: 'center',title: '椤圭洰鍚嶇О'} - ,{field: 'inUuid', align: 'center',title: '鍐呴儴缂栧彿', hide: true} + ,{field: 'inUuid', align: 'center',title: '椤圭洰缂栧彿', hide: true} // ,{field: 'cstmrUuid', align: 'center',title: '瀹㈡埛缂栧彿'} ,{field: 'cstmrUuid$', align: 'center',title: '瀹㈡埛鍚嶇О'} ,{field: 'projectStatus$', align: 'center', title: '椤圭洰杩涘害'} diff --git a/src/main/webapp/static/js/itemBusiness/itemBusiness.js b/src/main/webapp/static/js/itemBusiness/itemBusiness.js index 41aa8c3..5869e00 100644 --- a/src/main/webapp/static/js/itemBusiness/itemBusiness.js +++ b/src/main/webapp/static/js/itemBusiness/itemBusiness.js @@ -24,9 +24,9 @@ {type: 'checkbox'} // ,{field: 'id', align: 'center',title: 'ID'} // ,{field: 'hostId', align: 'center',title: ''} - ,{field: 'uuid', align: 'center',title: '椤圭洰缂栧彿'} + ,{field: 'uuid', align: 'center',title: '璁㈠崟鍙�'} ,{field: 'name', align: 'center',title: '椤圭洰鍚嶇О'} - ,{field: 'inUuid', align: 'center',title: '鍐呴儴缂栧彿', hide: true} + ,{field: 'inUuid', align: 'center',title: '椤圭洰缂栧彿', hide: true} // ,{field: 'cstmrUuid', align: 'center',title: '瀹㈡埛缂栧彿'} // ,{field: 'cstmrUuid$', align: 'center',title: '瀹㈡埛鍚嶇О'} ,{field: 'projectStatus$', align: 'center', title: '椤圭洰杩涘害'} diff --git a/src/main/webapp/static/js/itemManager/itemManager.js b/src/main/webapp/static/js/itemManager/itemManager.js index 30d5da2..d9f48f2 100644 --- a/src/main/webapp/static/js/itemManager/itemManager.js +++ b/src/main/webapp/static/js/itemManager/itemManager.js @@ -24,9 +24,9 @@ {type: 'checkbox'} // ,{field: 'id', align: 'center',title: 'ID'} // ,{field: 'hostId', align: 'center',title: ''} - ,{field: 'uuid', align: 'center',title: '椤圭洰缂栧彿'} + ,{field: 'uuid', align: 'center',title: '璁㈠崟鍙�'} ,{field: 'name', align: 'center',title: '椤圭洰鍚嶇О'} - ,{field: 'inUuid', align: 'center',title: '鍐呴儴缂栧彿', hide: true} + ,{field: 'inUuid', align: 'center',title: '椤圭洰缂栧彿', hide: true} // ,{field: 'cstmrUuid', align: 'center',title: '瀹㈡埛缂栧彿'} ,{field: 'progressRate', align: 'center',title: '杩涘害'} ,{field: 'planCarInfo', align: 'center', title: '棰勮杞﹁締澶у皬'} diff --git a/src/main/webapp/views/item/item.html b/src/main/webapp/views/item/item.html index 24c5714..8190698 100644 --- a/src/main/webapp/views/item/item.html +++ b/src/main/webapp/views/item/item.html @@ -57,15 +57,15 @@ <div class="layui-row"> <div class="layui-col-md6"> <div class="layui-form-item"> - <label class="layui-form-label">椤圭洰缂栧彿: </label> + <label class="layui-form-label">璁㈠崟鍙�: </label> <div class="layui-input-block"> - <input class="layui-input" name="uuid" placeholder="璇疯緭鍏ラ」鐩紪鍙�" > + <input class="layui-input" name="uuid" placeholder="璇疯緭鍏ヨ鍗曞彿" > </div> </div> <div class="layui-form-item"> - <label class="layui-form-label">鍐呴儴缂栧彿: </label> + <label class="layui-form-label">椤圭洰缂栧彿: </label> <div class="layui-input-block"> - <input class="layui-input" name="inUuid" placeholder="璇疯緭鍏ュ唴閮ㄧ紪鍙�"> + <input class="layui-input" name="inUuid" placeholder="璇疯緭鍏ラ」鐩紪鍙�"> </div> </div> <div class="layui-form-item"> diff --git a/src/main/webapp/views/itemBusiness/itemBusiness.html b/src/main/webapp/views/itemBusiness/itemBusiness.html index d355f6a..46db8e7 100644 --- a/src/main/webapp/views/itemBusiness/itemBusiness.html +++ b/src/main/webapp/views/itemBusiness/itemBusiness.html @@ -57,9 +57,9 @@ <div class="layui-row"> <div class="layui-col-md6"> <div class="layui-form-item"> - <label class="layui-form-label">椤圭洰缂栧彿: </label> + <label class="layui-form-label">璁㈠崟鍙�: </label> <div class="layui-input-block"> - <input class="layui-input" name="uuid" placeholder="璇疯緭鍏ラ」鐩紪鍙�"> + <input class="layui-input" name="uuid" placeholder="璇疯緭鍏ヨ鍗曞彿"> </div> </div> <div class="layui-form-item"> diff --git a/src/main/webapp/views/itemManager/itemManager.html b/src/main/webapp/views/itemManager/itemManager.html index 42de3cf..c895f9f 100644 --- a/src/main/webapp/views/itemManager/itemManager.html +++ b/src/main/webapp/views/itemManager/itemManager.html @@ -57,15 +57,15 @@ <div class="layui-row"> <div class="layui-col-md6"> <div class="layui-form-item"> - <label class="layui-form-label">椤圭洰缂栧彿: </label> + <label class="layui-form-label">璁㈠崟鍙�: </label> <div class="layui-input-block"> - <input class="layui-input" name="uuid" placeholder="璇疯緭鍏ラ」鐩紪鍙�"> + <input class="layui-input" name="uuid" placeholder="璇疯緭鍏ヨ鍗曞彿"> </div> </div> <div class="layui-form-item"> - <label class="layui-form-label">鍐呴儴缂栧彿: </label> + <label class="layui-form-label">椤圭洰缂栧彿: </label> <div class="layui-input-block"> - <input class="layui-input" name="inUuid" placeholder="璇疯緭鍏ュ唴閮ㄧ紪鍙�"> + <input class="layui-input" name="inUuid" placeholder="璇疯緭鍏ラ」鐩紪鍙�"> </div> </div> <div class="layui-form-item"> -- Gitblit v1.9.1