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