优化请求格式
This commit is contained in:
parent
e78392efdc
commit
9f33ffdd1f
@ -7,6 +7,7 @@ import org.springframework.web.bind.annotation.GetMapping;
|
|||||||
import org.springframework.web.bind.annotation.PostMapping;
|
import org.springframework.web.bind.annotation.PostMapping;
|
||||||
import org.springframework.web.bind.annotation.RequestParam;
|
import org.springframework.web.bind.annotation.RequestParam;
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
import org.springframework.web.multipart.MultipartFile;
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
|
|
||||||
@ -20,8 +21,8 @@ public class QcSourceController {
|
|||||||
* 添加检验数据
|
* 添加检验数据
|
||||||
*/
|
*/
|
||||||
@PostMapping("/insertQcSource")
|
@PostMapping("/insertQcSource")
|
||||||
public String insertQcSource(QcSourceQoInsert insertQo) {
|
public String insertQcSource(QcSourceQoInsert insertQo, @RequestParam(required = false, value = "picture") MultipartFile picture) {
|
||||||
return qcSourceService.insertQcSource(insertQo);
|
return qcSourceService.insertQcSource(insertQo, picture);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -2,13 +2,14 @@ package com.xkrs.newpro.service;
|
|||||||
|
|
||||||
import com.xkrs.newpro.model.qo.QcSourceQoDelete;
|
import com.xkrs.newpro.model.qo.QcSourceQoDelete;
|
||||||
import com.xkrs.newpro.model.qo.QcSourceQoInsert;
|
import com.xkrs.newpro.model.qo.QcSourceQoInsert;
|
||||||
|
import org.springframework.web.multipart.MultipartFile;
|
||||||
|
|
||||||
public interface QcSourceService {
|
public interface QcSourceService {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 添加检验数据
|
* 添加检验数据
|
||||||
*/
|
*/
|
||||||
String insertQcSource(QcSourceQoInsert insertQo);
|
String insertQcSource(QcSourceQoInsert insertQo, MultipartFile picture);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 删除检验数据
|
* 删除检验数据
|
||||||
|
@ -10,6 +10,7 @@ import com.xkrs.newpro.utils.LocalDateUtils;
|
|||||||
import com.xkrs.newpro.utils.LocalStringUtils;
|
import com.xkrs.newpro.utils.LocalStringUtils;
|
||||||
import org.springframework.context.i18n.LocaleContextHolder;
|
import org.springframework.context.i18n.LocaleContextHolder;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
import org.springframework.web.multipart.MultipartFile;
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@ -31,7 +32,7 @@ public class QcSourceServiceImpl implements QcSourceService {
|
|||||||
* 添加检验数据
|
* 添加检验数据
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public String insertQcSource(QcSourceQoInsert insertQo) {
|
public String insertQcSource(QcSourceQoInsert insertQo, MultipartFile picture) {
|
||||||
|
|
||||||
String batchNo = insertQo.getBatchNo();
|
String batchNo = insertQo.getBatchNo();
|
||||||
String machineNo = insertQo.getMachineNo();
|
String machineNo = insertQo.getMachineNo();
|
||||||
|
@ -51,7 +51,7 @@ public class QcSpecServiceImpl implements QcSpecService {
|
|||||||
|
|
||||||
Optional<QcItemEntity> entityByNo = qcItemDao.findByNo(qcItemNo);
|
Optional<QcItemEntity> entityByNo = qcItemDao.findByNo(qcItemNo);
|
||||||
if (entityByNo.isEmpty()) {
|
if (entityByNo.isEmpty()) {
|
||||||
return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "不存在该检验规格,请先添加检验规格!", locale);
|
return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "不存在该检验项目,请先添加检验项目!", locale);
|
||||||
}
|
}
|
||||||
|
|
||||||
Optional<QcSpecEntity> entityByVarietyNoAndQcItemNo = qcSpecDao.findByVarietyNoAndQcItemNo(varietyNo, qcItemNo);
|
Optional<QcSpecEntity> entityByVarietyNoAndQcItemNo = qcSpecDao.findByVarietyNoAndQcItemNo(varietyNo, qcItemNo);
|
||||||
|
Loading…
Reference in New Issue
Block a user