From dd3c23736017bca9aab8690d1e84f5df6f04f3ec Mon Sep 17 00:00:00 2001 From: Yangwl <1726150332@qq.com> Date: Thu, 27 Mar 2025 10:38:05 +0800 Subject: [PATCH] 20250327 --- op-auth/src/main/resources/bootstrap.yml | 2 +- .../op-common-datascope.iml | 14 -- .../op-common-datasource.iml | 51 +------ op-common/op-common-datasource/pom.xml | 5 +- op-common/op-common-log/op-common-log.iml | 117 +-------------- op-common/op-common-redis/op-common-redis.iml | 114 +------------- op-common/op-common-seata/op-common-seata.iml | 107 +------------ .../op-common-security/op-common-security.iml | 116 +------------- op-gateway/src/main/resources/bootstrap.yml | 2 +- .../op/mes/controller/MesBoardController.java | 9 ++ .../op/mes/domain/vo/MesDailyReportVo.java | 5 +- .../java/com/op/mes/mapper/MesMapper.java | 11 +- .../com/op/mes/service/IMesBoradService.java | 2 + .../mes/service/impl/MesBoradServiceImpl.java | 6 + .../op-mes/src/main/resources/bootstrap.yml | 2 +- .../op-sap/src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- op-visual/op-monitor/op-visual-monitor.iml | 141 +----------------- 18 files changed, 44 insertions(+), 664 deletions(-) delete mode 100644 op-common/op-common-datascope/op-common-datascope.iml diff --git a/op-auth/src/main/resources/bootstrap.yml b/op-auth/src/main/resources/bootstrap.yml index c062389c..d9ee4822 100644 --- a/op-auth/src/main/resources/bootstrap.yml +++ b/op-auth/src/main/resources/bootstrap.yml @@ -18,7 +18,7 @@ spring: #--spring.cloud.nacos.discovery.namespace=chj --spring.cloud.nacos.config.namespace=chj # namespace: lanju-op-test namespace: lanju-op-test - group: test + group: ywl # 服务注册地址 server-addr: 192.168.202.20:8848 config: diff --git a/op-common/op-common-datascope/op-common-datascope.iml b/op-common/op-common-datascope/op-common-datascope.iml deleted file mode 100644 index 47270e4b..00000000 --- a/op-common/op-common-datascope/op-common-datascope.iml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/op-common/op-common-datasource/op-common-datasource.iml b/op-common/op-common-datasource/op-common-datasource.iml index 0ed4ebdd..3b4d47d4 100644 --- a/op-common/op-common-datasource/op-common-datasource.iml +++ b/op-common/op-common-datasource/op-common-datasource.iml @@ -1,55 +1,8 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + diff --git a/op-common/op-common-datasource/pom.xml b/op-common/op-common-datasource/pom.xml index c1d911a3..fe1eb99e 100644 --- a/op-common/op-common-datasource/pom.xml +++ b/op-common/op-common-datasource/pom.xml @@ -8,7 +8,7 @@ 0.0.1 4.0.0 - + op-common-datasource @@ -23,7 +23,6 @@ druid-spring-boot-starter ${druid.version} - com.baomidou @@ -32,4 +31,4 @@ - \ No newline at end of file + diff --git a/op-common/op-common-log/op-common-log.iml b/op-common/op-common-log/op-common-log.iml index dab4c8af..47270e4b 100644 --- a/op-common/op-common-log/op-common-log.iml +++ b/op-common/op-common-log/op-common-log.iml @@ -11,119 +11,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/op-common/op-common-redis/op-common-redis.iml b/op-common/op-common-redis/op-common-redis.iml index b0a11c54..3b4d47d4 100644 --- a/op-common/op-common-redis/op-common-redis.iml +++ b/op-common/op-common-redis/op-common-redis.iml @@ -1,118 +1,8 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + diff --git a/op-common/op-common-seata/op-common-seata.iml b/op-common/op-common-seata/op-common-seata.iml index 629f8cd4..3b4d47d4 100644 --- a/op-common/op-common-seata/op-common-seata.iml +++ b/op-common/op-common-seata/op-common-seata.iml @@ -1,111 +1,8 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + diff --git a/op-common/op-common-security/op-common-security.iml b/op-common/op-common-security/op-common-security.iml index 5422c64f..47270e4b 100644 --- a/op-common/op-common-security/op-common-security.iml +++ b/op-common/op-common-security/op-common-security.iml @@ -11,118 +11,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/op-gateway/src/main/resources/bootstrap.yml b/op-gateway/src/main/resources/bootstrap.yml index de7b74c1..5a397056 100644 --- a/op-gateway/src/main/resources/bootstrap.yml +++ b/op-gateway/src/main/resources/bootstrap.yml @@ -16,7 +16,7 @@ spring: # username: nacos # password: sfnacos2023 namespace: lanju-op-test - group: test + group: ywl # 服务注册地址 server-addr: 192.168.202.20:8848 config: 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 7a61a25e..aba3799f 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 @@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Map; @RestController @RequestMapping("/mesborad") @@ -96,4 +97,12 @@ public class MesBoardController extends BaseController { } return success(iMesBoradService.getHFxlInfo(mesBoard)); } + /**黑蚊香车间生产监控看板**/ + @PostMapping("/getOrderInWork") + public AjaxResult getOrderInWork(@RequestParam(required = false) Map param) { + if (StringUtils.isBlank(param.get("factoryCode").toString())) { + return error("[factoryCode] 不能为空"); + } + return success(iMesBoradService.getOrderInWork(param)); + } } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/vo/MesDailyReportVo.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/vo/MesDailyReportVo.java index 2ec4209f..1dc425ff 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/vo/MesDailyReportVo.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/vo/MesDailyReportVo.java @@ -69,6 +69,8 @@ public class MesDailyReportVo extends BaseEntity { private String teamDesc; //计划产量 + @Excel(name = "标准用人") + private String manStandard;//标准用人 // 实际用人 @Excel(name = "实际用人") private BigDecimal useMan; @@ -76,8 +78,7 @@ public class MesDailyReportVo extends BaseEntity { private String workorderName; private String quantity;//计划产量（箱） - @Excel(name = "标准用人") - private String manStandard;//标准用人 + @Excel(name = "标准工时") private String workTimeStandard;//工时-标准 @Excel(name = "实际工时") 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 12adb234..914b6d65 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 @@ -46,15 +46,15 @@ public interface MesMapper { List getEveryNumL(BoardDTO boardDTO); - void deleteDateByTableName(@Param("table") String table, @Param("ymdhms") String ymdhms); + void deleteDateByTableName(@Param("table") String table,@Param("ymdhms")String ymdhms); int createNewTable(@Param("tableNew") String tableNew); - void copyBkDateByTable(@Param("table") String addMonthTable, @Param("startDate") String startDate, @Param("endDate") String endDate); + void copyBkDateByTable(@Param("table") String addMonthTable,@Param("startDate") String startDate, @Param("endDate")String endDate); - void deleteBkDateByTable(@Param("startDate") String startDate, @Param("endDate") String endDate); + void deleteBkDateByTable(@Param("startDate") String startDate, @Param("endDate")String endDate); - void deleteBkDate(@Param("table") String addMonthTable, @Param("startDate") String startDate, @Param("endDate") String endDate); + void deleteBkDate(@Param("table") String addMonthTable,@Param("startDate") String startDate, @Param("endDate")String endDate); void addSapLog(SysSapLog sysSapLog); @@ -62,6 +62,7 @@ public interface MesMapper { List> selectdryingRoomListInfo(); + void deleteDateByTableName0(@Param("table")String table,@Param("ymdhms")String ymdhms); void deleteDateByTableName0(@Param("table") String table, @Param("ymdhms") String ymdhms); List getTechnologyBoard(MesBoard mesBoard); @@ -117,4 +118,6 @@ public interface MesMapper { List getWhiteBoardProdDetails(Map paramMap); List whiteBoardProdListDetailss(Map paramMap); + + List getOrderInWork(Map param); } 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 03ff6336..c16f27d4 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 @@ -22,4 +22,6 @@ public interface IMesBoradService { public List getHFQcInfo(BoardDTO mesBoard); public List getHFxlInfo(BoardDTO mesBoard); + + public List getOrderInWork(Map param); } 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 44003553..1db59dd6 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 @@ -213,6 +213,8 @@ public class MesBoradServiceImpl implements IMesBoradService { return dtos; } + + //获取当前日期前几天 private List getDays(int dayNum){ List days = new ArrayList<>(); @@ -248,4 +250,8 @@ public class MesBoradServiceImpl implements IMesBoradService { System.out.println(JSONObject.toJSONString(days)); } + @Override + public List getOrderInWork(Map param) { + return mesMapper.getOrderInWork(param); + } } diff --git a/op-modules/op-mes/src/main/resources/bootstrap.yml b/op-modules/op-mes/src/main/resources/bootstrap.yml index a0e1c0df..527b3d9e 100644 --- a/op-modules/op-mes/src/main/resources/bootstrap.yml +++ b/op-modules/op-mes/src/main/resources/bootstrap.yml @@ -15,7 +15,7 @@ spring: discovery: #命名空间 namespace: lanju-op-test - group: test + group: ywl # 服务注册地址 server-addr: 192.168.202.20:8848 config: diff --git a/op-modules/op-sap/src/main/resources/bootstrap.yml b/op-modules/op-sap/src/main/resources/bootstrap.yml index f3ebf4cb..a28d47f8 100644 --- a/op-modules/op-sap/src/main/resources/bootstrap.yml +++ b/op-modules/op-sap/src/main/resources/bootstrap.yml @@ -15,7 +15,7 @@ spring: discovery: #命名空间 namespace: lanju-op-test - group: test + group: ywl # 服务注册地址 server-addr: 192.168.202.20:8848 config: diff --git a/op-modules/op-system/src/main/resources/bootstrap.yml b/op-modules/op-system/src/main/resources/bootstrap.yml index 116003a6..ad12faf3 100644 --- a/op-modules/op-system/src/main/resources/bootstrap.yml +++ b/op-modules/op-system/src/main/resources/bootstrap.yml @@ -15,7 +15,7 @@ spring: discovery: #命名空间 namespace: lanju-op-test - group: test + group: ywl # 服务注册地址 server-addr: 192.168.202.20:8848 config: diff --git a/op-visual/op-monitor/op-visual-monitor.iml b/op-visual/op-monitor/op-visual-monitor.iml index 106428e8..3b4d47d4 100644 --- a/op-visual/op-monitor/op-visual-monitor.iml +++ b/op-visual/op-monitor/op-visual-monitor.iml @@ -1,145 +1,8 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file +