导入导出bug修复

master
anthonywj 4 years ago
parent d639d1648c
commit 17b0308116

@ -176,6 +176,37 @@
<artifactId>poi-ooxml</artifactId>
<version>RELEASE</version>
</dependency>
<!-- PDF打印 -->
<dependency>
<groupId>com.itextpdf</groupId>
<artifactId>itextpdf</artifactId>
<version>5.5.10</version>
</dependency>
<dependency>
<groupId>com.itextpdf</groupId>
<artifactId>itext-asian</artifactId>
<version>5.2.0</version>
</dependency>
<!--Hutool是一个小而全的Java工具类库-->
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
<version>5.7.9</version>
</dependency>
<!-- 二维码工具 考虑到Hutool的非强制依赖性因此zxing需要用户自行引入 -->
<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>core</artifactId>
<version>3.3.3</version>
</dependency>
<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>javase</artifactId>
<version>3.3.3</version>
</dependency>
</dependencies>
<build>

@ -1,6 +1,7 @@
package com.glxp.api.admin.controller.basic;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity;
import com.glxp.api.admin.entity.basic.BasicThirdSysEntity;
import com.glxp.api.admin.req.basic.FilterBasicThirdSysDetailRequest;
@ -59,10 +60,13 @@ public class BasicThirdSysController {
return ResultVOUtils.success(pageSimpleResponse);
}
/**
*
*/
// @AuthRuleAnnotation("")
@GetMapping("/udiwms/basic/thirdsys/get")
public BaseResponse get(FilterBasicThirdSysRequest filterBasicThirdSysRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
@ -74,6 +78,9 @@ public class BasicThirdSysController {
BeanUtils.copyProperties(item, basicThirdSysResponse);
return basicThirdSysResponse;
}).collect(Collectors.toList());
basicThirdSysResponses.add(new BasicThirdSysResponse("ybbm","医保编码"));
basicThirdSysResponses.add(new BasicThirdSysResponse("sptm","商品条码"));
basicThirdSysResponses.add(new BasicThirdSysResponse("udiCode","UDI最小销售标识"));
return ResultVOUtils.success(basicThirdSysResponses);
}

@ -1,6 +1,7 @@
package com.glxp.api.admin.controller.basic;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity;
import com.glxp.api.admin.entity.basic.BasicThirdSysEntity;
import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity;
@ -19,6 +20,7 @@ import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.basic.BasicProductThirdSysResponse;
import com.glxp.api.admin.res.basic.BasicUnitMaintainResponse;
import com.glxp.api.admin.res.basic.ErpUnitsResponse;
import com.glxp.api.admin.res.basic.SrtBasicUnitResponse;
import com.glxp.api.admin.res.inout.WarehouseResponse;
import com.glxp.api.admin.service.basic.BasicThirdSysDetailService;
import com.glxp.api.admin.service.basic.BasicThirdSysService;
@ -138,6 +140,35 @@ public class BasicUnitMaintainController {
return ResultVOUtils.success(pageSimpleResponse);
}
/**
*
*/
// @AuthRuleAnnotation("")
@GetMapping("/udiwms/basic/unit/download")
public BaseResponse downloadBasicUnits(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<BasicUnitMaintainEntity> basicUnitMaintainEntities;
basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest);
List<SrtBasicUnitResponse> srtBasicUnitResponses = new ArrayList<>();
for (BasicUnitMaintainEntity basicUnitMaintainEntity : basicUnitMaintainEntities) {
SrtBasicUnitResponse srtBasicUnitResponse = new SrtBasicUnitResponse();
srtBasicUnitResponse.setUnitId(basicUnitMaintainEntity.getErpId());
srtBasicUnitResponse.setUnitName(basicUnitMaintainEntity.getName());
srtBasicUnitResponses.add(srtBasicUnitResponse);
}
PageInfo<BasicUnitMaintainEntity> pageInfo;
pageInfo = new PageInfo<>(basicUnitMaintainEntities);
PageSimpleResponse<SrtBasicUnitResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(srtBasicUnitResponses);
return ResultVOUtils.success(pageSimpleResponse);
}
@PostMapping("/udiwms/basic/unit/maintain/combine")
public BaseResponse combine(@RequestBody CombineUnitRequest combineRequest, BindingResult bindingResult) {

@ -1,16 +1,20 @@
package com.glxp.api.admin.controller.basic;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.constant.BussinessTypeUtils;
import com.glxp.api.admin.entity.basic.BussinessTypeEntity;
import com.glxp.api.admin.req.inout.DeleteRequest;
import com.glxp.api.admin.req.receipt.BussinessTypeFilterRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.basic.BasicThirdSysResponse;
import com.glxp.api.admin.res.basic.BussinessTypResponse;
import com.glxp.api.admin.res.basic.SrBtResponse;
import com.glxp.api.admin.service.basic.BussinessTypeService;
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;
@ -20,6 +24,7 @@ import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
*
@ -67,6 +72,33 @@ public class BussinessTypeController {
return ResultVOUtils.success(pageSimpleResponse);
}
// @AuthRuleAnnotation("")
@GetMapping("/udiwms/bussinessType/download")
public BaseResponse downloadJoinBussinessType(BussinessTypeFilterRequest bussinessTypeFilterRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
bussinessTypeFilterRequest.setEnabled(true);
List<BussinessTypResponse> bussinessTypeEntities;
bussinessTypeEntities = bussinessTypeService.filterJoinList(bussinessTypeFilterRequest);
List<SrBtResponse> basicThirdSysResponses = bussinessTypeEntities.stream().map(item ->
{
SrBtResponse basicThirdSysResponse = new SrBtResponse();
BeanUtils.copyProperties(item, basicThirdSysResponse);
return basicThirdSysResponse;
}).collect(Collectors.toList());
PageInfo<BussinessTypResponse> pageInfo;
pageInfo = new PageInfo<>(bussinessTypeEntities);
PageSimpleResponse<SrBtResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(basicThirdSysResponses);
return ResultVOUtils.success(pageSimpleResponse);
}
@PostMapping("/udiwms/bussinessType/delete")
public BaseResponse deleteBussinessType(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {

@ -154,11 +154,23 @@ public class CorpImportLogController {
continue;
}
// 滤过第一行标题
for (int k = sheet.getFirstRowNum(); k <= sheet.getLastRowNum(); k++) {
row = sheet.getRow(0);
if ((row.getCell(0) == null || row.getCell(1) == null || row.getCell(2) == null
|| row.getCell(3) == null || row.getCell(4) == null || row.getCell(5) == null|| row.getCell(6) == null) ||
(!"往来单位ID".equals(row.getCell(0).getStringCellValue())
|| !"往来单位名称".equals(row.getCell(1).getStringCellValue())
|| !"往来单位拼音简写".equals(row.getCell(2).getStringCellValue())
|| !"地址".equals(row.getCell(3).getStringCellValue())
|| !"联系人".equals(row.getCell(4).getStringCellValue())
|| !"联系电话".equals(row.getCell(5).getStringCellValue())
|| !"社会信用号".equals(row.getCell(6).getStringCellValue())
|| !"往来单位状态".equals(row.getCell(6).getStringCellValue())
|| !"往来单位类型".equals(row.getCell(6).getStringCellValue())
|| !"thirdId".equals(row.getCell(6).getStringCellValue()))) {
return ResultVOUtils.error(500, "文件格式错误!");
}
for (int k = sheet.getFirstRowNum()+1; 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) {

@ -153,11 +153,20 @@ public class UdiInfoImportLogController {
continue;
}
// 滤过第一行标题
for (int k = sheet.getFirstRowNum(); k <= sheet.getLastRowNum(); k++) {
row = sheet.getRow(0);
if ((row.getCell(0) == null || row.getCell(1) == null || row.getCell(2) == null
|| row.getCell(3) == null || row.getCell(4) == null || row.getCell(5) == null|| row.getCell(6) == null) ||
(!"udiCode".equals(row.getCell(0).getStringCellValue())
|| !"医保码".equals(row.getCell(1).getStringCellValue())
|| !"商品条码".equals(row.getCell(2).getStringCellValue())
|| !"thirdId".equals(row.getCell(3).getStringCellValue())
|| !"thirdId1".equals(row.getCell(4).getStringCellValue())
|| !"thirdId2".equals(row.getCell(5).getStringCellValue())
|| !"thirdId3".equals(row.getCell(6).getStringCellValue()))) {
return ResultVOUtils.error(500, "文件格式错误!");
}
for (int k = sheet.getFirstRowNum()+1; 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) {
@ -261,4 +270,41 @@ public class UdiInfoImportLogController {
}
//扫码精灵产品信息接口上传
@PostMapping("/udiwms/basic/products/srUpload")
public BaseResponse postSrUdiInfo(@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(BasicProcessStatus.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(BasicProcessStatus.UDIINFO_IMPORT_UNPROCESS);
udiInfoImportLogEntity.setUpdateTime(new Date(System.currentTimeMillis()));
udiInfoImportLogService.insertImportLog(udiInfoImportLogEntity);
}else {
udiInfoImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_UNPROCESS);
udiInfoImportLogService.updateImportLog(udiInfoImportLogEntity);
}
basicUdiInfoImportService.importUdiInfo(genKey);
return ResultVOUtils.success("上传成功");
}
}

@ -0,0 +1,129 @@
package com.glxp.api.admin.controller.info;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.entity.info.SystemPDFModuleEntity;
import com.glxp.api.admin.entity.info.SystemPDFTemplateEntity;
import com.glxp.api.admin.req.info.SystemPDFModuleRequest;
import com.glxp.api.admin.req.info.SystemPDFModuleSaveRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.info.SystemPDFModuleResponse;
import com.glxp.api.admin.res.info.SystemPDFModuleSelectResponse;
import com.glxp.api.admin.service.info.SystemPDFModuleService;
import com.glxp.api.admin.service.info.SystemPDFTemplateService;
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.*;
import javax.annotation.Resource;
import javax.validation.Valid;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@RestController
public class SystemPDFModuleController {
@Resource
private SystemPDFModuleService systemPDFModuleService;
@Resource
private SystemPDFTemplateService systemPDFTemplateService;
@AuthRuleAnnotation("system/pdf/module/list")
@GetMapping("/system/pdf/module/list")
public BaseResponse list(@Valid SystemPDFModuleRequest systemPDFModuleRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<SystemPDFModuleEntity> systemPDFModuleEntityList = systemPDFModuleService.queryPage(systemPDFModuleRequest);
List<SystemPDFModuleResponse> systemPDFModuleResponseList = systemPDFModuleEntityList.stream().map(item -> {
SystemPDFModuleResponse systemPDFModuleResponse = new SystemPDFModuleResponse();
BeanUtils.copyProperties(item, systemPDFModuleResponse);
if (item.getTemplateId() != 0) {
SystemPDFTemplateEntity systemPDFTemplateEntity =
systemPDFTemplateService.selectById(String.valueOf(item.getTemplateId()));
if (systemPDFTemplateEntity != null) {
systemPDFModuleResponse.setTemplateName(systemPDFTemplateEntity.getName());
}
}
return systemPDFModuleResponse;
}).collect(Collectors.toList());
PageInfo<SystemPDFModuleEntity> pageInfo = new PageInfo<>(systemPDFModuleEntityList);
PageSimpleResponse<SystemPDFModuleResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(systemPDFModuleResponseList);
return ResultVOUtils.success(pageSimpleResponse);
}
@AuthRuleAnnotation("system/pdf/module/list")
@GetMapping("/system/pdf/module/pdfModules")
public BaseResponse pdfModules(@RequestParam(value = "page", defaultValue = "1") Integer page,
@RequestParam(value = "limit", defaultValue = "100") Integer limit) {
List<SystemPDFModuleEntity> systemPDFModuleEntityList = systemPDFModuleService.listPDFModules(page, limit);
PageInfo<SystemPDFModuleEntity> pageInfo = new PageInfo<>(systemPDFModuleEntityList);
PageSimpleResponse<SystemPDFModuleSelectResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
List<SystemPDFModuleSelectResponse> systemPDFModuleSelectResponses = systemPDFModuleEntityList.stream().map(e -> {
SystemPDFModuleSelectResponse systemPDFModuleSelectResponse = new SystemPDFModuleSelectResponse();
BeanUtils.copyProperties(e, systemPDFModuleSelectResponse);
systemPDFModuleSelectResponse.setIdStr(String.valueOf(e.getId()));
return systemPDFModuleSelectResponse;
}).collect(Collectors.toList());
pageSimpleResponse.setList(systemPDFModuleSelectResponses);
return ResultVOUtils.success(pageSimpleResponse);
}
@AuthRuleAnnotation("system/pdf/module/save")
@PostMapping("/system/pdf/module/save")
public BaseResponse save(@RequestBody @Valid SystemPDFModuleSaveRequest systemPDFModuleSaveRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
SystemPDFModuleEntity systemPDFModuleEntity = new SystemPDFModuleEntity();
BeanUtils.copyProperties(systemPDFModuleSaveRequest, systemPDFModuleEntity);
systemPDFModuleEntity.setCreate_time(new Date());
systemPDFModuleEntity.setUpdate_time(new Date());
boolean b = systemPDFModuleService.insert(systemPDFModuleEntity);
if (!b) {
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
}
return ResultVOUtils.success();
}
@AuthRuleAnnotation("system/pdf/module/update")
@PostMapping("/system/pdf/module/update")
public BaseResponse update(@RequestBody SystemPDFModuleSaveRequest systemPDFModuleSaveRequest) {
systemPDFModuleSaveRequest.setUpdate_time(new Date());
systemPDFModuleService.updateById(systemPDFModuleSaveRequest);
return ResultVOUtils.success("修改成功");
}
@AuthRuleAnnotation("system/pdf/module/delete")
@GetMapping("/system/pdf/module/delete")
public BaseResponse deleteById(@RequestParam("id") Integer id) {
boolean b = systemPDFModuleService.deleteById(id);
if (b)
return ResultVOUtils.success("删除成功");
else {
return ResultVOUtils.error(500, "删除失败");
}
}
}

@ -0,0 +1,127 @@
package com.glxp.api.admin.controller.info;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.entity.info.SystemPDFTemplateEntity;
import com.glxp.api.admin.req.info.SystemPDFTemplateRequest;
import com.glxp.api.admin.req.info.SystemPDFTemplateSaveRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.info.SystemPDFTemplateResponse;
import com.glxp.api.admin.res.info.SystemPDFTemplateSelectResponse;
import com.glxp.api.admin.service.info.SystemPDFTemplateService;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.Valid;
import java.io.File;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@RestController
public class SystemPDFTemplateController {
@Resource
private SystemPDFTemplateService systemPDFTemplateService;
@AuthRuleAnnotation("system/pdf/template/list")
@GetMapping("/system/pdf/template/list")
public BaseResponse list(@Valid SystemPDFTemplateRequest systemPDFTemplateRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
systemPDFTemplateRequest.setType(2);
List<SystemPDFTemplateEntity> systemPDFTemplateEntityList = systemPDFTemplateService.queryPage(systemPDFTemplateRequest);
List<SystemPDFTemplateResponse> systemPDFTemplateResponseList = systemPDFTemplateEntityList.stream().map(item -> {
SystemPDFTemplateResponse systemPDFTemplateResponse = new SystemPDFTemplateResponse();
BeanUtils.copyProperties(item, systemPDFTemplateResponse);
return systemPDFTemplateResponse;
}).collect(Collectors.toList());
PageInfo<SystemPDFTemplateEntity> pageInfo = new PageInfo<>(systemPDFTemplateEntityList);
PageSimpleResponse<SystemPDFTemplateResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(systemPDFTemplateResponseList);
return ResultVOUtils.success(pageSimpleResponse);
}
@AuthRuleAnnotation("system/pdf/template/list")
@GetMapping("/system/pdf/template/pdfTemplates")
public BaseResponse pdfTemplates(@RequestParam(value = "page", defaultValue = "1") Integer page,
@RequestParam(value = "limit", defaultValue = "100") Integer limit) {
List<SystemPDFTemplateEntity> systemPDFTemplateEntityList = systemPDFTemplateService.listPDFTemplates(page, limit);
PageInfo<SystemPDFTemplateEntity> pageInfo = new PageInfo<>(systemPDFTemplateEntityList);
PageSimpleResponse<SystemPDFTemplateSelectResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
List<SystemPDFTemplateSelectResponse> systemPDFTemplateSelectResponses = systemPDFTemplateEntityList.stream().map(e -> {
SystemPDFTemplateSelectResponse systemPDFTemplateSelectResponse = new SystemPDFTemplateSelectResponse();
BeanUtils.copyProperties(e, systemPDFTemplateSelectResponse);
systemPDFTemplateSelectResponse.setIdStr(String.valueOf(e.getId()));
return systemPDFTemplateSelectResponse;
}).collect(Collectors.toList());
pageSimpleResponse.setList(systemPDFTemplateSelectResponses);
return ResultVOUtils.success(pageSimpleResponse);
}
@AuthRuleAnnotation("system/pdf/template/save")
@PostMapping("/system/pdf/template/save")
public BaseResponse save(@RequestBody @Valid SystemPDFTemplateSaveRequest systemPDFTemplateSaveRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
SystemPDFTemplateEntity systemPDFTemplateEntity = new SystemPDFTemplateEntity();
BeanUtils.copyProperties(systemPDFTemplateSaveRequest, systemPDFTemplateEntity);
systemPDFTemplateEntity.setCreate_time(new Date());
systemPDFTemplateEntity.setUpdate_time(new Date());
boolean b = systemPDFTemplateService.insert(systemPDFTemplateEntity);
if (!b) {
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
}
return ResultVOUtils.success();
}
@AuthRuleAnnotation("system/pdf/template/update")
@PostMapping("/system/pdf/template/update")
public BaseResponse update(@RequestBody SystemPDFTemplateSaveRequest systemPDFTemplateSaveRequest) {
// systemPDFTemplateSaveRequest.setId(1);
systemPDFTemplateSaveRequest.setUpdate_time(new Date());
systemPDFTemplateService.updateById(systemPDFTemplateSaveRequest);
return ResultVOUtils.success("修改成功");
}
@AuthRuleAnnotation("system/pdf/template/delete")
@GetMapping("/system/pdf/template/delete")
public BaseResponse deleteById(@RequestParam("id") Integer id,
@RequestParam("path") String path) {
if (StringUtils.isNotBlank(path)) {//删除文件
File file = new File(path);
file.delete();
}
boolean b = systemPDFTemplateService.deleteById(id);
if (b)
return ResultVOUtils.success("删除成功");
else {
return ResultVOUtils.error(500, "删除失败");
}
}
}

@ -1,13 +1,16 @@
package com.glxp.api.admin.controller.inout;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.entity.basic.BussinessTypeEntity;
import com.glxp.api.admin.entity.inout.WarehouseEntity;
import com.glxp.api.admin.req.inout.*;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.inout.WarehouseResponse;
import com.glxp.api.admin.service.basic.BussinessTypeService;
import com.glxp.api.admin.service.inout.CodesTempService;
import com.glxp.api.admin.service.inout.CodesService;
import com.glxp.api.admin.thread.IoTransInoutService;
import com.glxp.api.admin.util.DateUtil;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
@ -16,6 +19,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;
@ -27,7 +32,8 @@ public class WareHouseController {
private IoTransInoutService transInoutService;
@Resource
private CodesTempService codesTempService;
@Resource
private BussinessTypeService bussinessTypeService;
@PostMapping("/warehouse/inout/code/deleteCodes")
public BaseResponse deleteCodes(@RequestBody DeleteCodeRequest deleteCodeRequest, BindingResult bindingResult) {
@ -124,6 +130,42 @@ public class WareHouseController {
return ResultVOUtils.success("导入成功");
}
//扫码精灵扫码上传
@PostMapping("warehouse/inout/scanPost")
public BaseResponse postOrders(@RequestBody ScPostOrderRequest postOrderRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
try {
PostOrderRequest.PostOrder postOrder = new PostOrderRequest.PostOrder();
postOrder.setOrderId(postOrderRequest.getOrderId());
postOrder.setBillType(postOrderRequest.getBillType());
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(postOrderRequest.getBillType());
List<WarehouseEntity> warehouseEntityList = postOrderRequest.getCodes();
String date = DateUtil.formatDateTime(new Date());
for (WarehouseEntity warehouseEntity : warehouseEntityList) {
warehouseEntity.setActDate(date);
warehouseEntity.setMainAction(bussinessTypeEntity.getMainAction());
warehouseEntity.setAction(postOrderRequest.getBillType());
warehouseEntity.setCorpOrderId(postOrderRequest.getOrderId());
warehouseEntity.setFromCorp(postOrderRequest.getFromCorp());
warehouseEntity.setFromCorpId(postOrderRequest.getFromCorpId());
}
postOrder.setCodes(warehouseEntityList);
PostOrderRequest commit = new PostOrderRequest();
List<PostOrderRequest.PostOrder> postOrders = new ArrayList<>();
postOrders.add(postOrder);
commit.setPostOrder(postOrders);
transInoutService.creatOrder(commit);
} catch (Exception e) {
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
}
return ResultVOUtils.success("导入成功");
}
@PostMapping("/warehouse/inout/commit")
public BaseResponse commitOrder(@RequestBody CommitRequest commitRequest,
BindingResult bindingResult) {

@ -199,7 +199,7 @@ public class InvPrintController {
return ResultVOUtils.success("后台已开始自动更新,请稍后刷新查看");
}
// 根据存货编码生成内部码
// 根据第三方产品ID生成内部码
@GetMapping("/udiwarehouse/stockPrint/importBycode")
public BaseResponse importBycode(FilterStockprintRequest stockprintRequest) {
if (stockprintRequest.getThirdId() == null || stockprintRequest.getThirdId().equals("")) {
@ -216,6 +216,7 @@ public class InvPrintController {
return ResultVOUtils.success("后台已开始自动更新,请稍后刷新查看");
}
//根据产品信息生成内部码
@PostMapping("udiwms/stockprint/postByUdiInfo")
public BaseResponse postByUdiInfo(@RequestBody PostStockPrintRequest postStockPrintRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
@ -235,6 +236,7 @@ public class InvPrintController {
return ResultVOUtils.success("后台已开始自动更新,请稍后刷新查看!");
}
//根据库存产品信息生成内部码
@PostMapping("udiwms/stockprint/postByInvInfo")
public BaseResponse postByInvInfo(@RequestBody PostStockPrintRequest postStockPrintRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
@ -254,6 +256,7 @@ public class InvPrintController {
return ResultVOUtils.success("后台已开始自动更新,请稍后刷新查看!");
}
//根据库存产品信息一键生成内部码
@GetMapping("udiwms/stockprint/postAllByInvInfo")
public BaseResponse postAllByInvInfo(FilterStockprintRequest filterStockprintRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
@ -273,7 +276,7 @@ public class InvPrintController {
return ResultVOUtils.success("后台已开始自动更新,请稍后刷新查看!");
}
//其他系统上传参数生成内部码
@PostMapping("udiwms/stockprint/post")
public BaseResponse postInCode(@RequestBody PostStockPrintRequest postStockPrintRequest, BindingResult bindingResult) {

@ -0,0 +1,258 @@
package com.glxp.api.admin.controller.itextpdf;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.glxp.api.admin.entity.basic.BussinessTypeEntity;
import com.glxp.api.admin.entity.info.SystemPDFModuleEntity;
import com.glxp.api.admin.entity.info.SystemPDFTemplateEntity;
import com.glxp.api.admin.entity.info.SystemPDFTemplateRelevanceEntity;
import com.glxp.api.admin.entity.inout.ErpOrderEntity;
import com.glxp.api.admin.entity.inout.FilterErpOrderRequest;
import com.glxp.api.admin.entity.inout.OrderEntity;
import com.glxp.api.admin.req.info.SystemPDFTemplateRequest;
import com.glxp.api.admin.req.itextpdf.InoutOrderDetailPDFCodeRequest;
import com.glxp.api.admin.req.itextpdf.InoutOrderDetailPDFFileRequest;
import com.glxp.api.admin.req.itextpdf.InspectionPDFTemplateRequest;
import com.glxp.api.admin.service.basic.BussinessTypeService;
import com.glxp.api.admin.service.info.SystemPDFModuleService;
import com.glxp.api.admin.service.info.SystemPDFTemplateRelevanceService;
import com.glxp.api.admin.service.info.SystemPDFTemplateService;
import com.glxp.api.admin.service.inout.OrderDetailService;
import com.glxp.api.admin.service.inout.OrderService;
import com.glxp.api.admin.util.ITextPDFUtils;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
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.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@RestController
public class PDFDawnloadController {
@Resource
private OrderService orderService;
@Resource
private BussinessTypeService bussinessTypeService;
@Resource
private OrderDetailService orderDetailService;
@Resource
private SystemPDFTemplateRelevanceService systemPDFTemplateRelevanceService;
@Resource
private SystemPDFTemplateService systemPDFTemplateService;
@Resource
private SystemPDFModuleService systemPDFModuleService;
/**
* pdf
*
* @throws Exception
*/
@GetMapping("/udiwms/pdf/download/test")
public void downloadTestPDF(HttpServletRequest request, HttpServletResponse response) throws Exception {
// ITextPDFUtils.exportPDFTest(request, response);
//-----------------------------------------------------------
SystemPDFModuleEntity systemPDFModuleEntity = systemPDFModuleService.selectById(1 + "");
if (systemPDFModuleEntity != null) {
SystemPDFTemplateEntity systemPDFTemplateEntity =
systemPDFTemplateService.selectById(String.valueOf(systemPDFModuleEntity.getTemplateId()));
if (systemPDFTemplateEntity != null) {
ITextPDFUtils.exportPDFFromTemplateFileTest(systemPDFTemplateEntity.getPath(), request, response);
}
}
//-----------------------------------------------------------
}
/**
*
*/
@PostMapping("/udiwms/pdf/download/inout/order/success")
public void downloadInoutOrderSuccessPDF(@RequestBody InoutOrderDetailPDFCodeRequest inoutOrderDetailPDFCodeRequest, HttpServletRequest request, HttpServletResponse response) throws Exception {
OrderEntity orderEntity = orderService.findById(inoutOrderDetailPDFCodeRequest.getOrderId());
if (orderEntity == null) {
return;
}
inoutOrderDetailPDFCodeRequest.setFromCorp(orderEntity.getFromCorp());
inoutOrderDetailPDFCodeRequest.setFromType(orderEntity.getFromType());
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderEntity.getAction());
inoutOrderDetailPDFCodeRequest.setActionName(bussinessTypeEntity == null ? " " : bussinessTypeEntity.getName());
FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest();
filterErpOrderRequest.setOrderIdFk(inoutOrderDetailPDFCodeRequest.getOrderId());
List<ErpOrderEntity> erpOrderEntityList = orderDetailService.filterAllMyErpOrder(filterErpOrderRequest);
ITextPDFUtils.exportInoutOrderSuccessPDF(inoutOrderDetailPDFCodeRequest, erpOrderEntityList, request, response);
}
/**
*
*/
@PostMapping("/udiwms/template/pdf/order/detail/code")
public void orderDetailPDFFromTemplateCode(
@RequestBody InoutOrderDetailPDFCodeRequest inoutOrderDetailPDFCodeRequest,
HttpServletRequest request, HttpServletResponse response) throws Exception {
OrderEntity orderEntity = orderService.findById(inoutOrderDetailPDFCodeRequest.getOrderId());
if (orderEntity == null) {
return;
}
// Map<String, Object> rMap = inspectionCustomerPDFTemplate(inoutOrderSuccessPDFRequest.getCustomerId());
// if (Integer.parseInt(String.valueOf(rMap.get("code"))) != 0) {
// return;
// }
// String settingDataJsonString = String.valueOf(rMap.get("data"));
SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById("1");
if (systemPDFTemplateEntity == null) return;
String settingDataJsonString = systemPDFTemplateEntity.getParam();
JSONObject settingDataJson = JSONObject.parseObject(settingDataJsonString);
InoutOrderDetailPDFCodeRequest.SettingData settingData =//JSON转实体类
JSON.toJavaObject(settingDataJson, InoutOrderDetailPDFCodeRequest.SettingData.class);
inoutOrderDetailPDFCodeRequest.setSettingData(settingData);
//-----------------------------------------------
inoutOrderDetailPDFCodeRequest.setFromCorp(orderEntity.getFromCorp());
inoutOrderDetailPDFCodeRequest.setFromType(orderEntity.getFromType());
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderEntity.getAction());
inoutOrderDetailPDFCodeRequest.setActionName(bussinessTypeEntity == null ? " " : bussinessTypeEntity.getName());
FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest();
filterErpOrderRequest.setOrderId(inoutOrderDetailPDFCodeRequest.getOrderId());
List<ErpOrderEntity> erpOrderEntityList = orderDetailService.filterAllMyErpOrder(filterErpOrderRequest);
ITextPDFUtils.exportInoutOrderSuccessPDF(inoutOrderDetailPDFCodeRequest, erpOrderEntityList, request, response);
}
/**
*
*/
@PostMapping("/udiwms/pdf/template/order/detail/file")
public void orderDetailPDFFromTemplateFile(
@RequestBody InoutOrderDetailPDFFileRequest inoutOrderDetailPDFFileRequest,
HttpServletRequest request, HttpServletResponse response) throws Exception {
OrderEntity orderEntity = orderService.findById(inoutOrderDetailPDFFileRequest.getOrderId());
if (orderEntity == null) {
return;
}
SystemPDFModuleEntity systemPDFModuleEntity = systemPDFModuleService.selectById(1 + "");
if (systemPDFModuleEntity == null) return;
SystemPDFTemplateEntity systemPDFTemplateEntity =
systemPDFTemplateService.selectById(String.valueOf(systemPDFModuleEntity.getTemplateId()));
if (systemPDFTemplateEntity == null) return;
inoutOrderDetailPDFFileRequest.setPath(systemPDFTemplateEntity.getPath());
inoutOrderDetailPDFFileRequest.setRowCount(systemPDFTemplateEntity.getRowCount());
inoutOrderDetailPDFFileRequest.setQrcodeCount(systemPDFTemplateEntity.getQrcodeCount());
//-----------------------------------------------
inoutOrderDetailPDFFileRequest.setFromCorp(orderEntity.getFromCorp());
inoutOrderDetailPDFFileRequest.setFromType(orderEntity.getFromType());
inoutOrderDetailPDFFileRequest.setActDate(orderEntity.getActDate());
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderEntity.getAction());
inoutOrderDetailPDFFileRequest.setActionName(bussinessTypeEntity == null ? " " : bussinessTypeEntity.getName());
FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest();
filterErpOrderRequest.setOrderId(inoutOrderDetailPDFFileRequest.getOrderId());
List<ErpOrderEntity> erpOrderEntityList = orderDetailService.filterAllMyErpOrder(filterErpOrderRequest);
ITextPDFUtils.exportOrderDetailPDFFromTemplateFile(
inoutOrderDetailPDFFileRequest, erpOrderEntityList, request, response);
}
@PostMapping("/udiwms/pdf/template/preview")
public BaseResponse previewPDFTemplate(
@RequestBody InspectionPDFTemplateRequest inspectionPDFTemplateRequest) throws Exception {
return ResultVOUtils.success();
}
/**
* code
*/
@PostMapping("/udiwms/pdf/template/inspection/order/detail/code")
public BaseResponse inspectionOrderDetailPDFFromTemplateCode(
@RequestBody InspectionPDFTemplateRequest inspectionPDFTemplateRequest) throws Exception {
OrderEntity orderEntity = orderService.findById(inspectionPDFTemplateRequest.getOrderId());
if (orderEntity == null) {
return ResultVOUtils.error(ResultEnum.DATA_NOT, "未找到订单");
}
SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById("1");
if (systemPDFTemplateEntity == null) return ResultVOUtils.error(ResultEnum.DATA_NOT, "模板错误");
// Map<String, Object> rMap = inspectionCustomerPDFTemplate(inspectionPDFTemplateRequest.getCustomerId());
// if (Integer.parseInt(String.valueOf(rMap.get("code"))) != 0) {
// return ResultVOUtils.error(ResultEnum.DATA_NOT, String.valueOf(rMap.get("message")));
// }
return ResultVOUtils.success();
}
/**
* file
*/
@PostMapping("/udiwms/pdf/template/inspection/order/detail/file")
public BaseResponse inspectionOrderDetailPDFFromTemplateFile(
@RequestBody InspectionPDFTemplateRequest inspectionPDFTemplateRequest) throws Exception {
OrderEntity orderEntity = orderService.findById(inspectionPDFTemplateRequest.getOrderId());
if (orderEntity == null) {
return ResultVOUtils.error(ResultEnum.DATA_NOT, "未找到订单");
}
SystemPDFModuleEntity systemPDFModuleEntity = systemPDFModuleService.selectById(1 + "");
if (systemPDFModuleEntity == null) return ResultVOUtils.error(ResultEnum.DATA_NOT, "所属模块错误");
SystemPDFTemplateEntity systemPDFTemplateEntity =
systemPDFTemplateService.selectById(String.valueOf(systemPDFModuleEntity.getTemplateId()));
if (systemPDFTemplateEntity == null) return ResultVOUtils.error(ResultEnum.DATA_NOT, "模板错误");
return ResultVOUtils.success();
}
/**
*
*/
public Map<String, Object> inspectionCustomerPDFTemplate(Long customerId) {
Map<String, Object> rMap = new HashMap<>();
rMap.put("code", -1);
List<SystemPDFTemplateRelevanceEntity> systemPDFTemplateRelevanceEntityList =
systemPDFTemplateRelevanceService.listByCustomerId(customerId);
if (systemPDFTemplateRelevanceEntityList.size() < 1) {
rMap.put("message", "未设置模板");
return rMap;
}
SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity = systemPDFTemplateRelevanceEntityList.get(0);
SystemPDFTemplateRequest systemPDFTemplateRequest = new SystemPDFTemplateRequest();
systemPDFTemplateRequest.setId(systemPDFTemplateRelevanceEntity.getTemplate_id());
SystemPDFTemplateEntity systemPDFTemplateEntity =
systemPDFTemplateService.findSystemPDFTemplate(systemPDFTemplateRequest);
if (systemPDFTemplateEntity == null) {
rMap.put("message", "模板错误");
return rMap;
}
rMap.put("code", 0);
rMap.put("message", "成功");
rMap.put("data", systemPDFTemplateEntity.getParam());
return rMap;
}
}

@ -0,0 +1,4 @@
package com.glxp.api.admin.controller.scdemon;
public class ScdemonController {
}

@ -5,6 +5,8 @@ import com.alibaba.fastjson.TypeReference;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.constant.BasicProcessStatus;
import com.glxp.api.admin.entity.info.SystemParamConfigEntity;
import com.glxp.api.admin.entity.inout.ErpOrderEntity;
import com.glxp.api.admin.entity.inout.FilterErpOrderRequest;
import com.glxp.api.admin.entity.thrsys.ThrOrderDetailEntity;
import com.glxp.api.admin.entity.thrsys.ThrOrderEntity;
import com.glxp.api.admin.entity.thrsys.ThrOrderImportDetailEntity;
@ -14,6 +16,7 @@ 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.inout.OrderDetailService;
import com.glxp.api.admin.service.thrsys.ThrOrderDetailService;
import com.glxp.api.admin.service.thrsys.ThrOrderImportDetailService;
import com.glxp.api.admin.service.thrsys.ThrOrderImportLogService;
@ -56,6 +59,9 @@ public class ThrOrderController {
@Resource
ThrOrderImportService thrOrderImportService;
@Resource
private OrderDetailService myErpOrderService;
@GetMapping("/udiwms/thrsys/getOrders")
public BaseResponse getOrders(FilterThrOrderRequest filterThrOrderRequest,
BindingResult bindingResult) {
@ -154,11 +160,26 @@ public class ThrOrderController {
}
String id = deleteRequest.getId();
ThrOrderEntity thrOrderEntity = thrOrderService.findById(id);
boolean b = thrOrderService.deleteById(id);
thrOrderDetailService.deleteByOrderIdFk(thrOrderEntity.getId() + "");
if (b)
return ResultVOUtils.success("删除成功");
else return ResultVOUtils.error(500, "无法删除!");
String msg = selectDelect(thrOrderEntity);
if (msg == null) {
boolean b = thrOrderService.deleteById(id);
thrOrderDetailService.deleteByOrderIdFk(thrOrderEntity.getId() + "");
if (b)
return ResultVOUtils.success("删除成功");
else return ResultVOUtils.error(500, "无法删除!");
} else return ResultVOUtils.error(500, msg);
}
public String selectDelect(ThrOrderEntity thrOrderEntity) {
FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest();
filterErpOrderRequest.setErpOrderId(thrOrderEntity.getBillNo());
List<ErpOrderEntity> erpOrderEntities = myErpOrderService.filterAllMyErpOrder(filterErpOrderRequest);
if (erpOrderEntities != null && erpOrderEntities.size() > 0) {
return "单据" + thrOrderEntity.getBillNo() + "已于出入库单据关联,无法删除";
} else {
return null;
}
}
@RequestMapping("/udiwms/thrsys/order/delAll")

@ -154,11 +154,20 @@ public class ThrOrderImportLogController {
continue;
}
// 滤过第一行标题
for (int k = sheet.getFirstRowNum(); k <= sheet.getLastRowNum(); k++) {
row = sheet.getRow(0);
if ((row.getCell(0) == null || row.getCell(1) == null || row.getCell(2) == null
|| row.getCell(3) == null || row.getCell(4) == null || row.getCell(5) == null|| row.getCell(6) == null) ||
(!"单据号".equals(row.getCell(0).getStringCellValue())
|| !"单据日期".equals(row.getCell(1).getStringCellValue())
|| !"往来单位ID".equals(row.getCell(2).getStringCellValue())
|| !"往来单位名称".equals(row.getCell(3).getStringCellValue())
|| !"单据类型".equals(row.getCell(4).getStringCellValue())
|| !"单据状态".equals(row.getCell(5).getStringCellValue())
|| !"产品ID".equals(row.getCell(6).getStringCellValue()))) {
return ResultVOUtils.error(500, "文件格式错误!");
}
for (int k = sheet.getFirstRowNum()+1; 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) {
@ -189,9 +198,9 @@ public class ThrOrderImportLogController {
cell5.setCellType(CellType.STRING);
String billType = cell5.getStringCellValue();
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByName(billType);
if(bussinessTypeEntity!=null){
if (bussinessTypeEntity != null) {
corpImportDetailEntity.setBillType(bussinessTypeEntity.getAction());
}else
} else
corpImportDetailEntity.setBillType(billType);
@ -217,20 +226,43 @@ public class ThrOrderImportLogController {
Cell cell9 = row.getCell(8);
if (cell9 != null) {
cell9.setCellType(CellType.STRING);
corpImportDetailEntity.setProductDate(cell9.getStringCellValue());
corpImportDetailEntity.setSpec(cell9.getStringCellValue());
}
Cell cell10 = row.getCell(9);
if (cell10 != null) {
cell10.setCellType(CellType.STRING);
corpImportDetailEntity.setExpireDate(cell10.getStringCellValue());
corpImportDetailEntity.setBatchNo(cell10.getStringCellValue());
}
Cell cell11 = row.getCell(10);
corpImportDetailEntity.setCount((int) cell11.getNumericCellValue());
if (cell11 != null) {
cell11.setCellType(CellType.STRING);
corpImportDetailEntity.setProductDate(cell11.getStringCellValue());
}
Cell cell12 = row.getCell(11);
corpImportDetailEntity.setReCount((int) cell12.getNumericCellValue());
if (cell12 != null) {
cell12.setCellType(CellType.STRING);
corpImportDetailEntity.setExpireDate(cell12.getStringCellValue());
}
Cell cell13 = row.getCell(12);
if (cell13 != null) {
cell13.setCellType(CellType.STRING);
String count = cell13.getStringCellValue();
if (count != null && !"".equals(count)) {
corpImportDetailEntity.setCount(Integer.parseInt(count));
}
}
Cell cell14 = row.getCell(13);
if (cell14 != null) {
cell14.setCellType(CellType.STRING);
String count = cell14.getStringCellValue();
if (count != null && !"".equals(count)) {
corpImportDetailEntity.setReCount(Integer.parseInt(count));
}
}
corpImportDetailEntity.setThirdSysFk(thirdSys);
corpImportDetailEntity.setGenKeyFk(genKey);

@ -4,11 +4,14 @@ import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.constant.BasicProcessStatus;
import com.glxp.api.admin.entity.thrsys.ThrProductsEntity;
import com.glxp.api.admin.entity.thrsys.ThrProductsImportLogEntity;
import com.glxp.api.admin.req.basic.FilterUdiInfoRequest;
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.res.basic.UdiRelevanceResponse;
import com.glxp.api.admin.service.basic.UdiRelevanceService;
import com.glxp.api.admin.service.thrsys.ThrProductsImportLogService;
import com.glxp.api.admin.service.thrsys.ThrProductsService;
import com.glxp.api.admin.thread.ThrProductsDlService;
@ -35,6 +38,8 @@ public class ThrProductsController {
private ThrProductsDlService thrProductsDlService;
@Resource
ThrProductsImportLogService thrProductsImportLogService;
@Resource
UdiRelevanceService udiRelevanceService;
@GetMapping("/udiwms/thrsys/getThrProducts")
@ -61,11 +66,48 @@ public class ThrProductsController {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
String id = deleteRequest.getId();
thrProductsService.deleteById(id);
if (deleteRequest.getIds() != null && deleteRequest.getIds().size() > 0) {
for (String id : deleteRequest.getIds()) {
selectDetale(id);
}
} else {
String id = deleteRequest.getId();
String msg = selectDetale(id);
if (msg != null) {
return ResultVOUtils.error(500, msg);
}
}
return ResultVOUtils.success("删除成功");
}
public String selectDetale(String id) {
ThrProductsEntity thrProductsEntity = thrProductsService.selectById(id);
if (thrProductsEntity != null) {
FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
if ("thirdId".equals(thrProductsEntity.getThirdSysFk())) {
filterUdiInfoRequest.setThirdId(thrProductsEntity.getCode());
} else if ("thirdId1".equals(thrProductsEntity.getThirdSysFk())) {
filterUdiInfoRequest.setThirdId(thrProductsEntity.getCode());
} else if ("thirdId2".equals(thrProductsEntity.getThirdSysFk())) {
filterUdiInfoRequest.setThirdId(thrProductsEntity.getCode());
} else if ("thirdId3".equals(thrProductsEntity.getThirdSysFk())) {
filterUdiInfoRequest.setThirdId(thrProductsEntity.getCode());
} else if ("thirdId4".equals(thrProductsEntity.getThirdSysFk())) {
filterUdiInfoRequest.setThirdId(thrProductsEntity.getCode());
}
List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest);
if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 0) {
return "该产品已与UDI码关联无法删除";
}
}
boolean b = thrProductsService.deleteById(id);
if (b)
return null;
else return "删除失败!";
}
@RequestMapping("/udiwms/thrsys/products/delAll")
public BaseResponse delAll() {
thrProductsService.deleteAll();

@ -0,0 +1,26 @@
package com.glxp.api.admin.dao.info;
import com.glxp.api.admin.entity.info.SystemPDFModuleEntity;
import com.glxp.api.admin.req.info.SystemPDFModuleRequest;
import com.glxp.api.admin.req.info.SystemPDFModuleSaveRequest;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface SystemPDFModuleDao {
List<SystemPDFModuleEntity> queryPage(SystemPDFModuleRequest systemPDFModuleRequest);
List<SystemPDFModuleEntity> listPDFModules();
SystemPDFModuleEntity findSystemPDFModule(SystemPDFModuleRequest systemPDFModuleRequest);
SystemPDFModuleEntity selectById(String id);
boolean updateById(SystemPDFModuleSaveRequest systemPDFModuleSaveRequest);
boolean insert(SystemPDFModuleEntity systemPDFModuleEntity);
boolean deleteById(Integer id);
}

@ -0,0 +1,26 @@
package com.glxp.api.admin.dao.info;
import com.glxp.api.admin.entity.info.SystemPDFTemplateEntity;
import com.glxp.api.admin.req.info.SystemPDFTemplateRequest;
import com.glxp.api.admin.req.info.SystemPDFTemplateSaveRequest;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface SystemPDFTemplateDao {
List<SystemPDFTemplateEntity> queryPage(SystemPDFTemplateRequest systemPDFTemplateRequest);
List<SystemPDFTemplateEntity> listPDFTemplates();
SystemPDFTemplateEntity findSystemPDFTemplate(SystemPDFTemplateRequest systemPDFTemplateRequest);
SystemPDFTemplateEntity selectById(String id);
boolean updateById(SystemPDFTemplateSaveRequest systemPDFTemplateSaveRequest);
boolean insert(SystemPDFTemplateEntity systemPDFTemplateEntity);
boolean deleteById(Integer id);
}

@ -0,0 +1,49 @@
package com.glxp.api.admin.dao.info;
import com.glxp.api.admin.entity.info.SystemPDFTemplateRelevanceEntity;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface SystemPDFTemplateRelevanceDao {
/**
* customerId
* @param customerId customerId
* @return
*/
List<SystemPDFTemplateRelevanceEntity> listByCustomerId(Long customerId);
/**
* customerId
* @param customerIds customerIds
* @return
*/
List<SystemPDFTemplateRelevanceEntity> listByCustomerIdIn(List<Long> customerIds);
/**
* template_id customer_id
* @param templateId templateId
* @return
*/
List<SystemPDFTemplateRelevanceEntity> listByTemplateId(int templateId);
/**
*
* @param systemPDFTemplateRelevanceEntityList
* @return
*/
int insertSystemPDFTemplateRelevanceAll(List<SystemPDFTemplateRelevanceEntity> systemPDFTemplateRelevanceEntityList);
boolean insert(SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity);
/**
* customerId
* @param customerId
* @return
*/
boolean deleteByCustomerId(Long customerId);
}

@ -0,0 +1,18 @@
package com.glxp.api.admin.entity.info;
import lombok.Data;
import java.util.Date;
@Data
public class SystemPDFModuleEntity {
private int id;
private String name;
private String param;
private String fieldExplain;
private int templateId;
private String remark;
private Date create_time;
private Date update_time;
}

@ -0,0 +1,21 @@
package com.glxp.api.admin.entity.info;
import lombok.Data;
import java.util.Date;
@Data
public class SystemPDFTemplateEntity {
private int id;
private String name;
private int type;
private int module;
private String param;
private String path;
private int rowCount;
private int qrcodeCount;
private String remark;
private Date create_time;
private Date update_time;
}

@ -0,0 +1,15 @@
package com.glxp.api.admin.entity.info;
import lombok.Data;
/**
*
*/
@Data
public class SystemPDFTemplateRelevanceEntity {
private int id;
private int template_id;
private Long customerId;
private int admin_id;
}

@ -0,0 +1,20 @@
package com.glxp.api.admin.entity.inout;
import lombok.Data;
@Data
public class StockOrderDetailEntity {
private String id;
private String orderIdFk;
private String productId;
private String productName;
private String spec;
private String batchNo;
private String expireDate;
private String productDate;
private String count;
private String reCount;
private String sweepCount;
}

@ -0,0 +1,21 @@
package com.glxp.api.admin.entity.inout;
import lombok.Data;
@Data
public class StockOrderEntity {
private String id;
private String billNo;
private String billdate;
private String corpId;
private String corpName;
private String billType;
private String billFlag;
private String thirdSysFk;
private String status;
private String statusInfo;
private String type;
private String sourceType;
private String status2;
}

@ -0,0 +1,24 @@
package com.glxp.api.admin.entity.inout;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
@Data
public class StockQRCodeTextEntity {
private String id;
private String orderId;
private String detailId;
private String text;
private String textTag;
private String status;
private String param;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date create_time;
private Date update_time;
private String count;
private String reCount;
}

@ -0,0 +1,21 @@
package com.glxp.api.admin.req.info;
import com.glxp.api.admin.req.ListPageRequest;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
@EqualsAndHashCode(callSuper = true)
@Data
public class SystemPDFModuleRequest extends ListPageRequest {
private int id;
private String name;
private String param;
private String fieldExplain;
private int templateId;
private String remark;
private Date create_time;
private Date update_time;
}

@ -0,0 +1,18 @@
package com.glxp.api.admin.req.info;
import lombok.Data;
import java.util.Date;
@Data
public class SystemPDFModuleSaveRequest {
private int id;
private String name;
private String param;
private String fieldExplain;
private int templateId;
private String remark;
private Date create_time;
private Date update_time;
}

@ -0,0 +1,24 @@
package com.glxp.api.admin.req.info;
import com.glxp.api.admin.req.ListPageRequest;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
@EqualsAndHashCode(callSuper = true)
@Data
public class SystemPDFTemplateRequest extends ListPageRequest {
private int id;
private String name;
private int type;
private int module;
private String param;
private String path;
private int rowCount;
private int qrcodeCount;
private String remark;
private Date create_time;
private Date update_time;
}

@ -0,0 +1,21 @@
package com.glxp.api.admin.req.info;
import lombok.Data;
import java.util.Date;
@Data
public class SystemPDFTemplateSaveRequest {
private int id;
private String name;
private int type;
private int module;
private String param;
private String path;
private int rowCount;
private int qrcodeCount;
private String remark;
private Date create_time;
private Date update_time;
}

@ -5,7 +5,6 @@ import lombok.Data;
import java.util.List;
@Data
public class PostOrderRequest {
List<PostOrder> postOrders;

@ -0,0 +1,21 @@
package com.glxp.api.admin.req.inout;
import com.glxp.api.admin.entity.inout.WarehouseEntity;
import lombok.Data;
import java.util.List;
/**
*
*/
@Data
public class ScPostOrderRequest {
List<WarehouseEntity> codes;
private String billType;
private String orderId;
private String fromCorpId;
private String fromCorp;
private String actor;
}

@ -0,0 +1,161 @@
package com.glxp.api.admin.req.itextpdf;
import lombok.Data;
@Data
public class InoutOrderDetailPDFCodeRequest {
private String orderId;
private SettingData settingData;
private String actionName;
private String fromCorp;
private String fromType;
private Long customerId;
public static class SettingData {
private boolean orderIdEnable;
private int orderIdWidth;
private boolean actionEnable;
private int actionWidth;
private boolean fromCorpEnable;
private int fromCorpWidth;
private boolean fromTypeEnable;
private int fromTypeWidth;
private boolean numberEnable;
private int numberWidth;
private boolean coNameEnable;
private int coNameWidth;
private boolean packSpecEnable;
private int packSpecWidth;
private boolean batchNoEnable;
private int batchNoWidth;
private boolean countEnable;
private int countWidth;
private boolean productCompanyEnable;
private int productCompanyWidth;
private boolean authCodeEnable;
private int authCodeWidth;
public boolean getOrderIdEnable() { return orderIdEnable; }
public void setOrderIdEnable(boolean orderIdEnable) {
this.orderIdEnable = orderIdEnable;
}
public int getOrderIdWidth() {
return orderIdWidth;
}
public void setOrderIdWidth(int orderIdWidth) {
this.orderIdWidth = orderIdWidth;
}
public boolean getActionEnable() { return actionEnable; }
public void setActionEnable(boolean actionEnable) {
this.actionEnable = actionEnable;
}
public int getActionWidth() {
return actionWidth;
}
public void setActionWidth(int actionWidth) {
this.actionWidth = actionWidth;
}
public boolean getFromCorpEnable() { return fromCorpEnable; }
public void setFromCorpEnable(boolean fromCorpEnable) {
this.fromCorpEnable = fromCorpEnable;
}
public int getFromCorpWidth() {
return fromCorpWidth;
}
public void setFromCorpWidth(int fromCorpWidth) {
this.fromCorpWidth = fromCorpWidth;
}
public boolean getFromTypeEnable() { return fromTypeEnable; }
public void setFromTypeEnable(boolean fromTypeEnable) {
this.fromTypeEnable = fromTypeEnable;
}
public int getFromTypeWidth() {
return fromTypeWidth;
}
public void setFromTypeWidth(int fromTypeWidth) {
this.fromTypeWidth = fromTypeWidth;
}
public boolean getNumberEnable() { return numberEnable; }
public void setNumberEnable(boolean numberEnable) {
this.numberEnable = numberEnable;
}
public int getNumberWidth() {
return numberWidth;
}
public void setNumberWidth(int numberWidth) {
this.numberWidth = numberWidth;
}
public boolean getCoNameEnable() { return coNameEnable; }
public void setCoNameEnable(boolean coNameEnable) {
this.coNameEnable = coNameEnable;
}
public int getCoNameWidth() {
return coNameWidth;
}
public void setCoNameWidth(int coNameWidth) {
this.coNameWidth = coNameWidth;
}
public boolean getPackSpecEnable() { return packSpecEnable; }
public void setPackSpecEnable(boolean packSpecEnable) {
this.packSpecEnable = packSpecEnable;
}
public int getPackSpecWidth() {
return packSpecWidth;
}
public void setPackSpecWidth(int packSpecWidth) {
this.packSpecWidth = packSpecWidth;
}
public boolean getBatchNoEnable() { return batchNoEnable; }
public void setBatchNoEnable(boolean batchNoEnable) {
this.batchNoEnable = batchNoEnable;
}
public int getBatchNoWidth() {
return batchNoWidth;
}
public void setBatchNoWidth(int batchNoWidth) {
this.batchNoWidth = batchNoWidth;
}
public boolean getCountEnable() { return countEnable; }
public void setCountEnable(boolean countEnable) {
this.countEnable = countEnable;
}
public int getCountWidth() {
return countWidth;
}
public void setCountWidth(int countWidth) {
this.countWidth = countWidth;
}
public boolean getProductCompanyEnable() { return productCompanyEnable; }
public void setProductCompanyEnable(boolean productCompanyEnable) {
this.productCompanyEnable = productCompanyEnable;
}
public int getProductCompanyWidth() {
return productCompanyWidth;
}
public void setProductCompanyWidth(int productCompanyWidth) {
this.productCompanyWidth = productCompanyWidth;
}
public boolean getAuthCodeEnable() { return authCodeEnable; }
public void setAuthCodeEnable(boolean authCodeEnable) {
this.authCodeEnable = authCodeEnable;
}
public int getAuthCodeWidth() {
return authCodeWidth;
}
public void setAuthCodeWidth(int authCodeWidth) {
this.authCodeWidth = authCodeWidth;
}
}
}

@ -0,0 +1,18 @@
package com.glxp.api.admin.req.itextpdf;
import lombok.Data;
@Data
public class InoutOrderDetailPDFFileRequest {
private String orderId;
private String actionName;
private String fromCorp;
private String fromType;
private String actDate;
private Long customerId;
private String path;
private int rowCount;
private int qrcodeCount;
}

@ -0,0 +1,17 @@
package com.glxp.api.admin.req.itextpdf;
import lombok.Data;
@Data
public class InspectionPDFTemplateRequest {
private String queryId;
private String id;
private int type;
private int module;
private String orderId;
private Long customerId;
}

@ -0,0 +1,19 @@
package com.glxp.api.admin.req.itextpdf;
import lombok.Data;
@Data
public class StockQRCodeTextPDFTemplateRequest {
private String id;
private String orderId;
private String billNo;
private String detailId;
private String actionName;
private String text;
private String path;
private int rowCount;
private int qrcodeCount;
}

@ -4,8 +4,15 @@ import lombok.Data;
@Data
public class BasicThirdSysResponse {
public BasicThirdSysResponse() {
}
public BasicThirdSysResponse(String thirdId, String thirdName) {
this.thirdId = thirdId;
this.thirdName = thirdName;
}
private String id;
private String thirdId;
private String thirdName;

@ -0,0 +1,13 @@
package com.glxp.api.admin.res.basic;
import lombok.Data;
@Data
public class SrBtResponse {
private String mainAction;
private String action;
private String name;
private String thirdSysFk;
}

@ -0,0 +1,10 @@
package com.glxp.api.admin.res.basic;
import lombok.Data;
@Data
public class SrtBasicUnitResponse {
private String unitId;
private String unitName;
}

@ -0,0 +1,20 @@
package com.glxp.api.admin.res.info;
import lombok.Data;
import java.util.Date;
@Data
public class SystemPDFModuleResponse {
private int id;
private String name;
private String param;
private String fieldExplain;
private int templateId;
private String remark;
private Date create_time;
private Date update_time;
private String templateName;
}

@ -0,0 +1,12 @@
package com.glxp.api.admin.res.info;
import lombok.Data;
@Data
public class SystemPDFModuleSelectResponse {
private int id;
private String idStr;
private String name;
}

@ -0,0 +1,21 @@
package com.glxp.api.admin.res.info;
import lombok.Data;
import java.util.Date;
@Data
public class SystemPDFTemplateResponse {
private int id;
private String name;
private int type;
private int module;
private String param;
private String path;
private int rowCount;
private int qrcodeCount;
private String remark;
private Date create_time;
private Date update_time;
}

@ -0,0 +1,12 @@
package com.glxp.api.admin.res.info;
import lombok.Data;
@Data
public class SystemPDFTemplateSelectResponse {
private int id;
private String idStr;
private String name;
}

@ -0,0 +1,26 @@
package com.glxp.api.admin.service.info;
import com.glxp.api.admin.entity.info.SystemPDFModuleEntity;
import com.glxp.api.admin.req.info.SystemPDFModuleRequest;
import com.glxp.api.admin.req.info.SystemPDFModuleSaveRequest;
import java.util.List;
public interface SystemPDFModuleService {
List<SystemPDFModuleEntity> queryPage(SystemPDFModuleRequest systemPDFModuleRequest);
List<SystemPDFModuleEntity> listPDFModules(Integer page, Integer limit);
SystemPDFModuleEntity findSystemPDFModule(SystemPDFModuleRequest systemPDFModuleRequest);
SystemPDFModuleEntity selectById(String id);
boolean updateById(SystemPDFModuleSaveRequest systemPDFModuleSaveRequest);
boolean insert(SystemPDFModuleEntity systemPDFModuleEntity);
boolean deleteById(Integer id);
}

@ -0,0 +1,24 @@
package com.glxp.api.admin.service.info;
import com.glxp.api.admin.entity.info.SystemPDFTemplateRelevanceEntity;
import java.util.List;
public interface SystemPDFTemplateRelevanceService {
List<SystemPDFTemplateRelevanceEntity> listByCustomerId(Long customerId);
List<SystemPDFTemplateRelevanceEntity> listByCustomerIdIn(List<Long> customerIds);
List<SystemPDFTemplateRelevanceEntity> listByTemplateId(int templateId);
int insertSystemPDFTemplateRelevanceAll(List<SystemPDFTemplateRelevanceEntity> systemPDFTemplateRelevanceEntityList);
boolean insert(SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity);
int insertRolesCustomerIdAll(List<Integer> templates, Long customerId);
boolean deleteByCustomerId(Long customerId);
}

@ -0,0 +1,26 @@
package com.glxp.api.admin.service.info;
import com.glxp.api.admin.entity.info.SystemPDFTemplateEntity;
import com.glxp.api.admin.req.info.SystemPDFTemplateRequest;
import com.glxp.api.admin.req.info.SystemPDFTemplateSaveRequest;
import java.util.List;
public interface SystemPDFTemplateService {
List<SystemPDFTemplateEntity> queryPage(SystemPDFTemplateRequest systemPDFTemplateRequest);
List<SystemPDFTemplateEntity> listPDFTemplates(Integer page, Integer limit);
SystemPDFTemplateEntity findSystemPDFTemplate(SystemPDFTemplateRequest systemPDFTemplateRequest);
SystemPDFTemplateEntity selectById(String id);
boolean updateById(SystemPDFTemplateSaveRequest systemPDFTemplateSaveRequest);
boolean insert(SystemPDFTemplateEntity systemPDFTemplateEntity);
boolean deleteById(Integer id);
}

@ -0,0 +1,62 @@
package com.glxp.api.admin.service.info.impl;
import com.github.pagehelper.PageHelper;
import com.glxp.api.admin.dao.info.SystemPDFModuleDao;
import com.glxp.api.admin.entity.info.SystemPDFModuleEntity;
import com.glxp.api.admin.req.info.SystemPDFModuleRequest;
import com.glxp.api.admin.req.info.SystemPDFModuleSaveRequest;
import com.glxp.api.admin.service.info.SystemPDFModuleService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
@Service
public class SystemPDFModuleServiceImpl implements SystemPDFModuleService {
@Resource
SystemPDFModuleDao systemPDFModuleDao;
@Override
public List<SystemPDFModuleEntity> queryPage(SystemPDFModuleRequest SystemPDFModuleRequest) {
int offset = (SystemPDFModuleRequest.getPage() - 1) * SystemPDFModuleRequest.getLimit();
PageHelper.offsetPage(offset, SystemPDFModuleRequest.getLimit());
List<SystemPDFModuleEntity> list = systemPDFModuleDao.queryPage(SystemPDFModuleRequest);
return list;
}
@Override
public List<SystemPDFModuleEntity> listPDFModules(Integer page, Integer limit) {
page = page != null && page > 0 ? page : 1;
limit = limit != null && limit > 0 && limit < 100 ? limit : 100;
int offset = (page - 1) * limit;
PageHelper.offsetPage(offset, limit);
List<SystemPDFModuleEntity> list = systemPDFModuleDao.listPDFModules();
return list;
}
@Override
public SystemPDFModuleEntity findSystemPDFModule(SystemPDFModuleRequest systemPDFModuleRequest) {
return systemPDFModuleDao.findSystemPDFModule(systemPDFModuleRequest);
}
@Override
public SystemPDFModuleEntity selectById(String id) {
return systemPDFModuleDao.selectById(id);
}
@Override
public boolean updateById(SystemPDFModuleSaveRequest systemPDFModuleSaveRequest) {
return systemPDFModuleDao.updateById(systemPDFModuleSaveRequest);
}
@Override
public boolean insert(SystemPDFModuleEntity systemPDFModuleEntity) {
return systemPDFModuleDao.insert(systemPDFModuleEntity);
}
@Override
public boolean deleteById(Integer id) {
return systemPDFModuleDao.deleteById(id);
}
}

@ -0,0 +1,104 @@
package com.glxp.api.admin.service.info.impl;
import com.glxp.api.admin.dao.info.SystemPDFTemplateRelevanceDao;
import com.glxp.api.admin.entity.info.SystemPDFTemplateRelevanceEntity;
import com.glxp.api.admin.service.info.SystemPDFTemplateRelevanceService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
@Service
public class SystemPDFTemplateRelevanceServiceImpl implements SystemPDFTemplateRelevanceService {
@Resource
private SystemPDFTemplateRelevanceDao systemPDFTemplateRelevanceDao;
/**
* customerId id
* @param customerId
* @return
*/
@Override
public List<SystemPDFTemplateRelevanceEntity> listByCustomerId(Long customerId) {
return systemPDFTemplateRelevanceDao.listByCustomerId(customerId);
}
/**
* customerId
* @param customerIds
* @return
*/
@Override
public List<SystemPDFTemplateRelevanceEntity> listByCustomerIdIn(List<Long> customerIds) {
if (customerIds.isEmpty()) {
return Collections.emptyList();
}
return systemPDFTemplateRelevanceDao.listByCustomerIdIn(customerIds);
}
/**
* roleId customerId
* @param templateId
* @return
*/
@Override
public List<SystemPDFTemplateRelevanceEntity> listByTemplateId(int templateId) {
return systemPDFTemplateRelevanceDao.listByTemplateId(templateId);
}
/**
*
* @param systemPDFTemplateRelevanceEntityList
* @return
*/
@Override
public int insertSystemPDFTemplateRelevanceAll(List<SystemPDFTemplateRelevanceEntity> systemPDFTemplateRelevanceEntityList) {
if (systemPDFTemplateRelevanceEntityList == null || systemPDFTemplateRelevanceEntityList.isEmpty()) {
return 0;
}
return systemPDFTemplateRelevanceDao.insertSystemPDFTemplateRelevanceAll(systemPDFTemplateRelevanceEntityList);
}
@Override
public boolean insert(SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity) {
return systemPDFTemplateRelevanceDao.insert(systemPDFTemplateRelevanceEntity);
}
/**
* ids customerId
* @param templates
* @param customerId
* @return
*/
@Override
public int insertRolesCustomerIdAll(List<Integer> templates, Long customerId) {
List<SystemPDFTemplateRelevanceEntity> systemPDFTemplateRelevanceEntityList = templates.stream().map(aLong -> {
SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity = new SystemPDFTemplateRelevanceEntity();
systemPDFTemplateRelevanceEntity.setTemplate_id(aLong);
systemPDFTemplateRelevanceEntity.setCustomerId(customerId);
return systemPDFTemplateRelevanceEntity;
}).collect(Collectors.toList());
if (!systemPDFTemplateRelevanceEntityList.isEmpty()) {
return insertSystemPDFTemplateRelevanceAll(systemPDFTemplateRelevanceEntityList);
}
return 0;
}
/**
* customerId
* @param customerId
* @return
*/
@Override
public boolean deleteByCustomerId(Long customerId) {
return systemPDFTemplateRelevanceDao.deleteByCustomerId(customerId);
}
}

@ -0,0 +1,62 @@
package com.glxp.api.admin.service.info.impl;
import com.github.pagehelper.PageHelper;
import com.glxp.api.admin.dao.info.SystemPDFTemplateDao;
import com.glxp.api.admin.entity.info.SystemPDFTemplateEntity;
import com.glxp.api.admin.req.info.SystemPDFTemplateRequest;
import com.glxp.api.admin.req.info.SystemPDFTemplateSaveRequest;
import com.glxp.api.admin.service.info.SystemPDFTemplateService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
@Service
public class SystemPDFTemplateServiceImpl implements SystemPDFTemplateService {
@Resource
SystemPDFTemplateDao systemPDFTemplateDao;
@Override
public List<SystemPDFTemplateEntity> queryPage(SystemPDFTemplateRequest SystemPDFTemplateRequest) {
int offset = (SystemPDFTemplateRequest.getPage() - 1) * SystemPDFTemplateRequest.getLimit();
PageHelper.offsetPage(offset, SystemPDFTemplateRequest.getLimit());
List<SystemPDFTemplateEntity> list = systemPDFTemplateDao.queryPage(SystemPDFTemplateRequest);
return list;
}
@Override
public List<SystemPDFTemplateEntity> listPDFTemplates(Integer page, Integer limit) {
page = page != null && page > 0 ? page : 1;
limit = limit != null && limit > 0 && limit < 100 ? limit : 100;
int offset = (page - 1) * limit;
PageHelper.offsetPage(offset, limit);
List<SystemPDFTemplateEntity> list = systemPDFTemplateDao.listPDFTemplates();
return list;
}
@Override
public SystemPDFTemplateEntity findSystemPDFTemplate(SystemPDFTemplateRequest systemPDFTemplateRequest) {
return systemPDFTemplateDao.findSystemPDFTemplate(systemPDFTemplateRequest);
}
@Override
public SystemPDFTemplateEntity selectById(String id) {
return systemPDFTemplateDao.selectById(id);
}
@Override
public boolean updateById(SystemPDFTemplateSaveRequest systemPDFTemplateSaveRequest) {
return systemPDFTemplateDao.updateById(systemPDFTemplateSaveRequest);
}
@Override
public boolean insert(SystemPDFTemplateEntity systemPDFTemplateEntity) {
return systemPDFTemplateDao.insert(systemPDFTemplateEntity);
}
@Override
public boolean deleteById(Integer id) {
return systemPDFTemplateDao.deleteById(id);
}
}

@ -58,6 +58,6 @@ public class ThrOrderDetailServiceImpl implements ThrOrderDetailService {
@Override
public boolean deleteAll() {
return deleteAll();
return thrOrderDetailDao.deleteAll();
}
}

@ -51,7 +51,7 @@ public class BasicUpdateErpDataTask implements SchedulingConfigurer {
private void process() {
logger.info("定时更新下载ERP产品信息");
logger.info("定时更新下载第三方产品信息");
SystemParamConfigEntity isUpdate = systemParamConfigService.selectByParamKey("erp_updateErpData");
if (isUpdate != null && "1".equals(isUpdate.getParamValue())) {
SystemParamConfigEntity thirdSys = systemParamConfigService.selectByParamKey("erp_updateErpData_thirdSys");
@ -61,13 +61,19 @@ public class BasicUpdateErpDataTask implements SchedulingConfigurer {
} else
thirdSysId = "thirdId";
BasicThirdSysDetailEntity piDetailEntity = basicThirdSysDetailService.selectByKey("piQueryUrl", thirdSysId);
BasicThirdSysDetailEntity invPiDetailEntity = basicThirdSysDetailService.selectByKey("invPiUrl", thirdSysId);
if (piDetailEntity.getValue() != null && invPiDetailEntity.getValue() != null) {
updateproductService.updateProduct(piDetailEntity.getValue(), invPiDetailEntity.getValue(),thirdSysId);
if (piDetailEntity.getFromType() == 0 && !piDetailEntity.getItrCache()) {
BasicThirdSysDetailEntity invPiDetailEntity = basicThirdSysDetailService.selectByKey("invPiUrl", thirdSysId);
if (piDetailEntity.getValue() != null && invPiDetailEntity.getValue() != null) {
updateproductService.updateProduct(piDetailEntity.getValue(), invPiDetailEntity.getValue(), thirdSysId);
} else {
logger.info("接口地址未设置");
}
} else {
logger.info("接口地址未设置");
updateproductService.loadLocal(thirdSysId);
}
} else {
logger.info("暂未设置,不更新");
}

@ -2,17 +2,20 @@ package com.glxp.api.admin.thread;
import com.glxp.api.admin.entity.basic.UdiInfoEntity;
import com.glxp.api.admin.entity.basic.UdiRelevanceEntity;
import com.glxp.api.admin.entity.thrsys.ThrProductsEntity;
import com.glxp.api.admin.httpclient.ErpBasicClient;
import com.glxp.api.admin.httpclient.ErpInvClient;
import com.glxp.api.admin.req.basic.CombineRequest;
import com.glxp.api.admin.req.basic.FilterErpGoodsRequest;
import com.glxp.api.admin.req.inventory.ErpOnhandRequest;
import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.basic.ErpProductsResponse;
import com.glxp.api.admin.res.inventory.ErpInvProductResponse;
import com.glxp.api.admin.res.inventory.ErpOnHandResponse;
import com.glxp.api.admin.service.basic.UdiInfoService;
import com.glxp.api.admin.service.basic.UdiRelevanceService;
import com.glxp.api.admin.service.thrsys.ThrProductsService;
import com.glxp.api.admin.util.CustomUtil;
import com.glxp.api.admin.util.DateUtil;
import com.glxp.api.common.res.BaseResponse;
@ -33,7 +36,8 @@ public class BasicUpdateproductService {
UdiRelevanceService udiRelevanceService;
@Resource
UdiInfoService udiInfoService;
@Resource
ThrProductsService thrProductsService;
@Async
public void updateProduct(String productUrl, String onHandUrl, String thirdSysId) {
@ -76,6 +80,49 @@ public class BasicUpdateproductService {
}
}
@Async
public void loadLocal(String thirdSysId) {
FilterThrProductsRequest filterThrInvProductsRequest = new FilterThrProductsRequest();
List<ThrProductsEntity> thrProductsEntities = thrProductsService.filterThrProductsRequest(filterThrInvProductsRequest);
if (thrProductsEntities != null && thrProductsEntities.size() > 0) {
for (ThrProductsEntity thrProductsEntity : thrProductsEntities) {
UdiInfoEntity udiInfoEntity = new UdiInfoEntity();
udiInfoEntity.setNameCode(thrProductsEntity.getCode());
udiInfoEntity.setCpmctymc(thrProductsEntity.getName());
udiInfoEntity.setGgxh(thrProductsEntity.getSpec());
udiInfoEntity.setUuid(CustomUtil.getUUId());
udiInfoEntity.setYlqxzcrbarmc(thrProductsEntity.getManufactory());
udiInfoEntity.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo());
udiInfoService.insertUdiInfo(udiInfoEntity);
UdiRelevanceEntity udiRelevanceEntity1 = new UdiRelevanceEntity();
udiRelevanceEntity1.setUuid(udiInfoEntity.getUuid());
if ("thirdId".equals(thirdSysId)) {
udiRelevanceEntity1.setThirdId(thrProductsEntity.getCode());
udiRelevanceEntity1.setThirdName(thrProductsEntity.getName());
} else if ("thirdId1".equals(thirdSysId)) {
udiRelevanceEntity1.setThirdId1(thrProductsEntity.getCode());
udiRelevanceEntity1.setThirdName1(thrProductsEntity.getName());
} else if ("thirdId2".equals(thirdSysId)) {
udiRelevanceEntity1.setThirdId4(thrProductsEntity.getCode());
udiRelevanceEntity1.setThirdName4(thrProductsEntity.getName());
} else if ("thirdId3".equals(thirdSysId)) {
udiRelevanceEntity1.setThirdId3(thrProductsEntity.getCode());
udiRelevanceEntity1.setThirdName3(thrProductsEntity.getName());
} else if ("thirdId4".equals(thirdSysId)) {
udiRelevanceEntity1.setThirdId4(thrProductsEntity.getCode());
udiRelevanceEntity1.setThirdName4(thrProductsEntity.getName());
}
udiRelevanceEntity1.setThirdId(thrProductsEntity.getCode());
udiRelevanceEntity1.setThirdName(thrProductsEntity.getName());
udiRelevanceEntity1.setUpdateTime(DateUtil.getDateTime());
udiRelevanceService.insertUdiRelevance(udiRelevanceEntity1);
}
}
}
public int getInvmandoc(String invcode, int page, int limit, String productUrl, String onHandUrl, String thirdSysId) {
@ -121,6 +168,24 @@ public class BasicUpdateproductService {
udiInfoService.insertUdiInfo(udiInfoEntity);
UdiRelevanceEntity udiRelevanceEntity1 = new UdiRelevanceEntity();
udiRelevanceEntity1.setUuid(udiInfoEntity.getUuid());
if ("thirdId".equals(thirdSysId)) {
udiRelevanceEntity1.setThirdId(onhandQueryResponse.getCode());
udiRelevanceEntity1.setThirdName(onhandQueryResponse.getName());
} else if ("thirdId1".equals(thirdSysId)) {
udiRelevanceEntity1.setThirdId1(onhandQueryResponse.getCode());
udiRelevanceEntity1.setThirdName1(onhandQueryResponse.getName());
} else if ("thirdId2".equals(thirdSysId)) {
udiRelevanceEntity1.setThirdId4(onhandQueryResponse.getCode());
udiRelevanceEntity1.setThirdName4(onhandQueryResponse.getName());
} else if ("thirdId3".equals(thirdSysId)) {
udiRelevanceEntity1.setThirdId3(onhandQueryResponse.getCode());
udiRelevanceEntity1.setThirdName3(onhandQueryResponse.getName());
} else if ("thirdId4".equals(thirdSysId)) {
udiRelevanceEntity1.setThirdId4(onhandQueryResponse.getCode());
udiRelevanceEntity1.setThirdName4(onhandQueryResponse.getName());
}
udiRelevanceEntity1.setThirdId(onhandQueryResponse.getCode());
udiRelevanceEntity1.setThirdName(onhandQueryResponse.getName());
udiRelevanceEntity1.setUpdateTime(DateUtil.getDateTime());

@ -119,6 +119,8 @@ public class ThrOrdersDlService {
rows.add(erpOrderResponse.getBillFlag());
rows.add(subErpOrder.getProductId());
rows.add(subErpOrder.getProductName());
rows.add(subErpOrder.getSpec());
rows.add(subErpOrder.getBatchNo());
rows.add(subErpOrder.getProductDate());
rows.add(subErpOrder.getExpireDate());
rows.add(subErpOrder.getCount() + "");
@ -224,15 +226,16 @@ public class ThrOrdersDlService {
postThrOrderRequest.setGenKey(genKey);
postThrOrderRequest.setThirdSys(thrOrderExportRequest.getThirdSysFk());
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("smp_service_ip");
if(systemParamConfigEntity!=null){
String response = HttpClient.uCloudPost(systemParamConfigEntity.getParamValue()+"/udiwms/thrsys/postOrderDetail", postThrOrderRequest);
BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference<BaseResponse>() {});
if (systemParamConfigEntity != null) {
String response = HttpClient.uCloudPost(systemParamConfigEntity.getParamValue() + "/udiwms/thrsys/postOrderDetail", postThrOrderRequest);
BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference<BaseResponse>() {
});
if (baseResponse.getCode() == 20000) {
thrOrderExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS);
} else {
thrOrderExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL);
}
}else {
} else {
thrOrderExportLogEntity.setRemark("SMP服务IP地址未定义");
thrOrderExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL);
}

@ -0,0 +1,18 @@
package com.glxp.api.admin.util;
import com.itextpdf.text.Font;
import lombok.Data;
@Data
public class ITextPDFCellConfig {
private String key; //键
private String value; //值
private int keyWidth; //键宽度
private int valueWidth; //值宽度
private Font font; //字体,含中文的字符串必须添加,否则乱码
private int fixedHeight; //行高
private int totalColumn; //总宽度
private int cellMaxColumn; //单元格最大宽度
private int disableBorderSide; //单元格边框设置 0不隐藏7隐藏左、上、下边框13隐藏上、左、右边框15隐藏全部。
private int horizontalAlignment; //设置水平位置 0靠左1居中2靠右
}

@ -0,0 +1,211 @@
package com.glxp.api.admin.util;
import cn.hutool.core.util.StrUtil;
import com.google.zxing.BarcodeFormat;
import com.google.zxing.EncodeHintType;
import com.google.zxing.common.BitMatrix;
import com.google.zxing.qrcode.QRCodeWriter;
import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
import com.itextpdf.xmp.impl.Base64;
import lombok.experimental.UtilityClass;
import lombok.extern.slf4j.Slf4j;
import javax.imageio.ImageIO;
import javax.servlet.ServletOutputStream;
import java.awt.*;
import java.awt.geom.RoundRectangle2D;
import java.awt.image.BufferedImage;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.net.URL;
import java.util.HashMap;
/**
* <p>QRCodeUtil</p>
*
* @author lvhaosir6
* @version 1.0.0
* @date 2020/7/8
*/
@Slf4j
@UtilityClass
public class QRCodeUtil {
/**
*
*/
private static final Integer WIDTH = 140;
/**
*
*/
private static final Integer HEIGHT = 140;
/**
* LOGO
*/
private static final Integer LOGO_WIDTH = 22;
/**
* LOGO
*/
private static final Integer LOGO_HEIGHT = 22;
/**
*
*/
private static final String IMAGE_FORMAT = "png";
private static final String CHARSET = "utf-8";
/**
* data:image/png;base64
*/
private static final String BASE64_IMAGE = "data:image/png;base64,%s";
/**
* 使
*
* @param content
* @return
*/
public String getBase64QRCode(String content) {
return getBase64Image(content, WIDTH, HEIGHT, null, null, null);
}
/**
* 使logo
*
* @param content
* @param logoUrl logo
* @return
*/
public String getBase64QRCode(String content, String logoUrl) {
return getBase64Image(content, WIDTH, HEIGHT, logoUrl, LOGO_WIDTH, LOGO_HEIGHT);
}
/**
*
*
* @param content
* @param width
* @param height
* @param logoUrl logo 线
* @param logoWidth logo
* @param logoHeight logo
* @return
*/
public String getBase64QRCode(String content, Integer width, Integer height, String logoUrl, Integer logoWidth, Integer logoHeight) {
return getBase64Image(content, width, height, logoUrl, logoWidth, logoHeight);
}
private String getBase64Image(String content, Integer width, Integer height, String logoUrl, Integer logoWidth, Integer logoHeight) {
ByteArrayOutputStream os = new ByteArrayOutputStream();
BufferedImage bufferedImage = crateQRCode(content, width, height, logoUrl, logoWidth, logoHeight);
try {
ImageIO.write(bufferedImage, IMAGE_FORMAT, os);
} catch (IOException e) {
log.error("[生成二维码,错误{}]", e);
}
// 转出即可直接使用
return String.format(BASE64_IMAGE, Base64.encode(os.toByteArray()));
}
/**
*
*
* @param content
* @param width
* @param height
* @param logoUrl logo 线
* @param logoWidth logo
* @param logoHeight logo
* @return
*/
private BufferedImage crateQRCode(String content, Integer width, Integer height, String logoUrl, Integer logoWidth, Integer logoHeight) {
if (StrUtil.isNotBlank(content)) {
ServletOutputStream stream = null;
HashMap<EncodeHintType, Comparable> hints = new HashMap<>(4);
// 指定字符编码为utf-8
hints.put(EncodeHintType.CHARACTER_SET, CHARSET);
// 指定二维码的纠错等级为中级
hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.M);
// 设置图片的边距
hints.put(EncodeHintType.MARGIN, 2);
try {
QRCodeWriter writer = new QRCodeWriter();
BitMatrix bitMatrix = writer.encode(content, BarcodeFormat.QR_CODE, width, height, hints);
BufferedImage bufferedImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
for (int x = 0; x < width; x++) {
for (int y = 0; y < height; y++) {
bufferedImage.setRGB(x, y, bitMatrix.get(x, y) ? 0xFF000000 : 0xFFFFFFFF);
}
}
if (StrUtil.isNotBlank(logoUrl)) {
insertLogo(bufferedImage, width, height, logoUrl, logoWidth, logoHeight);
}
return bufferedImage;
} catch (Exception e) {
e.printStackTrace();
} finally {
if (stream != null) {
try {
stream.flush();
stream.close();
} catch (IOException e) {
e.printStackTrace();
}
}
}
}
return null;
}
/**
* logo
*
* @param source
* @param width
* @param height
* @param logoUrl logo 线
* @param logoWidth logo
* @param logoHeight logo
* @throws Exception
*/
private void insertLogo(BufferedImage source, Integer width, Integer height, String logoUrl, Integer logoWidth, Integer logoHeight) throws Exception {
// logo 源可为 File/InputStream/URL
Image src = ImageIO.read(new URL(logoUrl));
// 插入LOGO
Graphics2D graph = source.createGraphics();
int x = (width - logoWidth) / 2;
int y = (height - logoHeight) / 2;
graph.drawImage(src, x, y, logoWidth, logoHeight, null);
Shape shape = new RoundRectangle2D.Float(x, y, logoWidth, logoHeight, 6, 6);
graph.setStroke(new BasicStroke(3f));
graph.draw(shape);
graph.dispose();
}
/**
*
*
* @param content
* @param output
* @throws IOException
*/
public void getQRCode(String content, OutputStream output) throws IOException {
BufferedImage image = crateQRCode(content, WIDTH, HEIGHT, null, null, null);
ImageIO.write(image, IMAGE_FORMAT, output);
}
/**
*
*
* @param content
* @param logoUrl logo
* @param output
* @throws Exception
*/
public void getQRCode(String content, String logoUrl, OutputStream output) throws Exception {
BufferedImage image = crateQRCode(content, WIDTH, HEIGHT, logoUrl, LOGO_WIDTH, LOGO_HEIGHT);
ImageIO.write(image, IMAGE_FORMAT, output);
}
}

@ -31,10 +31,10 @@
AND name LIKE concat(#{name},'%')
</if>
<if test="action != ''and action != null">
AND action LIKE concat(#{action},'%')
AND `action` LIKE concat(#{action},'%')
</if>
<if test="mainAction != ''and mainAction != null">
AND action LIKE concat(#{mainAction},'%')
AND mainAction LIKE concat(#{mainAction},'%')
</if>
<if test="enabled != ''and enabled != null">
AND basic_third_sys.enabled =#{enabled}

@ -17,7 +17,7 @@
AND `type` = #{type}
</if>
</where>
ORDER BY updateTime DESC
</select>

@ -17,7 +17,7 @@
AND status = #{status}
</if>
</where>
ORDER BY updateTime DESC
</select>

@ -17,7 +17,7 @@
AND `type` = #{type}
</if>
</where>
ORDER BY updateTime DESC
</select>

@ -20,7 +20,7 @@
AND thirdSysFk = #{thirdSysFk}
</if>
</where>
ORDER BY updateTime DESC
</select>

@ -0,0 +1,66 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.glxp.api.admin.dao.info.SystemPDFModuleDao">
<select id="queryPage" parameterType="com.glxp.api.admin.req.info.SystemPDFModuleRequest"
resultType="com.glxp.api.admin.entity.info.SystemPDFModuleEntity">
SELECT id,name,param,fieldExplain,remark,templateId,create_time,update_time
FROM system_pdf_module
<where>
<if test="templateId != null and '' != templateId">
AND `templateId` LIKE CONCAT(#{templateId},'%')
</if>
<if test="name != null and '' != name">
AND `name` LIKE CONCAT(#{name},'%')
</if>
</where>
</select>
<select id="findSystemPDFModule" parameterType="com.glxp.api.admin.req.info.SystemPDFModuleRequest"
resultType="com.glxp.api.admin.entity.info.SystemPDFModuleEntity">
SELECT * FROM system_pdf_module WHERE id=#{id}
</select>
<select id="selectById" parameterType="java.lang.String"
resultType="com.glxp.api.admin.entity.info.SystemPDFModuleEntity">
select * FROM system_pdf_module WHERE id = #{id}
</select>
<update id="updateById" parameterType="com.glxp.api.admin.entity.info.SystemPDFModuleEntity">
UPDATE system_pdf_module
<set>
<if test="name != null">name=#{name},</if>
<if test="param != null">param=#{param},</if>
<if test="fieldExplain != null">fieldExplain=#{fieldExplain},</if>
<if test="remark != null">remark=#{remark},</if>
<if test="templateId != null">templateId=#{templateId},</if>
<if test="create_time != null">create_time=#{create_time},</if>
<if test="update_time != null">update_time=#{update_time},</if>
</set>
WHERE id=#{id}
</update>
<insert id="insert" parameterType="com.glxp.api.admin.entity.info.SystemPDFModuleEntity">
insert INTO system_pdf_module(name,param,fieldExplain,remark,templateId,create_time,update_time
) values
(
#{name},
#{param},
#{fieldExplain},
#{templateId},
#{remark},
#{create_time},
#{update_time}
)
</insert>
<select id="listPDFModules" parameterType="java.lang.Integer" resultType="com.glxp.api.admin.entity.info.SystemPDFModuleEntity">
SELECT id,name
FROM system_pdf_module
</select>
<delete id="deleteById" parameterType="java.lang.Integer">
delete from system_pdf_module where id = #{id}
</delete>
</mapper>

@ -0,0 +1,74 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.glxp.api.admin.dao.info.SystemPDFTemplateDao">
<select id="queryPage" parameterType="com.glxp.api.admin.req.info.SystemPDFTemplateRequest"
resultType="com.glxp.api.admin.entity.info.SystemPDFTemplateEntity">
SELECT id,name,type,module,param,path,rowCount,qrcodeCount,remark,create_time,update_time
FROM system_pdf_template
<where>
AND `type` = #{type}
<if test="name != null and '' != name">
AND `name` LIKE CONCAT(#{name},'%')
</if>
<if test="module != null and '' != module">
AND `module` LIKE CONCAT(#{module},'%')
</if>
</where>
</select>
<select id="findSystemPDFTemplate" parameterType="com.glxp.api.admin.req.info.SystemPDFTemplateRequest"
resultType="com.glxp.api.admin.entity.info.SystemPDFTemplateEntity">
SELECT * FROM system_pdf_template WHERE id=#{id}
</select>
<select id="selectById" parameterType="java.lang.String"
resultType="com.glxp.api.admin.entity.info.SystemPDFTemplateEntity">
select * FROM system_pdf_template WHERE id = #{id}
</select>
<update id="updateById" parameterType="com.glxp.api.admin.entity.info.SystemPDFTemplateEntity">
UPDATE system_pdf_template
<set>
<if test="name != null">name=#{name},</if>
<if test="type != null">type=#{type},</if>
<if test="module != null">module=#{module},</if>
<if test="param != null">param=#{param},</if>
<if test="path != null">path=#{path},</if>
<if test="rowCount != null">rowCount=#{rowCount},</if>
<if test="qrcodeCount != null">qrcodeCount=#{qrcodeCount},</if>
<if test="remark != null">remark=#{remark},</if>
<if test="create_time != null">create_time=#{create_time},</if>
<if test="update_time != null">update_time=#{update_time},</if>
</set>
WHERE id=#{id}
</update>
<insert id="insert" parameterType="com.glxp.api.admin.entity.info.SystemPDFTemplateEntity">
insert INTO system_pdf_template(name,
type,module,param,path,rowCount,qrcodeCount,remark,create_time,update_time
) values
(
#{name},
#{type},
#{module},
#{param},
#{path},
#{rowCount},
#{qrcodeCount},
#{remark},
#{create_time},
#{update_time}
)
</insert>
<select id="listPDFTemplates" parameterType="java.lang.Integer" resultType="com.glxp.api.admin.entity.info.SystemPDFTemplateEntity">
SELECT id,name
FROM system_pdf_template
</select>
<delete id="deleteById" parameterType="java.lang.Integer">
delete from system_pdf_template where id = #{id}
</delete>
</mapper>

@ -0,0 +1,53 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.glxp.api.admin.dao.info.SystemPDFTemplateRelevanceDao">
<select id="listByCustomerId" resultType="com.glxp.api.admin.entity.info.SystemPDFTemplateRelevanceEntity">
SELECT template_id
FROM system_pdf_template_relevance
where customerId = #{customerId}
</select>
<select id="listByCustomerIdIn" resultType="com.glxp.api.admin.entity.info.SystemPDFTemplateRelevanceEntity">
SELECT *
FROM system_pdf_template_relevance
where customerId in
<foreach collection="list" item="id" index="index" open="(" close=")" separator=",">
#{id}
</foreach>
</select>
<select id="listByTemplateId" resultType="com.glxp.api.admin.entity.info.SystemPDFTemplateRelevanceEntity">
SELECT customerId
FROM system_pdf_template_relevance
where template_id = #{templateId}
</select>
<insert id="insertSystemPDFTemplateRelevanceAll">
INSERT INTO system_pdf_template_relevance
(template_id, customerId)
VALUES
<foreach collection="list" item="item" separator=",">
<if test="item.template_id != null and item.customerId != null">
(#{item.template_id}, #{item.customerId})
</if>
</foreach>
</insert>
<insert id="insert" parameterType="com.glxp.api.admin.entity.info.SystemPDFTemplateRelevanceEntity">
INSERT INTO system_pdf_template_relevance
(template_id,customerId,admin_id)
values
(
#{template_id},
#{customerId},
#{admin_id}
)
</insert>
<delete id="deleteByCustomerId" parameterType="java.lang.Long">
delete from system_pdf_template_relevance where customerId = #{customerId}
</delete>
</mapper>

@ -17,7 +17,7 @@
AND `type` = #{type}
</if>
</where>
ORDER BY updateTime DESC
</select>

@ -17,7 +17,7 @@
AND status = #{status}
</if>
</where>
ORDER BY updateTime DESC
</select>

@ -17,7 +17,7 @@
AND `type` = #{type}
</if>
</where>
ORDER BY updateTime DESC
</select>

@ -17,7 +17,7 @@
AND status = #{status}
</if>
</where>
ORDER BY updateTime DESC
</select>

@ -17,7 +17,7 @@
AND `type` = #{type}
</if>
</where>
ORDER BY updateTime DESC
</select>

@ -17,7 +17,7 @@
AND status = #{status}
</if>
</where>
ORDER BY updateTime DESC
</select>

@ -17,7 +17,7 @@
AND `type` = #{type}
</if>
</where>
ORDER BY updateTime DESC
</select>

@ -17,7 +17,7 @@
AND status = #{status}
</if>
</where>
ORDER BY updateTime DESC
</select>

Loading…
Cancel
Save