UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

模板单据问题修改

Browse Source
master
anthonywj 3 years ago
parent a380f67945
commit a493526502
5 changed files with 88 additions and 66 deletions
Show Stats Download Patch File Download Diff File

46
src/main/java/com/glxp/api/controller/system/SysPdfModuleController.java
Unescape Escape View File

@ -5,15 +5,19 @@ import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; 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.SystemPDFModuleEntity;
import com.glxp.api.entity.system.SystemPDFTemplateEntity; import com.glxp.api.entity.system.SystemPDFTemplateEntity;
import com.glxp.api.entity.system.SystemPDFTemplateRelevanceEntity; 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.FilterPdfModuleRequest;
import com.glxp.api.req.system.SysPdfModuleSaveRequest; import com.glxp.api.req.system.SysPdfModuleSaveRequest;
import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest;
import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.system.SystemPDFModuleResponse; import com.glxp.api.res.system.SystemPDFModuleResponse;
import com.glxp.api.res.system.SystemPDFModuleSelectResponse; 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.SystemPDFModuleService;
import com.glxp.api.service.system.SystemPDFTemplateRelevanceService; import com.glxp.api.service.system.SystemPDFTemplateRelevanceService;
import com.glxp.api.service.system.SystemPDFTemplateService; import com.glxp.api.service.system.SystemPDFTemplateService;
@ -70,6 +74,10 @@ public class SysPdfModuleController {
} }
@Resource
IBasicBussinessTypeService basicBussinessTypeService;
@AuthRuleAnnotation("system/pdf/module/detail") @AuthRuleAnnotation("system/pdf/module/detail")
@GetMapping("/system/pdf/module/detail") @GetMapping("/system/pdf/module/detail")
public BaseResponse moduleDetail(@Valid FilterPdfTemplateRelevanceRequest systemPDFModuleRequest, public BaseResponse moduleDetail(@Valid FilterPdfTemplateRelevanceRequest systemPDFModuleRequest,
@ -79,25 +87,25 @@ public class SysPdfModuleController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
} }
//todo 单据类型未迁移完， if (systemPDFModuleRequest.getTemplateType() != null && systemPDFModuleRequest.getTemplateType() == 2) {
// if (systemPDFModuleRequest.getTemplateType() != null && systemPDFModuleRequest.getTemplateType() == 2) { FilterBussinessTypeRequest filterBussinessTypeRequest = new FilterBussinessTypeRequest();
// BussinessLocalTypeFilterRequest bussinessLocalTypeFilterRequest = new BussinessLocalTypeFilterRequest(); filterBussinessTypeRequest.setEnable(true);
// List<BussinessLocalTypeEntity> bussinessLocalTypeEntities = bussinessLocalTypeService.filterJoin(bussinessLocalTypeFilterRequest); List<BasicBussinessTypeEntity> bussinessLocalTypeEntities = basicBussinessTypeService.findList(filterBussinessTypeRequest);
// for (BussinessLocalTypeEntity bussinessLocalTypeEntity : bussinessLocalTypeEntities) { for (BasicBussinessTypeEntity basicBussinessTypeEntity : bussinessLocalTypeEntities) {
// SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity = new SystemPDFTemplateRelevanceEntity(); SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity = new SystemPDFTemplateRelevanceEntity();
// systemPDFTemplateRelevanceEntity.setLocalAction(bussinessLocalTypeEntity.getLocalAction()); systemPDFTemplateRelevanceEntity.setLocalAction(basicBussinessTypeEntity.getAction());
// systemPDFTemplateRelevanceEntity.setModuleId(systemPDFModuleRequest.getModuleId()); systemPDFTemplateRelevanceEntity.setModuleId(systemPDFModuleRequest.getModuleId());
// systemPDFTemplateRelevanceService.insert(systemPDFTemplateRelevanceEntity); systemPDFTemplateRelevanceService.insert(systemPDFTemplateRelevanceEntity);
// } }
//
// List<SystemPDFTemplateRelevanceResponse> systemPDFTemplateRelevanceEntityList = List<SystemPDFTemplateRelevanceResponse> systemPDFTemplateRelevanceEntityList =
// systemPDFTemplateRelevanceService.filterList(systemPDFModuleRequest); systemPDFTemplateRelevanceService.filterList(systemPDFModuleRequest);
// PageInfo<SystemPDFTemplateRelevanceResponse> pageInfo = new PageInfo<>(systemPDFTemplateRelevanceEntityList); PageInfo<SystemPDFTemplateRelevanceResponse> pageInfo = new PageInfo<>(systemPDFTemplateRelevanceEntityList);
// PageSimpleResponse<SystemPDFTemplateRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>(); PageSimpleResponse<SystemPDFTemplateRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
// pageSimpleResponse.setList(pageInfo.getList()); pageSimpleResponse.setList(pageInfo.getList());
// pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setTotal(pageInfo.getTotal());
// return ResultVOUtils.success(pageSimpleResponse); return ResultVOUtils.success(pageSimpleResponse);
// } }
return ResultVOUtils.success(null); return ResultVOUtils.success(null);

2
src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java
Unescape Escape View File

@ -129,7 +129,7 @@ public class FilterOrderRequest extends ListPageRequest {
private String statusType; private String statusType;
private Integer orderType; private Integer orderType;
private Integer syncStatus;
/** /**
* 单据状态集合 * 单据状态集合

2
src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
Unescape Escape View File

@ -443,7 +443,7 @@ public class IoOrderServiceImpl implements IoOrderService {
result.add(response); result.add(response);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
log.error(orderEntity.getBillNo() + "平衡补单出错\n" + e.getCause().toString()); log.error(orderEntity.getBillNo() + "平衡补单出错\n" );
} }
}); });

4
src/main/resources/application-dev.yml
Unescape Escape View File

@ -4,9 +4,9 @@ server:
spring: spring:
datasource: datasource:
driver-class-name: com.p6spy.engine.spy.P6SpyDriver 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 username: root
password: Glxp@6066 password: 123456
hikari: hikari:
connection-timeout: 60000 connection-timeout: 60000
maximum-pool-size: 60 maximum-pool-size: 60

98
src/main/resources/mybatis/mapper/system/SystemPDFTemplateRelevanceDao.xml
Unescape Escape View File

@ -2,7 +2,6 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.glxp.api.dao.system.SystemPDFTemplateRelevanceDao"> <mapper namespace="com.glxp.api.dao.system.SystemPDFTemplateRelevanceDao">
<select id="listByCustomerId" resultType="com.glxp.api.entity.system.SystemPDFTemplateRelevanceEntity"> <select id="listByCustomerId" resultType="com.glxp.api.entity.system.SystemPDFTemplateRelevanceEntity">
SELECT templateId SELECT templateId
FROM sys_pdf_template_relevance FROM sys_pdf_template_relevance
@ -11,29 +10,29 @@
<select id="filterList" parameterType="com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest" <select id="filterList" parameterType="com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest"
resultType="com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse"> resultType="com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse">
select basic_bustype_local.`name` localActionName,sys_pdf_template_relevance.id, select basic_bussiness_type.`name` localActionName,
basic_bustype_local.action localAction, sys_pdf_template_relevance.id,
templateId, basic_bussiness_type.action localAction,
moduleId, templateId,
system_pdf_template.name moduleId,
templateName,sys_pdf_template_relevance.remark1,sys_pdf_template_relevance.remark2,sys_pdf_template_relevance.remark3, sys_pdf_template.name templateName,
printType sys_pdf_template_relevance.remark1,
from basic_bustype_local sys_pdf_template_relevance.remark2,
LEFT JOIN sys_pdf_template_relevance sys_pdf_template_relevance.remark3,
on basic_bustype_local.action = sys_pdf_template_relevance.localAction printType
LEFT JOIN system_pdf_template from basic_bussiness_type
on sys_pdf_template_relevance.templateId = system_pdf_template.id LEFT JOIN sys_pdf_template_relevance
inner join basic_bussiness_type on basic_bussiness_type.action = sys_pdf_template_relevance.localAction
on basic_bustype_local.action = basic_bussiness_type.localAction LEFT JOIN sys_pdf_template
on sys_pdf_template_relevance.templateId = sys_pdf_template.id
<where> <where>
<if test="moduleId != null "> <if test="moduleId != null">
AND `moduleId` = #{moduleId} AND `moduleId` = #{moduleId}
</if> </if>
<if test="localAction != null "> <if test="localAction != null">
AND sys_pdf_template_relevance.`localAction` = #{localAction} AND sys_pdf_template_relevance.`localAction` = #{localAction}
</if> </if>
</where> </where>
group by basic_bustype_local.action
</select> </select>
@ -54,7 +53,7 @@
<insert id="insertSystemPDFTemplateRelevanceAll"> <insert id="insertSystemPDFTemplateRelevanceAll">
INSERT INTO sys_pdf_template_relevance INSERT INTO sys_pdf_template_relevance
(templateId, customerId) (templateId, customerId)
VALUES VALUES
<foreach collection="list" item="item" separator=","> <foreach collection="list" item="item" separator=",">
<if test="item.templateId != null and item.customerId != null"> <if test="item.templateId != null and item.customerId != null">
@ -65,33 +64,49 @@
<insert id="insert" parameterType="com.glxp.api.entity.system.SystemPDFTemplateRelevanceEntity"> <insert id="insert" parameterType="com.glxp.api.entity.system.SystemPDFTemplateRelevanceEntity">
insert insert
ignore ignore
INTO sys_pdf_template_relevance INTO sys_pdf_template_relevance
(templateId, customerId, adminId, moduleId, localAction, remark1, remark2, remark3,printType) (templateId, customerId, adminId, moduleId, localAction, remark1, remark2, remark3, printType)
values ( values (#{templateId},
#{templateId}, #{customerId},
#{customerId}, #{adminId},
#{adminId}, #{moduleId},
#{moduleId}, #{localAction},
#{localAction}, #{remark1},
#{remark1}, #{remark2},
#{remark2}, #{remark3},
#{remark3}, #{printType})
#{printType}
)
</insert> </insert>
<update id="udpateRl" parameterType="com.glxp.api.entity.system.SystemPDFTemplateRelevanceEntity"> <update id="udpateRl" parameterType="com.glxp.api.entity.system.SystemPDFTemplateRelevanceEntity">
UPDATE sys_pdf_template_relevance UPDATE sys_pdf_template_relevance
<trim prefix="set" suffixOverrides=","> <trim prefix="set" suffixOverrides=",">
<if test="templateId != null">templateId = #{templateId},</if> <if test="templateId != null">
<if test="customerId != null">customerId = #{customerId},</if> templateId = #{templateId},
<if test="adminId != null">adminId = #{adminId},</if> </if>
<if test="moduleId != null">moduleId = #{moduleId},</if> <if test="customerId != null">
<if test="localAction != null">localAction=#{localAction},</if> customerId = #{customerId},
<if test="remark1 != null">remark1=#{remark1},</if> </if>
<if test="remark2 != null">remark2=#{remark2},</if> <if test="adminId != null">
<if test="remark3 != null">remark3=#{remark3},</if> adminId = #{adminId},
<if test="printType != null">printType=#{printType},</if> </if>
<if test="moduleId != null">
moduleId = #{moduleId},
</if>
<if test="localAction != null">
localAction=#{localAction},
</if>
<if test="remark1 != null">
remark1=#{remark1},
</if>
<if test="remark2 != null">
remark2=#{remark2},
</if>
<if test="remark3 != null">
remark3=#{remark3},
</if>
<if test="printType != null">
printType=#{printType},
</if>
</trim> </trim>
WHERE id = #{id} WHERE id = #{id}
</update> </update>
@ -100,5 +115,4 @@
from sys_pdf_template_relevance from sys_pdf_template_relevance
where id = #{id} where id = #{id}
</delete> </delete>
</mapper> </mapper>
Write Preview
Loading…
Cancel
Save