# 修改配置角色 报角色编码存在

jiaosong

2023-08-22 607cff1cefe640dee994e6d18d5f6a8f23c62755

# 修改配置角色 报角色编码存在

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

@@ -30,10 +30,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import java.util.ArrayList;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
import java.util.*;

/**
 * ç”Ÿäº§è®¾å¤‡ä¿¡æ¯æŽ¥å£
@@ -162,7 +159,7 @@
        find.setModel(device.getModel());
        find.setProcedureId(device.getProcedureId());
        find.setStationCode(device.getStationCode());
        find.setType(device.getType());
        find.setType(Objects.nonNull(device.getType()) ? device.getType() : Constants.ONE);
        find.setGroupId(device.getGroupId());
        find.setProduceWarehouseLocationId(device.getProduceWarehouseLocationId());
        find.setFinishWarehouseLocationId(device.getFinishWarehouseLocationId());

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

@@ -181,12 +181,18 @@



    @ApiOperation("导出Excel")
    @ApiOperation("生产产出导出Excel")
    @PostMapping("/exportExcel")
   // @RequiresPermissions("ext:workorderrecordext:exportExcel")
    public void exportExcel (@RequestBody PageWrap<QueryWorkorderRecordExtDTO> pageWrap, HttpServletResponse response) {
        workorderRecordExtService.exportExcel(pageWrap,response);
    }

    @ApiOperation("生产投料导出Excel")
    @PostMapping("/exportExcelFeeding")
    public void exportExcelFeeding(@RequestBody PageWrap<QueryWorkorderRecordExtDTO> pageWrap ,HttpServletResponse response){
        workorderRecordExtService.exportExcel2(pageWrap,response);
    }
    @ApiOperation("导出员工绩效明细")
    @PostMapping("/exportUserSalary")
    public void exportUserSalary (@RequestBody PageWrap<QueryUserSalaryListDTO> pageWrap, HttpServletResponse response) {

 server/src/main/java/doumeemes/dao/ext/vo/WorkorderRecordBathExportExtListVO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,72 @@
package doumeemes.dao.ext.vo;

import doumeemes.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @author T14
 */
@Data
@ApiModel("生产投料明细")
public class WorkorderRecordBathExportExtListVO {


    @ApiModelProperty(value = "工单编号")
    @ExcelColumn(name = "工单编号",index =1 ,width =15)
    private String workordercode;

    @ApiModelProperty(value = "工单状态 0已创建、1已备料、2已完工、3已检验、4已报工、5已入库、6已取消", example = "1")
    @ExcelColumn(name="工单状态", index = 2,width =15)
    private String status;

    @ApiModelProperty(value = "编码，不可重复")
    @ExcelColumn(name="物料编码",index =3,width =15)
    private String materialcode;

    @ApiModelProperty(value = "名称，不可重复")
    @ExcelColumn(name="物料名称",index =4,width =15)
    private String materialname;

    @ApiModelProperty(value = "批次号")
    @ExcelColumn(name="生产批次号",index =5,width =15)
    private String batch;

    @ApiModelProperty(value = "工序")
    @ExcelColumn(name="工序",index =6,width =15)
    private String proceduresname;

    @ApiModelProperty(value = "计划数量")
    @ExcelColumn(name="计划数量",index =7,width =15)
    private String planNum;

    @ApiModelProperty(value = "单位名称")
    private String unitname;

    @ApiModelProperty(value = "生产员工")
    @ExcelColumn(name="生产员工",index =8,width =15)
    private String  procedureName;

    @ApiModelProperty(value = "质量属性0合格 1不良 2报废（只有type=1才有值）")
    @ExcelColumn(name="质量属性",index = 9,width =15,valueMapping = "0=合格;1=不良;2=报废")
    private Integer materialDonetype;

    @ApiModelProperty(value = "数量", example = "1")
    @ExcelColumn(name="数量",index = 10,width =15)
    private String num;

//    @ExcelColumn(name="单位",index =11,width =15)
    private String unintname;


    @ApiModelProperty(value = "设备")
    @ExcelColumn(name="设备",index =11,width =15)
    private String deviceCode;

    @ApiModelProperty(value = "投料时间")
    @ExcelColumn(name="投料时间",index =12,width =15)
    private String createTime;


}

 server/src/main/java/doumeemes/dao/ext/vo/WorkorderRecordExportExtListVO.java

@@ -46,31 +46,41 @@
    @ApiModelProperty(value = "单位名称")
    private String unitname;

  /*  @ApiModelProperty(value = "计划数量")
    @ExcelColumn(name="计划数量",index =8)
    private String procedurenum;*/

    @ApiModelProperty(value = "生产员工")
    @ExcelColumn(name="生产员工",index =8,width =15)
    private String  procedureName;

    @ApiModelProperty(value = "报工类型0合格 1不良,2报废（只有type=1才有值）")
    @ExcelColumn(name="报工类型",index =9,width =15)
    private String doneType;
    @ApiModelProperty(value = "检验合格数量", example = "1")
    @ExcelColumn(name="检验合格数量",index = 9,width =15)
    private String qualifiedNum;

    @ApiModelProperty(value = "检验不合格数量", example = "1")
    @ExcelColumn(name="检验不合格数量",index = 10,width =15)
    private String unqualifiedNum;

  /*  @ApiModelProperty(value = "计划数量")
    @ExcelColumn(name="计划数量",index =8)
    private String procedurenum;*/


    @ApiModelProperty(value = "数量")
    @ExcelColumn(name="数量",index =10,width =15)
    @ExcelColumn(name="报工数量",index =11,width =15)
    private String appliancenum;

    @ApiModelProperty(value = "单位")
    @ExcelColumn(name="单位",index =11,width =15)
//    @ExcelColumn(name="单位",index =11,width =15)
    private String unintname;

    @ApiModelProperty(value = "工装器具")
    @ExcelColumn(name="工装器具",index =12,width =15)
//    @ApiModelProperty(value = "工装器具")
//    @ExcelColumn(name="工装器具",index =12,width =15)
    private String appliancecode;


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


    @ApiModelProperty(value = "设备")
    @ExcelColumn(name="设备",index =13,width =15)
    private String deviceCode;

 server/src/main/java/doumeemes/service/ext/WorkorderRecordExtService.java

@@ -49,6 +49,9 @@

   void exportExcel(PageWrap<QueryWorkorderRecordExtDTO> pageWrap ,HttpServletResponse response);


    void exportExcel2(PageWrap<QueryWorkorderRecordExtDTO> pageWrap ,HttpServletResponse response);

   PageData<SalaryStatisticsListVO> salaryStatistic(PageWrap<QuerySalaryStatisticDTO> pageWrap);

    PageData<UserSalaryListVO> userSalaryPage(PageWrap<QueryUserSalaryListDTO> pageWrap);

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

@@ -1737,45 +1737,81 @@
                unintname = re.getUmodel().getName();
            }
            if (re.getPmodel() != null) {
                Integer pmodelnum = re.getPmodel().getNum() != null ? re.getPmodel().getNum() : 0;
                BigDecimal pmodelnum = re.getNum() != null ? re.getNum() : new BigDecimal("0");
               // wreev.setPlanNum( new BigDecimal(pmodelnum).stripTrailingZeros().toPlainString() + unintname);
                wreev.setPlanNum( new BigDecimal(pmodelnum).stripTrailingZeros().toPlainString() );
            }
            if (re.getDoneType() != null) {
                switch (re.getDoneType()) {
                    case 0:
                        wreev.setDoneType("合格");
                        break;
                    case 1:
                        wreev.setDoneType("不良");
                        break;
                    case 2:
                        wreev.setDoneType("报废");
                        break;
                    default:
                        break;
                }
                wreev.setPlanNum( re.getNum().stripTrailingZeros().toPlainString()+unintname);
            }
                wreev.setProcedureName(re.getProcedureName());
                wreev.setUnintname(unintname);
                if(re.getNum()!=null){
                    wreev.setAppliancenum(re.getNum().stripTrailingZeros().toPlainString() );
                    wreev.setAppliancenum(re.getNum().stripTrailingZeros().toPlainString()+unintname );
                }

                wreev.setUnintname(unintname);

                if (re.getAmodel() != null) {
                    wreev.setAppliancecode(re.getAmodel().getCode());
                }

                wreev.setDeviceCode(re.getDeviceCode()+"|"+re.getDeviceName());
                wreev.setCreateTime(format.format(re.getCreateTime()));
                wreev.setQualifiedNum(re.getQualifiedNum()+unintname);
                wreev.setUnqualifiedNum(re.getUnqualifiedNum()+unintname);
                wreev.setDuration(re.getDuration());
                list.add(wreev);

        }
        ExcelExporter.build(WorkorderRecordExportExtListVO.class).export(list, "工单生产过程记录"+System.currentTimeMillis(), response);
        ExcelExporter.build(WorkorderRecordExportExtListVO.class).export(list, "生产产出明细"+System.currentTimeMillis(), response);

       // EasyExcelUtil.exportExcel(list, "工单生产过程记录","工单生产过程记录",WorkorderRecordExportExtListVO.class,"工单生产过程记录"+System.currentTimeMillis()+".xls", response);
    }

    @Override
    public void exportExcel2(PageWrap<QueryWorkorderRecordExtDTO> pageWrap, HttpServletResponse response) {

        List<WorkorderRecordExtListVO> result=this.findPage(pageWrap).getRecords();
        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
        List<WorkorderRecordBathExportExtListVO> list=new ArrayList<>();
        for(int i=0;i<result.size();i++) {
            WorkorderRecordExtListVO re = result.get(i);
            WorkorderRecordBathExportExtListVO wreev = new WorkorderRecordBathExportExtListVO();
            if (re.getOmodel() != null) {
                wreev.setWorkordercode(re.getOmodel().getCode());
                if (re.getOmodel().getStatus() != null) {
                    String status = Constants.WORKORDER_STATUS.getTitleByStatus(null, re.getOmodel().getStatus());
                    wreev.setStatus(status);
                }
            }
            if (re.getMmodel() != null) {
                wreev.setMaterialcode(re.getMmodel().getCode());
                wreev.setMaterialname(re.getMmodel().getName());
            }

            wreev.setBatch(re.getBatch());
            if (re.getPromodel() != null) {
                wreev.setProceduresname(re.getPromodel().getName());
            }

            String unintname = "";
            if (re.getUmodel() != null) {
                unintname = re.getUmodel().getName();
            }
            if (re.getNum() != null) {
                BigDecimal pmodelnum = re.getNum() != null ? re.getNum() : new BigDecimal("0");
                // wreev.setPlanNum( new BigDecimal(pmodelnum).stripTrailingZeros().toPlainString() + unintname);
                wreev.setNum( pmodelnum.stripTrailingZeros().toPlainString()+unintname);
            }
            wreev.setProcedureName(re.getProcedureName());
            wreev.setUnintname(unintname);
            if(re.getOmodel().getPlanNum() != null){
                wreev.setPlanNum(re.getOmodel().getPlanNum()+unintname );
            }
            wreev.setMaterialDonetype(re.getMaterialDonetype());
            wreev.setDeviceCode(re.getDeviceCode()+"|"+re.getDeviceName());
            wreev.setCreateTime(format.format(re.getCreateTime()));
            list.add(wreev);

        }
        ExcelExporter.build(WorkorderRecordBathExportExtListVO.class).export(list, "生产投料明细"+System.currentTimeMillis(), response);

    }
}