diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/BoardDTO.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/BoardDTO.java new file mode 100644 index 000000000..9849139e4 --- /dev/null +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/BoardDTO.java @@ -0,0 +1,69 @@ +package com.op.system.api.domain.dto; + +import java.util.List; + +public class BoardDTO { + private String factory; + private String ymd; + private String equCode; + private String equName; + private Integer totalNum; + private String equTypeCode; + private String equTypeName; + + public String getEquName() { + return equName; + } + + public void setEquName(String equName) { + this.equName = equName; + } + + public String getEquTypeName() { + return equTypeName; + } + + public void setEquTypeName(String equTypeName) { + this.equTypeName = equTypeName; + } + + public String getEquTypeCode() { + return equTypeCode; + } + + public void setEquTypeCode(String equTypeCode) { + this.equTypeCode = equTypeCode; + } + + public String getEquCode() { + return equCode; + } + + public void setEquCode(String equCode) { + this.equCode = equCode; + } + + public Integer getTotalNum() { + return totalNum; + } + + public void setTotalNum(Integer totalNum) { + this.totalNum = totalNum; + } + + public String getYmd() { + return ymd; + } + + public void setYmd(String ymd) { + this.ymd = ymd; + } + + public String getFactory() { + return factory; + } + + public void setFactory(String factory) { + this.factory = factory; + } +} diff --git a/op-auth/op-auth.iml b/op-auth/op-auth.iml deleted file mode 100644 index d83ba2773..000000000 --- a/op-auth/op-auth.iml +++ /dev/null @@ -1,174 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/op-common/op-common.iml b/op-common/op-common.iml deleted file mode 100644 index e27a22bf9..000000000 --- a/op-common/op-common.iml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/op-modules/op-device/op-modules-device.iml b/op-modules/op-device/op-modules-device.iml deleted file mode 100644 index 0cd655a41..000000000 --- a/op-modules/op-device/op-modules-device.iml +++ /dev/null @@ -1,224 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/op-modules/op-energy/op-modules-engery.iml b/op-modules/op-energy/op-modules-engery.iml deleted file mode 100644 index 0cd655a41..000000000 --- a/op-modules/op-energy/op-modules-engery.iml +++ /dev/null @@ -1,224 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/op-modules/op-job/op-modules-job.iml b/op-modules/op-job/op-modules-job.iml deleted file mode 100644 index bace127ca..000000000 --- a/op-modules/op-job/op-modules-job.iml +++ /dev/null @@ -1,224 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/op-modules/op-mes/op-modules-mes.iml b/op-modules/op-mes/op-modules-mes.iml deleted file mode 100644 index c65dbc08b..000000000 --- a/op-modules/op-mes/op-modules-mes.iml +++ /dev/null @@ -1,224 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/WCSInterfaceController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/WCSInterfaceController.java index 004f3a0ac..f6b1216a1 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/controller/WCSInterfaceController.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/WCSInterfaceController.java @@ -1,11 +1,13 @@ package com.op.mes.controller; +import com.op.common.core.utils.DateUtils; import com.op.common.core.utils.StringUtils; import com.op.common.core.web.controller.BaseController; import com.op.common.core.web.domain.AjaxResult; import com.op.common.log.annotation.Log; import com.op.common.log.enums.BusinessType; import com.op.mes.domain.dto.BaseEquipmentDto; +import com.op.system.api.domain.dto.BoardDTO; import com.op.system.api.domain.dto.WCSDTO; import com.op.mes.service.IWCSInterfaceService; @@ -15,7 +17,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; /** - * 工厂数据库Controller + * 看板、WCS等对外接口 * * @author sf * @date 2023-05-18 @@ -52,4 +54,24 @@ public class WCSInterfaceController extends BaseController { } return success(WCInterfaceService.requestDestinationStations(wcsdto)); } + + /** + * MES看板 + */ + @Log(title = "MES看板-获取工厂列表", businessType = BusinessType.GRANT) + @PostMapping("/getBoardFactory") + public AjaxResult getBoardFactory(@RequestBody BoardDTO boardDTO) { + return success(WCInterfaceService.getBoardFactory(boardDTO)); + } + @Log(title = "MES看板", businessType = BusinessType.GRANT) + @PostMapping("/getMesBoardEquProductionToday") + public AjaxResult getMesBoardEquProductionToday(@RequestBody BoardDTO boardDTO) { + if(StringUtils.isBlank(boardDTO.getFactory())){ + return error("[factory] is not null"); + } + if(StringUtils.isEmpty(boardDTO.getYmd())){ + boardDTO.setYmd(DateUtils.getDate()); + } + return success(WCInterfaceService.getMesBoardEquProductionToday(boardDTO)); + } } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java index c228fd7c2..f32158f44 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java @@ -1,6 +1,8 @@ package com.op.mes.mapper; import com.op.mes.domain.dto.BaseEquipmentDto; +import com.op.system.api.domain.SysDept; +import com.op.system.api.domain.dto.BoardDTO; import com.op.system.api.domain.dto.WCSDTO; import com.op.system.api.domain.dto.WCSDataItemsDTO; import org.apache.ibatis.annotations.Mapper; @@ -22,4 +24,10 @@ public interface MesMapper { List getAllEquipments(BaseEquipmentDto baseEquipmentDto); int saveRfidWithEquip(BaseEquipmentDto baseEquipmentDto); + + List getTotalNum(BoardDTO boardDTO); + + List getEveryNum(BoardDTO boardDTO); + + List getBoardFactory(BoardDTO boardDTO); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/IWCSInterfaceService.java b/op-modules/op-mes/src/main/java/com/op/mes/service/IWCSInterfaceService.java index f09dd968c..a1bfd1e32 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/IWCSInterfaceService.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/IWCSInterfaceService.java @@ -2,9 +2,12 @@ package com.op.mes.service; import com.op.common.core.web.domain.AjaxResult; import com.op.mes.domain.dto.BaseEquipmentDto; +import com.op.system.api.domain.SysDept; +import com.op.system.api.domain.dto.BoardDTO; import com.op.system.api.domain.dto.WCSDTO; import java.util.List; +import java.util.Map; /** * 订单Service接口 @@ -16,4 +19,7 @@ public interface IWCSInterfaceService { WCSDTO requestDestinationStations(WCSDTO wcsdto); + Map getMesBoardEquProductionToday(BoardDTO boardDTO); + + List getBoardFactory(BoardDTO boardDTO); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java index 41967a6aa..aecdfd31d 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java @@ -12,6 +12,8 @@ import com.op.mes.mapper.MesMapper; import com.op.mes.mapper.MesStationArriveMapper; import com.op.mes.mapper.ProRfidProcessDetailMapper; import com.op.mes.service.IWCSInterfaceService; +import com.op.system.api.domain.SysDept; +import com.op.system.api.domain.dto.BoardDTO; import com.op.system.api.domain.dto.WCSDTO; import com.op.system.api.domain.dto.WCSDataDTO; import com.op.system.api.domain.dto.WCSDataItemsDTO; @@ -21,9 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; +import java.util.*; import java.util.stream.Collectors; /** @@ -142,19 +142,28 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { return dto; } + @Override + public Map getMesBoardEquProductionToday(BoardDTO boardDTO) { + DynamicDataSourceContextHolder.push("ds_"+boardDTO.getFactory());// 这是数据源的key + Map boardMap = new HashMap(); + + List totals = mesMapper.getTotalNum(boardDTO);// + + List everys = mesMapper.getEveryNum(boardDTO);// + + boardMap.put("totalNum", totals); + boardMap.put("everyNum", everys); + return boardMap; + } + + @Override + public List getBoardFactory(BoardDTO boardDTO) { + //DynamicDataSourceContextHolder.push("master");// 这是数据源的key + return mesMapper.getBoardFactory(boardDTO); + } + + public static void main(String args[]){ - String machinecode1 = "[[\"GX01\",\"LG2\"],[\"GX01\",\"LG3\"],[\"GX02\",\"S1\"],[\"GX02\",\"S2\"],[\"GX03\",\"HF01\"],[\"GX04\",\"SPJ01\"]]"; - JSONArray codeArray1 = JSONArray.parseArray(machinecode1); - String[] machineCodes1 = new String[codeArray1.size()]; - for(int c1=0;c1 list1 = Arrays.asList(machinecode0); - List list2 = Arrays.asList(machineCodes1); - List machineArray = list2.stream() - .filter(u1-> list1.contains(u1)) - .collect(Collectors.toList()); - System.out.println(machineArray.toString()); + System.out.println(DateUtils.getDate()); } } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java index bcda1f53a..c578ce343 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java @@ -111,58 +111,6 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService { public List getProcessFinishList(MesProcessReport mesReportWork) { List dtos = new ArrayList<>(); dtos = mesReportWorkMapper.getProcessFinishList(mesReportWork); -// MesProcessReport dto = null; -// if(CollectionUtils.isEmpty(dtos)){ -// dto = new MesProcessReport(); -// dto.setProductDate("2023-08-31"); -// dto.setOrderCode("000100220788"); -// dto.setWorkorderCode("000100220788-1"); -// dto.setProductCode("000000020000004232"); -// dto.setProductName("榄菊小盘艾草型蚊香3+1家庭特惠装(1901)"); -// dto.setProductSpc("23mm"); -// dto.setProcessCode("ProdGX01"); -// dto.setProcessName("包装线工序01"); -// dto.setQuantityFeedback(new BigDecimal("500")); -// dto.setQuantity(new BigDecimal("1000")); -// dto.setUnit("KAR"); -// dtos.add(dto); -// dto = new MesProcessReport(); -// dto.setProductDate("2023-08-31"); -// dto.setOrderCode("000100220789"); -// dto.setWorkorderCode("000100220789-1"); -// dto.setProductCode("000000020000004234"); -// dto.setProductName("白坯"); -// dto.setProductSpc("23mm"); -// dto.setProcessCode("BPGX01"); -// dto.setProcessName("收胚机工序"); -// dto.setQuantityFeedback(new BigDecimal("80")); -// dto.setUnit("车"); -// dtos.add(dto); -// dto = new MesProcessReport(); -// dto.setProductDate("2023-08-31"); -// dto.setOrderCode("000100220789"); -// dto.setWorkorderCode("000100220789-1"); -// dto.setProductCode("000000020000004234"); -// dto.setProductName("白坯"); -// dto.setProductSpc("23mm"); -// dto.setProcessCode("BPGX02"); -// dto.setProcessName("烘房工序"); -// dto.setQuantityFeedback(new BigDecimal("70")); -// dto.setUnit("车"); -// dtos.add(dto); -// dto = new MesProcessReport(); -// dto.setProductDate("2023-08-31"); -// dto.setOrderCode("000100220789"); -// dto.setWorkorderCode("000100220789-1"); -// dto.setProductCode("000000020000004234"); -// dto.setProductName("白坯"); -// dto.setProductSpc("23mm"); -// dto.setProcessCode("BPGX02"); -// dto.setProcessName("收坯工序"); -// dto.setQuantityFeedback(new BigDecimal("100")); -// dto.setUnit("车"); -// dtos.add(dto); -// } return dtos; } diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml index 15203ebe0..8c022eb11 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml @@ -67,5 +67,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and equipment_name like concat('%', #{equipmentName}, '%') + + + + diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml index d0e81e74d..6b11ab7da 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml @@ -101,7 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from pro_rfid_process_detail prpd left join pro_order_workorder pow on pow.workorder_code = prpd.workorder_code left join pro_process ps on ps.process_id = prpd.now_process_id - where prpd.bind_status = 0 + where pow.order_code is not null and pow.order_code like concat('%', #{orderCode}, '%') diff --git a/op-modules/op-plan/op-modules-plan.iml b/op-modules/op-plan/op-modules-plan.iml deleted file mode 100644 index 761bce125..000000000 --- a/op-modules/op-plan/op-modules-plan.iml +++ /dev/null @@ -1,225 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/op-modules/op-quality/op-modules-quality.iml b/op-modules/op-quality/op-modules-quality.iml deleted file mode 100644 index 0cd655a41..000000000 --- a/op-modules/op-quality/op-modules-quality.iml +++ /dev/null @@ -1,224 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/op-modules/op-sap/op-modules-sap.iml b/op-modules/op-sap/op-modules-sap.iml deleted file mode 100644 index 99920ab48..000000000 --- a/op-modules/op-sap/op-modules-sap.iml +++ /dev/null @@ -1,244 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/op-modules/op-scada/op-modules-scada.iml b/op-modules/op-scada/op-modules-scada.iml deleted file mode 100644 index 0cd655a41..000000000 --- a/op-modules/op-scada/op-modules-scada.iml +++ /dev/null @@ -1,224 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/op-modules/op-security/op-modules-security.iml b/op-modules/op-security/op-modules-security.iml deleted file mode 100644 index 316b0b50f..000000000 --- a/op-modules/op-security/op-modules-security.iml +++ /dev/null @@ -1,224 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/op-modules/op-system/op-modules-system.iml b/op-modules/op-system/op-modules-system.iml deleted file mode 100644 index 1aa5993b7..000000000 --- a/op-modules/op-system/op-modules-system.iml +++ /dev/null @@ -1,227 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/op-modules/op-technology/op-modules-technology.iml b/op-modules/op-technology/op-modules-technology.iml deleted file mode 100644 index 0d6a0c460..000000000 --- a/op-modules/op-technology/op-modules-technology.iml +++ /dev/null @@ -1,224 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/op-modules/op-wms/op-modules-wms.iml b/op-modules/op-wms/op-modules-wms.iml deleted file mode 100644 index 0cd655a41..000000000 --- a/op-modules/op-wms/op-modules-wms.iml +++ /dev/null @@ -1,224 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file