【admin&front】 新增&优化 # 1、后台管理和小程序新增接口、根据维修模块id和维修模块审核id查出配件列表 2、维修模块单新增字段标明是否在补料中 3、优化补料申请补料申请时，若repairNextStep==5，不需要改变步骤，若repairNextStep大于5，设为6

admin/src/main/java/com/hcy/admin/controller/order/RepairOrderAuditController.java

@@ -135,4 +135,6 @@ public class RepairOrderAuditController {
         iRepairOrderAuditService.distributionPrinting(repairOrderAuditParam);
         return AjaxResult.success();
     }
+
+
 }

admin/src/main/java/com/hcy/admin/controller/order/RepairOrderController.java

@@ -7,10 +7,7 @@ import com.hcy.admin.validate.order.ParentRepairOrderParam;
 import com.hcy.admin.validate.order.RepairOrderParam;
 import com.hcy.admin.validate.common.PageParam;
 import com.hcy.admin.validate.sparePartStockAudit.SparePartStockAuditParam;
-import com.hcy.admin.vo.order.MaintenanceReportOrderListVo;
+import com.hcy.admin.vo.order.*;
-import com.hcy.admin.vo.order.ParentRepairOrderListVo;
-import com.hcy.admin.vo.order.RepairOrderListVo;
-import com.hcy.admin.vo.order.RepairOrderDetailVo;
 import com.hcy.common.core.AjaxResult;
 import com.hcy.common.core.PageResult;
 import com.hcy.common.utils.ExcelUtils;
@@ -262,4 +259,17 @@ public class RepairOrderController {
     public void maintenanceReportExcel(@Validated @RequestBody RepairOrderParam params, HttpServletResponse response) {
         iRepairOrderService.maintenanceReportExcel(params,response);
     }
+
+    /**
+     * 根据工单号和审核id查出配件列表
+     *
+     * @author hcy
+     * @param repairOrderParam 搜索参数
+     * @return Object
+     */
+    @GetMapping("/partsList")
+    public Object partsList(RepairOrderParam repairOrderParam) {
+        List<OrderSparePartListVo> list = iRepairOrderService.partsList(repairOrderParam);
+        return AjaxResult.success(list);
+    }
 }

admin/src/main/java/com/hcy/admin/service/order/IRepairOrderService.java

@@ -4,6 +4,7 @@ import com.hcy.admin.validate.common.PageParam;
 import com.hcy.admin.validate.order.RepairOrderParam;
 import com.hcy.admin.vo.excel.ModuleMaintenanceExcel;
 import com.hcy.admin.vo.order.MaintenanceReportOrderListVo;
+import com.hcy.admin.vo.order.OrderSparePartListVo;
 import com.hcy.admin.vo.order.RepairOrderListVo;
 import com.hcy.admin.vo.order.RepairOrderDetailVo;
 import com.hcy.common.core.PageResult;
@@ -146,4 +147,11 @@ public interface IRepairOrderService {
      * @param response
      */
     void maintenanceReportExcel(RepairOrderParam params, HttpServletResponse response);
+
+    /**
+     * 根据工单号和审核id查出配件列表
+     * @param repairOrderParam
+     * @return
+     */
+    List<OrderSparePartListVo> partsList(RepairOrderParam repairOrderParam);
 }

admin/src/main/java/com/hcy/admin/service/order/impl/RepairOrderServiceImpl.java

@@ -1547,7 +1547,6 @@ public class RepairOrderServiceImpl implements IRepairOrderService {
                         NormalMaintenanceExcel vo = new NormalMaintenanceExcel();
                         BeanUtils.copyProperties(item, vo);
                         vo.setSpecificationsModel(item.getModuleNumber()); // 模块型号
-                        vo.setModelCode(item.getModuleCode()); // 模块代码
                         vo.setPower(distMap.get(item.getModulePower().toString()));// 功率
                         vo.setDeliveryTime(TimeUtil.dateToString(item.getCreateTime(), TimeConstant.DATE_FORMAT)); // 维修日期（返修日期）
                         if(item.getMaintenanceResult() != null){// 维修结论
@@ -1915,4 +1914,32 @@ public class RepairOrderServiceImpl implements IRepairOrderService {
         }
     }
 
+    /**
+     * 根据工单号和审核id查出配件列表
+     *
+     * @param repairOrderParam
+     * @return
+     */
+    @Override
+    public List<OrderSparePartListVo> partsList(RepairOrderParam repairOrderParam) {
+        //根据工单号和审核id查出配件列表
+        List<OrderSparePart> orderSpareParts = orderSparePartMapper.selectList(new LambdaQueryWrapper<OrderSparePart>()
+                .eq(OrderSparePart::getRepairOrderId, repairOrderParam.getId())
+                .eq(OrderSparePart::getRepairOrderAuditId, repairOrderParam.getRepairOrderAuditId())
+                .eq(OrderSparePart::getIsDelete, GlobalConstant.NOT_DELETE));
+
+        List<OrderSparePartListVo> orderSparePartListVos = new ArrayList<>();
+        for (OrderSparePart item : orderSpareParts) {
+            OrderSparePartListVo orderSparePartListVo = new OrderSparePartListVo();
+            BeanUtils.copyProperties(item, orderSparePartListVo);
+            //仓库名称
+            Warehouse warehouse = warehouseMapper.selectOne(new LambdaQueryWrapper<Warehouse>()
+                    .eq(Warehouse::getId, item.getWarehouseId()));
+            orderSparePartListVo.setWarehouseName(warehouse.getWarehouseName());
+            orderSparePartListVos.add(orderSparePartListVo);
+        }
+
+        return orderSparePartListVos;
+    }
+
 }

admin/src/main/java/com/hcy/admin/service/order/impl/RepairOrderShippingServiceImpl.java

@@ -12,22 +12,31 @@ import com.hcy.admin.AdminThreadLocal;
 import com.hcy.admin.service.order.IRepairOrderShippingService;
 import com.hcy.admin.validate.common.PageParam;
 import com.hcy.admin.validate.order.RepairOrderShippingParam;
+import com.hcy.admin.vo.excel.OfferDetailEntity;
 import com.hcy.admin.vo.excel.ReleaseRecordListExcel;
+import com.hcy.admin.vo.excel.order.WarehouseReceipt;
 import com.hcy.admin.vo.order.RepairOrderListVo;
 import com.hcy.admin.vo.order.RepairOrderShippingListVo;
 import com.hcy.admin.vo.order.RepairOrderShippingDetailVo;
+import com.hcy.common.constant.GlobalConstant;
+import com.hcy.common.constant.TimeConstant;
 import com.hcy.common.core.PageResult;
 import com.hcy.common.entity.client.Client;
 import com.hcy.common.entity.order.ParentRepairOrder;
 import com.hcy.common.entity.order.RepairOrder;
 import com.hcy.common.entity.order.RepairOrderShipping;
+import com.hcy.common.entity.setting.DictData;
 import com.hcy.common.entity.system.SystemAuthAdmin;
+import com.hcy.common.enums.order.RepairOrderAuditStatusEnum;
 import com.hcy.common.enums.order.RepairOrderStatusEnum;
+import com.hcy.common.exception.OperateException;
 import com.hcy.common.mapper.client.ClientMapper;
 import com.hcy.common.mapper.order.ParentRepairOrderMapper;
 import com.hcy.common.mapper.order.RepairOrderMapper;
 import com.hcy.common.mapper.order.RepairOrderShippingMapper;
+import com.hcy.common.mapper.setting.DictDataMapper;
 import com.hcy.common.mapper.system.SystemAuthAdminMapper;
+import com.hcy.common.utils.TimeUtil;
 import com.hcy.common.utils.excel.EasyExcelUtil;
 import com.hcy.common.utils.excel.LocalImageModifyStrategy;
 import org.springframework.beans.BeanUtils;
@@ -41,6 +50,7 @@ import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 维修模块发货记录实现类
@@ -63,6 +73,9 @@ public class RepairOrderShippingServiceImpl implements IRepairOrderShippingServi
     @Resource
     SystemAuthAdminMapper systemAuthAdminMapper;
 
+    @Resource
+    DictDataMapper dictDataMapper;
+
     /**
      * 维修模块发货记录列表
      *
@@ -320,96 +333,110 @@ public class RepairOrderShippingServiceImpl implements IRepairOrderShippingServi
      */
     @Override
     public void releaseRecordListExcel(RepairOrderShippingParam params, HttpServletResponse response) {
-        List<RepairOrderShipping> repairOrderShippings = repairOrderShippingMapper.selectList(new LambdaQueryWrapper<RepairOrderShipping>()
-                .in(RepairOrderShipping::getId, params.getIds()));
-
-        List<ReleaseRecordListExcel> list = new LinkedList<>();
-
-        for (RepairOrderShipping item : repairOrderShippings) {
-            ReleaseRecordListExcel releaseRecordListExcel = new ReleaseRecordListExcel();
-            BeanUtils.copyProperties(item, releaseRecordListExcel);
-
-            //规格型号
-            RepairOrder repairOrder = repairOrderMapper.selectOne(new LambdaQueryWrapper<RepairOrder>()
-                    .eq(RepairOrder::getShippingId, item.getId())
-                    .last("limit 1"));
-            releaseRecordListExcel.setModuleNumber(repairOrder.getModuleNumber());
-
-            //单位
-            releaseRecordListExcel.setUnit("PCS");
-
-            //备注 功率 + 本次交货数量 + 返修结论 例如：20KW，5台OK
-            //模块功率（0=10kw，1=20kw，2=30kw，3=40kw，4=50kw，5=60kw，6=70kw）
-            String modulePower = null;
-            if(repairOrder.getModulePower() == 0){
-                modulePower = "10KW";
-            }else if(repairOrder.getModulePower() == 1){
-                modulePower = "20KW";
-            }else if(repairOrder.getModulePower() == 2){
-                modulePower = "30KW";
-            }else if(repairOrder.getModulePower() == 3){
-                modulePower = "40KW";
-            }else if(repairOrder.getModulePower() == 4){
-                modulePower = "50KW";
-            }else if(repairOrder.getModulePower() == 5){
-                modulePower = "60KW";
-            }else if(repairOrder.getModulePower() == 6){
-                modulePower = "70KW";
-            }
-            //维修结论（0=报废，1=OK）
-            String maintenanceResult = null;
-            if(repairOrder.getMaintenanceResult() == 0){
-                maintenanceResult = "报废";
-            }else if(repairOrder.getMaintenanceResult() == 1){
-                maintenanceResult = "OK";
-            }
-            releaseRecordListExcel.setRemark(modulePower + "，" + item.getTheQuantityShipped() + "台" + maintenanceResult);
-
-            //工单编号
-//            ParentRepairOrder parentRepairOrder = parentRepairOrderMapper.selectOne(new LambdaQueryWrapper<ParentRepairOrder>()
-//                    .eq(ParentRepairOrder::getId, repairOrder.getParentRepairOrderId()));
-//            releaseRecordListExcel.setOrderNo(parentRepairOrder.getOrderNo());
-
-            //发货人名称
-//            SystemAuthAdmin authAdmin = systemAuthAdminMapper.selectOne(new LambdaQueryWrapper<SystemAuthAdmin>()
-//                    .eq(SystemAuthAdmin::getId, item.getConsignerId()));
-//            releaseRecordListExcel.setConsignerName(authAdmin.getUsername());
-
-            //合计
-//            releaseRecordListExcel.setTotal(item.getTheQuantityShipped());
-
-            list.add(releaseRecordListExcel);
-        }
-
         try {
-            ServletOutputStream out = response.getOutputStream();
-
-            EasyExcelUtil.initResponse(response, "创先捷送货单");
-
             // 文件模板输入流，将 excel 模板放到 resources 目录下
             InputStream templateFile = new ClassPathResource("templates/excel/deliveryNote.xlsx").getInputStream();
 
+            ServletOutputStream out = response.getOutputStream();
+            FillConfig fillConfig = FillConfig.builder().forceNewRow(true).build();
+            //设置多sheet输出流
             ExcelWriter writer = EasyExcel
                     .write(out)
                     .withTemplate(templateFile)
                     // 使用图片处理策略
                     .registerWriteHandler(
-                            // 设置每张图片的宽度为 200px，转换因子为 32
+                            // 设置每张图片的宽度为 100px，转换因子为 32
                             new LocalImageModifyStrategy(100, 32))
                     .build();
+            //公共数据
+            OfferDetailEntity offerDetail = new OfferDetailEntity();
+            //送货单
+            List<ReleaseRecordListExcel> releaseRecordListExcelList = new LinkedList<>();
+            int index = 1;
 
-            WriteSheet sheet = EasyExcel.writerSheet().build();
+            //功率字典
+            Map<String, String> distMap = dictDataMapper.selectList(new LambdaQueryWrapper<DictData>()
+                            .eq(DictData::getIsDelete, GlobalConstant.NOT_DELETE)
+                            .eq(DictData::getTypeId, 46))
+                    .stream()
+                    .collect(Collectors.toMap(DictData::getValue, DictData::getName));
 
-            // 填充配置，开启组合填充换行
+            //获取制单人
-            FillConfig fillConfig = FillConfig.builder().forceNewRow(true).build();
+            SystemAuthAdmin contentAdmin = systemAuthAdminMapper.findSystemAuthAdminById(Math.toIntExact(Long.valueOf(AdminThreadLocal.getAdminId())));
+            if(contentAdmin != null){
+                offerDetail.setCreator(contentAdmin.getUsername());
+            }
 
-            // 填充列表占位符
+            List<RepairOrderShipping> repairOrderShippings = repairOrderShippingMapper.selectList(new LambdaQueryWrapper<RepairOrderShipping>()
-            writer.fill(list, fillConfig, sheet);
+                    .in(RepairOrderShipping::getId, params.getIds())
+                    .orderByDesc(RepairOrderShipping::getDeliveryTime));
+
+            repairOrderMapper.selectList(new LambdaQueryWrapper<RepairOrder>()
+                    .in(RepairOrder::getShippingId, params.getIds())
+                    .orderByDesc(RepairOrder::getCreateTime));
+            
+            for (RepairOrderShipping item : repairOrderShippings) {
+                ReleaseRecordListExcel releaseRecordListExcel = new ReleaseRecordListExcel();
+                BeanUtils.copyProperties(item, releaseRecordListExcel);
+                //序号
+                releaseRecordListExcel.setIndex(index);
+                //规格型号
+                RepairOrder repairOrder = repairOrderMapper.selectOne(new LambdaQueryWrapper<RepairOrder>()
+                        .eq(RepairOrder::getShippingId, item.getId())
+                        .eq(RepairOrder::getIsDelete, GlobalConstant.NOT_DELETE)
+                        .orderByDesc(RepairOrder::getCreateTime)
+                        .last("limit 1"));
+                releaseRecordListExcel.setModuleNumber(repairOrder.getModuleNumber());
+                releaseRecordListExcel.setModelCode(repairOrder.getModuleCode()); // 料号
+                //工单编号
+                ParentRepairOrder parentRepairOrder = parentRepairOrderMapper.selectOne(new LambdaQueryWrapper<ParentRepairOrder>()
+                        .eq(ParentRepairOrder::getId, repairOrder.getParentRepairOrderId()));
+                releaseRecordListExcel.setOrderNo(parentRepairOrder.getOrderNo());
+
+                //单位
+                releaseRecordListExcel.setUnit("PCS");
+
+                //备注 功率 + 本次交货数量 + 返修结论 例如：20KW，5台OK
+                //模块功率（0=10kw，1=20kw，2=30kw，3=40kw，4=50kw，5=60kw，6=70kw）
+                String modulePower = distMap.get(repairOrder.getModulePower().toString());
+
+                //1、查询出维修结论报废的数量
+                Integer scrapCount = repairOrderMapper.selectCount(new LambdaQueryWrapper<RepairOrder>()
+                        .eq(RepairOrder::getShippingId, item.getId())
+                        .eq(RepairOrder::getMaintenanceResult, RepairOrderStatusEnum.SCRAP.getStatus())
+                        .eq(RepairOrder::getIsDelete, GlobalConstant.NOT_DELETE));
+
+                //2、查询出维修结论ok的数量
+                Integer okCount = repairOrderMapper.selectCount(new LambdaQueryWrapper<RepairOrder>()
+                        .eq(RepairOrder::getShippingId, item.getId())
+                        .eq(RepairOrder::getMaintenanceResult, RepairOrderStatusEnum.OK.getStatus())
+                        .eq(RepairOrder::getIsDelete, GlobalConstant.NOT_DELETE));
+
+                if(scrapCount != 0 && okCount != 0){
+                    releaseRecordListExcel.setRemark(modulePower + "，" + scrapCount + "台报废，" + okCount + "台OK");
+                }else if(scrapCount != 0){
+                    releaseRecordListExcel.setRemark(modulePower + "，" + scrapCount + "台报废");
+                }else if(okCount != 0){
+                    releaseRecordListExcel.setRemark(modulePower + "，" + okCount + "台OK");
+                }
+
+                //送货日期
+                releaseRecordListExcel.setDeliveryTime(TimeUtil.dateToString(item.getDeliveryTime(), TimeConstant.DATE_FORMAT));
+
+                releaseRecordListExcelList.add(releaseRecordListExcel);
+                index++; // 序号累计
+                offerDetail.setTotalQty(offerDetail.getTotalQty() + item.getTheQuantityShipped()); // 合计
+            }
+            WriteSheet sheet = EasyExcel.writerSheet(0).build();
+            writer.fill(offerDetail, sheet);
+            writer.fill(releaseRecordListExcelList, fillConfig, sheet);
 
-            //填充完成
             writer.finish();
-        } catch (Exception e) {
+            out.close();
-            System.out.println("导出异常:" + e);
+            templateFile.close();
+        }catch (Exception e){
+            e.printStackTrace();
+            throw new OperateException("导出报表出现错误："+e.getLocalizedMessage());
         }
 
     }

admin/src/main/java/com/hcy/admin/validate/order/RepairOrderParam.java

@@ -126,4 +126,6 @@ public class RepairOrderParam implements Serializable {
     private Integer maintenanceState; // 维修状态（0=正常维修，1=返修，2=报废）
 
     private String typeIds; //表单类型 ：0-正常维修 1-返修 2-报废
+    private Long repairOrderAuditId; //维修单审核id
+
 }

admin/src/main/java/com/hcy/admin/vo/excel/ReleaseRecordListExcel.java

@@ -21,8 +21,14 @@ public class ReleaseRecordListExcel implements Serializable {
 
     @ApiModelProperty(value = "序号")
     private Integer index; // 序号
+    @ApiModelProperty(value = "单据编号")
+    private String orderNo;
+    @ApiModelProperty(value = "模块代码")
+    private String modelCode;
     @ApiModelProperty(value = "型号/规格")
     private String moduleNumber; // 模块型号
+    @ApiModelProperty(value = "功率")
+    private String power;
     @ApiModelProperty(value = "单位")
     private String unit; //单位
     @ApiModelProperty(value = "订单数量")
@@ -35,6 +41,6 @@ public class ReleaseRecordListExcel implements Serializable {
     private Integer undeliveredQuantity; // 未交数量
     @ApiModelProperty(value = "备注")
     private String remark; //备注
-
+    @ApiModelProperty(value = "送货日期")
-
+    private String deliveryTime;
 }

admin/src/main/java/com/hcy/admin/vo/excel/order/NormalMaintenanceExcel.java

@@ -31,9 +31,6 @@ public class NormalMaintenanceExcel {
     @ApiModelProperty(value = "型号/规格")
     private String specificationsModel;
 
-    @ApiModelProperty(value = "模块代码")
-    private String modelCode;
-
     @ApiModelProperty(value = "功率")
     private String power;
 

admin/src/main/java/com/hcy/admin/vo/order/OrderSparePartListVo.java

@@ -15,6 +15,8 @@ public class OrderSparePartListVo implements Serializable {
 
     private Long id; // id
     private Long maintenanceOrderId; //检修单id
+    private Long repairOrderId; //维修单id
+    private Long repairOrderAuditId; //维修单审核id
     private Long sparePartsId; // 备件id
     private String sparePartsCode; // 备件编码
     private String sparePartsName; // 备件名称

admin/src/main/java/com/hcy/admin/vo/order/RepairOrderStepDataVo.java

@@ -9,6 +9,7 @@ import java.util.Date;
 public class RepairOrderStepDataVo implements Serializable {
     private Long id; // 主键id
     private Long repairOrderId; // 维修单id
+    private Long repairOrderAuditId; //维修模块审核id
     private Integer repairStep; // 当前步骤（0=拆机，1=清洗，2=故障排查，3=确认签名，4=重领配件，5=上传维修前图片，6=上传维修中图片，7=上传维修后图片，8=补强三防漆，9=补强点胶，10=DC&PFC组装，11=补强三防漆和点胶，12=模块装配，13=功能测试，14=老化测试，15=包装出货，16=填写回单）
     private String remark; // 备注
     private String img; // 照片

common/src/main/java/com/hcy/common/dto/order/RepairOrderDto.java

@@ -111,4 +111,5 @@ public class RepairOrderDto implements Serializable {
     private String startTime; //开始时间
     private String endTime; //结束时间
     private String maintenanceMan; //维修人员
+    private Integer feedingOrNot; //是否在补料中（0=是，1=否）
 }

common/src/main/java/com/hcy/common/entity/order/RepairOrder.java

@@ -101,4 +101,6 @@ public class RepairOrder implements Serializable {
     private Integer type; // 扫码核对（0=入库，1=返修）
     private String returnReason; // 返修原因
     private Integer returning; //是否在退仓中（0=是，1=否）
+    private Integer feedingOrNot; //是否在补料中（0=是，1=否）
+
 }

common/src/main/java/com/hcy/common/entity/order/RepairOrderStepData.java

@@ -56,7 +56,17 @@ public class RepairOrderStepData implements Serializable {
         this.auditStatus = auditStatus;
         this.creatorId = creatorId;
     }
-
+    public RepairOrderStepData(Long repairOrderId, Integer repairStep, String remark, String img, String title, Integer dscType, Integer auditStatus, Long creatorId, Long repairOrderAuditId) {
+        this.repairOrderId = repairOrderId;
+        this.repairStep = repairStep;
+        this.remark = remark;
+        this.img = img;
+        this.title = title;
+        this.dscType = dscType;
+        this.auditStatus = auditStatus;
+        this.creatorId = creatorId;
+        this.repairOrderAuditId = repairOrderAuditId;
+    }
     public RepairOrderStepData(Long repairOrderId, Integer repairStep, String remark, String img, String title, Integer auditStatus, Long creatorId) {
         this.repairOrderId = repairOrderId;
         this.repairStep = repairStep;
@@ -91,6 +101,20 @@ public class RepairOrderStepData implements Serializable {
         this.createTime = createTime;
     }
 
+    public RepairOrderStepData(Long id ,Long repairOrderId, Integer repairStep, String remark, String img, String title, Integer dscType, Integer auditStatus, Long creatorId, Date createTime, Long repairOrderAuditId) {
+        this.id = id;
+        this.repairOrderId = repairOrderId;
+        this.repairStep = repairStep;
+        this.remark = remark;
+        this.img = img;
+        this.title = title;
+        this.dscType = dscType;
+        this.auditStatus = auditStatus;
+        this.creatorId = creatorId;
+        this.createTime = createTime;
+        this.repairOrderAuditId = repairOrderAuditId;
+    }
+
     public RepairOrderStepData(Long id ,Long repairOrderId, Integer repairStep, String remark, String img, String title, Integer auditStatus, Long creatorId, Date createTime) {
         this.id = id;
         this.repairOrderId = repairOrderId;

front/src/main/java/com/hcy/front/controller/order/RepairOrderController.java

@@ -9,6 +9,7 @@ import com.hcy.front.service.order.IRepairOrderService;
 import com.hcy.front.validate.PageParam;
 import com.hcy.front.validate.order.MaintenanceOrderParam;
 import com.hcy.front.validate.order.RepairOrderParam;
+import com.hcy.front.vo.order.OrderSparePartListVo;
 import com.hcy.front.vo.order.RepairOrderDetailVo;
 import com.hcy.front.vo.order.RepairOrderListVo;
 import lombok.extern.java.Log;
@@ -16,6 +17,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * 维修订单管理
@@ -165,17 +167,6 @@ public class RepairOrderController {
         return AjaxResult.success();
     }
 
-    /**
-     * 备件领用补料申请
-     * @param repairOrderParam 参数
-     * @return Object
-     */
-    @PostMapping("/sparePartsRequisition")
-    public Object sparePartsRequisition(@RequestBody RepairOrderParam repairOrderParam) {
-        iRepairOrderService.sparePartsRequisition(repairOrderParam);
-        return AjaxResult.success();
-    }
-
     /**
      * 确认收货
      * @param repairOrderParam 参数
@@ -291,4 +282,28 @@ public class RepairOrderController {
         iRepairOrderService.cancelMaterialRequisition(repairOrderParam);
         return AjaxResult.success();
     }
+
+    /**
+     * 根据工单号和审核id查出配件列表
+     *
+     * @author hcy
+     * @param repairOrderParam 搜索参数
+     * @return Object
+     */
+    @GetMapping("/partsList")
+    public Object partsList(RepairOrderParam repairOrderParam) {
+        List<OrderSparePartListVo> list = iRepairOrderService.partsList(repairOrderParam);
+        return AjaxResult.success(list);
+    }
+
+    /**
+     * 备件领用补料申请
+     * @param repairOrderParam 参数
+     * @return Object
+     */
+    @PostMapping("/sparePartsRequisition")
+    public Object sparePartsRequisition(@RequestBody RepairOrderParam repairOrderParam) {
+        iRepairOrderService.sparePartsRequisition(repairOrderParam);
+        return AjaxResult.success();
+    }
 }

front/src/main/java/com/hcy/front/service/order/IRepairOrderService.java

@@ -3,6 +3,7 @@ package com.hcy.front.service.order;
 import com.hcy.common.core.PageResult;
 import com.hcy.front.validate.PageParam;
 import com.hcy.front.validate.order.RepairOrderParam;
+import com.hcy.front.vo.order.OrderSparePartListVo;
 import com.hcy.front.vo.order.OrderStatusCountVo;
 import com.hcy.front.vo.order.RepairOrderDetailVo;
 import com.hcy.front.vo.order.RepairOrderListVo;
@@ -144,4 +145,11 @@ public interface IRepairOrderService {
      * @param repairOrderParam
      */
     void cancelMaterialRequisition(RepairOrderParam repairOrderParam);
+
+    /**
+     * 根据工单号和审核id查出配件列表
+     * @param repairOrderParam
+     * @return
+     */
+    List<OrderSparePartListVo> partsList(RepairOrderParam repairOrderParam);
 }

front/src/main/java/com/hcy/front/service/order/impl/RepairOrderServiceImpl.java

@@ -669,7 +669,8 @@ public class RepairOrderServiceImpl implements IRepairOrderService {
 
         //设置配件清单
         List<OrderSparePart> orderSpareParts = orderSparePartMapper.selectList(new LambdaQueryWrapper<OrderSparePart>()
-                .eq(OrderSparePart::getRepairOrderId, model.getId()));
+                .eq(OrderSparePart::getRepairOrderId, model.getId())
+                .eq(OrderSparePart::getIsDelete, GlobalConstant.NOT_DELETE));
         List<OrderSparePartListVo> orderSparePartListVos = new ArrayList<>();
         for (OrderSparePart item : orderSpareParts) {
             OrderSparePartListVo orderSparePartListVo = new OrderSparePartListVo();
@@ -1228,20 +1229,6 @@ public class RepairOrderServiceImpl implements IRepairOrderService {
                         repairOrderParam.getMaintenanceResult(),
                         FrontThreadLocal.getUserId().longValue()));
 
-//                Client client = clientMapper.findClientById(repairOrder.getClientId());
-                //判断当前客户是全包还是半包
-//                if(client.getMaintainType() == ClientStatusEnum.MODULE_MAINTENANCE_ALL_WRAPPED.getStatus()){
-//                    repairOrder.setScrapConfirmation(RepairOrderStatusEnum.YES.getStatus()); // 报废确认（0=是，1=否）
-//
-//                    //维修单步骤数据
-//                    RepairOrderStepData repairOrderStepData = new RepairOrderStepData();
-//                    repairOrderStepData.setRepairOrderId(repairOrder.getId());
-//                    repairOrderStepData.setRemark("全包客户自动确认报废");
-//                    repairOrderStepData.setTitle("全包客户自动确认报废");
-//                    repairOrderStepData.setAuditStatus(Math.toIntExact(repairOrder.getScrapConfirmation()));
-//                    repairOrderStepData.setCreatorId(FrontThreadLocal.getUserId().longValue());
-//                    repairOrderStepDataMapper.insert(repairOrderStepData);
-//                }
                 repairOrderMapper.updateById(repairOrder); // 更新维修单
                 return;
             }else{
@@ -1310,18 +1297,35 @@ public class RepairOrderServiceImpl implements IRepairOrderService {
                                 RepairOrderStopEnum.ACCESSORY_REQUISITION.getStatus(),
                                 repairOrderParam.getScrapOrNot(),
                                 FrontThreadLocal.getUserId().longValue(),
-                                new Date()));
+                                new Date(),
+                                repairOrderStepData1.getRepairOrderAuditId()));
                     }else{
-                        //维修单步骤数据
+                        if(resultRoa != null){
-                        repairOrderStepDataMapper.insert(new RepairOrderStepData(
+                            //维修单步骤数据
-                                repairOrderParam.getId(),
+                            repairOrderStepDataMapper.insert(new RepairOrderStepData(
-                                repairOrder.getRepairStep(),
+                                    repairOrderParam.getId(),
-                                repairOrderParam.getRepairOrderStepRemark(),
+                                    repairOrder.getRepairStep(),
-                                repairOrderParam.getRepairOrderStepImg(),
+                                    repairOrderParam.getRepairOrderStepRemark(),
-                                RepairOrderStopEnum.getMsgByCode(repairOrder.getRepairStep()),
+                                    repairOrderParam.getRepairOrderStepImg(),
-                                RepairOrderStopEnum.ACCESSORY_REQUISITION.getStatus(),
+                                    RepairOrderStopEnum.getMsgByCode(repairOrder.getRepairStep()),
-                                repairOrderParam.getScrapOrNot(),
+                                    RepairOrderStopEnum.ACCESSORY_REQUISITION.getStatus(),
-                                FrontThreadLocal.getUserId().longValue()));
+                                    repairOrderParam.getScrapOrNot(),
+                                    FrontThreadLocal.getUserId().longValue(),
+                                    resultRoa.getId()));
+                        }else{
+                            //维修单步骤数据
+                            repairOrderStepDataMapper.insert(new RepairOrderStepData(
+                                    repairOrderParam.getId(),
+                                    repairOrder.getRepairStep(),
+                                    repairOrderParam.getRepairOrderStepRemark(),
+                                    repairOrderParam.getRepairOrderStepImg(),
+                                    RepairOrderStopEnum.getMsgByCode(repairOrder.getRepairStep()),
+                                    RepairOrderStopEnum.ACCESSORY_REQUISITION.getStatus(),
+                                    repairOrderParam.getScrapOrNot(),
+                                    FrontThreadLocal.getUserId().longValue(),
+                                    repairOrderAudit.getId()));
+                        }
+
                     }
                     repairOrderMapper.updateById(repairOrder); // 更新维修单
                 }else{
@@ -1377,6 +1381,7 @@ public class RepairOrderServiceImpl implements IRepairOrderService {
                 RepairOrderAudit resultRoa = repairOrderAuditMapper.selectOne(new LambdaQueryWrapper<RepairOrderAudit>()
                         .eq(RepairOrderAudit::getRepairOrderId, repairOrder.getId())
                         .eq(RepairOrderAudit::getReviewRequest, RepairOrderStatusEnum.STORES_REQUISITION.getStatus()));
+
                 if(resultRoa != null){
                     //已有领取记录但被拒绝则重新审核
                     resultRoa.setAuditStatus(AuditStateEnum.UNREVIEWED.getStatus());
@@ -1422,18 +1427,35 @@ public class RepairOrderServiceImpl implements IRepairOrderService {
                             RepairOrderStopEnum.RECOLLAR_FITTING.getStatus(),
                             repairOrderParam.getScrapOrNot(),
                             FrontThreadLocal.getUserId().longValue(),
-                            new Date()));
+                            new Date(),
+                            repairOrderStepData1.getRepairOrderAuditId()));
                 }else{
-                    //维修单步骤数据
+                    if(resultRoa != null){
-                    repairOrderStepDataMapper.insert(new RepairOrderStepData(
+                        //维修单步骤数据
-                            repairOrderParam.getId(),
+                        repairOrderStepDataMapper.insert(new RepairOrderStepData(
-                            repairOrder.getRepairStep(),
+                                repairOrderParam.getId(),
-                            repairOrderParam.getRepairOrderStepRemark(),
+                                repairOrder.getRepairStep(),
-                            repairOrderParam.getRepairOrderStepImg(),
+                                repairOrderParam.getRepairOrderStepRemark(),
-                            RepairOrderStopEnum.getMsgByCode(repairOrder.getRepairStep()),
+                                repairOrderParam.getRepairOrderStepImg(),
-                            RepairOrderStopEnum.RECOLLAR_FITTING.getStatus(),
+                                RepairOrderStopEnum.getMsgByCode(repairOrder.getRepairStep()),
-                            repairOrderParam.getScrapOrNot(),
+                                RepairOrderStopEnum.RECOLLAR_FITTING.getStatus(),
-                            FrontThreadLocal.getUserId().longValue()));
+                                repairOrderParam.getScrapOrNot(),
+                                FrontThreadLocal.getUserId().longValue(),
+                                resultRoa.getId()));
+                    }else{
+                        //维修单步骤数据
+                        repairOrderStepDataMapper.insert(new RepairOrderStepData(
+                                repairOrderParam.getId(),
+                                repairOrder.getRepairStep(),
+                                repairOrderParam.getRepairOrderStepRemark(),
+                                repairOrderParam.getRepairOrderStepImg(),
+                                RepairOrderStopEnum.getMsgByCode(repairOrder.getRepairStep()),
+                                RepairOrderStopEnum.RECOLLAR_FITTING.getStatus(),
+                                repairOrderParam.getScrapOrNot(),
+                                FrontThreadLocal.getUserId().longValue(),
+                                repairOrderAudit.getId()));
+                    }
+
                 }
                 // 确认签名
                 repairOrder.setRepairNextStep(RepairOrderStopEnum.CONFIRMATION_SIGNATURE.getStatus()); // 下个步骤
@@ -1494,7 +1516,8 @@ public class RepairOrderServiceImpl implements IRepairOrderService {
             if(repairOrderAudit.getAuditStatus() != RepairOrderAuditStatusEnum.TO_BE_CONFIRMED.getStatus()){
                 throw new OperateException("当前审核状态不可操作，请联系管理审核领料申请！");
             }
-
+            // feedingOrNot; //是否在补料中（0=是，1=否）
+            repairOrder.setFeedingOrNot(RepairOrderStatusEnum.NO.getStatus());
             // 确认签名
             repairOrder.setRepairNextStep(RepairOrderStopEnum.PRE_MAINTENANCE_IMG.getStatus()); // 下个步骤
             //确认签名完变成维修中
@@ -1507,19 +1530,21 @@ public class RepairOrderServiceImpl implements IRepairOrderService {
 
         }else if (repairOrderParam.getRepairStep() == RepairOrderStopEnum.PRE_MAINTENANCE_IMG.getStatus()) {
             // 上传维修前图片
+
             repairOrder.setRepairNextStep(RepairOrderStopEnum.IN_MAINTENANCE_IMG.getStatus()); // 下个步骤
+
         }else if (repairOrderParam.getRepairStep() == RepairOrderStopEnum.IN_MAINTENANCE_IMG.getStatus()) {
             // 上传维修中图片
             // 更新不更新步骤
-            if(repairOrderStepData1 == null){
+
                 repairOrder.setRepairNextStep(RepairOrderStopEnum.AFTER_REPAIR_IMG.getStatus()); // 下个步骤
-            }
+
         }else if (repairOrderParam.getRepairStep() == RepairOrderStopEnum.AFTER_REPAIR_IMG.getStatus()) {
             // 上传维修后图片
             // 更新不更新步骤
-            if(repairOrderStepData1 == null){
+
-                repairOrder.setRepairNextStep(RepairOrderStopEnum.FUNCTIONAL_TEST.getStatus()); // 下个步骤8、功能测试
+            repairOrder.setRepairNextStep(RepairOrderStopEnum.FUNCTIONAL_TEST.getStatus()); // 下个步骤8、功能测试
-            }
+
         }else if (repairOrderParam.getRepairStep() == RepairOrderStopEnum.FUNCTIONAL_TEST.getStatus()) {
             // 功能测试
             // 更新不更新步骤
@@ -1559,23 +1584,23 @@ public class RepairOrderServiceImpl implements IRepairOrderService {
         } else if (repairOrderParam.getRepairStep() == RepairOrderStopEnum.DC_AND_PFC_ASSEMBLE.getStatus()) {
             // DC&PFC组装
             // 更新不更新步骤
-            if(repairOrderStepData1 == null){
+
                 repairOrder.setRepairNextStep(RepairOrderStopEnum.REINFORCING_THREE_ANTI_PAINT_AND_DISPENSING.getStatus()); // 下个步骤
-            }
+
         }else if (repairOrderParam.getRepairStep() == RepairOrderStopEnum.REINFORCING_THREE_ANTI_PAINT_AND_DISPENSING.getStatus()) {
             // 补强三防漆和点胶
             // 更新不更新步骤
-            if(repairOrderStepData1 == null){
+
                 repairOrder.setRepairNextStep(RepairOrderStopEnum.MODULE_ASSEMBLY.getStatus()); // 下个步骤
-            }
+
         }else if (repairOrderParam.getRepairStep() == RepairOrderStopEnum.MODULE_ASSEMBLY.getStatus()) {
             // 模块装配
             //模块装配完变成测试中
             // 更新不更新步骤
-            if(repairOrderStepData1 == null){
+
                 repairOrder.setOrderStatus(RepairOrderStatusEnum.TEST_IN_PROCESS.getStatus());
                 repairOrder.setRepairNextStep(RepairOrderStopEnum.AGING_TEST.getStatus()); // 下个步骤12、老化测试
-            }
+
         }else if (repairOrderParam.getRepairStep() == RepairOrderStopEnum.AGING_TEST.getStatus()) {
             // 老化测试
             // 更新不更新步骤
@@ -1684,64 +1709,7 @@ public class RepairOrderServiceImpl implements IRepairOrderService {
 
             //良品入库申请,工单状态改为审核中
             repairOrder.setRepairNextStep(RepairOrderStopEnum.FINISH.getStatus()); // 下个步骤
-        }
+        } else {
-//        }else if (repairOrderParam.getRepairStep() == RepairOrderStopEnum.PACKAGE_AND_SHIP.getStatus()) {
-//            // 包装出货
-//            repairOrder.setExpressName(repairOrderParam.getExpressName());// 快递名称
-//            repairOrder.setExpressNo(repairOrderParam.getExpressNo());// 快递单号
-//            //客户确认报废，完成包装出货就已完成
-//            if(repairOrder.getScrapConfirmation() != null){
-//                if(repairOrder.getScrapConfirmation() == RepairOrderStatusEnum.YES.getStatus()){
-//                    repairOrder.setOrderStatus(RepairOrderStatusEnum.FINISHED.getStatus()); // 已完成
-//                    repairOrder.setOrderAccomplishTime(new Date()); // 订单完成时间
-//                    repairOrderMapper.updateById(repairOrder); // 更新维修单
-//                    //维修单步骤数据
-//                    repairOrderStepDataMapper.insert(new RepairOrderStepData(
-//                            repairOrderParam.getId(),
-//                            repairOrder.getRepairStep(),
-//                            repairOrderParam.getRepairOrderStepRemark(),
-//                            repairOrderParam.getRepairOrderStepImg(),
-//                            RepairOrderStopEnum.getMsgByCode(repairOrder.getRepairStep()),
-//                            FrontThreadLocal.getUserId().longValue()));
-//
-//                    //新增维修单操作记录
-//                    RepairOrderStepData repairOrderStepData = new RepairOrderStepData();
-//                    repairOrderStepData.setRepairOrderId(repairOrder.getId());
-//                    repairOrderStepData.setTitle("结束");
-//                    repairOrderStepData.setCreatorId(FrontThreadLocal.getUserId().longValue());
-//                    repairOrderStepDataMapper.insert(repairOrderStepData);
-//                    return;
-//                }
-//            } else {
-//                repairOrder.setRepairNextStep(RepairOrderStopEnum.FILL_IN_THE_RECEIPT.getStatus()); // 下个步骤
-//            }
-//        }else if (repairOrderParam.getRepairStep() == RepairOrderStopEnum.FILL_IN_THE_RECEIPT.getStatus()) {
-//            // 填写回单
-//            //填写回单完变成已完成
-//            repairOrder.setOrderStatus(RepairOrderStatusEnum.FINISHED.getStatus());
-//            repairOrder.setOrderAccomplishTime(new Date()); // 完成时间
-//            repairOrder.setRepairNextStep(RepairOrderStopEnum.FINISH.getStatus()); // 下个步骤
-////            repairOrder.setFaultId(repairOrderParam.getFaultId()); // 维修结论类型id
-////            repairOrder.setFaultDescription(repairOrderParam.getFaultDescription()); // 维修结论描述
-//            repairOrder.setRepairStep(repairOrderParam.getRepairStep());// 当前步骤
-//            repairOrderMapper.updateById(repairOrder); // 更新维修单
-//            //维修单步骤数据
-//            repairOrderStepDataMapper.insert(new RepairOrderStepData(
-//                    repairOrderParam.getId(),
-//                    repairOrder.getRepairStep(),
-//                    repairOrderParam.getRepairOrderStepRemark(),
-//                    repairOrderParam.getRepairOrderStepImg(),
-//                    RepairOrderStopEnum.getMsgByCode(repairOrder.getRepairStep()),
-//                    FrontThreadLocal.getUserId().longValue()));
-//
-//            //新增维修单操作记录
-//            RepairOrderStepData repairOrderStepData = new RepairOrderStepData();
-//            repairOrderStepData.setRepairOrderId(repairOrder.getId());
-//            repairOrderStepData.setTitle("结束");
-//            repairOrderStepData.setCreatorId(FrontThreadLocal.getUserId().longValue());
-//            repairOrderStepDataMapper.insert(repairOrderStepData);
-//            return;
-         else {
             throw new OperateException("当前步骤不正确！");
         }
 
@@ -1803,6 +1771,16 @@ public class RepairOrderServiceImpl implements IRepairOrderService {
             orderSparePartMapper.insert(orderSparePart);
         }
 
+        //1、补料申请时，若repairNextStep==5，不需要改变步骤，若repairNextStep大于5，设为6
+        if(repairOrder.getRepairNextStep() == 5){
+            
+        } else if (repairOrder.getRepairNextStep() > 5) {
+            repairOrder.setRepairNextStep(RepairOrderStopEnum.IN_MAINTENANCE_IMG.getStatus());
+        }
+        //feedingOrNot; //是否在补料中（0=是，1=否）
+        repairOrder.setFeedingOrNot(RepairOrderStatusEnum.YES.getStatus());
+        repairOrderMapper.updateById(repairOrder);
+
         //维修单步骤数据
         RepairOrderStepData repairOrderStepData = new RepairOrderStepData();
         repairOrderStepData.setRepairOrderId(repairOrder.getId());
@@ -2285,9 +2263,15 @@ public class RepairOrderServiceImpl implements IRepairOrderService {
         repairOrderAudit.setAuditStatus(RepairOrderAuditStatusEnum.CANCELED.getStatus()); // 审核状态改为已取消
         repairOrderAuditMapper.updateById(repairOrderAudit);
 
-        repairOrder.setRepairStep(RepairOrderStopEnum.RECOLLAR_FITTING.getStatus());// 下个步骤 重领配件
+        if(repairOrder.getFeedingOrNot() != null && repairOrder.getFeedingOrNot() == RepairOrderStatusEnum.YES.getStatus()){
-        repairOrder.setRepairNextStep(RepairOrderStopEnum.RECOLLAR_FITTING.getStatus()); // 下个步骤 重领配件
+            repairOrder.setFeedingOrNot(RepairOrderStatusEnum.NO.getStatus()); //feedingOrNot; //是否在补料中（0=是，1=否）
-        repairOrderMapper.updateById(repairOrder); // 更新维修模块单信息
+            repairOrderMapper.updateById(repairOrder); // 更新维修模块单信息
+        }else{
+            repairOrder.setFeedingOrNot(RepairOrderStatusEnum.NO.getStatus()); //feedingOrNot; //是否在补料中（0=是，1=否）
+            //repairOrder.setRepairStep(RepairOrderStopEnum.RECOLLAR_FITTING.getStatus());// 下个步骤 重领配件
+            repairOrder.setRepairNextStep(RepairOrderStopEnum.RECOLLAR_FITTING.getStatus()); // 下个步骤 重领配件
+            repairOrderMapper.updateById(repairOrder); // 更新维修模块单信息
+        }
 
         //维修单步骤数据
         RepairOrderStepData repairOrderStepData = new RepairOrderStepData();
@@ -2298,4 +2282,32 @@ public class RepairOrderServiceImpl implements IRepairOrderService {
         repairOrderStepData.setCreatorId(FrontThreadLocal.getUserId().longValue());
         repairOrderStepDataMapper.insert(repairOrderStepData);
     }
+
+    /**
+     * 根据工单号和审核id查出配件列表
+     *
+     * @param repairOrderParam
+     * @return
+     */
+    @Override
+    public List<OrderSparePartListVo> partsList(RepairOrderParam repairOrderParam) {
+        //根据工单号和审核id查出配件列表
+        List<OrderSparePart> orderSpareParts = orderSparePartMapper.selectList(new LambdaQueryWrapper<OrderSparePart>()
+                .eq(OrderSparePart::getRepairOrderId, repairOrderParam.getId())
+                .eq(OrderSparePart::getRepairOrderAuditId, repairOrderParam.getRepairOrderAuditId())
+                .eq(OrderSparePart::getIsDelete, GlobalConstant.NOT_DELETE));
+
+        List<OrderSparePartListVo> orderSparePartListVos = new ArrayList<>();
+        for (OrderSparePart item : orderSpareParts) {
+            OrderSparePartListVo orderSparePartListVo = new OrderSparePartListVo();
+            BeanUtils.copyProperties(item, orderSparePartListVo);
+            //仓库名称
+            Warehouse warehouse = warehouseMapper.selectOne(new LambdaQueryWrapper<Warehouse>()
+                    .eq(Warehouse::getId, item.getWarehouseId()));
+            orderSparePartListVo.setWarehouseName(warehouse.getWarehouseName());
+            orderSparePartListVos.add(orderSparePartListVo);
+        }
+
+        return orderSparePartListVos;
+    }
 }

front/src/main/java/com/hcy/front/validate/order/RepairOrderParam.java

@@ -167,4 +167,7 @@ public class RepairOrderParam implements Serializable {
 
     private List<RepairOrder> repairOrderList; //扫码核对列表
     private String withdrawalImg; // 退仓图片
+    private Long repairOrderAuditId; //维修单审核id
+    private Integer feedingOrNot; //是否在补料中（0=是，1=否）
+
 }

front/src/main/java/com/hcy/front/vo/order/RepairOrderDetailVo.java

@@ -162,5 +162,7 @@ public class RepairOrderDetailVo implements Serializable {
     private RepairOrderAuditListVo repairOrderAuditListVo; // 填写维修信息
     private Integer returning; //是否在退仓中（0=是，1=否）
     private RepairOrderAuditListVo cancellationRequestListVo; // 退仓申请信息
+    private Integer feedingOrNot; //是否在补料中（0=是，1=否）
+
 
 }

front/src/main/java/com/hcy/front/vo/order/RepairOrderListVo.java

@@ -135,5 +135,7 @@ public class RepairOrderListVo implements Serializable {
     private Integer type; // 扫码核对（0=入库，1=返修）
     private String returnReason; // 返修原因
     private Integer returning; //是否在退仓中（0=是，1=否）
+    private Integer feedingOrNot; //是否在补料中（0=是，1=否）
+
 
 }