111

k94314517

2023-08-15 ea939151c7a7ea7c26d302e200c263d817b5abc7

111

 server/src/main/java/doumeemes/api/ext/PlansExtController.java

@@ -3,6 +3,7 @@
import doumeemes.config.rocketmq.MqConfig;
import doumeemes.config.rocketmq.RocketMessageProducer;
import doumeemes.core.utils.DateUtil;
import doumeemes.dao.business.dto.AutoWorkReportDTO;
import doumeemes.dao.business.model.Workorder;
import doumeemes.dao.ext.vo.PlansExtListCountVO;
import doumeemes.dao.ext.vo.PlansExtListH5VO;
@@ -221,6 +222,14 @@
        return ApiResponse.success(plansExtService.pageCount(param));
    }


    @ApiOperation("一键报工")
    @PostMapping("/autoWorkReport")
    public ApiResponse autoWorkReport (@RequestBody AutoWorkReportDTO autoWorkReportDTO) {
        plansExtService.autoWorkReport(getLoginUser(),autoWorkReportDTO);
        return ApiResponse.success("操作成功");
    }

    /**
     * 批量导入计划
     *

 server/src/main/java/doumeemes/dao/business/dto/AutoWorkReportDTO.java

@@ -1,5 +1,7 @@
package doumeemes.dao.business.dto;

import com.baomidou.mybatisplus.annotation.TableField;
import doumeemes.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -18,6 +20,13 @@
    @ApiModelProperty(value = "工序计划主键")
    private Integer plansId;

    @ApiModelProperty(value = "设备主键", example = "1")
    private Integer proGroupId;

    @ApiModelProperty(value = "生产人员编码集合" )
    @TableField(exist = false)
    private List<Integer> proUserList;

    @ApiModelProperty(value = "投料记录")
    private List<MaterialListDTO> recordList ;


 server/src/main/java/doumeemes/dao/business/model/Workorder.java

@@ -225,30 +225,4 @@
    @TableField(exist = false)
    private List<WorkorderUser>  workorderUserList;


    @ApiModelProperty(value = "报工时长（秒）", example = "1")
    @ExcelColumn(name="报工时长（秒）")
    private Integer duration;

    @ApiModelProperty(value = "工资结果（元)", example = "1")
    @ExcelColumn(name="工资结果（元)")
    private Integer salary;
    @ApiModelProperty(value = "工资单价（元)", example = "1")
    @ExcelColumn(name="工资单价（元)")
    private Integer salaryPrice;
    @ApiModelProperty(value = "标准数量", example = "1")
    @ExcelColumn(name="标准数量")
    private Integer salaryNum;

    @ApiModelProperty(value = "标准时长（秒）")
    @ExcelColumn(name="标准时长（秒）")
    private String salaryTimes;

    @ApiModelProperty(value = "不良品是否计入 0否 1是", example = "1")
    @ExcelColumn(name="不良品是否计入 0否 1是")
    private Integer salaryUnqualified;

    @ApiModelProperty(value = "计价方式 0计件 1计时", example = "1")
    @ExcelColumn(name="计价方式 0计件 1计时")
    private Integer salaryType;
}

 server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java

@@ -1585,10 +1585,8 @@
        Workorder param = new Workorder();
        param.setPlanId(autoWorkReportDTO.getPlansId());
        param.setPlanDate(new Date());
        List<Integer> proUserList = new ArrayList<Integer>();
        //TODO
        proUserList.add(user.getId());
        param.setProUserList(proUserList);
        param.setProGroupId(autoWorkReportDTO.getProGroupId());
        param.setProUserList(autoWorkReportDTO.getProUserList());
        param.setPlanNum(plans.getNum());
        //生成工单信息
        Workorder workorder = this.distributeDone(user,param,plans.getNum());

 server/src/main/java/doumeemes/service/system/impl/WxLoginServiceImpl.java

@@ -134,7 +134,7 @@
            loginLog.setSuccess(Boolean.TRUE);
            systemLoginLogService.create(loginLog);
            String session = (String)subject.getSession().getId();
            wxLoginVO.setLoginStatus(Constants.ONE);
            wxLoginVO.setLoginStatus(Constants.ZERO);
            wxLoginVO.setSession(session);
            return wxLoginVO;
        }catch (AuthenticationException e) {