.
This commit is contained in:
		| @@ -1,18 +0,0 @@ | ||||
| package com.xkrs.service; | ||||
|  | ||||
| import com.xkrs.model.qo.QcInspectionDataSourceQo; | ||||
|  | ||||
| /** | ||||
|  * @Author: XinYi Song | ||||
|  * @Date: 2022/1/19 16:42 | ||||
|  */ | ||||
| public interface QcInspectionDataSourceService { | ||||
|  | ||||
|     /** | ||||
|      * 添加测量数据 | ||||
|      * | ||||
|      * @param inspectionDataSourceQo | ||||
|      * @return | ||||
|      */ | ||||
|     String insertDataSource(QcInspectionDataSourceQo inspectionDataSourceQo); | ||||
| } | ||||
| @@ -1,30 +0,0 @@ | ||||
| package com.xkrs.service; | ||||
|  | ||||
| import com.xkrs.model.qo.QcInspectionFileQo; | ||||
| import org.apache.poi.openxml4j.exceptions.InvalidFormatException; | ||||
| import org.springframework.web.multipart.MultipartFile; | ||||
|  | ||||
| import java.io.IOException; | ||||
|  | ||||
| /** | ||||
|  * @Author: XinYi Song | ||||
|  * @Date: 2022/1/20 15:24 | ||||
|  */ | ||||
| public interface QcInspectionFileService { | ||||
|  | ||||
|     /** | ||||
|      * 添加模板信息 | ||||
|      * | ||||
|      * @param inspectionFileQo | ||||
|      * @return | ||||
|      */ | ||||
|     String insertFileExcel(QcInspectionFileQo inspectionFileQo, MultipartFile fileExcel) throws IOException; | ||||
|  | ||||
|     /** | ||||
|      * 导出excel | ||||
|      * | ||||
|      * @param inspectionFileQo | ||||
|      * @return | ||||
|      */ | ||||
|     String exportExcel(QcInspectionFileQo inspectionFileQo) throws IOException, InvalidFormatException; | ||||
| } | ||||
| @@ -1,17 +0,0 @@ | ||||
| package com.xkrs.service; | ||||
|  | ||||
| import com.xkrs.model.qo.QcInspectionItemDictQo; | ||||
|  | ||||
| /** | ||||
|  * @Author: XinYi Song | ||||
|  * @Date: 2022/1/19 10:10 | ||||
|  */ | ||||
| public interface QcInspectionItemDictService { | ||||
|  | ||||
|     /** | ||||
|      * 添加字典数据 | ||||
|      * @param inspectionItemDictQo | ||||
|      * @return | ||||
|      */ | ||||
|     String insertDataDict(QcInspectionItemDictQo inspectionItemDictQo); | ||||
| } | ||||
| @@ -1,18 +0,0 @@ | ||||
| package com.xkrs.service; | ||||
|  | ||||
| import com.xkrs.model.qo.QcInspectionPictureQo; | ||||
| import org.springframework.web.multipart.MultipartFile; | ||||
|  | ||||
| import java.io.IOException; | ||||
|  | ||||
| public interface QcInspectionPictureService { | ||||
|  | ||||
|     /** | ||||
|      * 添加图片 | ||||
|      * | ||||
|      * @param inspectionPictureQo | ||||
|      * @return | ||||
|      */ | ||||
|     String insertPicture(QcInspectionPictureQo inspectionPictureQo, MultipartFile pictureFile) throws IOException; | ||||
|  | ||||
| } | ||||
| @@ -1,15 +0,0 @@ | ||||
| package com.xkrs.service; | ||||
|  | ||||
| import com.xkrs.model.qo.QcInspectionSpecQo; | ||||
|  | ||||
| public interface QcInspectionSpecService { | ||||
|  | ||||
|     /** | ||||
|      * 添加规格数据 | ||||
|      * | ||||
|      * @param inspectionSpecQo | ||||
|      * @return | ||||
|      */ | ||||
|     String insertSpec(QcInspectionSpecQo inspectionSpecQo); | ||||
|  | ||||
| } | ||||
| @@ -1,58 +0,0 @@ | ||||
| package com.xkrs.service.impl; | ||||
|  | ||||
| import com.xkrs.dao.QcInspectionDataSourceDao; | ||||
| import com.xkrs.dao.QcInspectionItemDictDao; | ||||
| import com.xkrs.encapsulation.PromptMessageEnum; | ||||
| import com.xkrs.model.entity.QcInspectionDataSourceEntity; | ||||
| import com.xkrs.model.entity.QcInspectionItemDictEntity; | ||||
| import com.xkrs.model.qo.QcInspectionDataSourceQo; | ||||
| import com.xkrs.service.QcInspectionDataSourceService; | ||||
| import org.springframework.context.i18n.LocaleContextHolder; | ||||
| import org.springframework.stereotype.Service; | ||||
|  | ||||
| import javax.annotation.Resource; | ||||
| import java.util.Locale; | ||||
|  | ||||
| import static com.xkrs.encapsulation.OutputEncapsulation.outputEncapsulationObject; | ||||
|  | ||||
| /** | ||||
|  * @Author: XinYi Song | ||||
|  * @Date: 2022/1/19 16:43 | ||||
|  */ | ||||
| @Service | ||||
| public class QcInspectionDataSourceServiceImpl implements QcInspectionDataSourceService { | ||||
|  | ||||
|     @Resource | ||||
|     private QcInspectionDataSourceDao inspectionDataSourceDao; | ||||
|  | ||||
|     @Resource | ||||
|     private QcInspectionItemDictDao inspectionItemDictDao; | ||||
|  | ||||
|     /** | ||||
|      * 添加测量数据 | ||||
|      * | ||||
|      * @param inspectionDataSourceQo | ||||
|      * @return | ||||
|      */ | ||||
|     @Override | ||||
|     public String insertDataSource(QcInspectionDataSourceQo inspectionDataSourceQo) { | ||||
|         Locale locale = LocaleContextHolder.getLocale(); | ||||
|         QcInspectionItemDictEntity byInspectionItemCode = inspectionItemDictDao.findByInspectionItemCode(inspectionDataSourceQo.getInspectionItemCode()); | ||||
|         if (byInspectionItemCode == null) { | ||||
|             return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "不存在该字典类型!", locale); | ||||
|         } | ||||
|         QcInspectionDataSourceEntity qcInspectionDataSourceEntity = new QcInspectionDataSourceEntity(); | ||||
|         if (inspectionDataSourceQo.getId() > 0) { | ||||
|             qcInspectionDataSourceEntity.setId(inspectionDataSourceQo.getId()); | ||||
|         } | ||||
|         qcInspectionDataSourceEntity.setLotNo(inspectionDataSourceQo.getLotNo()); | ||||
|         qcInspectionDataSourceEntity.setMachineNo(inspectionDataSourceQo.getMachineNo()); | ||||
|         qcInspectionDataSourceEntity.setMaterialNo(inspectionDataSourceQo.getMaterialNo()); | ||||
|         qcInspectionDataSourceEntity.setModelNo(inspectionDataSourceQo.getModelNo()); | ||||
|         qcInspectionDataSourceEntity.setPartNo(inspectionDataSourceQo.getPartNo()); | ||||
|         qcInspectionDataSourceEntity.setInspectionItemCode(inspectionDataSourceQo.getInspectionItemCode()); | ||||
|         qcInspectionDataSourceEntity.setInspectValue(inspectionDataSourceQo.getInspectValue()); | ||||
|         inspectionDataSourceDao.save(qcInspectionDataSourceEntity); | ||||
|         return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "添加成功!", locale); | ||||
|     } | ||||
| } | ||||
| @@ -1,110 +0,0 @@ | ||||
| package com.xkrs.service.impl; | ||||
|  | ||||
| import com.xkrs.dao.QcInspectionDataSourceDao; | ||||
| import com.xkrs.dao.QcInspectionFileDao; | ||||
| import com.xkrs.encapsulation.PromptMessageEnum; | ||||
| import com.xkrs.model.entity.QcInspectionDataSourceEntity; | ||||
| import com.xkrs.model.entity.QcInspectionFileEntity; | ||||
| import com.xkrs.model.entity.QcInspectionItemDictEntity; | ||||
| import com.xkrs.model.qo.QcInspectionFileQo; | ||||
| import com.xkrs.service.QcInspectionFileService; | ||||
| import com.xkrs.util.ExcelUploadUtil; | ||||
| import com.xkrs.util.ExportExcel; | ||||
| import org.apache.poi.openxml4j.exceptions.InvalidFormatException; | ||||
| import org.springframework.context.i18n.LocaleContextHolder; | ||||
| import org.springframework.stereotype.Service; | ||||
| import org.springframework.web.multipart.MultipartFile; | ||||
|  | ||||
| import javax.annotation.Resource; | ||||
| import javax.transaction.Transactional; | ||||
| import java.io.IOException; | ||||
| import java.util.HashMap; | ||||
| import java.util.List; | ||||
| import java.util.Locale; | ||||
| import java.util.Map; | ||||
|  | ||||
| import static com.xkrs.encapsulation.OutputEncapsulation.outputEncapsulationObject; | ||||
|  | ||||
| /** | ||||
|  * @Author: XinYi Song | ||||
|  * @Date: 2022/1/20 15:24 | ||||
|  */ | ||||
| @Service | ||||
| public class QcInspectionFileServiceImpl implements QcInspectionFileService { | ||||
|  | ||||
|     @Resource | ||||
|     private QcInspectionFileDao inspectionFileDao; | ||||
|  | ||||
|     @Resource | ||||
|     private QcInspectionItemDictEntity inspectionItemDict; | ||||
|  | ||||
|     @Resource | ||||
|     private QcInspectionDataSourceDao inspectionDataSourceDao; | ||||
|  | ||||
|     /** | ||||
|      * 添加模板信息 | ||||
|      * | ||||
|      * @param inspectionFileQo | ||||
|      * @return | ||||
|      */ | ||||
|     @Override | ||||
|     public String insertFileExcel(QcInspectionFileQo inspectionFileQo, MultipartFile fileExcel) throws IOException { | ||||
|         String lotNo = inspectionFileQo.getLotNo(); | ||||
|         String machineNo = inspectionFileQo.getMachineNo(); | ||||
|         String materialNo = inspectionFileQo.getMaterialNo(); | ||||
|         String modelNo = inspectionFileQo.getModelNo(); | ||||
|         String partNo = inspectionFileQo.getPartNo(); | ||||
|         Locale locale = LocaleContextHolder.getLocale(); | ||||
|         List<QcInspectionFileEntity> qcInspectionFileEntities = inspectionFileDao.selectFile(lotNo, machineNo, materialNo, modelNo, partNo); | ||||
|         if (qcInspectionFileEntities != null || qcInspectionFileEntities.isEmpty()) { | ||||
|             return outputEncapsulationObject(PromptMessageEnum.DATA_EXIT, "已存在该产品的模板!", locale); | ||||
|         } | ||||
|         if (fileExcel == null) { | ||||
|             return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "模板不能为空!", locale); | ||||
|         } | ||||
|         String file = ExcelUploadUtil.memoryFile(fileExcel); | ||||
|         QcInspectionFileEntity fileEntity = new QcInspectionFileEntity(); | ||||
|         fileEntity.setId(inspectionFileQo.getId()); | ||||
|         fileEntity.setLotNo(lotNo); | ||||
|         fileEntity.setMachineNo(machineNo); | ||||
|         fileEntity.setMaterialNo(materialNo); | ||||
|         fileEntity.setModelNo(modelNo); | ||||
|         fileEntity.setPartNo(partNo); | ||||
|         fileEntity.setTemplatePath(file); | ||||
|         inspectionFileDao.save(fileEntity); | ||||
|         return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "添加成功!", locale); | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * 导出excel | ||||
|      * | ||||
|      * @param inspectionFileQo | ||||
|      * @return | ||||
|      */ | ||||
|     @Transactional(rollbackOn = Exception.class) | ||||
|     @Override | ||||
|     public String exportExcel(QcInspectionFileQo inspectionFileQo) throws IOException, InvalidFormatException { | ||||
|         String lotNo = inspectionFileQo.getLotNo(); | ||||
|         String machineNo = inspectionFileQo.getMachineNo(); | ||||
|         String materialNo = inspectionFileQo.getMaterialNo(); | ||||
|         String modelNo = inspectionFileQo.getModelNo(); | ||||
|         String partNo = inspectionFileQo.getPartNo(); | ||||
|         Locale locale = LocaleContextHolder.getLocale(); | ||||
|         List<QcInspectionFileEntity> qcInspectionFileEntities = inspectionFileDao.selectFile(lotNo, machineNo, materialNo, modelNo, partNo); | ||||
|         if (qcInspectionFileEntities == null || qcInspectionFileEntities.isEmpty()) { | ||||
|             return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "暂时没有该产品的模板,请添加!", locale); | ||||
|         } | ||||
|         String templatePath = qcInspectionFileEntities.get(0).getTemplatePath(); | ||||
|         List<QcInspectionDataSourceEntity> inspectionDataSources = inspectionDataSourceDao.selectDataSource(lotNo, machineNo, materialNo, modelNo, partNo); | ||||
|         if (inspectionDataSources == null || inspectionDataSources.isEmpty()) { | ||||
|             return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "暂时没有该产品的信息!", locale); | ||||
|         } | ||||
|         Map<String, String> map = new HashMap<>(); | ||||
|         for (QcInspectionDataSourceEntity inspectionDataSource : inspectionDataSources) { | ||||
|             map.put(inspectionDataSource.getInspectionItemCode(), inspectionDataSource.getInspectValue()); | ||||
|         } | ||||
|         String fill = ExportExcel.exportToProveExcel(map, templatePath); | ||||
|         inspectionFileDao.updateFilePath(lotNo, machineNo, materialNo, modelNo, partNo, fill); | ||||
|         return outputEncapsulationObject(PromptMessageEnum.SUCCESS, fill, locale); | ||||
|     } | ||||
| } | ||||
| @@ -1,45 +0,0 @@ | ||||
| package com.xkrs.service.impl; | ||||
|  | ||||
| import com.xkrs.dao.QcInspectionItemDictDao; | ||||
| import com.xkrs.encapsulation.PromptMessageEnum; | ||||
| import com.xkrs.model.entity.QcInspectionItemDictEntity; | ||||
| import com.xkrs.model.qo.QcInspectionItemDictQo; | ||||
| import com.xkrs.service.QcInspectionItemDictService; | ||||
| import org.springframework.context.i18n.LocaleContextHolder; | ||||
| import org.springframework.stereotype.Service; | ||||
|  | ||||
| import javax.annotation.Resource; | ||||
| import java.util.Locale; | ||||
|  | ||||
| import static com.xkrs.encapsulation.OutputEncapsulation.outputEncapsulationObject; | ||||
|  | ||||
| /** | ||||
|  * @Author: XinYi Song | ||||
|  * @Date: 2022/1/19 10:28 | ||||
|  */ | ||||
| @Service | ||||
| public class QcInspectionItemDictServiceImpl implements QcInspectionItemDictService { | ||||
|  | ||||
|     @Resource | ||||
|     private QcInspectionItemDictDao inspectionItemDictDao; | ||||
|  | ||||
|     /** | ||||
|      * 添加字典数据 | ||||
|      * | ||||
|      * @param inspectionItemDictQo | ||||
|      * @return | ||||
|      */ | ||||
|     @Override | ||||
|     public String insertDataDict(QcInspectionItemDictQo inspectionItemDictQo) { | ||||
|         Locale locale = LocaleContextHolder.getLocale(); | ||||
|         QcInspectionItemDictEntity englishName = inspectionItemDictDao.findByInspectionItemCode(inspectionItemDictQo.getInspectionItemCode()); | ||||
|         if (englishName != null) { | ||||
|             return outputEncapsulationObject(PromptMessageEnum.DATA_EXIT, "该产品变量已存在,请勿重复添加!", locale); | ||||
|         } | ||||
|         QcInspectionItemDictEntity qcInspectionItemDictEntity = new QcInspectionItemDictEntity(); | ||||
|         qcInspectionItemDictEntity.setInspectionItemName(inspectionItemDictQo.getInspectionItemName()); | ||||
|         qcInspectionItemDictEntity.setInspectionItemCode(inspectionItemDictQo.getInspectionItemCode()); | ||||
|         inspectionItemDictDao.save(qcInspectionItemDictEntity); | ||||
|         return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "添加成功!", locale); | ||||
|     } | ||||
| } | ||||
| @@ -1,40 +0,0 @@ | ||||
| package com.xkrs.service.impl; | ||||
|  | ||||
| import com.xkrs.dao.QcInspectionPictureDao; | ||||
| import com.xkrs.encapsulation.PromptMessageEnum; | ||||
| import com.xkrs.model.entity.QcInspectionPictureEntity; | ||||
| import com.xkrs.model.qo.QcInspectionPictureQo; | ||||
| import com.xkrs.service.QcInspectionPictureService; | ||||
| import com.xkrs.util.ExcelUploadUtil; | ||||
| import org.springframework.context.i18n.LocaleContextHolder; | ||||
| import org.springframework.stereotype.Service; | ||||
| import org.springframework.web.multipart.MultipartFile; | ||||
|  | ||||
| import javax.annotation.Resource; | ||||
| import java.io.IOException; | ||||
| import java.util.Locale; | ||||
|  | ||||
| import static com.xkrs.encapsulation.OutputEncapsulation.outputEncapsulationObject; | ||||
|  | ||||
| @Service | ||||
| public class QcInspectionPictureServiceImpl implements QcInspectionPictureService { | ||||
|  | ||||
|     @Resource | ||||
|     private QcInspectionPictureDao inspectionPictureDao; | ||||
|  | ||||
|     @Override | ||||
|     public String insertPicture(QcInspectionPictureQo inspectionPictureQo, MultipartFile pictureFile) throws IOException { | ||||
|         Locale locale = LocaleContextHolder.getLocale(); | ||||
|         String file = ExcelUploadUtil.memoryFile(pictureFile); | ||||
|         QcInspectionPictureEntity qcInspectionPicture = new QcInspectionPictureEntity(); | ||||
|         qcInspectionPicture.setId(inspectionPictureQo.getId()); | ||||
|         qcInspectionPicture.setLotNo(inspectionPictureQo.getLotNo()); | ||||
|         qcInspectionPicture.setMachineNo(inspectionPictureQo.getMachineNo()); | ||||
|         qcInspectionPicture.setMaterialNo(inspectionPictureQo.getMaterialNo()); | ||||
|         qcInspectionPicture.setModelNo(inspectionPictureQo.getModelNo()); | ||||
|         qcInspectionPicture.setPartNo(inspectionPictureQo.getPartNo()); | ||||
|         qcInspectionPicture.setPicturePath(file); | ||||
|         inspectionPictureDao.save(qcInspectionPicture); | ||||
|         return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "添加成功!", locale); | ||||
|     } | ||||
| } | ||||
| @@ -1,52 +0,0 @@ | ||||
| package com.xkrs.service.impl; | ||||
|  | ||||
| import com.xkrs.dao.QcInspectionItemDictDao; | ||||
| import com.xkrs.dao.QcInspectionSpecDao; | ||||
| import com.xkrs.encapsulation.PromptMessageEnum; | ||||
| import com.xkrs.model.entity.QcInspectionSpecEntity; | ||||
| import com.xkrs.model.qo.QcInspectionSpecQo; | ||||
| import com.xkrs.service.QcInspectionSpecService; | ||||
| import org.springframework.context.i18n.LocaleContextHolder; | ||||
| import org.springframework.stereotype.Service; | ||||
|  | ||||
| import javax.annotation.Resource; | ||||
| import java.util.Locale; | ||||
|  | ||||
| import static com.xkrs.encapsulation.OutputEncapsulation.outputEncapsulationObject; | ||||
|  | ||||
| @Service | ||||
| public class QcInspectionSpecServiceImpl implements QcInspectionSpecService { | ||||
|  | ||||
|     @Resource | ||||
|     private QcInspectionSpecDao inspectionSpecDao; | ||||
|  | ||||
|     @Resource | ||||
|     private QcInspectionItemDictDao inspectionItemDictDao; | ||||
|  | ||||
|  | ||||
|     /** | ||||
|      * 新增规格数据 | ||||
|      * | ||||
|      * @param inspectionSpecQo | ||||
|      * @return | ||||
|      */ | ||||
|     @Override | ||||
|     public String insertSpec(QcInspectionSpecQo inspectionSpecQo) { | ||||
|         Locale locale = LocaleContextHolder.getLocale(); | ||||
|         QcInspectionSpecEntity inspectionSpec = new QcInspectionSpecEntity(); | ||||
|         if (inspectionSpecQo.getId() > 0) { | ||||
|             inspectionSpec.setId(inspectionSpecQo.getId()); | ||||
|         } | ||||
|         inspectionSpec.setPartNo(inspectionSpecQo.getPartNo()); | ||||
|         inspectionSpec.setInspectionItemCode(inspectionSpecQo.getInspectionItemCode()); | ||||
|         inspectionSpec.setMax(inspectionSpecQo.getMax()); | ||||
|         inspectionSpec.setMean(inspectionSpecQo.getMean()); | ||||
|         inspectionSpec.setMin(inspectionSpecQo.getMin()); | ||||
|         inspectionSpec.setUnit(inspectionSpecQo.getUnit()); | ||||
|         inspectionSpec.setInspectionMethod(inspectionSpecQo.getInspectionMethod()); | ||||
|         inspectionSpec.setInspectionStandard(inspectionSpecQo.getInspectionStandard()); | ||||
|         inspectionSpec.setRemark(inspectionSpecQo.getRemark()); | ||||
|         inspectionSpecDao.save(inspectionSpec); | ||||
|         return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "添加成功!", locale); | ||||
|     } | ||||
| } | ||||
		Reference in New Issue
	
	Block a user