diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesBoardController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesBoardController.java index 79f7ab1d8..8b1f10f36 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesBoardController.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesBoardController.java @@ -108,4 +108,12 @@ public class MesBoardController extends BaseController { } return success(iMesBoradService.getHFxlInfo(mesBoard)); } + + /**获取包装产线看板数据*/ + @GetMapping("/getProductionLineData") + public AjaxResult getProductionLineData() { + return success(iMesBoradService.getProductionLineData()); + } + + } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesProductLineController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesProductLineController.java new file mode 100644 index 000000000..4eac752bf --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesProductLineController.java @@ -0,0 +1,26 @@ +package com.op.mes.controller; + +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * remark + * + * @author 019117 + * @date + */ +@RestController +@RequestMapping("/mesProductLine") +@RequiredArgsConstructor +public class MesProductLineController { + + + /** + * 生产线汇总看板数据 + * **/ + + + + +} 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 75752f322..9801be90c 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 @@ -123,4 +123,6 @@ public interface MesMapper { List getproductLineList(); + List> getProductionLineData(); + } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesBoradService.java b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesBoradService.java index f1090b7a9..3c10ecadf 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesBoradService.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesBoradService.java @@ -24,4 +24,6 @@ public interface IMesBoradService { public List getHFxlInfo(BoardDTO mesBoard); public Map getProductionNumberPLC(BoardDTO mesBoard); + + List> getProductionLineData(); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesBoradServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesBoradServiceImpl.java index c61915121..262df024d 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesBoradServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesBoradServiceImpl.java @@ -284,4 +284,10 @@ public class MesBoradServiceImpl implements IMesBoradService { } } + @Override + @DS("#header.poolName") + public List> getProductionLineData() { + return mesMapper.getProductionLineData(); + } + } 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 5c9f020c4..30f8f40ea 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 @@ -552,4 +552,49 @@ product_date = CONVERT ( VARCHAR ( 10 ), GETDATE( ), 120 ) + +