巡检报修中添加申领物料

src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java

@@ -16,9 +16,11 @@ import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.modules.business.enums.MaintenanceStatusEnum;
 import org.springblade.modules.business.pojo.dto.MaintenanceTaskDto;
+import org.springblade.modules.business.pojo.entity.MaintenanceTaskDetailGoods;
 import org.springblade.modules.business.pojo.entity.maintenance.MaintenancePlan;
 import org.springblade.modules.business.pojo.entity.maintenance.MaintenanceTask;
 import org.springblade.modules.business.pojo.entity.maintenance.MaintenanceTaskDetail;
+import org.springblade.modules.business.service.IMaintenanceApplyGoodsService;
 import org.springblade.modules.business.service.IMaintenancePlanService;
 import org.springblade.modules.business.service.IMaintenanceTaskDetailService;
 import org.springblade.modules.business.service.IMaintenanceTaskService;
@@ -29,6 +31,7 @@ import org.springframework.web.bind.annotation.*;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 /**
  * 维保控制器
@@ -45,7 +48,7 @@ public class MaintenanceController extends BladeController {
 
     private final IMaintenanceTaskService taskService;
     private final IMaintenanceTaskDetailService taskDetailService;
-
+    private final IMaintenanceApplyGoodsService maintenanceApplyGoodsService;
     private final SmsService smsService;
 
     /*---------- 维修计划开始 ----------*/
@@ -251,8 +254,17 @@ public class MaintenanceController extends BladeController {
         taskOld.setRepairStatus(MaintenanceStatusEnum.REPAIR_SERVICEMAN_CREATE.getValue());
         taskService.updateById(taskOld);
         List<MaintenanceTaskDetail> detailList = taskDto.getDetailList();
-        taskDetailService.saveOrUpdateBatch(detailList);
+        for (MaintenanceTaskDetail maintenanceTaskDetail : detailList) {
-
+            Optional<List<MaintenanceTaskDetailGoods>> detailGoods = Optional.ofNullable(maintenanceTaskDetail.getDetailGoodsList());
+            if (detailGoods.isPresent()) {
+                List<MaintenanceTaskDetailGoods> detailGoodsList = detailGoods.get();
+                for (MaintenanceTaskDetailGoods maintenanceTaskDetailGoods : detailGoodsList) {
+                    maintenanceApplyGoodsService.save(maintenanceTaskDetailGoods);
+                }
+            } else {
+                taskDetailService.saveOrUpdate(maintenanceTaskDetail);
+            }
+        }
         return R.success();
     }
 

src/main/java/org/springblade/modules/business/mapper/MaintenanceApplyGoodsMapper.java

@@ -0,0 +1,9 @@
+package org.springblade.modules.business.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springblade.modules.business.pojo.entity.MaintenanceTaskDetailGoods;
+
+@Mapper
+public interface MaintenanceApplyGoodsMapper extends BaseMapper<MaintenanceTaskDetailGoods> {
+}

src/main/java/org/springblade/modules/business/pojo/entity/MaintenanceTaskDetailGoods.java

@@ -0,0 +1,39 @@
+package org.springblade.modules.business.pojo.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.apache.poi.hpsf.Decimal;
+import org.springblade.core.mp.base.BaseEntity;
+import org.springblade.modules.business.pojo.entity.maintenance.MaintenanceTaskDetail;
+
+@Data
+@TableName("lab_maintenance_task_detail_applygoods")
+@EqualsAndHashCode(callSuper = true)
+public class MaintenanceTaskDetailGoods extends BaseEntity {
+
+    //物料名称
+    private String goodsName;
+
+    //库存id
+    private Long warehouseId;
+
+    //规格
+    private String rule;
+
+    //型号
+    private String xh;
+
+    //数量
+    private Integer number;
+
+    //单位
+    private String unit;
+
+    //价格
+    private Double price;
+
+    private Long parentId;
+
+
+}

src/main/java/org/springblade/modules/business/pojo/entity/maintenance/MaintenanceTaskDetail.java

@@ -7,6 +7,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.base.BaseEntity;
+import org.springblade.modules.business.pojo.entity.MaintenanceTaskDetailGoods;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
@@ -23,84 +24,94 @@ import java.util.List;
 @Schema(description = "维保任务详细")
 public class MaintenanceTaskDetail extends BaseEntity {
 
-	private Long taskId;
+    private Long taskId;
-
+
-	/**
+    /**
-	 * 设备id
+     * 设备id
-	 */
+     */
-	private Long deviceId;
+    private Long deviceId;
-	/**
+    /**
-	 * 设备名称
+     * 设备名称
-	 */
+     */
-	private String deviceName;
+    private String deviceName;
-
+
-	/**
+    /**
-	 * 楼层
+     * 楼层
-	 */
+     */
-	private String floorName;
+    private String floorName;
-
+
-	/**
+    /**
-	 * 房间
+     * 房间
-	 */
+     */
-	private Long deptId;
+    private Long deptId;
-
+
-	/**
+    /**
-	 * 房间名称
+     * 房间名称
-	 */
+     */
-	private String deptName;
+    private String deptName;
-
+
-	/**
+    /**
-	 * 专业名称
+     * 专业名称
-	 */
+     */
-	private String majorName;
+    private String majorName;
-
+
-	/**
+    /**
-	 * 巡检内容
+     * 巡检内容
-	 */
+     */
-	private String checkContent;
+    private String checkContent;
-
+
-	/**
+    /**
-	 * 工艺要求
+     * 工艺要求
-	 */
+     */
-	private String craft;
+    private String craft;
-
+
-	/**
+    /**
-	 * 巡检周期 1:月， 2：季， 3：半年
+     * 巡检周期 1:月， 2：季， 3：半年
-	 */
+     */
-	private Integer period;
+    private Integer period;
-
+
-	/**
+    /**
-	 * 现场图片地址
+     * 现场图片地址
-	 */
+     */
-	private String picUrl;
+    private String picUrl;
-
+
-	/**
+    /**
-	 * 签字图片地址
+     * 签字图片地址
-	 */
+     */
-	private String signUrl;
+    private String signUrl;
-
+
-	/**
+    /**
-	 * 备注
+     * 备注
-	 */
+     */
-	private String remark;
+    private String remark;
-
+
-	/**
+    /**
-	 * 维修价格
+     * 维修价格
-	 */
+     */
-	private Double price;
+    private Double price;
-
+
-	/**
+    /**
-	 * 客户确认是否维修, 0:不维修， 1维修
+     * 客户确认是否维修, 0:不维修， 1维修
-	 */
+     */
-	private Integer isRepair;
+    private Integer isRepair;
-
+
-	/**
+    /**
-	 * 计划开始时间
+     * 确认是否需要物资
-	 */
+     */
-	@DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Integer isNeed;
-	@JsonFormat(pattern = "yyyy-MM-dd")
+
-	private Date startTime;
+    /**
-
+     * 计划开始时间
-	@TableField(exist = false)
+     */
-	private List<MaintenanceTaskDetail> details;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date startTime;
+
+    @TableField(exist = false)
+    private List<MaintenanceTaskDetail> details;
+
+    //物资申领列表
+    @TableField(exist = false)
+    private List<MaintenanceTaskDetailGoods> detailGoodsList;
+
 }

src/main/java/org/springblade/modules/business/service/IMaintenanceApplyGoodsService.java

@@ -0,0 +1,9 @@
+package org.springblade.modules.business.service;
+
+
+import org.springblade.core.mp.base.BaseService;
+import org.springblade.modules.business.pojo.entity.MaintenanceTaskDetailGoods;
+
+public interface IMaintenanceApplyGoodsService extends BaseService<MaintenanceTaskDetailGoods> {
+
+}

src/main/java/org/springblade/modules/business/service/impl/MaintenanceApplyGoodsServiceImpl.java

@@ -0,0 +1,11 @@
+package org.springblade.modules.business.service.impl;
+
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.modules.business.mapper.MaintenanceApplyGoodsMapper;
+import org.springblade.modules.business.pojo.entity.MaintenanceTaskDetailGoods;
+import org.springblade.modules.business.service.IMaintenanceApplyGoodsService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class MaintenanceApplyGoodsServiceImpl extends BaseServiceImpl<MaintenanceApplyGoodsMapper, MaintenanceTaskDetailGoods> implements IMaintenanceApplyGoodsService {
+}