wms_saas.git - Gitblit

parent: f3ed1f9e | 补丁 | 提交 | ignore whitespace

wang..123

2022-03-25 24f998b69143b99846b646d05ecf185058ae5072

7个文件已修改

	src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java	54 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/static/js/item/item.js	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/static/js/itemBusiness/itemBusiness.js	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/static/js/itemManager/itemManager.js	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/views/item/item.html	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/views/itemBusiness/itemBusiness.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/views/itemManager/itemManager.html	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 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);

 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: '项目进度'}

 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: '项目进度'}

 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: '预计车辆大小'}

 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">

 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">

 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">

			@@ -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);

			@@ -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: '项目进度'}

			@@ -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">

			@@ -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">