diff --git a/api-admin/pom.xml b/api-admin/pom.xml index dad71673..aad2b99f 100644 --- a/api-admin/pom.xml +++ b/api-admin/pom.xml @@ -164,6 +164,18 @@ org.springframework.boot spring-boot-starter-data-redis + + + + org.apache.poi + poi + RELEASE + + + org.apache.poi + poi-ooxml + RELEASE + diff --git a/api-admin/src/main/java/com/glxp/api/admin/constant/IncodeStatus.java b/api-admin/src/main/java/com/glxp/api/admin/constant/IncodeStatus.java new file mode 100644 index 00000000..b83daa95 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/constant/IncodeStatus.java @@ -0,0 +1,13 @@ +package com.glxp.api.admin.constant; + +public class IncodeStatus { + + public static final Integer PROCESS = 0; //处理中 + public static final Integer FINISH = 1; //已完成 + public static final Integer ERROR = 2; //异常 + + public static final Integer FROM_UDIINFO = 0; //产品信息 + public static final Integer FROM_INVINFO = 1; //库存产品信息 + public static final Integer FROM_THRSYS = 2; //第三方提交 + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/constant/UdiInfoImportStatus.java b/api-admin/src/main/java/com/glxp/api/admin/constant/UdiInfoImportStatus.java new file mode 100644 index 00000000..2970fa45 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/constant/UdiInfoImportStatus.java @@ -0,0 +1,15 @@ +package com.glxp.api.admin.constant; + +public class UdiInfoImportStatus { + + public static final int UDIINFO_IMPORT_UNPROCESS = 0; + public static final int UDIINFO_IMPORT_PROCESS = 1; + public static final int UDIINFO_IMPORT_FAIL = 2; + public static final int UDIINFO_IMPORT_SUCCESS = 3; + + + + public static final int UDIINFO_IMPORT_CODE_UNPROCESS = 0; + public static final int UDIINFO_IMPORT_CODE_SUCESS = 2; + public static final int UDIINFO_IMPORT_CODE_FAIL = 1; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicUnitMaintainController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicUnitMaintainController.java index b042b0cb..1085017d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicUnitMaintainController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicUnitMaintainController.java @@ -255,7 +255,7 @@ public class BasicUnitMaintainController { return thrCorpEntity; }).collect(Collectors.toList()); PageInfo pageInfo; - pageInfo = new PageInfo<>(thrCorpEntityList); + pageInfo = new PageInfo<>(thrCorpEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(thrCorpEntityList); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/CorpExportLogController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/CorpExportLogController.java new file mode 100644 index 00000000..1c0cf35d --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/CorpExportLogController.java @@ -0,0 +1,127 @@ +package com.glxp.api.admin.controller.basic; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.constant.UdiInfoImportStatus; +import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity; +import com.glxp.api.admin.entity.basic.CorpExportLogEntity; +import com.glxp.api.admin.entity.basic.UdiInfoExportLogEntity; +import com.glxp.api.admin.req.basic.*; +import com.glxp.api.admin.req.inout.DeleteRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.res.basic.UdiRelevanceResponse; +import com.glxp.api.admin.service.basic.BasicUnitMaintainService; +import com.glxp.api.admin.service.basic.CorpExportLogService; +import com.glxp.api.admin.service.basic.UdiInfoExportLogService; +import com.glxp.api.admin.service.basic.UdiRelevanceService; +import com.glxp.api.admin.thread.BasicGenExcelService; +import com.glxp.api.admin.util.CustomUtil; +import com.glxp.api.admin.util.ExcelUtil; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +@RestController +public class CorpExportLogController { + @Resource + BasicGenExcelService basicGenExcelService; + @Resource + CorpExportLogService corpExportLogService; + + @GetMapping("/udiwms/corps/exportLog/filter") + public BaseResponse filter(FilterUdiEpLogRequest filterUdiEpLogReques, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List corpExportLogEntities + = corpExportLogService.filterCorpExportLog(filterUdiEpLogReques); + PageInfo pageInfo; + pageInfo = new PageInfo<>(corpExportLogEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(corpExportLogEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @PostMapping("/udiwms/corps/exportLog/deleteLog") + public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + String id = deleteRequest.getId(); + corpExportLogService.deleteById(id + ""); + return ResultVOUtils.success("删除成功"); + } + + //产品信息excel文件下载 + @GetMapping("/udiwms/corps/exportLog/download") + public void download(FilterUdiEpLogRequest filterUdiEpLogRequest, HttpServletResponse res) { + + List corpExportLogEntities = corpExportLogService.filterCorpExportLog(filterUdiEpLogRequest); + CorpExportLogEntity corpExportLogEntity = corpExportLogEntities.get(0); + try { + String filePath = corpExportLogEntity.getFilePath(); + String fileName = "temp"; + if (filePath != null && filePath.length() > 0) { + String[] data = filePath.split("/"); + fileName = data[data.length - 1]; + } + res.setHeader("Content-disposition", "attachment;fileName=" + fileName); + res.setContentType("text/plain;charset=UTF-8"); + FileInputStream input = new FileInputStream(new File(filePath)); + OutputStream out = res.getOutputStream(); + byte[] b = new byte[2048]; + int len; + while ((len = input.read(b)) != -1) { + out.write(b, 0, len); + } + input.close(); + if (corpExportLogEntity.getDlCount() == 0) { + corpExportLogEntity.setDlCount(1); + } else { + corpExportLogEntity.setDlCount(corpExportLogEntity.getDlCount() + 1); + } + corpExportLogService.updateCorpExportLog(corpExportLogEntity); + } catch (Exception ex) { + System.out.println("下载失败！"); + } + + + } + + //产品信息导出生成Excel，并创建生成记录 + @PostMapping("/udiwms/corps/importLog/export") + public BaseResponse excelDownload(@RequestBody CorpsExportRequest corpsExportRequest) { + String fileName = "D:\\udiwms\\exportFile\\" + "往来单位信息导出" + System.currentTimeMillis() + ".xls"; + CorpExportLogEntity corpExportLogEntity = new CorpExportLogEntity(); + corpExportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_PROCESS); + String genKey = CustomUtil.getId(); + corpExportLogEntity.setGenKey(genKey); + corpExportLogEntity.setFilePath(fileName); + corpExportLogEntity.setUpdateTime(new Date()); + corpExportLogEntity.setDlCount(0); + corpExportLogService.insertCorpExportLog(corpExportLogEntity); + basicGenExcelService.exportCorp(genKey, corpsExportRequest); + return ResultVOUtils.success("后台正在导出生成excel文件，请稍后刷新查看!"); + } + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/CorpImportLogController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/CorpImportLogController.java new file mode 100644 index 00000000..6b79a0bb --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/CorpImportLogController.java @@ -0,0 +1,358 @@ +package com.glxp.api.admin.controller.basic; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.constant.UdiInfoImportStatus; +import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; +import com.glxp.api.admin.entity.basic.CorpImportDetailEntity; +import com.glxp.api.admin.entity.basic.CorpImportLogEntity; +import com.glxp.api.admin.entity.basic.UdiInfoImportDetailEntity; +import com.glxp.api.admin.entity.info.ThirdSysApiEntity; +import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.admin.req.basic.PostCorpsRequest; +import com.glxp.api.admin.req.basic.PostUdiInfoRequest; +import com.glxp.api.admin.req.inout.DeleteRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.service.basic.BasicThirdSysService; +import com.glxp.api.admin.service.basic.CorpImportDetailService; +import com.glxp.api.admin.service.basic.CorpImportLogService; +import com.glxp.api.admin.thread.BasicCorpImportService; +import com.glxp.api.admin.util.CustomUtil; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +@RestController +public class CorpImportLogController { + @Resource + CorpImportLogService corpImportLogService; + @Resource + CorpImportDetailService corpImportDetailService; + @Resource + BasicThirdSysService basicThirdSysService; + @Resource + BasicCorpImportService basicCorpImportService; + + @GetMapping("/udiwms/corps/importLog/filter") + public BaseResponse filter(FilterUdiIpLogRequest filterUdiIpLogRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List udiInfoImportLogEntities + = corpImportLogService.filterImportLog(filterUdiIpLogRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(udiInfoImportLogEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(udiInfoImportLogEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @GetMapping("/udiwms/corps/importLog/filterDetail") + public BaseResponse filterDetail(FilterUdiIpLogRequest filterUdiIpLogRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List corpImportDetailEntities + = corpImportDetailService.filterCorpImport(filterUdiIpLogRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(corpImportDetailEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(corpImportDetailEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + + @PostMapping("/udiwms/corps/importLog/deleteLog") + public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + String id = deleteRequest.getId(); + FilterUdiIpLogRequest filterInCodeLogRequest = new FilterUdiIpLogRequest(); + filterInCodeLogRequest.setId(Integer.parseInt(id)); + List corpImportLogEntities = corpImportLogService.filterImportLog(filterInCodeLogRequest); + if (corpImportLogEntities != null && corpImportLogEntities.size() > 0) { + CorpImportLogEntity corpImportLogEntity = corpImportLogEntities.get(0); + corpImportLogService.deleteById(corpImportLogEntity.getId() + ""); + corpImportDetailService.deleteByGenkey(corpImportLogEntity.getGenKey()); + } + + return ResultVOUtils.success("删除成功"); + } + + @PostMapping("/udiwms/corps/importLog/delete") + public BaseResponse delete(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + if (corpImportDetailService.deleteById(deleteRequest.getId())) + return ResultVOUtils.success("删除成功"); + else + return ResultVOUtils.error(500, "删除成功"); + } + + + //产品信息文件导入 + @PostMapping("/udiwms/corps/importLog/upload") + public BaseResponse uploadProducts(@RequestParam("file") List files, @RequestParam("thirdSys") String thirdSys) { + + BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys(); + String filePath = "D:\\udiwms\\filePath\\"; + File createFile = new File(filePath); + if (!createFile.exists()) { + createFile.mkdirs(); + } + for (int i = 0; i < files.size(); i++) { + MultipartFile file = files.get(i); + if (file.isEmpty()) { + return ResultVOUtils.error(500, "上传第" + (i++) + "个文件失败"); + } + String fileName = file.getOriginalFilename(); + try { + InputStream inputStream = file.getInputStream(); + Workbook workbook = null; + String filetype = fileName.substring(fileName.lastIndexOf(".")); + + if (".xls".equals(filetype)) { + workbook = new HSSFWorkbook(inputStream); + } else if (".xlsx".equals(filetype)) { + workbook = new XSSFWorkbook(inputStream); + } else { + return ResultVOUtils.error(500, "请上传excel文件"); + } + Sheet sheet = null; + Row row = null; + CorpImportLogEntity corpImportLogEntity = new CorpImportLogEntity(); + String genKey = CustomUtil.getId(); + corpImportLogEntity.setGenKey(genKey); + corpImportLogEntity.setFromType("文件导入"); + corpImportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_UNPROCESS); + corpImportLogEntity.setUpdateTime(new Date(System.currentTimeMillis())); + corpImportLogService.insertImportLog(corpImportLogEntity); + List corpImportDetailEntities = new ArrayList<>(); + for (int j = 0; j < workbook.getNumberOfSheets(); j++) { + sheet = workbook.getSheetAt(j); + if (sheet == null) { + continue; + } + // 滤过第一行标题 + for (int k = sheet.getFirstRowNum(); k <= sheet.getLastRowNum(); k++) { + row = sheet.getRow(k); + if (row == null || row.getFirstCellNum() == k) { + continue; + } + CorpImportDetailEntity corpImportDetailEntity = new CorpImportDetailEntity(); + Cell cell1 = row.getCell(0); + if (cell1 != null) { + cell1.setCellType(CellType.STRING); + corpImportDetailEntity.setErpId(cell1.getStringCellValue()); + } + + + Cell cell2 = row.getCell(1); + if (cell2 != null) { + cell2.setCellType(CellType.STRING); + corpImportDetailEntity.setName(cell2.getStringCellValue()); + } + Cell cell3 = row.getCell(2); + if (cell3 != null) { + cell3.setCellType(CellType.STRING); + corpImportDetailEntity.setSpell(cell3.getStringCellValue()); + + } + Cell cell4 = row.getCell(3); + if (cell4 != null) { + cell4.setCellType(CellType.STRING); + corpImportDetailEntity.setAddr(cell4.getStringCellValue()); + + } + Cell cell5 = row.getCell(4); + if (cell5 != null) { + cell5.setCellType(CellType.STRING); + corpImportDetailEntity.setContact(cell5.getStringCellValue()); + + } + Cell cell6 = row.getCell(5); + if (cell6 != null) { + cell6.setCellType(CellType.STRING); + corpImportDetailEntity.setMobile(cell6.getStringCellValue()); + } + + Cell cell7 = row.getCell(6); + if (cell7 != null) { + cell7.setCellType(CellType.STRING); + corpImportDetailEntity.setCreditNo(cell7.getStringCellValue()); + } + + Cell cell8 = row.getCell(7); + if (cell8 != null) { + cell8.setCellType(CellType.STRING); + corpImportDetailEntity.setStatus(cell8.getStringCellValue()); + } + + Cell cell9 = row.getCell(8); + if (cell9 != null) { + cell9.setCellType(CellType.STRING); + corpImportDetailEntity.setType(cell9.getStringCellValue()); + } + + Cell cell10 = row.getCell(9); + if (cell10 != null) { + cell10.setCellType(CellType.STRING); + corpImportDetailEntity.setThirdId(cell10.getStringCellValue()); + } + + Cell cell11 = row.getCell(10); + if (cell11 != null) { + cell11.setCellType(CellType.STRING); + corpImportDetailEntity.setThirdName(cell11.getStringCellValue()); + } + + Cell cell12 = row.getCell(11); + if (cell12 != null) { + cell12.setCellType(CellType.STRING); + corpImportDetailEntity.setThirdId1(cell12.getStringCellValue()); + } + + Cell cell13 = row.getCell(12); + if (cell13 != null) { + cell13.setCellType(CellType.STRING); + corpImportDetailEntity.setThirdName1(cell13.getStringCellValue()); + } + + Cell cell14 = row.getCell(13); + if (cell14 != null) { + cell14.setCellType(CellType.STRING); + corpImportDetailEntity.setThirdId2(cell14.getStringCellValue()); + } + + Cell cell15 = row.getCell(14); + if (cell15 != null) { + cell15.setCellType(CellType.STRING); + corpImportDetailEntity.setThirdName2(cell15.getStringCellValue()); + } + + Cell cell16 = row.getCell(15); + if (cell16 != null) { + cell16.setCellType(CellType.STRING); + corpImportDetailEntity.setThirdId3(cell16.getStringCellValue()); + } + + Cell cell17 = row.getCell(16); + if (cell17 != null) { + cell17.setCellType(CellType.STRING); + corpImportDetailEntity.setThirdName3(cell17.getStringCellValue()); + } + + Cell cell18 = row.getCell(17); + if (cell18 != null) { + cell18.setCellType(CellType.STRING); + corpImportDetailEntity.setThirdId4(cell18.getStringCellValue()); + } + + Cell cell19 = row.getCell(18); + if (cell19 != null) { + cell19.setCellType(CellType.STRING); + corpImportDetailEntity.setThirdName4(cell19.getStringCellValue()); + } + if (basicThirdSysEntity != null) { + if ("thirdId".equals(basicThirdSysEntity.getThirdId())) { + corpImportDetailEntity.setThirdId(corpImportDetailEntity.getErpId()); + corpImportDetailEntity.setThirdName(corpImportDetailEntity.getName()); + } else if ("thirdId1".equals(basicThirdSysEntity.getThirdId())) { + corpImportDetailEntity.setThirdId1(corpImportDetailEntity.getErpId()); + corpImportDetailEntity.setThirdName1(corpImportDetailEntity.getName()); + } else if ("thirdId2".equals(basicThirdSysEntity.getThirdId())) { + corpImportDetailEntity.setThirdId2(corpImportDetailEntity.getErpId()); + corpImportDetailEntity.setThirdName2(corpImportDetailEntity.getName()); + } else if ("thirdId3".equals(basicThirdSysEntity.getThirdId())) { + corpImportDetailEntity.setThirdId3(corpImportDetailEntity.getErpId()); + corpImportDetailEntity.setThirdName3(corpImportDetailEntity.getName()); + } else if ("thirdId4".equals(basicThirdSysEntity.getThirdId())) { + corpImportDetailEntity.setThirdId4(corpImportDetailEntity.getErpId()); + corpImportDetailEntity.setThirdName4(corpImportDetailEntity.getName()); + } + } else { + corpImportDetailEntity.setThirdId(corpImportDetailEntity.getErpId()); + corpImportDetailEntity.setThirdName(corpImportDetailEntity.getName()); + } + + + corpImportDetailEntity.setGenKeyFk(genKey); + corpImportDetailEntity.setImportStatus(UdiInfoImportStatus.UDIINFO_IMPORT_CODE_UNPROCESS); + corpImportDetailEntity.setUpdateTime(new Date(System.currentTimeMillis())); + corpImportDetailEntities.add(corpImportDetailEntity); + } + } + corpImportDetailService.insertCorpImports(corpImportDetailEntities); + corpImportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_UNPROCESS); + corpImportLogService.updateImportLog(corpImportLogEntity); + workbook.close(); + basicCorpImportService.importCorps(genKey); + } catch (IOException e) { + e.printStackTrace(); + } + } + return ResultVOUtils.success("上传成功"); + } + + + //产品信息接口上传 + @PostMapping("/udiwms/corps/importLog/post") + public BaseResponse postUdiInfo(@RequestBody PostCorpsRequest postCorpsRequest, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + + + String genKey = postCorpsRequest.getGenKey(); + if (genKey == null) { + genKey = CustomUtil.getId(); + } + CorpImportLogEntity corpImportLogEntity = corpImportLogService.selectByGenKey(genKey); + List corpImportDetailEntities = postCorpsRequest.getDatas(); + if (corpImportDetailEntities != null) { + for (CorpImportDetailEntity corpImportDetailEntity : corpImportDetailEntities) { + corpImportDetailEntity.setGenKeyFk(genKey); + corpImportDetailEntity.setImportStatus(UdiInfoImportStatus.UDIINFO_IMPORT_CODE_UNPROCESS); + corpImportDetailEntity.setUpdateTime(new java.util.Date()); + corpImportDetailService.insertCorpImport(corpImportDetailEntity); + } + } + if (corpImportLogEntity == null) { + corpImportLogEntity = new CorpImportLogEntity(); + corpImportLogEntity.setGenKey(genKey); + corpImportLogEntity.setFromType("文件导入"); + corpImportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_UNPROCESS); + corpImportLogEntity.setUpdateTime(new Date(System.currentTimeMillis())); + corpImportLogService.insertImportLog(corpImportLogEntity); + } else { + corpImportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_UNPROCESS); + corpImportLogService.updateImportLog(corpImportLogEntity); + } + basicCorpImportService.importCorps(genKey); + return ResultVOUtils.success("上传成功"); + } + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoController.java index f6261e8c..1f452897 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoController.java @@ -109,7 +109,7 @@ public class UdiInfoController { List invmandocResponses = udiDlDeviceResponse.getData().getList(); if(invmandocResponses != null){ for (ErpProductsResponse invmandocResponse : invmandocResponses) { - UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(invmandocResponse.getCode()); + UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(invmandocResponse.getCode(),filterErpGoodsRequest.getThirdSys()); invmandocResponse.setThirdSys(filterErpGoodsRequest.getThirdSys()); if (udiRelevanceEntity != null) { invmandocResponse.setChecked(true); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoExportLogController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoExportLogController.java new file mode 100644 index 00000000..27db86da --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoExportLogController.java @@ -0,0 +1,133 @@ +package com.glxp.api.admin.controller.basic; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.constant.UdiInfoImportStatus; +import com.glxp.api.admin.entity.basic.UdiInfoExportLogEntity; +import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest; +import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; +import com.glxp.api.admin.req.basic.UdiInfoExportRequest; +import com.glxp.api.admin.req.inout.DeleteRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.res.basic.UdiRelevanceResponse; +import com.glxp.api.admin.service.basic.UdiInfoExportLogService; +import com.glxp.api.admin.service.basic.UdiRelevanceService; +import com.glxp.api.admin.thread.BasicGenExcelService; +import com.glxp.api.admin.util.CustomUtil; +import com.glxp.api.admin.util.ExcelUtil; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * 医疗器械信息导出 + */ +@RestController +public class UdiInfoExportLogController { + + @Resource + UdiInfoExportLogService udiInfoExportLogService; + @Resource + UdiRelevanceService udiRelevanceService; + @Resource + BasicGenExcelService basicGenExcelService; + + + @GetMapping("/udiwms/products/exportLog/filter") + public BaseResponse filter(FilterUdiEpLogRequest filterUdiEpLogReques, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List udiInfoExportLogEntities + = udiInfoExportLogService.filterUdiInfoExportLog(filterUdiEpLogReques); + PageInfo pageInfo; + pageInfo = new PageInfo<>(udiInfoExportLogEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(udiInfoExportLogEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @PostMapping("/udiwms/products/exportLog/deleteLog") + public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + String id = deleteRequest.getId(); + udiInfoExportLogService.deleteById(id + ""); + return ResultVOUtils.success("删除成功"); + } + + //产品信息excel文件下载 + @GetMapping("/udiwms/products/exportLog/download") + public void download(FilterUdiEpLogRequest filterUdiEpLogRequest, HttpServletResponse res) { + + List udiInfoExportLogEntities = udiInfoExportLogService.filterUdiInfoExportLog(filterUdiEpLogRequest); + UdiInfoExportLogEntity udiInfoExportLogEntity = udiInfoExportLogEntities.get(0); + try { + String filePath = udiInfoExportLogEntity.getFilePath(); + String fileName = "temp"; + if (filePath != null && filePath.length() > 0) { + String[] data = filePath.split("/"); + fileName = data[data.length - 1]; + } + res.setHeader("Content-disposition", "attachment;fileName=" + fileName); + res.setContentType("text/plain;charset=UTF-8"); + FileInputStream input = new FileInputStream(new File(filePath)); + OutputStream out = res.getOutputStream(); + byte[] b = new byte[2048]; + int len; + while ((len = input.read(b)) != -1) { + out.write(b, 0, len); + } + input.close(); + if (udiInfoExportLogEntity.getDlCount() == 0) { + udiInfoExportLogEntity.setDlCount(1); + } else { + udiInfoExportLogEntity.setDlCount(udiInfoExportLogEntity.getDlCount() + 1); + } + udiInfoExportLogService.updateUdiInfoExportLog(udiInfoExportLogEntity); + } catch (Exception ex) { + System.out.println("下载失败！"); + } + + + } + + //产品信息导出生成Excel，并创建生成记录 + @PostMapping("/udiwms/products/importLog/export") + public BaseResponse excelDownload(@RequestBody UdiInfoExportRequest udiInfoExportRequest) { + + String fileName = "D:\\udiwms\\exportFile\\" + "产品信息导出" + System.currentTimeMillis() + ".xls"; + UdiInfoExportLogEntity udiInfoExportLogEntity = new UdiInfoExportLogEntity(); + udiInfoExportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_PROCESS); + String genKey = CustomUtil.getId(); + udiInfoExportLogEntity.setGenKey(genKey); + udiInfoExportLogEntity.setFilePath(fileName); + udiInfoExportLogEntity.setUpdateTime(new Date()); + udiInfoExportLogEntity.setDlCount(0); + udiInfoExportLogService.insertUdiInfoExportLog(udiInfoExportLogEntity); + basicGenExcelService.exportUdiInfo(genKey, udiInfoExportRequest); + return ResultVOUtils.success("后台正在导出生成excel文件，请稍后刷新查看!"); + + } + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoImportLogController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoImportLogController.java new file mode 100644 index 00000000..6fc48bcb --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoImportLogController.java @@ -0,0 +1,265 @@ +package com.glxp.api.admin.controller.basic; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.constant.UdiInfoImportStatus; +import com.glxp.api.admin.entity.basic.UdiInfoImportDetailEntity; +import com.glxp.api.admin.entity.basic.UdiInfoImportLogEntity; +import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.admin.req.basic.PostUdiInfoRequest; +import com.glxp.api.admin.req.inout.DeleteRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.service.basic.UdiInfoImportLogService; +import com.glxp.api.admin.service.basic.UdiInfoImportDetailService; +import com.glxp.api.admin.thread.BasicUdiInfoImportService; +import com.glxp.api.admin.util.CustomUtil; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.sql.Date; +import java.util.ArrayList; +import java.util.List; + +/** + * 医疗器械信息导入 + */ + +@RestController +public class UdiInfoImportLogController { + + @Resource + UdiInfoImportLogService udiInfoImportLogService; + @Resource + UdiInfoImportDetailService udiInfoImportService; + @Resource + BasicUdiInfoImportService basicUdiInfoImportService; + + @GetMapping("/udiwms/products/importLog/filter") + public BaseResponse filter(FilterUdiIpLogRequest filterUdiIpLogRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List udiInfoImportLogEntities + = udiInfoImportLogService.filterImportLog(filterUdiIpLogRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(udiInfoImportLogEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(udiInfoImportLogEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @GetMapping("/udiwms/products/importLog/filterDetail") + public BaseResponse filterDetail(FilterUdiIpLogRequest filterUdiIpLogRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List udiInfoImportEntities + = udiInfoImportService.filterUdiInfoImport(filterUdiIpLogRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(udiInfoImportEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(udiInfoImportEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + + @PostMapping("/udiwms/products/importLog/deleteLog") + public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + String id = deleteRequest.getId(); + FilterUdiIpLogRequest filterInCodeLogRequest = new FilterUdiIpLogRequest(); + filterInCodeLogRequest.setId(Integer.parseInt(id)); + List importLogEntities = udiInfoImportLogService.filterImportLog(filterInCodeLogRequest); + if (importLogEntities != null && importLogEntities.size() > 0) { + UdiInfoImportLogEntity importLogEntity = importLogEntities.get(0); + udiInfoImportLogService.deleteById(importLogEntity.getId() + ""); + udiInfoImportService.deleteByGenkey(importLogEntity.getGenKey()); + } + + return ResultVOUtils.success("删除成功"); + } + + @PostMapping("/udiwms/products/importLog/delete") + public BaseResponse delete(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + if (udiInfoImportService.deleteById(deleteRequest.getId())) + return ResultVOUtils.success("删除成功"); + else + return ResultVOUtils.error(500, "删除成功"); + } + + + //产品信息文件导入 + @PostMapping("/udiwms/products/importLog/upload") + public BaseResponse uploadProducts(@RequestParam("file") List files, @RequestParam("thirdSys") String thirdSys) { + String filePath = "D:\\udiwms\\filePath\\"; + File createFile = new File(filePath); + if (!createFile.exists()) { + createFile.mkdirs(); + } + for (int i = 0; i < files.size(); i++) { + MultipartFile file = files.get(i); + if (file.isEmpty()) { + return ResultVOUtils.error(500, "上传第" + (i++) + "个文件失败"); + } + String fileName = file.getOriginalFilename(); + try { + InputStream inputStream = file.getInputStream(); + Workbook workbook = null; + String filetype = fileName.substring(fileName.lastIndexOf(".")); + + if (".xls".equals(filetype)) { + workbook = new HSSFWorkbook(inputStream); + } else if (".xlsx".equals(filetype)) { + workbook = new XSSFWorkbook(inputStream); + } else { + return ResultVOUtils.error(500, "请上传excel文件"); + } + Sheet sheet = null; + Row row = null; + UdiInfoImportLogEntity udiInfoImportLogEntity = new UdiInfoImportLogEntity(); + String genKey = CustomUtil.getId(); + udiInfoImportLogEntity.setGenKey(genKey); + udiInfoImportLogEntity.setFromType("文件导入"); + udiInfoImportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_UNPROCESS); + udiInfoImportLogEntity.setUpdateTime(new Date(System.currentTimeMillis())); + udiInfoImportLogService.insertImportLog(udiInfoImportLogEntity); + List udiInfoImportEntities = new ArrayList<>(); + for (int j = 0; j < workbook.getNumberOfSheets(); j++) { + sheet = workbook.getSheetAt(j); + if (sheet == null) { + continue; + } + // 滤过第一行标题 + for (int k = sheet.getFirstRowNum(); k <= sheet.getLastRowNum(); k++) { + row = sheet.getRow(k); + if (row == null || row.getFirstCellNum() == k) { + continue; + } + UdiInfoImportDetailEntity udiInfoImportEntity = new UdiInfoImportDetailEntity(); + Cell cell1 = row.getCell(0); + if (cell1 != null) { + cell1.setCellType(CellType.STRING); + udiInfoImportEntity.setUdiCode(cell1.getStringCellValue()); + } + + + Cell cell2 = row.getCell(1); + if (cell2 != null) { + cell2.setCellType(CellType.STRING); + udiInfoImportEntity.setYbbm(cell2.getStringCellValue()); + } + Cell cell3 = row.getCell(2); + if (cell3 != null) { + cell3.setCellType(CellType.STRING); + udiInfoImportEntity.setSptm(cell3.getStringCellValue()); + + } + Cell cell4 = row.getCell(3); + if (cell4 != null) { + cell4.setCellType(CellType.STRING); + udiInfoImportEntity.setThirdId(cell4.getStringCellValue()); + + } + Cell cell5 = row.getCell(4); + if (cell5 != null) { + cell5.setCellType(CellType.STRING); + udiInfoImportEntity.setThirdId1(cell5.getStringCellValue()); + + } + Cell cell6 = row.getCell(5); + if (cell6 != null) { + cell6.setCellType(CellType.STRING); + udiInfoImportEntity.setThirdId2(cell6.getStringCellValue()); + } + + Cell cell7 = row.getCell(6); + if (cell7 != null) { + cell7.setCellType(CellType.STRING); + udiInfoImportEntity.setThirdId3(cell7.getStringCellValue()); + } + Cell cell8 = row.getCell(7); + if (cell8 != null) { + cell8.setCellType(CellType.STRING); + udiInfoImportEntity.setThirdId4(cell8.getStringCellValue()); + } + udiInfoImportEntity.setGenKeyFk(genKey); + udiInfoImportEntity.setStatus(0); + udiInfoImportEntity.setUpdateTime(new Date(System.currentTimeMillis())); + udiInfoImportEntities.add(udiInfoImportEntity); + } + } + udiInfoImportService.insertUdiInfoImports(udiInfoImportEntities); + udiInfoImportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_UNPROCESS); + udiInfoImportLogService.updateImportLog(udiInfoImportLogEntity); + workbook.close(); + basicUdiInfoImportService.importUdiInfo(genKey); + } catch (IOException e) { + e.printStackTrace(); + } + } + return ResultVOUtils.success("上传成功"); + } + + + //产品信息接口上传 + @PostMapping("/udiwms/products/importLog/post") + public BaseResponse postUdiInfo(@RequestBody PostUdiInfoRequest postUdiInfoRequest, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + + + String genKey = postUdiInfoRequest.getGenKey(); + if (genKey == null) { + genKey = CustomUtil.getId(); + } + UdiInfoImportLogEntity udiInfoImportLogEntity = udiInfoImportLogService.selectByGenKey(genKey); + List udiInfoImportEntities = postUdiInfoRequest.getDatas(); + if(udiInfoImportEntities!=null){ + for(UdiInfoImportDetailEntity udiInfoImportEntity:udiInfoImportEntities){ + udiInfoImportEntity.setGenKeyFk(genKey); + udiInfoImportEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_CODE_UNPROCESS); + udiInfoImportEntity.setUpdateTime(new java.util.Date()); + udiInfoImportService.insertUdiInfoImport(udiInfoImportEntity); + } + } + if(udiInfoImportLogEntity==null){ + udiInfoImportLogEntity = new UdiInfoImportLogEntity(); + udiInfoImportLogEntity.setGenKey(genKey); + udiInfoImportLogEntity.setFromType("接口导入"); + udiInfoImportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_UNPROCESS); + udiInfoImportLogEntity.setUpdateTime(new Date(System.currentTimeMillis())); + udiInfoImportLogService.insertImportLog(udiInfoImportLogEntity); + }else { + udiInfoImportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_UNPROCESS); + udiInfoImportLogService.updateImportLog(udiInfoImportLogEntity); + } + basicUdiInfoImportService.importUdiInfo(genKey); + return ResultVOUtils.success("上传成功"); + } + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java index c96f99f1..15acbbcc 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java @@ -124,7 +124,7 @@ public class UdiRelevanceController { return ResultVOUtils.error(500, "ERP产品信息接口地址未定义"); if (invPiDetailEntity == null || invPiDetailEntity.getValue() == null) return ResultVOUtils.error(500, "ERP库存产品信息接口地址未定义"); - updateproductService.updateProduct(piDetailEntity.getValue(), invPiDetailEntity.getValue()); + updateproductService.updateProduct(piDetailEntity.getValue(), invPiDetailEntity.getValue(),thirdSysId); return ResultVOUtils.success("后台已开启下载更新，请稍后刷新查看！"); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java index fd002881..38b7cd24 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java @@ -88,6 +88,8 @@ public class OrderDetailController { BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(filterErpOrderRequest.getBillAction()); filterThrOrderRequest.setBillAction(bussinessTypeEntity.getName()); } + filterThrOrderRequest.setPage(filterErpOrderRequest.getPage()); + filterThrOrderRequest.setLimit(filterErpOrderRequest.getLimit()); List erpOrderResponses = thrOrderService.filterAllDetail(filterThrOrderRequest); PageInfo pageInfo; pageInfo = new PageInfo<>(erpOrderResponses); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/InoutUtils.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/InoutUtils.java index 56938713..38fd9147 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/InoutUtils.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/InoutUtils.java @@ -155,7 +155,6 @@ public class InoutUtils { udiInfoEntity = new UdiInfoEntity(); } } - udiInfoEntity.setCode(code); udiInfoEntity = FilterUdiUtils.transUdi(udiInfoEntity); return udiInfoEntity; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InCodeLogController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InCodeLogController.java index 8cdb1264..32ed121a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InCodeLogController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InCodeLogController.java @@ -1,10 +1,13 @@ package com.glxp.api.admin.controller.inventory; import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.entity.info.SystemParamConfigEntity; import com.glxp.api.admin.entity.inventory.InCodeLogEntity; import com.glxp.api.admin.req.inout.DeleteRequest; import com.glxp.api.admin.req.inventory.FilterInCodeLogRequest; import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.res.inventory.IncodeSysParmsResponse; +import com.glxp.api.admin.service.info.SystemParamConfigService; import com.glxp.api.admin.service.inventory.InCodeLogService; import com.glxp.api.admin.service.inventory.InvStockPrintService; import com.glxp.api.common.enums.ResultEnum; @@ -25,6 +28,8 @@ public class InCodeLogController { InCodeLogService inCodeLogService; @Resource InvStockPrintService invStockPrintService; + @Resource + SystemParamConfigService systemParamConfigService; @GetMapping("/udiwms/inv/incode/filter") @@ -45,23 +50,31 @@ public class InCodeLogController { } + @PostMapping("/udiwms/inv/incode/delete") + public BaseResponse delete(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { - @PostMapping("/udiwms/inv/incode/delete") - public BaseResponse delete(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + String id = deleteRequest.getId(); + FilterInCodeLogRequest filterInCodeLogRequest = new FilterInCodeLogRequest(); + filterInCodeLogRequest.setId(Integer.parseInt(id)); + List inCodeLogEntities = inCodeLogService.filterInCodeLog(filterInCodeLogRequest); + if (inCodeLogEntities != null && inCodeLogEntities.size() > 0) { + InCodeLogEntity inCodeLogEntity = inCodeLogEntities.get(0); + inCodeLogService.deleteById(inCodeLogEntity.getId() + ""); + invStockPrintService.deleteByGenKey(inCodeLogEntity.getGenKey()); + } - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - String id = deleteRequest.getId(); - FilterInCodeLogRequest filterInCodeLogRequest = new FilterInCodeLogRequest(); - filterInCodeLogRequest.setId(Integer.parseInt(id)); - List inCodeLogEntities = inCodeLogService.filterInCodeLog(filterInCodeLogRequest); - if(inCodeLogEntities!=null && inCodeLogEntities.size()>0){ - InCodeLogEntity inCodeLogEntity = inCodeLogEntities.get(0); - inCodeLogService.deleteById(inCodeLogEntity.getId()+""); - invStockPrintService.deleteByGenKey(inCodeLogEntity.getGenKey()); - } + return ResultVOUtils.success("删除成功"); + } - return ResultVOUtils.success("删除成功"); - } + + @GetMapping("/udiwms/inv/incode/getParams") + public BaseResponse getParams() { + IncodeSysParmsResponse incodeSysParmsResponse = new IncodeSysParmsResponse(); + incodeSysParmsResponse.setFromType(systemParamConfigService.selectValueByParamKey("incode_fromType")); + incodeSysParmsResponse.setThirdSys(systemParamConfigService.selectValueByParamKey("incode_thirdSys_fromType")); + return ResultVOUtils.success(incodeSysParmsResponse); + } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvErpOnhandController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvErpOnhandController.java index 98a19e43..e7555f17 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvErpOnhandController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvErpOnhandController.java @@ -1,45 +1,30 @@ package com.glxp.api.admin.controller.inventory; -import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.TypeReference; import com.github.pagehelper.PageInfo; import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; -import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; -import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; import com.glxp.api.admin.entity.basic.UdiEntity; -import com.glxp.api.admin.entity.info.SystemParamConfigEntity; import com.glxp.api.admin.entity.thrsys.ThrInvProductsEntity; import com.glxp.api.admin.httpclient.ErpInvClient; import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; -import com.glxp.api.admin.req.basic.UOnhandQueryRequest; import com.glxp.api.admin.req.inventory.ErpOnhandRequest; import com.glxp.api.admin.req.thrsys.FilterThrInvProductsRequest; import com.glxp.api.admin.res.PageSimpleResponse; -import com.glxp.api.admin.res.basic.UOnhandQueryResponse; import com.glxp.api.admin.res.basic.UdiRelevanceResponse; -import com.glxp.api.admin.res.inout.WarehouseResponse; import com.glxp.api.admin.res.inventory.ErpInvProductResponse; -import com.glxp.api.admin.res.inventory.ErpOnHandResponse; import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; -import com.glxp.api.admin.service.basic.BasicThirdSysService; import com.glxp.api.admin.service.basic.UdiRelevanceService; -import com.glxp.api.admin.service.info.SystemParamConfigService; import com.glxp.api.admin.service.thrsys.ThrInvProductsService; import com.glxp.api.admin.util.FilterUdiUtils; -import com.glxp.api.admin.util.HttpClient; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Value; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.stream.Collectors; @RestController diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvPrintController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvPrintController.java index b5f58a04..c9f50f29 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvPrintController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvPrintController.java @@ -1,9 +1,11 @@ package com.glxp.api.admin.controller.inventory; import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.constant.IncodeStatus; import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; import com.glxp.api.admin.entity.info.SystemParamConfigEntity; +import com.glxp.api.admin.entity.inventory.InCodeLogEntity; import com.glxp.api.admin.httpclient.ErpInvClient; import com.glxp.api.admin.req.inventory.ErpOnhandRequest; import com.glxp.api.admin.entity.inventory.StockPrintEntity; @@ -16,9 +18,11 @@ import com.glxp.api.admin.res.inventory.ErpInvProductResponse; import com.glxp.api.admin.res.inventory.ErpOnHandResponse; import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; import com.glxp.api.admin.service.basic.BasicThirdSysService; +import com.glxp.api.admin.service.inventory.InCodeLogService; import com.glxp.api.admin.service.inventory.InvStockPrintService; import com.glxp.api.admin.service.info.SystemParamConfigService; import com.glxp.api.admin.thread.InvImportStockService; +import com.glxp.api.admin.util.CustomUtil; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; @@ -26,6 +30,7 @@ import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.sql.Date; import java.util.List; @RestController @@ -38,7 +43,8 @@ public class InvPrintController { private SystemParamConfigService systemParamConfigService; @Resource BasicThirdSysDetailService basicThirdSysDetailService; - + @Resource + InCodeLogService inCodeLogService; @PostMapping("/udiwarehouse/stockPrint/filter") public BaseResponse filterAll(@RequestBody FilterStockprintRequest stockprintRequest, @@ -47,6 +53,8 @@ public class InvPrintController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } + String thirdSys = systemParamConfigService.selectValueByParamKey("incode_thirdSys_fromType"); + stockprintRequest.setThirdSysFk(thirdSys); List stockPrintEntities = stockPrintService.filterStockPrint(stockprintRequest); PageInfo pageInfo; @@ -57,7 +65,7 @@ public class InvPrintController { return ResultVOUtils.success(pageSimpleResponse); } - @GetMapping("/udiwarehouse/stockPrint/getFilter") + @GetMapping("/udiwms/stockPrint/getFilter") public BaseResponse getFilter(FilterStockprintRequest stockprintRequest, BindingResult bindingResult) { @@ -169,7 +177,6 @@ public class InvPrintController { return ResultVOUtils.success("删除成功"); } - @GetMapping("/warehouse/stockPrint/dlErpStock") public BaseResponse dlErpStock() { // dlErpStockService.dlErpStock(); @@ -180,7 +187,15 @@ public class InvPrintController { //产品信息一键生成内部码 @GetMapping("/udiwarehouse/stockPrint/import") public BaseResponse importStock(FilterStockprintRequest filterStockprintRequest) { - importStockService.updateStock(filterStockprintRequest.getThirdSysFk()); + InCodeLogEntity inCodeLogEntity = new InCodeLogEntity(); + inCodeLogEntity.setFromType(IncodeStatus.FROM_UDIINFO); + inCodeLogEntity.setUpdateTime(new Date(System.currentTimeMillis())); + String genKey = CustomUtil.getId(); + inCodeLogEntity.setGenKey(genKey); + inCodeLogEntity.setStatus(IncodeStatus.PROCESS); + inCodeLogEntity.setThirdSysFk(filterStockprintRequest.getThirdSysFk()); + inCodeLogService.insertInCodeLog(inCodeLogEntity); + importStockService.updateStock(genKey, filterStockprintRequest.getThirdSysFk()); return ResultVOUtils.success("后台已开始自动更新，请稍后刷新查看"); } @@ -197,43 +212,120 @@ public class InvPrintController { return ResultVOUtils.error(500, "ERP库存产品信息查询接口地址未定义"); else url = systemParamConfigEntity.getParamValue(); - importStockService.updateByCode(stockprintRequest.getThirdId(), url); + importStockService.updateByCode(stockprintRequest.getThirdId(), url, stockprintRequest.getThirdSysFk()); return ResultVOUtils.success("后台已开始自动更新，请稍后刷新查看"); } + @PostMapping("udiwms/stockprint/postByUdiInfo") + public BaseResponse postByUdiInfo(@RequestBody PostStockPrintRequest postStockPrintRequest, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + if (postStockPrintRequest != null) { + InCodeLogEntity inCodeLogEntity = new InCodeLogEntity(); + inCodeLogEntity.setFromType(IncodeStatus.FROM_UDIINFO); + inCodeLogEntity.setUpdateTime(new Date(System.currentTimeMillis())); + inCodeLogEntity.setStatus(IncodeStatus.PROCESS); + String genKey = CustomUtil.getId(); + inCodeLogEntity.setGenKey(genKey); + inCodeLogEntity.setThirdSysFk(postStockPrintRequest.getThirdSys()); + inCodeLogService.insertInCodeLog(inCodeLogEntity); + importStockService.updateStockById(genKey, postStockPrintRequest.getIds(), postStockPrintRequest.getThirdSys()); + } + return ResultVOUtils.success("后台已开始自动更新，请稍后刷新查看！"); + } + + @PostMapping("udiwms/stockprint/postByInvInfo") + public BaseResponse postByInvInfo(@RequestBody PostStockPrintRequest postStockPrintRequest, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + if (postStockPrintRequest != null) { + InCodeLogEntity inCodeLogEntity = new InCodeLogEntity(); + inCodeLogEntity.setFromType(IncodeStatus.FROM_INVINFO); + inCodeLogEntity.setUpdateTime(new Date(System.currentTimeMillis())); + inCodeLogEntity.setStatus(IncodeStatus.PROCESS); + String genKey = CustomUtil.getId(); + inCodeLogEntity.setGenKey(genKey); + inCodeLogEntity.setThirdSysFk(postStockPrintRequest.getThirdSys()); + inCodeLogService.insertInCodeLog(inCodeLogEntity); + importStockService.updateByInvInfo(genKey, postStockPrintRequest.getIds(), postStockPrintRequest.getThirdSys()); + } + return ResultVOUtils.success("后台已开始自动更新，请稍后刷新查看！"); + } + + @GetMapping("udiwms/stockprint/postAllByInvInfo") + public BaseResponse postAllByInvInfo(FilterStockprintRequest filterStockprintRequest, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + if (filterStockprintRequest != null) { + InCodeLogEntity inCodeLogEntity = new InCodeLogEntity(); + inCodeLogEntity.setFromType(IncodeStatus.FROM_INVINFO); + inCodeLogEntity.setUpdateTime(new Date(System.currentTimeMillis())); + inCodeLogEntity.setStatus(IncodeStatus.PROCESS); + String genKey = CustomUtil.getId(); + inCodeLogEntity.setGenKey(genKey); + inCodeLogEntity.setThirdSysFk(filterStockprintRequest.getThirdSysFk()); + inCodeLogService.insertInCodeLog(inCodeLogEntity); + importStockService.updateAllByInvInfo(genKey, filterStockprintRequest.getThirdSysFk()); + } + return ResultVOUtils.success("后台已开始自动更新，请稍后刷新查看！"); + } + + @PostMapping("udiwms/stockprint/post") public BaseResponse postInCode(@RequestBody PostStockPrintRequest postStockPrintRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } + String genKey = null; if (postStockPrintRequest != null) { + + InCodeLogEntity inCodeLogEntity = new InCodeLogEntity(); + inCodeLogEntity.setFromType(IncodeStatus.FROM_THRSYS); + inCodeLogEntity.setUpdateTime(new Date(System.currentTimeMillis())); + if (postStockPrintRequest.getGenKey() == null) { + genKey = CustomUtil.getId(); + inCodeLogEntity.setGenKey(genKey); + } else { + genKey = postStockPrintRequest.getGenKey(); + inCodeLogEntity.setGenKey(postStockPrintRequest.getGenKey()); + } + inCodeLogEntity.setStatus(IncodeStatus.PROCESS); + inCodeLogEntity.setThirdSysFk(postStockPrintRequest.getThirdSys()); + inCodeLogService.insertInCodeLog(inCodeLogEntity); + List stockPrintEntities = postStockPrintRequest.getDatas(); if (stockPrintEntities != null && stockPrintEntities.size() > 0) { for (StockPrintEntity stockPrintEntity : stockPrintEntities) { - FilterStockprintRequest filterStockprintRequest = new FilterStockprintRequest(); - filterStockprintRequest.setThirdSysFk(filterStockprintRequest.getThirdSysFk()); - filterStockprintRequest.setNameCode(stockPrintEntity.getNameCode()); - filterStockprintRequest.setWarehouseCode(stockPrintEntity.getWarehouseCode()); - filterStockprintRequest.setBatchNo(stockPrintEntity.getBatchNo()); - filterStockprintRequest.setThirdId(stockPrintEntity.getThirdId()); - filterStockprintRequest.setSpaceCode(stockPrintEntity.getSpaceCode()); - List stockPrintEntityList = stockPrintService.filterStockPrint(filterStockprintRequest); - if(stockPrintEntityList!=null && stockPrintEntityList.size()>0 ){ - StockPrintEntity temp = stockPrintEntities.get(0); - stockPrintEntity.setId(temp.getId()); - stockPrintService.updateStockPrint(stockPrintEntity); - StockPrintEntity stockPrintEntity1 = stockPrintService.findByNameCode(temp.getId()+""); - stockPrintEntity = stockPrintEntity1; - } +// FilterStockprintRequest filterStockprintRequest = new FilterStockprintRequest(); +// filterStockprintRequest.setThirdSysFk(filterStockprintRequest.getThirdSysFk()); +// filterStockprintRequest.setNameCode(stockPrintEntity.getNameCode()); +// filterStockprintRequest.setWarehouseCode(stockPrintEntity.getWarehouseCode()); +// filterStockprintRequest.setBatchNo(stockPrintEntity.getBatchNo()); +// filterStockprintRequest.setThirdId(stockPrintEntity.getThirdId()); +// filterStockprintRequest.setSpaceCode(stockPrintEntity.getSpaceCode()); +// List stockPrintEntityList = stockPrintService.filterStockPrint(filterStockprintRequest); +// if (stockPrintEntityList != null && stockPrintEntityList.size() > 0) { +// StockPrintEntity temp = stockPrintEntities.get(0); +// stockPrintEntity.setId(temp.getId()); +// stockPrintService.updateStockPrint(stockPrintEntity); +// StockPrintEntity stockPrintEntity1 = stockPrintService.findByNameCode(temp.getId() + ""); +// stockPrintEntity = stockPrintEntity1; +// } + stockPrintEntity.setGenKeyFk(genKey); String udiCode = "#" + stockPrintEntity.getNameCode() + "#" + stockPrintEntity.getProduceDate() + "#" + stockPrintEntity.getExpireDate() + "#" + stockPrintEntity.getBatchNo() + "#" + stockPrintEntity.getSerialNo() + "#" + stockPrintEntity.getWarehouseCode() + "#" + stockPrintEntity.getSpaceCode(); stockPrintEntity.setUdiCode(udiCode); stockPrintService.insertStockPrint(stockPrintEntity); } } + inCodeLogEntity.setStatus(IncodeStatus.FINISH); + inCodeLogService.updateInCodeLog(inCodeLogEntity); } - return ResultVOUtils.success("提交成功！"); + return ResultVOUtils.success(genKey); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrCorpExportLogController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrCorpExportLogController.java new file mode 100644 index 00000000..9653c59c --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrCorpExportLogController.java @@ -0,0 +1,144 @@ +package com.glxp.api.admin.controller.thrsys; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.constant.UdiInfoImportStatus; +import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; +import com.glxp.api.admin.entity.thrsys.*; +import com.glxp.api.admin.entity.thrsys.ThrCorpExportLogEntity; +import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest; +import com.glxp.api.admin.req.inout.DeleteRequest; +import com.glxp.api.admin.req.thrsys.*; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.res.basic.UdiRelevanceResponse; +import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; +import com.glxp.api.admin.service.thrsys.ThrCorpExportLogService; +import com.glxp.api.admin.service.thrsys.ThrCorpService; +import com.glxp.api.admin.service.thrsys.ThrOrderExportLogService; +import com.glxp.api.admin.thread.ThrCorpsDlService; +import com.glxp.api.admin.util.CustomUtil; +import com.glxp.api.admin.util.ExcelUtil; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * 第三方数据往来单位导出日志 + */ +@RestController +public class ThrCorpExportLogController { + + @Resource + ThrCorpExportLogService thrCorpExportLogService; + @Resource + ThrCorpService thrCorpService; + @Resource + ThrCorpsDlService thrCorpsDlService; + @GetMapping("/udiwms/thrCorp/exportLog/filter") + public BaseResponse filter(FilterUdiEpLogRequest filterUdiEpLogReques, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List thrCorpExportLogEntities + = thrCorpExportLogService.filterThrCorpExportLog(filterUdiEpLogReques); + PageInfo pageInfo; + pageInfo = new PageInfo<>(thrCorpExportLogEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(thrCorpExportLogEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @PostMapping("/udiwms/thrCorp/exportLog/deleteLog") + public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + String id = deleteRequest.getId(); + thrCorpExportLogService.deleteById(id + ""); + return ResultVOUtils.success("删除成功"); + } + + //往来单位excel文件下载 + @GetMapping("/udiwms/thrCorp/exportLog/download") + public void download(FilterUdiEpLogRequest filterUdiEpLogRequest, HttpServletResponse res) { + + List thrCorpExportLogEntities = thrCorpExportLogService.filterThrCorpExportLog(filterUdiEpLogRequest); + ThrCorpExportLogEntity thrOrderExportLogEntity = thrCorpExportLogEntities.get(0); + try { + String filePath = thrOrderExportLogEntity.getFilePath(); + String fileName = "temp"; + if (filePath != null && filePath.length() > 0) { + String[] data = filePath.split("/"); + fileName = data[data.length - 1]; + } + res.setHeader("Content-disposition", "attachment;fileName=" + fileName); + res.setContentType("text/plain;charset=UTF-8"); + FileInputStream input = new FileInputStream(new File(filePath)); + OutputStream out = res.getOutputStream(); + byte[] b = new byte[2048]; + int len; + while ((len = input.read(b)) != -1) { + out.write(b, 0, len); + } + input.close(); + if (thrOrderExportLogEntity.getDlCount() == 0) { + thrOrderExportLogEntity.setDlCount(1); + } else { + thrOrderExportLogEntity.setDlCount(thrOrderExportLogEntity.getDlCount() + 1); + } + thrCorpExportLogService.updateThrCorpExportLog(thrOrderExportLogEntity); + } catch (Exception ex) { + System.out.println("下载失败！"); + } + + + } + + //往来单位导出生成Excel，并创建生成记录 + @PostMapping("/udiwms/thrCorp/importLog/export") + public BaseResponse excelDownload(@RequestBody ThrCorpExportRequest thrCorpExportRequest) { + + String fileName = "D:\\udiwms\\exportFile\\" + "第三方往来单位信息导出" + System.currentTimeMillis() + ".xls"; + File file = new File(fileName); + if (!file.exists()) { + try { + file.createNewFile(); + } catch (IOException e) { + e.printStackTrace(); + } + } + ThrCorpExportLogEntity thrCorpExportLogEntity = new ThrCorpExportLogEntity(); + thrCorpExportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_PROCESS); + String genKey = CustomUtil.getId(); + thrCorpExportLogEntity.setGenKey(genKey); + thrCorpExportLogEntity.setFilePath(fileName); + thrCorpExportLogEntity.setUpdateTime(new Date()); + thrCorpExportLogEntity.setDlCount(0); + thrCorpExportLogService.insertThrCorpExportLog(thrCorpExportLogEntity); + thrCorpsDlService.genExcel(genKey,thrCorpExportRequest); + return ResultVOUtils.success("后台正在导出生成excel文件，请稍后刷新查看!"); + + } + + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrCorpImportLogController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrCorpImportLogController.java new file mode 100644 index 00000000..c3da163c --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrCorpImportLogController.java @@ -0,0 +1,67 @@ +package com.glxp.api.admin.controller.thrsys; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.entity.thrsys.ThrCorpImportLogEntity; +import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.admin.req.inout.DeleteRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.service.thrsys.ThrCorpImportLogService; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; +import java.util.List; + +/** + * 第三方数据往来单位导入日志 + */ +@RestController +public class ThrCorpImportLogController { + + @Resource + ThrCorpImportLogService thrCorpImportLogService; + + @GetMapping("/udiwms/thrCorp/importLog/filter") + public BaseResponse filter(FilterUdiIpLogRequest filterUdiIpLogRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List thrCorpImportLogEntities + = thrCorpImportLogService.filterImportLog(filterUdiIpLogRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(thrCorpImportLogEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(thrCorpImportLogEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + + @PostMapping("/udiwms/thrCorp/importLog/deleteLog") + public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + String id = deleteRequest.getId(); + FilterUdiIpLogRequest filterInCodeLogRequest = new FilterUdiIpLogRequest(); + filterInCodeLogRequest.setId(Integer.parseInt(id)); + List thrCorpImportLogEntities = thrCorpImportLogService.filterImportLog(filterInCodeLogRequest); + if (thrCorpImportLogEntities != null && thrCorpImportLogEntities.size() > 0) { + ThrCorpImportLogEntity thrCorpImportLogEntity = thrCorpImportLogEntities.get(0); + thrCorpImportLogService.deleteById(thrCorpImportLogEntity.getId() + ""); + } + + return ResultVOUtils.success("删除成功"); + } + + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrCorpsController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrCorpsController.java index f5d03f0c..9b4de78d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrCorpsController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrCorpsController.java @@ -1,8 +1,12 @@ package com.glxp.api.admin.controller.thrsys; import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.constant.UdiInfoImportStatus; import com.glxp.api.admin.entity.inventory.StockPrintEntity; import com.glxp.api.admin.entity.thrsys.ThrCorpEntity; +import com.glxp.api.admin.entity.thrsys.ThrCorpImportLogEntity; +import com.glxp.api.admin.entity.thrsys.ThrOrderImportLogEntity; +import com.glxp.api.admin.entity.thrsys.ThrProductsImportLogEntity; import com.glxp.api.admin.req.basic.FilterStockprintRequest; import com.glxp.api.admin.req.inout.DeleteRequest; import com.glxp.api.admin.req.thrsys.FilterThrCorpRequest; @@ -11,9 +15,12 @@ import com.glxp.api.admin.req.thrsys.PostThrCorpRequest; import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.basic.ErpUnitsResponse; import com.glxp.api.admin.res.inout.WarehouseResponse; +import com.glxp.api.admin.service.thrsys.ThrCorpImportLogService; import com.glxp.api.admin.service.thrsys.ThrCorpService; +import com.glxp.api.admin.service.thrsys.ThrOrderImportLogService; import com.glxp.api.admin.thread.ThrCorpsDlService; import com.glxp.api.admin.util.Constant; +import com.glxp.api.admin.util.CustomUtil; import com.glxp.api.admin.util.RedisUtil; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; @@ -23,6 +30,7 @@ import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -34,6 +42,8 @@ public class ThrCorpsController { private ThrCorpService thrCorpService; @Resource private ThrCorpsDlService thrCorpsDlService; + @Resource + private ThrCorpImportLogService thrCorpImportLogService; @GetMapping("/udiwms/thrsys/getCorps") public BaseResponse getCorps(FilterThrCorpRequest filterThrCorpRequest, @@ -52,6 +62,25 @@ public class ThrCorpsController { return ResultVOUtils.success(pageSimpleResponse); } + @PostMapping("/udiwms/thrsys/delCorps") + public BaseResponse delCorps(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + String id = deleteRequest.getId(); + thrCorpService.deleteById(id); + return ResultVOUtils.success("删除成功"); + } + + @RequestMapping("/udiwms/thrsys/corp/delAll") + public BaseResponse delAll() { + thrCorpService.deleteAll(); + return ResultVOUtils.success("删除成功"); + } + + + //第三方服务上传（包括文件导入后上传） @PostMapping("/udiwms/thrsys/postCorps") public BaseResponse postCorps(@RequestBody PostThrCorpRequest postThrCorpRequest, BindingResult bindingResult) { @@ -62,8 +91,23 @@ public class ThrCorpsController { List thrCorpEntities; List erpUnitsResponses = postThrCorpRequest.getCorps(); if (erpUnitsResponses != null && erpUnitsResponses.size() > 0) { - - + String genKey = postThrCorpRequest.getGenKey(); + if (genKey == null) { + genKey = CustomUtil.getId(); + } + ThrCorpImportLogEntity thrCorpImportLogEntity = thrCorpImportLogService.selectByGenKey(genKey); + if (thrCorpImportLogEntity == null) { + thrCorpImportLogEntity = new ThrCorpImportLogEntity(); + thrCorpImportLogEntity.setGenKey(genKey); + if (postThrCorpRequest.getUploadType() != null) { + thrCorpImportLogEntity.setFromType(postThrCorpRequest.getUploadType()); + } else + thrCorpImportLogEntity.setFromType("第三方系统上传"); + thrCorpImportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_PROCESS); + thrCorpImportLogEntity.setUpdateTime(new Date()); + thrCorpImportLogEntity.setThirdSysFk(postThrCorpRequest.getThirdSys()); + thrCorpImportLogService.insertImportLog(thrCorpImportLogEntity); + } thrCorpEntities = erpUnitsResponses.stream().map( item -> { ThrCorpEntity thrCorpEntity = new ThrCorpEntity(); @@ -74,31 +118,15 @@ public class ThrCorpsController { } ).collect(Collectors.toList()); thrCorpService.insertThrCorpss(thrCorpEntities); + thrCorpImportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_SUCCESS); + thrCorpImportLogEntity.setUpdateTime(new Date()); + thrCorpImportLogService.updateImportLog(thrCorpImportLogEntity); return ResultVOUtils.success("往来单位上传成功！"); - } - return ResultVOUtils.error(500, "上传数据为空"); } - - @PostMapping("/udiwms/thrsys/delCorps") - public BaseResponse delCorps(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { - - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - String id = deleteRequest.getId(); - thrCorpService.deleteById(id); - return ResultVOUtils.success("删除成功"); - } - - @RequestMapping("/udiwms/thrsys/corp/delAll") - public BaseResponse delAll() { - thrCorpService.deleteAll(); - return ResultVOUtils.success("删除成功"); - } - + //接口一键导入 @RequestMapping("/udiwms/thrsys/corp/downloadAll") public BaseResponse downloadAll(FilterThrProductsRequest filterThrProductsRequest) { String data = (String) redisUtil.get(Constant.dlThrProducts); @@ -109,7 +137,15 @@ public class ThrCorpsController { if (filterThrProductsRequest.getThirdSysFk() == null) { return ResultVOUtils.error(500, "未选择第三方系统！"); } - thrCorpsDlService.importCorps(filterThrProductsRequest.getThirdSysFk()); + ThrCorpImportLogEntity thrCorpImportLogEntity = new ThrCorpImportLogEntity(); + String genKey = CustomUtil.getId(); + thrCorpImportLogEntity.setGenKey(genKey); + thrCorpImportLogEntity.setFromType("第三方系统获取"); + thrCorpImportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_PROCESS); + thrCorpImportLogEntity.setUpdateTime(new Date()); + thrCorpImportLogEntity.setThirdSysFk(filterThrProductsRequest.getThirdSysFk()); + thrCorpImportLogService.insertImportLog(thrCorpImportLogEntity); + thrCorpsDlService.importCorps(genKey,filterThrProductsRequest.getThirdSysFk()); return ResultVOUtils.success("后台开始下载更新，请稍后刷新查看"); } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrInvProductsController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrInvProductsController.java index 995153ec..d8b939f3 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrInvProductsController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrInvProductsController.java @@ -1,7 +1,10 @@ package com.glxp.api.admin.controller.thrsys; import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.constant.UdiInfoImportStatus; +import com.glxp.api.admin.entity.thrsys.ThrCorpImportLogEntity; import com.glxp.api.admin.entity.thrsys.ThrInvProductsEntity; +import com.glxp.api.admin.entity.thrsys.ThrInvProductsImportLogEntity; import com.glxp.api.admin.req.inout.DeleteRequest; import com.glxp.api.admin.req.thrsys.FilterThrInvProductsRequest; import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest; @@ -11,9 +14,11 @@ import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.basic.ErpUnitsResponse; import com.glxp.api.admin.res.inventory.ErpInvProductResponse; import com.glxp.api.admin.res.inventory.ErpOnHandResponse; +import com.glxp.api.admin.service.thrsys.ThrInvProductsImportLogService; import com.glxp.api.admin.service.thrsys.ThrInvProductsService; import com.glxp.api.admin.thread.ThrInvProductsDlService; import com.glxp.api.admin.util.Constant; +import com.glxp.api.admin.util.CustomUtil; import com.glxp.api.admin.util.RedisUtil; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; @@ -23,6 +28,7 @@ import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -35,6 +41,8 @@ public class ThrInvProductsController { private ThrInvProductsService thrInvProductsService; @Resource private ThrInvProductsDlService thrInvProductsDlService; + @Resource + private ThrInvProductsImportLogService thrInvProductsImportLogService; @GetMapping("/udiwms/thrsys/getInvProducts") public BaseResponse getInvProducts(FilterThrInvProductsRequest filterThrInvProductsRequest, @@ -62,6 +70,24 @@ public class ThrInvProductsController { } List thrInvProductsEntities; List erpOnHandResponses = postThrInvProductsRequest.getDatas(); + + String genKey = postThrInvProductsRequest.getGenKey(); + if (genKey == null) { + genKey = CustomUtil.getId(); + } + ThrInvProductsImportLogEntity thrInvProductsImportLogEntity = thrInvProductsImportLogService.selectByGenKey(genKey); + if (thrInvProductsImportLogEntity == null) { + thrInvProductsImportLogEntity = new ThrInvProductsImportLogEntity(); + thrInvProductsImportLogEntity.setGenKey(genKey); + if (postThrInvProductsRequest.getUploadType() != null) { + thrInvProductsImportLogEntity.setFromType(postThrInvProductsRequest.getUploadType()); + } else + thrInvProductsImportLogEntity.setFromType("第三方系统上传"); + thrInvProductsImportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_PROCESS); + thrInvProductsImportLogEntity.setUpdateTime(new Date()); + thrInvProductsImportLogEntity.setThirdSysFk(postThrInvProductsRequest.getThirdSys()); + thrInvProductsImportLogService.insertImportLog(thrInvProductsImportLogEntity); + } if (erpOnHandResponses != null && erpOnHandResponses.size() > 0) { thrInvProductsEntities = erpOnHandResponses.stream().map( @@ -75,9 +101,16 @@ public class ThrInvProductsController { } ).collect(Collectors.toList()); thrInvProductsService.insertThrInvProducts(thrInvProductsEntities); - return ResultVOUtils.success("往来单位上传成功！"); - } + thrInvProductsImportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_SUCCESS); + thrInvProductsImportLogEntity.setUpdateTime(new Date()); + thrInvProductsImportLogService.updateImportLog(thrInvProductsImportLogEntity); + return ResultVOUtils.success("库存产品信息上传成功！"); + } + thrInvProductsImportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_FAIL); + thrInvProductsImportLogEntity.setUpdateTime(new Date()); + thrInvProductsImportLogEntity.setRemark("上传数据为空"); + thrInvProductsImportLogService.updateImportLog(thrInvProductsImportLogEntity); return ResultVOUtils.error(500, "上传数据为空"); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrInvProductsExportLogController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrInvProductsExportLogController.java new file mode 100644 index 00000000..90123e08 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrInvProductsExportLogController.java @@ -0,0 +1,131 @@ +package com.glxp.api.admin.controller.thrsys; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.constant.UdiInfoImportStatus; +import com.glxp.api.admin.entity.thrsys.ThrInvProductsExportLogEntity; +import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest; +import com.glxp.api.admin.req.inout.DeleteRequest; +import com.glxp.api.admin.req.thrsys.ThrInvProductsExportRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.service.thrsys.ThrInvProductsExportLogService; +import com.glxp.api.admin.thread.ThrInvProductsDlService; +import com.glxp.api.admin.util.CustomUtil; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.util.Date; +import java.util.List; + +@RestController +public class ThrInvProductsExportLogController { + @Resource + ThrInvProductsExportLogService thrInvProductsExportLogService; + @Resource + ThrInvProductsDlService thrInvProductsDlService; + + @GetMapping("/udiwms/invProducts/exportLog/filter") + public BaseResponse filter(FilterUdiEpLogRequest filterUdiEpLogReques, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List thrInvProductsExportLogEntities + = thrInvProductsExportLogService.filterThrInvProductsExportLog(filterUdiEpLogReques); + PageInfo pageInfo; + pageInfo = new PageInfo<>(thrInvProductsExportLogEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(thrInvProductsExportLogEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @PostMapping("/udiwms/invProducts/exportLog/deleteLog") + public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + String id = deleteRequest.getId(); + thrInvProductsExportLogService.deleteById(id + ""); + return ResultVOUtils.success("删除成功"); + } + + //产品信息excel文件下载 + @GetMapping("/udiwms/invProducts/exportLog/download") + public void download(FilterUdiEpLogRequest filterUdiEpLogRequest, HttpServletResponse res) { + + List thrInvProductsExportLogEntities = thrInvProductsExportLogService.filterThrInvProductsExportLog(filterUdiEpLogRequest); + ThrInvProductsExportLogEntity thrInvProductsExportLogEntity = thrInvProductsExportLogEntities.get(0); + try { + String filePath = thrInvProductsExportLogEntity.getFilePath(); + String fileName = "temp"; + if (filePath != null && filePath.length() > 0) { + String[] data = filePath.split("/"); + fileName = data[data.length - 1]; + } + res.setHeader("Content-disposition", "attachment;fileName=" + fileName); + res.setContentType("text/plain;charset=UTF-8"); + FileInputStream input = new FileInputStream(new File(filePath)); + OutputStream out = res.getOutputStream(); + byte[] b = new byte[2048]; + int len; + while ((len = input.read(b)) != -1) { + out.write(b, 0, len); + } + input.close(); + if (thrInvProductsExportLogEntity.getDlCount() == 0) { + thrInvProductsExportLogEntity.setDlCount(1); + } else { + thrInvProductsExportLogEntity.setDlCount(thrInvProductsExportLogEntity.getDlCount() + 1); + } + thrInvProductsExportLogService.updateThrInvProductsExportLog(thrInvProductsExportLogEntity); + } catch (Exception ex) { + System.out.println("下载失败！"); + } + + + } + + //产品信息导出生成Excel，并创建生成记录 + @PostMapping("/udiwms/invProducts/importLog/export") + public BaseResponse excelDownload(@RequestBody ThrInvProductsExportRequest thrInvProductsExportRequest) { + + + String fileName = "D:\\udiwms\\exportFile\\" + "库存产品信息导出" + System.currentTimeMillis() + ".xls"; + File file = new File(fileName); + if (!file.exists()) { + try { + file.createNewFile(); + } catch (IOException e) { + e.printStackTrace(); + } + } + ThrInvProductsExportLogEntity udiInfoExportLogEntity = new ThrInvProductsExportLogEntity(); + udiInfoExportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_PROCESS); + String genKey = CustomUtil.getId(); + udiInfoExportLogEntity.setGenKey(genKey); + udiInfoExportLogEntity.setFilePath(fileName); + udiInfoExportLogEntity.setUpdateTime(new Date()); + udiInfoExportLogEntity.setDlCount(0); + thrInvProductsExportLogService.insertThrInvProductsExportLog(udiInfoExportLogEntity); + thrInvProductsDlService.genExcel(genKey, thrInvProductsExportRequest); + return ResultVOUtils.success("后台正在导出生成excel文件，请稍后刷新查看!"); + + + } + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrInvProductsImportLogController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrInvProductsImportLogController.java new file mode 100644 index 00000000..2f2130be --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrInvProductsImportLogController.java @@ -0,0 +1,64 @@ +package com.glxp.api.admin.controller.thrsys; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.entity.thrsys.ThrInvProductsImportLogEntity; +import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.admin.req.inout.DeleteRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.service.thrsys.ThrInvProductsImportLogService; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +@RestController +public class ThrInvProductsImportLogController { + + + @Resource + ThrInvProductsImportLogService thrInvProductsImportLogService; + + @GetMapping("/udiwms/thrInvProducts/importLog/filter") + public BaseResponse filter(FilterUdiIpLogRequest filterUdiIpLogRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List thrInvProductsImportLogEntities + = thrInvProductsImportLogService.filterImportLog(filterUdiIpLogRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(thrInvProductsImportLogEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(thrInvProductsImportLogEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + + @PostMapping("/udiwms/thrInvProducts/importLog/deleteLog") + public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + String id = deleteRequest.getId(); + FilterUdiIpLogRequest filterInCodeLogRequest = new FilterUdiIpLogRequest(); + filterInCodeLogRequest.setId(Integer.parseInt(id)); + List thrInvProductsImportLogEntities = thrInvProductsImportLogService.filterImportLog(filterInCodeLogRequest); + if (thrInvProductsImportLogEntities != null && thrInvProductsImportLogEntities.size() > 0) { + ThrInvProductsImportLogEntity thrInvProductsImportLogEntity = thrInvProductsImportLogEntities.get(0); + thrInvProductsImportLogService.deleteById(thrInvProductsImportLogEntity.getId() + ""); + } + + return ResultVOUtils.success("删除成功"); + } + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderController.java index 001d778b..70f4784c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderController.java @@ -1,19 +1,26 @@ package com.glxp.api.admin.controller.thrsys; +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.TypeReference; import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.constant.UdiInfoImportStatus; +import com.glxp.api.admin.entity.basic.UdiInfoImportLogEntity; +import com.glxp.api.admin.entity.info.SystemParamConfigEntity; import com.glxp.api.admin.entity.thrsys.ThrOrderDetailEntity; import com.glxp.api.admin.entity.thrsys.ThrOrderEntity; +import com.glxp.api.admin.entity.thrsys.ThrOrderImportLogEntity; import com.glxp.api.admin.req.inout.DeleteRequest; -import com.glxp.api.admin.req.thrsys.FilterThrOrderDetailRequest; -import com.glxp.api.admin.req.thrsys.FilterThrOrderRequest; -import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest; -import com.glxp.api.admin.req.thrsys.PostThrOrderRequest; +import com.glxp.api.admin.req.thrsys.*; import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.inout.ErpOrderResponse; +import com.glxp.api.admin.service.info.SystemParamConfigService; import com.glxp.api.admin.service.thrsys.ThrOrderDetailService; +import com.glxp.api.admin.service.thrsys.ThrOrderImportLogService; import com.glxp.api.admin.service.thrsys.ThrOrderService; import com.glxp.api.admin.thread.ThrOrdersDlService; import com.glxp.api.admin.util.Constant; +import com.glxp.api.admin.util.CustomUtil; +import com.glxp.api.admin.util.HttpClient; import com.glxp.api.admin.util.RedisUtil; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; @@ -23,6 +30,8 @@ import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -35,7 +44,11 @@ public class ThrOrderController { @Resource private ThrOrdersDlService thrOrdersDlService; @Resource + private ThrOrderImportLogService thrOrderImportLogService; + @Resource RedisUtil redisUtil; + @Resource + private SystemParamConfigService systemParamConfigService; @GetMapping("/udiwms/thrsys/getOrders") public BaseResponse getOrders(FilterThrOrderRequest filterThrOrderRequest, @@ -80,6 +93,19 @@ public class ThrOrderController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } + String genKey = postThrOrderRequest.getGenKey(); + if (genKey == null) { + genKey = CustomUtil.getId(); + } + ThrOrderImportLogEntity thrOrderImportLogEntity = thrOrderImportLogService.selectByGenKey(genKey); + if (thrOrderImportLogEntity == null) { + thrOrderImportLogEntity.setGenKey(genKey); + thrOrderImportLogEntity.setFromType("第三方系统上传"); + thrOrderImportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_PROCESS); + thrOrderImportLogEntity.setUpdateTime(new Date()); + thrOrderImportLogEntity.setThirdSysFk(postThrOrderRequest.getThirdSys()); + thrOrderImportLogService.insertImportLog(thrOrderImportLogEntity); + } List thrOrderEntities; List erpOrderResponses = postThrOrderRequest.getDatas(); if (erpOrderResponses != null && erpOrderResponses.size() > 0) { @@ -111,7 +137,9 @@ public class ThrOrderController { thrOrderService.insertThrOrders(thrOrderEntities); return ResultVOUtils.success("单据上传成功！"); } - + thrOrderImportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_SUCCESS); + thrOrderImportLogEntity.setUpdateTime(new Date()); + thrOrderImportLogService.updateImportLog(thrOrderImportLogEntity); return ResultVOUtils.error(500, "上传数据为空"); } @@ -147,8 +175,66 @@ public class ThrOrderController { if (filterThrProductsRequest.getBillAction() == null) { return ResultVOUtils.error(500, "未选择业务类型！"); } - thrOrdersDlService.importOrders(filterThrProductsRequest.getThirdSysFk()); + + ThrOrderImportLogEntity thrOrderImportLogEntity = new ThrOrderImportLogEntity(); + String genKey = CustomUtil.getId(); + thrOrderImportLogEntity.setGenKey(genKey); + thrOrderImportLogEntity.setFromType("第三方系统获取"); + thrOrderImportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_PROCESS); + thrOrderImportLogEntity.setUpdateTime(new Date()); + thrOrderImportLogEntity.setThirdSysFk(filterThrProductsRequest.getThirdSysFk()); + thrOrderImportLogService.insertImportLog(thrOrderImportLogEntity); + + thrOrdersDlService.importOrders(genKey,filterThrProductsRequest.getBillAction()); return ResultVOUtils.success("后台开始下载更新，请稍后刷新查看"); } } + + + @PostMapping("/udiwms/smp/postOrder") + public BaseResponse postSmpOrder(@RequestBody PostSmpOrderRequest postSmpOrderRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("smp_uploadOrder_url"); + String postUrl; + if (systemParamConfigEntity == null) + return ResultVOUtils.error(500, "上传供应商平台接口地址未定义"); + else + postUrl = systemParamConfigEntity.getParamValue(); + + List ids = postSmpOrderRequest.getIds(); + for (String id : ids) { + ThrOrderEntity thrOrderEntity = thrOrderService.findById(id); + UploadSmpRequest uploadSmpRequest = new UploadSmpRequest(); + BeanUtils.copyProperties(thrOrderEntity, uploadSmpRequest); + uploadSmpRequest.setType(1); + FilterThrOrderDetailRequest filterThrOrderDetailRequest = new FilterThrOrderDetailRequest(); + filterThrOrderDetailRequest.setOrderIdFk(id); + List thrOrderDetailEntities = thrOrderDetailService.filterThrOrderDetailDetail(filterThrOrderDetailRequest); + if (thrOrderDetailEntities != null && thrOrderDetailEntities.size() > 0) { + List subErpOrders = new ArrayList<>(); + for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) { + UploadSmpRequest.SubErpOrder subErpOrder = new UploadSmpRequest.SubErpOrder(); + BeanUtils.copyProperties(thrOrderDetailEntity, subErpOrder); + subErpOrders.add(subErpOrder); + } + uploadSmpRequest.setSubErpOrders(subErpOrders); + + String response = HttpClient.uCloudPost(postUrl, uploadSmpRequest); + BaseResponse baseResponse = + JSONObject.parseObject(response, new TypeReference() { + }); + if (baseResponse.getCode() == 20000) { + return ResultVOUtils.success("上传成功！"); + } else { + return ResultVOUtils.error(baseResponse.getCode(), baseResponse.getMessage()); + } + } + } + return ResultVOUtils.error(500, "上传数据成功"); + } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderExportLogController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderExportLogController.java new file mode 100644 index 00000000..0bb34550 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderExportLogController.java @@ -0,0 +1,143 @@ +package com.glxp.api.admin.controller.thrsys; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.constant.UdiInfoImportStatus; +import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; +import com.glxp.api.admin.entity.thrsys.ThrOrderDetailEntity; +import com.glxp.api.admin.entity.thrsys.ThrOrderEntity; +import com.glxp.api.admin.entity.thrsys.ThrOrderExportLogEntity; +import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest; +import com.glxp.api.admin.req.inout.DeleteRequest; +import com.glxp.api.admin.req.thrsys.FilterThrOrderDetailRequest; +import com.glxp.api.admin.req.thrsys.FilterThrOrderRequest; +import com.glxp.api.admin.req.thrsys.ThrOrderExportRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.res.inout.ErpOrderResponse; +import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; +import com.glxp.api.admin.service.thrsys.ThrOrderDetailService; +import com.glxp.api.admin.service.thrsys.ThrOrderExportLogService; +import com.glxp.api.admin.service.thrsys.ThrOrderService; +import com.glxp.api.admin.thread.ThrOrdersDlService; +import com.glxp.api.admin.util.CustomUtil; +import com.glxp.api.admin.util.ExcelUtil; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +@RestController +public class ThrOrderExportLogController { + @Resource + ThrOrderExportLogService thrOrderExportLogService; + @Resource + ThrOrdersDlService thrOrdersDlService; + + @GetMapping("/udiwms/thrOrder/exportLog/filter") + public BaseResponse filter(FilterUdiEpLogRequest filterUdiEpLogReques, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List udiInfoExportLogEntities + = thrOrderExportLogService.filterThrOrderExportLog(filterUdiEpLogReques); + PageInfo pageInfo; + pageInfo = new PageInfo<>(udiInfoExportLogEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(udiInfoExportLogEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @PostMapping("/udiwms/thrOrder/exportLog/deleteLog") + public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + String id = deleteRequest.getId(); + thrOrderExportLogService.deleteById(id + ""); + return ResultVOUtils.success("删除成功"); + } + + //产品信息excel文件下载 + @GetMapping("/udiwms/thrOrder/exportLog/download") + public void download(FilterUdiEpLogRequest filterUdiEpLogRequest, HttpServletResponse res) { + + List thrOrderExportLogEntities = thrOrderExportLogService.filterThrOrderExportLog(filterUdiEpLogRequest); + ThrOrderExportLogEntity thrOrderExportLogEntity = thrOrderExportLogEntities.get(0); + try { + String filePath = thrOrderExportLogEntity.getFilePath(); + String fileName = "temp"; + if (filePath != null && filePath.length() > 0) { + String[] data = filePath.split("/"); + fileName = data[data.length - 1]; + } + res.setHeader("Content-disposition", "attachment;fileName=" + fileName); + res.setContentType("text/plain;charset=UTF-8"); + FileInputStream input = new FileInputStream(new File(filePath)); + OutputStream out = res.getOutputStream(); + byte[] b = new byte[2048]; + int len; + while ((len = input.read(b)) != -1) { + out.write(b, 0, len); + } + input.close(); + if (thrOrderExportLogEntity.getDlCount() == 0) { + thrOrderExportLogEntity.setDlCount(1); + } else { + thrOrderExportLogEntity.setDlCount(thrOrderExportLogEntity.getDlCount() + 1); + } + thrOrderExportLogService.updateThrOrderExportLog(thrOrderExportLogEntity); + } catch (Exception ex) { + System.out.println("下载失败！"); + } + + + } + + //产品信息导出生成Excel，并创建生成记录 + @PostMapping("/udiwms/thrOrder/importLog/export") + public BaseResponse excelDownload(@RequestBody ThrOrderExportRequest thrOrderExportRequest) { + + + String fileName = "D:\\udiwms\\exportFile\\" + "业务单据导出" + System.currentTimeMillis() + ".xls"; + File file = new File(fileName); + if (!file.exists()) { + try { + file.createNewFile(); + } catch (IOException e) { + e.printStackTrace(); + } + } + + ThrOrderExportLogEntity udiInfoExportLogEntity = new ThrOrderExportLogEntity(); + udiInfoExportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_PROCESS); + String genKey = CustomUtil.getId(); + udiInfoExportLogEntity.setGenKey(genKey); + udiInfoExportLogEntity.setFilePath(fileName); + udiInfoExportLogEntity.setUpdateTime(new Date()); + udiInfoExportLogEntity.setDlCount(0); + thrOrderExportLogService.insertThrOrderExportLog(udiInfoExportLogEntity); + thrOrdersDlService.genExcel(genKey,thrOrderExportRequest); + return ResultVOUtils.success("后台正在导出生成excel文件，请稍后刷新查看!"); + + } + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderImportLogController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderImportLogController.java new file mode 100644 index 00000000..d53a0752 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderImportLogController.java @@ -0,0 +1,293 @@ +package com.glxp.api.admin.controller.thrsys; + + +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.constant.UdiInfoImportStatus; +import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; +import com.glxp.api.admin.entity.thrsys.ThrOrderImportDetailEntity; +import com.glxp.api.admin.entity.thrsys.ThrOrderImportLogEntity; +import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.admin.req.basic.PostCorpsRequest; +import com.glxp.api.admin.req.inout.DeleteRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.service.basic.*; +import com.glxp.api.admin.service.thrsys.ThrOrderDetailService; +import com.glxp.api.admin.service.thrsys.ThrOrderImportDetailService; +import com.glxp.api.admin.service.thrsys.ThrOrderImportLogService; +import com.glxp.api.admin.service.thrsys.ThrOrderService; +import com.glxp.api.admin.thread.ThrOrderImportService; +import com.glxp.api.admin.util.CustomUtil; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +@RestController +public class ThrOrderImportLogController { + + @Resource + ThrOrderImportLogService thrOrderImportLogService; + @Resource + BasicThirdSysService basicThirdSysService; + @Resource + ThrOrderImportDetailService thrOrderImportDetailService; + @Resource + ThrOrderService thrOrderService; + @Resource + ThrOrderDetailService thrOrderDetailService; + @Resource + ThrOrderImportService thrOrderImportService; + + @GetMapping("/udiwms/thrOrder/importLog/filter") + public BaseResponse filter(FilterUdiIpLogRequest filterUdiIpLogRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List udiInfoImportLogEntities + = thrOrderImportLogService.filterImportLog(filterUdiIpLogRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(udiInfoImportLogEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(udiInfoImportLogEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @GetMapping("/udiwms/thrOrder/importLog/filterDetail") + public BaseResponse filterDetail(FilterUdiIpLogRequest filterUdiIpLogRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List thrOrderImportDetailEntities + = thrOrderImportDetailService.filterOrderImportDetail(filterUdiIpLogRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(thrOrderImportDetailEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(thrOrderImportDetailEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + + @PostMapping("/udiwms/thrOrder/importLog/deleteLog") + public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + String id = deleteRequest.getId(); + FilterUdiIpLogRequest filterInCodeLogRequest = new FilterUdiIpLogRequest(); + filterInCodeLogRequest.setId(Integer.parseInt(id)); + List corpImportLogEntities = thrOrderImportLogService.filterImportLog(filterInCodeLogRequest); + if (corpImportLogEntities != null && corpImportLogEntities.size() > 0) { + ThrOrderImportLogEntity corpImportLogEntity = corpImportLogEntities.get(0); + thrOrderImportLogService.deleteById(corpImportLogEntity.getId() + ""); + thrOrderImportDetailService.deleteByGenkey(corpImportLogEntity.getGenKey()); + } + + return ResultVOUtils.success("删除成功"); + } + + @PostMapping("/udiwms/thrOrder/importLog/delete") + public BaseResponse delete(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + if (thrOrderImportDetailService.deleteById(deleteRequest.getId())) + return ResultVOUtils.success("删除成功"); + else + return ResultVOUtils.error(500, "删除成功"); + } + + + @PostMapping("/udiwms/thrOrder/importLog/upload") + public BaseResponse uploadProducts(@RequestParam("file") List files, @RequestParam("thirdSys") String thirdSys) { + + BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys(); + String filePath = "D:\\udiwms\\filePath\\"; + File createFile = new File(filePath); + if (!createFile.exists()) { + createFile.mkdirs(); + } + for (int i = 0; i < files.size(); i++) { + MultipartFile file = files.get(i); + if (file.isEmpty()) { + return ResultVOUtils.error(500, "上传第" + (i++) + "个文件失败"); + } + String fileName = file.getOriginalFilename(); + try { + InputStream inputStream = file.getInputStream(); + Workbook workbook = null; + String filetype = fileName.substring(fileName.lastIndexOf(".")); + + if (".xls".equals(filetype)) { + workbook = new HSSFWorkbook(inputStream); + } else if (".xlsx".equals(filetype)) { + workbook = new XSSFWorkbook(inputStream); + } else { + return ResultVOUtils.error(500, "请上传excel文件"); + } + Sheet sheet = null; + Row row = null; + ThrOrderImportLogEntity thrOrderImportLogEntity = new ThrOrderImportLogEntity(); + String genKey = CustomUtil.getId(); + thrOrderImportLogEntity.setGenKey(genKey); + thrOrderImportLogEntity.setFromType("文件导入"); + thrOrderImportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_UNPROCESS); + thrOrderImportLogEntity.setUpdateTime(new Date(System.currentTimeMillis())); + thrOrderImportLogService.insertImportLog(thrOrderImportLogEntity); + List corpImportDetailEntities = new ArrayList<>(); + for (int j = 0; j < workbook.getNumberOfSheets(); j++) { + sheet = workbook.getSheetAt(j); + if (sheet == null) { + continue; + } + // 滤过第一行标题 + for (int k = sheet.getFirstRowNum(); k <= sheet.getLastRowNum(); k++) { + row = sheet.getRow(k); + if (row == null || row.getFirstCellNum() == k) { + continue; + } + ThrOrderImportDetailEntity corpImportDetailEntity = new ThrOrderImportDetailEntity(); + Cell cell1 = row.getCell(0); + if (cell1 != null) { + cell1.setCellType(CellType.STRING); + corpImportDetailEntity.setBillNo(cell1.getStringCellValue()); + } + + + Cell cell2 = row.getCell(1); + if (cell2 != null) { + cell2.setCellType(CellType.STRING); + corpImportDetailEntity.setBilldate(cell2.getStringCellValue()); + } + Cell cell3 = row.getCell(2); + if (cell3 != null) { + cell3.setCellType(CellType.STRING); + corpImportDetailEntity.setCorpId(cell3.getStringCellValue()); + + } + Cell cell4 = row.getCell(3); + if (cell4 != null) { + cell4.setCellType(CellType.STRING); + corpImportDetailEntity.setCorpName(cell4.getStringCellValue()); + + } + Cell cell5 = row.getCell(4); + if (cell5 != null) { + cell5.setCellType(CellType.STRING); + corpImportDetailEntity.setBillType(cell5.getStringCellValue()); + + } + Cell cell6 = row.getCell(5); + if (cell6 != null) { + cell6.setCellType(CellType.STRING); + corpImportDetailEntity.setBillFlag(cell6.getStringCellValue()); + } + + Cell cell7 = row.getCell(6); + if (cell7 != null) { + cell7.setCellType(CellType.STRING); + corpImportDetailEntity.setProductId(cell7.getStringCellValue()); + } + + Cell cell8 = row.getCell(7); + if (cell8 != null) { + cell8.setCellType(CellType.STRING); + corpImportDetailEntity.setProductName(cell8.getStringCellValue()); + } + + Cell cell9 = row.getCell(8); + if (cell9 != null) { + cell9.setCellType(CellType.STRING); + corpImportDetailEntity.setProductDate(cell9.getStringCellValue()); + } + + Cell cell10 = row.getCell(9); + if (cell10 != null) { + cell10.setCellType(CellType.STRING); + corpImportDetailEntity.setExpireDate(cell10.getStringCellValue()); + } + + Cell cell11 = row.getCell(10); + corpImportDetailEntity.setCount((int) cell11.getNumericCellValue()); + + Cell cell12 = row.getCell(11); + corpImportDetailEntity.setReCount((int) cell12.getNumericCellValue()); + + corpImportDetailEntity.setThirdSysFk(thirdSys); + corpImportDetailEntity.setGenKeyFk(genKey); + corpImportDetailEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_CODE_UNPROCESS); + corpImportDetailEntity.setUpdateTime(new Date(System.currentTimeMillis())); + corpImportDetailEntities.add(corpImportDetailEntity); + } + } + thrOrderImportDetailService.insertOrderImportDetails(corpImportDetailEntities); + thrOrderImportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_UNPROCESS); + thrOrderImportLogService.updateImportLog(thrOrderImportLogEntity); + workbook.close(); + thrOrderImportService.importThrOrder(genKey); + } catch (IOException e) { + e.printStackTrace(); + } + } + return ResultVOUtils.success("上传成功"); + } + + +// //产品信息接口上传 +// @PostMapping("/udiwms/thrOrder/importLog/post") +// public BaseResponse postUdiInfo(@RequestBody PostCorpsRequest postCorpsRequest, BindingResult bindingResult) { +// if (bindingResult.hasErrors()) { +// return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); +// } +// +// +// String genKey = postCorpsRequest.getGenKey(); +// if (genKey == null) { +// genKey = CustomUtil.getId(); +// } +// ThrOrderImportLogEntity corpImportLogEntity = corpImportLogService.selectByGenKey(genKey); +// List corpImportDetailEntities = postCorpsRequest.getDatas(); +// if (corpImportDetailEntities != null) { +// for (ThrOrderImportDetailEntity corpImportDetailEntity : corpImportDetailEntities) { +// corpImportDetailEntity.setGenKeyFk(genKey); +// corpImportDetailEntity.setImportStatus(UdiInfoImportStatus.UDIINFO_IMPORT_CODE_UNPROCESS); +// corpImportDetailEntity.setUpdateTime(new java.util.Date()); +// corpImportDetailService.insertCorpImport(corpImportDetailEntity); +// } +// } +// if (corpImportLogEntity == null) { +// corpImportLogEntity = new ThrOrderImportLogEntity(); +// corpImportLogEntity.setGenKey(genKey); +// corpImportLogEntity.setFromType("文件导入"); +// corpImportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_UNPROCESS); +// corpImportLogEntity.setUpdateTime(new Date(System.currentTimeMillis())); +// corpImportLogService.insertImportLog(corpImportLogEntity); +// } else { +// corpImportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_UNPROCESS); +// corpImportLogService.updateImportLog(corpImportLogEntity); +// } +// basicCorpImportService.importCorps(genKey); +// return ResultVOUtils.success("上传成功"); +// } + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrProductsController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrProductsController.java index f9be0515..bf33185b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrProductsController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrProductsController.java @@ -1,15 +1,20 @@ package com.glxp.api.admin.controller.thrsys; import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.constant.UdiInfoImportStatus; +import com.glxp.api.admin.entity.thrsys.ThrInvProductsImportLogEntity; import com.glxp.api.admin.entity.thrsys.ThrProductsEntity; +import com.glxp.api.admin.entity.thrsys.ThrProductsImportLogEntity; import com.glxp.api.admin.req.inout.DeleteRequest; import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest; import com.glxp.api.admin.req.thrsys.PostThrProductsRequest; import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.basic.ErpProductsResponse; +import com.glxp.api.admin.service.thrsys.ThrProductsImportLogService; import com.glxp.api.admin.service.thrsys.ThrProductsService; import com.glxp.api.admin.thread.ThrProductsDlService; import com.glxp.api.admin.util.Constant; +import com.glxp.api.admin.util.CustomUtil; import com.glxp.api.admin.util.RedisUtil; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; @@ -19,6 +24,7 @@ import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -30,6 +36,9 @@ public class ThrProductsController { private ThrProductsService thrProductsService; @Resource private ThrProductsDlService thrProductsDlService; + @Resource + ThrProductsImportLogService thrProductsImportLogService; + @GetMapping("/udiwms/thrsys/getThrProducts") public BaseResponse getThrProducts(FilterThrProductsRequest filterThrProductsRequest, @@ -57,6 +66,26 @@ public class ThrProductsController { } List thrProductsEntities; List erpProductsResponses = postThrProductsRequest.getDatas(); + + String genKey = postThrProductsRequest.getGenKey(); + if (genKey == null) { + genKey = CustomUtil.getId(); + } + ThrProductsImportLogEntity thrProductsImportLogEntity = thrProductsImportLogService.selectByGenKey(genKey); + if (thrProductsImportLogEntity == null) { + thrProductsImportLogEntity = new ThrProductsImportLogEntity(); + thrProductsImportLogEntity.setGenKey(genKey); + if (postThrProductsRequest.getUploadType() != null) { + thrProductsImportLogEntity.setFromType(postThrProductsRequest.getUploadType()); + } else + thrProductsImportLogEntity.setFromType("第三方系统上传"); + thrProductsImportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_PROCESS); + thrProductsImportLogEntity.setUpdateTime(new Date()); + thrProductsImportLogEntity.setThirdSysFk(postThrProductsRequest.getThirdSys()); + thrProductsImportLogService.insertImportLog(thrProductsImportLogEntity); + } + + if (erpProductsResponses != null && erpProductsResponses.size() > 0) { thrProductsEntities = erpProductsResponses.stream().map( item -> { @@ -67,10 +96,16 @@ public class ThrProductsController { } ).collect(Collectors.toList()); thrProductsService.insertThrProductss(thrProductsEntities); + thrProductsImportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_SUCCESS); + thrProductsImportLogEntity.setUpdateTime(new Date()); + thrProductsImportLogService.updateImportLog(thrProductsImportLogEntity); return ResultVOUtils.success("产品信息上传成功！"); } - + thrProductsImportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_FAIL); + thrProductsImportLogEntity.setUpdateTime(new Date()); + thrProductsImportLogEntity.setRemark("上传数据为空"); + thrProductsImportLogService.updateImportLog(thrProductsImportLogEntity); return ResultVOUtils.error(500, "上传数据为空"); } @@ -102,7 +137,15 @@ public class ThrProductsController { if (filterThrProductsRequest.getThirdSysFk() == null) { return ResultVOUtils.error(500, "未选择第三方系统！"); } - thrProductsDlService.importProducrs(filterThrProductsRequest.getThirdSysFk()); + ThrProductsImportLogEntity thrProductsImportLogEntity = new ThrProductsImportLogEntity(); + String genKey = CustomUtil.getId(); + thrProductsImportLogEntity.setGenKey(genKey); + thrProductsImportLogEntity.setFromType("第三方系统获取"); + thrProductsImportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_PROCESS); + thrProductsImportLogEntity.setUpdateTime(new Date()); + thrProductsImportLogEntity.setThirdSysFk(filterThrProductsRequest.getThirdSysFk()); + thrProductsImportLogService.insertImportLog(thrProductsImportLogEntity); + thrProductsDlService.importProducrs(genKey,filterThrProductsRequest.getThirdSysFk()); return ResultVOUtils.success("后台开始下载更新，请稍后刷新查看"); } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrProductsExportLogController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrProductsExportLogController.java new file mode 100644 index 00000000..2996d9b2 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrProductsExportLogController.java @@ -0,0 +1,143 @@ +package com.glxp.api.admin.controller.thrsys; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.constant.UdiInfoImportStatus; +import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; +import com.glxp.api.admin.entity.thrsys.ThrInvProductsEntity; +import com.glxp.api.admin.entity.thrsys.ThrProductsEntity; +import com.glxp.api.admin.entity.thrsys.ThrProductsExportLogEntity; +import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest; +import com.glxp.api.admin.req.inout.DeleteRequest; +import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest; +import com.glxp.api.admin.req.thrsys.ThrProductsExportRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; +import com.glxp.api.admin.service.thrsys.ThrProductsExportLogService; +import com.glxp.api.admin.service.thrsys.ThrProductsService; +import com.glxp.api.admin.thread.ThrProductsDlService; +import com.glxp.api.admin.util.CustomUtil; +import com.glxp.api.admin.util.ExcelUtil; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +@RestController +public class ThrProductsExportLogController { + + @Resource + ThrProductsExportLogService thrProductsExportLogService; + @Resource + ThrProductsService thrProductsService; + @Resource + ThrProductsDlService thrProductsDlService; + @Resource + BasicThirdSysDetailService basicThirdSysDetailService; + + @GetMapping("/udiwms/thrProducts/exportLog/filter") + public BaseResponse filter(FilterUdiEpLogRequest filterUdiEpLogReques, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List thrProductsExportLogEntities + = thrProductsExportLogService.filterThrProductsExportLog(filterUdiEpLogReques); + PageInfo pageInfo; + pageInfo = new PageInfo<>(thrProductsExportLogEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(thrProductsExportLogEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @PostMapping("/udiwms/thrProducts/exportLog/deleteLog") + public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + String id = deleteRequest.getId(); + thrProductsExportLogService.deleteById(id + ""); + return ResultVOUtils.success("删除成功"); + } + + //产品信息excel文件下载 + @GetMapping("/udiwms/thrProducts/exportLog/download") + public void download(FilterUdiEpLogRequest filterUdiEpLogRequest, HttpServletResponse res) { + + List thrProductsExportLogEntities = thrProductsExportLogService.filterThrProductsExportLog(filterUdiEpLogRequest); + ThrProductsExportLogEntity thrProductsExportLogEntity = thrProductsExportLogEntities.get(0); + try { + String filePath = thrProductsExportLogEntity.getFilePath(); + String fileName = "temp"; + if (filePath != null && filePath.length() > 0) { + String[] data = filePath.split("/"); + fileName = data[data.length - 1]; + } + res.setHeader("Content-disposition", "attachment;fileName=" + fileName); + res.setContentType("text/plain;charset=UTF-8"); + FileInputStream input = new FileInputStream(new File(filePath)); + OutputStream out = res.getOutputStream(); + byte[] b = new byte[2048]; + int len; + while ((len = input.read(b)) != -1) { + out.write(b, 0, len); + } + input.close(); + if (thrProductsExportLogEntity.getDlCount() == 0) { + thrProductsExportLogEntity.setDlCount(1); + } else { + thrProductsExportLogEntity.setDlCount(thrProductsExportLogEntity.getDlCount() + 1); + } + thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity); + } catch (Exception ex) { + System.out.println("下载失败！"); + } + + + } + + //产品信息导出生成Excel，并创建生成记录 + @PostMapping("/udiwms/thrProducts/importLog/export") + public BaseResponse excelDownload(@RequestBody ThrProductsExportRequest thrProductsExportRequest) { + + String fileName = "D:\\udiwms\\exportFile\\" + "产品信息导出" + System.currentTimeMillis() + ".xls"; + File file = new File(fileName); + if (!file.exists()) { + try { + file.createNewFile(); + } catch (IOException e) { + e.printStackTrace(); + } + } + ThrProductsExportLogEntity thrProductsExportLogEntity = new ThrProductsExportLogEntity(); + thrProductsExportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_PROCESS); + String genKey = CustomUtil.getId(); + thrProductsExportLogEntity.setGenKey(genKey); + thrProductsExportLogEntity.setFilePath(fileName); + thrProductsExportLogEntity.setUpdateTime(new Date()); + thrProductsExportLogEntity.setDlCount(0); + thrProductsExportLogService.insertThrProductsExportLog(thrProductsExportLogEntity); + thrProductsDlService.genExcel(genKey, thrProductsExportRequest); + return ResultVOUtils.success("后台正在导出生成excel文件，请稍后刷新查看!"); + + } + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrProductsImportLogController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrProductsImportLogController.java new file mode 100644 index 00000000..51aaed6e --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrProductsImportLogController.java @@ -0,0 +1,63 @@ +package com.glxp.api.admin.controller.thrsys; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.entity.thrsys.ThrProductsImportLogEntity; +import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.admin.req.inout.DeleteRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.service.thrsys.ThrInvProductsImportLogService; +import com.glxp.api.admin.service.thrsys.ThrProductsImportLogService; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +@RestController +public class ThrProductsImportLogController { + + @Resource + ThrProductsImportLogService thrProductsImportLogService; + + @GetMapping("/udiwms/thrProducts//importLog/filter") + public BaseResponse filter(FilterUdiIpLogRequest filterUdiIpLogRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List thrProductsImportLogEntities + = thrProductsImportLogService.filterImportLog(filterUdiIpLogRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(thrProductsImportLogEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(thrProductsImportLogEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + + @PostMapping("/udiwms/thrProducts//importLog/deleteLog") + public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + String id = deleteRequest.getId(); + FilterUdiIpLogRequest filterInCodeLogRequest = new FilterUdiIpLogRequest(); + filterInCodeLogRequest.setId(Integer.parseInt(id)); + List thrProductsImportLogEntities = thrProductsImportLogService.filterImportLog(filterInCodeLogRequest); + if (thrProductsImportLogEntities != null && thrProductsImportLogEntities.size() > 0) { + ThrProductsImportLogEntity thrInvProductsImportLogEntity = thrProductsImportLogEntities.get(0); + thrProductsImportLogService.deleteById(thrInvProductsImportLogEntity.getId() + ""); + } + + return ResultVOUtils.success("删除成功"); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/CorpExportLogDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/CorpExportLogDao.java new file mode 100644 index 00000000..c340ad56 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/CorpExportLogDao.java @@ -0,0 +1,19 @@ +package com.glxp.api.admin.dao.basic; + +import com.glxp.api.admin.entity.basic.CorpExportLogEntity; +import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface CorpExportLogDao { + List filterCorpExportLog(FilterUdiEpLogRequest filterUdiEpLogRequest); + + boolean insertCorpExportLog(CorpExportLogEntity corpExportLogEntity); + + boolean updateCorpExportLog(CorpExportLogEntity corpExportLogEntity); + + boolean deleteById(@Param("id") String id); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/CorpImportDetailDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/CorpImportDetailDao.java new file mode 100644 index 00000000..b5f2e384 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/CorpImportDetailDao.java @@ -0,0 +1,25 @@ +package com.glxp.api.admin.dao.basic; + +import com.glxp.api.admin.entity.basic.CorpImportDetailEntity; +import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface CorpImportDetailDao { + + List filterCorpImport(FilterUdiIpLogRequest filterUdiIpLogRequest); + + boolean insertCorpImport(CorpImportDetailEntity corpImportDetailEntity); + + boolean updateCorpImport(CorpImportDetailEntity corpImportDetailEntity); + + boolean insertCorpImports(@Param("corps") List corpImportDetailEntities); + + boolean deleteById(@Param("id") String id); + + boolean deleteByGenkey(@Param("genKey") String genKey); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/CorpImportLogDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/CorpImportLogDao.java new file mode 100644 index 00000000..880a1476 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/CorpImportLogDao.java @@ -0,0 +1,19 @@ +package com.glxp.api.admin.dao.basic; + +import com.glxp.api.admin.entity.basic.CorpImportLogEntity; +import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface CorpImportLogDao { + List filterImportLog(FilterUdiIpLogRequest filterInCodeLogRequest); + + boolean insertImportLog(CorpImportLogEntity corpImportLogEntity); + + boolean updateImportLog(CorpImportLogEntity corpImportLogEntity); + + boolean deleteById(@Param("id") String id); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiInfoExportLogDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiInfoExportLogDao.java new file mode 100644 index 00000000..20dc81f6 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiInfoExportLogDao.java @@ -0,0 +1,22 @@ +package com.glxp.api.admin.dao.basic; + +import com.glxp.api.admin.entity.basic.UdiInfoExportLogEntity; +import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest; +import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface UdiInfoExportLogDao { + + List filterUdiInfoExportLog(FilterUdiEpLogRequest filterInCodeLogRequest); + + boolean insertUdiInfoExportLog(UdiInfoExportLogEntity udiInfoImportEntity); + + boolean updateUdiInfoExportLog(UdiInfoExportLogEntity udiInfoImportEntity); + + boolean deleteById(@Param("id") String id); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiInfoImportDetailDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiInfoImportDetailDao.java new file mode 100644 index 00000000..d2e27319 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiInfoImportDetailDao.java @@ -0,0 +1,25 @@ +package com.glxp.api.admin.dao.basic; + +import com.glxp.api.admin.entity.basic.UdiInfoImportDetailEntity; +import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface UdiInfoImportDetailDao { + + List filterUdiInfoImport(FilterUdiIpLogRequest filterInCodeLogRequest); + + boolean insertUdiInfoImport(UdiInfoImportDetailEntity udiInfoImportEntity); + + boolean updateUdiInfoImport(UdiInfoImportDetailEntity udiInfoImportEntity); + + boolean insertUdiInfoImports(@Param("udiInfos") List udiInfos); + + boolean deleteById(@Param("id") String id); + + boolean deleteByGenkey(@Param("genKey") String genKey); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiInfoImportLogDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiInfoImportLogDao.java new file mode 100644 index 00000000..b6865c7c --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiInfoImportLogDao.java @@ -0,0 +1,22 @@ +package com.glxp.api.admin.dao.basic; + +import com.glxp.api.admin.entity.basic.UdiInfoImportLogEntity; +import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface UdiInfoImportLogDao { + + List filterImportLog(FilterUdiIpLogRequest filterInCodeLogRequest); + + boolean insertImportLog(UdiInfoImportLogEntity udiInfoImportLogEntity); + + boolean updateImportLog(UdiInfoImportLogEntity udiInfoImportLogEntity); + + boolean deleteById(@Param("id") String id); + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiRelevanceDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiRelevanceDao.java index cc17c9b0..45d005dd 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiRelevanceDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiRelevanceDao.java @@ -21,7 +21,7 @@ public interface UdiRelevanceDao { UdiRelevanceEntity selectById(@Param("id") String id); - UdiRelevanceEntity selectByThirdId(@Param("thirdId")String thirdId); + UdiRelevanceEntity selectByThirdId(FilterUdiInfoRequest filterUdiInfoRequest); boolean insertUdiRelevance(UdiRelevanceEntity udiRelevanceEntity); diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpExportLogDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpExportLogDao.java new file mode 100644 index 00000000..5e6a7bc4 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpExportLogDao.java @@ -0,0 +1,21 @@ +package com.glxp.api.admin.dao.thrsys; + +import com.glxp.api.admin.entity.thrsys.ThrCorpExportLogEntity; +import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface ThrCorpExportLogDao { + + + List filterThrCorpExportLog(FilterUdiEpLogRequest filterUdiEpLogRequest); + + boolean insertThrCorpExportLog(ThrCorpExportLogEntity thrCorpExportLogEntity); + + boolean updateThrCorpExportLog(ThrCorpExportLogEntity thrCorpExportLogEntity); + + boolean deleteById(@Param("id") String id); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpImportLogDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpImportLogDao.java new file mode 100644 index 00000000..873205d6 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpImportLogDao.java @@ -0,0 +1,21 @@ +package com.glxp.api.admin.dao.thrsys; + +import com.glxp.api.admin.entity.thrsys.ThrCorpImportLogEntity; +import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface ThrCorpImportLogDao { + + List filterImportLog(FilterUdiIpLogRequest filterInCodeLogRequest); + + boolean insertImportLog(ThrCorpImportLogEntity thrCorpImportLogEntity); + + boolean updateImportLog(ThrCorpImportLogEntity thrCorpImportLogEntity); + + boolean deleteById(@Param("id") String id); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrInvProductsDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrInvProductsDao.java index d2700d11..44a01d71 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrInvProductsDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrInvProductsDao.java @@ -12,6 +12,8 @@ public interface ThrInvProductsDao { List filterThrInvProductss(FilterThrInvProductsRequest filterThrInvProductsRequest); + ThrInvProductsEntity selectById(@Param("id") String id); + boolean insertThrInvProduct(ThrInvProductsEntity thrInvProductsEntity); boolean insertThrInvProducts(@Param("thrInvProductsEntities") List thrInvProductsEntities); diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrInvProductsExportLogDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrInvProductsExportLogDao.java new file mode 100644 index 00000000..c8fcc835 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrInvProductsExportLogDao.java @@ -0,0 +1,19 @@ +package com.glxp.api.admin.dao.thrsys; + +import com.glxp.api.admin.entity.thrsys.ThrInvProductsExportLogEntity; +import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface ThrInvProductsExportLogDao { + List filterThrInvProductsExportLog(FilterUdiEpLogRequest filterUdiEpLogRequest); + + boolean insertThrInvProductsExportLog(ThrInvProductsExportLogEntity thrInvProductsExportLogEntity); + + boolean updateThrInvProductsExportLog(ThrInvProductsExportLogEntity thrInvProductsExportLogEntity); + + boolean deleteById(@Param("id") String id); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrInvProductsImportLogDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrInvProductsImportLogDao.java new file mode 100644 index 00000000..67d5d35a --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrInvProductsImportLogDao.java @@ -0,0 +1,22 @@ +package com.glxp.api.admin.dao.thrsys; + +import com.glxp.api.admin.entity.thrsys.ThrInvProductsImportLogEntity; +import com.glxp.api.admin.entity.thrsys.ThrProductsImportLogEntity; +import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface ThrInvProductsImportLogDao { + + List filterImportLog(FilterUdiIpLogRequest filterInCodeLogRequest); + + boolean insertImportLog(ThrInvProductsImportLogEntity thrInvProductsImportLogEntity); + + boolean updateImportLog(ThrInvProductsImportLogEntity thrInvProductsImportLogEntity); + + boolean deleteById(@Param("id") String id); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderExportLogDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderExportLogDao.java new file mode 100644 index 00000000..8c0d9b1e --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderExportLogDao.java @@ -0,0 +1,20 @@ +package com.glxp.api.admin.dao.thrsys; + +import com.glxp.api.admin.entity.thrsys.ThrOrderExportLogEntity; +import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface ThrOrderExportLogDao { + + List filterThrOrderExportLog(FilterUdiEpLogRequest filterUdiEpLogRequest); + + boolean insertThrOrderExportLog(ThrOrderExportLogEntity thrOrderExportLogEntity); + + boolean updateThrOrderExportLog(ThrOrderExportLogEntity thrOrderExportLogEntity); + + boolean deleteById(@Param("id") String id); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderImportDetailDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderImportDetailDao.java new file mode 100644 index 00000000..60b6f2de --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderImportDetailDao.java @@ -0,0 +1,24 @@ +package com.glxp.api.admin.dao.thrsys; + +import com.glxp.api.admin.entity.thrsys.ThrOrderImportDetailEntity; +import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface ThrOrderImportDetailDao { + + List filterOrderdDetailImport(FilterUdiIpLogRequest filterInCodeLogRequest); + + boolean insertOrderdDetailImport(ThrOrderImportDetailEntity thrOrderImportDetailEntity); + + boolean updateOrderdDetailImport(ThrOrderImportDetailEntity thrOrderImportDetailEntity); + + boolean insertOrderdDetailImports(@Param("orders") List thrOrderImportDetailEntities); + + boolean deleteById(@Param("id") String id); + + boolean deleteByGenkey(@Param("genKey") String genKey); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderImportLogDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderImportLogDao.java new file mode 100644 index 00000000..04c5abd5 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderImportLogDao.java @@ -0,0 +1,21 @@ +package com.glxp.api.admin.dao.thrsys; + +import com.glxp.api.admin.entity.thrsys.ThrOrderImportLogEntity; +import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface ThrOrderImportLogDao { + + List filterImportLog(FilterUdiIpLogRequest filterInCodeLogRequest); + + boolean insertImportLog(ThrOrderImportLogEntity thrOrderImportLogEntity); + + boolean updateImportLog(ThrOrderImportLogEntity thrOrderImportLogEntity); + + boolean deleteById(@Param("id") String id); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsDao.java index 3d0ce08b..f9e4fb4a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsDao.java @@ -13,6 +13,8 @@ public interface ThrProductsDao { List filterThrProductsRequest(FilterThrProductsRequest filterThrProductsRequest); + ThrProductsEntity selectById(@Param("id") String id); + boolean insertThrProducts(ThrProductsEntity thrProductsEntity); boolean insertThrProductss(@Param("thrProductsEntities") List thrProductsEntities); diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsExportLogDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsExportLogDao.java new file mode 100644 index 00000000..81bf5418 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsExportLogDao.java @@ -0,0 +1,20 @@ +package com.glxp.api.admin.dao.thrsys; + +import com.glxp.api.admin.entity.thrsys.ThrProductsExportLogEntity; +import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface ThrProductsExportLogDao { + + List filterThrProductsExportLog(FilterUdiEpLogRequest filterUdiEpLogRequest); + + boolean insertThrProductsExportLog(ThrProductsExportLogEntity thrProductsExportLogEntity); + + boolean updateThrProductsExportLog(ThrProductsExportLogEntity thrProductsExportLogEntity); + + boolean deleteById(@Param("id") String id); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsImportLogDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsImportLogDao.java new file mode 100644 index 00000000..e32cbcc9 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsImportLogDao.java @@ -0,0 +1,19 @@ +package com.glxp.api.admin.dao.thrsys; + +import com.glxp.api.admin.entity.thrsys.ThrProductsImportLogEntity; +import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface ThrProductsImportLogDao { + List filterImportLog(FilterUdiIpLogRequest filterInCodeLogRequest); + + boolean insertImportLog(ThrProductsImportLogEntity thrProductsImportLogEntity); + + boolean updateImportLog(ThrProductsImportLogEntity thrProductsImportLogEntity); + + boolean deleteById(@Param("id") String id); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/CorpExportLogEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/CorpExportLogEntity.java new file mode 100644 index 00000000..8516a94b --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/CorpExportLogEntity.java @@ -0,0 +1,16 @@ +package com.glxp.api.admin.entity.basic; + +import lombok.Data; + +import java.util.Date; + +@Data +public class CorpExportLogEntity { + private Integer id; + private String genKey; + private Integer status; + private Date updateTime; + private String remark; + private Integer dlCount; + private String filePath; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/CorpImportDetailEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/CorpImportDetailEntity.java new file mode 100644 index 00000000..eda14c22 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/CorpImportDetailEntity.java @@ -0,0 +1,37 @@ +package com.glxp.api.admin.entity.basic; + +import lombok.Data; + +import java.util.Date; + +@Data +public class CorpImportDetailEntity { + + private Integer id; + private String erpId; + private String name; + private String spell; + private String addr; + private String status; + private String type; + private String creditNo; + private String contact; + private String mobile; + + private String thirdId; + private String thirdId1; + private String thirdId2; + private String thirdId3; + private String thirdId4; + + private String thirdName; + private String thirdName1; + private String thirdName2; + private String thirdName3; + private String thirdName4; + + private String remark; + private Date updateTime; + private String genKeyFk; + private Integer importStatus; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/CorpImportLogEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/CorpImportLogEntity.java new file mode 100644 index 00000000..9727223e --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/CorpImportLogEntity.java @@ -0,0 +1,16 @@ +package com.glxp.api.admin.entity.basic; + +import lombok.Data; + +import java.util.Date; + +@Data +public class CorpImportLogEntity { + + private Integer id; + private String genKey; + private Integer status; + private Date updateTime; + private String fromType; + private String remark; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoExportLogEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoExportLogEntity.java new file mode 100644 index 00000000..30e6c1a2 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoExportLogEntity.java @@ -0,0 +1,18 @@ +package com.glxp.api.admin.entity.basic; + +import lombok.Data; + +import java.util.Date; + +@Data +public class UdiInfoExportLogEntity { + private Integer id; + private String genKey; + private Integer status; + private Date updateTime; + private String remark; + private Integer dlCount; + private String filePath; + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoImportDetailEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoImportDetailEntity.java new file mode 100644 index 00000000..80b7c388 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoImportDetailEntity.java @@ -0,0 +1,25 @@ +package com.glxp.api.admin.entity.basic; + +import lombok.Data; + +import java.util.Date; + +@Data +public class UdiInfoImportDetailEntity { + + private Integer id; + private String udiCode; + private String ybbm; + private String sptm; + private String thirdId1; + private String thirdId2; + private String thirdId3; + private String thirdId4; + private String thirdId; + private Integer status; + private Date updateTime; + private String remark; + private String genKeyFk; + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoImportLogEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoImportLogEntity.java new file mode 100644 index 00000000..b94a036f --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoImportLogEntity.java @@ -0,0 +1,19 @@ +package com.glxp.api.admin.entity.basic; + +import lombok.Data; + +import java.util.Date; + +@Data +public class UdiInfoImportLogEntity { + + private Integer id; + private String genKey; + private Integer status; + private Date updateTime; + private String fromType; + private String thirdSysFk; + private String remark; + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiRelevanceEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiRelevanceEntity.java index 57b0bf22..c556b66c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiRelevanceEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiRelevanceEntity.java @@ -21,6 +21,8 @@ public class UdiRelevanceEntity { private String thirdName4; private String manufactory; private String measname; + private String ybbm; + private String sptm; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InCodeLogEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InCodeLogEntity.java index a5cee45f..acb1e10c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InCodeLogEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InCodeLogEntity.java @@ -1,17 +1,21 @@ package com.glxp.api.admin.entity.inventory; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; -import java.sql.Date; +import java.util.Date; + @Data public class InCodeLogEntity { private Integer id; private String genKey; - private String fromType; + private Integer fromType; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date updateTime; private Integer status; private String thirdSysFk; + private String remark; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrCorpExportLogEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrCorpExportLogEntity.java new file mode 100644 index 00000000..7251c6af --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrCorpExportLogEntity.java @@ -0,0 +1,16 @@ +package com.glxp.api.admin.entity.thrsys; + +import lombok.Data; + +import java.util.Date; + +@Data +public class ThrCorpExportLogEntity { + private Integer id; + private String genKey; + private Integer status; + private Date updateTime; + private String remark; + private Integer dlCount; + private String filePath; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrCorpImportLogEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrCorpImportLogEntity.java new file mode 100644 index 00000000..da1e8443 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrCorpImportLogEntity.java @@ -0,0 +1,16 @@ +package com.glxp.api.admin.entity.thrsys; + +import lombok.Data; + +import java.util.Date; + +@Data +public class ThrCorpImportLogEntity { + private Integer id; + private String genKey; + private Integer status; + private Date updateTime; + private String fromType; + private String thirdSysFk; + private String remark; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrInvProductsExportLogEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrInvProductsExportLogEntity.java new file mode 100644 index 00000000..3af16df5 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrInvProductsExportLogEntity.java @@ -0,0 +1,16 @@ +package com.glxp.api.admin.entity.thrsys; + +import lombok.Data; + +import java.util.Date; + +@Data +public class ThrInvProductsExportLogEntity { + private Integer id; + private String genKey; + private Integer status; + private Date updateTime; + private String remark; + private Integer dlCount; + private String filePath; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrInvProductsImportLogEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrInvProductsImportLogEntity.java new file mode 100644 index 00000000..0c5aaac0 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrInvProductsImportLogEntity.java @@ -0,0 +1,16 @@ +package com.glxp.api.admin.entity.thrsys; + +import lombok.Data; + +import java.util.Date; + +@Data +public class ThrInvProductsImportLogEntity { + private Integer id; + private String genKey; + private Integer status; + private Date updateTime; + private String fromType; + private String thirdSysFk; + private String remark; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderExportLogEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderExportLogEntity.java new file mode 100644 index 00000000..699ba2e0 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderExportLogEntity.java @@ -0,0 +1,17 @@ +package com.glxp.api.admin.entity.thrsys; + +import lombok.Data; + +import java.util.Date; + +@Data +public class ThrOrderExportLogEntity { + + private Integer id; + private String genKey; + private Integer status; + private Date updateTime; + private String remark; + private Integer dlCount; + private String filePath; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderImportDetailEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderImportDetailEntity.java new file mode 100644 index 00000000..96dea3eb --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderImportDetailEntity.java @@ -0,0 +1,33 @@ +package com.glxp.api.admin.entity.thrsys; + +import lombok.Data; + +import java.util.Date; + +@Data +public class ThrOrderImportDetailEntity { + + private Integer id; + private String billNo; + private String billdate; + private String corpId; + private String corpName; + private String billType; + private String billFlag; + private String productId; + private String productName; + private String spec; + private String batchNo; + private String expireDate; + private String productDate; + private Integer count; + private Integer reCount; + private Integer status; + private Date updateTime; + private String remark; + private String genKeyFk; + + private String thirdSysFk; + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderImportLogEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderImportLogEntity.java new file mode 100644 index 00000000..7dd4c006 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderImportLogEntity.java @@ -0,0 +1,17 @@ +package com.glxp.api.admin.entity.thrsys; + +import lombok.Data; + +import java.util.Date; + +@Data +public class ThrOrderImportLogEntity { + + private Integer id; + private String genKey; + private Integer status; + private Date updateTime; + private String fromType; + private String thirdSysFk; + private String remark; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrProductsExportLogEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrProductsExportLogEntity.java new file mode 100644 index 00000000..3817a6ea --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrProductsExportLogEntity.java @@ -0,0 +1,16 @@ +package com.glxp.api.admin.entity.thrsys; + +import lombok.Data; + +import java.util.Date; + +@Data +public class ThrProductsExportLogEntity { + private Integer id; + private String genKey; + private Integer status; + private Date updateTime; + private String remark; + private Integer dlCount; + private String filePath; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrProductsImportLogEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrProductsImportLogEntity.java new file mode 100644 index 00000000..425bb03c --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrProductsImportLogEntity.java @@ -0,0 +1,16 @@ +package com.glxp.api.admin.entity.thrsys; + +import lombok.Data; + +import java.util.Date; + +@Data +public class ThrProductsImportLogEntity { + private Integer id; + private String genKey; + private Integer status; + private Date updateTime; + private String fromType; + private String thirdSysFk; + private String remark; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpBasicClient.java b/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpBasicClient.java index 93d27962..ee75634c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpBasicClient.java +++ b/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpBasicClient.java @@ -30,7 +30,9 @@ public class ErpBasicClient { paramMap.put("limit", unitMaintainFilterRequest.getLimit()); String response = HttpClient.mipsGet(url, paramMap); try { - BaseResponse> udiDlDeviceResponse = (BaseResponse>) JSONObject.parseObject(response, BaseResponse.class); + BaseResponse> udiDlDeviceResponse = + JSONObject.parseObject(response, new TypeReference>>() { + }); return udiDlDeviceResponse; } catch (Exception e) { e.printStackTrace(); diff --git a/api-admin/src/main/java/com/glxp/api/admin/httpclient/UdiDlHttpClient.java b/api-admin/src/main/java/com/glxp/api/admin/httpclient/UdiDlHttpClient.java index 8bb3f8b2..2d592618 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/httpclient/UdiDlHttpClient.java +++ b/api-admin/src/main/java/com/glxp/api/admin/httpclient/UdiDlHttpClient.java @@ -49,11 +49,15 @@ public class UdiDlHttpClient { JSONObject.parseObject(response, new TypeReference>>() { }); - List udiInfoEntities = udiDlDeviceResponse.getData(); - return udiInfoEntities; + if (udiDlDeviceResponse != null && udiDlDeviceResponse.getCode() == 20000) { + List udiInfoEntities = udiDlDeviceResponse.getData(); + return udiInfoEntities; + } + } catch (Exception e) { e.printStackTrace(); return null; } + return null; } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/CorpsExportRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/CorpsExportRequest.java new file mode 100644 index 00000000..d8795450 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/CorpsExportRequest.java @@ -0,0 +1,16 @@ +package com.glxp.api.admin.req.basic; + +import lombok.Data; + +import java.util.List; + +@Data +public class CorpsExportRequest { + List ids; + private Integer id; + private String key; + private String unitId; + private String name; + private String thirdSys; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiEpLogRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiEpLogRequest.java new file mode 100644 index 00000000..8817456b --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiEpLogRequest.java @@ -0,0 +1,13 @@ +package com.glxp.api.admin.req.basic; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class FilterUdiEpLogRequest extends ListPageRequest { + + + + private String genKey; + private Integer status; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiInfoRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiInfoRequest.java index 61faeca7..26bd0dba 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiInfoRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiInfoRequest.java @@ -14,4 +14,9 @@ public class FilterUdiInfoRequest extends ListPageRequest { private String thirdId; private String id; + private String thirdId1; + private String thirdId2; + private String thirdId3; + private String thirdId4; + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiIpLogRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiIpLogRequest.java new file mode 100644 index 00000000..b33a8784 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiIpLogRequest.java @@ -0,0 +1,14 @@ +package com.glxp.api.admin.req.basic; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + + +@Data +public class FilterUdiIpLogRequest extends ListPageRequest { + + private Integer id; + private String genKey; + private Integer status; + private String thirdSysFk; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/PostCorpsRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/PostCorpsRequest.java new file mode 100644 index 00000000..0ec30f7c --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/PostCorpsRequest.java @@ -0,0 +1,12 @@ +package com.glxp.api.admin.req.basic; + +import com.glxp.api.admin.entity.basic.CorpImportDetailEntity; +import lombok.Data; + +import java.util.List; + +@Data +public class PostCorpsRequest { + private String genKey; + private List datas; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/PostUdiInfoRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/PostUdiInfoRequest.java new file mode 100644 index 00000000..b32e0f04 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/PostUdiInfoRequest.java @@ -0,0 +1,12 @@ +package com.glxp.api.admin.req.basic; + +import com.glxp.api.admin.entity.basic.UdiInfoImportDetailEntity; +import lombok.Data; + +import java.util.List; + +@Data +public class PostUdiInfoRequest { + private String genKey; + private List datas; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/UdiInfoExportRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/UdiInfoExportRequest.java new file mode 100644 index 00000000..f4c11606 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/UdiInfoExportRequest.java @@ -0,0 +1,25 @@ +package com.glxp.api.admin.req.basic; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +import java.util.List; + +@Data +public class UdiInfoExportRequest extends ListPageRequest { + + List uuids; + private String ylqxzcrbarmc; + private String cpmctymc; + private String nameCode; + private String uuid; + private String ggxh; + private String thirdId; + private String id; + + private String thirdId1; + private String thirdId2; + private String thirdId3; + private String thirdId4; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/PostStockPrintRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/PostStockPrintRequest.java index 102636e9..82d1551d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/PostStockPrintRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/PostStockPrintRequest.java @@ -7,7 +7,9 @@ import java.util.List; @Data public class PostStockPrintRequest { + private String genKey; private String thirdSys; private List datas; + private List ids; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrProductsRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrProductsRequest.java index 1636b17f..f3dc7274 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrProductsRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrProductsRequest.java @@ -5,11 +5,8 @@ import lombok.Data; @Data public class FilterThrProductsRequest extends ListPageRequest { + private String code; private String name; + private String thirdSys; private String thirdSysFk; - private String startDate; //起始日期 - private String endDate; //结束日期 - private String billNo; //单据号 - private String billFlag; //单据状态,0.未签字，1.已签字 - private String billAction; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostSmpOrderRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostSmpOrderRequest.java new file mode 100644 index 00000000..bb6880cc --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostSmpOrderRequest.java @@ -0,0 +1,11 @@ +package com.glxp.api.admin.req.thrsys; + +import lombok.Data; + +import java.util.List; + +@Data +public class PostSmpOrderRequest { + + List ids; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostThrCorpRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostThrCorpRequest.java index 49f1ad90..62abecc4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostThrCorpRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostThrCorpRequest.java @@ -7,6 +7,8 @@ import java.util.List; @Data public class PostThrCorpRequest { + private String genKey; private String thirdSys; + private String uploadType; private List corps; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostThrInvProductsRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostThrInvProductsRequest.java index 2bdf0f5c..8b92544a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostThrInvProductsRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostThrInvProductsRequest.java @@ -9,6 +9,8 @@ import java.util.List; @Data public class PostThrInvProductsRequest { + private String genKey; private String thirdSys; + private String uploadType; private List datas; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostThrOrderRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostThrOrderRequest.java index fdf5a16a..c6310f49 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostThrOrderRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostThrOrderRequest.java @@ -8,6 +8,7 @@ import java.util.List; @Data public class PostThrOrderRequest { + private String genKey; private String thirdSys; private List datas; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostThrProductsRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostThrProductsRequest.java index d3108283..da8cb6e0 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostThrProductsRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostThrProductsRequest.java @@ -8,7 +8,9 @@ import java.util.List; @Data public class PostThrProductsRequest { + private String genKey; private String thirdSys; + private String uploadType; List datas; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/ThrCorpExportRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/ThrCorpExportRequest.java new file mode 100644 index 00000000..4be058c9 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/ThrCorpExportRequest.java @@ -0,0 +1,18 @@ +package com.glxp.api.admin.req.thrsys; + +import com.glxp.api.admin.entity.thrsys.ThrCorpEntity; +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +import java.util.List; + +@Data +public class ThrCorpExportRequest extends ListPageRequest { + + private List thrCorpEntities; + private String thirdSysFk; + private String unitId; + private String thirdSys; + private String name; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/ThrInvProductsExportRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/ThrInvProductsExportRequest.java new file mode 100644 index 00000000..b5843e5b --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/ThrInvProductsExportRequest.java @@ -0,0 +1,21 @@ +package com.glxp.api.admin.req.thrsys; + +import com.glxp.api.admin.entity.thrsys.ThrInvProductsEntity; +import lombok.Data; + +import java.util.List; + +@Data +public class ThrInvProductsExportRequest { + private List thrInvProductsEntities; + + private String inventoryCode; + private String inventoryName; + private String thirdSysFk; + private String batchNo; + private String warehouseCode; + private List inventoryCodes; + private String udiCode; + private String nameCode; + private String thirdSys; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/ThrOrderExportRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/ThrOrderExportRequest.java new file mode 100644 index 00000000..38c82b97 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/ThrOrderExportRequest.java @@ -0,0 +1,21 @@ +package com.glxp.api.admin.req.thrsys; + +import com.glxp.api.admin.res.inout.ErpOrderResponse; +import lombok.Data; + +import java.util.List; + +@Data +public class ThrOrderExportRequest { + + private List erpOrderResponses; + + private String id; + private String billNo; + private String thirdSysFk; + private String startDate; //起始日期 + private String endDate; //结束日期 + private String billFlag; //单据状态,0.未签字，1.已签字 + private String billAction; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/ThrProductsExportRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/ThrProductsExportRequest.java new file mode 100644 index 00000000..c04094af --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/ThrProductsExportRequest.java @@ -0,0 +1,15 @@ +package com.glxp.api.admin.req.thrsys; + +import com.glxp.api.admin.entity.thrsys.ThrProductsEntity; +import lombok.Data; + +import java.util.List; + +@Data +public class ThrProductsExportRequest { + private List thrProductsEntities; + private String code; + private String name; + private String thirdSys; + private String thirdSysFk; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/UploadSmpRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/UploadSmpRequest.java new file mode 100644 index 00000000..c4d18ca2 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/UploadSmpRequest.java @@ -0,0 +1,166 @@ +package com.glxp.api.admin.req.thrsys; + + +import java.util.List; + +public class UploadSmpRequest { + + private String billNo; + private String billdate; + private String corpId; + private String corpName; + private String billType; + private String billFlag; + private String thirdSysFk; + private Integer type; + private List subErpOrders; + + public String getBillNo() { + return billNo; + } + + public void setBillNo(String billNo) { + this.billNo = billNo; + } + + public String getBilldate() { + return billdate; + } + + public void setBilldate(String billdate) { + this.billdate = billdate; + } + + public String getCorpId() { + return corpId; + } + + public void setCorpId(String corpId) { + this.corpId = corpId; + } + + public String getCorpName() { + return corpName; + } + + public void setCorpName(String corpName) { + this.corpName = corpName; + } + + public String getBillType() { + return billType; + } + + public void setBillType(String billType) { + this.billType = billType; + } + + + public List getSubErpOrders() { + return subErpOrders; + } + + public void setSubErpOrders(List subErpOrders) { + this.subErpOrders = subErpOrders; + } + + public String getBillFlag() { + return billFlag; + } + + public void setBillFlag(String billFlag) { + this.billFlag = billFlag; + } + + public String getThirdSysFk() { + return thirdSysFk; + } + + public void setThirdSysFk(String thirdSysFk) { + this.thirdSysFk = thirdSysFk; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + + public static class SubErpOrder { + private String productId; + private String productName; + private String spec; + private String batchNo; + private String expireDate; + private String productDate; + private Integer count; //账面数量 + private Integer reCount; //实际数量 + + public String getProductId() { + return productId; + } + + public void setProductId(String productId) { + this.productId = productId; + } + + public String getProductName() { + return productName; + } + + public void setProductName(String productName) { + this.productName = productName; + } + + public String getSpec() { + return spec; + } + + public void setSpec(String spec) { + this.spec = spec; + } + + public String getBatchNo() { + return batchNo; + } + + public void setBatchNo(String batchNo) { + this.batchNo = batchNo; + } + + public String getExpireDate() { + return expireDate; + } + + public void setExpireDate(String expireDate) { + this.expireDate = expireDate; + } + + public String getProductDate() { + return productDate; + } + + public void setProductDate(String productDate) { + this.productDate = productDate; + } + + public Integer getCount() { + return count; + } + + public void setCount(Integer count) { + this.count = count; + } + + public Integer getReCount() { + return reCount; + } + + public void setReCount(Integer reCount) { + this.reCount = reCount; + } + } + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceResponse.java index 5ea46696..0b4a49ca 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceResponse.java @@ -43,5 +43,7 @@ public class UdiRelevanceResponse { private String thirdName3; private String thirdId4; private String thirdName4; + private String ybbm; + private String sptm; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/IncodeSysParmsResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/inventory/IncodeSysParmsResponse.java new file mode 100644 index 00000000..976cf78a --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/res/inventory/IncodeSysParmsResponse.java @@ -0,0 +1,11 @@ +package com.glxp.api.admin.res.inventory; + +import lombok.Data; + +@Data +public class IncodeSysParmsResponse { + + private String thirdSys; + private String fromType; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicThirdSysService.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicThirdSysService.java index ea000068..d89813a8 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicThirdSysService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicThirdSysService.java @@ -14,5 +14,5 @@ public interface BasicThirdSysService { List filterBasicThiSys(FilterBasicThirdSysRequest filterBasicThirdSysRequest); - + BasicThirdSysEntity selectMainThrSys(); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/CorpExportLogService.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/CorpExportLogService.java new file mode 100644 index 00000000..964ad36a --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/CorpExportLogService.java @@ -0,0 +1,22 @@ +package com.glxp.api.admin.service.basic; + +import com.glxp.api.admin.entity.basic.CorpExportLogEntity; +import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface CorpExportLogService { + + CorpExportLogEntity selectByGenKey(String genKey); + + List filterCorpExportLog(FilterUdiEpLogRequest filterUdiEpLogRequest); + + boolean insertCorpExportLog(CorpExportLogEntity corpExportLogEntity); + + boolean updateCorpExportLog(CorpExportLogEntity corpExportLogEntity); + + boolean deleteById(String id); + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/CorpImportDetailService.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/CorpImportDetailService.java new file mode 100644 index 00000000..56c46f31 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/CorpImportDetailService.java @@ -0,0 +1,23 @@ +package com.glxp.api.admin.service.basic; + +import com.glxp.api.admin.entity.basic.CorpImportDetailEntity; +import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface CorpImportDetailService { + + List filterCorpImport(FilterUdiIpLogRequest filterUdiIpLogRequest); + + boolean insertCorpImport(CorpImportDetailEntity corpImportDetailEntity); + + boolean updateCorpImport(CorpImportDetailEntity corpImportDetailEntity); + + boolean insertCorpImports(List corpImportDetailEntities); + + boolean deleteById(String id); + + boolean deleteByGenkey(String genKey); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/CorpImportLogService.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/CorpImportLogService.java new file mode 100644 index 00000000..cf0f404e --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/CorpImportLogService.java @@ -0,0 +1,23 @@ +package com.glxp.api.admin.service.basic; + +import com.glxp.api.admin.entity.basic.CorpImportLogEntity; +import com.glxp.api.admin.entity.basic.UdiInfoImportLogEntity; +import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface CorpImportLogService { + + CorpImportLogEntity selectByGenKey(String genKey); + + List filterImportLog(FilterUdiIpLogRequest filterUdiIpLogRequest); + + boolean insertImportLog(CorpImportLogEntity corpImportLogEntity); + + boolean updateImportLog(CorpImportLogEntity corpImportLogEntity); + + boolean deleteById(@Param("id") String id); + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiInfoExportLogService.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiInfoExportLogService.java new file mode 100644 index 00000000..30303b5d --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiInfoExportLogService.java @@ -0,0 +1,21 @@ +package com.glxp.api.admin.service.basic; + +import com.glxp.api.admin.entity.basic.UdiInfoExportLogEntity; +import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest; +import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface UdiInfoExportLogService { + + UdiInfoExportLogEntity selectByGenKey(String genKey); + List filterUdiInfoExportLog(FilterUdiEpLogRequest filterInCodeLogRequest); + + boolean insertUdiInfoExportLog(UdiInfoExportLogEntity udiInfoImportEntity); + + boolean updateUdiInfoExportLog(UdiInfoExportLogEntity udiInfoImportEntity); + + boolean deleteById( String id); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiInfoImportDetailService.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiInfoImportDetailService.java new file mode 100644 index 00000000..0510e7a0 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiInfoImportDetailService.java @@ -0,0 +1,23 @@ +package com.glxp.api.admin.service.basic; + +import com.glxp.api.admin.entity.basic.UdiInfoImportDetailEntity; +import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; + +import java.util.List; + +public interface UdiInfoImportDetailService { + + + List filterUdiInfoImport(FilterUdiIpLogRequest filterInCodeLogRequest); + + + boolean insertUdiInfoImport(UdiInfoImportDetailEntity udiInfoImportEntity); + + boolean updateUdiInfoImport(UdiInfoImportDetailEntity udiInfoImportEntity); + + boolean insertUdiInfoImports(List udiInfoImportEntities); + + boolean deleteById(String id); + + boolean deleteByGenkey(String genKey); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiInfoImportLogService.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiInfoImportLogService.java new file mode 100644 index 00000000..07bfcdc2 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiInfoImportLogService.java @@ -0,0 +1,21 @@ +package com.glxp.api.admin.service.basic; + +import com.glxp.api.admin.entity.basic.UdiInfoImportLogEntity; +import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; + +import java.util.List; + +public interface UdiInfoImportLogService { + + + UdiInfoImportLogEntity selectByGenKey(String genKey); + + List filterImportLog(FilterUdiIpLogRequest filterInCodeLogRequest); + + boolean insertImportLog(UdiInfoImportLogEntity udiInfoImportLogEntity); + + boolean updateImportLog(UdiInfoImportLogEntity udiInfoImportLogEntity); + + boolean deleteById(String id); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiRelevanceService.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiRelevanceService.java index 07279aa4..9ceaaad1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiRelevanceService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiRelevanceService.java @@ -19,7 +19,8 @@ public interface UdiRelevanceService { List selectByUuid(String uuid); UdiRelevanceEntity selectById( String id); - UdiRelevanceEntity selectByThirdId(String thirdId); + UdiRelevanceResponse selectGroupById( String id); + UdiRelevanceEntity selectByThirdId(String thirdId, String thirdSys); boolean insertUdiRelevance(UdiRelevanceEntity udiRelevanceEntity); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicThirdSysServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicThirdSysServiceImpl.java index 36739df1..c079858f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicThirdSysServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicThirdSysServiceImpl.java @@ -40,4 +40,15 @@ public class BasicThirdSysServiceImpl implements BasicThirdSysService { List data = basicThirdSysDao.filterBasicThiSys(filterBasicThirdSysRequest); return data; } + + @Override + public BasicThirdSysEntity selectMainThrSys() { + FilterBasicThirdSysRequest filterBasicThirdSysRequest = new FilterBasicThirdSysRequest(); + filterBasicThirdSysRequest.setMainSys(true); + List data = basicThirdSysDao.filterBasicThiSys(filterBasicThirdSysRequest); + if (data != null && data.size() > 0) { + return data.get(0); + } + return null; + } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicUnitMaintainServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicUnitMaintainServiceImpl.java index aa434243..e8e3d78c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicUnitMaintainServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicUnitMaintainServiceImpl.java @@ -23,8 +23,11 @@ public class BasicUnitMaintainServiceImpl implements BasicUnitMaintainService { if (basicUnitMaintainFilterRequest == null) { return Collections.emptyList(); } - int offset = (basicUnitMaintainFilterRequest.getPage() - 1) * basicUnitMaintainFilterRequest.getLimit(); - PageHelper.offsetPage(offset, basicUnitMaintainFilterRequest.getLimit()); + if(basicUnitMaintainFilterRequest.getPage()!=null){ + int offset = (basicUnitMaintainFilterRequest.getPage() - 1) * basicUnitMaintainFilterRequest.getLimit(); + PageHelper.offsetPage(offset, basicUnitMaintainFilterRequest.getLimit()); + } + List data = basicUnitMaintainDao.filterList(basicUnitMaintainFilterRequest); return data; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/CorpExportLogServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/CorpExportLogServiceImpl.java new file mode 100644 index 00000000..d2566d5e --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/CorpExportLogServiceImpl.java @@ -0,0 +1,59 @@ +package com.glxp.api.admin.service.basic.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.basic.CorpExportLogDao; +import com.glxp.api.admin.entity.basic.CorpExportLogEntity; +import com.glxp.api.admin.entity.basic.UdiInfoExportLogEntity; +import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest; +import com.glxp.api.admin.service.basic.CorpExportLogService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class CorpExportLogServiceImpl implements CorpExportLogService { + + @Resource + CorpExportLogDao corpExportLogDao; + + @Override + public CorpExportLogEntity selectByGenKey(String genKey) { + FilterUdiEpLogRequest filterUdiEpLogRequest = new FilterUdiEpLogRequest(); + filterUdiEpLogRequest.setGenKey(genKey); + List corpExportLogEntities = corpExportLogDao.filterCorpExportLog(filterUdiEpLogRequest); + if (corpExportLogEntities != null && corpExportLogEntities.size() > 0) { + return corpExportLogEntities.get(0); + } + return null; + } + + @Override + public List filterCorpExportLog(FilterUdiEpLogRequest filterUdiEpLogRequest) { + if (filterUdiEpLogRequest == null) { + return Collections.emptyList(); + } + if (filterUdiEpLogRequest.getPage() != null) { + int offset = (filterUdiEpLogRequest.getPage() - 1) * filterUdiEpLogRequest.getLimit(); + PageHelper.offsetPage(offset, filterUdiEpLogRequest.getLimit()); + } + List data = corpExportLogDao.filterCorpExportLog(filterUdiEpLogRequest); + return data; + } + + @Override + public boolean insertCorpExportLog(CorpExportLogEntity corpExportLogEntity) { + return corpExportLogDao.insertCorpExportLog(corpExportLogEntity); + } + + @Override + public boolean updateCorpExportLog(CorpExportLogEntity corpExportLogEntity) { + return corpExportLogDao.updateCorpExportLog(corpExportLogEntity); + } + + @Override + public boolean deleteById(String id) { + return corpExportLogDao.deleteById(id); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/CorpImportDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/CorpImportDetailServiceImpl.java new file mode 100644 index 00000000..826ef487 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/CorpImportDetailServiceImpl.java @@ -0,0 +1,57 @@ +package com.glxp.api.admin.service.basic.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.basic.CorpImportDetailDao; +import com.glxp.api.admin.entity.basic.CorpImportDetailEntity; +import com.glxp.api.admin.entity.basic.UdiInfoImportDetailEntity; +import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.admin.service.basic.CorpImportDetailService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class CorpImportDetailServiceImpl implements CorpImportDetailService { + @Resource + CorpImportDetailDao corpImportDetailDao; + + @Override + public List filterCorpImport(FilterUdiIpLogRequest filterUdiIpLogRequest) { + if (filterUdiIpLogRequest == null) { + return Collections.emptyList(); + } + if (filterUdiIpLogRequest.getPage() != null) { + int offset = (filterUdiIpLogRequest.getPage() - 1) * filterUdiIpLogRequest.getLimit(); + PageHelper.offsetPage(offset, filterUdiIpLogRequest.getLimit()); + } + List data = corpImportDetailDao.filterCorpImport(filterUdiIpLogRequest); + return data; + } + + @Override + public boolean insertCorpImport(CorpImportDetailEntity corpImportDetailEntity) { + return corpImportDetailDao.insertCorpImport(corpImportDetailEntity); + } + + @Override + public boolean updateCorpImport(CorpImportDetailEntity corpImportDetailEntity) { + return corpImportDetailDao.updateCorpImport(corpImportDetailEntity); + } + + @Override + public boolean insertCorpImports(List corpImportDetailEntities) { + return corpImportDetailDao.insertCorpImports(corpImportDetailEntities); + } + + @Override + public boolean deleteById(String id) { + return corpImportDetailDao.deleteById(id); + } + + @Override + public boolean deleteByGenkey(String genKey) { + return corpImportDetailDao.deleteByGenkey(genKey); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/CorpImportLogServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/CorpImportLogServiceImpl.java new file mode 100644 index 00000000..a1e2ef25 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/CorpImportLogServiceImpl.java @@ -0,0 +1,59 @@ +package com.glxp.api.admin.service.basic.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.basic.CorpImportLogDao; +import com.glxp.api.admin.entity.basic.CorpImportLogEntity; +import com.glxp.api.admin.entity.basic.UdiInfoImportLogEntity; +import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.admin.service.basic.CorpImportLogService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class CorpImportLogServiceImpl implements CorpImportLogService { + + @Resource + CorpImportLogDao corpImportLogDao; + + @Override + public CorpImportLogEntity selectByGenKey(String genKey) { + FilterUdiIpLogRequest filterUdiIpLogRequest = new FilterUdiIpLogRequest(); + filterUdiIpLogRequest.setGenKey(genKey); + List data = corpImportLogDao.filterImportLog(filterUdiIpLogRequest); + if (data != null && data.size() > 0) { + return data.get(0); + } + return null; + } + + @Override + public List filterImportLog(FilterUdiIpLogRequest filterUdiIpLogRequest) { + if (filterUdiIpLogRequest == null) { + return Collections.emptyList(); + } + if (filterUdiIpLogRequest.getPage() != null) { + int offset = (filterUdiIpLogRequest.getPage() - 1) * filterUdiIpLogRequest.getLimit(); + PageHelper.offsetPage(offset, filterUdiIpLogRequest.getLimit()); + } + List data = corpImportLogDao.filterImportLog(filterUdiIpLogRequest); + return data; + } + + @Override + public boolean insertImportLog(CorpImportLogEntity corpImportLogEntity) { + return corpImportLogDao.insertImportLog(corpImportLogEntity); + } + + @Override + public boolean updateImportLog(CorpImportLogEntity corpImportLogEntity) { + return corpImportLogDao.updateImportLog(corpImportLogEntity); + } + + @Override + public boolean deleteById(String id) { + return corpImportLogDao.deleteById(id); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiInfoExportLogServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiInfoExportLogServiceImpl.java new file mode 100644 index 00000000..3ba9c883 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiInfoExportLogServiceImpl.java @@ -0,0 +1,59 @@ +package com.glxp.api.admin.service.basic.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.basic.UdiInfoExportLogDao; +import com.glxp.api.admin.entity.basic.UdiInfoExportLogEntity; +import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest; +import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.admin.service.basic.UdiInfoExportLogService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class UdiInfoExportLogServiceImpl implements UdiInfoExportLogService { + + @Resource + UdiInfoExportLogDao udiInfoExportLogDao; + + @Override + public UdiInfoExportLogEntity selectByGenKey(String genKey) { + FilterUdiEpLogRequest filterUdiEpLogRequest = new FilterUdiEpLogRequest(); + filterUdiEpLogRequest.setGenKey(genKey); + List data = udiInfoExportLogDao.filterUdiInfoExportLog(filterUdiEpLogRequest); + if (data != null) + return data.get(0); + else + return null; + } + + @Override + public List filterUdiInfoExportLog(FilterUdiEpLogRequest filterInCodeLogRequest) { + if (filterInCodeLogRequest == null) { + return Collections.emptyList(); + } + if (filterInCodeLogRequest.getPage() != null) { + int offset = (filterInCodeLogRequest.getPage() - 1) * filterInCodeLogRequest.getLimit(); + PageHelper.offsetPage(offset, filterInCodeLogRequest.getLimit()); + } + List data = udiInfoExportLogDao.filterUdiInfoExportLog(filterInCodeLogRequest); + return data; + } + + @Override + public boolean insertUdiInfoExportLog(UdiInfoExportLogEntity udiInfoImportEntity) { + return udiInfoExportLogDao.insertUdiInfoExportLog(udiInfoImportEntity); + } + + @Override + public boolean updateUdiInfoExportLog(UdiInfoExportLogEntity udiInfoImportEntity) { + return udiInfoExportLogDao.updateUdiInfoExportLog(udiInfoImportEntity); + } + + @Override + public boolean deleteById(String id) { + return udiInfoExportLogDao.deleteById(id); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiInfoImportDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiInfoImportDetailServiceImpl.java new file mode 100644 index 00000000..e338d996 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiInfoImportDetailServiceImpl.java @@ -0,0 +1,60 @@ +package com.glxp.api.admin.service.basic.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.basic.UdiInfoImportDetailDao; +import com.glxp.api.admin.entity.basic.UdiInfoImportDetailEntity; +import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.admin.service.basic.UdiInfoImportDetailService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class UdiInfoImportDetailServiceImpl implements UdiInfoImportDetailService { + + @Resource + UdiInfoImportDetailDao udiInfoImportDao; + + + @Override + public List filterUdiInfoImport(FilterUdiIpLogRequest filterInCodeLogRequest) { + if (filterInCodeLogRequest == null) { + return Collections.emptyList(); + } + if (filterInCodeLogRequest.getPage() != null) { + int offset = (filterInCodeLogRequest.getPage() - 1) * filterInCodeLogRequest.getLimit(); + PageHelper.offsetPage(offset, filterInCodeLogRequest.getLimit()); + } + List data = udiInfoImportDao.filterUdiInfoImport(filterInCodeLogRequest); + return data; + + } + + + @Override + public boolean insertUdiInfoImport(UdiInfoImportDetailEntity udiInfoImportEntity) { + return udiInfoImportDao.insertUdiInfoImport(udiInfoImportEntity); + } + + @Override + public boolean updateUdiInfoImport(UdiInfoImportDetailEntity udiInfoImportEntity) { + return udiInfoImportDao.updateUdiInfoImport(udiInfoImportEntity); + } + + @Override + public boolean insertUdiInfoImports(List udiInfoImportEntities) { + return udiInfoImportDao.insertUdiInfoImports(udiInfoImportEntities); + } + + @Override + public boolean deleteById(String id) { + return udiInfoImportDao.deleteById(id); + } + + @Override + public boolean deleteByGenkey(String genKey) { + return udiInfoImportDao.deleteByGenkey(genKey); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiInfoImportLogServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiInfoImportLogServiceImpl.java new file mode 100644 index 00000000..ed35894f --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiInfoImportLogServiceImpl.java @@ -0,0 +1,58 @@ +package com.glxp.api.admin.service.basic.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.basic.UdiInfoImportLogDao; +import com.glxp.api.admin.entity.basic.UdiInfoImportLogEntity; +import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.admin.service.basic.UdiInfoImportLogService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class UdiInfoImportLogServiceImpl implements UdiInfoImportLogService { + @Resource + UdiInfoImportLogDao udiInfoImportLogDao; + + @Override + public UdiInfoImportLogEntity selectByGenKey(String genKey) { + FilterUdiIpLogRequest filterUdiIpLogRequest = new FilterUdiIpLogRequest(); + filterUdiIpLogRequest.setGenKey(genKey); + List data = udiInfoImportLogDao.filterImportLog(filterUdiIpLogRequest); + if (data != null && data.size() > 0) { + return data.get(0); + } + return null; + } + + @Override + public List filterImportLog(FilterUdiIpLogRequest filterUdiIpLogRequest) { + if (filterUdiIpLogRequest == null) { + return Collections.emptyList(); + } + if (filterUdiIpLogRequest.getPage() != null) { + int offset = (filterUdiIpLogRequest.getPage() - 1) * filterUdiIpLogRequest.getLimit(); + PageHelper.offsetPage(offset, filterUdiIpLogRequest.getLimit()); + } + List data = udiInfoImportLogDao.filterImportLog(filterUdiIpLogRequest); + return data; + } + + @Override + public boolean insertImportLog(UdiInfoImportLogEntity udiInfoImportLogEntity) { + return udiInfoImportLogDao.insertImportLog(udiInfoImportLogEntity); + } + + @Override + public boolean updateImportLog(UdiInfoImportLogEntity udiInfoImportLogEntity) { + return udiInfoImportLogDao.updateImportLog(udiInfoImportLogEntity); + } + + + @Override + public boolean deleteById(String id) { + return udiInfoImportLogDao.deleteById(id); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiRelevanceServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiRelevanceServiceImpl.java index 6efeaa90..6e17e55d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiRelevanceServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiRelevanceServiceImpl.java @@ -69,8 +69,31 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService { } @Override - public UdiRelevanceEntity selectByThirdId(String thirdId) { - return udiRelevanceDao.selectByThirdId(thirdId); + public UdiRelevanceResponse selectGroupById(String id) { + FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); + filterUdiInfoRequest.setId(id); + List data = udiRelevanceDao.filterUdiRelevance(filterUdiInfoRequest); + if (data != null) + return data.get(0); + return null; + } + + @Override + public UdiRelevanceEntity selectByThirdId(String thirdId, String thirdSys) { + FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); + if ("thirdId".equals(thirdSys)) { + filterUdiInfoRequest.setThirdId(thirdId); + } else if ("thirdId1".equals(thirdSys)) { + filterUdiInfoRequest.setThirdId1(thirdId); + } else if ("thirdId2".equals(thirdSys)) { + filterUdiInfoRequest.setThirdId2(thirdId); + } else if ("thirdId3".equals(thirdSys)) { + filterUdiInfoRequest.setThirdId3(thirdId); + } else if ("thirdId4".equals(thirdSys)) { + filterUdiInfoRequest.setThirdId4(thirdId); + } + + return udiRelevanceDao.selectByThirdId(filterUdiInfoRequest); } @Override diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/SystemParamConfigService.java b/api-admin/src/main/java/com/glxp/api/admin/service/info/SystemParamConfigService.java index 868c3361..273e543d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/info/SystemParamConfigService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/info/SystemParamConfigService.java @@ -20,6 +20,8 @@ public interface SystemParamConfigService { SystemParamConfigEntity selectByParamKey(String key); + String selectValueByParamKey(String key); + boolean updateById(SystemParamConfigSaveRequest systemParamConfigSaveRequest); boolean updateParentId(SystemParamConfigSaveRequest systemParamConfigSaveRequest); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SystemParamConfigServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SystemParamConfigServiceImpl.java index 9cfab419..9f288bf9 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SystemParamConfigServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SystemParamConfigServiceImpl.java @@ -42,10 +42,19 @@ public class SystemParamConfigServiceImpl implements SystemParamConfigService { } @Override - public SystemParamConfigEntity selectByParamKey(String key) { + public SystemParamConfigEntity selectByParamKey(String key) { return systemParamConfigDao.selectByParamKey(key); } + @Override + public String selectValueByParamKey(String key) { + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigDao.selectByParamKey(key); + if(systemParamConfigEntity!=null ){ + return systemParamConfigEntity.getParamValue(); + } + return null; + } + @Override public boolean updateById(SystemParamConfigSaveRequest systemParamConfigSaveRequest) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InCodeLogService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InCodeLogService.java index 3fe7c877..a62196e0 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InCodeLogService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InCodeLogService.java @@ -9,6 +9,8 @@ public interface InCodeLogService { List filterInCodeLog(FilterInCodeLogRequest filterInCodeLogRequest); + InCodeLogEntity selectByGenKey(String genKey); + boolean insertInCodeLog(InCodeLogEntity inCodeLogEntity); boolean updateInCodeLog(InCodeLogEntity inCodeLogEntity); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InCodeLogServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InCodeLogServiceImpl.java index 2f0b52f6..1aa536a7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InCodeLogServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InCodeLogServiceImpl.java @@ -30,6 +30,16 @@ public class InCodeLogServiceImpl implements InCodeLogService { return data; } + @Override + public InCodeLogEntity selectByGenKey(String genKey) { + FilterInCodeLogRequest filterInCodeLogRequest = new FilterInCodeLogRequest(); + filterInCodeLogRequest.setGenKey(genKey); + List data = inCodeLogDao.filterInCodeLog(filterInCodeLogRequest); + if (data != null) + return data.get(0); + else return null; + } + @Override public boolean insertInCodeLog(InCodeLogEntity inCodeLogEntity) { return inCodeLogDao.insertInCodeLog(inCodeLogEntity); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpExportLogService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpExportLogService.java new file mode 100644 index 00000000..6bab1325 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpExportLogService.java @@ -0,0 +1,23 @@ +package com.glxp.api.admin.service.thrsys; + +import com.glxp.api.admin.entity.thrsys.ThrCorpExportLogEntity; +import com.glxp.api.admin.entity.thrsys.ThrCorpImportLogEntity; +import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest; + +import java.util.List; + +public interface ThrCorpExportLogService { + + + ThrCorpExportLogEntity selectByGenKey(String genKey); + + + List filterThrCorpExportLog(FilterUdiEpLogRequest filterUdiEpLogRequest); + + boolean insertThrCorpExportLog(ThrCorpExportLogEntity thrCorpExportLogEntity); + + boolean updateThrCorpExportLog(ThrCorpExportLogEntity thrCorpExportLogEntity); + + boolean deleteById(String id); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpImportLogService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpImportLogService.java new file mode 100644 index 00000000..3cb510d5 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpImportLogService.java @@ -0,0 +1,20 @@ +package com.glxp.api.admin.service.thrsys; + +import com.glxp.api.admin.entity.thrsys.ThrCorpImportLogEntity; +import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; + +import java.util.List; + +public interface ThrCorpImportLogService { + + ThrCorpImportLogEntity selectByGenKey(String genKey); + + List filterImportLog(FilterUdiIpLogRequest filterInCodeLogRequest); + + boolean insertImportLog(ThrCorpImportLogEntity thrCorpImportLogEntity); + + boolean updateImportLog(ThrCorpImportLogEntity thrCorpImportLogEntity); + + boolean deleteById(String id); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrDataService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrDataService.java new file mode 100644 index 00000000..56712fcb --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrDataService.java @@ -0,0 +1,66 @@ +package com.glxp.api.admin.service.thrsys; + +import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; +import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; +import com.glxp.api.admin.entity.thrsys.ThrProductsEntity; +import com.glxp.api.admin.httpclient.ErpBasicClient; +import com.glxp.api.admin.req.basic.FilterErpGoodsRequest; +import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.res.basic.ErpProductsResponse; +import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; +import com.glxp.api.admin.service.basic.BasicThirdSysService; +import com.glxp.api.common.res.BaseResponse; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 根据系统设置，获取对应的第三方数据信息 + */ + +@Service +public class ThrDataService { + + @Resource + private BasicThirdSysDetailService basicThirdSysDetailService; + @Resource + private ThrProductsService thrProductsService; + + public ThrProductsEntity getProducts(String code, String thirdSys) { + + BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("piQueryUrl", thirdSys); + if (basicThirdSysDetailEntity.getEnabled() && !basicThirdSysDetailEntity.getItrCache()) { + FilterErpGoodsRequest filterErpGoodsRequest = new FilterErpGoodsRequest(); + filterErpGoodsRequest.setCode(code); + filterErpGoodsRequest.setPage(1); + filterErpGoodsRequest.setLimit(1); + BaseResponse> udiDlDeviceResponse = new ErpBasicClient().getErpProducts(filterErpGoodsRequest, basicThirdSysDetailEntity.getValue()); + if (udiDlDeviceResponse.getCode() == 20000) { + List erpProductsResponses = udiDlDeviceResponse.getData().getList(); + if (erpProductsResponses != null) { + ThrProductsEntity thrProductsEntity = new ThrProductsEntity(); + BeanUtils.copyProperties(erpProductsResponses.get(0), thrProductsEntity); + return thrProductsEntity; + } + } + } else { + FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest(); + filterThrProductsRequest.setCode(code); + filterThrProductsRequest.setThirdSys(thirdSys); + List thrProductsEntitys = thrProductsService.filterThrProductsRequest(filterThrProductsRequest); + if (thrProductsEntitys != null && thrProductsEntitys.size() > 0) { + return thrProductsEntitys.get(0); + } + } + return null; + } + + public void getCorps(){ + + } + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrInvProductsExportLogService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrInvProductsExportLogService.java new file mode 100644 index 00000000..f1882541 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrInvProductsExportLogService.java @@ -0,0 +1,19 @@ +package com.glxp.api.admin.service.thrsys; + +import com.glxp.api.admin.entity.thrsys.ThrInvProductsExportLogEntity; +import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest; + +import java.util.List; + +public interface ThrInvProductsExportLogService { + + ThrInvProductsExportLogEntity selectByGenKey(String genKey); + + List filterThrInvProductsExportLog(FilterUdiEpLogRequest filterUdiEpLogRequest); + + boolean insertThrInvProductsExportLog(ThrInvProductsExportLogEntity thrInvProductsExportLogEntity); + + boolean updateThrInvProductsExportLog(ThrInvProductsExportLogEntity thrInvProductsExportLogEntity); + + boolean deleteById(String id); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrInvProductsImportLogService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrInvProductsImportLogService.java new file mode 100644 index 00000000..e6894aa0 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrInvProductsImportLogService.java @@ -0,0 +1,20 @@ +package com.glxp.api.admin.service.thrsys; + +import com.glxp.api.admin.entity.thrsys.ThrInvProductsImportLogEntity; +import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; + +import java.util.List; + +public interface ThrInvProductsImportLogService { + + + List filterImportLog(FilterUdiIpLogRequest filterInCodeLogRequest); + + boolean insertImportLog(ThrInvProductsImportLogEntity thrInvProductsImportLogEntity); + + boolean updateImportLog(ThrInvProductsImportLogEntity thrInvProductsImportLogEntity); + + boolean deleteById(String id); + + ThrInvProductsImportLogEntity selectByGenKey(String genKey); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrInvProductsService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrInvProductsService.java index a105bbef..2a27b1b5 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrInvProductsService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrInvProductsService.java @@ -10,6 +10,8 @@ public interface ThrInvProductsService { List filterThrInvProductss(FilterThrInvProductsRequest filterThrInvProductsRequest); + ThrInvProductsEntity selectById(String id); + boolean insertThrInvProduct(ThrInvProductsEntity thrInvProductsEntity); boolean insertThrInvProducts(List thrInvProductsEntities); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderExportLogService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderExportLogService.java new file mode 100644 index 00000000..64180d7a --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderExportLogService.java @@ -0,0 +1,19 @@ +package com.glxp.api.admin.service.thrsys; + +import com.glxp.api.admin.entity.thrsys.ThrOrderExportLogEntity; +import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest; + +import java.util.List; + +public interface ThrOrderExportLogService { + + ThrOrderExportLogEntity selectByGenKey(String genKey); + + List filterThrOrderExportLog(FilterUdiEpLogRequest filterUdiEpLogRequest); + + boolean insertThrOrderExportLog(ThrOrderExportLogEntity thrOrderExportLogEntity); + + boolean updateThrOrderExportLog(ThrOrderExportLogEntity thrOrderExportLogEntity); + + boolean deleteById(String id); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderImportDetailService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderImportDetailService.java new file mode 100644 index 00000000..8c79c10f --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderImportDetailService.java @@ -0,0 +1,21 @@ +package com.glxp.api.admin.service.thrsys; + +import com.glxp.api.admin.entity.thrsys.ThrOrderImportDetailEntity; +import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; + +import java.util.List; + +public interface ThrOrderImportDetailService { + + List filterOrderImportDetail(FilterUdiIpLogRequest filterUdiIpLogRequest); + + boolean insertOrderImportDetail(ThrOrderImportDetailEntity thrOrderImportDetailEntity); + + boolean updateOrderImportDetail(ThrOrderImportDetailEntity thrOrderImportDetailEntity); + + boolean insertOrderImportDetails(List thrOrderImportDetailEntities); + + boolean deleteById(String id); + + boolean deleteByGenkey(String genKey); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderImportLogService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderImportLogService.java new file mode 100644 index 00000000..ad67abb3 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderImportLogService.java @@ -0,0 +1,19 @@ +package com.glxp.api.admin.service.thrsys; + +import com.glxp.api.admin.entity.thrsys.ThrOrderImportLogEntity; +import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; + +import java.util.List; + +public interface ThrOrderImportLogService { + ThrOrderImportLogEntity selectByGenKey(String genKey); + + List filterImportLog(FilterUdiIpLogRequest filterInCodeLogRequest); + + boolean insertImportLog(ThrOrderImportLogEntity thrOrderImportLogEntity); + + boolean updateImportLog(ThrOrderImportLogEntity thrOrderImportLogEntity); + + boolean deleteById(String id); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsExportLogService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsExportLogService.java new file mode 100644 index 00000000..5011baea --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsExportLogService.java @@ -0,0 +1,20 @@ +package com.glxp.api.admin.service.thrsys; + +import com.glxp.api.admin.entity.thrsys.ThrProductsExportLogEntity; +import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest; + +import java.util.List; + +public interface ThrProductsExportLogService { + + ThrProductsExportLogEntity selectByGenKey(String genKey); + + List filterThrProductsExportLog(FilterUdiEpLogRequest filterUdiEpLogRequest); + + boolean insertThrProductsExportLog(ThrProductsExportLogEntity thrProductsExportLogEntity); + + boolean updateThrProductsExportLog(ThrProductsExportLogEntity thrProductsExportLogEntity); + + boolean deleteById(String id); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsImportLogService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsImportLogService.java new file mode 100644 index 00000000..1157d28e --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsImportLogService.java @@ -0,0 +1,18 @@ +package com.glxp.api.admin.service.thrsys; + +import com.glxp.api.admin.entity.thrsys.ThrProductsImportLogEntity; +import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; + +import java.util.List; + +public interface ThrProductsImportLogService { + List filterImportLog(FilterUdiIpLogRequest filterInCodeLogRequest); + + boolean insertImportLog(ThrProductsImportLogEntity thrProductsImportLogEntity); + + boolean updateImportLog(ThrProductsImportLogEntity thrProductsImportLogEntity); + + boolean deleteById(String id); + + ThrProductsImportLogEntity selectByGenKey(String genKey); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsService.java index 8435e03f..88c9ac37 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsService.java @@ -1,5 +1,6 @@ package com.glxp.api.admin.service.thrsys; +import com.glxp.api.admin.entity.thrsys.ThrInvProductsEntity; import com.glxp.api.admin.entity.thrsys.ThrProductsEntity; import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest; @@ -10,6 +11,8 @@ public interface ThrProductsService { List filterThrProductsRequest(FilterThrProductsRequest filterThrProductsRequest); + ThrProductsEntity selectById(String id); + boolean insertThrProducts(ThrProductsEntity thrProductsEntity); boolean insertThrProductss(List thrProductsEntities); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpExportLogServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpExportLogServiceImpl.java new file mode 100644 index 00000000..8642acdb --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpExportLogServiceImpl.java @@ -0,0 +1,59 @@ +package com.glxp.api.admin.service.thrsys.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.thrsys.ThrCorpExportLogDao; +import com.glxp.api.admin.entity.thrsys.ThrCorpExportLogEntity; +import com.glxp.api.admin.entity.thrsys.ThrCorpImportLogEntity; +import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest; +import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.admin.service.thrsys.ThrCorpExportLogService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class ThrCorpExportLogServiceImpl implements ThrCorpExportLogService { + @Resource + ThrCorpExportLogDao thrCorpExportLogDao; + + @Override + public ThrCorpExportLogEntity selectByGenKey(String genKey) { + FilterUdiEpLogRequest filterUdiEpLogRequest = new FilterUdiEpLogRequest(); + filterUdiEpLogRequest.setGenKey(genKey); + List data = thrCorpExportLogDao.filterThrCorpExportLog(filterUdiEpLogRequest); + if (data != null && data.size() > 0) { + return data.get(0); + } + return null; + } + + @Override + public List filterThrCorpExportLog(FilterUdiEpLogRequest filterUdiEpLogRequest) { + if (filterUdiEpLogRequest == null) { + return Collections.emptyList(); + } + if (filterUdiEpLogRequest.getPage() != null) { + int offset = (filterUdiEpLogRequest.getPage() - 1) * filterUdiEpLogRequest.getLimit(); + PageHelper.offsetPage(offset, filterUdiEpLogRequest.getLimit()); + } + List data = thrCorpExportLogDao.filterThrCorpExportLog(filterUdiEpLogRequest); + return data; + } + + @Override + public boolean insertThrCorpExportLog(ThrCorpExportLogEntity thrCorpExportLogEntity) { + return thrCorpExportLogDao.insertThrCorpExportLog(thrCorpExportLogEntity); + } + + @Override + public boolean updateThrCorpExportLog(ThrCorpExportLogEntity thrCorpExportLogEntity) { + return thrCorpExportLogDao.updateThrCorpExportLog(thrCorpExportLogEntity); + } + + @Override + public boolean deleteById(String id) { + return thrCorpExportLogDao.deleteById(id); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpImportLogServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpImportLogServiceImpl.java new file mode 100644 index 00000000..84f35797 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpImportLogServiceImpl.java @@ -0,0 +1,58 @@ +package com.glxp.api.admin.service.thrsys.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.thrsys.ThrCorpImportLogDao; +import com.glxp.api.admin.entity.thrsys.ThrCorpImportLogEntity; +import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.admin.service.thrsys.ThrCorpImportLogService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class ThrCorpImportLogServiceImpl implements ThrCorpImportLogService { + @Resource + ThrCorpImportLogDao thrCorpImportLogDao; + + @Override + public ThrCorpImportLogEntity selectByGenKey(String genKey) { + FilterUdiIpLogRequest filterUdiIpLogRequest = new FilterUdiIpLogRequest(); + filterUdiIpLogRequest.setGenKey(genKey); + List data = thrCorpImportLogDao.filterImportLog(filterUdiIpLogRequest); + if (data != null && data.size() > 0) { + return data.get(0); + } + return null; + } + + @Override + public List filterImportLog(FilterUdiIpLogRequest filterInCodeLogRequest) { + if (filterInCodeLogRequest == null) { + return Collections.emptyList(); + } + if (filterInCodeLogRequest.getPage() != null) { + int offset = (filterInCodeLogRequest.getPage() - 1) * filterInCodeLogRequest.getLimit(); + PageHelper.offsetPage(offset, filterInCodeLogRequest.getLimit()); + } + List data = thrCorpImportLogDao.filterImportLog(filterInCodeLogRequest); + return data; + + } + + @Override + public boolean insertImportLog(ThrCorpImportLogEntity thrCorpImportLogEntity) { + return thrCorpImportLogDao.insertImportLog(thrCorpImportLogEntity); + } + + @Override + public boolean updateImportLog(ThrCorpImportLogEntity thrCorpImportLogEntity) { + return thrCorpImportLogDao.updateImportLog(thrCorpImportLogEntity); + } + + @Override + public boolean deleteById(String id) { + return thrCorpImportLogDao.deleteById(id); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrInvProductsExportLogServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrInvProductsExportLogServiceImpl.java new file mode 100644 index 00000000..eada5e15 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrInvProductsExportLogServiceImpl.java @@ -0,0 +1,58 @@ +package com.glxp.api.admin.service.thrsys.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.thrsys.ThrInvProductsExportLogDao; +import com.glxp.api.admin.entity.thrsys.ThrInvProductsExportLogEntity; +import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest; +import com.glxp.api.admin.service.thrsys.ThrInvProductsExportLogService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class ThrInvProductsExportLogServiceImpl implements ThrInvProductsExportLogService { + + @Resource + ThrInvProductsExportLogDao thrInvProductsExportLogDao; + + @Override + public ThrInvProductsExportLogEntity selectByGenKey(String genKey) { + FilterUdiEpLogRequest filterUdiEpLogRequest = new FilterUdiEpLogRequest(); + filterUdiEpLogRequest.setGenKey(genKey); + List thrInvProductsExportLogEntities = thrInvProductsExportLogDao.filterThrInvProductsExportLog(filterUdiEpLogRequest); + if (thrInvProductsExportLogEntities != null && thrInvProductsExportLogEntities.size() > 0) { + return thrInvProductsExportLogEntities.get(0); + } + return null; + } + + @Override + public List filterThrInvProductsExportLog(FilterUdiEpLogRequest filterUdiEpLogRequest) { + if (filterUdiEpLogRequest == null) { + return Collections.emptyList(); + } + if (filterUdiEpLogRequest.getPage() != null) { + int offset = (filterUdiEpLogRequest.getPage() - 1) * filterUdiEpLogRequest.getLimit(); + PageHelper.offsetPage(offset, filterUdiEpLogRequest.getLimit()); + } + List data = thrInvProductsExportLogDao.filterThrInvProductsExportLog(filterUdiEpLogRequest); + return data; + } + + @Override + public boolean insertThrInvProductsExportLog(ThrInvProductsExportLogEntity thrInvProductsExportLogEntity) { + return thrInvProductsExportLogDao.insertThrInvProductsExportLog(thrInvProductsExportLogEntity); + } + + @Override + public boolean updateThrInvProductsExportLog(ThrInvProductsExportLogEntity thrInvProductsExportLogEntity) { + return thrInvProductsExportLogDao.updateThrInvProductsExportLog(thrInvProductsExportLogEntity); + } + + @Override + public boolean deleteById(String id) { + return thrInvProductsExportLogDao.deleteById(id); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrInvProductsImportLogServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrInvProductsImportLogServiceImpl.java new file mode 100644 index 00000000..ddcb41c9 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrInvProductsImportLogServiceImpl.java @@ -0,0 +1,58 @@ +package com.glxp.api.admin.service.thrsys.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.thrsys.ThrInvProductsImportLogDao; +import com.glxp.api.admin.entity.thrsys.ThrInvProductsImportLogEntity; +import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.admin.service.thrsys.ThrInvProductsImportLogService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; +@Service +public class ThrInvProductsImportLogServiceImpl implements ThrInvProductsImportLogService +{ + + @Resource + ThrInvProductsImportLogDao thrInvProductsImportLogDao; + + @Override + public List filterImportLog(FilterUdiIpLogRequest filterInCodeLogRequest) { + if (filterInCodeLogRequest == null) { + return Collections.emptyList(); + } + if (filterInCodeLogRequest.getPage() != null) { + int offset = (filterInCodeLogRequest.getPage() - 1) * filterInCodeLogRequest.getLimit(); + PageHelper.offsetPage(offset, filterInCodeLogRequest.getLimit()); + } + List data = thrInvProductsImportLogDao.filterImportLog(filterInCodeLogRequest); + return data; + } + + @Override + public boolean insertImportLog(ThrInvProductsImportLogEntity thrInvProductsImportLogEntity) { + return thrInvProductsImportLogDao.insertImportLog(thrInvProductsImportLogEntity); + } + + @Override + public boolean updateImportLog(ThrInvProductsImportLogEntity thrInvProductsImportLogEntity) { + return thrInvProductsImportLogDao.updateImportLog(thrInvProductsImportLogEntity); + } + + @Override + public boolean deleteById(String id) { + return thrInvProductsImportLogDao.deleteById(id); + } + + @Override + public ThrInvProductsImportLogEntity selectByGenKey(String genKey) { + FilterUdiIpLogRequest filterUdiIpLogRequest = new FilterUdiIpLogRequest(); + filterUdiIpLogRequest.setGenKey(genKey); + List data = thrInvProductsImportLogDao.filterImportLog(filterUdiIpLogRequest); + if (data != null && data.size() > 0) { + return data.get(0); + } + return null; + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrInvProductsServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrInvProductsServiceImpl.java index 2142fd61..44e734e3 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrInvProductsServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrInvProductsServiceImpl.java @@ -32,6 +32,11 @@ public class ThrInvProductsServiceImpl implements ThrInvProductsService { return data; } + @Override + public ThrInvProductsEntity selectById(String id) { + return thrInvProductsDao.selectById(id); + } + @Override public boolean insertThrInvProduct(ThrInvProductsEntity thrInvProductsEntity) { return thrInvProductsDao.insertThrInvProduct(thrInvProductsEntity); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderExportLogServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderExportLogServiceImpl.java new file mode 100644 index 00000000..bbd7d455 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderExportLogServiceImpl.java @@ -0,0 +1,58 @@ +package com.glxp.api.admin.service.thrsys.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.thrsys.ThrOrderExportLogDao; +import com.glxp.api.admin.entity.thrsys.ThrOrderExportLogEntity; +import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest; +import com.glxp.api.admin.service.thrsys.ThrOrderExportLogService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class ThrOrderExportLogServiceImpl implements ThrOrderExportLogService { + + @Resource + ThrOrderExportLogDao thrOrderExportLogDao; + + @Override + public ThrOrderExportLogEntity selectByGenKey(String genKey) { + FilterUdiEpLogRequest filterUdiEpLogRequest = new FilterUdiEpLogRequest(); + filterUdiEpLogRequest.setGenKey(genKey); + List thrOrderExportLogEntities = thrOrderExportLogDao.filterThrOrderExportLog(filterUdiEpLogRequest); + if (thrOrderExportLogEntities != null) { + return thrOrderExportLogEntities.get(0); + } + return null; + } + + @Override + public List filterThrOrderExportLog(FilterUdiEpLogRequest filterUdiEpLogRequest) { + if (filterUdiEpLogRequest == null) { + return Collections.emptyList(); + } + if (filterUdiEpLogRequest.getPage() != null) { + int offset = (filterUdiEpLogRequest.getPage() - 1) * filterUdiEpLogRequest.getLimit(); + PageHelper.offsetPage(offset, filterUdiEpLogRequest.getLimit()); + } + List data = thrOrderExportLogDao.filterThrOrderExportLog(filterUdiEpLogRequest); + return data; + } + + @Override + public boolean insertThrOrderExportLog(ThrOrderExportLogEntity thrOrderExportLogEntity) { + return thrOrderExportLogDao.insertThrOrderExportLog(thrOrderExportLogEntity); + } + + @Override + public boolean updateThrOrderExportLog(ThrOrderExportLogEntity thrOrderExportLogEntity) { + return thrOrderExportLogDao.updateThrOrderExportLog(thrOrderExportLogEntity); + } + + @Override + public boolean deleteById(String id) { + return thrOrderExportLogDao.deleteById(id); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderImportDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderImportDetailServiceImpl.java new file mode 100644 index 00000000..30920cd2 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderImportDetailServiceImpl.java @@ -0,0 +1,57 @@ +package com.glxp.api.admin.service.thrsys.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.thrsys.ThrOrderImportDetailDao; +import com.glxp.api.admin.entity.thrsys.ThrOrderImportDetailEntity; +import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.admin.service.thrsys.ThrOrderImportDetailService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class ThrOrderImportDetailServiceImpl implements ThrOrderImportDetailService { + + @Resource + ThrOrderImportDetailDao thrOrderImportDetailDao; + + @Override + public List filterOrderImportDetail(FilterUdiIpLogRequest filterUdiIpLogRequest) { + if (filterUdiIpLogRequest == null) { + return Collections.emptyList(); + } + if (filterUdiIpLogRequest.getPage() != null) { + int offset = (filterUdiIpLogRequest.getPage() - 1) * filterUdiIpLogRequest.getLimit(); + PageHelper.offsetPage(offset, filterUdiIpLogRequest.getLimit()); + } + List data = thrOrderImportDetailDao.filterOrderdDetailImport(filterUdiIpLogRequest); + return data; + } + + @Override + public boolean insertOrderImportDetail(ThrOrderImportDetailEntity thrOrderImportDetailEntity) { + return thrOrderImportDetailDao.insertOrderdDetailImport(thrOrderImportDetailEntity); + } + + @Override + public boolean updateOrderImportDetail(ThrOrderImportDetailEntity thrOrderImportDetailEntity) { + return thrOrderImportDetailDao.updateOrderdDetailImport(thrOrderImportDetailEntity); + } + + @Override + public boolean insertOrderImportDetails(List thrOrderImportDetailEntities) { + return thrOrderImportDetailDao.insertOrderdDetailImports(thrOrderImportDetailEntities); + } + + @Override + public boolean deleteById(String id) { + return thrOrderImportDetailDao.deleteById(id); + } + + @Override + public boolean deleteByGenkey(String genKey) { + return thrOrderImportDetailDao.deleteByGenkey(genKey); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderImportLogServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderImportLogServiceImpl.java new file mode 100644 index 00000000..16a55bac --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderImportLogServiceImpl.java @@ -0,0 +1,60 @@ +package com.glxp.api.admin.service.thrsys.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.thrsys.ThrOrderImportLogDao; +import com.glxp.api.admin.entity.basic.CorpImportLogEntity; +import com.glxp.api.admin.entity.thrsys.ThrOrderImportLogEntity; +import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.admin.service.thrsys.ThrOrderImportLogService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + + +@Service +public class ThrOrderImportLogServiceImpl implements ThrOrderImportLogService { + @Resource + ThrOrderImportLogDao thrOrderImportLogDao; + + @Override + public ThrOrderImportLogEntity selectByGenKey(String genKey) { + FilterUdiIpLogRequest filterUdiIpLogRequest = new FilterUdiIpLogRequest(); + filterUdiIpLogRequest.setGenKey(genKey); + List data = thrOrderImportLogDao.filterImportLog(filterUdiIpLogRequest); + if (data != null && data.size() > 0) { + return data.get(0); + } + return null; + } + + @Override + public List filterImportLog(FilterUdiIpLogRequest filterInCodeLogRequest) { + if (filterInCodeLogRequest == null) { + return Collections.emptyList(); + } + if (filterInCodeLogRequest.getPage() != null) { + int offset = (filterInCodeLogRequest.getPage() - 1) * filterInCodeLogRequest.getLimit(); + PageHelper.offsetPage(offset, filterInCodeLogRequest.getLimit()); + } + List data = thrOrderImportLogDao.filterImportLog(filterInCodeLogRequest); + return data; + + } + + @Override + public boolean insertImportLog(ThrOrderImportLogEntity thrOrderImportLogEntity) { + return thrOrderImportLogDao.insertImportLog(thrOrderImportLogEntity); + } + + @Override + public boolean updateImportLog(ThrOrderImportLogEntity thrOrderImportLogEntity) { + return thrOrderImportLogDao.updateImportLog(thrOrderImportLogEntity); + } + + @Override + public boolean deleteById(String id) { + return thrOrderImportLogDao.deleteById(id); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderServiceImpl.java index a8b480e1..8dae7baf 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderServiceImpl.java @@ -69,7 +69,7 @@ public class ThrOrderServiceImpl implements ThrOrderService { public List filterAllDetail(FilterThrOrderRequest filterThrOrderRequest) { List erpOrderResponses = new ArrayList<>(); - List data = thrOrderDao.filterThrOrder(filterThrOrderRequest); + List data = filterThrOrder(filterThrOrderRequest); if (data != null && data.size() > 0) { for (ThrOrderEntity thrOrderEntity : data) { FilterThrOrderDetailRequest filterThrOrderDetailRequest = new FilterThrOrderDetailRequest(); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsExportLogServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsExportLogServiceImpl.java new file mode 100644 index 00000000..e955b446 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsExportLogServiceImpl.java @@ -0,0 +1,57 @@ +package com.glxp.api.admin.service.thrsys.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.thrsys.ThrProductsExportLogDao; +import com.glxp.api.admin.entity.thrsys.ThrProductsExportLogEntity; +import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest; +import com.glxp.api.admin.service.thrsys.ThrProductsExportLogService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class ThrProductsExportLogServiceImpl implements ThrProductsExportLogService { + @Resource + ThrProductsExportLogDao thrProductsExportLogDao; + + @Override + public ThrProductsExportLogEntity selectByGenKey(String genKey) { + FilterUdiEpLogRequest filterUdiEpLogRequest = new FilterUdiEpLogRequest(); + filterUdiEpLogRequest.setGenKey(genKey); + List data = thrProductsExportLogDao.filterThrProductsExportLog(filterUdiEpLogRequest); + if (data != null) { + return data.get(0); + } + return null; + } + + @Override + public List filterThrProductsExportLog(FilterUdiEpLogRequest filterUdiEpLogRequest) { + if (filterUdiEpLogRequest == null) { + return Collections.emptyList(); + } + if (filterUdiEpLogRequest.getPage() != null) { + int offset = (filterUdiEpLogRequest.getPage() - 1) * filterUdiEpLogRequest.getLimit(); + PageHelper.offsetPage(offset, filterUdiEpLogRequest.getLimit()); + } + List data = thrProductsExportLogDao.filterThrProductsExportLog(filterUdiEpLogRequest); + return data; + } + + @Override + public boolean insertThrProductsExportLog(ThrProductsExportLogEntity thrProductsExportLogEntity) { + return thrProductsExportLogDao.insertThrProductsExportLog(thrProductsExportLogEntity); + } + + @Override + public boolean updateThrProductsExportLog(ThrProductsExportLogEntity thrProductsExportLogEntity) { + return thrProductsExportLogDao.updateThrProductsExportLog(thrProductsExportLogEntity); + } + + @Override + public boolean deleteById(String id) { + return thrProductsExportLogDao.deleteById(id); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsImportLogServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsImportLogServiceImpl.java new file mode 100644 index 00000000..afa49ec9 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsImportLogServiceImpl.java @@ -0,0 +1,57 @@ +package com.glxp.api.admin.service.thrsys.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.thrsys.ThrProductsImportLogDao; +import com.glxp.api.admin.entity.thrsys.ThrProductsImportLogEntity; +import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.admin.service.thrsys.ThrProductsImportLogService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class ThrProductsImportLogServiceImpl implements ThrProductsImportLogService { + @Resource + ThrProductsImportLogDao thrProductsImportLogDao; + + @Override + public List filterImportLog(FilterUdiIpLogRequest filterInCodeLogRequest) { + if (filterInCodeLogRequest == null) { + return Collections.emptyList(); + } + if (filterInCodeLogRequest.getPage() != null) { + int offset = (filterInCodeLogRequest.getPage() - 1) * filterInCodeLogRequest.getLimit(); + PageHelper.offsetPage(offset, filterInCodeLogRequest.getLimit()); + } + List data = thrProductsImportLogDao.filterImportLog(filterInCodeLogRequest); + return data; + } + + @Override + public boolean insertImportLog(ThrProductsImportLogEntity thrProductsImportLogEntity) { + return thrProductsImportLogDao.insertImportLog(thrProductsImportLogEntity); + } + + @Override + public boolean updateImportLog(ThrProductsImportLogEntity thrProductsImportLogEntity) { + return thrProductsImportLogDao.updateImportLog(thrProductsImportLogEntity); + } + + @Override + public boolean deleteById(String id) { + return thrProductsImportLogDao.deleteById(id); + } + + @Override + public ThrProductsImportLogEntity selectByGenKey(String genKey) { + FilterUdiIpLogRequest filterUdiIpLogRequest = new FilterUdiIpLogRequest(); + filterUdiIpLogRequest.setGenKey(genKey); + List data = thrProductsImportLogDao.filterImportLog(filterUdiIpLogRequest); + if (data != null && data.size() > 0) { + return data.get(0); + } + return null; + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsServiceImpl.java index b064970e..37dbea52 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsServiceImpl.java @@ -2,6 +2,7 @@ package com.glxp.api.admin.service.thrsys.impl; import com.github.pagehelper.PageHelper; import com.glxp.api.admin.dao.thrsys.ThrProductsDao; +import com.glxp.api.admin.entity.thrsys.ThrInvProductsEntity; import com.glxp.api.admin.entity.thrsys.ThrProductsEntity; import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest; import com.glxp.api.admin.service.thrsys.ThrProductsService; @@ -32,6 +33,11 @@ public class ThrProductsServiceImpl implements ThrProductsService { return data; } + @Override + public ThrProductsEntity selectById(String id) { + return thrProductsDao.selectById(id); + } + @Override public boolean insertThrProducts(ThrProductsEntity thrProductsEntity) { return thrProductsDao.insertThrProducts(thrProductsEntity); diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicCorpImportService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/BasicCorpImportService.java new file mode 100644 index 00000000..a315b6f5 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/BasicCorpImportService.java @@ -0,0 +1,55 @@ +package com.glxp.api.admin.thread; + +import com.glxp.api.admin.constant.UdiInfoImportStatus; +import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity; +import com.glxp.api.admin.entity.basic.CorpImportDetailEntity; +import com.glxp.api.admin.entity.basic.CorpImportLogEntity; +import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.admin.service.basic.BasicUnitMaintainService; +import com.glxp.api.admin.service.basic.CorpImportDetailService; +import com.glxp.api.admin.service.basic.CorpImportLogService; +import org.springframework.beans.BeanUtils; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +@Service +public class BasicCorpImportService { + + @Resource + CorpImportLogService corpImportLogService; + @Resource + CorpImportDetailService corpImportDetailService; + @Resource + BasicUnitMaintainService basicUnitMaintainService; + + @Async + public void importCorps(String genKey) { + + CorpImportLogEntity corpImportLogEntity = corpImportLogService.selectByGenKey(genKey); + if(corpImportLogEntity!=null && corpImportLogEntity.getStatus() == UdiInfoImportStatus.UDIINFO_IMPORT_UNPROCESS){ + FilterUdiIpLogRequest filterUdiIpLogRequest = new FilterUdiIpLogRequest(); + filterUdiIpLogRequest.setGenKey(genKey); + List corpImportDetailEntities + = corpImportDetailService.filterCorpImport(filterUdiIpLogRequest); + if (corpImportDetailEntities != null) { + for (CorpImportDetailEntity corpImportDetailEntity : corpImportDetailEntities) { + BasicUnitMaintainEntity basicUnitMaintainEntity = new BasicUnitMaintainEntity(); + BeanUtils.copyProperties(corpImportDetailEntity, basicUnitMaintainEntity); + basicUnitMaintainService.insertBasicUnitMaintain(basicUnitMaintainEntity); + corpImportDetailEntity.setImportStatus(UdiInfoImportStatus.UDIINFO_IMPORT_CODE_SUCESS); + corpImportDetailService.updateCorpImport(corpImportDetailEntity); + } + } + corpImportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_SUCCESS); + corpImportLogService.updateImportLog(corpImportLogEntity); + } + + + + + } + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicGenExcelService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/BasicGenExcelService.java new file mode 100644 index 00000000..57f82f97 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/BasicGenExcelService.java @@ -0,0 +1,199 @@ +package com.glxp.api.admin.thread; + +import com.glxp.api.admin.constant.UdiInfoImportStatus; +import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity; +import com.glxp.api.admin.entity.basic.CorpExportLogEntity; +import com.glxp.api.admin.entity.basic.UdiInfoExportLogEntity; +import com.glxp.api.admin.req.basic.BasicUnitMaintainFilterRequest; +import com.glxp.api.admin.req.basic.CorpsExportRequest; +import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; +import com.glxp.api.admin.req.basic.UdiInfoExportRequest; +import com.glxp.api.admin.res.basic.UdiRelevanceResponse; +import com.glxp.api.admin.service.basic.BasicUnitMaintainService; +import com.glxp.api.admin.service.basic.CorpExportLogService; +import com.glxp.api.admin.service.basic.UdiInfoExportLogService; +import com.glxp.api.admin.service.basic.UdiRelevanceService; +import com.glxp.api.admin.util.ExcelUtil; +import org.springframework.beans.BeanUtils; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +@Service +public class BasicGenExcelService { + @Resource + CorpExportLogService corpExportLogService; + @Resource + BasicUnitMaintainService basicUnitMaintainService; + @Resource + UdiInfoExportLogService udiInfoExportLogService; + @Resource + UdiRelevanceService udiRelevanceService; + + //往来单位导出excel文件 + @Async + public void exportCorp(String genKey, CorpsExportRequest corpsExportRequest) { + + CorpExportLogEntity corpExportLogEntity = corpExportLogService.selectByGenKey(genKey); + List> excelData = new ArrayList<>(); + List head = new ArrayList<>(); + head.add("往来单位ID"); + head.add("往来单位名称"); + head.add("往来单位拼音简写"); + head.add("地址"); + head.add("联系人"); + head.add("联系电话"); + head.add("社会信用号"); + head.add("往来单位状态"); + head.add("往来单位类型"); + head.add("thirdId"); + head.add("thirdName"); + head.add("thirdI1d"); + head.add("thirdName1"); + head.add("thirdId2"); + head.add("thirdName2"); + head.add("thirdId3"); + head.add("thirdName3"); + head.add("thirdId4"); + head.add("thirdName4"); + excelData.add(head); + //选中导出 + if (corpsExportRequest.getIds() != null && corpsExportRequest.getIds().size() > 0) { + List ids = corpsExportRequest.getIds(); + for (Integer id : ids) { + BasicUnitMaintainFilterRequest filterRequest = new BasicUnitMaintainFilterRequest(); + filterRequest.setId(id); + List> genDatas = genExcelData(filterRequest); + if (genDatas != null && genDatas.size() > 0) { + excelData.addAll(genDatas); + } + } + + } else {//一键导出 + BasicUnitMaintainFilterRequest filterRequest = new BasicUnitMaintainFilterRequest(); + BeanUtils.copyProperties(corpsExportRequest, filterRequest); + List> genDatas = genExcelData(filterRequest); + if (genDatas != null && genDatas.size() > 0) { + excelData.addAll(genDatas); + } + } + + String sheetName = "往来单位信息"; + File file = new File(corpExportLogEntity.getFilePath()); + if (!file.exists()) { + try { + file.createNewFile(); + } catch (IOException e) { + e.printStackTrace(); + } + } + new ExcelUtil().exportExcel(excelData, sheetName, corpExportLogEntity.getFilePath(), 20); + corpExportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_SUCCESS); + corpExportLogService.updateCorpExportLog(corpExportLogEntity); + } + + @Async + public void exportUdiInfo(String genKey, UdiInfoExportRequest udiInfoExportRequest) { + UdiInfoExportLogEntity udiInfoExportLogEntity = udiInfoExportLogService.selectByGenKey(genKey); + List> excelData = new ArrayList<>(); + List head = new ArrayList<>(); + head.add("udiCode"); + head.add("医保编码"); + head.add("商品条码"); + head.add("thirdId"); + head.add("thirdId1"); + head.add("thirdId2"); + head.add("thirdId3"); + head.add("thirdId4"); + excelData.add(head); + //选中导出 + if (udiInfoExportRequest.getUuids() != null && udiInfoExportRequest.getUuids().size() > 0) { + List uuids = udiInfoExportRequest.getUuids(); + for (String uuid : uuids) { + FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); + filterUdiInfoRequest.setUuid(uuid); + List> genDatas = genExcelData(filterUdiInfoRequest); + if (genDatas != null && genDatas.size() > 0) { + excelData.addAll(genDatas); + } + } + + } else {//一键导出 + FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); + BeanUtils.copyProperties(udiInfoExportRequest, filterUdiInfoRequest); + List> genDatas = genExcelData(filterUdiInfoRequest); + if (genDatas != null && genDatas.size() > 0) { + excelData.addAll(genDatas); + } + } + + String sheetName = "UDI产品信息对照"; + + File file = new File(udiInfoExportLogEntity.getFilePath()); + if (!file.exists()) { + try { + file.createNewFile(); + } catch (IOException e) { + e.printStackTrace(); + } + } + new ExcelUtil().exportExcel(excelData, sheetName, udiInfoExportLogEntity.getFilePath(), 20); + udiInfoExportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_SUCCESS); + udiInfoExportLogService.updateUdiInfoExportLog(udiInfoExportLogEntity); + } + + + public List> genExcelData(BasicUnitMaintainFilterRequest filterUdiInfoRequest) { + + List> excelData = new ArrayList<>(); + List unitMaintainEntities = basicUnitMaintainService.filterList(filterUdiInfoRequest); + for (BasicUnitMaintainEntity basicUnitMaintainEntity : unitMaintainEntities) { + List rows = new ArrayList<>(); + rows.add(basicUnitMaintainEntity.getErpId()); + rows.add(basicUnitMaintainEntity.getName()); + rows.add(basicUnitMaintainEntity.getSpell()); + rows.add(basicUnitMaintainEntity.getAddr()); + rows.add(basicUnitMaintainEntity.getContact()); + rows.add(basicUnitMaintainEntity.getMobile()); + rows.add(basicUnitMaintainEntity.getCreditNo()); + rows.add(basicUnitMaintainEntity.getStatus()); + rows.add(basicUnitMaintainEntity.getType()); + rows.add(basicUnitMaintainEntity.getThirdId()); + rows.add(basicUnitMaintainEntity.getThirdName()); + rows.add(basicUnitMaintainEntity.getThirdId1()); + rows.add(basicUnitMaintainEntity.getThirdName1()); + rows.add(basicUnitMaintainEntity.getThirdId2()); + rows.add(basicUnitMaintainEntity.getThirdName2()); + rows.add(basicUnitMaintainEntity.getThirdId3()); + rows.add(basicUnitMaintainEntity.getThirdName3()); + rows.add(basicUnitMaintainEntity.getThirdId4()); + rows.add(basicUnitMaintainEntity.getThirdName4()); + excelData.add(rows); + } + return excelData; + } + + public List> genExcelData(FilterUdiInfoRequest filterUdiInfoRequest) { + + List> excelData = new ArrayList<>(); + List udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest); + for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses) { + List rows = new ArrayList<>(); + rows.add(udiRelevanceResponse.getNameCode()); + rows.add(udiRelevanceResponse.getYbbm()); + rows.add(udiRelevanceResponse.getSptm()); + rows.add(udiRelevanceResponse.getThirdId()); + rows.add(udiRelevanceResponse.getThirdId1()); + rows.add(udiRelevanceResponse.getThirdId2()); + rows.add(udiRelevanceResponse.getThirdId3()); + rows.add(udiRelevanceResponse.getThirdId4()); + excelData.add(rows); + } + return excelData; + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUdiInfoImportService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUdiInfoImportService.java new file mode 100644 index 00000000..07ff9c4b --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUdiInfoImportService.java @@ -0,0 +1,105 @@ +package com.glxp.api.admin.thread; + +import com.glxp.api.admin.constant.UdiInfoImportStatus; +import com.glxp.api.admin.entity.basic.UdiInfoEntity; +import com.glxp.api.admin.entity.basic.UdiInfoImportDetailEntity; +import com.glxp.api.admin.entity.basic.UdiInfoImportLogEntity; +import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; +import com.glxp.api.admin.entity.thrsys.ThrProductsEntity; +import com.glxp.api.admin.httpclient.UdiDlHttpClient; +import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.admin.service.basic.UdiInfoImportLogService; +import com.glxp.api.admin.service.basic.UdiInfoImportDetailService; +import com.glxp.api.admin.service.basic.UdiInfoService; +import com.glxp.api.admin.service.basic.UdiRelevanceService; +import com.glxp.api.admin.service.thrsys.ThrDataService; +import com.glxp.api.admin.util.DateUtil; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +@Service +public class BasicUdiInfoImportService { + + @Resource + UdiInfoImportLogService udiInfoImportLogService; + @Resource + UdiInfoImportDetailService udiInfoImportService; + @Resource + UdiInfoService udiInfoService; + @Resource + UdiRelevanceService udiRelevanceService; + @Resource + ThrDataService thrDataService; + @Value("${UDI_SERVER_URL}") + private String udiUrl; + + //导入产品信息文件，生成产品信息，更新或插入对照表 + @Async + public void importUdiInfo(String genKey) { + + UdiInfoImportLogEntity udiInfoImportLogEntity = udiInfoImportLogService.selectByGenKey(genKey); + if (udiInfoImportLogEntity.getStatus() == UdiInfoImportStatus.UDIINFO_IMPORT_CODE_UNPROCESS) { + FilterUdiIpLogRequest filterUdiIpLogRequest = new FilterUdiIpLogRequest(); + filterUdiIpLogRequest.setGenKey(genKey); + List udiInfoImportEntities + = udiInfoImportService.filterUdiInfoImport(filterUdiIpLogRequest); + if (udiInfoImportEntities != null) { + for (UdiInfoImportDetailEntity udiInfoImportDetailEntity : udiInfoImportEntities) { + UdiInfoEntity udiInfoEntity = udiInfoService.findByNameCode(udiInfoImportDetailEntity.getUdiCode()); + if (udiInfoEntity == null) { + List froms = new UdiDlHttpClient(udiUrl).getUdiByDi(udiInfoImportDetailEntity.getUdiCode()); + if (froms != null && !froms.isEmpty()) { + udiInfoEntity = froms.get(0); + UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); + udiRelevanceEntity.setUuid(udiInfoEntity.getUuid()); + udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime()); + udiRelevanceEntity.setThirdId(udiInfoImportDetailEntity.getThirdId()); + udiRelevanceEntity.setThirdId1(udiInfoImportDetailEntity.getThirdId1()); + udiRelevanceEntity.setThirdId2(udiInfoImportDetailEntity.getThirdId2()); + udiRelevanceEntity.setThirdId3(udiInfoImportDetailEntity.getThirdId3()); + udiRelevanceEntity.setThirdId4(udiInfoImportDetailEntity.getThirdId4()); + udiRelevanceEntity.setYbbm(udiInfoImportDetailEntity.getYbbm()); + udiRelevanceEntity.setSptm(udiInfoImportDetailEntity.getSptm()); + + if (udiRelevanceEntity.getThirdId() != null) { + ThrProductsEntity thrProductsEntity = thrDataService.getProducts(udiRelevanceEntity.getThirdId(), "thirdId"); + if(thrProductsEntity!=null){ + udiRelevanceEntity.setManufactory(thrProductsEntity.getManufactory()); + udiRelevanceEntity.setMeasname(thrProductsEntity.getMeasname()); + udiInfoService.insertUdiInfos(froms); + udiInfoImportDetailEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_CODE_SUCESS); + udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); + }else { + udiInfoImportDetailEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_CODE_FAIL); + udiInfoImportDetailEntity.setRemark("未查询到系统产品信息！"); + udiInfoImportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_FAIL); + } + } + + } else { + udiInfoImportDetailEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_CODE_FAIL); + udiInfoImportDetailEntity.setRemark("未查询到UDI产品信息！"); + udiInfoImportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_FAIL); + } + + }else { + udiInfoImportDetailEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_CODE_SUCESS); + } + udiInfoImportService.updateUdiInfoImport(udiInfoImportDetailEntity); + } + udiInfoImportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_SUCCESS); + udiInfoImportLogService.updateImportLog(udiInfoImportLogEntity); + } + } + + } + + + //导出生成EXCEL文件 + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateErpDataTask.java b/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateErpDataTask.java index 890a380c..934af516 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateErpDataTask.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateErpDataTask.java @@ -63,7 +63,7 @@ public class BasicUpdateErpDataTask implements SchedulingConfigurer { BasicThirdSysDetailEntity piDetailEntity = basicThirdSysDetailService.selectByKey("piQueryUrl", thirdSysId); BasicThirdSysDetailEntity invPiDetailEntity = basicThirdSysDetailService.selectByKey("invPiUrl", thirdSysId); if (piDetailEntity.getValue() != null && invPiDetailEntity.getValue() != null) { - updateproductService.updateProduct(piDetailEntity.getValue(), invPiDetailEntity.getValue()); + updateproductService.updateProduct(piDetailEntity.getValue(), invPiDetailEntity.getValue(),thirdSysId); } else { logger.info("接口地址未设置"); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateproductService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateproductService.java index df894c72..077211b1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateproductService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateproductService.java @@ -36,11 +36,11 @@ public class BasicUpdateproductService { @Async - public void updateProduct(String productUrl, String onHandUrl) { + public void updateProduct(String productUrl, String onHandUrl, String thirdSysId) { int page = 1; int limit = 100; while (page != -1) { - page = getInvmandoc(null, page, limit, productUrl, onHandUrl); + page = getInvmandoc(null, page, limit, productUrl, onHandUrl, thirdSysId); } } @@ -51,7 +51,6 @@ public class BasicUpdateproductService { UdiRelevanceEntity udiRelevanceEntity1 = new UdiRelevanceEntity(); udiRelevanceEntity1.setThirdId(combineRequest.getThirdId()); udiRelevanceEntity1.setThirdName(combineRequest.getErpName()); - udiRelevanceEntity1.setUpdateTime(DateUtil.getDateTime()); FilterErpGoodsRequest filterErpGoodsRequest = new FilterErpGoodsRequest(); filterErpGoodsRequest.setCode(combineRequest.getThirdId()); @@ -62,7 +61,7 @@ public class BasicUpdateproductService { if (erpProductsResponses != null & erpProductsResponses.size() > 0) { ErpProductsResponse erpProductsResponse = erpProductsResponses.get(0); UdiInfoEntity udiInfoEntity = new UdiInfoEntity(); - BeanUtils.copyProperties(erpProductsResponse,udiInfoEntity); + BeanUtils.copyProperties(erpProductsResponse, udiInfoEntity); // udiInfoEntity.setNameCode(erpProductsResponse.getCode()); udiInfoEntity.setCpmctymc(erpProductsResponse.getName()); udiInfoEntity.setGgxh(erpProductsResponse.getSpec()); @@ -78,7 +77,7 @@ public class BasicUpdateproductService { } - public int getInvmandoc(String invcode, int page, int limit, String productUrl, String onHandUrl) { + public int getInvmandoc(String invcode, int page, int limit, String productUrl, String onHandUrl, String thirdSysId) { FilterErpGoodsRequest filterErpGoodsRequest = new FilterErpGoodsRequest(); filterErpGoodsRequest.setPage(page); @@ -94,7 +93,7 @@ public class BasicUpdateproductService { inventoryCodes.add(invcode); } else { for (ErpProductsResponse invmandocResponse : invmandocResponses) { - UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(invmandocResponse.getCode()); + UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(invmandocResponse.getCode(), thirdSysId); if (udiRelevanceEntity == null) { inventoryCodes.add(invmandocResponse.getCode()); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/InvImportStockService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/InvImportStockService.java index 07b6123a..6de43bb1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/InvImportStockService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/InvImportStockService.java @@ -2,6 +2,7 @@ package com.glxp.api.admin.thread; import com.glxp.api.admin.config.WebSocketServer; import com.glxp.api.admin.constant.ConstantType; +import com.glxp.api.admin.constant.IncodeStatus; import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; import com.glxp.api.admin.entity.basic.UdiInfoEntity; @@ -11,13 +12,16 @@ import com.glxp.api.admin.entity.inout.ErpOrderEntity; import com.glxp.api.admin.entity.inout.FilterErpOrderRequest; import com.glxp.api.admin.entity.inout.OrderEntity; import com.glxp.api.admin.entity.inventory.ErpStockEntity; +import com.glxp.api.admin.entity.inventory.InCodeLogEntity; import com.glxp.api.admin.entity.inventory.StockPrintEntity; +import com.glxp.api.admin.entity.thrsys.ThrInvProductsEntity; import com.glxp.api.admin.httpclient.ErpInvClient; import com.glxp.api.admin.req.basic.FilterStockprintRequest; import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; import com.glxp.api.admin.req.inout.FilterStockCheckRequest; import com.glxp.api.admin.req.inout.OrderFilterRequest; import com.glxp.api.admin.req.inventory.ErpOnhandRequest; +import com.glxp.api.admin.req.thrsys.FilterThrInvProductsRequest; import com.glxp.api.admin.res.basic.UdiRelevanceResponse; import com.glxp.api.admin.res.inventory.ErpInvProductResponse; import com.glxp.api.admin.res.inventory.ErpOnHandResponse; @@ -25,7 +29,9 @@ import com.glxp.api.admin.service.basic.*; import com.glxp.api.admin.service.info.SystemParamConfigService; import com.glxp.api.admin.service.inout.OrderDetailService; import com.glxp.api.admin.service.inout.OrderService; +import com.glxp.api.admin.service.inventory.InCodeLogService; import com.glxp.api.admin.service.inventory.InvStockPrintService; +import com.glxp.api.admin.service.thrsys.ThrInvProductsService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; @@ -56,14 +62,20 @@ public class InvImportStockService { @Resource private BasicThirdSysService basicThirdSysService; @Resource + InCodeLogService inCodeLogService; + @Resource + ThrInvProductsService thrInvProductsService; + @Resource BasicThirdSysDetailService basicThirdSysDetailService; final Logger logger = LoggerFactory.getLogger(InvImportStockService.class); + //产品信息生成全部 @Async - public void updateStock(String thirsysFk) { + public void updateStock(String genKey, String thirsysFk) { int page = 1; int limit = 1000; + InCodeLogEntity inCodeLogEntity = inCodeLogService.selectByGenKey(genKey); FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); BasicThirdSysDetailEntity invPiDetailEntity = basicThirdSysDetailService.selectByKey("invPiUrl", thirsysFk); String url; @@ -77,15 +89,15 @@ public class InvImportStockService { List stockPrintEntities = new ArrayList<>(); for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses) { if ("thirdId".equals(thirsysFk)) { - generatorPrints(udiRelevanceResponse.getThirdId(), "thirdId", url, stockPrintEntities, udiRelevanceResponse); + generatorPrints(udiRelevanceResponse.getThirdId(), "thirdId", url, stockPrintEntities, udiRelevanceResponse, genKey); } else if ("thirdId1".equals(thirsysFk)) { - generatorPrints(udiRelevanceResponse.getThirdId(), "thirdId1", url, stockPrintEntities, udiRelevanceResponse); + generatorPrints(udiRelevanceResponse.getThirdId1(), "thirdId1", url, stockPrintEntities, udiRelevanceResponse, genKey); } else if ("thirdId2".equals(thirsysFk)) { - generatorPrints(udiRelevanceResponse.getThirdId(), "thirdId2", url, stockPrintEntities, udiRelevanceResponse); + generatorPrints(udiRelevanceResponse.getThirdId2(), "thirdId2", url, stockPrintEntities, udiRelevanceResponse, genKey); } else if ("thirdId3".equals(thirsysFk)) { - generatorPrints(udiRelevanceResponse.getThirdId(), "thirdId3", url, stockPrintEntities, udiRelevanceResponse); + generatorPrints(udiRelevanceResponse.getThirdId3(), "thirdId3", url, stockPrintEntities, udiRelevanceResponse, genKey); } else if ("thirdId4".equals(thirsysFk)) { - generatorPrints(udiRelevanceResponse.getThirdId(), "thirdId4", url, stockPrintEntities, udiRelevanceResponse); + generatorPrints(udiRelevanceResponse.getThirdId4(), "thirdId4", url, stockPrintEntities, udiRelevanceResponse, genKey); } } stockPrintService.insertStockPrints(stockPrintEntities); @@ -99,17 +111,62 @@ public class InvImportStockService { } } WebSocketServer.sendInfo("后台已更新完成，请刷新查看", "sid"); + inCodeLogEntity.setStatus(IncodeStatus.FINISH); + inCodeLogService.updateInCodeLog(inCodeLogEntity); } else { WebSocketServer.sendInfo("自动更新失败，ERP库存产品信息查询接口地址未定义", "err"); logger.error("ERP库存产品信息查询接口地址未定义！"); + inCodeLogEntity.setStatus(IncodeStatus.ERROR); + inCodeLogEntity.setRemark("ERP库存产品信息查询接口地址未定义！"); + inCodeLogService.updateInCodeLog(inCodeLogEntity); } } - public void generatorPrints(String inventoryCode, String thirdSysFk, String url, List stockPrintEntities, UdiRelevanceResponse udiRelevanceResponse) { + //根据产品ID生成 + @Async + public void updateStockById(String genKey, List ids, String thirsysFk) { + BasicThirdSysDetailEntity invPiDetailEntity = basicThirdSysDetailService.selectByKey("invPiUrl", thirsysFk); + String url; + if (invPiDetailEntity != null) { + url = invPiDetailEntity.getValue(); + if (ids != null && ids.size() > 0) { + for (String id : ids) { + List stockPrintEntities = new ArrayList<>(); + UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(id); + if ("thirdId".equals(thirsysFk)) { + generatorPrints(udiRelevanceResponse.getThirdId(), "thirdId", url, stockPrintEntities, udiRelevanceResponse, genKey); + } else if ("thirdId1".equals(thirsysFk)) { + generatorPrints(udiRelevanceResponse.getThirdId1(), "thirdId1", url, stockPrintEntities, udiRelevanceResponse, genKey); + } else if ("thirdId2".equals(thirsysFk)) { + generatorPrints(udiRelevanceResponse.getThirdId2(), "thirdId2", url, stockPrintEntities, udiRelevanceResponse, genKey); + } else if ("thirdId3".equals(thirsysFk)) { + generatorPrints(udiRelevanceResponse.getThirdId3(), "thirdId3", url, stockPrintEntities, udiRelevanceResponse, genKey); + } else if ("thirdId4".equals(thirsysFk)) { + generatorPrints(udiRelevanceResponse.getThirdId4(), "thirdId4", url, stockPrintEntities, udiRelevanceResponse, genKey); + } + stockPrintService.insertStockPrints(stockPrintEntities); + } + + } + } + InCodeLogEntity inCodeLogEntity = inCodeLogService.selectByGenKey(genKey); + inCodeLogEntity.setStatus(IncodeStatus.FINISH); + inCodeLogService.updateInCodeLog(inCodeLogEntity); + WebSocketServer.sendInfo("生成内部码已完成，请刷新查看", "sid"); + } + + //根据第三方产品ID生成 + @Async + public void updateByCode(String code, String url,String thirdSysFk) { + UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(code,thirdSysFk); + UdiRelevanceResponse udiRelevanceResponse = new UdiRelevanceResponse(); + BeanUtils.copyProperties(udiRelevanceEntity, udiRelevanceResponse); + List stockPrintEntities = new ArrayList<>(); ErpOnhandRequest erpOnhandRequest = new ErpOnhandRequest(); - erpOnhandRequest.setInventoryCode(inventoryCode); + erpOnhandRequest.setInventoryCode(udiRelevanceResponse.getThirdId()); List uOnhandQueryResponses = new ErpInvClient().getInvPrdoduct(erpOnhandRequest, url); if (uOnhandQueryResponses != null && uOnhandQueryResponses.size() > 0) { + for (ErpInvProductResponse onhandQueryResponse : uOnhandQueryResponses) { StockPrintEntity stockPrintEntity = new StockPrintEntity(); stockPrintEntity.setBatchNo(onhandQueryResponse.getBatchNo()); @@ -118,9 +175,9 @@ public class InvImportStockService { stockPrintEntity.setWarehouseCode(onhandQueryResponse.getWarehouseCode()); stockPrintEntity.setExpireDate(onhandQueryResponse.getExpirationDate()); stockPrintEntity.setProduceDate(onhandQueryResponse.getManufacturingDate()); - stockPrintEntity.setThirdSysFk(thirdSysFk); setCommonparams(stockPrintEntity, udiRelevanceResponse, stockPrintEntities); } + } else { StockPrintEntity stockPrintEntity = new StockPrintEntity(); setCommonparams(stockPrintEntity, udiRelevanceResponse, stockPrintEntities); @@ -128,17 +185,91 @@ public class InvImportStockService { } + //根据库存产品信息生成 @Async - public void updateByCode(String code, String url) { - UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(code); - UdiRelevanceResponse udiRelevanceResponse = new UdiRelevanceResponse(); - BeanUtils.copyProperties(udiRelevanceEntity, udiRelevanceResponse); - List stockPrintEntities = new ArrayList<>(); + public void updateByInvInfo(String genKey, List ids, String thirsysFk) { + if (ids != null && ids.size() > 0) { + for (String id : ids) { + + FilterThrInvProductsRequest filterThrInvProductsRequest = new FilterThrInvProductsRequest(); + filterThrInvProductsRequest.setThirdSysFk(thirsysFk); + filterThrInvProductsRequest.setInventoryCode(id); + List thrInvProductsEntities = thrInvProductsService.filterThrInvProductss(filterThrInvProductsRequest); + if(thrInvProductsEntities!=null){ + UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(id,thirsysFk); + for(ThrInvProductsEntity thrInvProductsEntity:thrInvProductsEntities){ + StockPrintEntity stockPrintEntity = new StockPrintEntity(); + stockPrintEntity.setNameCode(thrInvProductsEntity.getInventoryCode()); + stockPrintEntity.setBatchNo(thrInvProductsEntity.getBatchNo()); + stockPrintEntity.setNnum(thrInvProductsEntity.getCount() + ""); + stockPrintEntity.setWarehouseName(thrInvProductsEntity.getWarehouseName()); + stockPrintEntity.setWarehouseCode(thrInvProductsEntity.getWarehouseCode()); + stockPrintEntity.setSpaceCode(thrInvProductsEntity.getSpaceCode()); + stockPrintEntity.setSpaceName(thrInvProductsEntity.getSpaceName()); + stockPrintEntity.setExpireDate(thrInvProductsEntity.getExpirationDate()); + stockPrintEntity.setProduceDate(thrInvProductsEntity.getManufacturingDate()); + stockPrintEntity.setThirdSysFk(thirsysFk); + stockPrintEntity.setGenKeyFk(genKey); + stockPrintEntity.setUdiCode(generateUdiCode(stockPrintEntity)); + stockPrintService.insertStockPrint(stockPrintEntity); + } + } + } + InCodeLogEntity inCodeLogEntity = inCodeLogService.selectByGenKey(genKey); + inCodeLogEntity.setStatus(IncodeStatus.FINISH); + inCodeLogService.updateInCodeLog(inCodeLogEntity); + WebSocketServer.sendInfo("生成内部码已完成，请刷新查看", "sid"); + } + + } + + //根据库存产品信息全部生成 + @Async + public void updateAllByInvInfo(String genKey, String thirsysFk) { + int page = 1; + int limit = 1000; + while (true) { + FilterThrInvProductsRequest filterThrInvProductsRequest = new FilterThrInvProductsRequest(); + filterThrInvProductsRequest.setPage(page); + filterThrInvProductsRequest.setLimit(limit); + List thrInvProductsEntities = thrInvProductsService.filterThrInvProductss(filterThrInvProductsRequest); + if (thrInvProductsEntities != null && thrInvProductsEntities.size() > 0) { + for (ThrInvProductsEntity thrInvProductsEntity : thrInvProductsEntities) { + StockPrintEntity stockPrintEntity = new StockPrintEntity(); + stockPrintEntity.setBatchNo(thrInvProductsEntity.getBatchNo()); + stockPrintEntity.setNameCode(thrInvProductsEntity.getInventoryCode()); + stockPrintEntity.setNnum(thrInvProductsEntity.getCount() + ""); + stockPrintEntity.setWarehouseName(thrInvProductsEntity.getWarehouseName()); + stockPrintEntity.setWarehouseCode(thrInvProductsEntity.getWarehouseCode()); + stockPrintEntity.setSpaceCode(thrInvProductsEntity.getSpaceCode()); + stockPrintEntity.setSpaceName(thrInvProductsEntity.getSpaceName()); + stockPrintEntity.setExpireDate(thrInvProductsEntity.getExpirationDate()); + stockPrintEntity.setProduceDate(thrInvProductsEntity.getManufacturingDate()); + stockPrintEntity.setThirdSysFk(thirsysFk); + stockPrintEntity.setGenKeyFk(genKey); + stockPrintEntity.setUdiCode(generateUdiCode(stockPrintEntity)); + stockPrintService.insertStockPrint(stockPrintEntity); + } + } + if (thrInvProductsEntities.size() < limit) { + break; + } else { + page++; + } + } + + InCodeLogEntity inCodeLogEntity = inCodeLogService.selectByGenKey(genKey); + inCodeLogEntity.setStatus(IncodeStatus.FINISH); + inCodeLogService.updateInCodeLog(inCodeLogEntity); + WebSocketServer.sendInfo("生成内部码已完成，请刷新查看", "sid"); + } + + public void generatorPrints(String inventoryCode, String thirdSysFk, String url, List stockPrintEntities, + UdiRelevanceResponse udiRelevanceResponse, String genKey) { ErpOnhandRequest erpOnhandRequest = new ErpOnhandRequest(); - erpOnhandRequest.setInventoryCode(udiRelevanceResponse.getThirdId()); + erpOnhandRequest.setInventoryCode(inventoryCode); List uOnhandQueryResponses = new ErpInvClient().getInvPrdoduct(erpOnhandRequest, url); if (uOnhandQueryResponses != null && uOnhandQueryResponses.size() > 0) { - for (ErpInvProductResponse onhandQueryResponse : uOnhandQueryResponses) { StockPrintEntity stockPrintEntity = new StockPrintEntity(); stockPrintEntity.setBatchNo(onhandQueryResponse.getBatchNo()); @@ -147,11 +278,14 @@ public class InvImportStockService { stockPrintEntity.setWarehouseCode(onhandQueryResponse.getWarehouseCode()); stockPrintEntity.setExpireDate(onhandQueryResponse.getExpirationDate()); stockPrintEntity.setProduceDate(onhandQueryResponse.getManufacturingDate()); + stockPrintEntity.setThirdSysFk(thirdSysFk); + stockPrintEntity.setGenKeyFk(genKey); setCommonparams(stockPrintEntity, udiRelevanceResponse, stockPrintEntities); } - } else { StockPrintEntity stockPrintEntity = new StockPrintEntity(); + stockPrintEntity.setThirdSysFk(thirdSysFk); + stockPrintEntity.setGenKeyFk(genKey); setCommonparams(stockPrintEntity, udiRelevanceResponse, stockPrintEntities); } @@ -192,6 +326,8 @@ public class InvImportStockService { filterStockprintRequest.setUdiRlIdFk(stockPrintEntity.getUdiRlIdFk() + ""); filterStockprintRequest.setBatchNo(stockPrintEntity.getBatchNo()); filterStockprintRequest.setWarehouseCode(stockPrintEntity.getWarehouseCode()); + filterStockprintRequest.setSpaceCode(stockPrintEntity.getSpaceCode()); + filterStockprintRequest.setGenKeyFk(stockPrintEntity.getGenKeyFk()); StockPrintEntity temp = stockPrintService.findByRlId(filterStockprintRequest); if (temp != null) { @@ -218,13 +354,11 @@ public class InvImportStockService { stockPrintEntities.add(stockPrintEntity); } - public String generateUdiCode(StockPrintEntity stockPrintEntity) { String udiCode = ""; if (stockPrintEntity.getProduceDate() == null) { stockPrintEntity.setProduceDate(""); } - if (stockPrintEntity.getExpireDate() == null) { stockPrintEntity.setExpireDate(""); } @@ -238,10 +372,11 @@ public class InvImportStockService { //货位码类型 //#di#生产日期#失效日期#批次号#序列号#仓位号#货位号 udiCode = "#" + stockPrintEntity.getNameCode() + "#" + stockPrintEntity.getProduceDate() + "#" + stockPrintEntity.getExpireDate() + - "#" + stockPrintEntity.getBatchNo() + "#" + "#" + stockPrintEntity.getWarehouseCode() + "#"; + "#" + stockPrintEntity.getBatchNo() + "#" + "#" + stockPrintEntity.getWarehouseCode() + "#" + stockPrintEntity.getSpaceCode(); return udiCode; } + //盘点校验 @Async public void checkStock(FilterStockCheckRequest filterStockCheckRequest) { SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("erp_inv_product_query"); diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/InvUpdateStock1Task.java b/api-admin/src/main/java/com/glxp/api/admin/thread/InvUpdateStock1Task.java index caeaa6fd..21a0cf52 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/InvUpdateStock1Task.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/InvUpdateStock1Task.java @@ -51,7 +51,7 @@ public class InvUpdateStock1Task implements SchedulingConfigurer { if ("1".equals(systemParamConfigEntity.getParamValue())) { logger.info("定时更新下载电子货位卡"); SystemParamConfigEntity systemParamConfigEntity1 = systemParamConfigService.selectByParamKey("erp_stockprint_get_invpi"); - importStockService.updateStock(systemParamConfigEntity1.getParamValue()); +// importStockService.updateStock(systemParamConfigEntity1.getParamValue()); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/InvUpdateStock2Task.java b/api-admin/src/main/java/com/glxp/api/admin/thread/InvUpdateStock2Task.java index e21b1f03..716692a2 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/InvUpdateStock2Task.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/InvUpdateStock2Task.java @@ -49,7 +49,7 @@ public class InvUpdateStock2Task implements SchedulingConfigurer { if ("1".equals(systemParamConfigEntity.getParamValue())) { logger.info("定时更新下载电子货位卡"); SystemParamConfigEntity systemParamConfigEntity1 = systemParamConfigService.selectByParamKey("erp_stockprint_get_invpi"); - importStockService.updateStock(systemParamConfigEntity1.getParamValue()); +// importStockService.updateStock(systemParamConfigEntity1.getParamValue()); } } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/ThrCorpsDlService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/ThrCorpsDlService.java index 394c8426..f5c12f48 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/ThrCorpsDlService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/ThrCorpsDlService.java @@ -1,26 +1,32 @@ package com.glxp.api.admin.thread; import com.glxp.api.admin.config.WebSocketServer; +import com.glxp.api.admin.constant.UdiInfoImportStatus; import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; -import com.glxp.api.admin.entity.thrsys.ThrCorpEntity; -import com.glxp.api.admin.entity.thrsys.ThrProductsEntity; +import com.glxp.api.admin.entity.thrsys.*; import com.glxp.api.admin.httpclient.ErpBasicClient; import com.glxp.api.admin.req.basic.BasicUnitMaintainFilterRequest; import com.glxp.api.admin.req.basic.FilterErpGoodsRequest; +import com.glxp.api.admin.req.thrsys.FilterThrCorpRequest; +import com.glxp.api.admin.req.thrsys.ThrCorpExportRequest; import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.basic.ErpProductsResponse; import com.glxp.api.admin.res.basic.ErpUnitsResponse; import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; -import com.glxp.api.admin.service.thrsys.ThrCorpService; -import com.glxp.api.admin.service.thrsys.ThrProductsService; +import com.glxp.api.admin.service.thrsys.*; import com.glxp.api.admin.util.Constant; +import com.glxp.api.admin.util.CustomUtil; +import com.glxp.api.admin.util.ExcelUtil; import com.glxp.api.admin.util.RedisUtil; import com.glxp.api.common.res.BaseResponse; import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; +import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -33,29 +39,41 @@ public class ThrCorpsDlService { BasicThirdSysDetailService basicThirdSysDetailService; @Resource RedisUtil redisUtil; + @Resource + ThrCorpImportLogService thrCorpImportLogService; + @Resource + ThrCorpExportLogService thrCorpExportLogService; @Async - public void importCorps(String thirdSys) { + public void importCorps(String genKey, String thirdSys) { BasicThirdSysDetailEntity piDetailEntity = basicThirdSysDetailService.selectByKey("corpUrl", thirdSys); if (piDetailEntity == null || piDetailEntity.getValue() == null) { WebSocketServer.sendInfo("往来单位接口未设置！", "sid"); return; } + ThrCorpImportLogEntity thrProductsImportLogEntity = thrCorpImportLogService.selectByGenKey(genKey); + int page = 1; int limit = 100; while (page != -1) { - page = getCorps(page, limit, piDetailEntity.getValue()); + page = getCorps(page, limit, piDetailEntity.getValue(), thrProductsImportLogEntity,thirdSys); } redisUtil.set(Constant.dlThrProducts, "false"); WebSocketServer.sendInfo("往来单位信息下载已完成，请刷新查看！", "sid"); } - - public int getCorps(int page, int limit, String corpUrl) { + public int getCorps(int page, int limit, String corpUrl, ThrCorpImportLogEntity thrCorpImportLogEntity,String thirdSys) { BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest = new BasicUnitMaintainFilterRequest(); basicUnitMaintainFilterRequest.setPage(page); basicUnitMaintainFilterRequest.setLimit(limit); BaseResponse> erpCrops = new ErpBasicClient().getErpCrop(basicUnitMaintainFilterRequest, corpUrl); + if (erpCrops==null || erpCrops.getCode() != 20000) { + + thrCorpImportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_FAIL); + thrCorpImportLogEntity.setRemark(erpCrops.getMessage()); + thrCorpImportLogService.updateImportLog(thrCorpImportLogEntity); + return -1; + } List erpUnitsResponses = erpCrops.getData().getList(); if (erpUnitsResponses != null && erpUnitsResponses.size() > 0) { List thrCorpEntities = erpUnitsResponses.stream().map( @@ -63,6 +81,7 @@ public class ThrCorpsDlService { ThrCorpEntity thrProductsEntity = new ThrCorpEntity(); BeanUtils.copyProperties(item, thrProductsEntity); thrProductsEntity.setUnitId(item.getId()); + thrProductsEntity.setThirdSysFk(thirdSys); return thrProductsEntity; } ).collect(Collectors.toList()); @@ -71,11 +90,137 @@ public class ThrCorpsDlService { if (page * limit < erpCrops.getData().getTotal()) { return page; } - } else { - return -1; } + thrCorpImportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_SUCCESS); + thrCorpImportLogService.updateImportLog(thrCorpImportLogEntity); return -1; } + @Async + public void genExcel(String genKey, ThrCorpExportRequest thrCorpExportRequest) { + ThrCorpExportLogEntity thrCorpExportLogEntity = thrCorpExportLogService.selectByGenKey(genKey); + List> excelData = new ArrayList<>(); + List head = new ArrayList<>(); + head.add("往来单位ID"); + head.add("往来单位名称"); + head.add("拼音简写"); + head.add("地址"); + head.add("社会信用号"); + head.add("联系人"); + head.add("联系电话"); + excelData.add(head); + //选中导出 + if (thrCorpExportRequest.getThrCorpEntities() != null && thrCorpExportRequest.getThrCorpEntities().size()>0) { + List corpEntities = thrCorpExportRequest.getThrCorpEntities(); + for (ThrCorpEntity thrCorpEntity : corpEntities) { + List rows = new ArrayList<>(); + rows.add(thrCorpEntity.getUnitId()); + rows.add(thrCorpEntity.getName()); + rows.add(thrCorpEntity.getSpell()); + rows.add(thrCorpEntity.getAddr()); + rows.add(thrCorpEntity.getCreditNo()); + rows.add(thrCorpEntity.getContact()); + rows.add(thrCorpEntity.getMobile()); + excelData.add(rows); + } + } else {//一键导出 + + //判断是否启用实时获取 + BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("corpUrl", thrCorpExportRequest.getThirdSys()); + if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null) { + thrCorpExportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_FAIL); + thrCorpExportLogEntity.setRemark("往来单位接口地址未定义"); + thrCorpExportLogService.updateThrCorpExportLog(thrCorpExportLogEntity); + return; + } + if (basicThirdSysDetailEntity.getEnabled() && !basicThirdSysDetailEntity.getItrCache()) { + //根据查询条件一键导出第三方系统往来单位 + List thrCorpEntities = exportCorps(thrCorpExportRequest); + excelData.addAll(getRows(thrCorpEntities)); + } else { + //根据查询条件一键导出数据库往来单位 + FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest(); + BeanUtils.copyProperties(thrCorpExportRequest, filterThrCorpRequest); + List> genDatas = genExcelData(filterThrCorpRequest); + if (genDatas != null && genDatas.size() > 0) { + excelData.addAll(genDatas); + } + } + + } + String sheetName = "往来单位信息"; + new ExcelUtil().exportExcel(excelData, sheetName, thrCorpExportLogEntity.getFilePath(), 20); + thrCorpExportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_SUCCESS); + thrCorpExportLogService.updateThrCorpExportLog(thrCorpExportLogEntity); + + } + + public List exportCorps(ThrCorpExportRequest thrCorpExportRequest) { + BasicThirdSysDetailEntity corpEntity = basicThirdSysDetailService.selectByKey("corpUrl", thrCorpExportRequest.getThirdSys()); + int page = 1; + int limit = 100; + List thrCorpEntities = new ArrayList<>(); + while (true) { + List datas = getCorps(page, limit, corpEntity.getValue(), thrCorpExportRequest); + if (datas != null && datas.size() >= limit) { + thrCorpEntities.addAll(datas); + } else { + if (datas != null) { + thrCorpEntities.addAll(datas); + } + break; + } + } + return thrCorpEntities; + } + public List getCorps(int page, int limit, String corpUrl, ThrCorpExportRequest thrCorpExportRequest) { + BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest = new BasicUnitMaintainFilterRequest(); + basicUnitMaintainFilterRequest.setName(thrCorpExportRequest.getName()); + basicUnitMaintainFilterRequest.setUnitId(thrCorpExportRequest.getUnitId()); + basicUnitMaintainFilterRequest.setPage(page); + basicUnitMaintainFilterRequest.setLimit(limit); + BaseResponse> erpCrops = new ErpBasicClient().getErpCrop(basicUnitMaintainFilterRequest, corpUrl); + if (erpCrops.getCode() != 20000) { + return null; + } + List erpUnitsResponses = erpCrops.getData().getList(); + if (erpUnitsResponses != null && erpUnitsResponses.size() > 0) { + List thrCorpEntities = erpUnitsResponses.stream().map( + item -> { + ThrCorpEntity thrProductsEntity = new ThrCorpEntity(); + BeanUtils.copyProperties(item, thrProductsEntity); + thrProductsEntity.setUnitId(item.getId()); + return thrProductsEntity; + } + ).collect(Collectors.toList()); + return thrCorpEntities; + } + return null; + } + + public List> genExcelData(FilterThrCorpRequest filterThrOrderRequest) { + + List> excelData = new ArrayList<>(); + List thrCorpEntities = thrCorpService.filterThrCorps(filterThrOrderRequest); + excelData.addAll(getRows(thrCorpEntities)); + return excelData; + } + + public List> getRows(List thrCorpEntities) { + List> excelData = new ArrayList<>(); + for (ThrCorpEntity thrCorpEntity : thrCorpEntities) { + List rows = new ArrayList<>(); + rows.add(thrCorpEntity.getUnitId()); + rows.add(thrCorpEntity.getName()); + rows.add(thrCorpEntity.getSpell()); + rows.add(thrCorpEntity.getAddr()); + rows.add(thrCorpEntity.getCreditNo()); + rows.add(thrCorpEntity.getContact()); + rows.add(thrCorpEntity.getMobile()); + excelData.add(rows); + + } + return excelData; + } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/ThrInvProductsDlService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/ThrInvProductsDlService.java index 1ccec958..f8d1eab8 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/ThrInvProductsDlService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/ThrInvProductsDlService.java @@ -1,20 +1,27 @@ package com.glxp.api.admin.thread; import com.glxp.api.admin.config.WebSocketServer; +import com.glxp.api.admin.constant.UdiInfoImportStatus; import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; -import com.glxp.api.admin.entity.thrsys.ThrInvProductsEntity; -import com.glxp.api.admin.entity.thrsys.ThrProductsEntity; +import com.glxp.api.admin.entity.thrsys.*; import com.glxp.api.admin.httpclient.ErpBasicClient; import com.glxp.api.admin.httpclient.ErpInvClient; import com.glxp.api.admin.req.basic.FilterErpGoodsRequest; import com.glxp.api.admin.req.inventory.ErpOnhandRequest; +import com.glxp.api.admin.req.thrsys.FilterThrInvProductsRequest; +import com.glxp.api.admin.req.thrsys.ThrCorpExportRequest; +import com.glxp.api.admin.req.thrsys.ThrInvProductsExportRequest; import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.basic.ErpProductsResponse; import com.glxp.api.admin.res.inventory.ErpInvProductResponse; import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; +import com.glxp.api.admin.service.thrsys.ThrInvProductsExportLogService; +import com.glxp.api.admin.service.thrsys.ThrInvProductsImportLogService; import com.glxp.api.admin.service.thrsys.ThrInvProductsService; import com.glxp.api.admin.service.thrsys.ThrProductsService; import com.glxp.api.admin.util.Constant; +import com.glxp.api.admin.util.CustomUtil; +import com.glxp.api.admin.util.ExcelUtil; import com.glxp.api.admin.util.RedisUtil; import com.glxp.api.common.res.BaseResponse; import org.springframework.beans.BeanUtils; @@ -22,6 +29,8 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -34,6 +43,10 @@ public class ThrInvProductsDlService { BasicThirdSysDetailService basicThirdSysDetailService; @Resource RedisUtil redisUtil; + @Resource + ThrInvProductsImportLogService thrInvProductsImportLogService; + @Resource + ThrInvProductsExportLogService thrInvProductsExportLogService; @Async public void importProducrs(String thirdSys) { @@ -42,23 +55,87 @@ public class ThrInvProductsDlService { WebSocketServer.sendInfo("库存产品信息接口未设置！", "sid"); return; } + ThrInvProductsImportLogEntity thrInvProductsImportLogEntity = new ThrInvProductsImportLogEntity(); + String genKey = CustomUtil.getId(); + thrInvProductsImportLogEntity.setGenKey(genKey); + thrInvProductsImportLogEntity.setFromType("第三方系统获取"); + thrInvProductsImportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_PROCESS); + thrInvProductsImportLogEntity.setUpdateTime(new Date()); + thrInvProductsImportLogEntity.setThirdSysFk(thirdSys); + thrInvProductsImportLogService.insertImportLog(thrInvProductsImportLogEntity); int page = 1; int limit = 100; while (page != -1) { - page = getInvmandoc(page, limit, piDetailEntity.getValue()); + page = getInvmandoc(page, limit, piDetailEntity.getValue(), thrInvProductsImportLogEntity); } redisUtil.set(Constant.dlThrProducts, "false"); WebSocketServer.sendInfo("库存产品信息下载已完成，请刷新查看！", "sid"); } + @Async + public void genExcel(String genKey, ThrInvProductsExportRequest thrInvProductsExportRequest) { + + ThrInvProductsExportLogEntity thrInvProductsExportLogEntity = thrInvProductsExportLogService.selectByGenKey(genKey); + List> excelData = new ArrayList<>(); + List head = new ArrayList<>(); + head.add("往来单位ID"); + head.add("往来单位名称"); + head.add("拼音简写"); + head.add("地址"); + head.add("社会信用号"); + head.add("联系人"); + head.add("联系电话"); + excelData.add(head); + //选中导出 + if (thrInvProductsExportRequest.getThrInvProductsEntities() != null && thrInvProductsExportRequest.getThrInvProductsEntities().size()>0) { + List thrInvProductsEntities = thrInvProductsExportRequest.getThrInvProductsEntities(); + excelData.addAll(getRows(thrInvProductsEntities)); + } else {//一键导出 + //判断是否启用实时获取 + BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("invPiUrl", thrInvProductsExportRequest.getThirdSysFk()); + if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null) { + thrInvProductsExportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_FAIL); + thrInvProductsExportLogEntity.setRemark("库存产品信息接口地址未定义"); + thrInvProductsExportLogService.updateThrInvProductsExportLog(thrInvProductsExportLogEntity); + return; + } + if (basicThirdSysDetailEntity.getEnabled() && !basicThirdSysDetailEntity.getItrCache()) { + //从第三方服务实时一键导出 + FilterThrInvProductsRequest filterThrInvProductsRequest = new FilterThrInvProductsRequest(); + BeanUtils.copyProperties(thrInvProductsExportRequest, filterThrInvProductsRequest); + List thrInvProductsEntities = exportInvProducts(filterThrInvProductsRequest); + excelData.addAll(getRows(thrInvProductsEntities)); + } else { + //从本地导出 + FilterThrInvProductsRequest filterThrInvProductsRequest = new FilterThrInvProductsRequest(); + BeanUtils.copyProperties(thrInvProductsExportRequest, filterThrInvProductsRequest); + List> genDatas = genExcelData(null, filterThrInvProductsRequest); + if (genDatas != null && genDatas.size() > 0) { + excelData.addAll(genDatas); + } + } + } + String sheetName = "库存产品信息"; + new ExcelUtil().exportExcel(excelData, sheetName, thrInvProductsExportLogEntity.getFilePath(), 20); + thrInvProductsExportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_SUCCESS); + thrInvProductsExportLogService.updateThrInvProductsExportLog(thrInvProductsExportLogEntity); + } - public int getInvmandoc(int page, int limit, String productUrl) { + public int getInvmandoc(int page, int limit, String productUrl, ThrInvProductsImportLogEntity thrInvProductsImportLogEntity) { ErpOnhandRequest erpOnhandRequest = new ErpOnhandRequest(); erpOnhandRequest.setPage(page); erpOnhandRequest.setLimit(limit); BaseResponse> responseBaseResponse = new ErpInvClient().getInvPrdoductResponse(erpOnhandRequest, productUrl); + + if (responseBaseResponse.getCode() != 20000) { + thrInvProductsImportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_FAIL); + thrInvProductsImportLogEntity.setRemark(responseBaseResponse.getMessage()); + thrInvProductsImportLogService.updateImportLog(thrInvProductsImportLogEntity); + return -1; + } + List erpInvProductResponses = responseBaseResponse.getData().getList(); if (erpInvProductResponses != null && erpInvProductResponses.size() > 0) { List thrProductsEntities = erpInvProductResponses.stream().map( @@ -73,10 +150,90 @@ public class ThrInvProductsDlService { if (page * limit < responseBaseResponse.getData().getTotal()) { return page; } + } + thrInvProductsImportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_SUCCESS); + thrInvProductsImportLogService.updateImportLog(thrInvProductsImportLogEntity); + return -1; + } + + public List exportInvProducts(FilterThrInvProductsRequest filterThrInvProductsRequest) { + BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("invPiUrl", filterThrInvProductsRequest.getThirdSysFk()); + int page = 1; + int limit = 100; + List thrInvProductsEntities = new ArrayList<>(); + while (true) { + List datas = getInvProducts(page, limit, basicThirdSysDetailEntity.getValue(), filterThrInvProductsRequest); + if (datas != null && datas.size() >= limit) { + thrInvProductsEntities.addAll(datas); + page++; + + } else { + if (datas != null) { + thrInvProductsEntities.addAll(datas); + } + break; + } + } + return thrInvProductsEntities; + } + + public List getInvProducts(int page, int limit, String invPiUrl, FilterThrInvProductsRequest filterThrInvProductsRequest) { + ErpOnhandRequest erpOnhandRequest = new ErpOnhandRequest(); + BeanUtils.copyProperties(filterThrInvProductsRequest, erpOnhandRequest); + erpOnhandRequest.setPage(page); + erpOnhandRequest.setLimit(limit); + + BaseResponse> responseBaseResponse = new ErpInvClient().getInvPrdoductResponse(erpOnhandRequest, invPiUrl); + if (responseBaseResponse != null && responseBaseResponse.getCode() == 20000) { + List erpInvProductResponses = responseBaseResponse.getData().getList(); + if (erpInvProductResponses != null && erpInvProductResponses.size() > 0) { + List thrProductsEntities = erpInvProductResponses.stream().map( + item -> { + ThrInvProductsEntity thrProductsEntity = new ThrInvProductsEntity(); + BeanUtils.copyProperties(item, thrProductsEntity); + return thrProductsEntity; + } + ).collect(Collectors.toList()); + return thrProductsEntities; + } + } + + + return null; + } + + public List> genExcelData(String id, FilterThrInvProductsRequest filterThrInvProductsRequest) { + + List> excelData = new ArrayList<>(); + List thrInvProductsEntities = new ArrayList<>(); + if (id != null) { + ThrInvProductsEntity thrInvProductsEntity = thrInvProductsService.selectById(id); + thrInvProductsEntities.add(thrInvProductsEntity); } else { - return -1; + thrInvProductsEntities = thrInvProductsService.filterThrInvProductss(filterThrInvProductsRequest); } + excelData.addAll(getRows(thrInvProductsEntities)); + return excelData; + } - return -1; + + public List> getRows(List thrInvProductsEntities) { + List> excelData = new ArrayList<>(); + for (ThrInvProductsEntity thrInvProductsEntity : thrInvProductsEntities) { + List rows = new ArrayList<>(); + rows.add(thrInvProductsEntity.getInventoryCode()); + rows.add(thrInvProductsEntity.getInventoryName()); + rows.add(thrInvProductsEntity.getSpec()); + rows.add(thrInvProductsEntity.getCount() + ""); + rows.add(thrInvProductsEntity.getBatchNo()); + rows.add(thrInvProductsEntity.getManufacturingDate()); + rows.add(thrInvProductsEntity.getExpirationDate()); + rows.add(thrInvProductsEntity.getWarehouseCode()); + rows.add(thrInvProductsEntity.getWarehouseName()); + rows.add(thrInvProductsEntity.getSpaceCode()); + rows.add(thrInvProductsEntity.getSpaceName()); + excelData.add(rows); + } + return excelData; } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/ThrOrderImportService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/ThrOrderImportService.java new file mode 100644 index 00000000..2f71a6e3 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/ThrOrderImportService.java @@ -0,0 +1,67 @@ +package com.glxp.api.admin.thread; + +import com.glxp.api.admin.constant.UdiInfoImportStatus; +import com.glxp.api.admin.entity.basic.UdiInfoImportLogEntity; +import com.glxp.api.admin.entity.thrsys.ThrOrderDetailEntity; +import com.glxp.api.admin.entity.thrsys.ThrOrderEntity; +import com.glxp.api.admin.entity.thrsys.ThrOrderImportDetailEntity; +import com.glxp.api.admin.entity.thrsys.ThrOrderImportLogEntity; +import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; +import com.glxp.api.admin.req.basic.PostSmpUdiInfoRequest; +import com.glxp.api.admin.service.thrsys.ThrOrderDetailService; +import com.glxp.api.admin.service.thrsys.ThrOrderImportDetailService; +import com.glxp.api.admin.service.thrsys.ThrOrderImportLogService; +import com.glxp.api.admin.service.thrsys.ThrOrderService; +import org.springframework.beans.BeanUtils; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +@Service +public class ThrOrderImportService { + + @Resource + ThrOrderImportLogService thrOrderImportLogService; + @Resource + ThrOrderImportDetailService thrOrderImportDetailService; + @Resource + ThrOrderService thrOrderService; + @Resource + ThrOrderDetailService thrOrderDetailService; + + @Async + public void importThrOrder(String genKey) { + ThrOrderImportLogEntity thrOrderImportLogEntity = thrOrderImportLogService.selectByGenKey(genKey); + if (thrOrderImportLogEntity.getStatus() == UdiInfoImportStatus.UDIINFO_IMPORT_CODE_UNPROCESS) { + FilterUdiIpLogRequest filterUdiIpLogRequest = new FilterUdiIpLogRequest(); + filterUdiIpLogRequest.setGenKey(genKey); + List thrOrderImportDetailEntities = thrOrderImportDetailService.filterOrderImportDetail(filterUdiIpLogRequest); + if (thrOrderImportDetailEntities != null && thrOrderImportDetailEntities.size() > 0) { + Map> map = thrOrderImportDetailEntities.stream().collect(Collectors.groupingBy(ThrOrderImportDetailEntity::getBillNo)); + for (List datas : map.values()) { + ThrOrderImportDetailEntity thrOrderImportDetailEntity = datas.get(0); + ThrOrderEntity thrOrderEntity = new ThrOrderEntity(); + BeanUtils.copyProperties(thrOrderImportDetailEntity, thrOrderEntity); + thrOrderService.insertThrOrder(thrOrderEntity); + thrOrderEntity = thrOrderService.findByUnique(thrOrderEntity.getBillNo(), thrOrderEntity.getThirdSysFk()); + ThrOrderEntity finalThrOrderEntity = thrOrderEntity; + List postDatas = datas.stream().map(item -> + { + ThrOrderDetailEntity thrOrderDetailEntity = new ThrOrderDetailEntity(); + BeanUtils.copyProperties(item, thrOrderDetailEntity); + thrOrderDetailEntity.setOrderIdFk(finalThrOrderEntity.getId()+""); + return thrOrderDetailEntity; + }).collect(Collectors.toList()); + thrOrderDetailService.insertThrOrderDetails(postDatas); + + } + + } + } + + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/ThrOrdersDlService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/ThrOrdersDlService.java index f320bf17..84ecb7be 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/ThrOrdersDlService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/ThrOrdersDlService.java @@ -1,24 +1,30 @@ package com.glxp.api.admin.thread; import com.glxp.api.admin.config.WebSocketServer; +import com.glxp.api.admin.constant.UdiInfoImportStatus; import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; import com.glxp.api.admin.entity.inout.ErpOrderEntity; -import com.glxp.api.admin.entity.thrsys.ThrCorpEntity; -import com.glxp.api.admin.entity.thrsys.ThrOrderDetailEntity; -import com.glxp.api.admin.entity.thrsys.ThrOrderEntity; +import com.glxp.api.admin.entity.thrsys.*; import com.glxp.api.admin.httpclient.ErpBasicClient; +import com.glxp.api.admin.httpclient.ErpInvClient; import com.glxp.api.admin.httpclient.ErpOrderClient; import com.glxp.api.admin.req.basic.BasicUnitMaintainFilterRequest; import com.glxp.api.admin.req.inout.FilterOrderRequest; +import com.glxp.api.admin.req.inventory.ErpOnhandRequest; +import com.glxp.api.admin.req.thrsys.FilterThrInvProductsRequest; +import com.glxp.api.admin.req.thrsys.FilterThrOrderDetailRequest; +import com.glxp.api.admin.req.thrsys.FilterThrOrderRequest; +import com.glxp.api.admin.req.thrsys.ThrOrderExportRequest; import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.basic.ErpUnitsResponse; import com.glxp.api.admin.res.inout.ErpOrderResponse; +import com.glxp.api.admin.res.inventory.ErpInvProductResponse; import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; import com.glxp.api.admin.service.basic.BussinessTypeService; -import com.glxp.api.admin.service.thrsys.ThrOrderDetailService; -import com.glxp.api.admin.service.thrsys.ThrOrderService; -import com.glxp.api.admin.service.thrsys.ThrProductsService; +import com.glxp.api.admin.service.thrsys.*; import com.glxp.api.admin.util.Constant; +import com.glxp.api.admin.util.CustomUtil; +import com.glxp.api.admin.util.ExcelUtil; import com.glxp.api.admin.util.RedisUtil; import com.glxp.api.common.res.BaseResponse; import org.springframework.beans.BeanUtils; @@ -27,6 +33,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -42,54 +49,238 @@ public class ThrOrdersDlService { RedisUtil redisUtil; @Resource BussinessTypeService bussinessTypeService; + @Resource + private ThrOrderImportLogService thrOrderImportLogService; + @Resource + ThrOrderExportLogService thrOrderExportLogService; @Async - public void importOrders(String action) { - BasicThirdSysDetailEntity basicThirdSysDetailEntity = bussinessTypeService.findByActionKey(action, "orderQueryUrl"); + public void importOrders(String genKey, String action) { + + ThrOrderImportLogEntity thrOrderImportLogEntity = thrOrderImportLogService.selectByGenKey(genKey); + BasicThirdSysDetailEntity basicThirdSysDetailEntity = bussinessTypeService.findByActionKey(action, "orderQueryUrl"); if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null) { WebSocketServer.sendInfo("业务单据查询接口未设置！", "sid"); return; } + + int page = 1; int limit = 100; while (page != -1) { - page = getOrders(page, limit, basicThirdSysDetailEntity.getValue(), basicThirdSysDetailEntity.getThirdSysFk()); + page = getOrders(page, limit, basicThirdSysDetailEntity.getValue(), basicThirdSysDetailEntity.getThirdSysFk(), thrOrderImportLogEntity,action); } redisUtil.set(Constant.dlThrProducts, "false"); WebSocketServer.sendInfo("业务单据信息下载已完成，请刷新查看！", "sid"); +// thrOrderImportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_SUCCESS); +// thrOrderImportLogService.updateImportLog(thrOrderImportLogEntity); } + @Async + public void genExcel(String genKey, ThrOrderExportRequest thrOrderExportRequest) { + + ThrOrderExportLogEntity thrOrderExportLogEntity = thrOrderExportLogService.selectByGenKey(genKey); + List> excelData = new ArrayList<>(); + List head = new ArrayList<>(); + head.add("单据号"); + head.add("单据日期"); + head.add("往来单位ID"); + head.add("往来单位名称"); + head.add("单据类型"); + head.add("单据状态"); + head.add("产品ID"); + head.add("产品名称"); + head.add("规格型号"); + head.add("批次号"); + head.add("生产日期"); + head.add("失效日期"); + head.add("订单数量"); + head.add("实际数量"); + excelData.add(head); + //选中导出 + if (thrOrderExportRequest.getErpOrderResponses() != null && thrOrderExportRequest.getErpOrderResponses().size() > 0) { + List erpOrderResponses = thrOrderExportRequest.getErpOrderResponses(); + for (ErpOrderResponse erpOrderResponse : erpOrderResponses) { + List subErpOrders = erpOrderResponse.getSubErpOrders(); + for (ErpOrderResponse.SubErpOrder subErpOrder : subErpOrders) { + List rows = new ArrayList<>(); + rows.add(erpOrderResponse.getBillNo()); + rows.add(erpOrderResponse.getBilldate()); + rows.add(erpOrderResponse.getCorpId()); + rows.add(erpOrderResponse.getCorpName()); + rows.add(erpOrderResponse.getBillType()); + rows.add(erpOrderResponse.getBillFlag()); + rows.add(subErpOrder.getProductId()); + rows.add(subErpOrder.getProductName()); + rows.add(subErpOrder.getProductDate()); + rows.add(subErpOrder.getExpireDate()); + rows.add(subErpOrder.getCount() + ""); + rows.add(subErpOrder.getReCount() + ""); + excelData.add(rows); + } + + } + + } else {//一键导出 - public int getOrders(int page, int limit, String orderUrl, String thirdSys) { + BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("orderQueryUrl", thrOrderExportRequest.getThirdSysFk()); + if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null) { + thrOrderExportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_FAIL); + thrOrderExportLogEntity.setRemark("往来单位接口地址未定义"); + thrOrderExportLogService.updateThrOrderExportLog(thrOrderExportLogEntity); + return; + } + if (basicThirdSysDetailEntity.getEnabled() && !basicThirdSysDetailEntity.getItrCache()) { + FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest(); + BeanUtils.copyProperties(thrOrderExportRequest, filterThrOrderRequest); + List> datas = exportThrOrders(filterThrOrderRequest); + excelData.addAll(datas); + } else { + FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest(); + BeanUtils.copyProperties(thrOrderExportRequest, filterThrOrderRequest); + List> genDatas = genExcelData(filterThrOrderRequest); + if (genDatas != null && genDatas.size() > 0) { + excelData.addAll(genDatas); + } + } + + } + String sheetName = "业务单据"; + new ExcelUtil().exportExcel(excelData, sheetName, thrOrderExportLogEntity.getFilePath(), 20); + thrOrderExportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_SUCCESS); + thrOrderExportLogService.updateThrOrderExportLog(thrOrderExportLogEntity); + } + + public int getOrders(int page, int limit, String orderUrl, String thirdSys, ThrOrderImportLogEntity thrOrderImportLogEntity,String action) { FilterOrderRequest filterOrderRequest = new FilterOrderRequest(); filterOrderRequest.setPage(page); filterOrderRequest.setLimit(limit); + filterOrderRequest.setBillAction(action); BaseResponse> responseBaseResponse = new ErpOrderClient(orderUrl).getErpOrderResponse(filterOrderRequest); - List erpOrderResponses = responseBaseResponse.getData().getList(); - if (erpOrderResponses != null && erpOrderResponses.size() > 0) { - for (ErpOrderResponse erpOrderResponse : erpOrderResponses) { - ThrOrderEntity thrOrderEntity = new ThrOrderEntity(); - BeanUtils.copyProperties(erpOrderResponse, thrOrderEntity); - thrOrderEntity.setThirdSysFk(thirdSys); - thrOrderService.insertThrOrder(thrOrderEntity); - List thrOrderDetailEntities = new ArrayList<>(); - for (ErpOrderResponse.SubErpOrder subPurchase : erpOrderResponse.getSubErpOrders()) { - ThrOrderDetailEntity thrOrderDetailEntity = new ThrOrderDetailEntity(); - BeanUtils.copyProperties(subPurchase, thrOrderEntity); - thrOrderDetailEntities.add(thrOrderDetailEntity); + if (responseBaseResponse != null && responseBaseResponse.getCode() == 20000) { + List erpOrderResponses = responseBaseResponse.getData().getList(); + if (erpOrderResponses != null && erpOrderResponses.size() > 0) { + for (ErpOrderResponse erpOrderResponse : erpOrderResponses) { + ThrOrderEntity thrOrderEntity = new ThrOrderEntity(); + BeanUtils.copyProperties(erpOrderResponse, thrOrderEntity); + thrOrderEntity.setThirdSysFk(thirdSys); + thrOrderService.insertThrOrder(thrOrderEntity); + thrOrderEntity = thrOrderService.findByUnique(thrOrderEntity.getBillNo(), thrOrderEntity.getThirdSysFk()); + List thrOrderDetailEntities = new ArrayList<>(); + for (ErpOrderResponse.SubErpOrder subPurchase : erpOrderResponse.getSubErpOrders()) { + ThrOrderDetailEntity thrOrderDetailEntity = new ThrOrderDetailEntity(); + BeanUtils.copyProperties(subPurchase, thrOrderDetailEntity); + thrOrderDetailEntity.setOrderIdFk(thrOrderEntity.getId()+""); + thrOrderDetailEntities.add(thrOrderDetailEntity); + } + thrOrderDetailService.insertThrOrderDetails(thrOrderDetailEntities); + } + page++; + if (page * limit < responseBaseResponse.getData().getTotal()) { + return page; } - thrOrderDetailService.insertThrOrderDetails(thrOrderDetailEntities); - } - page++; - if (page * limit < responseBaseResponse.getData().getTotal()) { - return page; } } else { + thrOrderImportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_FAIL); + if (responseBaseResponse != null) { + thrOrderImportLogEntity.setRemark(responseBaseResponse.getMessage()); + } else { + thrOrderImportLogEntity.setRemark("第三方服务出错！"); + } + thrOrderImportLogService.updateImportLog(thrOrderImportLogEntity); return -1; } + thrOrderImportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_SUCCESS); + thrOrderImportLogService.updateImportLog(thrOrderImportLogEntity); return -1; } + public List> exportThrOrders(FilterThrOrderRequest filterThrOrderRequest) { + BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("orderQueryUrl", filterThrOrderRequest.getThirdSysFk()); + int page = 1; + int limit = 100; + List erpOrderResponseList = new ArrayList<>(); + while (true) { + List datas = getThrOrders(page, limit, basicThirdSysDetailEntity.getValue(), filterThrOrderRequest); + if (datas != null && datas.size() >= limit) { + erpOrderResponseList.addAll(datas); + page++; + + } else { + if (datas != null) { + erpOrderResponseList.addAll(datas); + } + break; + } + } + List> excelData = new ArrayList<>(); + for (ErpOrderResponse erpOrderResponse : erpOrderResponseList) { + for (ErpOrderResponse.SubErpOrder subPurchase : erpOrderResponse.getSubErpOrders()) { + List rows = new ArrayList<>(); + rows.add(erpOrderResponse.getBillNo()); + rows.add(erpOrderResponse.getBilldate()); + rows.add(erpOrderResponse.getCorpId()); + rows.add(erpOrderResponse.getCorpName()); + rows.add(erpOrderResponse.getBillType()); + rows.add(erpOrderResponse.getBillFlag()); + rows.add(subPurchase.getProductId()); + rows.add(subPurchase.getProductName()); + rows.add(subPurchase.getProductDate()); + rows.add(subPurchase.getExpireDate()); + rows.add(subPurchase.getCount() + ""); + rows.add(subPurchase.getReCount() + ""); + excelData.add(rows); + } + } + return excelData; + } + + public List getThrOrders(int page, int limit, String orderQueryUrl, FilterThrOrderRequest filterThrOrderRequest) { + FilterOrderRequest filterOrderRequest = new FilterOrderRequest(); + BeanUtils.copyProperties(filterThrOrderRequest, filterOrderRequest); + filterOrderRequest.setPage(page); + filterOrderRequest.setLimit(limit); + BaseResponse> responseBaseResponse = new ErpOrderClient(orderQueryUrl).getErpOrderResponse(filterOrderRequest); + if (responseBaseResponse != null && responseBaseResponse.getCode() == 20000) { + } + List erpOrderResponses = responseBaseResponse.getData().getList(); + if (erpOrderResponses != null && erpOrderResponses.size() > 0) { + return erpOrderResponses; + } + return null; + } + + public List> genExcelData(FilterThrOrderRequest filterThrOrderRequest) { + + List> excelData = new ArrayList<>(); + List thrOrderEntities = thrOrderService.filterThrOrder(filterThrOrderRequest); + for (ThrOrderEntity thrOrderEntity : thrOrderEntities) { + FilterThrOrderDetailRequest filterThrOrderDetailRequest = new FilterThrOrderDetailRequest(); + filterThrOrderDetailRequest.setOrderIdFk(thrOrderEntity.getId() + ""); + List thrOrderDetailEntities = thrOrderDetailService.filterThrOrderDetailDetail(filterThrOrderDetailRequest); + if (thrOrderDetailEntities != null) { + for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) { + List rows = new ArrayList<>(); + + rows.add(thrOrderEntity.getBillNo()); + rows.add(thrOrderEntity.getBilldate()); + rows.add(thrOrderEntity.getCorpId()); + rows.add(thrOrderEntity.getCorpName()); + rows.add(thrOrderEntity.getBillType()); + rows.add(thrOrderEntity.getBillFlag()); + rows.add(thrOrderDetailEntity.getProductId()); + rows.add(thrOrderDetailEntity.getProductName()); + rows.add(thrOrderDetailEntity.getProductDate()); + rows.add(thrOrderDetailEntity.getExpireDate()); + rows.add(thrOrderDetailEntity.getCount() + ""); + rows.add(thrOrderDetailEntity.getReCount() + ""); + excelData.add(rows); + } + } + + } + return excelData; + } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/ThrProductsDlService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/ThrProductsDlService.java index 2b42ce70..8d024c3b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/ThrProductsDlService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/ThrProductsDlService.java @@ -1,15 +1,22 @@ package com.glxp.api.admin.thread; import com.glxp.api.admin.config.WebSocketServer; +import com.glxp.api.admin.constant.UdiInfoImportStatus; import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; -import com.glxp.api.admin.entity.thrsys.ThrProductsEntity; +import com.glxp.api.admin.entity.thrsys.*; import com.glxp.api.admin.httpclient.ErpBasicClient; import com.glxp.api.admin.req.basic.FilterErpGoodsRequest; +import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest; +import com.glxp.api.admin.req.thrsys.ThrProductsExportRequest; import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.basic.ErpProductsResponse; import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; +import com.glxp.api.admin.service.thrsys.ThrProductsExportLogService; +import com.glxp.api.admin.service.thrsys.ThrProductsImportLogService; import com.glxp.api.admin.service.thrsys.ThrProductsService; import com.glxp.api.admin.util.Constant; +import com.glxp.api.admin.util.CustomUtil; +import com.glxp.api.admin.util.ExcelUtil; import com.glxp.api.admin.util.RedisUtil; import com.glxp.api.common.res.BaseResponse; import org.springframework.beans.BeanUtils; @@ -17,6 +24,8 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -28,49 +37,190 @@ public class ThrProductsDlService { BasicThirdSysDetailService basicThirdSysDetailService; @Resource RedisUtil redisUtil; + @Resource + ThrProductsImportLogService thrProductsImportLogService; + @Resource + ThrProductsExportLogService thrProductsExportLogService; @Async - public void importProducrs(String thirdSys) { + public void importProducrs(String genKey, String thirdSys) { + ThrProductsImportLogEntity thrProductsImportLogEntity = thrProductsImportLogService.selectByGenKey(genKey); BasicThirdSysDetailEntity piDetailEntity = basicThirdSysDetailService.selectByKey("piQueryUrl", thirdSys); if (piDetailEntity == null || piDetailEntity.getValue() == null) { + thrProductsImportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_FAIL); + thrProductsImportLogEntity.setRemark("产品信息接口未设置"); + thrProductsImportLogService.updateImportLog(thrProductsImportLogEntity); WebSocketServer.sendInfo("产品信息接口未设置！", "sid"); return; } + int page = 1; int limit = 100; while (page != -1) { - page = getInvmandoc(page, limit, piDetailEntity.getValue()); + page = getInvmandoc(thrProductsImportLogEntity,page, limit, piDetailEntity.getValue()); } redisUtil.set(Constant.dlThrProducts, "false"); + thrProductsImportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_SUCCESS); + thrProductsImportLogService.updateImportLog(thrProductsImportLogEntity); WebSocketServer.sendInfo("产品信息下载已完成，请刷新查看！", "sid"); } + @Async + public void genExcel(String genKey, ThrProductsExportRequest thrProductsExportRequest) { + + ThrProductsExportLogEntity thrProductsExportLogEntity = thrProductsExportLogService.selectByGenKey(genKey); + + List> excelData = new ArrayList<>(); + List head = new ArrayList<>(); + head.add("产品ID"); + head.add("产品名称"); + head.add("计量单位"); + head.add("规格型号"); + head.add("注册证号"); + head.add("生产厂家"); + excelData.add(head); + //选中导出 + if (thrProductsExportRequest.getThrProductsEntities() != null && thrProductsExportRequest.getThrProductsEntities().size()>0) { + List thrProductsEntities = thrProductsExportRequest.getThrProductsEntities(); + excelData.addAll(getRows(thrProductsEntities)); - public int getInvmandoc(int page, int limit, String productUrl) { + } else {//一键导出 + + BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("piQueryUrl", thrProductsExportRequest.getThirdSys()); + if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null) { + thrProductsExportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_FAIL); + thrProductsExportLogEntity.setRemark("产品信息接口未定义！"); + thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity); + return; + } + if (basicThirdSysDetailEntity.getEnabled() && !basicThirdSysDetailEntity.getItrCache()) { + FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest(); + BeanUtils.copyProperties(thrProductsExportRequest, filterThrProductsRequest); + List thrProductsEntities = exportThrProducts(filterThrProductsRequest); + excelData.addAll(getRows(thrProductsEntities)); + + } else { + FilterThrProductsRequest filterThrInvProductsRequest = new FilterThrProductsRequest(); + BeanUtils.copyProperties(thrProductsExportRequest, filterThrInvProductsRequest); + List> genDatas = genExcelData(null, filterThrInvProductsRequest); + if (genDatas != null && genDatas.size() > 0) { + excelData.addAll(genDatas); + } + } + } + String sheetName = "产品信息"; + new ExcelUtil().exportExcel(excelData, sheetName, thrProductsExportLogEntity.getFilePath(), 20); + thrProductsExportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_SUCCESS); + thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity); + + } + + + public int getInvmandoc(ThrProductsImportLogEntity thrProductsImportLogEntity,int page, int limit, String productUrl) { FilterErpGoodsRequest filterErpGoodsRequest = new FilterErpGoodsRequest(); filterErpGoodsRequest.setPage(page); filterErpGoodsRequest.setLimit(limit); BaseResponse> erpProducts = new ErpBasicClient().getErpProducts(filterErpGoodsRequest, productUrl); - List erpProductsResponses = erpProducts.getData().getList(); - if (erpProductsResponses != null && erpProductsResponses.size() > 0) { - List thrProductsEntities = erpProductsResponses.stream().map( - item -> { - ThrProductsEntity thrProductsEntity = new ThrProductsEntity(); - BeanUtils.copyProperties(item, thrProductsEntity); - return thrProductsEntity; - } - ).collect(Collectors.toList()); - thrProductsService.insertThrProductss(thrProductsEntities); - page++; - if (page * limit < erpProducts.getData().getTotal()) { - return page; + if (erpProducts != null && erpProducts.getCode() == 20000) { + List erpProductsResponses = erpProducts.getData().getList(); + if (erpProductsResponses != null && erpProductsResponses.size() > 0) { + List thrProductsEntities = erpProductsResponses.stream().map( + item -> { + ThrProductsEntity thrProductsEntity = new ThrProductsEntity(); + BeanUtils.copyProperties(item, thrProductsEntity); + return thrProductsEntity; + } + ).collect(Collectors.toList()); + thrProductsService.insertThrProductss(thrProductsEntities); + page++; + if (page * limit < erpProducts.getData().getTotal()) { + return page; + } + } else { + return -1; } - } else { + }else { + thrProductsImportLogEntity.setRemark(erpProducts.getMessage()); + thrProductsImportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_FAIL); + thrProductsImportLogService.updateImportLog(thrProductsImportLogEntity); return -1; } - return -1; } + public List exportThrProducts(FilterThrProductsRequest filterThrProductsRequest) { + BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("piQueryUrl", filterThrProductsRequest.getThirdSys()); + int page = 1; + int limit = 100; + List thrProductsEntities = new ArrayList<>(); + while (true) { + List datas = getThrProducrts(page, limit, basicThirdSysDetailEntity.getValue(), filterThrProductsRequest); + if (datas != null && datas.size() >= limit) { + thrProductsEntities.addAll(datas); + page++; + + } else{ + if(datas!=null){ + thrProductsEntities.addAll(datas); + } + break; + } + + } + return thrProductsEntities; + } + + public List getThrProducrts(int page, int limit, String productUrl, FilterThrProductsRequest filterThrProductsRequest) { + + FilterErpGoodsRequest filterErpGoodsRequest = new FilterErpGoodsRequest(); + BeanUtils.copyProperties(filterThrProductsRequest, filterErpGoodsRequest); + filterErpGoodsRequest.setPage(page); + filterErpGoodsRequest.setLimit(limit); + BaseResponse> erpProducts = new ErpBasicClient().getErpProducts(filterErpGoodsRequest, productUrl); + if (erpProducts != null && erpProducts.getCode() == 20000) { + List erpProductsResponses = erpProducts.getData().getList(); + if (erpProductsResponses != null && erpProductsResponses.size() > 0) { + List thrProductsEntities = erpProductsResponses.stream().map( + item -> { + ThrProductsEntity thrProductsEntity = new ThrProductsEntity(); + BeanUtils.copyProperties(item, thrProductsEntity); + return thrProductsEntity; + } + ).collect(Collectors.toList()); + return thrProductsEntities; + } + } + + return null; + } + + public List> genExcelData(String id, FilterThrProductsRequest filterThrProductsRequest) { + + List> excelData = new ArrayList<>(); + List thrProductsEntities = new ArrayList<>(); + if (id != null) { + ThrProductsEntity thrProductsEntity = thrProductsService.selectById(id); + thrProductsEntities.add(thrProductsEntity); + } else { + thrProductsEntities = thrProductsService.filterThrProductsRequest(filterThrProductsRequest); + } + excelData.addAll(getRows(thrProductsEntities)); + return excelData; + } + + public List> getRows(List thrProductsEntities) { + List> excelData = new ArrayList<>(); + for (ThrProductsEntity thrProductsEntity : thrProductsEntities) { + List rows = new ArrayList<>(); + rows.add(thrProductsEntity.getCode()); + rows.add(thrProductsEntity.getName()); + rows.add(thrProductsEntity.getMeasname() + ""); + rows.add(thrProductsEntity.getSpec()); + rows.add(thrProductsEntity.getRegisterNo()); + rows.add(thrProductsEntity.getManufactory()); + excelData.add(rows); + } + return excelData; + } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/CustomUtil.java b/api-admin/src/main/java/com/glxp/api/admin/util/CustomUtil.java index b93dfe6f..ed9ff740 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/CustomUtil.java +++ b/api-admin/src/main/java/com/glxp/api/admin/util/CustomUtil.java @@ -1,5 +1,6 @@ package com.glxp.api.admin.util; +import java.util.Random; import java.util.UUID; public class CustomUtil { @@ -8,4 +9,12 @@ public class CustomUtil { UUID uuid = UUID.randomUUID(); return uuid.toString().replace("-", ""); } + + //随机生成ID + public static String getId(){ + String id = System.currentTimeMillis()+""; + int number=new Random().nextInt(90)+10; + id = id+number; + return id.substring(4); + } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/ExcelUtil.java b/api-admin/src/main/java/com/glxp/api/admin/util/ExcelUtil.java new file mode 100644 index 00000000..b3513dee --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/util/ExcelUtil.java @@ -0,0 +1,64 @@ +package com.glxp.api.admin.util; + +import org.apache.poi.hssf.usermodel.*; + +import java.io.File; +import java.io.FileOutputStream; +import java.util.List; + +public class ExcelUtil { + + + public void exportExcel( + List> excelData, + String sheetName, + String fileName, + int columnWidth) { + + HSSFWorkbook workbook = new HSSFWorkbook(); + HSSFSheet sheet = workbook.createSheet(sheetName); + sheet.setDefaultColumnWidth(columnWidth); + int rowIndex = 0; + for (List data : excelData) { + HSSFRow row = sheet.createRow(rowIndex++); + for (int i = 0; i < data.size(); i++) { + HSSFCell cell = row.createCell(i); + String content = data.get(i); + if (content != null) { + HSSFRichTextString text = new HSSFRichTextString(content); + cell.setCellValue(text); + }else { + + } + } + } + FileOutputStream outputStream = null; + try { + + File createFile = new File(fileName); + if (!createFile.exists()) { + createFile.mkdirs(); + } + outputStream = new FileOutputStream(fileName); + workbook.write(outputStream); + } catch (Exception e) { + e.printStackTrace(); + } finally { + try { + if (outputStream != null) { + outputStream.flush(); + outputStream.close(); + } + } catch (Exception e) { + e.printStackTrace(); + } + try { + if (workbook != null) { + workbook.close(); + } + } catch (Exception e) { + e.printStackTrace(); + } + } + } +} diff --git a/api-admin/src/main/resources/application-dev.properties b/api-admin/src/main/resources/application-dev.properties index 3a124e7b..4b65d26a 100644 --- a/api-admin/src/main/resources/application-dev.properties +++ b/api-admin/src/main/resources/application-dev.properties @@ -40,6 +40,9 @@ spring.redis.jedis.pool.min-idle=0 # 连接超时时间（毫秒） spring.redis.jedis.timeout=300 +spring.jackson.date-format=yyyy-MM-dd HH:mm:ss +spring.jackson.time-zone=GMT+8 + diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml index befdd711..2bee9506 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml @@ -25,7 +25,7 @@ - INSERT INTO basic_corp + REPLACE INTO basic_corp (thirdId,erpId,name,spell, addr,status,type,creditNo,contact,mobile,thirdId1,thirdId2,thirdId3,thirdId4, thirdName,thirdName1,thirdName2,thirdName3,thirdName4) diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/CorpExportLogDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/CorpExportLogDao.xml new file mode 100644 index 00000000..4848d1dd --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/basic/CorpExportLogDao.xml @@ -0,0 +1,50 @@ + + + + + + + + + + insert INTO basic_corps_export_log + (genKey,updateTime,dlCount,status,filePath,remark) + values + ( + #{genKey}, + #{updateTime}, + #{dlCount},#{status},#{filePath},#{remark} + ) + + + + + DELETE FROM basic_corps_export_log WHERE id = #{id} + + + + UPDATE basic_corps_export_log + + updateTime=#{updateTime}, + dlCount=#{dlCount}, + status=#{status}, + filePath=#{filePath}, + remark=#{remark}, + + WHERE genKey = #{genKey} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/CorpImportDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/CorpImportDetailDao.xml new file mode 100644 index 00000000..69b57bbd --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/basic/CorpImportDetailDao.xml @@ -0,0 +1,113 @@ + + + + + + + + + + insert INTO basic_corps_import_detail + ( + thirdId,erpId,name,spell, + addr,status,type,creditNo,contact,mobile,thirdId1,thirdId2,thirdId3,thirdId4, + thirdName,thirdName1,thirdName2,thirdName3,thirdName4, + importStatus,updateTime,remark,genKeyFk) + values + ( + #{thirdId}, + #{erpId}, + #{name}, + #{spell}, + #{addr}, + #{status}, + #{type}, + #{creditNo}, + #{contact}, + #{mobile},#{thirdId1},#{thirdId2},#{thirdId3},#{thirdId4}, + #{thirdName},#{thirdName1},#{thirdName2},#{thirdName3},#{thirdName4}, + #{importStatus}, + #{updateTime},#{remark}, #{genKeyFk} + ) + + + + insert INTO basic_corps_import_detail + ( + thirdId,erpId,name,spell, + addr,status,type,creditNo,contact,mobile,thirdId1,thirdId2,thirdId3,thirdId4, + thirdName,thirdName1,thirdName2,thirdName3,thirdName4, + importStatus,updateTime,remark,genKeyFk) + values + + ( + #{item.thirdId}, + #{item.erpId}, + #{item.name}, + #{item.spell}, + #{item.addr}, + #{item.status}, + #{item.type}, + #{item.creditNo}, + #{item.contact}, + #{item.mobile},#{item.thirdId1},#{item.thirdId2},#{item.thirdId3},#{item.thirdId4}, + #{item.thirdName},#{item.thirdName1},#{item.thirdName2},#{item.thirdName3},#{item.thirdName4}, + #{item.importStatus}, + #{item.updateTime},#{item.remark}, #{item.genKeyFk} + ) + + + + DELETE FROM basic_corps_import_detail WHERE id = #{id} + + + DELETE FROM basic_corps_import_detail WHERE genKeyFk = #{genKey} + + + + UPDATE basic_corps_import_detail + + thirdId=#{thirdId}, + erpId=#{erpId}, + name=#{name}, + spell=#{spell}, + addr=#{addr}, + status=#{status}, + type=#{type}, + creditNo=#{creditNo}, + contact=#{contact}, + mobile=#{mobile}, + thirdId1=#{thirdId1}, + thirdId2=#{thirdId2}, + thirdId3=#{thirdId3}, + thirdId4=#{thirdId4}, + thirdName=#{thirdName}, + thirdName1=#{thirdName1}, + thirdName2=#{thirdName2}, + thirdName3=#{thirdName3}, + thirdName4=#{thirdName4}, + importStatus=#{importStatus}, + updateTime=#{updateTime}, + remark=#{remark}, + + WHERE id = #{id} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/CorpImportLogDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/CorpImportLogDao.xml new file mode 100644 index 00000000..c064a30b --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/basic/CorpImportLogDao.xml @@ -0,0 +1,53 @@ + + + + + + + + + + insert INTO basic_corps_import_log + (genKey,fromType,updateTime,remark,status) + values + ( + #{genKey}, + #{fromType}, + #{updateTime}, + #{remark},#{status} + ) + + + + + DELETE FROM basic_corps_import_log WHERE id = #{id} + + + + UPDATE basic_corps_import_log + + genKey=#{genKey}, + fromType=#{fromType}, + updateTime=#{updateTime}, + status=#{status}, + remark=#{remark}, + + WHERE genKey = #{genKey} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml index f04ce39b..43a1a8e1 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml @@ -37,7 +37,7 @@ diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoExportLogDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoExportLogDao.xml new file mode 100644 index 00000000..cdaed33a --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoExportLogDao.xml @@ -0,0 +1,50 @@ + + + + + + + + + + insert INTO basic_products_export_log + (genKey,updateTime,dlCount,status,filePath,remark) + values + ( + #{genKey}, + #{updateTime}, + #{dlCount},#{status},#{filePath},#{remark} + ) + + + + + DELETE FROM basic_products_export_log WHERE id = #{id} + + + + UPDATE basic_products_export_log + + updateTime=#{updateTime}, + dlCount=#{dlCount}, + status=#{status}, + filePath=#{filePath}, + remark=#{remark}, + + WHERE genKey = #{genKey} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoImportDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoImportDetailDao.xml new file mode 100644 index 00000000..38d693cc --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoImportDetailDao.xml @@ -0,0 +1,81 @@ + + + + + + + + + + insert INTO basic_products_import_detail + (udiCode,ybbm,sptm,thirdId1,thirdId2, + thirdId3,thirdId4,thirdId,status,updateTime,remark,genKeyFk) + values + ( + #{udiCode}, #{ybbm},#{sptm}, + #{thirdId1}, #{thirdId2},#{thirdId3}, + #{thirdId4}, #{thirdId},#{status}, + #{updateTime},#{remark}, #{genKeyFk} + ) + + + + insert INTO basic_products_import_detail + (udiCode,ybbm,sptm,thirdId1,thirdId2, + thirdId3,thirdId4,thirdId,status,updateTime,remark,genKeyFk) + values + + ( + #{item.udiCode}, #{item.ybbm},#{item.sptm}, + #{item.thirdId1}, #{item.thirdId2},#{item.thirdId3}, + #{item.thirdId4}, #{item.thirdId},#{item.status}, + #{item.updateTime},#{item.remark}, #{item.genKeyFk} + ) + + + + DELETE FROM basic_products_import_detail WHERE id = #{id} + + + DELETE FROM basic_products_import_detail WHERE genKeyFk = #{genKey} + + + + UPDATE basic_products_import_detail + + udiCode=#{udiCode}, + ybbm=#{ybbm}, + sptm=#{sptm}, + thirdId1=#{thirdId1}, + thirdId2=#{thirdId2}, + thirdId3=#{thirdId3}, + thirdId4=#{thirdId4}, + thirdId=#{thirdId}, + status=#{status}, + updateTime=#{updateTime}, + remark=#{remark}, + + WHERE id = #{id} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoImportLogDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoImportLogDao.xml new file mode 100644 index 00000000..6721bccc --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoImportLogDao.xml @@ -0,0 +1,56 @@ + + + + + + + + + + insert INTO basic_products_import_log + (genKey,fromType,updateTime,thirdSysFk,status) + values + ( + #{genKey}, + #{fromType}, + #{updateTime}, + #{thirdSysFk},#{status} + ) + + + + + DELETE FROM basic_products_import_log WHERE id = #{id} + + + + UPDATE basic_products_import_log + + genKey=#{genKey}, + fromType=#{fromType}, + updateTime=#{updateTime}, + thirdSysFk=#{thirdSysFk}, + status=#{status}, + + WHERE genKey = #{genKey} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index e7d085f1..a6534711 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -10,7 +10,7 @@ basic_udirel.thirdId,basic_udirel.thirdName,basic_udirel.isUseDy, basic_udirel.thirdId1,basic_udirel.thirdId2,basic_udirel.thirdId3,basic_udirel.thirdId4, basic_udirel.thirdName1,basic_udirel.thirdName2,basic_udirel.thirdName3,basic_udirel.thirdName4, - basic_udirel.manufactory,basic_udirel.measname, + basic_udirel.manufactory,basic_udirel.measname,basic_udirel.ybbm,basic_udirel.sptm, basic_products.nameCode,basic_products.packRatio,basic_products.packLevel, basic_products.bhxjsl,basic_products.bhzxxsbzsl,basic_products.zxxsbzbhsydysl, basic_products.bhxjcpbm,basic_products.bzcj, @@ -36,7 +36,7 @@ AND thirdId LIKE concat(#{thirdId},'%') - AND uuid = #{uuid} + AND basic_udirel.uuid = #{uuid} AND basic_udirel.id = #{id} @@ -53,6 +53,7 @@ basic_udirel.id, basic_udirel.thirdId,basic_udirel.thirdName,basic_udirel.isUseDy, basic_udirel.thirdId1,basic_udirel.thirdId2,basic_udirel.thirdId3,basic_udirel.thirdId4, + basic_udirel.ybbm,basic_udirel.sptm, basic_udirel.thirdName1,basic_udirel.thirdName2,basic_udirel.thirdName3,basic_udirel.thirdName4, basic_udirel.manufactory,basic_udirel.measname, basic_products.nameCode,basic_products.packRatio,basic_products.packLevel,basic_products.bhxjsl,basic_products.bhzxxsbzsl,basic_products.zxxsbzbhsydysl,basic_products.bhxjcpbm,basic_products.bzcj,basic_products.addType,basic_products.deviceRecordKey,basic_products.cpmctymc,basic_products.cplb,basic_products.flbm,basic_products.ggxh,basic_products.qxlb,basic_products.tyshxydm,basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh,basic_products.ylqxzcrbarywmc,basic_products.sydycpbs,basic_products.uuid,basic_products.sjcpbm,basic_products.versionNumber,basic_products.diType @@ -95,9 +96,28 @@ resultType="com.glxp.api.admin.entity.basic.UdiRelevanceEntity"> select * FROM basic_udirel WHERE id = #{id} - @@ -105,7 +125,7 @@ replace INTO basic_udirel ( thirdId,thirdName,uuid,isUseDy,updateTime, - thirdId1,thirdId2,thirdId3,thirdId4,thirdName1,thirdName2,thirdName3,thirdName4,manufactory,measname + thirdId1,thirdId2,thirdId3,thirdId4,thirdName1,thirdName2,thirdName3,thirdName4,manufactory,measname,ybbm,sptm ) values ( @@ -116,7 +136,7 @@ #{updateTime}, #{thirdId1}, #{thirdId2}, #{thirdId3}, #{thirdId4}, #{thirdName1}, #{thirdName2}, #{thirdName3}, #{thirdName4}, - #{manufactory}, #{measname} + #{manufactory}, #{measname},#{ybbm},#{sptm} ) @@ -151,6 +171,8 @@ thirdName4=#{thirdName4}, manufactory=#{manufactory}, measname=#{measname}, + ybbm=#{ybbm}, + sptm=#{sptm}, updateTime=#{updateTime} WHERE id = #{id} diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InCodeLogDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InCodeLogDao.xml index 3fbf5f58..585fe0e6 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InCodeLogDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InCodeLogDao.xml @@ -41,7 +41,7 @@ DELETE FROM inv_incode_log WHERE id = #{id} - + UPDATE inv_incode_log genKey=#{genKey}, diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvStockPrintDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvStockPrintDao.xml index 283e4c49..b4c92e8f 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvStockPrintDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvStockPrintDao.xml @@ -46,14 +46,15 @@ replace INTO inv_stockprint ( udiCode,udiRlIdFk,nameCode,cpmctymc,batchNo, produceDate,expireDate,serialNo,codeType,thirdId,thirdName, - ggxh,ylqxzcrbarmc,zczbhhzbapzbh,warehouseName,warehouseCode,spaceCode,spaceName,genKeyFk + ggxh,ylqxzcrbarmc,zczbhhzbapzbh,warehouseName,warehouseCode,spaceCode,spaceName,genKeyFk,thirdSysFk ) values ( @@ -72,7 +73,7 @@ #{ylqxzcrbarmc}, #{zczbhhzbapzbh}, #{warehouseName}, - #{warehouseCode},#{spaceCode},#{spaceName},#{genKeyFk} + #{warehouseCode},#{spaceCode},#{spaceName},#{genKeyFk},#{thirdSysFk} ) @@ -81,7 +82,7 @@ ( udiCode,udiRlIdFk,nameCode,cpmctymc,batchNo, produceDate,expireDate,serialNo,codeType,thirdId,thirdName, - ggxh,ylqxzcrbarmc,zczbhhzbapzbh,warehouseName,warehouseCode,spaceCode,spaceName,genKeyFk + ggxh,ylqxzcrbarmc,zczbhhzbapzbh,warehouseName,warehouseCode,spaceCode,spaceName,genKeyFk,thirdSysFk ) values @@ -103,7 +104,7 @@ #{item.ylqxzcrbarmc}, #{item.zczbhhzbapzbh}, #{item.warehouseName}, - #{item.warehouseCode},#{item.spaceCode},#{item.spaceName},#{item.genKeyFk} + #{item.warehouseCode},#{item.spaceCode},#{item.spaceName},#{item.genKeyFk},#{item.thirdSysFk} ) @@ -113,7 +114,7 @@ - DELETE FROM inv_stockprint WHERE genKey = #{genKey} + DELETE FROM inv_stockprint WHERE genKeyFk = #{genKey} diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpExportLogDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpExportLogDao.xml new file mode 100644 index 00000000..f2704219 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpExportLogDao.xml @@ -0,0 +1,50 @@ + + + + + + + + + + insert INTO thr_corp_export_log + (genKey,updateTime,dlCount,status,filePath,remark) + values + ( + #{genKey}, + #{updateTime}, + #{dlCount},#{status},#{filePath},#{remark} + ) + + + + + DELETE FROM thr_corp_export_log WHERE id = #{id} + + + + UPDATE thr_corp_export_log + + updateTime=#{updateTime}, + dlCount=#{dlCount}, + status=#{status}, + filePath=#{filePath}, + remark=#{remark}, + + WHERE genKey = #{genKey} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportLogDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportLogDao.xml new file mode 100644 index 00000000..e6411a21 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportLogDao.xml @@ -0,0 +1,54 @@ + + + + + + + + + + insert INTO thr_corp_import_log + (genKey,fromType,updateTime,thirdSysFk,status) + values + ( + #{genKey}, + #{fromType}, + #{updateTime}, + #{thirdSysFk},#{status} + ) + + + + + DELETE FROM thr_corp_import_log WHERE id = #{id} + + + + UPDATE thr_corp_import_log + + genKey=#{genKey}, + fromType=#{fromType}, + updateTime=#{updateTime}, + thirdSysFk=#{thirdSysFk}, + status=#{status}, + remark=#{remark}, + + WHERE genKey = #{genKey} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDao.xml index f2ad8451..3c9c9ef4 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDao.xml @@ -7,7 +7,6 @@ resultType="com.glxp.api.admin.entity.thrsys.ThrInvProductsEntity"> SELECT * FROM thr_inv_products - AND inventoryCode LIKE concat(#{inventoryCode},'%') @@ -21,7 +20,9 @@ - + replace INTO thr_inv_products diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsExportLogDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsExportLogDao.xml new file mode 100644 index 00000000..aea95a43 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsExportLogDao.xml @@ -0,0 +1,50 @@ + + + + + + + + + + insert INTO thr_inv_products_export_log + (genKey,updateTime,dlCount,status,filePath,remark) + values + ( + #{genKey}, + #{updateTime}, + #{dlCount},#{status},#{filePath},#{remark} + ) + + + + + DELETE FROM thr_inv_products_export_log WHERE id = #{id} + + + + UPDATE thr_inv_products_export_log + + updateTime=#{updateTime}, + dlCount=#{dlCount}, + status=#{status}, + filePath=#{filePath}, + remark=#{remark}, + + WHERE genKey = #{genKey} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsImportLogDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsImportLogDao.xml new file mode 100644 index 00000000..72931891 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsImportLogDao.xml @@ -0,0 +1,54 @@ + + + + + + + + + + insert INTO thr_inv_products_import_log + (genKey,fromType,updateTime,thirdSysFk,status) + values + ( + #{genKey}, + #{fromType}, + #{updateTime}, + #{thirdSysFk},#{status} + ) + + + + + DELETE FROM thr_inv_products_import_log WHERE id = #{id} + + + + UPDATE thr_inv_products_import_log + + genKey=#{genKey}, + fromType=#{fromType}, + updateTime=#{updateTime}, + thirdSysFk=#{thirdSysFk}, + status=#{status}, + remark=#{remark}, + + WHERE genKey = #{genKey} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderExportLogDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderExportLogDao.xml new file mode 100644 index 00000000..cdec802b --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderExportLogDao.xml @@ -0,0 +1,50 @@ + + + + + + + + + + insert INTO thr_order_export_log + (genKey,updateTime,dlCount,status,filePath,remark) + values + ( + #{genKey}, + #{updateTime}, + #{dlCount},#{status},#{filePath},#{remark} + ) + + + + + DELETE FROM thr_order_export_log WHERE id = #{id} + + + + UPDATE thr_order_export_log + + updateTime=#{updateTime}, + dlCount=#{dlCount}, + status=#{status}, + filePath=#{filePath}, + remark=#{remark}, + + WHERE genKey = #{genKey} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderImportDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderImportDetailDao.xml new file mode 100644 index 00000000..655e7bfe --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderImportDetailDao.xml @@ -0,0 +1,87 @@ + + + + + + + + + + insert INTO thr_order_import_detail + ( + billNo,billdate,corpId,corpName,billType,billFlag,productId,productName,spec,batchNo,expireDate,productDate,count,reCount,status,updateTime,remark,genKeyFk + ) + values + ( + #{billNo},#{billdate},#{corpId},#{corpName},#{billType},#{billFlag},#{productId},#{productName},#{spec}, + #{batchNo},#{expireDate},#{productDate},#{count},#{reCount},#{status},#{updateTime},#{remark},#{genKeyFk} + ) + + + + insert INTO thr_order_import_detail + ( + billNo,billdate,corpId,corpName,billType,billFlag,productId,productName,spec,batchNo,expireDate,productDate,count,reCount,status,updateTime,remark,genKeyFk + ) + values + + ( + #{item.billNo},#{item.billdate},#{item.corpId},#{item.corpName},#{item.billType}, + #{item.billFlag},#{item.productId},#{item.productName},#{item.spec},#{item.batchNo},#{item.expireDate},#{item.productDate}, + #{item.count},#{item.reCount},#{item.status},#{item.updateTime},#{item.remark},#{item.genKeyFk} + ) + + + + DELETE FROM thr_order_import_detail WHERE id = #{id} + + + DELETE FROM thr_order_import_detail WHERE genKeyFk = #{genKey} + + + + UPDATE thr_order_import_detail + + billNo=#{billNo}, + billdate=#{billdate}, + corpId=#{corpId}, + corpName=#{corpName}, + billType=#{billType}, + billFlag=#{billFlag}, + productId=#{productId}, + productName=#{productName}, + spec=#{spec}, + expireDate=#{expireDate}, + batchNo=#{batchNo}, + productDate=#{productDate}, + count=#{count}, + reCount=#{reCount}, + status=#{status}, + updateTime=#{updateTime}, + genKeyFk=#{genKeyFk}, + remark=#{remark}, + + WHERE id = #{id} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderImportLogDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderImportLogDao.xml new file mode 100644 index 00000000..51a66f06 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderImportLogDao.xml @@ -0,0 +1,54 @@ + + + + + + + + + + insert INTO thr_order_import_log + (genKey,fromType,updateTime,thirdSysFk,status) + values + ( + #{genKey}, + #{fromType}, + #{updateTime}, + #{thirdSysFk},#{status} + ) + + + + + DELETE FROM thr_order_import_log WHERE id = #{id} + + + + UPDATE thr_order_import_log + + genKey=#{genKey}, + fromType=#{fromType}, + updateTime=#{updateTime}, + thirdSysFk=#{thirdSysFk}, + status=#{status}, + remark=#{remark}, + + WHERE genKey = #{genKey} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml index 6b0a5734..21c64fa5 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml @@ -10,13 +10,18 @@ AND name = #{name} + + AND code = #{code} + AND thirdSysFk = #{thirdSysFk} - + replace INTO thr_products diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsExportLogDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsExportLogDao.xml new file mode 100644 index 00000000..f87916a8 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsExportLogDao.xml @@ -0,0 +1,50 @@ + + + + + + + + + + insert INTO thr_products_export_log + (genKey,updateTime,dlCount,status,filePath,remark) + values + ( + #{genKey}, + #{updateTime}, + #{dlCount},#{status},#{filePath},#{remark} + ) + + + + + DELETE FROM thr_products_export_log WHERE id = #{id} + + + + UPDATE thr_products_export_log + + updateTime=#{updateTime}, + dlCount=#{dlCount}, + status=#{status}, + filePath=#{filePath}, + remark=#{remark}, + + WHERE genKey = #{genKey} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsImportLogDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsImportLogDao.xml new file mode 100644 index 00000000..f9dc01f8 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsImportLogDao.xml @@ -0,0 +1,54 @@ + + + + + + + + + + insert INTO thr_porducts_import_log + (genKey,fromType,updateTime,thirdSysFk,status) + values + ( + #{genKey}, + #{fromType}, + #{updateTime}, + #{thirdSysFk},#{status} + ) + + + + + DELETE FROM thr_porducts_import_log WHERE id = #{id} + + + + UPDATE thr_porducts_import_log + + genKey=#{genKey}, + fromType=#{fromType}, + updateTime=#{updateTime}, + thirdSysFk=#{thirdSysFk}, + status=#{status}, + remark=#{remark}, + + WHERE genKey = #{genKey} + + + \ No newline at end of file