parent: bbb54c1a | 补丁 | 提交 | ignore whitespace
mrzhssss
2022-01-11 cf22fb461f13b7136807fc5272e8ef254ff29db4 
完成提交
5个文件已修改
1 文件已重命名
252 ■■■■■ 已修改文件
src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java 58 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/manager/entity/ProjectPlan.java 57 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/projectPlan/projectPlan.js 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/item/item.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/projectPlan/projectPlan.html 119 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
version/db/zypms20220111.bak 补丁 | 查看 | 原始文档 | blame | 历史 
 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();


    }






 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= "创建人id")


    @TableField("create_id")


    private Integer createId;


    private Long createId;




    /**


     * 修改时间


@@ -165,7 +168,7 @@


     */


    @ApiModelProperty(value= "修改人id")


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




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




        }


    });


}


}






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




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


<!--    &lt;!&ndash; 待添加 &ndash;&gt;-->


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


    <!--    &lt;!&ndash; 待添加 &ndash;&gt;-->


    <!--    <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="请输入项目ID" 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="请输入项目ID" 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="请输入权重ID" lay-vertype="tips" lay-verify="required">


                        <input class="layui-input" name="weightNum" placeholder="请输入权重ID" 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="请输入节点ID" lay-vertype="tips" lay-verify="required">


                        <input class="layui-input" name="flowId" placeholder="请输入节点ID" 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">创建人id: </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">修改人id: </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">创建人id: </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">修改人id: </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>




 version/db/zypms20220111.bak

Binary files differ