diff --git a/src/main/java/com/glxp/api/controller/system/SysPdfModuleController.java b/src/main/java/com/glxp/api/controller/system/SysPdfModuleController.java index 7b12a4ef9..d73e9adfa 100644 --- a/src/main/java/com/glxp/api/controller/system/SysPdfModuleController.java +++ b/src/main/java/com/glxp/api/controller/system/SysPdfModuleController.java @@ -5,15 +5,19 @@ import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.system.SystemPDFModuleEntity; import com.glxp.api.entity.system.SystemPDFTemplateEntity; import com.glxp.api.entity.system.SystemPDFTemplateRelevanceEntity; +import com.glxp.api.req.basic.FilterBussinessTypeRequest; import com.glxp.api.req.system.FilterPdfModuleRequest; import com.glxp.api.req.system.SysPdfModuleSaveRequest; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.system.SystemPDFModuleResponse; import com.glxp.api.res.system.SystemPDFModuleSelectResponse; +import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; +import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.service.system.SystemPDFModuleService; import com.glxp.api.service.system.SystemPDFTemplateRelevanceService; import com.glxp.api.service.system.SystemPDFTemplateService; @@ -70,6 +74,10 @@ public class SysPdfModuleController { } + @Resource + IBasicBussinessTypeService basicBussinessTypeService; + + @AuthRuleAnnotation("system/pdf/module/detail") @GetMapping("/system/pdf/module/detail") public BaseResponse moduleDetail(@Valid FilterPdfTemplateRelevanceRequest systemPDFModuleRequest, @@ -79,25 +87,25 @@ public class SysPdfModuleController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - //todo 单据类型未迁移完, -// if (systemPDFModuleRequest.getTemplateType() != null && systemPDFModuleRequest.getTemplateType() == 2) { -// BussinessLocalTypeFilterRequest bussinessLocalTypeFilterRequest = new BussinessLocalTypeFilterRequest(); -// List bussinessLocalTypeEntities = bussinessLocalTypeService.filterJoin(bussinessLocalTypeFilterRequest); -// for (BussinessLocalTypeEntity bussinessLocalTypeEntity : bussinessLocalTypeEntities) { -// SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity = new SystemPDFTemplateRelevanceEntity(); -// systemPDFTemplateRelevanceEntity.setLocalAction(bussinessLocalTypeEntity.getLocalAction()); -// systemPDFTemplateRelevanceEntity.setModuleId(systemPDFModuleRequest.getModuleId()); -// systemPDFTemplateRelevanceService.insert(systemPDFTemplateRelevanceEntity); -// } -// -// List systemPDFTemplateRelevanceEntityList = -// systemPDFTemplateRelevanceService.filterList(systemPDFModuleRequest); -// PageInfo pageInfo = new PageInfo<>(systemPDFTemplateRelevanceEntityList); -// PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); -// pageSimpleResponse.setList(pageInfo.getList()); -// pageSimpleResponse.setTotal(pageInfo.getTotal()); -// return ResultVOUtils.success(pageSimpleResponse); -// } + if (systemPDFModuleRequest.getTemplateType() != null && systemPDFModuleRequest.getTemplateType() == 2) { + FilterBussinessTypeRequest filterBussinessTypeRequest = new FilterBussinessTypeRequest(); + filterBussinessTypeRequest.setEnable(true); + List bussinessLocalTypeEntities = basicBussinessTypeService.findList(filterBussinessTypeRequest); + for (BasicBussinessTypeEntity basicBussinessTypeEntity : bussinessLocalTypeEntities) { + SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity = new SystemPDFTemplateRelevanceEntity(); + systemPDFTemplateRelevanceEntity.setLocalAction(basicBussinessTypeEntity.getAction()); + systemPDFTemplateRelevanceEntity.setModuleId(systemPDFModuleRequest.getModuleId()); + systemPDFTemplateRelevanceService.insert(systemPDFTemplateRelevanceEntity); + } + + List systemPDFTemplateRelevanceEntityList = + systemPDFTemplateRelevanceService.filterList(systemPDFModuleRequest); + PageInfo pageInfo = new PageInfo<>(systemPDFTemplateRelevanceEntityList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setList(pageInfo.getList()); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + return ResultVOUtils.success(pageSimpleResponse); + } return ResultVOUtils.success(null); diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java index c74f3747a..91b7bbfc1 100644 --- a/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java +++ b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java @@ -129,7 +129,7 @@ public class FilterOrderRequest extends ListPageRequest { private String statusType; private Integer orderType; - + private Integer syncStatus; /** * 单据状态集合 diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index 1ba6f79bc..71ab69f22 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -443,7 +443,7 @@ public class IoOrderServiceImpl implements IoOrderService { result.add(response); } catch (Exception e) { e.printStackTrace(); - log.error(orderEntity.getBillNo() + "平衡补单出错\n" + e.getCause().toString()); + log.error(orderEntity.getBillNo() + "平衡补单出错\n" ); } }); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index c450cfd9b..973044518 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -4,9 +4,9 @@ server: spring: datasource: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - jdbc-url: jdbc:p6spy:mysql://192.168.0.66:3364/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root - password: Glxp@6066 + password: 123456 hikari: connection-timeout: 60000 maximum-pool-size: 60 diff --git a/src/main/resources/mybatis/mapper/system/SystemPDFTemplateRelevanceDao.xml b/src/main/resources/mybatis/mapper/system/SystemPDFTemplateRelevanceDao.xml index 1adba6ebe..294f26cbc 100644 --- a/src/main/resources/mybatis/mapper/system/SystemPDFTemplateRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/system/SystemPDFTemplateRelevanceDao.xml @@ -2,7 +2,6 @@ - - select basic_bustype_local.`name` localActionName,sys_pdf_template_relevance.id, - basic_bustype_local.action localAction, - templateId, - moduleId, - system_pdf_template.name - templateName,sys_pdf_template_relevance.remark1,sys_pdf_template_relevance.remark2,sys_pdf_template_relevance.remark3, - printType - from basic_bustype_local - LEFT JOIN sys_pdf_template_relevance - on basic_bustype_local.action = sys_pdf_template_relevance.localAction - LEFT JOIN system_pdf_template - on sys_pdf_template_relevance.templateId = system_pdf_template.id - inner join basic_bussiness_type - on basic_bustype_local.action = basic_bussiness_type.localAction + select basic_bussiness_type.`name` localActionName, + sys_pdf_template_relevance.id, + basic_bussiness_type.action localAction, + templateId, + moduleId, + sys_pdf_template.name templateName, + sys_pdf_template_relevance.remark1, + sys_pdf_template_relevance.remark2, + sys_pdf_template_relevance.remark3, + printType + from basic_bussiness_type + LEFT JOIN sys_pdf_template_relevance + on basic_bussiness_type.action = sys_pdf_template_relevance.localAction + LEFT JOIN sys_pdf_template + on sys_pdf_template_relevance.templateId = sys_pdf_template.id - + AND `moduleId` = #{moduleId} - + AND sys_pdf_template_relevance.`localAction` = #{localAction} - group by basic_bustype_local.action @@ -54,7 +53,7 @@ INSERT INTO sys_pdf_template_relevance - (templateId, customerId) + (templateId, customerId) VALUES @@ -65,33 +64,49 @@ insert - ignore + ignore INTO sys_pdf_template_relevance - (templateId, customerId, adminId, moduleId, localAction, remark1, remark2, remark3,printType) - values ( - #{templateId}, - #{customerId}, - #{adminId}, - #{moduleId}, - #{localAction}, - #{remark1}, - #{remark2}, - #{remark3}, - #{printType} - ) + (templateId, customerId, adminId, moduleId, localAction, remark1, remark2, remark3, printType) + values (#{templateId}, + #{customerId}, + #{adminId}, + #{moduleId}, + #{localAction}, + #{remark1}, + #{remark2}, + #{remark3}, + #{printType}) UPDATE sys_pdf_template_relevance - templateId = #{templateId}, - customerId = #{customerId}, - adminId = #{adminId}, - moduleId = #{moduleId}, - localAction=#{localAction}, - remark1=#{remark1}, - remark2=#{remark2}, - remark3=#{remark3}, - printType=#{printType}, + + templateId = #{templateId}, + + + customerId = #{customerId}, + + + adminId = #{adminId}, + + + moduleId = #{moduleId}, + + + localAction=#{localAction}, + + + remark1=#{remark1}, + + + remark2=#{remark2}, + + + remark3=#{remark3}, + + + printType=#{printType}, + WHERE id = #{id} @@ -100,5 +115,4 @@ from sys_pdf_template_relevance where id = #{id} - - \ No newline at end of file +