Merge remote-tracking branch 'origin/master'

yudao-module-pms/yudao-module-pms-api/src/main/java/cn/iocoder/yudao/module/pms/enums/ErrorCodeConstant.java

@@ -13,6 +13,7 @@ public interface ErrorCodeConstant{
     ErrorCode IOT_MATERIAL_GROUP_NOT_EXISTS = new ErrorCode(103, "物料组不存在");
     ErrorCode IOT_MATERIAL_NOT_EXISTS = new ErrorCode(104, "物料不存在");
     ErrorCode IOT_DEVICE_TEMPLATE_ATTRS_NOT_EXISTS = new ErrorCode(105, "设备模板属性不存在");
+    ErrorCode IOT_DEVICE_TEMPLATE_ATTRS_EXISTS = new ErrorCode(152, "设备模板属性已经存在");
     ErrorCode IOT_DEVICE_TEMPLATE_NOT_EXISTS = new ErrorCode(106, "设备模板不存在");
     ErrorCode IOT_BOM_NOT_EXISTS = new ErrorCode(107, "BOM 关系不存在");
     ErrorCode IOT_DEVICE_MATERIAL_NOT_EXISTS = new ErrorCode(108, "设备BOM物料关联不存在");
@@ -61,4 +62,5 @@ public interface ErrorCodeConstant{
     ErrorCode IOT_DEVICE_PERSON_NOT_EXISTS = new ErrorCode(148, "设备负责人分配不存在");
     ErrorCode IOT_DEVICE_STATUS_LOG_NOT_EXISTS = new ErrorCode(149, "设备状态调整日志不存在");
     ErrorCode IOT_DEVICE_ALLOT_LOG_NOT_EXISTS = new ErrorCode(150, "设备调拨日志不存在");
+    ErrorCode IOT_DEVICE_PERSON_LOG_NOT_EXISTS = new ErrorCode(151, "设备责任人日志不存在");
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/IotTreeController.java

@@ -1,8 +1,6 @@
 package cn.iocoder.yudao.module.pms.controller.admin;
 
-import cn.hutool.core.collection.CollUtil;
 import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
-import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
@@ -12,9 +10,9 @@ import cn.iocoder.yudao.module.pms.controller.admin.vo.IotTreeListReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.vo.IotTreePageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.vo.IotTreeRespVO;
 import cn.iocoder.yudao.module.pms.controller.admin.vo.IotTreeSaveReqVO;
-import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptSimpleRespVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.IotTreeDO;
 import cn.iocoder.yudao.module.pms.service.IotTreeService;
+import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptSimpleRespVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotdevicepersonlog/IotDevicePersonLogController.java

@@ -0,0 +1,95 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotdevicepersonlog;
+
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import javax.validation.constraints.*;
+import javax.validation.*;
+import javax.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
+
+import cn.iocoder.yudao.module.pms.controller.admin.iotdevicepersonlog.vo.*;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotdevicepersonlog.IotDevicePersonLogDO;
+import cn.iocoder.yudao.module.pms.service.iotdevicepersonlog.IotDevicePersonLogService;
+
+@Tag(name = "管理后台 - 设备责任人日志")
+@RestController
+@RequestMapping("/pms/iot-device-person-log")
+@Validated
+public class IotDevicePersonLogController {
+
+    @Resource
+    private IotDevicePersonLogService iotDevicePersonLogService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建设备责任人日志")
+    @PreAuthorize("@ss.hasPermission('pms:iot-device-person-log:create')")
+    public CommonResult<Long> createIotDevicePersonLog(@Valid @RequestBody IotDevicePersonLogSaveReqVO createReqVO) {
+        return success(iotDevicePersonLogService.createIotDevicePersonLog(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新设备责任人日志")
+    @PreAuthorize("@ss.hasPermission('pms:iot-device-person-log:update')")
+    public CommonResult<Boolean> updateIotDevicePersonLog(@Valid @RequestBody IotDevicePersonLogSaveReqVO updateReqVO) {
+        iotDevicePersonLogService.updateIotDevicePersonLog(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除设备责任人日志")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('pms:iot-device-person-log:delete')")
+    public CommonResult<Boolean> deleteIotDevicePersonLog(@RequestParam("id") Long id) {
+        iotDevicePersonLogService.deleteIotDevicePersonLog(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得设备责任人日志")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('pms:iot-device-person-log:query')")
+    public CommonResult<IotDevicePersonLogRespVO> getIotDevicePersonLog(@RequestParam("id") Long id) {
+        IotDevicePersonLogDO iotDevicePersonLog = iotDevicePersonLogService.getIotDevicePersonLog(id);
+        return success(BeanUtils.toBean(iotDevicePersonLog, IotDevicePersonLogRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得设备责任人日志分页")
+    @PreAuthorize("@ss.hasPermission('pms:iot-device-person-log:query')")
+    public CommonResult<PageResult<IotDevicePersonLogRespVO>> getIotDevicePersonLogPage(@Valid IotDevicePersonLogPageReqVO pageReqVO) {
+        PageResult<IotDevicePersonLogDO> pageResult = iotDevicePersonLogService.getIotDevicePersonLogPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, IotDevicePersonLogRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出设备责任人日志 Excel")
+    @PreAuthorize("@ss.hasPermission('pms:iot-device-person-log:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportIotDevicePersonLogExcel(@Valid IotDevicePersonLogPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<IotDevicePersonLogDO> list = iotDevicePersonLogService.getIotDevicePersonLogPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "设备责任人日志.xls", "数据", IotDevicePersonLogRespVO.class,
+                        BeanUtils.toBean(list, IotDevicePersonLogRespVO.class));
+    }
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotdevicepersonlog/vo/IotDevicePersonLogPageReqVO.java

@@ -0,0 +1,43 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotdevicepersonlog.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 设备责任人日志分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class IotDevicePersonLogPageReqVO extends PageParam {
+
+    @Schema(description = "设备id", example = "14117")
+    private Long deviceId;
+
+    @Schema(description = "设备调整前责任人", example = "12055")
+    private Long oldPersonId;
+
+    @Schema(description = "设备调整前责任人id集合")
+    private String oldPersonIds;
+
+    @Schema(description = "设备调整后责任人", example = "29347")
+    private Long newPersonId;
+
+    @Schema(description = "设备调整后责任人id集合")
+    private String newPersonIds;
+
+    @Schema(description = "调整原因", example = "不好")
+    private String reason;
+
+    @Schema(description = "备注", example = "你猜")
+    private String remark;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotdevicepersonlog/vo/IotDevicePersonLogRespVO.java

@@ -0,0 +1,51 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotdevicepersonlog.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - 设备责任人日志 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class IotDevicePersonLogRespVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "14500")
+    @ExcelProperty("主键id")
+    private Long id;
+
+    @Schema(description = "设备id", example = "14117")
+    @ExcelProperty("设备id")
+    private Long deviceId;
+
+    @Schema(description = "设备调整前责任人", example = "12055")
+    @ExcelProperty("设备调整前责任人")
+    private Long oldPersonId;
+
+    @Schema(description = "设备调整前责任人id集合")
+    @ExcelProperty("设备调整前责任人id集合")
+    private String oldPersonIds;
+
+    @Schema(description = "设备调整后责任人", example = "29347")
+    @ExcelProperty("设备调整后责任人")
+    private Long newPersonId;
+
+    @Schema(description = "设备调整后责任人id集合")
+    @ExcelProperty("设备调整后责任人id集合")
+    private String newPersonIds;
+
+    @Schema(description = "调整原因", example = "不好")
+    @ExcelProperty("调整原因")
+    private String reason;
+
+    @Schema(description = "备注", example = "你猜")
+    @ExcelProperty("备注")
+    private String remark;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotdevicepersonlog/vo/IotDevicePersonLogSaveReqVO.java

@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.module.pms.controller.admin.iotdevicepersonlog.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import javax.validation.constraints.*;
+
+@Schema(description = "管理后台 - 设备责任人日志新增/修改 Request VO")
+@Data
+public class IotDevicePersonLogSaveReqVO {
+
+    @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "14500")
+    private Long id;
+
+    @Schema(description = "设备id", example = "14117")
+    private Long deviceId;
+
+    @Schema(description = "设备调整前责任人", example = "12055")
+    private Long oldPersonId;
+
+    @Schema(description = "设备调整前责任人id集合")
+    private String oldPersonIds;
+
+    @Schema(description = "设备调整后责任人", example = "29347")
+    private Long newPersonId;
+
+    @Schema(description = "设备调整后责任人id集合")
+    private String newPersonIds;
+
+    @Schema(description = "调整原因", example = "不好")
+    private String reason;
+
+    @Schema(description = "备注", example = "你猜")
+    private String remark;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotlockstock/vo/IotLockStockPageReqVO.java

@@ -9,6 +9,8 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Set;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
@@ -93,4 +95,13 @@ public class IotLockStockPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
+    /**
+     * 扩展字段
+     */
+    @Schema(description = "工厂id集合", example = "11671")
+    private Set<Long> factoryIds;
+    @Schema(description = "成本中心id集合", example = "11671")
+    private Set<Long> costCenterIds;
+    @Schema(description = "物料编码集合", example = "11671")
+    private Set<String> materialCodes;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotmainworkorderbommaterial/vo/IotMainWorkOrderBomMaterialPageReqVO.java

@@ -81,6 +81,13 @@ public class IotMainWorkOrderBomMaterialPageReqVO extends PageParam {
     @Schema(description = "物料来源 (SAP库存 本地库存...)")
     private String materialSource;
 
+    @Schema(description = "工厂id")
+    private Long factoryId;
+    @Schema(description = "成本中心id")
+    private Long costCenterId;
+    @Schema(description = "库存地点id")
+    private Long storageLocationId;
+
     @Schema(description = "库存地点")
     private String inventoryAddress;
 

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotmainworkorderbommaterial/vo/IotMainWorkOrderBomMaterialSaveReqVO.java

@@ -75,6 +75,13 @@ public class IotMainWorkOrderBomMaterialSaveReqVO {
     @Schema(description = "物料来源 (SAP库存 本地库存...)")
     private String materialSource;
 
+    @Schema(description = "工厂id")
+    private Long factoryId;
+    @Schema(description = "成本中心id")
+    private Long costCenterId;
+    @Schema(description = "库存地点id")
+    private Long storageLocationId;
+
     @Schema(description = "库存地点")
     private String inventoryAddress;
 

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotopeationfill/IotOpeationFillController.java

@@ -123,14 +123,17 @@ public class IotOpeationFillController {
         List<IotOpeationFillRespVO> fillList1 = iotOpeationFillService.getFillList(respVO);
 
         boolean result = fillList1.stream().allMatch(e->e.getIsFill()==1);
+        boolean result1 = fillList1.stream().allMatch(e->e.getIsFill()==0);
 
         IotDeviceRunLogDO deviceRunLogDO = new IotDeviceRunLogDO();
         deviceRunLogDO.setId(createReqVO.get(0).getId());
 
         if(result){
             iotOpeationFillService.updateFillOrder(deviceRunLogDO);
-        }else{
+        }else if(result1){
             iotOpeationFillService.updateFillOrder1(deviceRunLogDO);
+        }else{
+            iotOpeationFillService.updateFillOrder2(deviceRunLogDO);
         }
 
         return success(iotOpeationFillService.insertLog(logDO));
@@ -167,35 +170,64 @@ public class IotOpeationFillController {
     @PreAuthorize("@ss.hasPermission('rq:iot-opeation-fill:query')")
     public CommonResult<List<IotOpeationFillDO>> getIotOpeationFillPage(@Valid IotOpeationFillRespVO pageReqVO) {
         List<IotOpeationFillDO> fillList = new ArrayList<>();
-        List<IotOpeationFillDO> deviceList = iotOpeationFillService.deviceList(pageReqVO);
-        if(deviceList.size()==0){
+       /* if(pageReqVO.getDeviceId()!=null){
+            *//**
+             * 根据设备ID和OrderId返回
+             *//*
             fillList = iotOpeationFillService.fillListByDeptId(pageReqVO);
-        }else{
+        }else{*/
+            /**
+             * 根据OrderId返回
+             */
             fillList = iotOpeationFillService.fillListByUserId(pageReqVO);
-        }
+
+        return success(BeanUtils.toBean(fillList, IotOpeationFillDO.class));
+    }
+
+    @GetMapping("/orderPage")
+    @Operation(summary = "获得运行记录填报分页")
+    @PreAuthorize("@ss.hasPermission('rq:iot-opeation-fill:query')")
+    public CommonResult<List<IotOpeationFillDO>> getOrderPage(@Valid IotOpeationFillRespVO pageReqVO) {
+        List<IotOpeationFillDO> fillList = new ArrayList<>();
+        /* if(pageReqVO.getDeviceId()!=null){
+         *//**
+         * 根据设备ID和OrderId返回
+         *//*
+
+        }else{*/
+        fillList = iotOpeationFillService.fillListByDeptId(pageReqVO);
+
+
         return success(BeanUtils.toBean(fillList, IotOpeationFillDO.class));
     }
 
+
     @GetMapping("/page1")
     @Operation(summary = "获得运行记录填报分页")
     @PreAuthorize("@ss.hasPermission('rq:iot-opeation-fill:query')")
     public CommonResult<PageResult<IotOpeationFillOrderDO>> getIotOpeationFillPage1(@Valid IotOpeationFillPageReqVO pageReqVO) {
-
-        List<IotOpeationFillDO> pdList = iotOpeationFillService.pdList();
-        List<String> nameList  = pdList.stream().map(o -> o.getUserName()).collect(Collectors.toList());
-        List<Integer> idList  = pdList.stream().map(o -> o.getUserId()).collect(Collectors.toList());
+        IotOpeationFillDO fillDO = new IotOpeationFillDO();
+        fillDO.setId(pageReqVO.getDeptId());
+        List<IotOpeationFillDO> pdList = iotOpeationFillService.pdList1(fillDO);
+        List<Long> idList  = pdList.stream().map(o -> o.getId()).collect(Collectors.toList());
         PageResult<IotOpeationFillOrderDO> fillList = new PageResult<>();
-        boolean exists = pdList.stream()
-                .anyMatch(rh -> rh.getUserId()==pageReqVO.getUserId());
-        if(!exists){
-            fillList = iotOpeationFillService.fillList2(pageReqVO,idList,nameList);
-        }else{
-            fillList = iotOpeationFillService.fillList1(pageReqVO);
-        }
+
+        fillList = iotOpeationFillService.fillList2(pageReqVO,idList);
+
+        return success(BeanUtils.toBean(fillList, IotOpeationFillOrderDO.class));
+    }
+
+    @GetMapping("/fillRecordPage")
+    @Operation(summary = "获得运行记录填报分页")
+    public CommonResult<PageResult<IotOpeationFillOrderDO>> getFillRecords(@Valid IotOpeationFillPageReqVO pageReqVO) {
+
+        List<IotOpeationFillOrderDO> list =  iotOpeationFillService.fillRecords(pageReqVO);
+        PageResult<IotOpeationFillOrderDO> fillList = new PageResult(list,Long.valueOf(list.size()));
 
         return success(BeanUtils.toBean(fillList, IotOpeationFillOrderDO.class));
     }
 
+
     @GetMapping("/getAttrs")
     @PermitAll
     @Operation(summary = "获得PMS 功能优化 设备模板属性")
@@ -227,13 +259,14 @@ public class IotOpeationFillController {
         logDO1.setDeviceId(vo.getDeviceId());
         LocalTime local = LocalTime.of(12, 0);
         logDO1.setCreateTime(LocalDateTime.of(vo.getCreateTime(),local));
-        List<IotDeviceRunLogDO> logList = iotOpeationFillService.getDeivceFillInfo(logDO1);
 
+        List<IotDeviceRunLogDO> logList = iotOpeationFillService.getDeivceFillInfo(logDO1);
+        List<IotDeviceRunLogDO> maxLog = iotOpeationFillService.getMaxFillInfo(logDO1);
 
         if(exists){
             for (IotModelTemplateAttrsDO attrsDO:list) {
-                DeviceVO dv= new DeviceVO();
 
+                DeviceVO dv= new DeviceVO();
                 dv.setDeviceName(vo.getDeviceCode().toLowerCase());
                 dv.setColName(attrsDO.getModelAttr());
                 dv.setTs(startTime);
@@ -260,14 +293,22 @@ public class IotOpeationFillController {
                                  */
                                 attrsDO.setIsCollection(0);
                             }
-
                         }
+                    }else{
+                        attrsDO.setFillContent("0.0");
+                        attrsDO.setTotalRunTime(maxLog.get(0).getTotalRunTime());
+                        /**
+                         * 设置为非数采
+                         */
+                        attrsDO.setIsCollection(0);
                     }
                 }
             }
         }else{
-            if(logList.size()>0){
-                for (IotModelTemplateAttrsDO attrsDO:list) {
+
+            for (IotModelTemplateAttrsDO attrsDO:list) {
+                if(logList.size()>0){
+
                     for (IotDeviceRunLogDO log:logList) {
                         if(log.getPointName().equals(attrsDO.getName())){
                             attrsDO.setFillContent(log.getFillContent());
@@ -279,8 +320,19 @@ public class IotOpeationFillController {
                         }
 
                     }
-               }
-            }
+
+                }else{
+                    attrsDO.setFillContent("0.0");
+                    attrsDO.setTotalRunTime(maxLog.get(0).getTotalRunTime());
+                    /**
+                     * 设置为非数采
+                     */
+                    attrsDO.setIsCollection(0);
+
+                }
+
+           }
+
         }
 
 

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotopeationfill/vo/IotOpeationFillPageReqVO.java

@@ -71,11 +71,11 @@ public class IotOpeationFillPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
-    private int isFill;
+    private Integer isFill;
     private String orderName;
     private String orderType;
-    private int orderStatus;
-    private int userId;
+    private Integer orderStatus;
+    private Integer userId;
     private String userName;
 
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotopeationfill/vo/IotOpeationFillRespVO.java

@@ -84,4 +84,8 @@ public class IotOpeationFillRespVO {
     private Integer userId;
 
     private Integer isFill;
+
+    private Long orderId;
+
+    private Integer deviceId;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotdevicepersonlog/IotDevicePersonLogDO.java

@@ -0,0 +1,59 @@
+package cn.iocoder.yudao.module.pms.dal.dataobject.iotdevicepersonlog;
+
+import lombok.*;
+import java.util.*;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+
+/**
+ * 设备责任人日志 DO
+ *
+ * @author ruiqi
+ */
+@TableName("rq_iot_device_person_log")
+@KeySequence("rq_iot_device_person_log_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class IotDevicePersonLogDO extends BaseDO {
+
+    /**
+     * 主键id
+     */
+    @TableId
+    private Long id;
+    /**
+     * 设备id
+     */
+    private Long deviceId;
+    /**
+     * 设备调整前责任人
+     */
+    private Long oldPersonId;
+    /**
+     * 设备调整前责任人id集合
+     */
+    private String oldPersonIds;
+    /**
+     * 设备调整后责任人
+     */
+    private Long newPersonId;
+    /**
+     * 设备调整后责任人id集合
+     */
+    private String newPersonIds;
+    /**
+     * 调整原因
+     */
+    private String reason;
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotmainworkorderbommaterial/IotMainWorkOrderBomMaterialDO.java

@@ -112,6 +112,20 @@ public class IotMainWorkOrderBomMaterialDO extends BaseDO {
      * 物料来源 (SAP库存 本地库存...)
      */
     private String materialSource;
+
+    /**
+     * 工厂id
+     */
+    private Long factoryId;
+    /**
+     * 成本中心id
+     */
+    private Long costCenterId;
+    /**
+     * 库存地点id
+     */
+    private Long storageLocationId;
+
     /**
      * 库存地点
      */

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotopeationfill/IotOpeationFillDO.java

@@ -102,7 +102,8 @@ public class IotOpeationFillDO extends BaseDO {
     private String orderName;
     private String orderType;
     private int orderStatus;
-    private int userId;
+    private Integer userId;
     private String userName;
+    private Long orderId;
 
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotopeationfill/IotOpeationFillOrderDO.java

@@ -41,6 +41,6 @@ public class IotOpeationFillOrderDO extends BaseDO {
     private String orderType;
     private int orderStatus;
     private String userName;
-    private int userId;
+    private Integer userId;
 
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/iotdevicecategorytemplateattrs/IotDeviceCategoryTemplateAttrsMapper.java

@@ -37,6 +37,25 @@ public interface IotDeviceCategoryTemplateAttrsMapper extends BaseMapperX<IotDev
                 .orderByDesc(IotDeviceCategoryTemplateAttrsDO::getId));
     }
 
+    default List<IotDeviceCategoryTemplateAttrsDO> selectList(IotDeviceCategoryTemplateAttrsPageReqVO reqVO) {
+        return selectList(new LambdaQueryWrapperX<IotDeviceCategoryTemplateAttrsDO>()
+                .eqIfPresent(IotDeviceCategoryTemplateAttrsDO::getDeviceCategoryId, reqVO.getDeviceCategoryId())
+                .eqIfPresent(IotDeviceCategoryTemplateAttrsDO::getTemplateId, reqVO.getTemplateId())
+                .likeIfPresent(IotDeviceCategoryTemplateAttrsDO::getName, reqVO.getName())
+                .eqIfPresent(IotDeviceCategoryTemplateAttrsDO::getCode, reqVO.getCode())
+                .eqIfPresent(IotDeviceCategoryTemplateAttrsDO::getType, reqVO.getType())
+                .eqIfPresent(IotDeviceCategoryTemplateAttrsDO::getRequiredFlag, reqVO.getRequiredFlag())
+                .eqIfPresent(IotDeviceCategoryTemplateAttrsDO::getDefaultValue, reqVO.getDefaultValue())
+                .eqIfPresent(IotDeviceCategoryTemplateAttrsDO::getUnit, reqVO.getUnit())
+                .eqIfPresent(IotDeviceCategoryTemplateAttrsDO::getDescription, reqVO.getDescription())
+                .eqIfPresent(IotDeviceCategoryTemplateAttrsDO::getStatus, reqVO.getStatus())
+                .eqIfPresent(IotDeviceCategoryTemplateAttrsDO::getRemark, reqVO.getRemark())
+                .eqIfPresent(IotDeviceCategoryTemplateAttrsDO::getSort, reqVO.getSort())
+                .eqIfPresent(IotDeviceCategoryTemplateAttrsDO::getSelectOptions, reqVO.getSelectOptions())
+                .eqIfPresent(IotDeviceCategoryTemplateAttrsDO::getVersion, reqVO.getVersion())
+                .betweenIfPresent(IotDeviceCategoryTemplateAttrsDO::getCreateTime, reqVO.getCreateTime()));
+    }
+
     default List<IotDeviceCategoryTemplateAttrsDO> selectList(Long deviceCategoryId) {
         return selectList(IotDeviceCategoryTemplateAttrsDO::getDeviceCategoryId, deviceCategoryId);
     }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/iotdevicepersonlog/IotDevicePersonLogMapper.java

@@ -0,0 +1,33 @@
+package cn.iocoder.yudao.module.pms.dal.mysql.iotdevicepersonlog;
+
+import java.util.*;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotdevicepersonlog.IotDevicePersonLogDO;
+import org.apache.ibatis.annotations.Mapper;
+import cn.iocoder.yudao.module.pms.controller.admin.iotdevicepersonlog.vo.*;
+
+/**
+ * 设备责任人日志 Mapper
+ *
+ * @author ruiqi
+ */
+@Mapper
+public interface IotDevicePersonLogMapper extends BaseMapperX<IotDevicePersonLogDO> {
+
+    default PageResult<IotDevicePersonLogDO> selectPage(IotDevicePersonLogPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<IotDevicePersonLogDO>()
+                .eqIfPresent(IotDevicePersonLogDO::getDeviceId, reqVO.getDeviceId())
+                .eqIfPresent(IotDevicePersonLogDO::getOldPersonId, reqVO.getOldPersonId())
+                .eqIfPresent(IotDevicePersonLogDO::getOldPersonIds, reqVO.getOldPersonIds())
+                .eqIfPresent(IotDevicePersonLogDO::getNewPersonId, reqVO.getNewPersonId())
+                .eqIfPresent(IotDevicePersonLogDO::getNewPersonIds, reqVO.getNewPersonIds())
+                .eqIfPresent(IotDevicePersonLogDO::getReason, reqVO.getReason())
+                .eqIfPresent(IotDevicePersonLogDO::getRemark, reqVO.getRemark())
+                .betweenIfPresent(IotDevicePersonLogDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(IotDevicePersonLogDO::getId));
+    }
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/iotlockstock/IotLockStockMapper.java

@@ -7,6 +7,8 @@ import cn.iocoder.yudao.module.pms.controller.admin.iotlockstock.vo.IotLockStock
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotlockstock.IotLockStockDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * PMS 本地 库存 Mapper
  *
@@ -45,4 +47,35 @@ public interface IotLockStockMapper extends BaseMapperX<IotLockStockDO> {
                 .orderByDesc(IotLockStockDO::getId));
     }
 
+    default List<IotLockStockDO> selectList(IotLockStockPageReqVO reqVO) {
+        return selectList(new LambdaQueryWrapperX<IotLockStockDO>()
+                .eqIfPresent(IotLockStockDO::getDeptId, reqVO.getDeptId())
+                .eqIfPresent(IotLockStockDO::getFactoryId, reqVO.getFactoryId())
+                .eqIfPresent(IotLockStockDO::getFactory, reqVO.getFactory())
+                .eqIfPresent(IotLockStockDO::getStorageLocationId, reqVO.getStorageLocationId())
+                .eqIfPresent(IotLockStockDO::getProjectDepartment, reqVO.getProjectDepartment())
+                .eqIfPresent(IotLockStockDO::getCostCenterId, reqVO.getCostCenterId())
+                .eqIfPresent(IotLockStockDO::getCostCenter, reqVO.getCostCenter())
+                .eqIfPresent(IotLockStockDO::getPickingListNumber, reqVO.getPickingListNumber())
+                .likeIfPresent(IotLockStockDO::getMaterialCode, reqVO.getMaterialCode())
+                .likeIfPresent(IotLockStockDO::getMaterialName, reqVO.getMaterialName())
+                .likeIfPresent(IotLockStockDO::getMaterialGroupName, reqVO.getMaterialGroupName())
+                .eqIfPresent(IotLockStockDO::getMaterialGroupId, reqVO.getMaterialGroupId())
+                .eqIfPresent(IotLockStockDO::getQuantity, reqVO.getQuantity())
+                .eqIfPresent(IotLockStockDO::getUnitPrice, reqVO.getUnitPrice())
+                .eqIfPresent(IotLockStockDO::getUnit, reqVO.getUnit())
+                .betweenIfPresent(IotLockStockDO::getStorageTime, reqVO.getStorageTime())
+                .eqIfPresent(IotLockStockDO::getStorageAreaId, reqVO.getStorageAreaId())
+                .eqIfPresent(IotLockStockDO::getShelvesId, reqVO.getShelvesId())
+                .eqIfPresent(IotLockStockDO::getCargoLocationId, reqVO.getCargoLocationId())
+                .eqIfPresent(IotLockStockDO::getSort, reqVO.getSort())
+                .eqIfPresent(IotLockStockDO::getStatus, reqVO.getStatus())
+                .eqIfPresent(IotLockStockDO::getProcessInstanceId, reqVO.getProcessInstanceId())
+                .eqIfPresent(IotLockStockDO::getAuditStatus, reqVO.getAuditStatus())
+                .eqIfPresent(IotLockStockDO::getRemark, reqVO.getRemark())
+                .inIfPresent(IotLockStockDO::getFactoryId, reqVO.getFactoryIds())
+                .inIfPresent(IotLockStockDO::getCostCenterId, reqVO.getCostCenterIds())
+                .betweenIfPresent(IotLockStockDO::getCreateTime, reqVO.getCreateTime()));
+    }
+
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/iotopeationfill/IotOpeationFillMapper.java

@@ -64,6 +64,9 @@ public interface IotOpeationFillMapper extends BaseMapperX<IotOpeationFillDO> {
     List<IotOpeationFillDO> ryList();
     @TenantIgnore
     List<IotOpeationFillDO> rhList();
+    @TenantIgnore
+    List<IotOpeationFillDO> pdList1(IotOpeationFillDO vo);
+
     @TenantIgnore
     List<IotOpeationFillDO> pdList();
     List<IotOpeationFillDO> deviceList(IotOpeationFillRespVO vo);
@@ -78,7 +81,14 @@ public interface IotOpeationFillMapper extends BaseMapperX<IotOpeationFillDO> {
     List<IotOpeationFillRespVO> getFillList(IotOpeationFillRespVO vo);
 
     List<IotDeviceRunLogDO> getDeivceFillInfo(IotDeviceRunLogDO vo);
+    List<IotDeviceRunLogDO> getMaxFillInfo(IotDeviceRunLogDO vo);
 
+    @TenantIgnore
     int updateFillOrder(IotDeviceRunLogDO vo);
+    @TenantIgnore
     int updateFillOrder1(IotDeviceRunLogDO vo);
+    @TenantIgnore
+    int updateFillOrder2(IotDeviceRunLogDO vo);
+    @TenantIgnore
+    List<IotOpeationFillOrderDO> fillRecords(IotOpeationFillPageReqVO vo);
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/iotopeationfill/IotOpeationFillOrderMapper.java

@@ -37,15 +37,15 @@ public interface IotOpeationFillOrderMapper extends BaseMapperX<IotOpeationFillO
     }
     @TenantIgnore
     default PageResult<IotOpeationFillOrderDO> selectPage1(IotOpeationFillPageReqVO reqVO,
-                                                           Collection<Integer> userIds,
-                                                           Collection<String> names) {
+                                                           Collection<Long> deptIds
+                                                           ) {
         return selectPage(reqVO, new LambdaQueryWrapperX<IotOpeationFillOrderDO>()
-                .eqIfPresent(IotOpeationFillOrderDO::getDeptId, reqVO.getDeptId())
+                .inIfPresent(IotOpeationFillOrderDO::getDeptId, deptIds)
                 .likeIfPresent(IotOpeationFillOrderDO::getOrderName, reqVO.getOrderName())
                 .eqIfPresent(IotOpeationFillOrderDO::getOrderType, reqVO.getOrderType())
                 .eqIfPresent(IotOpeationFillOrderDO::getOrderStatus, reqVO.getOrderStatus())
-                .inIfPresent(IotOpeationFillOrderDO::getUserName, names)
-                .inIfPresent(IotOpeationFillOrderDO::getUserId, userIds)
+                .likeIfPresent(IotOpeationFillOrderDO::getUserName, reqVO.getUserName())
+                .eqIfPresent(IotOpeationFillOrderDO::getUserId, reqVO.getUserId())
                 .betweenIfPresent(IotOpeationFillOrderDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(IotOpeationFillOrderDO::getId));
     }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/iotsapstock/IotSapStockMapper.java

@@ -47,6 +47,8 @@ public interface IotSapStockMapper extends BaseMapperX<IotSapStockDO> {
                 .orderByDesc(IotSapStockDO::getId);
         if ("Y".equals(reqVO.getConfigFlag())) {
             query.gt(IotSapStockDO::getSafetyStock, 0);
+        } else if ("N".equals(reqVO.getConfigFlag())) {
+            query.eq(IotSapStockDO::getSafetyStock, 0);
         }
         return selectJoinPage(reqVO, IotSapStockDO.class, query);
     }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/job/IotOperationFillJob.java

@@ -6,7 +6,9 @@ import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
 import cn.iocoder.yudao.framework.tenant.core.job.TenantJob;
 import cn.iocoder.yudao.module.pms.controller.admin.iotopeationfill.vo.IotOpeationFillPageReqVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillOrderDO;
 import cn.iocoder.yudao.module.pms.dal.mysql.iotopeationfill.IotOpeationFillMapper;
+import cn.iocoder.yudao.module.pms.dal.mysql.iotopeationfill.IotOpeationFillOrderMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
@@ -20,6 +22,8 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 /**
  * @author yc
@@ -35,13 +39,15 @@ public class IotOperationFillJob implements JobHandler {
 
     @Autowired
     private IotOpeationFillMapper iotOpeationFillMapper;
+    @Autowired
+    private IotOpeationFillOrderMapper iotOpeationFillOrderMapper;
 
     @Override
     @TenantIgnore
     public String execute(String param) throws Exception {
         TenantContextHolder.setIgnore(true);
         System.out.println("***********创建运行记录填报工单开始执行*********8");
-        List<IotOpeationFillDO> orderList = new ArrayList<>();
+        List<IotOpeationFillOrderDO> orderList = new ArrayList<>();
         List<IotOpeationFillDO> pdList = iotOpeationFillMapper.pdList();
         List<IotOpeationFillDO> rhList = iotOpeationFillMapper.rhList();
         List<IotOpeationFillDO> rdList = iotOpeationFillMapper.rdList();
@@ -49,10 +55,10 @@ public class IotOperationFillJob implements JobHandler {
 
         for (IotOpeationFillDO pd:pdList) {
 
-            IotOpeationFillDO fillDO = new IotOpeationFillDO();
+            IotOpeationFillOrderDO fillDO = new IotOpeationFillOrderDO();
 
             boolean exists = rhList.stream()
-                    .anyMatch(rh -> rh.getDeptId().equals(pd.getDeptId()));
+                    .anyMatch(rh -> rh.getId().equals(pd.getDeptId()));
             if(exists){
                 fillDO.setOrderName("瑞恒兴域"+LocalDate.now()+"运行记录填报");
                 fillDO.setDeptId(pd.getDeptId());
@@ -64,7 +70,7 @@ public class IotOperationFillJob implements JobHandler {
             }
 
             boolean exists1 = rdList.stream()
-                    .anyMatch(rd -> rd.getDeptId().equals(pd.getDeptId()));
+                    .anyMatch(rd -> rd.getId().equals(pd.getDeptId()));
 
             if(exists1){
                 fillDO.setOrderName("瑞都石油"+LocalDate.now()+"运行记录填报");
@@ -77,7 +83,7 @@ public class IotOperationFillJob implements JobHandler {
             }
 
             boolean exists2 = ryList.stream()
-                    .anyMatch(ry -> ry.getDeptId().equals(pd.getDeptId()));
+                    .anyMatch(ry -> ry.getId().equals(pd.getDeptId()));
 
             if(exists2){
                 fillDO.setOrderName("瑞鹰国际"+LocalDate.now()+"运行记录填报");
@@ -90,41 +96,51 @@ public class IotOperationFillJob implements JobHandler {
             }
         }
 
-        iotOpeationFillMapper.insertFillOrder(orderList);
+        //iotOpeationFillMapper.insertFillOrder(orderList);
+        List<IotOpeationFillDO> deviceList = iotOpeationFillMapper.getFillDevices();
+
+        List<Integer> idList = deviceList.stream().map(IotOpeationFillDO::getUserId).collect(Collectors.toList());
 
 
 
+        List<IotOpeationFillOrderDO> orderList1 = orderList.stream()
+                .filter(obj -> idList.contains(obj.getUserId()))
+                .collect(Collectors.toList());
 
+        iotOpeationFillOrderMapper.insertBatch(orderList1);
 
-       /* Long[] deptArray = {157L,158L,163L};
-        for (Long a:deptArray) {
-            IotOpeationFillDO fillDO = new IotOpeationFillDO();
-            fillDO.setDeptId(a);
-            if(a==157L){
-                fillDO.setOrderName("瑞恒兴域运行记录填报");
-            }else if(a==158L){
-                fillDO.setOrderName("瑞鹰国际运行记录填报");
-            }else{
-                fillDO.setOrderName("四川瑞都运行记录填报");
+
+        for (IotOpeationFillDO device:deviceList) {
+            System.out.println("deviceUser"+device.getUserId());
+            for (IotOpeationFillOrderDO order:orderList1) {
+                System.out.println("orderId"+order.getUserId());
+                if(device.getUserId().intValue()==order.getUserId().intValue()){
+                    System.out.println("-----相等-------");
+                    device.setOrderId(order.getId());
+                }
             }
-            fillDO.setOrderType("计划生成");
-            fillDO.setOrderStatus(0);
-            fillDO.setCreateTime(LocalDateTime.now());
-            orderList.add(fillDO);
-        }*/
+        }
+
+
+
 
         System.out.println("***********创建运行记录填报工单执行结束*********8");
 
+
+
+
+
+
         System.out.println("*****************插入运行记录设备表***********************");
         IotOpeationFillPageReqVO vo = new IotOpeationFillPageReqVO();
         List<IotOpeationFillDO> fillList = iotOpeationFillMapper.fillList(vo);
         if(fillList.size()==0){
-            List<IotOpeationFillDO> deviceList = iotOpeationFillMapper.getFillDevices();
             for (IotOpeationFillDO re:deviceList) {
                 re.setDeviceId(re.getId());
             }
             iotOpeationFillMapper.insertFill(deviceList);
         }
+
         System.out.println("*****************插入运行记录设备表完成***********************");
         return "创建成功";
     }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotdevicecategorytemplateattrs/IotDeviceCategoryTemplateAttrsServiceImpl.java

@@ -1,11 +1,13 @@
 package cn.iocoder.yudao.module.pms.service.iotdevicecategorytemplateattrs;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.pms.controller.admin.iotdevicecategorytemplateattrs.vo.IotDeviceCategoryTemplateAttrsPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotdevicecategorytemplateattrs.vo.IotDeviceCategoryTemplateAttrsSaveReqVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotdevicecategorytemplateattrs.IotDeviceCategoryTemplateAttrsDO;
 import cn.iocoder.yudao.module.pms.dal.mysql.iotdevicecategorytemplateattrs.IotDeviceCategoryTemplateAttrsMapper;
+import cn.iocoder.yudao.module.system.dal.dataobject.dept.PostDO;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
@@ -15,6 +17,8 @@ import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.pms.enums.ErrorCodeConstant.IOT_DEVICE_CATEGORY_TEMPLATE_ATTRS_NOT_EXISTS;
+import static cn.iocoder.yudao.module.pms.enums.ErrorCodeConstant.IOT_DEVICE_TEMPLATE_ATTRS_EXISTS;
+import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.POST_NAME_DUPLICATE;
 
 /**
  * 设备分类公共模板属性 Service 实现类
@@ -39,13 +43,33 @@ public class IotDeviceCategoryTemplateAttrsServiceImpl implements IotDeviceCateg
 
     @Override
     public void updateIotDeviceCategoryTemplateAttrs(IotDeviceCategoryTemplateAttrsSaveReqVO updateReqVO) {
-        // 校验存在
+        // 校验属性是否存在
         validateIotDeviceCategoryTemplateAttrsExists(updateReqVO.getId());
+        // 查验是否存在相同标识符的属性
+        validateAttrCodeUnique(updateReqVO.getId(), updateReqVO.getCode());
         // 更新
         IotDeviceCategoryTemplateAttrsDO updateObj = BeanUtils.toBean(updateReqVO, IotDeviceCategoryTemplateAttrsDO.class);
         iotDeviceCategoryTemplateAttrsMapper.updateById(updateObj);
     }
 
+    private void validateAttrCodeUnique(Long id, String code) {
+        IotDeviceCategoryTemplateAttrsPageReqVO reqVO = new IotDeviceCategoryTemplateAttrsPageReqVO();
+        reqVO.setCode(code);
+        List<IotDeviceCategoryTemplateAttrsDO> attrs = iotDeviceCategoryTemplateAttrsMapper.selectList(reqVO);
+        if (CollUtil.isEmpty(attrs)) {
+            return;
+        }
+        // 如果有相同的标识符，随机取一个
+        IotDeviceCategoryTemplateAttrsDO attr = attrs.get(0);
+        // 如果 id 为空，说明不用比较是否为相同 id 的岗位
+        if (id == null) {
+            throw exception(IOT_DEVICE_TEMPLATE_ATTRS_EXISTS);
+        }
+        if (!attr.getId().equals(id)) {
+            throw exception(IOT_DEVICE_TEMPLATE_ATTRS_EXISTS);
+        }
+    }
+
     @Override
     public void deleteIotDeviceCategoryTemplateAttrs(Long id) {
         // 校验存在

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotdevicepersonlog/IotDevicePersonLogService.java

@@ -0,0 +1,55 @@
+package cn.iocoder.yudao.module.pms.service.iotdevicepersonlog;
+
+import java.util.*;
+import javax.validation.*;
+import cn.iocoder.yudao.module.pms.controller.admin.iotdevicepersonlog.vo.*;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotdevicepersonlog.IotDevicePersonLogDO;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+
+/**
+ * 设备责任人日志 Service 接口
+ *
+ * @author ruiqi
+ */
+public interface IotDevicePersonLogService {
+
+    /**
+     * 创建设备责任人日志
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createIotDevicePersonLog(@Valid IotDevicePersonLogSaveReqVO createReqVO);
+
+    /**
+     * 更新设备责任人日志
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateIotDevicePersonLog(@Valid IotDevicePersonLogSaveReqVO updateReqVO);
+
+    /**
+     * 删除设备责任人日志
+     *
+     * @param id 编号
+     */
+    void deleteIotDevicePersonLog(Long id);
+
+    /**
+     * 获得设备责任人日志
+     *
+     * @param id 编号
+     * @return 设备责任人日志
+     */
+    IotDevicePersonLogDO getIotDevicePersonLog(Long id);
+
+    /**
+     * 获得设备责任人日志分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 设备责任人日志分页
+     */
+    PageResult<IotDevicePersonLogDO> getIotDevicePersonLogPage(IotDevicePersonLogPageReqVO pageReqVO);
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotdevicepersonlog/IotDevicePersonLogServiceImpl.java

@@ -0,0 +1,71 @@
+package cn.iocoder.yudao.module.pms.service.iotdevicepersonlog;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.pms.controller.admin.iotdevicepersonlog.vo.IotDevicePersonLogPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.iotdevicepersonlog.vo.IotDevicePersonLogSaveReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotdevicepersonlog.IotDevicePersonLogDO;
+import cn.iocoder.yudao.module.pms.dal.mysql.iotdevicepersonlog.IotDevicePersonLogMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.pms.enums.ErrorCodeConstant.IOT_DEVICE_PERSON_LOG_NOT_EXISTS;
+
+/**
+ * 设备责任人日志 Service 实现类
+ *
+ * @author ruiqi
+ */
+@Service
+@Validated
+public class IotDevicePersonLogServiceImpl implements IotDevicePersonLogService {
+
+    @Resource
+    private IotDevicePersonLogMapper iotDevicePersonLogMapper;
+
+    @Override
+    public Long createIotDevicePersonLog(IotDevicePersonLogSaveReqVO createReqVO) {
+        // 插入
+        IotDevicePersonLogDO iotDevicePersonLog = BeanUtils.toBean(createReqVO, IotDevicePersonLogDO.class);
+        iotDevicePersonLogMapper.insert(iotDevicePersonLog);
+        // 返回
+        return iotDevicePersonLog.getId();
+    }
+
+    @Override
+    public void updateIotDevicePersonLog(IotDevicePersonLogSaveReqVO updateReqVO) {
+        // 校验存在
+        validateIotDevicePersonLogExists(updateReqVO.getId());
+        // 更新
+        IotDevicePersonLogDO updateObj = BeanUtils.toBean(updateReqVO, IotDevicePersonLogDO.class);
+        iotDevicePersonLogMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteIotDevicePersonLog(Long id) {
+        // 校验存在
+        validateIotDevicePersonLogExists(id);
+        // 删除
+        iotDevicePersonLogMapper.deleteById(id);
+    }
+
+    private void validateIotDevicePersonLogExists(Long id) {
+        if (iotDevicePersonLogMapper.selectById(id) == null) {
+            throw exception(IOT_DEVICE_PERSON_LOG_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public IotDevicePersonLogDO getIotDevicePersonLog(Long id) {
+        return iotDevicePersonLogMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<IotDevicePersonLogDO> getIotDevicePersonLogPage(IotDevicePersonLogPageReqVO pageReqVO) {
+        return iotDevicePersonLogMapper.selectPage(pageReqVO);
+    }
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotmainworkorder/IotMainWorkOrderServiceImpl.java

@@ -7,6 +7,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.pms.controller.admin.iotlockstock.vo.IotLockStockPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotmainworkorder.vo.IotMainWorkOrderPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotmainworkorder.vo.IotMainWorkOrderRespVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotmainworkorder.vo.IotMainWorkOrderSaveReqVO;
@@ -16,9 +17,11 @@ import cn.iocoder.yudao.module.pms.controller.admin.iotmainworkorderbom.vo.IotMa
 import cn.iocoder.yudao.module.pms.controller.admin.iotmainworkorderbom.vo.IotMainWorkOrderBomSaveReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotmainworkorderbommaterial.vo.IotMainWorkOrderBomMaterialSaveReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.vo.IotDeviceRespVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.iotlockstock.IotLockStockDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotmainworkorder.IotMainWorkOrderDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotmainworkorderbom.IotMainWorkOrderBomDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotmainworkorderbommaterial.IotMainWorkOrderBomMaterialDO;
+import cn.iocoder.yudao.module.pms.dal.mysql.iotlockstock.IotLockStockMapper;
 import cn.iocoder.yudao.module.pms.dal.mysql.iotmainworkorder.IotMainWorkOrderMapper;
 import cn.iocoder.yudao.module.pms.dal.mysql.iotmainworkorderbom.IotMainWorkOrderBomMapper;
 import cn.iocoder.yudao.module.pms.dal.mysql.iotmainworkorderbommaterial.IotMainWorkOrderBomMaterialMapper;
@@ -31,9 +34,8 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.math.BigDecimal;
+import java.util.*;
 import java.util.stream.Stream;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -59,6 +61,8 @@ public class IotMainWorkOrderServiceImpl implements IotMainWorkOrderService {
     private IotMainWorkOrderBomMaterialMapper iotMainWorkOrderBomMaterialMapper;
     @Resource
     private IotDeviceService iotDeviceService;
+    @Resource
+    private IotLockStockMapper iotLockStockMapper;
 
     @Override
     public Long createIotMainWorkOrder(IotMainWorkOrderSaveReqVO createReqVO) {
@@ -99,6 +103,9 @@ public class IotMainWorkOrderServiceImpl implements IotMainWorkOrderService {
 
     @Override
     public PageResult<IotMainWorkOrderDO> getIotMainWorkOrderPage(IotMainWorkOrderPageReqVO pageReqVO) {
+        if (ObjUtil.isNotEmpty(pageReqVO.getResult()) && 0 == pageReqVO.getResult()) {
+            pageReqVO.setResult(null);
+        }
         return iotMainWorkOrderMapper.selectPage(pageReqVO);
     }
 
@@ -136,7 +143,7 @@ public class IotMainWorkOrderServiceImpl implements IotMainWorkOrderService {
         if (ObjectUtil.isEmpty(workOrderMaterials)) {
             throw exception(IOT_MAIN_WORK_ORDER_NOT_EXISTS);
         }
-        // todo 保养工单 主表 还有 保养费用 、人工费用 、其他费用
+        // 保养工单 主表 还有 保养费用 、人工费用 、其他费用
         IotMainWorkOrderDO updateObj = BeanUtils.toBean(mainWorkOrder, IotMainWorkOrderDO.class);
         updateObj.setResult(2);
         iotMainWorkOrderMapper.updateById(updateObj);
@@ -149,13 +156,73 @@ public class IotMainWorkOrderServiceImpl implements IotMainWorkOrderService {
         iotMainWorkOrderBomMapper.updateBatch(workOrderBomDOS);
         // 保养工单 bom 明细关联的物料消耗
         List<IotMainWorkOrderBomMaterialDO> workOrderBomMaterialDOS = new ArrayList<>();
+        Set<Long> factoryIds = new HashSet<>();
+        Set<Long> costCenterIds = new HashSet<>();
+        Set<Long> storageLocationIds = new HashSet<>();
+        Set<String> materialCodes = new HashSet<>();
+        Map<String, BigDecimal> lockStockPair = new HashMap<>();
         workOrderMaterials.forEach(material -> {
             IotMainWorkOrderBomMaterialDO tempMaterial = BeanUtils.toBean(material, IotMainWorkOrderBomMaterialDO.class);
             tempMaterial.setWorkOrderId(mainWorkOrder.getId());
             workOrderBomMaterialDOS.add(tempMaterial);
+            if ("本地库存".equals(material.getMaterialSource())) {
+                if (ObjUtil.isNotEmpty(material.getFactoryId())) {
+                    factoryIds.add(material.getFactoryId());
+                }
+                if (ObjUtil.isNotEmpty(material.getCostCenterId())) {
+                    costCenterIds.add(material.getCostCenterId());
+                }
+                if (ObjUtil.isNotEmpty(material.getStorageLocationId())) {
+                    storageLocationIds.add(material.getStorageLocationId());
+                }
+                if (ObjUtil.isNotEmpty(material.getMaterialCode())) {
+                    materialCodes.add(material.getMaterialCode());
+                }
+                String tempKey = material.getFactoryId() + String.valueOf(material.getCostCenterId())
+                        + material.getMaterialCode();
+                if (lockStockPair.containsKey(tempKey)) {
+                    BigDecimal tempQuantity = lockStockPair.get(tempKey);
+                    BigDecimal totalQuantity = tempQuantity.add(material.getQuantity());
+                    lockStockPair.put(tempKey, totalQuantity);
+                } else {
+                    lockStockPair.put(tempKey, material.getQuantity());
+                }
+            }
         });
+        // 添加 工单消耗的物料记录
         iotMainWorkOrderBomMaterialMapper.insertBatch(workOrderBomMaterialDOS);
-        // todo 处理库存减少
+        // 只扣减本地库存 不处理SAP库存
+        if (CollUtil.isNotEmpty(factoryIds) && CollUtil.isNotEmpty(costCenterIds) && CollUtil.isNotEmpty(materialCodes)) {
+            IotLockStockPageReqVO reqVO = new IotLockStockPageReqVO();
+            reqVO.setFactoryIds(factoryIds);
+            reqVO.setCostCenterIds(costCenterIds);
+            reqVO.setMaterialCodes(materialCodes);
+            processLockStock(reqVO, lockStockPair);
+        }
+    }
+
+    /**
+     * 批量处理 库存扣减
+     * @param reqVO
+     * @param lockStockPair
+     */
+    private void processLockStock(IotLockStockPageReqVO reqVO, Map<String, BigDecimal> lockStockPair){
+        List<IotLockStockDO> lockStocks = iotLockStockMapper.selectList(reqVO);
+        List<IotLockStockDO> tobeUpdatedLockStocks = new ArrayList<>();
+        if (CollUtil.isNotEmpty(lockStocks)) {
+            lockStocks.forEach(lockStock -> {
+                String tempKey = lockStock.getFactoryId() + String.valueOf(lockStock.getCostCenterId())
+                        + lockStock.getMaterialCode();
+                if (lockStockPair.containsKey(tempKey)) {
+                    lockStock.setQuantity(lockStock.getQuantity().subtract(lockStockPair.get(tempKey)));
+                    tobeUpdatedLockStocks.add(lockStock);
+                }
+            });
+        }
+        if (CollUtil.isNotEmpty(tobeUpdatedLockStocks)) {
+            // 扣减本地库存
+            iotLockStockMapper.updateBatch(tobeUpdatedLockStocks);
+        }
     }
 
     @Override
@@ -175,7 +242,7 @@ public class IotMainWorkOrderServiceImpl implements IotMainWorkOrderService {
         if (ObjectUtil.isEmpty(workOrderMaterials)) {
             throw exception(IOT_MAIN_WORK_ORDER_NOT_EXISTS);
         }
-        // todo 保养工单 主表 还有 保养费用 、人工费用 、其他费用
+        // 保养工单 主表 还有 保养费用 、人工费用 、其他费用
         IotMainWorkOrderDO order = BeanUtils.toBean(mainWorkOrder, IotMainWorkOrderDO.class);
         // 生成保养工单号
         order.setOrderNumber(createWorkOrderNumber());
@@ -198,13 +265,48 @@ public class IotMainWorkOrderServiceImpl implements IotMainWorkOrderService {
         iotMainWorkOrderBomMapper.insertBatch(workOrderBomDOS);
         // 保养工单 bom 明细关联的物料消耗
         List<IotMainWorkOrderBomMaterialDO> workOrderBomMaterialDOS = new ArrayList<>();
+        Set<Long> factoryIds = new HashSet<>();
+        Set<Long> costCenterIds = new HashSet<>();
+        Set<Long> storageLocationIds = new HashSet<>();
+        Set<String> materialCodes = new HashSet<>();
+        Map<String, BigDecimal> lockStockPair = new HashMap<>();
         workOrderMaterials.forEach(material -> {
             IotMainWorkOrderBomMaterialDO tempMaterial = BeanUtils.toBean(material, IotMainWorkOrderBomMaterialDO.class);
             tempMaterial.setWorkOrderId(order.getId());
             workOrderBomMaterialDOS.add(tempMaterial);
+            if ("本地库存".equals(material.getMaterialSource())) {
+                if (ObjUtil.isNotEmpty(material.getFactoryId())) {
+                    factoryIds.add(material.getFactoryId());
+                }
+                if (ObjUtil.isNotEmpty(material.getCostCenterId())) {
+                    costCenterIds.add(material.getCostCenterId());
+                }
+                if (ObjUtil.isNotEmpty(material.getStorageLocationId())) {
+                    storageLocationIds.add(material.getStorageLocationId());
+                }
+                if (ObjUtil.isNotEmpty(material.getMaterialCode())) {
+                    materialCodes.add(material.getMaterialCode());
+                }
+                String tempKey = material.getFactoryId() + String.valueOf(material.getCostCenterId())
+                        + material.getMaterialCode();
+                if (lockStockPair.containsKey(tempKey)) {
+                    BigDecimal tempQuantity = lockStockPair.get(tempKey);
+                    BigDecimal totalQuantity = tempQuantity.add(material.getQuantity());
+                    lockStockPair.put(tempKey, totalQuantity);
+                } else {
+                    lockStockPair.put(tempKey, material.getQuantity());
+                }
+            }
         });
         iotMainWorkOrderBomMaterialMapper.insertBatch(workOrderBomMaterialDOS);
-        // todo 处理库存减少
+        // 只扣减本地库存 不处理SAP库存
+        if (CollUtil.isNotEmpty(factoryIds) && CollUtil.isNotEmpty(costCenterIds) && CollUtil.isNotEmpty(materialCodes)) {
+            IotLockStockPageReqVO reqVO = new IotLockStockPageReqVO();
+            reqVO.setFactoryIds(factoryIds);
+            reqVO.setCostCenterIds(costCenterIds);
+            reqVO.setMaterialCodes(materialCodes);
+            processLockStock(reqVO, lockStockPair);
+        }
     }
 
     @Override

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotopeationfill/IotOpeationFillService.java

@@ -4,21 +4,14 @@ import java.util.*;
 import javax.validation.*;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
-import cn.iocoder.yudao.module.pms.controller.admin.iotmodel.vo.IotModelPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotmodeltemplateattrs.vo.IotModelTemplateAttrsRespVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotopeationfill.vo.IotOpeationFillPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotopeationfill.vo.IotOpeationFillRespVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotopeationfill.vo.IotOpeationFillSaveReqVO;
-import cn.iocoder.yudao.module.pms.controller.admin.vo.IotDevicePageReqVO;
-import cn.iocoder.yudao.module.pms.controller.admin.vo.IotDeviceRespVO;
-import cn.iocoder.yudao.module.pms.dal.dataobject.IotDeviceDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotdevicerunlog.IotDeviceRunLogDO;
-import cn.iocoder.yudao.module.pms.dal.dataobject.iotmodel.IotModelDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotmodeltemplateattrs.IotModelTemplateAttrsDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillOrderDO;
-import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
 
 /**
  * 运行记录填报 Service 接口
@@ -79,9 +72,9 @@ public interface IotOpeationFillService {
 
     PageResult<IotOpeationFillOrderDO> fillList1(IotOpeationFillPageReqVO vo);
 
-    List<IotOpeationFillDO> pdList();
+    List<IotOpeationFillDO> pdList1(IotOpeationFillDO vo);
 
-    PageResult<IotOpeationFillOrderDO> fillList2(IotOpeationFillPageReqVO vo,List<Integer> userIds,List<String> nickNames);
+    PageResult<IotOpeationFillOrderDO> fillList2(IotOpeationFillPageReqVO vo,List<Long> deptIds);
 
 
 
@@ -98,6 +91,8 @@ public interface IotOpeationFillService {
 
     List<IotDeviceRunLogDO> getDeivceFillInfo(IotDeviceRunLogDO vo);
 
+    List<IotDeviceRunLogDO> getMaxFillInfo(IotDeviceRunLogDO vo);
+
     /**
      * 更新工单状态
      * @param vo
@@ -107,4 +102,8 @@ public interface IotOpeationFillService {
 
     int updateFillOrder1(IotDeviceRunLogDO vo);
 
+    int updateFillOrder2(IotDeviceRunLogDO vo);
+
+    List<IotOpeationFillOrderDO> fillRecords(IotOpeationFillPageReqVO vo);
+
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotopeationfill/IotOpeationFillServiceImpl.java

@@ -1,22 +1,15 @@
 package cn.iocoder.yudao.module.pms.service.iotopeationfill;
 
-import cn.iocoder.yudao.module.pms.controller.admin.iotmodel.vo.IotModelPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotmodeltemplateattrs.vo.IotModelTemplateAttrsRespVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotopeationfill.vo.IotOpeationFillPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotopeationfill.vo.IotOpeationFillRespVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotopeationfill.vo.IotOpeationFillSaveReqVO;
-import cn.iocoder.yudao.module.pms.controller.admin.vo.IotDevicePageReqVO;
-import cn.iocoder.yudao.module.pms.controller.admin.vo.IotDeviceRespVO;
-import cn.iocoder.yudao.module.pms.dal.dataobject.IotDeviceDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotdevicerunlog.IotDeviceRunLogDO;
-import cn.iocoder.yudao.module.pms.dal.dataobject.iotmodel.IotModelDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotmodeltemplateattrs.IotModelTemplateAttrsDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillOrderDO;
 import cn.iocoder.yudao.module.pms.dal.mysql.iotopeationfill.IotOpeationFillMapper;
 import cn.iocoder.yudao.module.pms.dal.mysql.iotopeationfill.IotOpeationFillOrderMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -26,7 +19,6 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 
 
-import java.util.Collection;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -131,13 +123,13 @@ public class IotOpeationFillServiceImpl implements IotOpeationFillService {
     }
 
     @Override
-    public List<IotOpeationFillDO> pdList() {
-        return iotOpeationFillMapper.pdList();
+    public List<IotOpeationFillDO> pdList1(IotOpeationFillDO vo) {
+        return iotOpeationFillMapper.pdList1(vo);
     }
 
     @Override
-    public PageResult<IotOpeationFillOrderDO> fillList2(IotOpeationFillPageReqVO vo,List<Integer> userIds,List<String> nickNames) {
-        return iotOpeationFillOrderMapper.selectPage1(vo,userIds,nickNames);
+    public PageResult<IotOpeationFillOrderDO> fillList2(IotOpeationFillPageReqVO vo,List<Long> deptIds) {
+        return iotOpeationFillOrderMapper.selectPage1(vo,deptIds);
     }
 
 
@@ -161,6 +153,11 @@ public class IotOpeationFillServiceImpl implements IotOpeationFillService {
         return iotOpeationFillMapper.getDeivceFillInfo(vo);
     }
 
+    @Override
+    public List<IotDeviceRunLogDO> getMaxFillInfo(IotDeviceRunLogDO vo) {
+        return iotOpeationFillMapper.getMaxFillInfo(vo);
+    }
+
     @Override
     public int updateFillOrder(IotDeviceRunLogDO vo) {
         return iotOpeationFillMapper.updateFillOrder(vo);
@@ -171,4 +168,14 @@ public class IotOpeationFillServiceImpl implements IotOpeationFillService {
         return iotOpeationFillMapper.updateFillOrder1(vo);
     }
 
+    @Override
+    public int updateFillOrder2(IotDeviceRunLogDO vo) {
+        return iotOpeationFillMapper.updateFillOrder2(vo);
+    }
+
+    @Override
+    public List<IotOpeationFillOrderDO> fillRecords(IotOpeationFillPageReqVO vo) {
+        return iotOpeationFillMapper.fillRecords(vo);
+    }
+
 }

yudao-module-pms/yudao-module-pms-biz/src/main/resources/mapper/static/IotOpeationFillMapper.xml

@@ -5,34 +5,38 @@
 
     <select id="getFillDevices"
             resultType="cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillDO">
+
         select
             distinct
-            a.id,
-            a.dept_id,
-            a.device_code,
-            a.device_name,
-            b.device_category_id
+            c.id,
+            c.dept_id,
+            c.device_code,
+            c.device_name,
+            b.device_category_id,
+            d.person_id user_id
         from
-            rqiot.rq_iot_device a,
-            rqiot.rq_iot_model_template b
+            rqiot.rq_iot_model_template a,
+            rqiot.rq_iot_model_template_attrs b,
+            rqiot.rq_iot_device c,
+            rqiot.rq_iot_device_person d
         where
-            a.asset_class = b.device_category_id
+            a.device_category_id = b.device_category_id
           and
-            a.deleted = 0
+            a.device_category_id = c.asset_class
           and
-            b.deleted = 0
+            c.id = d.device_id
           and
-            a.device_status in ('sg','dm')
+            c.device_status in ('sg','dm')
     </select>
 
 
     <insert id="insertFill"
     parameterType="cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillDO">
-       insert into rqiot.rq_iot_opeation_fill(device_id,device_code,device_name,device_category_id,create_time,dept_id)
+       insert into rqiot.rq_iot_opeation_fill(device_id,device_code,device_name,device_category_id,create_time,dept_id,order_id)
            values
         <foreach collection="list" item="item" separator=",">
             (#{item.deviceId},#{item.deviceCode},#{item.deviceName},
-            #{item.deviceCategoryId},#{item.createTime},#{item.deptId})
+            #{item.deviceCategoryId},#{item.createTime},#{item.deptId},#{item.orderId})
         </foreach>
     </insert>
 
@@ -94,68 +98,117 @@
 
     <select id="fillListByUserId" parameterType="cn.iocoder.yudao.module.pms.controller.admin.iotopeationfill.vo.IotOpeationFillRespVO"
             resultType="cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillDO">
-        SELECT distinct a.*,
-        b.name org_name FROM
-        rqiot.rq_iot_opeation_fill a,
-        rqiot.system_dept b,
+        select
+            distinct
+            a.*,
+            b.name org_name
+        from
+            rq_iot_opeation_fill a,
+            system_dept b,
+            rqiot.rq_iot_model_template_attrs c
+        where
+            a.dept_id = b.id
+          and
+            a.device_category_id = c.device_category_id
+
+            <if test="orderId != null  and orderId != ''">
+                and a.order_id = #{orderId}
+            </if>
+    </select>
+
+    <select id="fillListByDeptId" parameterType="cn.iocoder.yudao.module.pms.controller.admin.iotopeationfill.vo.IotOpeationFillRespVO"
+            resultType="cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillDO">
+        select
+        distinct
+        a.*,
+        b.name org_name
+        from
+        rq_iot_opeation_fill a,
+        system_dept b,
         rqiot.rq_iot_model_template_attrs c
-        WHERE DATE(a.create_time) = DATE(#{createTime})
-        <if test="userId != null  and userId != ''">
-            and a.device_id in (select device_id from
-            rqiot.rq_iot_device_person where person_id = #{userId})
-        </if>
-        and
+        where
         a.dept_id = b.id
         and
         a.device_category_id = c.device_category_id
 
+        <if test="orderId != null  and orderId != ''">
+            and a.order_id = #{orderId}
+        </if>
+        <if test="deviceId != null  and deviceId != ''">
+            and a.device_id = #{deviceId}
+        </if>
     </select>
 
-    <select id="fillListByDeptId" parameterType="cn.iocoder.yudao.module.pms.controller.admin.iotopeationfill.vo.IotOpeationFillRespVO"
-            resultType="cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillDO">
-        SELECT * FROM
-        rqiot.rq_iot_opeation_fill
-        WHERE DATE(create_time) = CURDATE()
-        <if test="deptId != null  and deptId != ''">
-            and dept_id in (SELECT d1.id
-            FROM system_dept d1
-            JOIN system_dept d2 ON d2.id = d1.parent_id
-            WHERE d2.parent_id = #{deptId}
-            union
-            select id from system_dept where id = #{deptId})
-        </if>
+    <select id="fillRecords" parameterType="cn.iocoder.yudao.module.pms.controller.admin.iotopeationfill.vo.IotOpeationFillPageReqVO"
+            resultType="cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillOrderDO">
+        select a.*
+        from
+               rq_iot_opeation_fill_order a,
+               rq_iot_opeation_fill b
+        where
+               a.id = b.order_id
+          and
+               b.device_id = #{deviceId}
     </select>
 
     <select id="rhList"
             resultType="cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillDO">
-        SELECT d1.id dept_id
-        FROM system_dept d1
-                 JOIN system_dept d2 ON d2.id = d1.parent_id
-        WHERE d2.parent_id = 157
-        union
-        select id from system_dept where id = 157
+        SELECT au.id, au.name, au.parent_id
+        FROM (SELECT * FROM system_dept WHERE parent_id IS NOT NULL) au,
+             (SELECT @parent_id := '157') pd
+        WHERE FIND_IN_SET(parent_id, @parent_id) > 0
+          AND @parent_id := concat(@parent_id, ',', id)
+        UNION
+        SELECT id, name, parent_id
+        FROM system_dept
+        WHERE id = '157'
+        ORDER BY id;
     </select>
 
     <select id="rdList"
             resultType="cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillDO">
-        SELECT d1.id dept_id
-        FROM system_dept d1
-                 JOIN system_dept d2 ON d2.id = d1.parent_id
-        WHERE d2.parent_id = 163
-        union
-        select id from system_dept where id = 163
+        SELECT au.id, au.name, au.parent_id
+        FROM (SELECT * FROM system_dept WHERE parent_id IS NOT NULL) au,
+             (SELECT @parent_id := '163') pd
+        WHERE FIND_IN_SET(parent_id, @parent_id) > 0
+          AND @parent_id := concat(@parent_id, ',', id)
+        UNION
+        SELECT id, name, parent_id
+        FROM system_dept
+        WHERE id = '163'
+        ORDER BY id;
     </select>
 
     <select id="ryList"
             resultType="cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillDO">
-        SELECT d1.id dept_id
-        FROM system_dept d1
-                 JOIN system_dept d2 ON d2.id = d1.parent_id
-        WHERE d2.parent_id = 158
-        union
-        select id from system_dept where id = 158
+        SELECT au.id, au.name, au.parent_id
+        FROM (SELECT * FROM system_dept WHERE parent_id IS NOT NULL) au,
+             (SELECT @parent_id := '158') pd
+        WHERE FIND_IN_SET(parent_id, @parent_id) > 0
+          AND @parent_id := concat(@parent_id, ',', id)
+        UNION
+        SELECT id, name, parent_id
+        FROM system_dept
+        WHERE id = '158'
+        ORDER BY id;
+    </select>
+
+
+    <select id="pdList1" parameterType="cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillDO"
+            resultType="cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillDO">
+        SELECT au.id, au.name, au.parent_id
+        FROM (SELECT * FROM system_dept WHERE parent_id IS NOT NULL) au,
+             (SELECT @parent_id := #{id}) pd
+        WHERE FIND_IN_SET(parent_id, @parent_id) > 0
+          AND @parent_id := concat(@parent_id, ',', id)
+        UNION
+        SELECT id, name, parent_id
+        FROM system_dept
+        WHERE id = #{id}
+        ORDER BY id;
     </select>
 
+
     <select id="pdList" resultType="cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillDO">
         select
             distinct
@@ -242,6 +295,19 @@
         limit 1
     </select>
 
+    <select id="getMaxFillInfo" parameterType="cn.iocoder.yudao.module.pms.dal.dataobject.iotdevicerunlog.IotDeviceRunLogDO"
+            resultType="cn.iocoder.yudao.module.pms.dal.dataobject.iotdevicerunlog.IotDeviceRunLogDO">
+        <!--SELECT * FROM rq_iot_device_run_log
+        WHERE
+            device_id = #{deviceId}
+        and
+            create_time  = (SELECT MAX(create_time) FROM rq_iot_device_run_log WHERE
+                device_id = #{deviceId})-->
+
+        select max(total_run_time)total_run_time from rq_iot_device_run_log  where  device_id = #{deviceId}
+
+    </select>
+
     <update id="updateFillOrder" parameterType="cn.iocoder.yudao.module.pms.dal.dataobject.iotdevicerunlog.IotDeviceRunLogDO">
         update rqiot.rq_iot_opeation_fill_order set order_status = 1 where id = #{id}
     </update>
@@ -249,4 +315,8 @@
         update rqiot.rq_iot_opeation_fill_order set order_status = 0 where id = #{id}
     </update>
 
+    <update id="updateFillOrder2" parameterType="cn.iocoder.yudao.module.pms.dal.dataobject.iotdevicerunlog.IotDeviceRunLogDO">
+        update rqiot.rq_iot_opeation_fill_order set order_status = 2 where id = #{id}
+    </update>
+
 </mapper>