生产版本图纸数据

mes/src/main/java/com/ximai/mes/pro/controller/productionSolution/ProProductionSolutionProcessDrawingController.java

+package com.ximai.mes.pro.controller.productionSolution;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ximai.common.annotation.Log;
+import com.ximai.common.core.controller.BaseController;
+import com.ximai.common.core.domain.AjaxResult;
+import com.ximai.common.enums.BusinessType;
+import io.swagger.annotations.ApiOperation;
+import com.ximai.mes.pro.domain.productionSolution.ProProductionSolutionProcessDrawing;
+import com.ximai.mes.pro.dto.productionSolution.ProProductionSolutionProcessDrawingDto;
+import com.ximai.mes.pro.dto.productionSolution.ProProductionSolutionProcessDrawingCreate;
+import com.ximai.mes.pro.dto.productionSolution.ProProductionSolutionProcessDrawingUpdate;
+import com.ximai.mes.pro.dto.productionSolution.ProProductionSolutionProcessDrawingExcelExport;
+import com.ximai.mes.pro.service.productionSolution.IProProductionSolutionProcessDrawingService;
+import com.ximai.common.utils.poi.ExcelUtil;
+import cn.hutool.core.bean.BeanUtil;
+import com.ximai.common.core.page.TableDataInfo;
+
+/**
+ * 生产版本工序图纸Controller
+ *
+ * @author generator
+ * @date 2024-08-29
+ */
+@RestController
+@RequestMapping("/pro/drawing")
+public class ProProductionSolutionProcessDrawingController extends BaseController
+{
+    @Autowired
+    private IProProductionSolutionProcessDrawingService proProductionSolutionProcessDrawingService;
+
+    /**
+     * 查询生产版本工序图纸列表
+     */
+    @ApiOperation("查询生产版本工序图纸列表")
+    @PreAuthorize("@ss.hasPermi('pro:drawing:list')")
+    @GetMapping("/list")
+    public TableDataInfo<ProProductionSolutionProcessDrawingDto> list(ProProductionSolutionProcessDrawing proProductionSolutionProcessDrawing)
+    {
+        startPage();
+        List<ProProductionSolutionProcessDrawingDto> list = proProductionSolutionProcessDrawingService.selectProProductionSolutionProcessDrawingList(proProductionSolutionProcessDrawing);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出生产版本工序图纸列表
+     */
+    @ApiOperation("导出生产版本工序图纸列表")
+    @PreAuthorize("@ss.hasPermi('pro:drawing:export')")
+    @Log(title = "生产版本工序图纸", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ProProductionSolutionProcessDrawing proProductionSolutionProcessDrawing)
+    {
+        List<ProProductionSolutionProcessDrawingDto> list = proProductionSolutionProcessDrawingService.selectProProductionSolutionProcessDrawingList(proProductionSolutionProcessDrawing);
+        ExcelUtil<ProProductionSolutionProcessDrawingExcelExport> util = new ExcelUtil<ProProductionSolutionProcessDrawingExcelExport>(ProProductionSolutionProcessDrawingExcelExport.class);
+        List<ProProductionSolutionProcessDrawingExcelExport> tempList = BeanUtil.copyToList(list, ProProductionSolutionProcessDrawingExcelExport.class);
+        util.exportExcel(response, tempList, "生产版本工序图纸数据");
+    }
+
+    /**
+     * 获取生产版本工序图纸详细信息
+     */
+    @ApiOperation("获取生产版本工序图纸详细信息")
+    @PreAuthorize("@ss.hasPermi('pro:drawing:query')")
+    @GetMapping(value = "/{productionSolutionProcessFileId}")
+    public AjaxResult<ProProductionSolutionProcessDrawingDto> getInfo(@PathVariable("productionSolutionProcessFileId") Long productionSolutionProcessFileId)
+    {
+        return AjaxResult.success(proProductionSolutionProcessDrawingService.selectProProductionSolutionProcessDrawingDtoByProductionSolutionProcessFileId(productionSolutionProcessFileId));
+    }
+
+    /**
+     * 新增生产版本工序图纸
+     */
+    @ApiOperation("新增生产版本工序图纸")
+    @PreAuthorize("@ss.hasPermi('pro:drawing:add')")
+    @Log(title = "生产版本工序图纸", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ProProductionSolutionProcessDrawingCreate proProductionSolutionProcessDrawingCreate)
+    {
+        return toAjax(proProductionSolutionProcessDrawingService.insertProProductionSolutionProcessDrawing(proProductionSolutionProcessDrawingCreate));
+    }
+
+    /**
+     * 修改生产版本工序图纸
+     */
+    @ApiOperation("修改生产版本工序图纸")
+    @PreAuthorize("@ss.hasPermi('pro:drawing:edit')")
+    @Log(title = "生产版本工序图纸", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ProProductionSolutionProcessDrawingUpdate proProductionSolutionProcessDrawingUpdate)
+    {
+        return toAjax(proProductionSolutionProcessDrawingService.updateProProductionSolutionProcessDrawing(proProductionSolutionProcessDrawingUpdate));
+    }
+
+    /**
+     * 删除生产版本工序图纸
+     */
+    @ApiOperation("删除生产版本工序图纸")
+    @PreAuthorize("@ss.hasPermi('pro:drawing:remove')")
+    @Log(title = "生产版本工序图纸", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{productionSolutionProcessFileIds}")
+    public AjaxResult remove(@PathVariable Long[] productionSolutionProcessFileIds)
+    {
+        return toAjax(proProductionSolutionProcessDrawingService.deleteProProductionSolutionProcessDrawingByProductionSolutionProcessFileIds(productionSolutionProcessFileIds));
+    }
+}

mes/src/main/java/com/ximai/mes/pro/domain/productionSolution/ProProductionSolutionProcess.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.ximai.common.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -153,6 +154,18 @@ public class ProProductionSolutionProcess {
     @TableField(exist = false)
     private String controlCode;
 
+    /**
+     * 是否外协
+     */
+    @ApiModelProperty("是否外协")
+    private String outsourced;
+
+    /**
+     * 排序号
+     */
+    @ApiModelProperty("排序号")
+    private Integer serial;
+
     /**
      * 采购信息记录号
      */

mes/src/main/java/com/ximai/mes/pro/domain/productionSolution/ProProductionSolutionProcessDrawing.java

+package com.ximai.mes.pro.domain.productionSolution;
+
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import com.ximai.common.core.domain.BaseEntity;
+
+/**
+ * 生产版本工序图纸对象 pro_production_solution_process_drawing
+ *
+ * @author generator
+ * @date 2024-08-29
+ */
+@Data
+public class ProProductionSolutionProcessDrawing extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    @TableId
+    private Long productionSolutionProcessFileId;
+
+    /** 生产方案工序ID */
+    @ApiModelProperty(name = "生产方案工序ID")
+    private Long productionSolutionProcessId;
+
+    /** 生产方案ID */
+    @ApiModelProperty(name = "生产方案ID")
+    private Long productionSolutionId;
+
+    /** 文件地址 */
+    @ApiModelProperty(name = "文件地址")
+    private String filePath;
+
+    /** 原文件名 */
+    @ApiModelProperty(name = "原文件名")
+    private String fileOriginalName;
+
+    @ApiModelProperty(name = "文件大小")
+    private Long fileSize;
+
+
+
+}

mes/src/main/java/com/ximai/mes/pro/domain/vo/ProProductionSolutionProcessVo.java

@@ -3,13 +3,17 @@ package com.ximai.mes.pro.domain.vo;
 import com.ximai.common.annotation.Excel;
 import com.ximai.common.core.domain.BaseEntity;
 import com.ximai.mes.pro.domain.productionSolution.ProProductionSolutionProcess;
+import com.ximai.mes.pro.domain.productionSolution.ProProductionSolutionProcessDrawing;
 import com.ximai.mes.pro.domain.productionSolution.ProProductionSolutionProcessItem;
+import com.ximai.mes.pro.dto.productionSolution.ProProductionSolutionProcessDrawingCreate;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.beans.BeanUtils;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -81,6 +85,15 @@ public class ProProductionSolutionProcessVo extends BaseEntity {
      */
     private String idx;
 
+    @ApiModelProperty("是否外协")
+    private String outsourced;
+
+    /**
+     * 排序号
+     */
+    @ApiModelProperty("排序号")
+    private Integer serial;
+
     /**
      * 工作中心编码
      */
@@ -214,17 +227,22 @@ public class ProProductionSolutionProcessVo extends BaseEntity {
     /**
      * 工序物料
      */
-    private List<ProProductionSolutionProcessItem> processItemList;
+    private List<ProProductionSolutionProcessItem> processItemList=new ArrayList<>();
 
     /**
      * 生产版本工序检验项
      **/
-    private List<ProProductionSolutionProcessQcindexVo> qcindexList;
+    private List<ProProductionSolutionProcessQcindexVo> qcindexList=new ArrayList<>();
 
     /**
      * 生产版本工序工装夹具
      **/
-    private List<ProProductionSolutionProcessToolVo> toolList;
+    private List<ProProductionSolutionProcessToolVo> toolList=new ArrayList<>();
+
+    /**
+     * 生产版本工序图纸
+     **/
+    private List<ProProductionSolutionProcessDrawing> drawingList=new ArrayList<>();
 
 
     public ProProductionSolutionProcess getProductionSolutionProcess(ProProductionSolutionProcessVo proProductionSolutionProcessVo) {

mes/src/main/java/com/ximai/mes/pro/domain/vo/ProProductionSolutionVo.java

@@ -2,8 +2,10 @@ package com.ximai.mes.pro.domain.vo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.ximai.mes.pro.domain.productionSolution.ProProductionSolutionProcessDrawing;
 import com.ximai.mes.pro.domain.productionSolution.ProProductionSolutionSpecificationSheet;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ximai.mes.pro.dto.productionSolution.ProProductionSolutionProcessDrawingDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;

mes/src/main/java/com/ximai/mes/pro/dto/productionSolution/ProProductionSolutionProcessDrawingCreate.java

+package com.ximai.mes.pro.dto.productionSolution;
+
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+/**
+ * 生产版本工序图纸对象 pro_production_solution_process_drawing
+ *
+ * @author generator
+ * @date 2024-08-29
+ */
+@Data
+public class ProProductionSolutionProcessDrawingCreate {
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    @TableId
+    private Long productionSolutionProcessFileId;
+
+    /** 生产方案工序ID */
+    @ApiModelProperty(name = "生产方案工序ID")
+    private Long productionSolutionProcessId;
+
+    /** 生产方案ID */
+    @ApiModelProperty(name = "生产方案ID")
+    private Long productionSolutionId;
+
+    /** 文件地址 */
+    @ApiModelProperty(name = "文件地址")
+    private String filePath;
+
+    /** 文件大小 */
+    @ApiModelProperty(name = "文件大小")
+    private Long fileSize;
+
+    /** 原文件名 */
+    @ApiModelProperty(name = "原文件名")
+    private String fileOriginalName;
+
+
+
+}

mes/src/main/java/com/ximai/mes/pro/dto/productionSolution/ProProductionSolutionProcessDrawingDto.java

+package com.ximai.mes.pro.dto.productionSolution;
+
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+/**
+ * 生产版本工序图纸对象 pro_production_solution_process_drawing
+ *
+ * @author generator
+ * @date 2024-08-29
+ */
+@Data
+public class ProProductionSolutionProcessDrawingDto {
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    @TableId
+    private Long productionSolutionProcessFileId;
+
+    /** 生产方案工序ID */
+    @ApiModelProperty(name = "生产方案工序ID")
+    private Long productionSolutionProcessId;
+
+    /** 生产方案ID */
+    @ApiModelProperty(name = "生产方案ID")
+    private Long productionSolutionId;
+
+    /** 文件地址 */
+    @ApiModelProperty(name = "文件地址")
+    private String filePath;
+
+    /** 原文件名 */
+    @ApiModelProperty(name = "原文件名")
+    private String fileOriginalName;
+
+    @ApiModelProperty(name = "文件大小")
+    private Long fileSize;
+
+
+
+}

mes/src/main/java/com/ximai/mes/pro/dto/productionSolution/ProProductionSolutionProcessDrawingExcelExport.java

+package com.ximai.mes.pro.dto.productionSolution;
+
+import com.ximai.common.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import com.ximai.common.core.domain.BaseEntity;
+
+/**
+ * 生产版本工序图纸对象 pro_production_solution_process_drawing
+ *
+ * @author generator
+ * @date 2024-08-29
+ */
+@Data
+public class ProProductionSolutionProcessDrawingExcelExport {
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    @TableId
+    private Long productionSolutionProcessFileId;
+
+    /** 生产方案工序ID */
+    @ApiModelProperty(name = "生产方案工序ID")
+    @Excel(name = "生产方案工序ID")
+    private Long productionSolutionProcessId;
+
+    /** 生产方案ID */
+    @ApiModelProperty(name = "生产方案ID")
+    @Excel(name = "生产方案ID")
+    private Long productionSolutionId;
+
+    /** 文件地址 */
+    @ApiModelProperty(name = "文件地址")
+    @Excel(name = "文件地址")
+    private String filePath;
+
+    /** 原文件名 */
+    @ApiModelProperty(name = "原文件名")
+    @Excel(name = "原文件名")
+    private String fileOriginalName;
+
+    @ApiModelProperty(name = "文件大小")
+    private Long fileSize;
+
+
+
+}

mes/src/main/java/com/ximai/mes/pro/dto/productionSolution/ProProductionSolutionProcessDrawingExcelImport.java

+package com.ximai.mes.pro.dto.productionSolution;
+
+import com.ximai.common.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import com.ximai.common.core.domain.BaseEntity;
+
+/**
+ * 生产版本工序图纸对象 pro_production_solution_process_drawing
+ *
+ * @author generator
+ * @date 2024-08-29
+ */
+@Data
+public class ProProductionSolutionProcessDrawingExcelImport {
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    @TableId
+    private Long productionSolutionProcessFileId;
+
+    /** 生产方案工序ID */
+    @ApiModelProperty(name = "生产方案工序ID")
+    @Excel(name = "生产方案工序ID")
+    private Long productionSolutionProcessId;
+
+    /** 生产方案ID */
+    @ApiModelProperty(name = "生产方案ID")
+    @Excel(name = "生产方案ID")
+    private Long productionSolutionId;
+
+    /** 文件地址 */
+    @ApiModelProperty(name = "文件地址")
+    @Excel(name = "文件地址")
+    private String filePath;
+
+    /** 原文件名 */
+    @ApiModelProperty(name = "原文件名")
+    @Excel(name = "原文件名")
+    private String fileOriginalName;
+
+    @ApiModelProperty(name = "文件大小")
+    private Long fileSize;
+
+
+
+}

mes/src/main/java/com/ximai/mes/pro/dto/productionSolution/ProProductionSolutionProcessDrawingUpdate.java

+package com.ximai.mes.pro.dto.productionSolution;
+
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+/**
+ * 生产版本工序图纸对象 pro_production_solution_process_drawing
+ *
+ * @author generator
+ * @date 2024-08-29
+ */
+@Data
+public class ProProductionSolutionProcessDrawingUpdate {
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    @TableId
+    private Long productionSolutionProcessFileId;
+
+    /** 生产方案工序ID */
+    @ApiModelProperty(name = "生产方案工序ID")
+    private Long productionSolutionProcessId;
+
+    /** 生产方案ID */
+    @ApiModelProperty(name = "生产方案ID")
+    private Long productionSolutionId;
+
+    /** 文件地址 */
+    @ApiModelProperty(name = "文件地址")
+    private String filePath;
+
+    /** 原文件名 */
+    @ApiModelProperty(name = "原文件名")
+    private String fileOriginalName;
+
+    @ApiModelProperty(name = "文件大小")
+    private Long fileSize;
+
+
+
+}

mes/src/main/java/com/ximai/mes/pro/mapper/productionSolution/ProProductionSolutionProcessDrawingMapper.java

+package com.ximai.mes.pro.mapper.productionSolution;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ximai.mes.pro.domain.productionSolution.ProProductionSolutionProcessDrawing;
+import com.ximai.mes.pro.dto.productionSolution.ProProductionSolutionProcessDrawingDto;
+
+/**
+ * 生产版本工序图纸Mapper接口
+ *
+ * @author generator
+ * @date 2024-08-29
+ */
+public interface ProProductionSolutionProcessDrawingMapper extends BaseMapper<ProProductionSolutionProcessDrawing>
+{
+    /**
+     * 查询生产版本工序图纸
+     *
+     * @param productionSolutionProcessFileId 生产版本工序图纸主键
+     * @return 生产版本工序图纸
+     */
+    public ProProductionSolutionProcessDrawingDto selectProProductionSolutionProcessDrawingByProductionSolutionProcessFileId(Long productionSolutionProcessFileId);
+
+    /**
+     * 查询生产版本工序图纸列表
+     *
+     * @param proProductionSolutionProcessDrawing 生产版本工序图纸
+     * @return 生产版本工序图纸集合
+     */
+    public List<ProProductionSolutionProcessDrawingDto> selectProProductionSolutionProcessDrawingList(ProProductionSolutionProcessDrawing proProductionSolutionProcessDrawing);
+
+    /**
+     * 新增生产版本工序图纸
+     *
+     * @param proProductionSolutionProcessDrawing 生产版本工序图纸
+     * @return 结果
+     */
+    public int insertProProductionSolutionProcessDrawing(ProProductionSolutionProcessDrawing proProductionSolutionProcessDrawing);
+
+    /**
+     * 修改生产版本工序图纸
+     *
+     * @param proProductionSolutionProcessDrawing 生产版本工序图纸
+     * @return 结果
+     */
+    public int updateProProductionSolutionProcessDrawing(ProProductionSolutionProcessDrawing proProductionSolutionProcessDrawing);
+
+    /**
+     * 删除生产版本工序图纸
+     *
+     * @param productionSolutionProcessFileId 生产版本工序图纸主键
+     * @return 结果
+     */
+    public int deleteProProductionSolutionProcessDrawingByProductionSolutionProcessFileId(Long productionSolutionProcessFileId);
+
+    /**
+     * 批量删除生产版本工序图纸
+     *
+     * @param productionSolutionProcessFileIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteProProductionSolutionProcessDrawingByProductionSolutionProcessFileIds(Long[] productionSolutionProcessFileIds);
+}

mes/src/main/java/com/ximai/mes/pro/mapper/productionSolution/ProProductionSolutionProcessQcindexMapper.java

@@ -53,7 +53,7 @@ public interface ProProductionSolutionProcessQcindexMapper extends BaseMapper<Pr
      * @param prototypeRequestProcessQcindexId 生产版本工序检验项主键
      * @return 结果
      */
-    int deleteProProductionSolutionProcessQcindexByPrototypeRequestProcessQcindexId(Long prototypeRequestProcessQcindexId);
+    int deleteProProductionSolutionProcessQcindexByPrototypeSolutionProcessQcindexId(Long prototypeRequestProcessQcindexId);
 
     /**
      * 批量删除生产版本工序检验项
@@ -61,5 +61,5 @@ public interface ProProductionSolutionProcessQcindexMapper extends BaseMapper<Pr
      * @param prototypeRequestProcessQcindexIds 需要删除的数据主键集合
      * @return 结果
      */
-    int deleteProProductionSolutionProcessQcindexByPrototypeRequestProcessQcindexIds(Long[] prototypeRequestProcessQcindexIds);
+    int deleteProProductionSolutionProcessQcindexByPrototypeSolutionProcessQcindexIds(Long[] prototypeRequestProcessQcindexIds);
 }

mes/src/main/java/com/ximai/mes/pro/service/impl/productionSolution/ProProductionSolutionProcessDrawingServiceImpl.java

+package com.ximai.mes.pro.service.impl.productionSolution;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import cn.hutool.core.bean.BeanUtil;
+import com.ximai.mes.pro.mapper.productionSolution.ProProductionSolutionProcessDrawingMapper;
+import com.ximai.mes.pro.domain.productionSolution.ProProductionSolutionProcessDrawing;
+import com.ximai.mes.pro.dto.productionSolution.ProProductionSolutionProcessDrawingCreate;
+import com.ximai.mes.pro.dto.productionSolution.ProProductionSolutionProcessDrawingUpdate;
+import com.ximai.mes.pro.dto.productionSolution.ProProductionSolutionProcessDrawingDto;
+import com.ximai.mes.pro.service.productionSolution.IProProductionSolutionProcessDrawingService;
+
+/**
+ * 生产版本工序图纸Service业务层处理
+ *
+ * @author generator
+ * @date 2024-08-29
+ */
+@Service
+public class ProProductionSolutionProcessDrawingServiceImpl implements IProProductionSolutionProcessDrawingService
+{
+    @Autowired
+    private ProProductionSolutionProcessDrawingMapper proProductionSolutionProcessDrawingMapper;
+
+    /**
+     * 查询生产版本工序图纸
+     *
+     * @param productionSolutionProcessFileId 生产版本工序图纸主键
+     * @return 生产版本工序图纸
+     */
+    @Override
+    public ProProductionSolutionProcessDrawingDto selectProProductionSolutionProcessDrawingDtoByProductionSolutionProcessFileId(Long productionSolutionProcessFileId)
+    {
+        return proProductionSolutionProcessDrawingMapper.selectProProductionSolutionProcessDrawingByProductionSolutionProcessFileId(productionSolutionProcessFileId);
+    }
+
+    /**
+     * 查询生产版本工序图纸
+     *
+     * @param productionSolutionProcessFileId 生产版本工序图纸主键
+     * @return 生产版本工序图纸
+     */
+    @Override
+    public ProProductionSolutionProcessDrawing selectProProductionSolutionProcessDrawingByProductionSolutionProcessFileId(Long productionSolutionProcessFileId)
+    {
+        return proProductionSolutionProcessDrawingMapper.selectById(productionSolutionProcessFileId);
+    }
+
+    /**
+     * 查询生产版本工序图纸列表
+     *
+     * @param proProductionSolutionProcessDrawing 生产版本工序图纸
+     * @return 生产版本工序图纸
+     */
+    @Override
+    public List<ProProductionSolutionProcessDrawingDto> selectProProductionSolutionProcessDrawingList(ProProductionSolutionProcessDrawing proProductionSolutionProcessDrawing)
+    {
+        return proProductionSolutionProcessDrawingMapper.selectProProductionSolutionProcessDrawingList(proProductionSolutionProcessDrawing);
+    }
+
+    /**
+     * 查询生产版本工序图纸列表
+     *
+     * @param proProductionSolutionProcessDrawingQuery 生产版本工序图纸
+     * @return 生产版本工序图纸
+     */
+    @Override
+    public List<ProProductionSolutionProcessDrawing> selectProProductionSolutionProcessDrawingList(QueryWrapper<ProProductionSolutionProcessDrawing> proProductionSolutionProcessDrawingQuery)
+    {
+        return proProductionSolutionProcessDrawingMapper.selectList(proProductionSolutionProcessDrawingQuery);
+    }
+
+    /**
+     * 新增生产版本工序图纸
+     *
+     * @param proProductionSolutionProcessDrawingCreate 生产版本工序图纸
+     * @return 结果
+     */
+    @Override
+    public int insertProProductionSolutionProcessDrawing(ProProductionSolutionProcessDrawingCreate proProductionSolutionProcessDrawingCreate)
+    {
+        ProProductionSolutionProcessDrawing proProductionSolutionProcessDrawing = new ProProductionSolutionProcessDrawing();
+        BeanUtil.copyProperties(proProductionSolutionProcessDrawingCreate, proProductionSolutionProcessDrawing);
+        return proProductionSolutionProcessDrawingMapper.insertProProductionSolutionProcessDrawing(proProductionSolutionProcessDrawing);
+    }
+
+    /**
+     * 修改生产版本工序图纸
+     *
+     * @param proProductionSolutionProcessDrawingUpdate 生产版本工序图纸
+     * @return 结果
+     */
+    @Override
+    public int updateProProductionSolutionProcessDrawing(ProProductionSolutionProcessDrawingUpdate proProductionSolutionProcessDrawingUpdate)
+    {
+        ProProductionSolutionProcessDrawing proProductionSolutionProcessDrawing = new ProProductionSolutionProcessDrawing();
+        BeanUtil.copyProperties(proProductionSolutionProcessDrawingUpdate, proProductionSolutionProcessDrawing);
+        return proProductionSolutionProcessDrawingMapper.updateProProductionSolutionProcessDrawing(proProductionSolutionProcessDrawing);
+    }
+
+    /**
+     * 批量删除生产版本工序图纸
+     *
+     * @param productionSolutionProcessFileIds 需要删除的生产版本工序图纸主键
+     * @return 结果
+     */
+    @Override
+    public int deleteProProductionSolutionProcessDrawingByProductionSolutionProcessFileIds(Long[] productionSolutionProcessFileIds)
+    {
+        return proProductionSolutionProcessDrawingMapper.deleteProProductionSolutionProcessDrawingByProductionSolutionProcessFileIds(productionSolutionProcessFileIds);
+    }
+
+    /**
+     * 删除生产版本工序图纸信息
+     *
+     * @param productionSolutionProcessFileId 生产版本工序图纸主键
+     * @return 结果
+     */
+    @Override
+    public int deleteProProductionSolutionProcessDrawingByProductionSolutionProcessFileId(Long productionSolutionProcessFileId)
+    {
+        return proProductionSolutionProcessDrawingMapper.deleteProProductionSolutionProcessDrawingByProductionSolutionProcessFileId(productionSolutionProcessFileId);
+    }
+}

mes/src/main/java/com/ximai/mes/pro/service/impl/productionSolution/ProProductionSolutionProcessQcindexServiceImpl.java

@@ -112,7 +112,7 @@ public class ProProductionSolutionProcessQcindexServiceImpl implements IProProdu
     @Override
     public int deleteProProductionSolutionProcessQcindexByPrototypeRequestProcessQcindexIds(Long[] prototypeRequestProcessQcindexIds)
     {
-        return proProductionSolutionProcessQcindexMapper.deleteProProductionSolutionProcessQcindexByPrototypeRequestProcessQcindexIds(prototypeRequestProcessQcindexIds);
+        return proProductionSolutionProcessQcindexMapper.deleteProProductionSolutionProcessQcindexByPrototypeSolutionProcessQcindexIds(prototypeRequestProcessQcindexIds);
     }
 
     /**
@@ -124,6 +124,6 @@ public class ProProductionSolutionProcessQcindexServiceImpl implements IProProdu
     @Override
     public int deleteProProductionSolutionProcessQcindexByPrototypeRequestProcessQcindexId(Long prototypeRequestProcessQcindexId)
     {
-        return proProductionSolutionProcessQcindexMapper.deleteProProductionSolutionProcessQcindexByPrototypeRequestProcessQcindexId(prototypeRequestProcessQcindexId);
+        return proProductionSolutionProcessQcindexMapper.deleteProProductionSolutionProcessQcindexByPrototypeSolutionProcessQcindexId(prototypeRequestProcessQcindexId);
     }
 }

mes/src/main/java/com/ximai/mes/pro/service/productionSolution/IProProductionSolutionProcessDrawingService.java

+package com.ximai.mes.pro.service.productionSolution;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ximai.mes.pro.domain.productionSolution.ProProductionSolutionProcessDrawing;
+import com.ximai.mes.pro.dto.productionSolution.ProProductionSolutionProcessDrawingCreate;
+import com.ximai.mes.pro.dto.productionSolution.ProProductionSolutionProcessDrawingUpdate;
+import com.ximai.mes.pro.dto.productionSolution.ProProductionSolutionProcessDrawingDto;
+
+/**
+ * 生产版本工序图纸Service接口
+ * 
+ * @author generator
+ * @date 2024-08-29
+ */
+public interface IProProductionSolutionProcessDrawingService 
+{
+    /**
+     * 查询生产版本工序图纸
+     *
+     * @param productionSolutionProcessFileId 生产版本工序图纸主键
+     * @return 生产版本工序图纸
+     */
+    public ProProductionSolutionProcessDrawingDto selectProProductionSolutionProcessDrawingDtoByProductionSolutionProcessFileId(Long productionSolutionProcessFileId);
+
+    /**
+     * 查询生产版本工序图纸
+     *
+     * @param productionSolutionProcessFileId 生产版本工序图纸主键
+     * @return 生产版本工序图纸
+     */
+    public ProProductionSolutionProcessDrawing selectProProductionSolutionProcessDrawingByProductionSolutionProcessFileId(Long productionSolutionProcessFileId);
+
+    /**
+     * 查询生产版本工序图纸列表
+     *
+     * @param proProductionSolutionProcessDrawing 生产版本工序图纸
+     * @return 生产版本工序图纸集合
+     */
+    public List<ProProductionSolutionProcessDrawingDto> selectProProductionSolutionProcessDrawingList(ProProductionSolutionProcessDrawing proProductionSolutionProcessDrawing);
+
+    /**
+     * 查询生产版本工序图纸列表
+     *
+     * @param proProductionSolutionProcessDrawingQuery 生产版本工序图纸
+     * @return 生产版本工序图纸集合
+     */
+    public List<ProProductionSolutionProcessDrawing> selectProProductionSolutionProcessDrawingList(QueryWrapper<ProProductionSolutionProcessDrawing> proProductionSolutionProcessDrawingQuery);
+
+    /**
+     * 新增生产版本工序图纸
+     * 
+     * @param proProductionSolutionProcessDrawing 生产版本工序图纸
+     * @return 结果
+     */
+    public int insertProProductionSolutionProcessDrawing(ProProductionSolutionProcessDrawingCreate proProductionSolutionProcessDrawing);
+
+    /**
+     * 修改生产版本工序图纸
+     * 
+     * @param proProductionSolutionProcessDrawing 生产版本工序图纸
+     * @return 结果
+     */
+    public int updateProProductionSolutionProcessDrawing(ProProductionSolutionProcessDrawingUpdate proProductionSolutionProcessDrawing);
+
+    /**
+     * 批量删除生产版本工序图纸
+     * 
+     * @param productionSolutionProcessFileIds 需要删除的生产版本工序图纸主键集合
+     * @return 结果
+     */
+    public int deleteProProductionSolutionProcessDrawingByProductionSolutionProcessFileIds(Long[] productionSolutionProcessFileIds);
+
+    /**
+     * 删除生产版本工序图纸信息
+     * 
+     * @param productionSolutionProcessFileId 生产版本工序图纸主键
+     * @return 结果
+     */
+    public int deleteProProductionSolutionProcessDrawingByProductionSolutionProcessFileId(Long productionSolutionProcessFileId);
+}

mes/src/main/resources/mapper/pro/productionSolution/ProProductionSolutionProcessDrawingMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ximai.mes.pro.mapper.productionSolution.ProProductionSolutionProcessDrawingMapper">
+
+    <resultMap type="ProProductionSolutionProcessDrawing" id="ProProductionSolutionProcessDrawingResult">
+            <result property="productionSolutionProcessFileId"    column="production_solution_process_file_id"    />
+            <result property="productionSolutionProcessId"    column="production_solution_process_id"    />
+            <result property="productionSolutionId"    column="production_solution_id"    />
+            <result property="filePath"    column="file_path"    />
+            <result property="fileSize"    column="file_size"    />
+            <result property="remark"    column="remark"    />
+            <result property="fileOriginalName"    column="file_original_name"    />
+    </resultMap>
+
+    <resultMap type="com.ximai.mes.pro.dto.productionSolution.ProProductionSolutionProcessDrawingDto" id="ProProductionSolutionProcessDrawingResult2">
+            <result property="productionSolutionProcessFileId"    column="production_solution_process_file_id"    />
+            <result property="productionSolutionProcessId"    column="production_solution_process_id"    />
+            <result property="productionSolutionId"    column="production_solution_id"    />
+            <result property="filePath"    column="file_path"    />
+            <result property="fileSize"    column="file_size"    />
+            <result property="remark"    column="remark"    />
+            <result property="fileOriginalName"    column="file_original_name"    />
+    </resultMap>
+
+    <sql id="selectProProductionSolutionProcessDrawingVo">
+        select production_solution_process_file_id, production_solution_process_id, production_solution_id, file_path, file_size, remark, file_original_name from pro_production_solution_process_drawing
+    </sql>
+
+    <select id="selectProProductionSolutionProcessDrawingList" parameterType="ProProductionSolutionProcessDrawing" resultMap="ProProductionSolutionProcessDrawingResult2">
+        <include refid="selectProProductionSolutionProcessDrawingVo"/>
+        <where>  
+            <if test="productionSolutionProcessId != null "> and production_solution_process_id = #{productionSolutionProcessId}</if>
+            <if test="productionSolutionId != null "> and production_solution_id = #{productionSolutionId}</if>
+            <if test="filePath != null  and filePath != ''"> and file_path = #{filePath}</if>
+            <if test="fileOriginalName != null  and fileOriginalName != ''"> and file_original_name like concat('%', #{fileOriginalName}, '%')</if>
+        </where>
+    </select>
+    
+    <select id="selectProProductionSolutionProcessDrawingByProductionSolutionProcessFileId" parameterType="Long" resultMap="ProProductionSolutionProcessDrawingResult2">
+        <include refid="selectProProductionSolutionProcessDrawingVo"/>
+        where production_solution_process_file_id = #{productionSolutionProcessFileId}
+    </select>
+        
+    <insert id="insertProProductionSolutionProcessDrawing" parameterType="ProProductionSolutionProcessDrawing" useGeneratedKeys="true" keyProperty="productionSolutionProcessFileId">
+        insert into pro_production_solution_process_drawing
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="productionSolutionProcessId != null">production_solution_process_id,</if>
+            <if test="productionSolutionId != null">production_solution_id,</if>
+            <if test="filePath != null">file_path,</if>
+            <if test="fileSize != null">file_size,</if>
+            <if test="remark != null">remark,</if>
+            <if test="fileOriginalName != null">file_original_name,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="productionSolutionProcessId != null">#{productionSolutionProcessId},</if>
+            <if test="productionSolutionId != null">#{productionSolutionId},</if>
+            <if test="filePath != null">#{filePath},</if>
+            <if test="fileSize != null">#{fileSize},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="fileOriginalName != null">#{fileOriginalName},</if>
+         </trim>
+    </insert>
+
+    <update id="updateProProductionSolutionProcessDrawing" parameterType="ProProductionSolutionProcessDrawing">
+        update pro_production_solution_process_drawing
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="productionSolutionProcessId != null">production_solution_process_id = #{productionSolutionProcessId},</if>
+            <if test="productionSolutionId != null">production_solution_id = #{productionSolutionId},</if>
+            <if test="filePath != null">file_path = #{filePath},</if>
+            <if test="fileSize != null">file_size = #{fileSize},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="fileOriginalName != null">file_original_name = #{fileOriginalName},</if>
+        </trim>
+        where production_solution_process_file_id = #{productionSolutionProcessFileId}
+    </update>
+
+    <delete id="deleteProProductionSolutionProcessDrawingByProductionSolutionProcessFileId" parameterType="Long">
+        delete from pro_production_solution_process_drawing where production_solution_process_file_id = #{productionSolutionProcessFileId}
+    </delete>
+
+    <delete id="deleteProProductionSolutionProcessDrawingByProductionSolutionProcessFileIds" parameterType="String">
+        delete from pro_production_solution_process_drawing where production_solution_process_file_id in 
+        <foreach item="productionSolutionProcessFileId" collection="array" open="(" separator="," close=")">
+            #{productionSolutionProcessFileId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

mes/src/main/resources/mapper/pro/productionSolution/ProProductionSolutionProcessMapper.xml

@@ -14,6 +14,8 @@
         <result property="keyFlag" column="key_flag"/>
         <result property="isCheck" column="is_check"/>
         <result property="idx" column="idx"/>
+        <result property="serial" column="serial"/>
+        <result property="outsourced" column="outsourced"/>
         <result property="workstationCode" column="workstation_code"/>
         <result property="processingMethod" column="processing_method"/>
         <result property="processName" column="process_name"/>
@@ -58,6 +60,8 @@
                ppsp.key_flag,
                ppsp.is_check,
                ppsp.idx,
+               ppsp.outsourced,
+               ppsp.serial,
                ppsp.workstation_code,
                ppsp.processing_method,
                ppsp.process_name,
@@ -127,6 +131,8 @@
             <if test="keyFlag != null">key_flag,</if>
             <if test="isCheck != null">is_check,</if>
             <if test="idx != null">idx,</if>
+            <if test="serial != null">serial,</if>
+            <if test="outsourced != null">outsourced,</if>
             <if test="workstationCode != null">workstation_code,</if>
             <if test="processingMethod != null">processing_method,</if>
             <if test="processName != null">process_name,</if>
@@ -165,6 +171,8 @@
             <if test="keyFlag != null">#{keyFlag},</if>
             <if test="isCheck != null">#{isCheck},</if>
             <if test="idx != null">#{idx},</if>
+            <if test="serial != null">#{serial},</if>
+            <if test="outsourced != null">#{outsourced},</if>
             <if test="workstationCode != null">#{workstationCode},</if>
             <if test="processingMethod != null">#{processingMethod},</if>
             <if test="processName != null">#{processName},</if>
@@ -207,6 +215,8 @@
             <if test="keyFlag != null">key_flag = #{keyFlag},</if>
             <if test="isCheck != null">is_check = #{isCheck},</if>
             <if test="idx != null">idx = #{idx},</if>
+            <if test="serial != null">serial = #{serial},</if>
+            <if test="outsourced != null">outsourced = #{outsourced},</if>
             <if test="workstationCode != null">workstation_code = #{workstationCode},</if>
             <if test="processingMethod != null">processing_method = #{processingMethod},</if>
             <if test="processName != null">process_name = #{processName},</if>

mes/src/main/resources/mapper/pro/productionSolution/ProProductionSolutionTmToolMapper.xml

@@ -47,7 +47,7 @@
             parameterType="Long"
             resultMap="ProProductionSolutionProcessToolResult">
         <include refid="selectProProductionSolutionProcessToolVo"/>
-        where production_solution_process_id = #{productionSolutionProcessId}
+        where prototype_solution_process_id = #{productionSolutionProcessId}
     </select>