update 成型工艺信息复制功能

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdTechnologyInfoController.java

@@ -53,7 +53,7 @@ public class ProdTechnologyInfoController extends BaseController {
     @Log(title = "工序工艺信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(ProdTechnologyInfoBo bo, HttpServletResponse response) {
-        List<ProdTechnologyInfoVo> list = prodTechnologyInfoService.queryList(bo);
+        List<ProdTechnologyInfoVo> list = prodTechnologyInfoService.queryExportList(bo);
         ExcelUtil.exportExcel(list, "工序工艺信息", ProdTechnologyInfoVo.class, response);
     }
 
@@ -108,10 +108,21 @@ public class ProdTechnologyInfoController extends BaseController {
     /**
      * 下拉框查询工序工艺信息列表
      */
-
     @GetMapping("getProdTechnologyInfoList")
     public R<List<ProdTechnologyInfoVo>> getProdTechnologyInfolist(ProdTechnologyInfoBo bo) {
         List<ProdTechnologyInfoVo> list = prodTechnologyInfoService.queryList(bo);
         return R.ok(list);
     }
+
+    /**
+     * 复制工序工艺信息
+     */
+    @SaCheckPermission("mes:technologyInfo:add")
+    @Log(title = "工序工艺信息", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping("/copyTechnologyInfo")
+    public R<Void> copyTechnologyInfo(@Validated(AddGroup.class) @RequestBody ProdTechnologyInfoBo bo) {
+        return toAjax(prodTechnologyInfoService.copyTechnologyInfo(bo));
+    }
+
 }

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdTechnologyInfoVo.java

@@ -7,11 +7,9 @@ import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
-import org.dromara.mes.domain.ProdTechnologyStepInfo;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.util.Date;
 import java.util.List;
 
 
@@ -41,12 +39,18 @@ public class ProdTechnologyInfoVo implements Serializable {
     @ExcelProperty(value = "工序ID")
     private Long processId;
 
+    @ExcelProperty(value = "工序名称")
+    private String processName;
+
     /**
      * 物料ID
      */
     @ExcelProperty(value = "物料ID")
     private Long materialId;
 
+    @ExcelProperty(value = "物料名称")
+    private String materialName;
+
     /**
      * 机台类型（1类一 2类二）
      */
@@ -70,7 +74,7 @@ public class ProdTechnologyInfoVo implements Serializable {
     /**
      * 硫化标准时间（秒）
      */
-    @ExcelProperty(value = "硫化标准时间", converter = ExcelDictConvert.class)
+    @ExcelProperty(value = "硫化标准时间")
     private Long standardTime;
 
     /**
@@ -80,17 +84,13 @@ public class ProdTechnologyInfoVo implements Serializable {
     @ExcelDictFormat(dictType = "active_flag")
     private String activeFlag;
 
+//    @ExcelProperty(value = "工艺参数")
+    private List<ProdTechnologyStepInfoVo> prodTechnologyStepInfoList;
+
     /**
      * 备注
      */
     @ExcelProperty(value = "备注")
     private String remark;
 
-    @ExcelProperty(value = "工序名称")
-    private String processName;
-
-    @ExcelProperty(value = "物料名称")
-    private String materialName;
-
-    private List<ProdTechnologyStepInfo> prodTechnologyStepInfoList;
 }

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdTechnologyStepInfoVo.java

@@ -56,7 +56,7 @@ public class ProdTechnologyStepInfoVo implements Serializable {
     /**
      * 时间/频率（毫秒）
      */
-    @ExcelProperty(value = "时间/频率", converter = ExcelDictConvert.class)
+    @ExcelProperty(value = "时间/频率")
     private Long stepTime;
 
     /**

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdTechnologyInfoService.java

@@ -66,4 +66,14 @@ public interface IProdTechnologyInfoService {
      * @return 是否删除成功
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 导出工序工艺信息列表
+     */
+    List<ProdTechnologyInfoVo> queryExportList(ProdTechnologyInfoBo bo);
+
+    /**
+     * 复制工序工艺信息
+     */
+    Boolean copyTechnologyInfo(ProdTechnologyInfoBo bo);
 }

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdTechnologyInfoServiceImpl.java

@@ -15,6 +15,7 @@ import org.dromara.mes.domain.BaseMaterialInfo;
 import org.dromara.mes.domain.ProdBaseProcessInfo;
 import org.dromara.mes.domain.ProdTechnologyStepInfo;
 import org.dromara.mes.domain.bo.ProdTechnologyStepInfoBo;
+import org.dromara.mes.domain.vo.ProdTechnologyStepInfoVo;
 import org.dromara.mes.mapper.ProdTechnologyStepInfoMapper;
 import org.springframework.stereotype.Service;
 import org.dromara.mes.domain.bo.ProdTechnologyInfoBo;
@@ -60,7 +61,7 @@ public class ProdTechnologyInfoServiceImpl implements IProdTechnologyInfoService
             .selectAll(ProdTechnologyStepInfo.class)
             .eq(bo.getTechnologyId() != null, ProdTechnologyStepInfo::getTechnologyId, bo.getTechnologyId())
             .orderByAsc(ProdTechnologyStepInfo::getCreateTime);
-        List<ProdTechnologyStepInfo> prodTechnologyStepInfoList = prodTechnologyStepInfoMapper.selectList(lqwStep);
+        List<ProdTechnologyStepInfoVo> prodTechnologyStepInfoList = prodTechnologyStepInfoMapper.selectVoList(lqwStep);
         prodTechnologyInfoVo.setProdTechnologyStepInfoList(prodTechnologyStepInfoList);
         return prodTechnologyInfoVo;
     }
@@ -175,4 +176,50 @@ public class ProdTechnologyInfoServiceImpl implements IProdTechnologyInfoService
         }
         return baseMapper.deleteByIds(ids) > 0;
     }
+
+    /**
+     * 导出工序工艺信息列表
+     */
+    @Override
+    public List<ProdTechnologyInfoVo> queryExportList(ProdTechnologyInfoBo bo) {
+        MPJLambdaWrapper<ProdTechnologyInfo> lqw = buildQueryWrapper(bo);
+        List<ProdTechnologyInfoVo> selectVoList = baseMapper.selectVoList(lqw);
+        for (ProdTechnologyInfoVo prodTechnologyInfoVo : selectVoList) {
+            //工艺步序信息
+            MPJLambdaWrapper<ProdTechnologyStepInfo> lqwStep = JoinWrappers.lambda(ProdTechnologyStepInfo.class)
+                .selectAll(ProdTechnologyStepInfo.class)
+                .eq(bo.getTechnologyId() != null, ProdTechnologyStepInfo::getTechnologyId, prodTechnologyInfoVo.getTechnologyId())
+                .orderByAsc(ProdTechnologyStepInfo::getCreateTime);
+            List<ProdTechnologyStepInfoVo> prodTechnologyStepInfoList = prodTechnologyStepInfoMapper.selectVoList(lqwStep);
+            prodTechnologyInfoVo.setProdTechnologyStepInfoList(prodTechnologyStepInfoList);
+        }
+        return selectVoList;
+    }
+
+    /**
+     * 复制工序工艺信息
+     */
+    @Override
+    public Boolean copyTechnologyInfo(ProdTechnologyInfoBo bo) {
+        ProdTechnologyInfo add = MapstructUtils.convert(bo, ProdTechnologyInfo.class);
+        validEntityBeforeSave(add);
+        add.setTechnologyId(null);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            Long technologyId = add.getTechnologyId();
+//            bo.setTechnologyId(technologyId);
+            MPJLambdaWrapper<ProdTechnologyStepInfo> lqwStep = JoinWrappers.lambda(ProdTechnologyStepInfo.class)
+                .selectAll(ProdTechnologyStepInfo.class)
+                .eq(bo.getTechnologyId() != null, ProdTechnologyStepInfo::getTechnologyId, bo.getTechnologyId())
+                .orderByAsc(ProdTechnologyStepInfo::getCreateTime);
+            List<ProdTechnologyStepInfo> prodTechnologyStepInfoList = prodTechnologyStepInfoMapper.selectList(lqwStep);
+            for (ProdTechnologyStepInfo technologyStepInfo : prodTechnologyStepInfoList) {
+                technologyStepInfo.setStepId(null);
+                technologyStepInfo.setTechnologyId(technologyId);
+                prodTechnologyStepInfoMapper.insert(technologyStepInfo);
+            }
+        }
+        return flag;
+    }
+
 }