Merge remote-tracking branch 'origin/zypms' into zypms

whycq

2022-09-06 5ec06e72f39cae4dd599af6aa798c84c1919528b

Merge remote-tracking branch 'origin/zypms' into zypms

 src/main/java/zy/cloud/wms/manager/controller/ItemController.java

@@ -115,9 +115,7 @@
        /**
         * 控管
         */
        if (Cools.isEmpty(item.getHostId()) || item.getHostId() == 0){
            item.setHostId(1L);
        }

        if (Cools.isEmpty(item)) {
            return R.error("参数为空,请联系管理员");
        }
@@ -145,7 +143,11 @@
        item.setCustMan(cstmr.getName());
        item.setCustMobile(cstmr.getTel());
        item.setCustAdress(cstmr.getAddr());
        item.setHostId(getHostId());
        if (Cools.isEmpty(item.getHostId()) || item.getHostId() == 0){
            item.setHostId(1L);
        }else {
            item.setHostId(getHostId());
        }
        item.setCreateBy(getUserId());
        item.setCreateTime(new Date());
        item.setStatus(1);

 src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java

@@ -18,6 +18,9 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;

@RestController
@@ -126,6 +129,25 @@
        return R.ok();
    }

    @RequestMapping("/projectPlan/update/homepage")
    public R updateByHomepage(@RequestParam HashMap<String,Object> param){
        String itemId = (String) param.get("itemId");
        String weightNum = (String) param.get("weightNum");
        String realStartTime = (String) param.get("realStartTime");
        String realEndTime = (String) param.get("realEndTime");
        ProjectPlan projectPlan = projectPlanService.selectOne(new EntityWrapper<ProjectPlan>()
                .eq("item_id", itemId)
                .eq("weight_num", weightNum));
        try {
            projectPlan.setRealStartTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(realStartTime));
            projectPlan.setRealEndTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(realEndTime));
        } catch (ParseException e) {
            throw new RuntimeException(e);
        }
        projectPlanService.updateById(projectPlan);
        return R.ok();
    }

    @RequestMapping(value = "/projectPlan/delete/auth")
    @ManagerAuth
    public R delete(@RequestParam(value = "ids[]") Long[] ids) {

 src/main/java/zy/cloud/wms/manager/entity/Item.java

@@ -150,6 +150,7 @@




    @TableField(value = "real_start_time", strategy = FieldStrategy.IGNORED)
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date realStartTime;
@@ -690,6 +691,15 @@
        return null;
    }

    public String getType$$(){
        if (this.type.equals("10")) {
            return "集成项目";
        }else {
            return "常规项目";
        }

    }

    public void setUpdateBy(Long updateBy) {
        this.updateBy = updateBy;
    }

 src/main/webapp/static/js/itemTable.js

@@ -42,7 +42,9 @@
        cols: [[
            {field: 'uuid', title: '订单号', width: 100, align: 'center'},
            {field: 'inUuid', title: '项目编号'},
            {field: 'name', title: '项目名称'}
            {field: 'name', title: '项目名称'},
            {field: 'type$$', title: '项目类型'}

        ]],
        done: function (res, curr, count) {
            $('#dictTable+.layui-table-view .layui-table-body tbody>tr:first').trigger('click');