xins
/
hwmom
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

质量检验任务接口提交修改

Browse Source
master
Yangwl 4 days ago
parent 155a21727f
commit aeebb4e306
6 changed files with 43 additions and 32 deletions
Show Stats Download Patch File Download Diff File

6
ruoyi-api/hwmom-api-pda/src/main/java/org/dromara/pda/api/RemotePdaQmsApiService.java
Unescape Escape View File

@ -2,9 +2,9 @@ package org.dromara.pda.api;
import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.R;
import org.dromara.common.core.exception.user.UserException; import org.dromara.common.core.exception.user.UserException;
import org.dromara.pda.api.model.QcInspectionTaskBo; import org.dromara.pda.api.model.RemoteQcInspectionTaskBo;
import org.dromara.pda.api.model.vo.RemoteDefectVo; import org.dromara.pda.api.model.vo.RemoteDefectVo;
import org.dromara.pda.api.model.vo.RemoteQcInspectionTaskVo;
import java.util.List; import java.util.List;
@ -20,5 +20,5 @@ public interface RemotePdaQmsApiService {
List<RemoteDefectVo> remoteQueryDefectList(String operationCode) throws UserException; List<RemoteDefectVo> remoteQueryDefectList(String operationCode) throws UserException;
R<Void> remoteSavePdaInspectionTask(QcInspectionTaskBo bo); R<Void> remoteSavePdaInspectionTask(RemoteQcInspectionTaskBo bo);
} }

16
ruoyi-api/hwmom-api-pda/src/main/java/org/dromara/pda/api/model/QcInspectionTaskBo.java → ruoyi-api/hwmom-api-pda/src/main/java/org/dromara/pda/api/model/RemoteQcInspectionTaskBo.java
Unescape Escape View File

@ -1,13 +1,10 @@
package org.dromara.pda.api.model; package org.dromara.pda.api.model;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import java.io.Serial;
import java.io.Serializable;
import java.util.List; import java.util.List;
@ -18,9 +15,11 @@ import java.util.List;
* @date 2025-05-27 * @date 2025-05-27
*/ */
@Data @Data
@NoArgsConstructor
public class RemoteQcInspectionTaskBo implements Serializable {
public class QcInspectionTaskBo { @Serial
private static final long serialVersionUID = 1L;
/** /**
* 主键标识 * 主键标识
*/ */
@ -110,6 +109,7 @@ public class QcInspectionTaskBo {
*/ */
private String attr4; private String attr4;
private List<QcInspectionTaskDefectBo> qcInspectionTaskDefectBoList; private List<QcInspectionTaskDefectBo> qcInspectionTaskDefectBoList;
} }

13
ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/controller/PdaApiController.java
Unescape Escape View File

@ -1,23 +1,18 @@
package org.dromara.api.controller; package org.dromara.api.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.api.domain.QcTaskInfo; import org.dromara.api.domain.QcTaskInfo;
import org.dromara.api.service.IPdaApiService; import org.dromara.api.service.IPdaApiService;
import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.R;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
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.common.web.core.BaseController;
import org.dromara.pda.api.model.BaseMaterial; import org.dromara.pda.api.model.BaseMaterial;
import org.dromara.pda.api.model.QcInspectionTaskBo;
import org.dromara.pda.api.model.RemoteQcInspectionTaskBo;
import org.dromara.pda.api.model.vo.RemoteDefectVo; import org.dromara.pda.api.model.vo.RemoteDefectVo;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.List;
@ -69,7 +64,7 @@ public class PdaApiController extends BaseController {
* PDA提交保存检验任务 * PDA提交保存检验任务
*/ */
@PostMapping("/savePdaInspectionTask") @PostMapping("/savePdaInspectionTask")
public R<Void> savePdaInspectionTask(@Validated(EditGroup.class) @RequestBody QcInspectionTaskBo bo) { public R<Void> savePdaInspectionTask(@RequestBody RemoteQcInspectionTaskBo bo) {
return iPdaApiService.savePdaInspectionTask(bo); return iPdaApiService.savePdaInspectionTask(bo);
} }
} }

4
ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/service/IPdaApiService.java
Unescape Escape View File

@ -3,7 +3,7 @@ package org.dromara.api.service;
import org.dromara.api.domain.QcTaskInfo; import org.dromara.api.domain.QcTaskInfo;
import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.R;
import org.dromara.pda.api.model.BaseMaterial; import org.dromara.pda.api.model.BaseMaterial;
import org.dromara.pda.api.model.QcInspectionTaskBo; import org.dromara.pda.api.model.RemoteQcInspectionTaskBo;
import org.dromara.pda.api.model.vo.RemoteDefectVo; import org.dromara.pda.api.model.vo.RemoteDefectVo;
import java.util.List; import java.util.List;
@ -22,5 +22,5 @@ public interface IPdaApiService {
QcTaskInfo getCheckMaterialInfo(String code); QcTaskInfo getCheckMaterialInfo(String code);
R<Void> savePdaInspectionTask(QcInspectionTaskBo bo); R<Void> savePdaInspectionTask(RemoteQcInspectionTaskBo bo);
} }

7
ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/service/impl/IPdaApiServiceImpl.java
Unescape Escape View File

@ -9,7 +9,7 @@ import org.dromara.common.core.domain.R;
import org.dromara.pda.api.RemotePdaMesApiService; import org.dromara.pda.api.RemotePdaMesApiService;
import org.dromara.pda.api.RemotePdaQmsApiService; import org.dromara.pda.api.RemotePdaQmsApiService;
import org.dromara.pda.api.model.BaseMaterial; import org.dromara.pda.api.model.BaseMaterial;
import org.dromara.pda.api.model.QcInspectionTaskBo; import org.dromara.pda.api.model.RemoteQcInspectionTaskBo;
import org.dromara.pda.api.model.vo.RemoteDefectVo; import org.dromara.pda.api.model.vo.RemoteDefectVo;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -41,7 +41,8 @@ public class IPdaApiServiceImpl implements IPdaApiService {
} }
@Override @Override
public R<Void> savePdaInspectionTask(QcInspectionTaskBo bo) { public R<Void> savePdaInspectionTask(RemoteQcInspectionTaskBo remoteQcInspectionTaskBo) {
return remotePdaQmsApiService.remoteSavePdaInspectionTask(bo); System.out.println(remoteQcInspectionTaskBo);
return remotePdaQmsApiService.remoteSavePdaInspectionTask(remoteQcInspectionTaskBo);
} }
} }

29
ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/dubbo/RemoteQmsApiServiceImpl.java
Unescape Escape View File

@ -8,7 +8,7 @@ import org.dromara.common.core.exception.user.UserException;
import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.tenant.helper.TenantHelper; import org.dromara.common.tenant.helper.TenantHelper;
import org.dromara.pda.api.RemotePdaQmsApiService; import org.dromara.pda.api.RemotePdaQmsApiService;
import org.dromara.pda.api.model.QcInspectionTaskBo; import org.dromara.pda.api.model.RemoteQcInspectionTaskBo;
import org.dromara.pda.api.model.vo.RemoteDefectVo; import org.dromara.pda.api.model.vo.RemoteDefectVo;
import org.dromara.qms.domain.QcInspectionTask; import org.dromara.qms.domain.QcInspectionTask;
import org.dromara.qms.domain.QcInspectionTaskDefect; import org.dromara.qms.domain.QcInspectionTaskDefect;
@ -22,7 +22,6 @@ import org.dromara.qms.service.IQcDefectDetailService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection;
import java.util.List; import java.util.List;
@RequiredArgsConstructor @RequiredArgsConstructor
@ -62,14 +61,13 @@ public class RemoteQmsApiServiceImpl implements RemotePdaQmsApiService {
}); });
} }
@Override @Override
public R<Void> remoteSavePdaInspectionTask(QcInspectionTaskBo bo) { public R<Void> remoteSavePdaInspectionTask(RemoteQcInspectionTaskBo bo) {
QcInspectionTask qcInspectionTask = new QcInspectionTask(); QcInspectionTask qcInspectionTask = BeanUtil.toBean(bo, QcInspectionTask.class);
qcInspectionTask = MapstructUtils.convert(bo, QcInspectionTask.class);
int i = qcInspectionTaskMapper.updateById(qcInspectionTask); int i = qcInspectionTaskMapper.updateById(qcInspectionTask);
if (bo.getResult().equals("N")){ if (bo.getResult().equals("N")){
List<QcInspectionTaskDefect> qcInspectionTaskDefectList=BeanUtil.copyToList(bo.getQcInspectionTaskDefectBoList(),QcInspectionTaskDefect.class); List<QcInspectionTaskDefect> qcInspectionTaskDefectList= BeanUtil.copyToList(bo.getQcInspectionTaskDefectBoList(),QcInspectionTaskDefect.class);
qcInspectionTaskDefectMapper.insertBatch(qcInspectionTaskDefectList); qcInspectionTaskDefectMapper.insertBatch(qcInspectionTaskDefectList);
} }
if (i > 0) { if (i > 0) {
@ -77,4 +75,21 @@ public class RemoteQmsApiServiceImpl implements RemotePdaQmsApiService {
} }
return R.fail(); return R.fail();
} }
// @Override
// public R<Void> remoteSavePdaInspectionTask(Long TaskId) {
// System.out.println(TaskId);
// return R.ok();
//// QcInspectionTask qcInspectionTask = MapstructUtils.convert(bo, QcInspectionTask.class);
//// int i = qcInspectionTaskMapper.updateById(qcInspectionTask);
//// if (bo.getResult().equals("N")){
//// List<QcInspectionTaskDefect> qcInspectionTaskDefectList=BeanUtil.copyToList(bo.getQcInspectionTaskDefectBoList(),QcInspectionTaskDefect.class);
//// qcInspectionTaskDefectMapper.insertBatch(qcInspectionTaskDefectList);
//// }
//// if (i > 0) {
//// return R.ok();
//// }
// // return R.fail();
// }
} }

Write Preview
Loading…
Cancel
Save