基础数据导入导出

master
anthonywj 4 years ago
parent 8842f864bf
commit 7c764a8aa0

@ -164,6 +164,18 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>
<!--解析excel-->
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>RELEASE</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>RELEASE</version>
</dependency>
</dependencies>
<build>

@ -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; //第三方提交
}

@ -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;
}

@ -255,7 +255,7 @@ public class BasicUnitMaintainController {
return thrCorpEntity;
}).collect(Collectors.toList());
PageInfo<ThrCorpEntity> pageInfo;
pageInfo = new PageInfo<>(thrCorpEntityList);
pageInfo = new PageInfo<>(thrCorpEntities);
PageSimpleResponse<ThrCorpEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(thrCorpEntityList);

@ -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<CorpExportLogEntity> corpExportLogEntities
= corpExportLogService.filterCorpExportLog(filterUdiEpLogReques);
PageInfo<CorpExportLogEntity> pageInfo;
pageInfo = new PageInfo<>(corpExportLogEntities);
PageSimpleResponse<CorpExportLogEntity> 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<CorpExportLogEntity> 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文件请稍后刷新查看!");
}
}

@ -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<CorpImportLogEntity> udiInfoImportLogEntities
= corpImportLogService.filterImportLog(filterUdiIpLogRequest);
PageInfo<CorpImportLogEntity> pageInfo;
pageInfo = new PageInfo<>(udiInfoImportLogEntities);
PageSimpleResponse<CorpImportLogEntity> 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<CorpImportDetailEntity> corpImportDetailEntities
= corpImportDetailService.filterCorpImport(filterUdiIpLogRequest);
PageInfo<CorpImportDetailEntity> pageInfo;
pageInfo = new PageInfo<>(corpImportDetailEntities);
PageSimpleResponse<CorpImportDetailEntity> 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<CorpImportLogEntity> 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<MultipartFile> 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<CorpImportDetailEntity> 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<CorpImportDetailEntity> 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("上传成功");
}
}

@ -109,7 +109,7 @@ public class UdiInfoController {
List<ErpProductsResponse> 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);

@ -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<UdiInfoExportLogEntity> udiInfoExportLogEntities
= udiInfoExportLogService.filterUdiInfoExportLog(filterUdiEpLogReques);
PageInfo<UdiInfoExportLogEntity> pageInfo;
pageInfo = new PageInfo<>(udiInfoExportLogEntities);
PageSimpleResponse<UdiInfoExportLogEntity> 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<UdiInfoExportLogEntity> 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文件请稍后刷新查看!");
}
}

@ -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<UdiInfoImportLogEntity> udiInfoImportLogEntities
= udiInfoImportLogService.filterImportLog(filterUdiIpLogRequest);
PageInfo<UdiInfoImportLogEntity> pageInfo;
pageInfo = new PageInfo<>(udiInfoImportLogEntities);
PageSimpleResponse<UdiInfoImportLogEntity> 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<UdiInfoImportDetailEntity> udiInfoImportEntities
= udiInfoImportService.filterUdiInfoImport(filterUdiIpLogRequest);
PageInfo<UdiInfoImportDetailEntity> pageInfo;
pageInfo = new PageInfo<>(udiInfoImportEntities);
PageSimpleResponse<UdiInfoImportDetailEntity> 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<UdiInfoImportLogEntity> 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<MultipartFile> 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<UdiInfoImportDetailEntity> 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<UdiInfoImportDetailEntity> 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("上传成功");
}
}

@ -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("后台已开启下载更新,请稍后刷新查看!");
}

@ -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<ErpOrderResponse> erpOrderResponses = thrOrderService.filterAllDetail(filterThrOrderRequest);
PageInfo<ErpOrderResponse> pageInfo;
pageInfo = new PageInfo<>(erpOrderResponses);

@ -155,7 +155,6 @@ public class InoutUtils {
udiInfoEntity = new UdiInfoEntity();
}
}
udiInfoEntity.setCode(code);
udiInfoEntity = FilterUdiUtils.transUdi(udiInfoEntity);
return udiInfoEntity;

@ -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<InCodeLogEntity> 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<InCodeLogEntity> 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);
}
}

@ -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

@ -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<StockPrintEntity> stockPrintEntities
= stockPrintService.filterStockPrint(stockprintRequest);
PageInfo<StockPrintEntity> 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<StockPrintEntity> 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<StockPrintEntity> 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<StockPrintEntity> 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);
}

@ -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<ThrCorpExportLogEntity> thrCorpExportLogEntities
= thrCorpExportLogService.filterThrCorpExportLog(filterUdiEpLogReques);
PageInfo<ThrCorpExportLogEntity> pageInfo;
pageInfo = new PageInfo<>(thrCorpExportLogEntities);
PageSimpleResponse<ThrCorpExportLogEntity> 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<ThrCorpExportLogEntity> 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文件请稍后刷新查看!");
}
}

@ -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<ThrCorpImportLogEntity> thrCorpImportLogEntities
= thrCorpImportLogService.filterImportLog(filterUdiIpLogRequest);
PageInfo<ThrCorpImportLogEntity> pageInfo;
pageInfo = new PageInfo<>(thrCorpImportLogEntities);
PageSimpleResponse<ThrCorpImportLogEntity> 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<ThrCorpImportLogEntity> thrCorpImportLogEntities = thrCorpImportLogService.filterImportLog(filterInCodeLogRequest);
if (thrCorpImportLogEntities != null && thrCorpImportLogEntities.size() > 0) {
ThrCorpImportLogEntity thrCorpImportLogEntity = thrCorpImportLogEntities.get(0);
thrCorpImportLogService.deleteById(thrCorpImportLogEntity.getId() + "");
}
return ResultVOUtils.success("删除成功");
}
}

@ -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<ThrCorpEntity> thrCorpEntities;
List<ErpUnitsResponse> 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("后台开始下载更新,请稍后刷新查看");
}
}

@ -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<ThrInvProductsEntity> thrInvProductsEntities;
List<ErpInvProductResponse> 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, "上传数据为空");
}

@ -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<ThrInvProductsExportLogEntity> thrInvProductsExportLogEntities
= thrInvProductsExportLogService.filterThrInvProductsExportLog(filterUdiEpLogReques);
PageInfo<ThrInvProductsExportLogEntity> pageInfo;
pageInfo = new PageInfo<>(thrInvProductsExportLogEntities);
PageSimpleResponse<ThrInvProductsExportLogEntity> 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<ThrInvProductsExportLogEntity> 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文件请稍后刷新查看!");
}
}

@ -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<ThrInvProductsImportLogEntity> thrInvProductsImportLogEntities
= thrInvProductsImportLogService.filterImportLog(filterUdiIpLogRequest);
PageInfo<ThrInvProductsImportLogEntity> pageInfo;
pageInfo = new PageInfo<>(thrInvProductsImportLogEntities);
PageSimpleResponse<ThrInvProductsImportLogEntity> 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<ThrInvProductsImportLogEntity> thrInvProductsImportLogEntities = thrInvProductsImportLogService.filterImportLog(filterInCodeLogRequest);
if (thrInvProductsImportLogEntities != null && thrInvProductsImportLogEntities.size() > 0) {
ThrInvProductsImportLogEntity thrInvProductsImportLogEntity = thrInvProductsImportLogEntities.get(0);
thrInvProductsImportLogService.deleteById(thrInvProductsImportLogEntity.getId() + "");
}
return ResultVOUtils.success("删除成功");
}
}

@ -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<ThrOrderEntity> thrOrderEntities;
List<ErpOrderResponse> 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<String> 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<ThrOrderDetailEntity> thrOrderDetailEntities = thrOrderDetailService.filterThrOrderDetailDetail(filterThrOrderDetailRequest);
if (thrOrderDetailEntities != null && thrOrderDetailEntities.size() > 0) {
List<UploadSmpRequest.SubErpOrder> 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<BaseResponse>() {
});
if (baseResponse.getCode() == 20000) {
return ResultVOUtils.success("上传成功!");
} else {
return ResultVOUtils.error(baseResponse.getCode(), baseResponse.getMessage());
}
}
}
return ResultVOUtils.error(500, "上传数据成功");
}
}

@ -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<ThrOrderExportLogEntity> udiInfoExportLogEntities
= thrOrderExportLogService.filterThrOrderExportLog(filterUdiEpLogReques);
PageInfo<ThrOrderExportLogEntity> pageInfo;
pageInfo = new PageInfo<>(udiInfoExportLogEntities);
PageSimpleResponse<ThrOrderExportLogEntity> 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<ThrOrderExportLogEntity> 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文件请稍后刷新查看!");
}
}

@ -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<ThrOrderImportLogEntity> udiInfoImportLogEntities
= thrOrderImportLogService.filterImportLog(filterUdiIpLogRequest);
PageInfo<ThrOrderImportLogEntity> pageInfo;
pageInfo = new PageInfo<>(udiInfoImportLogEntities);
PageSimpleResponse<ThrOrderImportLogEntity> 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<ThrOrderImportDetailEntity> thrOrderImportDetailEntities
= thrOrderImportDetailService.filterOrderImportDetail(filterUdiIpLogRequest);
PageInfo<ThrOrderImportDetailEntity> pageInfo;
pageInfo = new PageInfo<>(thrOrderImportDetailEntities);
PageSimpleResponse<ThrOrderImportDetailEntity> 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<ThrOrderImportLogEntity> 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<MultipartFile> 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<ThrOrderImportDetailEntity> 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<ThrOrderImportDetailEntity> 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("上传成功");
// }
}

@ -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<ThrProductsEntity> thrProductsEntities;
List<ErpProductsResponse> 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("后台开始下载更新,请稍后刷新查看");
}
}

@ -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<ThrProductsExportLogEntity> thrProductsExportLogEntities
= thrProductsExportLogService.filterThrProductsExportLog(filterUdiEpLogReques);
PageInfo<ThrProductsExportLogEntity> pageInfo;
pageInfo = new PageInfo<>(thrProductsExportLogEntities);
PageSimpleResponse<ThrProductsExportLogEntity> 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<ThrProductsExportLogEntity> 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文件请稍后刷新查看!");
}
}

@ -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<ThrProductsImportLogEntity> thrProductsImportLogEntities
= thrProductsImportLogService.filterImportLog(filterUdiIpLogRequest);
PageInfo<ThrProductsImportLogEntity> pageInfo;
pageInfo = new PageInfo<>(thrProductsImportLogEntities);
PageSimpleResponse<ThrProductsImportLogEntity> 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<ThrProductsImportLogEntity> thrProductsImportLogEntities = thrProductsImportLogService.filterImportLog(filterInCodeLogRequest);
if (thrProductsImportLogEntities != null && thrProductsImportLogEntities.size() > 0) {
ThrProductsImportLogEntity thrInvProductsImportLogEntity = thrProductsImportLogEntities.get(0);
thrProductsImportLogService.deleteById(thrInvProductsImportLogEntity.getId() + "");
}
return ResultVOUtils.success("删除成功");
}
}

@ -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<CorpExportLogEntity> filterCorpExportLog(FilterUdiEpLogRequest filterUdiEpLogRequest);
boolean insertCorpExportLog(CorpExportLogEntity corpExportLogEntity);
boolean updateCorpExportLog(CorpExportLogEntity corpExportLogEntity);
boolean deleteById(@Param("id") String id);
}

@ -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<CorpImportDetailEntity> filterCorpImport(FilterUdiIpLogRequest filterUdiIpLogRequest);
boolean insertCorpImport(CorpImportDetailEntity corpImportDetailEntity);
boolean updateCorpImport(CorpImportDetailEntity corpImportDetailEntity);
boolean insertCorpImports(@Param("corps") List<CorpImportDetailEntity> corpImportDetailEntities);
boolean deleteById(@Param("id") String id);
boolean deleteByGenkey(@Param("genKey") String genKey);
}

@ -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<CorpImportLogEntity> filterImportLog(FilterUdiIpLogRequest filterInCodeLogRequest);
boolean insertImportLog(CorpImportLogEntity corpImportLogEntity);
boolean updateImportLog(CorpImportLogEntity corpImportLogEntity);
boolean deleteById(@Param("id") String id);
}

@ -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<UdiInfoExportLogEntity> filterUdiInfoExportLog(FilterUdiEpLogRequest filterInCodeLogRequest);
boolean insertUdiInfoExportLog(UdiInfoExportLogEntity udiInfoImportEntity);
boolean updateUdiInfoExportLog(UdiInfoExportLogEntity udiInfoImportEntity);
boolean deleteById(@Param("id") String id);
}

@ -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<UdiInfoImportDetailEntity> filterUdiInfoImport(FilterUdiIpLogRequest filterInCodeLogRequest);
boolean insertUdiInfoImport(UdiInfoImportDetailEntity udiInfoImportEntity);
boolean updateUdiInfoImport(UdiInfoImportDetailEntity udiInfoImportEntity);
boolean insertUdiInfoImports(@Param("udiInfos") List<UdiInfoImportDetailEntity> udiInfos);
boolean deleteById(@Param("id") String id);
boolean deleteByGenkey(@Param("genKey") String genKey);
}

@ -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<UdiInfoImportLogEntity> filterImportLog(FilterUdiIpLogRequest filterInCodeLogRequest);
boolean insertImportLog(UdiInfoImportLogEntity udiInfoImportLogEntity);
boolean updateImportLog(UdiInfoImportLogEntity udiInfoImportLogEntity);
boolean deleteById(@Param("id") String id);
}

@ -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);

@ -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<ThrCorpExportLogEntity> filterThrCorpExportLog(FilterUdiEpLogRequest filterUdiEpLogRequest);
boolean insertThrCorpExportLog(ThrCorpExportLogEntity thrCorpExportLogEntity);
boolean updateThrCorpExportLog(ThrCorpExportLogEntity thrCorpExportLogEntity);
boolean deleteById(@Param("id") String id);
}

@ -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<ThrCorpImportLogEntity> filterImportLog(FilterUdiIpLogRequest filterInCodeLogRequest);
boolean insertImportLog(ThrCorpImportLogEntity thrCorpImportLogEntity);
boolean updateImportLog(ThrCorpImportLogEntity thrCorpImportLogEntity);
boolean deleteById(@Param("id") String id);
}

@ -12,6 +12,8 @@ public interface ThrInvProductsDao {
List<ThrInvProductsEntity> filterThrInvProductss(FilterThrInvProductsRequest filterThrInvProductsRequest);
ThrInvProductsEntity selectById(@Param("id") String id);
boolean insertThrInvProduct(ThrInvProductsEntity thrInvProductsEntity);
boolean insertThrInvProducts(@Param("thrInvProductsEntities") List<ThrInvProductsEntity> thrInvProductsEntities);

@ -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<ThrInvProductsExportLogEntity> filterThrInvProductsExportLog(FilterUdiEpLogRequest filterUdiEpLogRequest);
boolean insertThrInvProductsExportLog(ThrInvProductsExportLogEntity thrInvProductsExportLogEntity);
boolean updateThrInvProductsExportLog(ThrInvProductsExportLogEntity thrInvProductsExportLogEntity);
boolean deleteById(@Param("id") String id);
}

@ -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<ThrInvProductsImportLogEntity> filterImportLog(FilterUdiIpLogRequest filterInCodeLogRequest);
boolean insertImportLog(ThrInvProductsImportLogEntity thrInvProductsImportLogEntity);
boolean updateImportLog(ThrInvProductsImportLogEntity thrInvProductsImportLogEntity);
boolean deleteById(@Param("id") String id);
}

@ -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<ThrOrderExportLogEntity> filterThrOrderExportLog(FilterUdiEpLogRequest filterUdiEpLogRequest);
boolean insertThrOrderExportLog(ThrOrderExportLogEntity thrOrderExportLogEntity);
boolean updateThrOrderExportLog(ThrOrderExportLogEntity thrOrderExportLogEntity);
boolean deleteById(@Param("id") String id);
}

@ -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<ThrOrderImportDetailEntity> filterOrderdDetailImport(FilterUdiIpLogRequest filterInCodeLogRequest);
boolean insertOrderdDetailImport(ThrOrderImportDetailEntity thrOrderImportDetailEntity);
boolean updateOrderdDetailImport(ThrOrderImportDetailEntity thrOrderImportDetailEntity);
boolean insertOrderdDetailImports(@Param("orders") List<ThrOrderImportDetailEntity> thrOrderImportDetailEntities);
boolean deleteById(@Param("id") String id);
boolean deleteByGenkey(@Param("genKey") String genKey);
}

@ -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<ThrOrderImportLogEntity> filterImportLog(FilterUdiIpLogRequest filterInCodeLogRequest);
boolean insertImportLog(ThrOrderImportLogEntity thrOrderImportLogEntity);
boolean updateImportLog(ThrOrderImportLogEntity thrOrderImportLogEntity);
boolean deleteById(@Param("id") String id);
}

@ -13,6 +13,8 @@ public interface ThrProductsDao {
List<ThrProductsEntity> filterThrProductsRequest(FilterThrProductsRequest filterThrProductsRequest);
ThrProductsEntity selectById(@Param("id") String id);
boolean insertThrProducts(ThrProductsEntity thrProductsEntity);
boolean insertThrProductss(@Param("thrProductsEntities") List<ThrProductsEntity> thrProductsEntities);

@ -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<ThrProductsExportLogEntity> filterThrProductsExportLog(FilterUdiEpLogRequest filterUdiEpLogRequest);
boolean insertThrProductsExportLog(ThrProductsExportLogEntity thrProductsExportLogEntity);
boolean updateThrProductsExportLog(ThrProductsExportLogEntity thrProductsExportLogEntity);
boolean deleteById(@Param("id") String id);
}

@ -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<ThrProductsImportLogEntity> filterImportLog(FilterUdiIpLogRequest filterInCodeLogRequest);
boolean insertImportLog(ThrProductsImportLogEntity thrProductsImportLogEntity);
boolean updateImportLog(ThrProductsImportLogEntity thrProductsImportLogEntity);
boolean deleteById(@Param("id") String id);
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -21,6 +21,8 @@ public class UdiRelevanceEntity {
private String thirdName4;
private String manufactory;
private String measname;
private String ybbm;
private String sptm;
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -30,7 +30,9 @@ public class ErpBasicClient {
paramMap.put("limit", unitMaintainFilterRequest.getLimit());
String response = HttpClient.mipsGet(url, paramMap);
try {
BaseResponse<PageSimpleResponse<ErpUnitsResponse>> udiDlDeviceResponse = (BaseResponse<PageSimpleResponse<ErpUnitsResponse>>) JSONObject.parseObject(response, BaseResponse.class);
BaseResponse<PageSimpleResponse<ErpUnitsResponse>> udiDlDeviceResponse =
JSONObject.parseObject(response, new TypeReference<BaseResponse<PageSimpleResponse<ErpUnitsResponse>>>() {
});
return udiDlDeviceResponse;
} catch (Exception e) {
e.printStackTrace();

@ -49,11 +49,15 @@ public class UdiDlHttpClient {
JSONObject.parseObject(response, new TypeReference<BaseResponse<List<UdiInfoEntity>>>() {
});
List<UdiInfoEntity> udiInfoEntities = udiDlDeviceResponse.getData();
return udiInfoEntities;
if (udiDlDeviceResponse != null && udiDlDeviceResponse.getCode() == 20000) {
List<UdiInfoEntity> udiInfoEntities = udiDlDeviceResponse.getData();
return udiInfoEntities;
}
} catch (Exception e) {
e.printStackTrace();
return null;
}
return null;
}
}

@ -0,0 +1,16 @@
package com.glxp.api.admin.req.basic;
import lombok.Data;
import java.util.List;
@Data
public class CorpsExportRequest {
List<Integer> ids;
private Integer id;
private String key;
private String unitId;
private String name;
private String thirdSys;
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -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<CorpImportDetailEntity> datas;
}

@ -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<UdiInfoImportDetailEntity> datas;
}

@ -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<String> 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;
}

@ -7,7 +7,9 @@ import java.util.List;
@Data
public class PostStockPrintRequest {
private String genKey;
private String thirdSys;
private List<StockPrintEntity> datas;
private List<String> ids;
}

@ -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;
}

@ -0,0 +1,11 @@
package com.glxp.api.admin.req.thrsys;
import lombok.Data;
import java.util.List;
@Data
public class PostSmpOrderRequest {
List<String> ids;
}

@ -7,6 +7,8 @@ import java.util.List;
@Data
public class PostThrCorpRequest {
private String genKey;
private String thirdSys;
private String uploadType;
private List<ErpUnitsResponse> corps;
}

@ -9,6 +9,8 @@ import java.util.List;
@Data
public class PostThrInvProductsRequest {
private String genKey;
private String thirdSys;
private String uploadType;
private List<ErpInvProductResponse> datas;
}

@ -8,6 +8,7 @@ import java.util.List;
@Data
public class PostThrOrderRequest {
private String genKey;
private String thirdSys;
private List<ErpOrderResponse> datas;

@ -8,7 +8,9 @@ import java.util.List;
@Data
public class PostThrProductsRequest {
private String genKey;
private String thirdSys;
private String uploadType;
List<ErpProductsResponse> datas;
}

@ -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<ThrCorpEntity> thrCorpEntities;
private String thirdSysFk;
private String unitId;
private String thirdSys;
private String name;
}

@ -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<ThrInvProductsEntity> thrInvProductsEntities;
private String inventoryCode;
private String inventoryName;
private String thirdSysFk;
private String batchNo;
private String warehouseCode;
private List<String> inventoryCodes;
private String udiCode;
private String nameCode;
private String thirdSys;
}

@ -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<ErpOrderResponse> erpOrderResponses;
private String id;
private String billNo;
private String thirdSysFk;
private String startDate; //起始日期
private String endDate; //结束日期
private String billFlag; //单据状态,0.未签字1.已签字
private String billAction;
}

@ -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<ThrProductsEntity> thrProductsEntities;
private String code;
private String name;
private String thirdSys;
private String thirdSysFk;
}

@ -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<UploadSmpRequest.SubErpOrder> 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<UploadSmpRequest.SubErpOrder> getSubErpOrders() {
return subErpOrders;
}
public void setSubErpOrders(List<UploadSmpRequest.SubErpOrder> 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;
}
}
}

@ -43,5 +43,7 @@ public class UdiRelevanceResponse {
private String thirdName3;
private String thirdId4;
private String thirdName4;
private String ybbm;
private String sptm;
}

@ -0,0 +1,11 @@
package com.glxp.api.admin.res.inventory;
import lombok.Data;
@Data
public class IncodeSysParmsResponse {
private String thirdSys;
private String fromType;
}

@ -14,5 +14,5 @@ public interface BasicThirdSysService {
List<BasicThirdSysEntity> filterBasicThiSys(FilterBasicThirdSysRequest filterBasicThirdSysRequest);
BasicThirdSysEntity selectMainThrSys();
}

@ -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<CorpExportLogEntity> filterCorpExportLog(FilterUdiEpLogRequest filterUdiEpLogRequest);
boolean insertCorpExportLog(CorpExportLogEntity corpExportLogEntity);
boolean updateCorpExportLog(CorpExportLogEntity corpExportLogEntity);
boolean deleteById(String id);
}

@ -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<CorpImportDetailEntity> filterCorpImport(FilterUdiIpLogRequest filterUdiIpLogRequest);
boolean insertCorpImport(CorpImportDetailEntity corpImportDetailEntity);
boolean updateCorpImport(CorpImportDetailEntity corpImportDetailEntity);
boolean insertCorpImports(List<CorpImportDetailEntity> corpImportDetailEntities);
boolean deleteById(String id);
boolean deleteByGenkey(String genKey);
}

@ -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<CorpImportLogEntity> filterImportLog(FilterUdiIpLogRequest filterUdiIpLogRequest);
boolean insertImportLog(CorpImportLogEntity corpImportLogEntity);
boolean updateImportLog(CorpImportLogEntity corpImportLogEntity);
boolean deleteById(@Param("id") String id);
}

@ -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<UdiInfoExportLogEntity> filterUdiInfoExportLog(FilterUdiEpLogRequest filterInCodeLogRequest);
boolean insertUdiInfoExportLog(UdiInfoExportLogEntity udiInfoImportEntity);
boolean updateUdiInfoExportLog(UdiInfoExportLogEntity udiInfoImportEntity);
boolean deleteById( String id);
}

@ -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<UdiInfoImportDetailEntity> filterUdiInfoImport(FilterUdiIpLogRequest filterInCodeLogRequest);
boolean insertUdiInfoImport(UdiInfoImportDetailEntity udiInfoImportEntity);
boolean updateUdiInfoImport(UdiInfoImportDetailEntity udiInfoImportEntity);
boolean insertUdiInfoImports(List<UdiInfoImportDetailEntity> udiInfoImportEntities);
boolean deleteById(String id);
boolean deleteByGenkey(String genKey);
}

@ -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<UdiInfoImportLogEntity> filterImportLog(FilterUdiIpLogRequest filterInCodeLogRequest);
boolean insertImportLog(UdiInfoImportLogEntity udiInfoImportLogEntity);
boolean updateImportLog(UdiInfoImportLogEntity udiInfoImportLogEntity);
boolean deleteById(String id);
}

@ -19,7 +19,8 @@ public interface UdiRelevanceService {
List<UdiRelevanceEntity> 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);

@ -40,4 +40,15 @@ public class BasicThirdSysServiceImpl implements BasicThirdSysService {
List<BasicThirdSysEntity> data = basicThirdSysDao.filterBasicThiSys(filterBasicThirdSysRequest);
return data;
}
@Override
public BasicThirdSysEntity selectMainThrSys() {
FilterBasicThirdSysRequest filterBasicThirdSysRequest = new FilterBasicThirdSysRequest();
filterBasicThirdSysRequest.setMainSys(true);
List<BasicThirdSysEntity> data = basicThirdSysDao.filterBasicThiSys(filterBasicThirdSysRequest);
if (data != null && data.size() > 0) {
return data.get(0);
}
return null;
}
}

@ -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<BasicUnitMaintainEntity> data = basicUnitMaintainDao.filterList(basicUnitMaintainFilterRequest);
return data;
}

@ -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<CorpExportLogEntity> corpExportLogEntities = corpExportLogDao.filterCorpExportLog(filterUdiEpLogRequest);
if (corpExportLogEntities != null && corpExportLogEntities.size() > 0) {
return corpExportLogEntities.get(0);
}
return null;
}
@Override
public List<CorpExportLogEntity> 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<CorpExportLogEntity> 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);
}
}

@ -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<CorpImportDetailEntity> 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<CorpImportDetailEntity> 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<CorpImportDetailEntity> 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);
}
}

@ -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<CorpImportLogEntity> data = corpImportLogDao.filterImportLog(filterUdiIpLogRequest);
if (data != null && data.size() > 0) {
return data.get(0);
}
return null;
}
@Override
public List<CorpImportLogEntity> 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<CorpImportLogEntity> 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);
}
}

@ -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<UdiInfoExportLogEntity> data = udiInfoExportLogDao.filterUdiInfoExportLog(filterUdiEpLogRequest);
if (data != null)
return data.get(0);
else
return null;
}
@Override
public List<UdiInfoExportLogEntity> 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<UdiInfoExportLogEntity> 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);
}
}

@ -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<UdiInfoImportDetailEntity> 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<UdiInfoImportDetailEntity> 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<UdiInfoImportDetailEntity> 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);
}
}

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save