diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/ProLineDTO.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/ProLineDTO.java new file mode 100644 index 000000000..b120308a8 --- /dev/null +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/ProLineDTO.java @@ -0,0 +1,93 @@ +package com.op.system.api.domain.mes; + +//线体成型机类 +public class ProLineDTO { + private String key; + private String label; + private String lineCode; + private String lineName; + private Long efficiency; + private String dh; + private String factoryDh; + private String umrez; + + public String getUmrez() { + return umrez; + } + + public void setUmrez(String umrez) { + this.umrez = umrez; + } + + public String getFactoryDh() { + return factoryDh; + } + + public void setFactoryDh(String factoryDh) { + this.factoryDh = factoryDh; + } + + public Long getEfficiency() { + return efficiency; + } + + public void setEfficiency(Long efficiency) { + this.efficiency = efficiency; + } + + public String getDh() { + return dh; + } + + public void setDh(String dh) { + this.dh = dh; + } + + public String getLineCode() { + return lineCode; + } + + public void setLineCode(String lineCode) { + this.lineCode = lineCode; + } + + public String getLineName() { + return lineName; + } + + public void setLineName(String lineName) { + this.lineName = lineName; + } + + @Override + public String toString() { + return "ProLine{" + + "key='" + key + '\'' + + ", label='" + label + '\'' + + '}'; + } + + public String getKey() { + return key; + } + + public void setKey(String key) { + this.key = key; + } + + public String getLabel() { + return label; + } + + public void setLabel(String label) { + this.label = label; + } + + public ProLineDTO(String key, String label) { + this.key = key; + this.label = label; + } + + public ProLineDTO() { + } +} diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/ChartDTO.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/ChartDTO.java index c070aa2ee..8cc3049bd 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/ChartDTO.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/ChartDTO.java @@ -14,10 +14,47 @@ import java.util.List; * @author zxl * @date 2023-07-18 */ -public class ChartDTO { +public class ChartDTO{ private String name; private String type; private List data; + private Label label; + + public static class Label{ + private Boolean show; + private String position; + public Label(Boolean show,String position) { + this.show = show; + this.position = position; + } + public void setShow(Boolean show) { + this.show = show; + } + + public Boolean getShow() { + return show; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } + } + + public Label getLabel() { + return label; + } + + public void setLabel(Label label) { + this.label = label; + } + + public ChartDTO() { + this.label = new Label(true,"top"); + } public String getType() { return type; diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesLine.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesLine.java index 97ae9ce69..6dbc45d1f 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesLine.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesLine.java @@ -35,6 +35,7 @@ public class MesLine extends BaseEntity { * 线体名称 */ private String lineName; + private String sapCode; /** * 标准用人 @@ -84,6 +85,14 @@ public class MesLine extends BaseEntity { private BigDecimal standarXl;//标准效率 private BigDecimal actXl;//实际效率 + public String getSapCode() { + return sapCode; + } + + public void setSapCode(String sapCode) { + this.sapCode = sapCode; + } + public BigDecimal getHourEfficiency() { return hourEfficiency; } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesLineMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesLineMapper.java index c578bd0d0..5b18a1736 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesLineMapper.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesLineMapper.java @@ -1,9 +1,11 @@ package com.op.mes.mapper; import java.util.List; +import java.util.Map; import com.op.mes.domain.MesLine; import com.op.mes.domain.MesLineProduct; +import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.Mapper; /** @@ -75,4 +77,6 @@ public interface MesLineMapper { int insertLineProduct(MesLine mesLine); void updateLineProduct(MesLine mesLine); + @MapKey("sapCode") + Map getEquMap(); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesLineServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesLineServiceImpl.java index f683ea815..c6a47a7da 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesLineServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesLineServiceImpl.java @@ -4,6 +4,7 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; import com.baomidou.dynamic.datasource.annotation.DS; @@ -91,7 +92,8 @@ public class MesLineServiceImpl implements IMesLineService { @Override @DS("#header.poolName") public List selectMesLineList(MesLine mesLine) { - return mesLineMapper.selectMesLineList(mesLine); + List dtos = mesLineMapper.selectMesLineList(mesLine); + return dtos; } /** @@ -219,11 +221,17 @@ public class MesLineServiceImpl implements IMesLineService { @Transactional public AjaxResult importOrder(List mesLineList) { + Map equMap = mesLineMapper.getEquMap(); + for(MesLine mesLineProduct:mesLineList){ String factoryCode = ServletUtils.getRequest().getHeader("PoolName").replace("ds_",""); mesLineProduct.setFactoryCode(factoryCode); mesLineProduct.setCreateBy(SecurityUtils.getUsername()); mesLineProduct.setCreateTime(DateUtils.getNowDate()); + MesLine mesEqu = equMap.get(mesLineProduct.getLineCode()); + if(mesEqu != null){ + mesLineProduct.setLineCode(mesEqu.getLineCode()); + } } // 数据校验 diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesLineMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesLineMapper.xml index 633026fb0..28b0c5898 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesLineMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesLineMapper.xml @@ -227,5 +227,11 @@ where del_flag = '0' and line_code = #{lineCode} and product_code = #{productCode} + diff --git a/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java b/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java index 5569f5710..cd75c5692 100644 --- a/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java +++ b/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java @@ -115,6 +115,8 @@ public class OpenController extends BaseController { if (StringUtils.isBlank(qcCheckTaskProduce.getFactoryCode())) { return error("[factoryCode]不能为空"); } + //工单未 + //添加检测任务 int flag = openService.insertQcCheckTaskProduce(qcCheckTaskProduce); if(flag != -100){ diff --git a/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java b/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java index ea57ee58c..9d6f77c1c 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java @@ -303,7 +303,7 @@ public class ProOrderWorkorderController extends BaseController { newBatch.setWorkorderCode(workorderCode); return toAjax(proOrderWorkorderService.deleteWorkOrderBatch(newBatch)); } - + /**获取线体**/ @GetMapping("/getProdLineList") public List getProdLineList() { return proOrderWorkorderService.getProdLineList(); diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml index d360464f4..c3aaa907b 100644 --- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml +++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml @@ -99,6 +99,7 @@ and pow.del_flag = '0' + order by pow.product_date desc SELECT - concat(q.material_code,'-',q.project_no,'-',CONVERT(varchar(10),q.ymdms, 120)) yearMonth, - material_code materialCode, + concat(q.cpkType,'-',q.ymdms) yearMonth, ymdms,rule_name ruleName, project_no projectNo, STUFF( @@ -480,6 +479,7 @@ where qct.check_type = #{checkType} and qctd.property_code = '1' and qct.check_time is not null and CONVERT(varchar(7),qct.income_time, 120) >= #{ymArrayStart} and #{ymArrayEnd} >=CONVERT(varchar(7),qct.income_time,120) + and qct.check_loc = #{checkLoc} and qctd.project_id = #{projectId} and bpa.cpk_type = #{cpkType} ) t WHERE t.cpkType = q.cpkType and t.project_no = q.project_no and t.ymdms=q.ymdms @@ -497,6 +497,7 @@ where qct.check_type = #{checkType} and qctd.property_code = '1' and qct.check_time is not null and CONVERT(varchar(7),qct.income_time, 120) >= #{ymArrayStart} and #{ymArrayEnd}>=CONVERT(varchar(7),qct.income_time,120) + and qct.check_loc = #{checkLoc} and qctd.project_id = #{projectId} and bpa.cpk_type = #{cpkType} ) q GROUP BY q.cpkType, q.ymdms,q.rule_name,q.project_no @@ -928,9 +929,58 @@ order by qct.income_time + + +