质量PDA获取工序病疵逻辑修改

ruoyi-api/hwmom-api-pda/src/main/java/org/dromara/pda/api/RemotePdaMesApiService.java

@@ -15,6 +15,4 @@ public interface RemotePdaMesApiService {
      * @throws UserException
      */
     BaseMaterial remoteQueryByMaterialCode(String materialCode , String tenantId) throws UserException;
-
-
 }

ruoyi-api/hwmom-api-pda/src/main/java/org/dromara/pda/api/RemotePdaQmsApiService.java

@@ -10,10 +10,10 @@ import java.util.List;
 public interface RemotePdaQmsApiService {
     /**
      *
-     * @param defectType 缺陷类型
+     * @param operationCode  工序
      * @param tenantId   租户编号
      * @return
      * @throws UserException
      */
-    List<RemoteDefectVo> remoteQueryDefectList(String defectType , String tenantId) throws UserException;
+    List<RemoteDefectVo> remoteQueryDefectList(String operationCode , String tenantId) throws UserException;
 }

ruoyi-common/ruoyi-common-core/src/main/resources/i18n/messages.properties

@@ -61,4 +61,6 @@ tenant.blocked=对不起，您的租户已禁用，请联系管理员
 tenant.expired=对不起，您的租户已过期，请联系管理员
 ##PDA
 materialCode.not.exit=对不起，物料编码不存在
-defect.type.not.blank=缺陷类型不能为空
+defect.operation.not.blank=工序编码不能为空
+##上位机接口数据校验
+

ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/controller/PdaApiController.java

@@ -1,18 +1,22 @@
 package org.dromara.api.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import jakarta.validation.constraints.NotBlank;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.api.domain.QcTaskInfo;
 import org.dromara.api.service.IPdaApiService;
 import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.web.core.BaseController;
 import org.dromara.pda.api.model.BaseMaterial;
 import org.dromara.pda.api.model.vo.RemoteDefectVo;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -27,7 +31,7 @@ import java.util.List;
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/pdaApi")
-public class PdaApiController {
+public class PdaApiController extends BaseController {
 
     @Autowired
     private final IPdaApiService iPdaApiService;
@@ -51,8 +55,8 @@ public class PdaApiController {
 
 
     @GetMapping("/getDefectDetail")
-    public R< List<RemoteDefectVo>> getDefectDetail(@NotBlank(message = "{defect.type.not.blank}") String defectType) {
+    public R< List<RemoteDefectVo>> getDefectDetail(@NotBlank(message = "{defect.operation.not.blank}") String operationCode) {
-        List<RemoteDefectVo> defectDetail = iPdaApiService.getDefectDetail(defectType);
+        List<RemoteDefectVo> defectDetail = iPdaApiService.getDefectDetail(operationCode);
         if (defectDetail == null) {
             return R.fail();
         }

ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/service/IPdaApiService.java

@@ -16,7 +16,7 @@ public interface IPdaApiService {
 
     BaseMaterial getMaterialInfo(String materialCode);
 
-    List<RemoteDefectVo> getDefectDetail(String defectType);
+    List<RemoteDefectVo> getDefectDetail(String operationCode);
 
     QcTaskInfo getCheckMaterialInfo(String code);
 }

ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/service/impl/IPdaApiServiceImpl.java

@@ -27,8 +27,8 @@ public class IPdaApiServiceImpl implements IPdaApiService {
     }
 
     @Override
-    public List<RemoteDefectVo> getDefectDetail(String defectType) {
+    public List<RemoteDefectVo> getDefectDetail(String operationCode) {
-        return remotePdaQmsApiService.remoteQueryDefectList(defectType,"000000");
+        return remotePdaQmsApiService.remoteQueryDefectList(operationCode,"000000");
     }
 
     private final PdaApiMapper pdaApiMapper;

ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcDefectDetail.java

@@ -50,7 +50,7 @@ public class QcDefectDetail extends BaseEntity {
     /**
      * 工序
      */
-    private String operation;
+    private String operationCode;
 
     /**
      * 层级
@@ -70,12 +70,12 @@ public class QcDefectDetail extends BaseEntity {
     /**
      * 预留字段
      */
-    private String attr1;
+    private String workShop;
 
     /**
      * 预留字段
      */
-    private String attr2;
+    private String factoryName;
 
     /**
      * 预留字段

ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcDefectDetailBo.java

@@ -55,7 +55,7 @@ public class QcDefectDetailBo extends BaseEntity {
     /**
      * 工序
      */
-    private String operation;
+    private String operationCode;
 
     /**
      * 层级
@@ -77,13 +77,13 @@ public class QcDefectDetailBo extends BaseEntity {
      * 预留字段
      */
 
-    private String attr1;
+    private String workShop;
 
     /**
      * 预留字段
      */
 
-    private String attr2;
+    private String factoryName;
 
     /**
      * 预留字段

ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/dubbo/RemoteQmsApiServiceImpl.java

@@ -33,13 +33,12 @@ public class RemoteQmsApiServiceImpl implements RemotePdaQmsApiService {
      * @throws UserException
      */
     @Override
-    public List<RemoteDefectVo> remoteQueryDefectList(String defectType, String tenantId) throws UserException {
+    public List<RemoteDefectVo> remoteQueryDefectList(String operationCode, String tenantId) throws UserException {
         return TenantHelper.dynamic(tenantId, () -> {
             QcDefectDetailBo bo = new QcDefectDetailBo();
-            bo.setDefectType(defectType);
+            bo.setOperationCode(operationCode);
             bo.setTenantId("000000");
             List<QcDefectDetailVo> DefectDetailVos = iQcDefectDetailService.queryList(bo);
-
             List<RemoteDefectVo> remoteDefectVoList = new ArrayList<>();
             for (QcDefectDetailVo qcDefectDetailVo : DefectDetailVos) {
                 RemoteDefectVo rem = new RemoteDefectVo();

ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/mapper/QcDefectDetailMapper.java

@@ -1,10 +1,13 @@
 package org.dromara.qms.mapper;
 
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.qms.domain.QcDefectDetail;
 import org.dromara.qms.domain.vo.QcDefectDetailVo;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * 病疵详细Mapper接口
  *

ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcDefectDetailServiceImpl.java

@@ -78,12 +78,12 @@ public class QcDefectDetailServiceImpl implements IQcDefectDetailService {
         .eq(StringUtils.isNotBlank(bo.getDefectDesc()), QcDefectDetail::getDefectDesc, bo.getDefectDesc())
         .eq(StringUtils.isNotBlank(bo.getDefectType()), QcDefectDetail::getDefectType, bo.getDefectType())
         .eq(StringUtils.isNotBlank(bo.getSort()), QcDefectDetail::getSort, bo.getSort())
-        .eq(StringUtils.isNotBlank(bo.getOperation()), QcDefectDetail::getOperation, bo.getOperation())
+        .eq(StringUtils.isNotBlank(bo.getOperationCode()), QcDefectDetail::getOperationCode, bo.getOperationCode())
         .eq(StringUtils.isNotBlank(bo.getDefectLevel()), QcDefectDetail::getDefectLevel, bo.getDefectLevel())
         .eq(StringUtils.isNotBlank(bo.getStatus()), QcDefectDetail::getStatus, bo.getStatus())
         .eq(StringUtils.isNotBlank(bo.getIsFlag()), QcDefectDetail::getIsFlag, bo.getIsFlag())
-        .eq(StringUtils.isNotBlank(bo.getAttr1()), QcDefectDetail::getAttr1, bo.getAttr1())
+        .eq(StringUtils.isNotBlank(bo.getWorkShop()), QcDefectDetail::getWorkShop, bo.getWorkShop())
-        .eq(StringUtils.isNotBlank(bo.getAttr2()), QcDefectDetail::getAttr2, bo.getAttr2())
+        .eq(StringUtils.isNotBlank(bo.getFactoryName()), QcDefectDetail::getFactoryName, bo.getFactoryName())
         .eq(StringUtils.isNotBlank(bo.getAttr3()), QcDefectDetail::getAttr3, bo.getAttr3())
         .eq(StringUtils.isNotBlank(bo.getAttr4()), QcDefectDetail::getAttr4, bo.getAttr4())
         .orderByDesc(QcDefectDetail::getCreateTime);
@@ -140,4 +140,5 @@ public class QcDefectDetailServiceImpl implements IQcDefectDetailService {
         }
         return baseMapper.deleteByIds(ids) > 0;
     }
+
 }