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

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

@@ -81,6 +81,8 @@ public class PlatingSmallController extends BladeController {
     public R<IPage<PlatingSmallVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> platingSmall,
                                          Query query) {
         QueryWrapper<PlatingSmall> qw = Condition.getQueryWrapper(platingSmall, PlatingSmall.class);
+        // 名称
+        qw.like(PlatingSmall.COL_BPS_NAME, Func.toStr(platingSmall.get("bpsName")));
         IPage<PlatingSmall> pages = service.page(Condition.getPage(query), qw);
         IPage<PlatingSmallVO> pagesVO = PlatingSmallWrapper.build().pageVO(pages);
         pagesVO.getRecords()

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,6 +44,9 @@ public class PlatingSmallServiceImpl extends BaseServiceImpl<PlatingSmallMapper,
     @Resource
     private IDictClient dictClient;
 
+    @Resource
+    private IWorkCenterService workCenterService;
+
     @Override
     public IPage<PlatingSmallVO> selectPlatingSmallPage(IPage<PlatingSmallVO> page, PlatingSmallVO platingSmall) {
         return page.setRecords(baseMapper.selectPlatingSmallPage(page, platingSmall));
@@ -56,6 +63,11 @@ public class PlatingSmallServiceImpl extends BaseServiceImpl<PlatingSmallMapper,
 
     @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

@@ -57,11 +57,14 @@ public class LiquidTankReportConfigServiceImpl extends BaseServiceImpl<LiquidTan
 
     @Override
     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);
+        if (one == null) {
+            return null;
+        }
         LiquidTankReportConfigVO vo = new LiquidTankReportConfigVO();
-		BeanUtil.copyProperties(one,vo,true);
+        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;
         // 状态