镀种小类 槽液任务 化验频率。

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/PlatingSmall.java

@@ -57,7 +57,7 @@ public class PlatingSmall extends BaseEntity {
 	 * 日常规生产能力
 	 */
 	@Schema(description = "日常规生产能力")
-	private BigDecimal capacity;
+	private Integer capacity;
 	/**
 	 * [作业中心]id
 	 */

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingSmallVO.java

@@ -3,6 +3,7 @@
  */
 package org.springblade.desk.basic.pojo.vo;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.desk.basic.pojo.entity.PlatingSmall;
@@ -21,4 +22,6 @@ public class PlatingSmallVO extends PlatingSmall {
 	@Serial
 	private static final long serialVersionUID = 1L;
 
+    @Schema(description = "[作业中心]name")
+    private String wcName;
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTask.java

@@ -523,4 +523,9 @@ public class LiquidTankTask extends BaseEntity {
      */
     @Schema(description = "超期标记")
     private Integer flagOut;
+    /**
+     * 化验频率
+     */
+    @Schema(description = "化验频率")
+    private String jobExtShowText;
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingSmallController.java

@@ -56,184 +56,186 @@ import java.util.stream.Collectors;
 public class PlatingSmallController extends BladeController {
 
     @Resource
-	private IPlatingSmallService service;
+    private IPlatingSmallService service;
-
+
-	/**
+    /**
-	 * [镀种小类] 详情
+     * [镀种小类] 详情
-	 */
+     */
-	@GetMapping("/detail")
+    @GetMapping("/detail")
-	@ApiOperationSupport(order = 10)
+    @ApiOperationSupport(order = 10)
-	@Operation(summary = "详情", description  = "传入PlatingSmall Obj")
+    @Operation(summary = "详情", description = "传入PlatingSmall Obj")
-	public R<PlatingSmallVO> detail(PlatingSmall platingSmall) {
+    public R<PlatingSmallVO> detail(PlatingSmall platingSmall) {
-	    QueryWrapper<PlatingSmall> qw = Condition.getQueryWrapper(platingSmall);
+        QueryWrapper<PlatingSmall> qw = Condition.getQueryWrapper(platingSmall);
-		PlatingSmall detail = service.getOne(qw);
+        PlatingSmall detail = service.getOne(qw);
-		PlatingSmallVO detailVO = PlatingSmallWrapper.build().entityVO(detail);
+        PlatingSmallVO detailVO = PlatingSmallWrapper.build().entityVO(detail);
-		service.setVOValue(detailVO);
+        service.setVOValue(detailVO);
-		return R.data(detailVO);
+        return R.data(detailVO);
-	}
+    }
-
+
-	/**
+    /**
-	 * [镀种小类] list分页
+     * [镀种小类] list分页
-	 */
+     */
-	@GetMapping("/list")
+    @GetMapping("/list")
-	@ApiOperationSupport(order = 20)
+    @ApiOperationSupport(order = 20)
-	@Operation(summary = "list分页", description  = "传入PlatingSmall Obj")
+    @Operation(summary = "list分页", description = "传入PlatingSmall Obj")
-	public R<IPage<PlatingSmallVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> platingSmall,
+    public R<IPage<PlatingSmallVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> platingSmall,
-	                                        Query query) {
+                                         Query query) {
         QueryWrapper<PlatingSmall> qw = Condition.getQueryWrapper(platingSmall, PlatingSmall.class);
-		IPage<PlatingSmall> pages = service.page(Condition.getPage(query), qw);
+        // 名称
-		IPage<PlatingSmallVO> pagesVO = PlatingSmallWrapper.build().pageVO(pages);
+        qw.like(PlatingSmall.COL_BPS_NAME, Func.toStr(platingSmall.get("bpsName")));
-		pagesVO.getRecords()
+        IPage<PlatingSmall> pages = service.page(Condition.getPage(query), qw);
-               .stream()
+        IPage<PlatingSmallVO> pagesVO = PlatingSmallWrapper.build().pageVO(pages);
-               .peek(service::setVOValue)
+        pagesVO.getRecords()
-               .collect(Collectors.toList());
+                .stream()
-		return R.data(pagesVO);
+                .peek(service::setVOValue)
-	}
+                .collect(Collectors.toList());
-
+        return R.data(pagesVO);
-
+    }
-	/**
+
-	 * [镀种小类] page分页
+
-	 */
+    /**
-	@GetMapping("/page")
+     * [镀种小类] page分页
-	@ApiOperationSupport(order = 21)
+     */
-	@Operation(summary = "page分页", description  = "传入PlatingSmall Obj")
+    @GetMapping("/page")
-	public R<IPage<PlatingSmallVO>> page(PlatingSmallVO platingSmall, Query query) {
+    @ApiOperationSupport(order = 21)
-		IPage<PlatingSmallVO> pagesVO = service.selectPlatingSmallPage(
+    @Operation(summary = "page分页", description = "传入PlatingSmall Obj")
-		    Condition.getPage(query), platingSmall
+    public R<IPage<PlatingSmallVO>> page(PlatingSmallVO platingSmall, Query query) {
-		);
+        IPage<PlatingSmallVO> pagesVO = service.selectPlatingSmallPage(
-		return R.data(pagesVO);
+                Condition.getPage(query), platingSmall
-	}
+        );
-
+        return R.data(pagesVO);
-	/**
+    }
+
+    /**
      * [镀种小类] list下拉选择
      */
     @GetMapping("/listForSelect")
     @ApiOperationSupport(order = 22)
-    @Operation(summary = "list下拉选择", description  = "")
+    @Operation(summary = "list下拉选择", description = "")
     public R<List<PlatingSmallVO>> listForSelect() {
-         List<PlatingSmall> list = service.list();
+        List<PlatingSmall> list = service.list();
-         List<PlatingSmallVO> listVO = PlatingSmallWrapper.build().listVO(list);
+        List<PlatingSmallVO> listVO = PlatingSmallWrapper.build().listVO(list);
-         return R.data(listVO);
+        return R.data(listVO);
+    }
+
+    /**
+     * [镀种小类] 新增一条
+     */
+    @PostMapping("/save")
+    @ApiOperationSupport(order = 30)
+    @Operation(summary = "新增一条", description = "传入PlatingSmall Obj")
+    public R save(@Valid @RequestBody PlatingSmall addOne) {
+        addOne.setId(null);
+        return R.status(service.save(addOne));
     }
 
-	/**
+    /**
-	 * [镀种小类] 新增一条
-	 */
-	@PostMapping("/save")
-	@ApiOperationSupport(order = 30)
-	@Operation(summary = "新增一条", description  = "传入PlatingSmall Obj")
-	public R save(@Valid @RequestBody PlatingSmall addOne) {
-	    addOne.setId(null);
-		return R.status(service.save(addOne));
-	}
-
-	/**
      * [镀种小类] 新增批量
      */
-     @PostMapping("/saveBat")
+    @PostMapping("/saveBat")
-     @ApiOperationSupport(order = 31)
+    @ApiOperationSupport(order = 31)
-     @Operation(summary = "新增批量", description = "传入PlatingSmall List")
+    @Operation(summary = "新增批量", description = "传入PlatingSmall List")
-     public R saveBat(@Valid @RequestBody List<PlatingSmall> addList) {
+    public R saveBat(@Valid @RequestBody List<PlatingSmall> addList) {
-         addList.forEach(one -> {
+        addList.forEach(one -> {
-             one.setId(null);
+            one.setId(null);
-         });
+        });
-         return R.status(service.saveBatch(addList));
+        return R.status(service.saveBatch(addList));
-     }
+    }
-
+
-	/**
+    /**
-	 * [镀种小类] 修改一条
+     * [镀种小类] 修改一条
-	 */
+     */
-	@PostMapping("/update")
+    @PostMapping("/update")
-	@ApiOperationSupport(order = 40)
+    @ApiOperationSupport(order = 40)
-	@Operation(summary = "修改一条", description  = "传入PlatingSmall Obj")
+    @Operation(summary = "修改一条", description = "传入PlatingSmall Obj")
-	public R update(@Valid @RequestBody PlatingSmall updateOne) {
+    public R update(@Valid @RequestBody PlatingSmall updateOne) {
-		return R.status(service.updateById(updateOne));
+        return R.status(service.updateById(updateOne));
-	}
+    }
 
     /**
      * [镀种小类] 修改批量
      */
     @PostMapping("/updateBat")
     @ApiOperationSupport(order = 41)
-    @Operation(summary = "修改批量", description  = "传入PlatingSmall List")
+    @Operation(summary = "修改批量", description = "传入PlatingSmall List")
     public R updateBat(@Valid @RequestBody List<PlatingSmall> updateList) {
         return R.status(service.updateBatchById(updateList));
     }
 
-	/**
+    /**
-	 * [镀种小类] 新增或修改一条
+     * [镀种小类] 新增或修改一条
-	 */
+     */
-	@PostMapping("/submit")
+    @PostMapping("/submit")
-	@ApiOperationSupport(order = 50)
+    @ApiOperationSupport(order = 50)
-	@Operation(summary = "新增或修改一条", description  = "传入PlatingSmall Obj")
+    @Operation(summary = "新增或修改一条", description = "传入PlatingSmall Obj")
-	public R submit(@Valid @RequestBody PlatingSmall mergeOne) {
+    public R submit(@Valid @RequestBody PlatingSmall mergeOne) {
-		return R.status(service.saveOrUpdate(mergeOne));
+        return R.status(service.saveOrUpdate(mergeOne));
-	}
+    }
-
+
-	/**
+    /**
      * [镀种小类] 新增或修改批量
      */
-     @PostMapping("/submitBat")
+    @PostMapping("/submitBat")
-     @ApiOperationSupport(order = 51)
+    @ApiOperationSupport(order = 51)
-     @Operation(summary = "新增或修改批量", description = "传入PlatingSmall List")
+    @Operation(summary = "新增或修改批量", description = "传入PlatingSmall List")
-     public R submitBat(@Valid @RequestBody List<PlatingSmall> mergeList) {
+    public R submitBat(@Valid @RequestBody List<PlatingSmall> mergeList) {
-         return R.status(service.saveOrUpdateBatch(mergeList));
+        return R.status(service.saveOrUpdateBatch(mergeList));
-     }
+    }
-
+
-	/**
+    /**
-	 * [镀种小类] 逻辑删除
+     * [镀种小类] 逻辑删除
-	 */
+     */
-	@PostMapping("/remove")
+    @PostMapping("/remove")
-	@ApiOperationSupport(order = 61)
+    @ApiOperationSupport(order = 61)
-	@Operation(summary = "逻辑删除", description  = "传入ids")
+    @Operation(summary = "逻辑删除", description = "传入ids")
-	public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
+    public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(service.deleteLogic(Func.toLongList(ids)));
+        return R.status(service.deleteLogic(Func.toLongList(ids)));
-	}
+    }
-
+
-	/**
+    /**
-	 * [镀种小类] 导出Excel
+     * [镀种小类] 导出Excel
-	 */
+     */
-	@GetMapping("/exportExcel")
+    @GetMapping("/exportExcel")
-	@ApiOperationSupport(order = 70)
+    @ApiOperationSupport(order = 70)
-	@Operation(summary = "导出Excel", description  = "传入PlatingSmall")
+    @Operation(summary = "导出Excel", description = "传入PlatingSmall")
-	public void exportExcel(@Parameter(hidden = true) @RequestParam Map<String, Object> platingSmall,
+    public void exportExcel(@Parameter(hidden = true) @RequestParam Map<String, Object> platingSmall,
-	                                BladeUser bladeUser, HttpServletResponse response) {
+                            BladeUser bladeUser, HttpServletResponse response) {
-		QueryWrapper<PlatingSmall> qw = Condition.getQueryWrapper(platingSmall, PlatingSmall.class);
+        QueryWrapper<PlatingSmall> qw = Condition.getQueryWrapper(platingSmall, PlatingSmall.class);
-		//if (!AuthUtil.isAdministrator()) {
+        //if (!AuthUtil.isAdministrator()) {
-		//	queryWrapper.lambda().eq(PlatingSmall::getTenantId, bladeUser.getTenantId());
+        //	queryWrapper.lambda().eq(PlatingSmall::getTenantId, bladeUser.getTenantId());
-		//}
+        //}
-		//queryWrapper.lambda().eq(PlatingSmallEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+        //queryWrapper.lambda().eq(PlatingSmallEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
-		List<PlatingSmallExcel> list = service.exportPlatingSmall(qw);
+        List<PlatingSmallExcel> list = service.exportPlatingSmall(qw);
-		ExcelUtil.export(response, "[镀种小类]数据" + DateUtil.time(),
+        ExcelUtil.export(response, "[镀种小类]数据" + DateUtil.time(),
-		                "[镀种小类]数据表", list, PlatingSmallExcel.class);
+                "[镀种小类]数据表", list, PlatingSmallExcel.class);
-	}
+    }
-
+
-	/**
+    /**
      * [镀种小类] 下载Excel模板
      */
-     @GetMapping("/downloadExcelTemplate")
+    @GetMapping("/downloadExcelTemplate")
-     @ApiOperationSupport(order = 71)
+    @ApiOperationSupport(order = 71)
-     @Operation(summary = "下载Excel模板", description = "")
+    @Operation(summary = "下载Excel模板", description = "")
-     public ResponseEntity<org.springframework.core.io.Resource> downloadExcelTemplate() {
+    public ResponseEntity<org.springframework.core.io.Resource> downloadExcelTemplate() {
-            return ExcelExtUtil.downloadXlsTemplate(
+        return ExcelExtUtil.downloadXlsTemplate(
-                    "Excel/QA/ImportTemplate-CycleTestItem.xls",
+                "Excel/QA/ImportTemplate-CycleTestItem.xls",
-                    "导入模版-周期试验项目.xls");
+                "导入模版-周期试验项目.xls");
-     }
+    }
-
+
-     /**
+    /**
-      * [镀种小类] 导入Excel
+     * [镀种小类] 导入Excel
-      */
+     */
-      @PostMapping("/importExcel")
+    @PostMapping("/importExcel")
-      @ApiOperationSupport(order = 72)
+    @ApiOperationSupport(order = 72)
-      @Operation(summary = "导入Excel", description = "MultipartFile")
+    @Operation(summary = "导入Excel", description = "MultipartFile")
-      public R importExcel(@RequestParam("file") MultipartFile file) {
+    public R importExcel(@RequestParam("file") MultipartFile file) {
-          R checkR = ExcelExtUtil.importExcelCheck(file);
+        R checkR = ExcelExtUtil.importExcelCheck(file);
-          if (checkR != null) {
+        if (checkR != null) {
-              return checkR;
+            return checkR;
-          }
+        }
-          List<PlatingSmall> importList = ExcelUtil.read(
+        List<PlatingSmall> importList = ExcelUtil.read(
-                     file, 0, 1, PlatingSmall.class
+                file, 0, 1, PlatingSmall.class
-          );
+        );
-          return R.status(service.saveBatch(importList));
+        return R.status(service.saveBatch(importList));
-      }
+    }
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/PlatingSmallServiceImpl.java

@@ -12,10 +12,14 @@ import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.desk.basic.excel.PlatingSmallExcel;
+import org.springblade.desk.basic.feign.IWorkCenterClient;
 import org.springblade.desk.basic.mapper.PlatingSmallMapper;
 import org.springblade.desk.basic.pojo.entity.PlatingSmall;
+import org.springblade.desk.basic.pojo.entity.WorkCenter;
 import org.springblade.desk.basic.pojo.vo.PlatingSmallVO;
 import org.springblade.desk.basic.service.IPlatingSmallService;
+import org.springblade.desk.basic.service.IWorkCenterService;
+import org.springblade.desk.basic.util.IdUtil;
 import org.springblade.system.feign.IDictClient;
 import org.springblade.system.feign.IUserClient;
 import org.springframework.stereotype.Service;
@@ -40,22 +44,30 @@ public class PlatingSmallServiceImpl extends BaseServiceImpl<PlatingSmallMapper,
     @Resource
     private IDictClient dictClient;
 
-	@Override
+    @Resource
-	public IPage<PlatingSmallVO> selectPlatingSmallPage(IPage<PlatingSmallVO> page, PlatingSmallVO platingSmall) {
+    private IWorkCenterService workCenterService;
-		return page.setRecords(baseMapper.selectPlatingSmallPage(page, platingSmall));
+
-	}
+    @Override
-
+    public IPage<PlatingSmallVO> selectPlatingSmallPage(IPage<PlatingSmallVO> page, PlatingSmallVO platingSmall) {
-	@Override
+        return page.setRecords(baseMapper.selectPlatingSmallPage(page, platingSmall));
-	public List<PlatingSmallExcel> exportPlatingSmall(Wrapper<PlatingSmall> queryWrapper) {
+    }
-		List<PlatingSmallExcel> platingSmallList = baseMapper.exportPlatingSmall(queryWrapper);
-		//platingSmallList.forEach(platingSmall -> {
-		//	platingSmall.setTypeName(DictCache.getValue(DictEnum.YES_NO, PlatingSmall.getType()));
-		//});
-		return platingSmallList;
-	}
-
-	@Override
-    public void setVOValue(PlatingSmallVO vo) {
 
+    @Override
+    public List<PlatingSmallExcel> exportPlatingSmall(Wrapper<PlatingSmall> queryWrapper) {
+        List<PlatingSmallExcel> platingSmallList = baseMapper.exportPlatingSmall(queryWrapper);
+        //platingSmallList.forEach(platingSmall -> {
+        //	platingSmall.setTypeName(DictCache.getValue(DictEnum.YES_NO, PlatingSmall.getType()));
+        //});
+        return platingSmallList;
+    }
+
+    @Override
+    public void setVOValue(PlatingSmallVO vo) {
+        if (IdUtil.isValid(vo.getId())) {
+            WorkCenter wc = workCenterService.getById(vo.getId());
+            if (wc != null) {
+                vo.setWcName(wc.getWcName());
+            }
+        }
     }
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/LiquidTankReportConfigServiceImpl.java

@@ -33,35 +33,38 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 @Slf4j
 public class LiquidTankReportConfigServiceImpl extends BaseServiceImpl<LiquidTankReportConfigMapper, LiquidTankReportConfig>
-		implements ILiquidTankReportConfigService {
+        implements ILiquidTankReportConfigService {
 
-	@Override
+    @Override
-	public IPage<LiquidTankReportConfigVO> selectLiquidTankReportConfigPage(IPage<LiquidTankReportConfigVO> page,
+    public IPage<LiquidTankReportConfigVO> selectLiquidTankReportConfigPage(IPage<LiquidTankReportConfigVO> page,
-																			LiquidTankReportConfigVO liquidTankReportConfig) {
+                                                                            LiquidTankReportConfigVO liquidTankReportConfig) {
-		return page.setRecords(baseMapper.selectLiquidTankReportConfigPage(page, liquidTankReportConfig));
+        return page.setRecords(baseMapper.selectLiquidTankReportConfigPage(page, liquidTankReportConfig));
-	}
+    }
 
-	@Override
+    @Override
-	public List<LiquidTankReportConfigExcel> exportLiquidTankReportConfig(Wrapper<LiquidTankReportConfig> queryWrapper) {
+    public List<LiquidTankReportConfigExcel> exportLiquidTankReportConfig(Wrapper<LiquidTankReportConfig> queryWrapper) {
-		List<LiquidTankReportConfigExcel> liquidTankReportConfigList = baseMapper.exportLiquidTankReportConfig(queryWrapper);
+        List<LiquidTankReportConfigExcel> liquidTankReportConfigList = baseMapper.exportLiquidTankReportConfig(queryWrapper);
-		//liquidTankReportConfigList.forEach(liquidTankReportConfig -> {
+        //liquidTankReportConfigList.forEach(liquidTankReportConfig -> {
-		//	liquidTankReportConfig.setTypeName(DictCache.getValue(DictEnum.YES_NO, LiquidTankReportConfig.getType()));
+        //	liquidTankReportConfig.setTypeName(DictCache.getValue(DictEnum.YES_NO, LiquidTankReportConfig.getType()));
-		//});
+        //});
-		return liquidTankReportConfigList;
+        return liquidTankReportConfigList;
-	}
+    }
 
-	@Override
+    @Override
-	public void setVOValue(LiquidTankReportConfigVO vo) {
+    public void setVOValue(LiquidTankReportConfigVO vo) {
 
-	}
+    }
 
-	@Override
+    @Override
-	public LiquidTankReportConfigVO getByWcId(Long wcId) {
+    public LiquidTankReportConfigVO getByWcId(Long wcId) {
-		LiquidTankReportConfig one = getOne(
+        QueryWrapper<LiquidTankReportConfig> qw = new QueryWrapper<>();
-				new QueryWrapper<LiquidTankReportConfig>().eq(LiquidTankReportConfig.COL_WC_ID,wcId)
+        qw.eq(LiquidTankReportConfig.COL_WC_ID, wcId);
-		);
+        LiquidTankReportConfig one = getOne(qw);
-		LiquidTankReportConfigVO vo = new LiquidTankReportConfigVO();
+        if (one == null) {
-		BeanUtil.copyProperties(one,vo,true);
+            return null;
-		return vo;
+        }
-	}
+        LiquidTankReportConfigVO vo = new LiquidTankReportConfigVO();
+        BeanUtil.copyProperties(one, vo, true);
+        return vo;
+    }
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/LiquidTankTaskServiceImpl.java

@@ -31,9 +31,11 @@ import org.springblade.desk.quality.pojo.entity.LiquidTank;
 import org.springblade.desk.quality.pojo.entity.LiquidTankTask;
 import org.springblade.desk.quality.pojo.entity.LiquidTankTaskCopy;
 import org.springblade.desk.quality.pojo.entity.LiquidTankTaskHi;
+import org.springblade.desk.quality.pojo.request.JobExt;
 import org.springblade.desk.quality.pojo.vo.LiquidTankTaskVO;
 import org.springblade.desk.quality.service.*;
 import org.springblade.desk.basic.util.IdUtil;
+import org.springblade.desk.quality.util.JobExtUtil;
 import org.springblade.system.feign.IDictClient;
 import org.springblade.system.feign.IUserClient;
 import org.springframework.stereotype.Service;
@@ -391,6 +393,13 @@ public class LiquidTankTaskServiceImpl extends BaseServiceImpl<LiquidTankTaskMap
         //
         // from type
         task.setFromType(fromType);
+        { // 化验频率
+            if (lt.getJobType() != null && lt.getJobType() != 0) {
+                JobExt je = new JobExt();
+                BeanUtil.copyProperties(lt, je);
+                task.setJobExtShowText(JobExtUtil.getShowText(je));
+            }
+        }
         // todo:判断条件
         boolean toAccept = true;
         // 状态