Merge remote-tracking branch 'origin/master'

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

@@ -11,7 +11,6 @@ import cn.iocoder.yudao.module.pms.controller.admin.iotdevicecategorytemplate.vo
 import cn.iocoder.yudao.module.pms.controller.admin.iotdevicecategorytemplate.vo.IotDeviceCategoryTemplatePageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotdevicecategorytemplate.vo.IotDeviceCategoryTemplateRespVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotdevicecategorytemplate.vo.IotDeviceCategoryTemplateSaveReqVO;
-import cn.iocoder.yudao.module.pms.controller.admin.iotdevicetemplate.vo.DeviceTemplateUpdateStatusReqVO;
 import cn.iocoder.yudao.module.pms.convert.iotdevicecategorytemplate.IotDeviceCategoryTemplateConvert;
 import cn.iocoder.yudao.module.pms.dal.dataobject.IotProductClassifyDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotdevicecategorytemplate.IotDeviceCategoryTemplateDO;

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

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.pms.controller.admin.iotsapstock;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
@@ -25,7 +26,9 @@ import java.io.IOException;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.module.pms.enums.ErrorCodeConstant.IOT_SAP_STOCK_NOT_EXISTS;
 
 @Tag(name = "管理后台 - PMS SAP 库存(通用库存/项目部库存)")
 @RestController
@@ -51,6 +54,16 @@ public class IotSapStockController {
         return success(true);
     }
 
+    @PostMapping("/batchSetSafetyStock")
+    @Operation(summary = "批量设置安全库存")
+    @PreAuthorize("@ss.hasPermission('pms:iot-sap-stock:update')")
+    public CommonResult<Long> batchSetSafetyStock(@Valid @RequestBody List<IotSapStockSaveReqVO> sapStocks) {
+        if (CollUtil.isEmpty(sapStocks)) {
+            throw exception(IOT_SAP_STOCK_NOT_EXISTS);
+        }
+        return success(iotSapStockService.batchSetSafetyStock(sapStocks));
+    }
+
     @DeleteMapping("/delete")
     @Operation(summary = "删除PMS SAP 库存(通用库存/项目部库存)")
     @Parameter(name = "id", description = "编号", required = true)

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

@@ -25,7 +25,7 @@ public interface IotLockStockMapper extends BaseMapperX<IotLockStockDO> {
                 .eqIfPresent(IotLockStockDO::getCostCenterId, reqVO.getCostCenterId())
                 .eqIfPresent(IotLockStockDO::getCostCenter, reqVO.getCostCenter())
                 .eqIfPresent(IotLockStockDO::getPickingListNumber, reqVO.getPickingListNumber())
-                .eqIfPresent(IotLockStockDO::getMaterialCode, reqVO.getMaterialCode())
+                .likeIfPresent(IotLockStockDO::getMaterialCode, reqVO.getMaterialCode())
                 .likeIfPresent(IotLockStockDO::getMaterialName, reqVO.getMaterialName())
                 .likeIfPresent(IotLockStockDO::getMaterialGroupName, reqVO.getMaterialGroupName())
                 .eqIfPresent(IotLockStockDO::getMaterialGroupId, reqVO.getMaterialGroupId())

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

@@ -22,7 +22,7 @@ public interface IotSapStockMapper extends BaseMapperX<IotSapStockDO> {
                 .eqIfPresent(IotSapStockDO::getFactory, reqVO.getFactory())
                 .eqIfPresent(IotSapStockDO::getStorageLocationId, reqVO.getStorageLocationId())
                 .eqIfPresent(IotSapStockDO::getProjectDepartment, reqVO.getProjectDepartment())
-                .eqIfPresent(IotSapStockDO::getMaterialCode, reqVO.getMaterialCode())
+                .likeIfPresent(IotSapStockDO::getMaterialCode, reqVO.getMaterialCode())
                 .likeIfPresent(IotSapStockDO::getMaterialName, reqVO.getMaterialName())
                 .likeIfPresent(IotSapStockDO::getMaterialGroupName, reqVO.getMaterialGroupName())
                 .eqIfPresent(IotSapStockDO::getMaterialGroupId, reqVO.getMaterialGroupId())

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

@@ -22,7 +22,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
-import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -168,8 +167,8 @@ public class IotMainWorkOrderServiceImpl implements IotMainWorkOrderService {
         order.setOrderNumber(createWorkOrderNumber());
         order.setType(2);
         order.setResult(2);
-        order.setActualStartTime(LocalDateTime.now());
-        order.setActualEndTime(LocalDateTime.now());
+        // order.setActualStartTime(LocalDateTime.now());
+        // order.setActualEndTime(LocalDateTime.now());
         iotMainWorkOrderMapper.insert(order);
         // 保养工单明细
         List<IotMainWorkOrderBomDO> workOrderBomDOS = new ArrayList<>();

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotsapstock/IotSapStockService.java

@@ -6,6 +6,7 @@ import cn.iocoder.yudao.module.pms.controller.admin.iotsapstock.vo.IotSapStockSa
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotsapstock.IotSapStockDO;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * PMS SAP 库存(通用库存/项目部库存) Service 接口
@@ -52,4 +53,11 @@ public interface IotSapStockService {
      */
     PageResult<IotSapStockDO> getIotSapStockPage(IotSapStockPageReqVO pageReqVO);
 
+    /**
+     * 批量设置安全库存
+     *
+     * @param sapStocks sap 库存列表
+     * @return 更新记录数量
+     */
+    Long batchSetSafetyStock(List<IotSapStockSaveReqVO> sapStocks);
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotsapstock/IotSapStockServiceImpl.java

@@ -10,6 +10,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+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_SAP_STOCK_NOT_EXISTS;
@@ -68,4 +70,15 @@ public class IotSapStockServiceImpl implements IotSapStockService {
         return iotSapStockMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    public Long batchSetSafetyStock(List<IotSapStockSaveReqVO> sapStocks) {
+        List<IotSapStockDO> sapStockDOs = new ArrayList<>();
+        sapStocks.forEach(stock -> {
+            IotSapStockDO tempBom = BeanUtils.toBean(stock, IotSapStockDO.class);
+            sapStockDOs.add(tempBom);
+        });
+        iotSapStockMapper.updateBatch(sapStockDOs);
+        return 0l;
+    }
+
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/maintenance/IotMaintenancePlanServiceImpl.java

@@ -104,6 +104,8 @@ public class IotMaintenancePlanServiceImpl implements IotMaintenancePlanService
 
     @Override
     public PageResult<IotMaintenancePlanDO> getIotMaintenancePlanPage(IotMaintenancePlanPageReqVO pageReqVO) {
+        // 查询当前部门及子部门下所有数据
+
         return iotMaintenancePlanMapper.selectPage(pageReqVO);
     }