fix bug

sql/mysql/iotdata.sql

@@ -325,4 +325,17 @@ CREATE TABLE `iot_feedback`
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4
   COLLATE = utf8mb4_unicode_ci
-  ROW_FORMAT = DYNAMIC COMMENT ='代理服务器';
+  ROW_FORMAT = DYNAMIC COMMENT ='代理服务器';
+
+
+CREATE TABLE `iot_mqtt_data_record`
+(
+    `id`                bigint   NOT NULL AUTO_INCREMENT COMMENT 'ID',
+    `device_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '设备',
+    `attribute` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '属性',
+    `attr_value` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '属性值',
+    `device_time`       datetime NOT NULL   DEFAULT CURRENT_TIMESTAMP COMMENT '设备时间',
+    `create_time`       datetime NOT NULL   DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=91 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='设备数据记录';

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/organization/vo/ProcessTypeEnum.java

@@ -25,8 +25,8 @@ public enum ProcessTypeEnum {
     private final String value;
 
     // 一个可选的方法，用于根据整数值获取对应的枚举实例
-    public static OrgClassEnum fromValue(String value) {
-        for (OrgClassEnum status : OrgClassEnum.values()) {
+    public static ProcessTypeEnum fromValue(String value) {
+        for (ProcessTypeEnum status : ProcessTypeEnum.values()) {
             if (status.getValue() .equals(value)) {
                 return status;
             }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/producereportplan/ReportPlanViewController.java

@@ -47,7 +47,7 @@ public class ReportPlanViewController {
         if(planSummaryDOS.size()>0){
             //按照工序枚举顺序排序
             planSummaryDOS.sort(Comparator.comparing(book -> {
-                ProcessTypeEnum type = ProcessTypeEnum.valueOf(book.getOrgType());
+                ProcessTypeEnum type = ProcessTypeEnum.fromValue(book.getOrgType());
                 return type.ordinal();
             }));
             /****加上生产入库数量 todo
@@ -55,7 +55,7 @@ public class ReportPlanViewController {
             BigDecimal stockInNumber = stockInDetailService.selectSumBy(id);
             respVO.setTotalQualityNumber(stockInNumber);
             respVO.setTotalWasteNumber(BigDecimal.ZERO);
-            respVO.setOrgType("成品入库");
+            respVO.setOrgType("ruku");
             planSummaryDOS.add(respVO);
         }
         return success(planSummaryDOS);
@@ -75,7 +75,7 @@ public class ReportPlanViewController {
         if(planSummaryDOS.size()>0){
             //按照工序枚举顺序排序
             planSummaryDOS.sort(Comparator.comparing(book -> {
-                ProcessTypeEnum type = ProcessTypeEnum.valueOf(book.getOrgType());
+                ProcessTypeEnum type = ProcessTypeEnum.fromValue(book.getOrgType());
                 return type.ordinal();
             }));
             /****加上生产入库数量 todo
@@ -83,7 +83,7 @@ public class ReportPlanViewController {
             BigDecimal stockInNumber = stockInDetailService.selectSumByTaskDetailId(id);
             respVO.setTotalQualityNumber(stockInNumber);
             respVO.setTotalWasteNumber(BigDecimal.ZERO);
-            respVO.setOrgType("成品入库");
+            respVO.setOrgType("ruku");
             planSummaryDOS.add(respVO);
         }
         return success(planSummaryDOS);

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/workteam/vo/WorkTeamRespVO.java

@@ -50,4 +50,8 @@ public class WorkTeamRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
+    @Schema(description = "开工时间")
+    private LocalDateTime startTime;
+    @Schema(description = "结束时间")
+    private LocalDateTime endTime;
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/workteam/vo/WorkTeamSaveReqVO.java

@@ -3,6 +3,8 @@ package cn.iocoder.yudao.module.mes.controller.admin.workteam.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 @Schema(description = "管理后台 - 生产班组新增/修改 Request VO")
 @Data
 public class WorkTeamSaveReqVO {
@@ -25,7 +27,12 @@ public class WorkTeamSaveReqVO {
     private String remark;
 
     @Schema(description = "是否启用", requiredMode = Schema.RequiredMode.REQUIRED)
-
     private Boolean isEnable;
-
+    /**
+     * 班组开工时间和结束时间
+     */
+    @Schema(description = "开工时间",requiredMode = Schema.RequiredMode.REQUIRED)
+    private LocalDateTime startTime;
+    @Schema(description = "结束时间",requiredMode = Schema.RequiredMode.REQUIRED)
+    private LocalDateTime endTime;
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/workteam/WorkTeamDO.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 
+import java.time.LocalDateTime;
+
 /**
  * 生产班组 DO
  *
@@ -52,4 +54,9 @@ public class WorkTeamDO extends BaseDO {
     //@Schema(description = "班组类型", example = "1白班，2夜班")
     private String groupType;
 
+    /**
+     * 班组开工时间和结束时间
+     */
+    private LocalDateTime startTime;
+    private LocalDateTime endTime;
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/producereport/ProduceReportServiceImpl.java

@@ -85,7 +85,6 @@ public class ProduceReportServiceImpl implements ProduceReportService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updateProduceReport(ProduceReportSaveReqVO updateReqVO) {
-        updateReqVO.setReportStatus(ReportStatusEnum.草稿.getValue());
         // 校验存在
         validateProduceReportExists(updateReqVO.getId());
         // 更新
@@ -94,6 +93,10 @@ public class ProduceReportServiceImpl implements ProduceReportService {
         oldObj.setTotalTime(updateReqVO.getTotalTime());
         oldObj.setReportTime(updateReqVO.getReportTime());
         oldObj.setRemark(updateReqVO.getRemark());
+        //如果当前是驳回状态，再编辑的话就改为草稿状态重新提交
+        if(updateObj.getReportStatus().equals(ReportStatusEnum.驳回.getValue())){
+            oldObj.setReportStatus(ReportStatusEnum.草稿.getValue());
+        }
         produceReportMapper.updateById(oldObj);
 
         // 更新子表