槽液管理导入和生产质量检验模块数据接口

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java

@@ -160,7 +160,8 @@ public class YieldOrder extends BaseEntity {
 	 * todo 只有字段没有动 表 和 mapper
 	 * 零件号版本号
 	 */
-	@TableField(value = "PART_VERSION", exist = false)
+//	@TableField(value = "PART_VERSION", exist = false)
+	@TableField(value = "PART_VERSION")
 	private String partVersion;
 
 	/**
@@ -457,4 +458,5 @@ public class YieldOrder extends BaseEntity {
 	 */
 	@TableField(value = "ACTUAL_WEIGHING")
 	private BigDecimal actualWeighing;
+
 }

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

@@ -377,7 +377,8 @@ public class LiquidTank extends BaseEntity {
 	 * 上次化验日期
 	 */
 	@Schema(description = "上次化验日期")
-	private LocalDateTime lastTest;
+//	private LocalDateTime lastTest;
+	private LocalDate lastTest;
 	/**
 	 * 实测温度
 	 */

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java

@@ -107,4 +107,8 @@ public class InspectionTaskListVO extends InspectionTask {
     // todo:
     @Schema(description = "材料")
     private String material = "铜";
+//零件号版本号
+    private String partVersion;
+//工单id
+    private Long yoId;
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/MeasurementRecordsController.java

@@ -1,5 +1,6 @@
 package org.springblade.desk.device.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -65,6 +66,17 @@ public class MeasurementRecordsController extends BladeController {
         return R.data(pages);
     }
 
+    //查询合格的量具
+    @GetMapping("/listResult")
+    public R<List<MeasurementRecordsVO>> listResult() {
+
+        LambdaQueryWrapper<MeasurementRecordsEntity> query = Wrappers.<MeasurementRecordsEntity>lambdaQuery()
+                .eq(MeasurementRecordsEntity::getCheckResult, 1);
+        List<MeasurementRecordsEntity> list = mesMeasurementRecordsService.list(query);
+        List<MeasurementRecordsVO> vos = MeasurementRecordsWrapper.build().listVO(list);
+        return R.data(vos);
+    }
+
     /**
      * 量具计量记录 新增
      */

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java

@@ -3,6 +3,7 @@
  */
 package org.springblade.desk.quality.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -27,6 +28,14 @@ import org.springblade.core.tool.utils.Func;
 import org.springblade.desk.basic.config.RoleConfig;
 import org.springblade.desk.basic.pojo.vo.UrlVO;
 import org.springblade.desk.basic.util.RoleUtil;
+import org.springblade.desk.dashboard.pojo.entity.DsPartEntity;
+import org.springblade.desk.dashboard.pojo.entity.DsPartRelationEntity;
+import org.springblade.desk.dashboard.pojo.entity.DsPartVersionEntity;
+import org.springblade.desk.dashboard.service.IDsPartRelationService;
+import org.springblade.desk.dashboard.service.IDsPartService;
+import org.springblade.desk.dashboard.service.IDsPartVersionService;
+import org.springblade.desk.order.pojo.entity.YieldOrder;
+import org.springblade.desk.order.service.IYieldOrderService;
 import org.springblade.desk.produce.pojo.entity.WorkPlan;
 import org.springblade.desk.produce.pojo.vo.ProduceMonitorSlotListVO;
 import org.springblade.desk.produce.service.IMacToolUseService;
@@ -87,7 +96,7 @@ public class InspectionTaskController extends BladeController {
     public R<InspectionTaskDetailVO> detail(InspectionTask inspectionTask) {
         InspectionTask detail = service.getOne(Condition.getQueryWrapper(inspectionTask));
         InspectionTaskDetailVO detailDetailVO = InspectionTaskDetailWrapper.build().entityVO(detail);
-        ;
+        BladeUser user = AuthUtil.getUser();
 //        InspectionTaskListVO detailDetail = service.detailById(inspectionTask);
         service.setDetailVOValue(detailDetailVO);
         return R.data(detailDetailVO);
@@ -272,6 +281,23 @@ public class InspectionTaskController extends BladeController {
     }
 
 
+    //质量记录跳转
+    @PostMapping(value = "/reviewQualityRecords")
+    public R reviewQualityRecords(@RequestBody JSONObject data) {
+        String deliverKey = data.getString("deliverKey");
+        String url = "http://192.168.242.158:80/mms/login/login_vendorJpageZljl.jsp?LOGIN158=admin&deliverNo=" + deliverKey;
+        return R.data(url);
+    }
+
+    //合格证跳转
+    @PostMapping(value = "/reviewQualification")
+    public R reviewQualification(@RequestBody JSONObject data) {
+        String deliverKey = data.getString("deliverKey");
+        String url = "http://192.168.242.158:80/mms/login/login_vendorJpage.jsp?LOGIN158=admin&deliverNo=" + deliverKey;
+        return R.data(url);
+    }
+
+
     /**
      * [检验任务] 同槽 检验结果应用
      */
@@ -290,14 +316,56 @@ public class InspectionTaskController extends BladeController {
     @GetMapping("/subPartList")
     @ApiOperationSupport(order = 101)
     @Operation(summary = "烧结包装防护-子件列表", description = "传入inspectionTask id")
-    public R subPartList(@Parameter(hidden = true) @RequestParam Long id) {
+    public R subPartList(Long yoId) {
+
+        List<DsPartEntity> list = new ArrayList<>();
+
+        YieldOrder yo = yieldOrderService.getById(yoId);
+        QueryWrapper<DsPartVersionEntity> versionqw = new QueryWrapper<>();
+        versionqw.eq("part_code", yo.getPartCode());
+        versionqw.eq("part_version", yo.getPartVersion());
+        DsPartVersionEntity version = dsPartVersionService.getOne(versionqw);
+        Long partId = version.getPartId();
+
+
+//        QueryWrapper<DsPartRelationEntity> relqw = new QueryWrapper<>();
+//        relqw.eq("CHILD_PART_ID", partId);
+//        List<DsPartRelationEntity> rels = dsPartRelationService.list(relqw);
+//        if(null != rels && rels.size()>0){
+//            DsPartRelationEntity rel = rels.get(0);
+//            DsPartEntity part = dsPartService.getById(rel.getChildPartId());
+//            list.add(part);
+//        }
+
+
+        QueryWrapper<DsPartRelationEntity> relmasterqw = new QueryWrapper<>();
+        relmasterqw.eq("PART_ID", partId);
+        List<DsPartRelationEntity> relmasters = dsPartRelationService.list(relmasterqw);
+        if(null != relmasters && relmasters.size()>0){
+            for(DsPartRelationEntity rel : relmasters){
+                DsPartEntity part = dsPartService.getById(rel.getChildPartId());
+                list.add(part);
+            }
+        }
+
+
         // todo: 车间订单关联查询
-        List<InspectionTaskSubPartVO> list = new ArrayList<>();
-        list.add(new InspectionTaskSubPartVO());
-        list.add(new InspectionTaskSubPartVO());
+//        List<InspectionTaskSubPartVO> list = new ArrayList<>();
+//        list.add(new InspectionTaskSubPartVO());
+//        list.add(new InspectionTaskSubPartVO());
         return R.data(list);
     }
 
+    @Resource
+    IDsPartRelationService dsPartRelationService;
+    @Resource
+    IDsPartVersionService dsPartVersionService;
+    @Resource
+    IDsPartService dsPartService;
+    @Resource
+    private IYieldOrderService yieldOrderService;
+
+
     @GetMapping("/toQaRecord")
     @ApiOperationSupport(order = 101)
     @Operation(summary = "跳转-质量记录", description = "传入inspectionTask id")

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotHardnessController.java

@@ -3,6 +3,7 @@
  */
 package org.springblade.desk.quality.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -26,6 +27,8 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.desk.basic.util.ExcelExtUtil;
+import org.springblade.desk.device.pojo.entity.EquipmentEntity;
+import org.springblade.desk.device.service.IEquipmentService;
 import org.springblade.desk.quality.constant.QAModuleConst;
 import org.springblade.desk.quality.excel.IotHardnessExcel;
 import org.springblade.desk.quality.pojo.entity.IotHardness;
@@ -33,10 +36,14 @@ import org.springblade.desk.quality.pojo.vo.IotHardnessVO;
 import org.springblade.desk.quality.service.IIotHardnessService;
 import org.springblade.desk.quality.wrapper.IotHardnessWrapper;
 import org.springblade.system.feign.IUserClient;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.net.InetAddress;
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -62,6 +69,9 @@ public class IotHardnessController extends BladeController {
     @Resource
     private IUserClient iUserClient;
 
+    @Autowired
+    private IEquipmentService  equipmentService;
+
     /**
      * [IOT硬度] 详情
      */
@@ -94,6 +104,129 @@ public class IotHardnessController extends BladeController {
         return R.data(pagesVO);
     }
 
+    @GetMapping(value = "/queryHardnessData")
+    public R queryHardnessData() throws Exception {
+        InetAddress inetAddress = InetAddress.getLocalHost();
+        String ip = inetAddress.getHostAddress();
+//        ip = "127.0.0.1";
+
+        QueryWrapper<EquipmentEntity> qw = new QueryWrapper<>();
+        qw.eq("DEVICE_IP",ip);
+        EquipmentEntity card = equipmentService.getOne(qw);
+        //根据ip查询设备
+        if (card == null) {
+            return R.fail(-2, "ip未找到对应的测量仪设备！" + ip);
+        }
+        String deviceCode = card.getDeviceCode();
+        log.info("找到设备，设备编码: {}", deviceCode);
+
+        // 首次查询：无时间标记，设置初始标记为当前时间
+//        if (timeMarker == null) {
+//            timeMarker = new Date();
+//            log.info("首次查询，初始时间标记: {}", timeMarker);
+//        }
+
+        // 调用服务层方法查询未读数据
+        // 修改服务层方法，使其根据设备编码和未读状态查询
+
+        QueryWrapper<IotHardness> qwhard = new QueryWrapper<>();
+        qwhard.eq("EQUIPMENT_ID",card.getId());
+//        qwhard.eq("FLAG_READ",0);
+        qwhard.orderByDesc("CREATE_TIME");
+        List<IotHardness> qcHardnessIotList = service.list(qwhard);
+
+        // 记录查询到的数据数量
+        if (qcHardnessIotList != null) {
+            log.info("查询到 {} 条硬度数据", qcHardnessIotList.size());
+        } else {
+            log.info("未查询到硬度数据");
+        }
+
+        boolean hasNewData = qcHardnessIotList != null && !qcHardnessIotList.isEmpty();
+        List<String> list = new ArrayList<>();
+        List<JSONObject> resultList = new ArrayList<>();
+
+        if (hasNewData) {
+            log.info("设备[{}]查询到 {} 条新数据", deviceCode, qcHardnessIotList.size());
+            for (IotHardness iot : qcHardnessIotList) {
+                if(null != iot.getData()){
+                    resultList.add(JSONObject.parseObject(iot.getData()));
+                }
+
+                iot.setFlagRead(1L);
+                service.updateById(iot);
+            }
+            // 查到数据后，重置标记（返回null，前端下次请求不带标记）
+//            timeMarker = null;
+        } else {
+            log.info("设备[{}]未查询到新数据", deviceCode);
+        }
+        return R.data(resultList);
+    }
+
+
+    private R getHardnessData(JSONObject data, HttpServletRequest request) throws Exception {
+//        LoginInfo loginUser = ControllerUtils.getCurLoginInfo(request);
+//        String ip = loginUser.getLoginIp();
+
+        InetAddress inetAddress = InetAddress.getLocalHost();
+        String ip = inetAddress.getHostAddress();
+//        ip = "127.0.0.1";
+
+        QueryWrapper<EquipmentEntity> qw = new QueryWrapper<>();
+        qw.eq("DEVICE_IP",ip);
+        EquipmentEntity card = equipmentService.getOne(qw);
+        //根据ip查询设备
+        if (card == null) {
+            return R.fail(-2, "ip未找到对应的测量仪设备！" + ip);
+        }
+        String deviceCode = card.getDeviceCode();
+        log.info("找到设备，设备编码: {}", deviceCode);
+
+        // 首次查询：无时间标记，设置初始标记为当前时间
+//        if (timeMarker == null) {
+//            timeMarker = new Date();
+//            log.info("首次查询，初始时间标记: {}", timeMarker);
+//        }
+
+        // 调用服务层方法查询未读数据
+        // 修改服务层方法，使其根据设备编码和未读状态查询
+
+        QueryWrapper<IotHardness> qwhard = new QueryWrapper<>();
+        qwhard.eq("EQUIPMENT_ID",card.getId());
+//        qwhard.eq("FLAG_READ",0);
+        qwhard.orderByDesc("CREATE_TIME");
+        List<IotHardness> qcHardnessIotList = service.list(qwhard);
+
+        // 记录查询到的数据数量
+        if (qcHardnessIotList != null) {
+            log.info("查询到 {} 条硬度数据", qcHardnessIotList.size());
+        } else {
+            log.info("未查询到硬度数据");
+        }
+
+        boolean hasNewData = qcHardnessIotList != null && !qcHardnessIotList.isEmpty();
+        List<String> list = new ArrayList<>();
+        List<JSONObject> resultList = new ArrayList<>();
+
+        if (hasNewData) {
+            log.info("设备[{}]查询到 {} 条新数据", deviceCode, qcHardnessIotList.size());
+            for (IotHardness iot : qcHardnessIotList) {
+                if(null != iot.getData()){
+                    resultList.add(JSONObject.parseObject(iot.getData()));
+                }
+
+                iot.setFlagRead(1L);
+                service.updateById(iot);
+            }
+            // 查到数据后，重置标记（返回null，前端下次请求不带标记）
+//            timeMarker = null;
+        } else {
+            log.info("设备[{}]未查询到新数据", deviceCode);
+        }
+        return R.data(resultList);
+    }
+
 
     @GetMapping("/getDataFirst")
     @ApiOperationSupport(order = 20)

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/LiquidTankExcel.java

@@ -13,6 +13,7 @@ import lombok.Data;
 import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 
@@ -228,7 +229,7 @@ public class LiquidTankExcel implements Serializable {
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("有效期")
-	private LocalDateTime validDate;
+	private LocalDate validDate;
 
 
 	/**
@@ -344,7 +345,7 @@ public class LiquidTankExcel implements Serializable {
 	@ColumnWidth(20)
 //	@ExcelProperty("生成周期类型:生成周期类型:[1]:每周;[2]:每月;[3]:每年;[4]:自定义CRON")
 	@ExcelProperty("生成周期类型:[1]:每周;[2]:每月;[3]:每年;")
-	private Long jobType;
+	private Integer jobType;
 //	private String jobTypeName;
 	/**
 	 * 定时WEEK值

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml

@@ -84,8 +84,10 @@
         ps.NAME as currentProcessName,ps01.NAME as nextProcessName,wo.MAKE_QTY as poQty,
         yo.YP_AREA * wo.MAKE_QTY as areaTotal,yo.YP_AREA as area,yo.PRODUCT_IDENT as prodIdent,
         t.*,wo.WO_CODE as woCode,
-        wo.PART_CODE AS partCode,
-        wo.PART_CODE AS prodCode,
+        yo.PART_CODE AS partCode,
+        yo.PART_VERSION AS partVersion,
+        yo.ID AS yoId,
+        yo.PART_CODE AS prodCode,
         wo.TEST_QTY as orderCheckQty,
         wo.LOSS_QTY as orderLossQty,
         wo.SCRAP_QTY as orderScrapQty,

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml

@@ -67,18 +67,25 @@
     <select id="listInit"
             resultType="org.springblade.desk.quality.pojo.vo.ReviewSheetInitVO">
         SELECT rs.*,
-        yo.PRODUCT_TYPE as prodTypeName,yo.PART_NAME as prodName,yo.PLATE as platingInfo,
+        par.PRODUCT_TYPE as prodTypeName,yo.PART_NAME as prodName,yo.PLATE as platingInfo,
         yo.USE_DEPT as needDeptName,yo.PRODUCT_IDENT as prodIdent,wo.MAKE_QTY as poQty,
-        wo.WO_CODE AS woCode,wo.CARD_NO AS cardNo
+        wo.WO_CODE AS woCode,wo.CARD_NO AS cardNo,yo.PART_CODE AS prodCode,wo.batch_no as batchNo,yo.YO_CODE as docCode
         FROM QA_REVIEW_SHEET rs
         -- 车间作业计划 wp
         LEFT JOIN MES_WORK_PLAN wp ON rs.WP_ID = wp.ID
         -- 车间订单 wo
-        LEFT JOIN MES_WORK_ORDER wo ON rs.WO_ID = wo.ID
+--         LEFT JOIN MES_WORK_ORDER wo ON rs.WO_ID = wo.ID
+        -- 生产订单 yo
+--         LEFT JOIN MES_YIELD_ORDER yo ON wo.YO_ID = yo.ID
+
+        -- 车间订单 wo
+        LEFT JOIN MES_WORK_ORDER wo ON wp.WO_ID = wo.ID
         -- 生产订单 yo
         LEFT JOIN MES_YIELD_ORDER yo ON wo.YO_ID = yo.ID
+
         -- 外协厂商 oem
         LEFT JOIN BS_OEM oem ON wp.OC_ID = oem.ID
+        left join DS_PART par on par.PART_CODE = yo.PART_CODE
         WHERE (
         rs.IS_DELETED = 0
         -- AND wp.IS_DELETED = 0

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

@@ -30,4 +30,6 @@ public interface IWorkPlanItemThicknessService extends BaseService<WorkPlanThick
      */
     void setVOValue(WorkPlanItemThicknessVO vo);
 
+    List<WorkPlanItemThicknessVO> listThicknessByWorkPlanItemId(Long workPlanItemId);
+
 }

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

@@ -425,6 +425,14 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
                 checkResult = InspectionTaskConst.CHECK_RESULT_NG;
             }
         }
+
+//        if (countOK == itemList.size()) { // 全部item 合格
+//            checkResult = InspectionTaskConst.CHECK_RESULT_OK;
+//        } else if (countNA == itemList.size()) { // 全部item NA
+//            checkResult = InspectionTaskConst.CHECK_RESULT_NA;
+//        } else if (countNO >= 0 && countNO <= itemList.size()) { // 不合格
+//            checkResult = InspectionTaskConst.CHECK_RESULT_NG;
+//        }
         // 最新状态
         task.setCheckResult(checkResult);
         task.setStatus(checkResult);

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

@@ -69,7 +69,7 @@ public class LiquidTankServiceImpl extends BaseServiceImpl<LiquidTankMapper, Liq
 
         for(LiquidTankExcel excel:list) {
 
-            Long jobType = excel.getJobType();
+            Integer jobType = excel.getJobType();
             String jobTypeWeekValue = excel.getJobTypeWeekValue();
             String jobTypeMonthValue = excel.getJobTypeMonthValue();
             String jobTypeYearValue = excel.getJobTypeYearValue();
@@ -196,15 +196,21 @@ public class LiquidTankServiceImpl extends BaseServiceImpl<LiquidTankMapper, Liq
                 notice.setAfterTheoryFormulaId(afters.get(0).getId());
             }
             //化验人
-            List<User> tests = userClient.listByNameNolike(noticeExcel.getTestUserName());
-            if(null != tests && tests.size() > 0){
-                notice.setTestUserId(tests.get(0).getId());
+            if(noticeExcel.getTestUserName() != null && !noticeExcel.getTestUserName().trim().isEmpty()){
+                List<User> tests = userClient.listByNameNolike(noticeExcel.getTestUserName());
+                if(null != tests && tests.size() > 0){
+                    notice.setTestUserId(tests.get(0).getId());
+                }
             }
+
             //工艺主管
-            List<User> process = userClient.listByNameNolike(noticeExcel.getProcessUserName());
-            if(null != process && process.size() > 0){
-                notice.setProcessUserId(process.get(0).getId());
+            if(noticeExcel.getProcessUserName() != null && !noticeExcel.getProcessUserName().trim().isEmpty()){
+                List<User> process = userClient.listByNameNolike(noticeExcel.getProcessUserName());
+                if(null != process && process.size() > 0){
+                    notice.setProcessUserId(process.get(0).getId());
+                }
             }
+
             //班组
             QueryWrapper<TeamSet> queryWrapperteam = new QueryWrapper<>();
             queryWrapperteam.eq("TS_NAME",noticeExcel.getTeamName());
@@ -242,7 +248,7 @@ public class LiquidTankServiceImpl extends BaseServiceImpl<LiquidTankMapper, Liq
         if (testUI != null) {
 //            vo.setTestUserRealName(testUI.getUser().getRealName());
             if(null != testUI.getUser()){
-                vo.setProcessUserRealName(testUI.getUser().getRealName());
+                vo.setTestUserRealName(testUI.getUser().getRealName());
             }
         }
         UserInfo processUI = userClient.userInfo(vo.getProcessUserId()).getData();

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

@@ -45,6 +45,7 @@ import org.springblade.system.feign.IUserClient;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
@@ -259,6 +260,11 @@ public class LiquidTankTaskServiceImpl extends BaseServiceImpl<LiquidTankTaskMap
 //            task = basicChangeStatus(task.getId(), LiquidTankTaskConst.S_FINISH_OK);
             task = basicChangeTaskStatus(task, LiquidTankTaskConst.S_FINISH_OK);
 
+            Long tankId = task.getLiquidTankId();
+            LiquidTank tank = liquidTankService.getById(tankId);
+            tank.setLastTest(LocalDate.now());
+            liquidTankService.updateById(tank);
+
             // 复检化验时间 用户填写
             // 复检填报时间
             task.setRepeatFillDate(LocalDateTime.now());

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

@@ -29,10 +29,7 @@ import org.springblade.desk.quality.pojo.entity.WorkPlanItemDetail;
 import org.springblade.desk.quality.pojo.vo.InspectionItemVO;
 import org.springblade.desk.quality.pojo.vo.StandardVO;
 import org.springblade.desk.quality.pojo.vo.WorkPlanItemVO;
-import org.springblade.desk.quality.service.IInspectionItemService;
-import org.springblade.desk.quality.service.IStandardService;
-import org.springblade.desk.quality.service.IWorkPlanItemDetailService;
-import org.springblade.desk.quality.service.IWorkPlanItemService;
+import org.springblade.desk.quality.service.*;
 import org.springblade.desk.quality.wrapper.InspectionItemWrapper;
 import org.springblade.desk.quality.wrapper.StandardWrapper;
 import org.springblade.desk.quality.wrapper.WorkPlanItemWrapper;
@@ -110,10 +107,14 @@ public class WorkPlanItemServiceImpl extends BaseServiceImpl<WorkPlanItemMapper,
                     InspectionItemConst.SPECIAL_TYPE_SIZE.equals(vo.getItem().getSpecialType())
             ) {
                 vo.setWpItemDetailList(wpItemDetailService.listVOByWorkPlanItemId(vo.getId()));
+                vo.setThicknessList(wpItemThicknessService.listThicknessByWorkPlanItemId(vo.getId()));
             }
         }
     }
 
+    @Resource
+    private IWorkPlanItemThicknessService wpItemThicknessService;
+
     @Override
     public List<WorkPlanItem> listByWorkPlanId(Long wpId) {
         LambdaQueryWrapper<WorkPlanItem> qw = Wrappers.lambdaQuery();

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

@@ -26,6 +26,7 @@ import org.springblade.desk.quality.pojo.vo.WorkPlanItemThicknessVO;
 import org.springblade.desk.quality.service.IWorkPlanItemDetailService;
 import org.springblade.desk.quality.service.IWorkPlanItemThicknessService;
 import org.springblade.desk.quality.wrapper.WorkPlanItemDetailWrapper;
+import org.springblade.desk.quality.wrapper.WorkPlanItemThicknessWrapper;
 import org.springblade.system.feign.IDictClient;
 import org.springblade.system.feign.IUserClient;
 import org.springframework.stereotype.Service;
@@ -51,4 +52,15 @@ public class WorkPlanItemThicknessServiceImpl extends BaseServiceImpl<WorkPlanIt
     public void setVOValue(WorkPlanItemThicknessVO vo) {
 
     }
+
+    @Override
+    public List<WorkPlanItemThicknessVO> listThicknessByWorkPlanItemId(Long workPlanItemId) {
+
+        LambdaQueryWrapper<WorkPlanThicknessDetail> qw = Wrappers.lambdaQuery();
+        qw.eq(WorkPlanThicknessDetail::getWorkPlanItemId, workPlanItemId);
+        qw.orderByAsc(WorkPlanThicknessDetail::getId);
+        List<WorkPlanThicknessDetail> list = list(qw);
+        List<WorkPlanItemThicknessVO> voList = WorkPlanItemThicknessWrapper.build().listVO(list);
+        return voList;
+    }
 }