Skip to content

T
topsun-bpm
Commit c6015faa authored by 刘学辉's avatar 刘学辉
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents f5e2150c 7580677e
Hide whitespace changes
Inline Side-by-side
Showing with 224 additions and 494 deletions
huigou-xt/src/main/resources/config/spring/spring-shiro-cas.xml
View file @ c6015faa
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<bean id="sessionManager" class="com.huigou.shiro.session.ShiroSessionManager"> <bean id="sessionManager" class="com.huigou.shiro.session.ShiroSessionManager">
<property name="sessionDAO" ref="shiroSessionDAO" /> <property name="sessionDAO" ref="shiroSessionDAO" />
<!-- session 有效时间为半小时 （毫秒单位） --> <!-- session 有效时间为半小时 （毫秒单位） -->
<property name="globalSessionTimeout" value="1800000" /> <property name="globalSessionTimeout" value="18000000" />
<property name="sessionValidationInterval" value="1800000" /> <property name="sessionValidationInterval" value="1800000" />
<property name="sessionValidationSchedulerEnabled" value="false" /> <property name="sessionValidationSchedulerEnabled" value="false" />
<!-- 更改session cookie的名字 --> <!-- 更改session cookie的名字 -->
......
huigou-xt/src/main/resources/config/spring/spring-shiro.xml
View file @ c6015faa
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<bean id="shiroSessionManager" class="com.huigou.shiro.session.ShiroSessionManager"> <bean id="shiroSessionManager" class="com.huigou.shiro.session.ShiroSessionManager">
<property name="sessionDAO" ref="shiroSessionDAO" /> <property name="sessionDAO" ref="shiroSessionDAO" />
<!-- session 有效时间为半小时 （毫秒单位） --> <!-- session 有效时间为半小时 （毫秒单位） -->
<property name="globalSessionTimeout" value="1800000" /> <property name="globalSessionTimeout" value="18000000" />
<property name="sessionValidationInterval" value="1800000" /> <property name="sessionValidationInterval" value="1800000" />
<property name="sessionValidationSchedulerEnabled" value="false" /> <property name="sessionValidationSchedulerEnabled" value="false" />
<!-- 更改session cookie的名字 --> <!-- 更改session cookie的名字 -->
......
huigou-xt/src/main/webapp/template/print/commonStyleTemplate.ftl
View file @ c6015faa
...@@ -39,6 +39,9 @@ ${date?string("yyyy-MM-dd HH:mm:ss")}<#rt/> ...@@ -39,6 +39,9 @@ ${date?string("yyyy-MM-dd HH:mm:ss")}<#rt/>
.font_sm,.font_sm td{ .font_sm,.font_sm td{
font-size:12px; font-size:12px;
} }
table {
page-break-inside: avoid;
}
table.tablePrint{ table.tablePrint{
width:100%; width:100%;
table-layout:fixed; table-layout:fixed;
...@@ -88,6 +91,6 @@ ${date?string("yyyy-MM-dd HH:mm:ss")}<#rt/> ...@@ -88,6 +91,6 @@ ${date?string("yyyy-MM-dd HH:mm:ss")}<#rt/>
@page { @page {
size: 210mm 297mm; size: 210mm 297mm;
margin:5mm 3mm; margin:5mm 3mm;
} }
</style> </style>
\ No newline at end of file
topsun-xt/src/main/resources/config/spring/spring-mybatis-plus.xml deleted 100644 → 0
View file @ f5e2150c
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
<!-- SqlSessionFactory Config -->
<bean id="sqlSessionFactory" class="com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean">
<property name="dataSource" ref="dataSource"/>
<!-- <property name="configuration" ref="configuration"/>-->
<!--<property name="mapperLocations" value="classpath:/config/topsun/mapper/**/*.xml"/>-->
<property name="globalConfig" ref="globalConfig"/>
<property name="plugins">
<array>
<ref bean="mybatisPlusInterceptor"/>
</array>
</property>
</bean>
<!-- <bean id="configuration" class="com.baomidou.mybatisplus.core.MybatisConfiguration">-->
<!-- <property name="useDeprecatedExecutor" value="false"/>-->
<!-- </bean>-->
<bean id="mybatisPlusInterceptor" class="com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor">
<property name="interceptors">
<list>
<ref bean="paginationInnerInterceptor"/>
</list>
</property>
</bean>
<bean id="paginationInnerInterceptor"
class="com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor">
<constructor-arg name="dbType" value="H2"/>
<property name="optimizeJoin" value="true"/>
</bean>
<!-- <bean id="countSqlParser"-->
<!-- class="com.baomidou.mybatisplus.extension.plugins.pagination.optimize.JsqlParserCountOptimize">-->
<!-- <property name="optimizeJoin" value="true"/>-->
<!-- </bean>-->
<bean id="globalConfig" class="com.baomidou.mybatisplus.core.config.GlobalConfig">
<property name="dbConfig" ref="dbConfig"/>
</bean>
<bean id="dbConfig" class="com.baomidou.mybatisplus.core.config.GlobalConfig.DbConfig">
<property name="keyGenerators">
<list>
<bean class="com.baomidou.mybatisplus.extension.incrementer.H2KeyGenerator"/>
</list>
</property>
</bean>
<!-- MyBatis Mapper Scan Config -->
<bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
<property name="basePackage" value="com.huigou.topsun.**.mapper"/>
</bean>
</beans>
\ No newline at end of file
topsun-xt/src/main/resources/config/spring/spring-shiro-cache.xml deleted 100644 → 0
View file @ f5e2150c
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd">
<!-- redis 实现 -->
<!-- redisSessionDAO -->
<bean id="shiroSessionDAO" class="org.crazycake.shiro.RedisSessionDAO">
<property name="redisManager" ref="shiroRedisManager" />
</bean>
<!-- cacheManager -->
<bean id="shiroCacheManager" class="org.crazycake.shiro.RedisCacheManager">
<property name="redisManager" ref="shiroRedisManager" />
</bean>
<!-- shiro redisManager -->
<bean id="shiroRedisManager" class="org.crazycake.shiro.RedisManager">
<property name="host" value="${shiro.host}" />
<property name="port" value="${shiro.port}" />
<property name="expire" value="${shiro.expire}" />
</bean>
</beans>
topsun-xt/src/main/resources/config/spring/spring-shiro_bak.xml deleted 100644 → 0
View file @ f5e2150c
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd">
<!--继承继承重写DefaultWebSessionManager，解决频繁访问redis的问题 -->
<bean id="sessionManager" class="com.huigou.shiro.session.ShiroSessionManager">
<property name="sessionDAO" ref="shiroSessionDAO" />
<!-- session 有效时间为半小时 （毫秒单位） -->
<property name="globalSessionTimeout" value="1800000" />
<property name="sessionValidationInterval" value="1800000" />
<property name="sessionValidationSchedulerEnabled" value="false" />
<!-- 更改session cookie的名字 -->
<property name="sessionIdCookie.name" value="SSESSIONID"/>
<!-- session cookie 增加secure 属性-->
<property name="sessionIdCookie.secure" value="true"/>
<property name="sessionListeners">
<list>
<ref bean="shiroSessionListener"/>
</list>
</property>
</bean>
<bean id="shiroSessionListener" class="com.huigou.shiro.session.ShiroSessionListener">
<property name="sessionDAO" ref="shiroSessionDAO" />
<!-- 清除cas缓存 -->
<property name="icache" ref="casTicketCache" />
</bean>
<!-- 系统默认认证及授权域 -->
<bean id="standardRealm" class="com.huigou.shiro.realm.StandardRealm"/>
<!-- 不需要密码直接登录 -->
<bean id="simpleRealm" class="com.huigou.shiro.realm.SimpleRealm"/>
<bean id="securityManager" class="org.apache.shiro.web.mgt.DefaultWebSecurityManager">
<property name="sessionManager" ref="sessionManager" />
<property name="cacheManager" ref="shiroCacheManager" />
<property name="subjectFactory" ref="casSubjectFactory"/>
<property name="realms">
<list>
<ref bean="standardRealm" />
<ref bean="ldapRealm" />
<ref bean="casRealm" />
<ref bean="simpleRealm" />
</list>
</property>
</bean>
<bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
<property name="staticMethod" value="org.apache.shiro.SecurityUtils.setSecurityManager" />
<property name="arguments" ref="securityManager" />
</bean>
<bean id="shiroFilter" class="org.apache.shiro.spring.web.ShiroFilterFactoryBean">
<property name="securityManager" ref="securityManager" />
<property name="loginUrl" value="${shiro.loginUrl}" />
<!-- cas 单点登录添加过滤器 -->
<property name="filters">
<map>
<entry key="cas" value-ref="casFilter" />
<entry key="casLogout" value-ref="casLogoutFilter"/>
</map>
</property>
<!-- filterChainDefinitions 中添加 /Login.jsp = cas -->
<property name="filterChainDefinitions">
<value>
/login = anon
/Login.jsp = casLogout,cas
/logout = logout
/static/** = anon
/images/**= anon
/lib/** = anon
/** = casLogout
</value>
</property>
</bean>
<bean class="org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor">
<property name="securityManager" ref="securityManager" />
</bean>
<!-- ldap 配置 AD也是这样配置-->
<bean id="contextFactory" class="org.apache.shiro.realm.ldap.JndiLdapContextFactory">
<property name="url" value="${shiro.ldap.serverUrlPrefix}"/>
<property name="systemUsername" value="${shiro.ldap.systemUsername}"/>
<property name="systemPassword" value="${shiro.ldap.systemPassword}"/>
</bean>
<!-- 配置登录认证访问ldap的树域 -->
<bean id="ldapRealm" class="com.huigou.shiro.realm.LdapRealm">
<property name="userDnTemplate" value="${shiro.ldap.userDnTemplate}"/>
<property name="contextFactory" ref="contextFactory" />
</bean>
<!-- shiro cas config -->
<bean id="casSubjectFactory" class="org.apache.shiro.cas.CasSubjectFactory"/>
<!-- 替换原来的 Realm-->
<bean id="casRealm" class="com.huigou.shiro.realm.CasStandardRealm">
<!--casServerUrlPrefix 是CAS Server服务器端地址 -->
<property name="casServerUrlPrefix" value="${shiro.cas.serverUrlPrefix}" />
<!-- 客户端的回调地址设置，必须和过滤器拦截的地址一致 -->
<property name="casService" value="${shiro.cas.service}/Login.jsp" />
<property name="singleSignOutHandler" ref="singleSignOutHandler" />
</bean>
<bean id="casFilter" class="com.huigou.shiro.filter.CasFilter">
<!-- 配置验证错误时的失败页面 -->
<property name="failureUrl" value="${shiro.cas.serverUrlPrefix}/login?service=${shiro.cas.service}/Login.jsp" />
<property name="successUrl" value="/Index.jsp" />
</bean>
<!-- 记录ticket和sessionID的映射的缓存 -->
<bean id="casTicketCache" class="com.huigou.cache.service.impl.RedisCacheImpl">
<property name="redisTemplate" ref="redisTemplate"/>
<property name="name" value="casTicketCache"/>
<property name="liveTime" value="${shiro.expire}"/>
<property name="compressed" value="true"/>
</bean>
<!-- cas单点登出请求处理 -->
<bean id="casLogoutFilter" class="com.huigou.shiro.filter.CasLogoutFilter">
<property name="singleSignOutHandler" ref="singleSignOutHandler" />
</bean>
<bean id="singleSignOutHandler" class="com.huigou.shiro.filter.SingleSignOutHandler">
<property name="icache" ref="casTicketCache" />
<property name="sessionManager" ref="sessionManager" />
</bean>
</beans>
topsun-xt/src/main/resources/config/spring/spring-system-cache.xml deleted 100644 → 0
View file @ f5e2150c
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xmlns="http://www.springframework.org/schema/beans" xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd">
<!-- 使用 Redis 缓存系统数据缓存 数据字典 系统参数等-->
<bean id="sysDataCache" class="com.huigou.cache.service.impl.RedisCacheImpl">
<property name="redisTemplate" ref="redisTemplate"/>
<property name="name" value="sysDataCache"/>
</bean>
<bean id="permissionCache" class="com.huigou.cache.service.impl.RedisCacheImpl">
<property name="redisTemplate" ref="redisTemplate"/>
<property name="name" value="permissionCache"/>
<property name="liveTime" value="3600"/>
<property name="compressed" value="true"/>
</bean>
</beans>
topsun-xt/src/main/resources/数据库变更记录
View file @ c6015faa
...@@ -99,4 +99,20 @@ ADD COLUMN `follow_matter` varchar(128) NULL COMMENT '跟进事项' AFTER `date` ...@@ -99,4 +99,20 @@ ADD COLUMN `follow_matter` varchar(128) NULL COMMENT '跟进事项' AFTER `date`
--2024-10-11 ECN具体生效日期 --2024-10-11 ECN具体生效日期
ALTER TABLE `topsun_dev`.`ep_change_form` ALTER TABLE `topsun_dev`.`ep_change_form`
ADD COLUMN `effective_date` datetime NULL COMMENT '具体生效日期' AFTER `material_reason_for_change`; ADD COLUMN `effective_date` datetime NULL COMMENT '具体生效日期' AFTER `material_reason_for_change`;
\ No newline at end of file
--2024-10-12 采购订单供应商名称
ALTER TABLE `topsun_dev`.`sap_purchase_order`
ADD COLUMN `NAMEL` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '供应商名称' AFTER `total_money`;
--2024-10-11 ECN添加评论字段
ALTER TABLE `topsun_dev`.`ep_change_form_impl_item`
ADD COLUMN `comments` varchar(255) NULL COMMENT '评论' AFTER `follow_matter`;
ALTER TABLE `topsun_dev`.`ep_change_form_stock_item`
ADD COLUMN `comments` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '评论' AFTER `executor`;
--2024-10-15 EP销售订单修改/取消增加单价和总价
ALTER TABLE `topsun_dev`.`ep_sale_order_cancel_item`
ADD COLUMN `PRICE` decimal(10, 3) NULL COMMENT '单价' AFTER `PROCESS`,
ADD COLUMN `AMOUNT` decimal(10, 3) NULL COMMENT '总价' AFTER `PRICE`;
\ No newline at end of file
topsun-xt/src/main/webapp/biz/topsun/ep/change/epChangeFormDetail.js
View file @ c6015faa
...@@ -242,7 +242,10 @@ function loadGrid() { ...@@ -242,7 +242,10 @@ function loadGrid() {
editor: { editor: {
type: "dateTime" type: "dateTime"
} }
} },
{
display: "COMMENTS评论", name: "comments", width: 200, minWidth: 60, type: "string", align: "left"
},
], ],
dataAction: "server", dataAction: "server",
url: web_app.name + '/epChangeForm/slicedEpChangeFormImplItems.ajax', url: web_app.name + '/epChangeForm/slicedEpChangeFormImplItems.ajax',
...@@ -346,7 +349,10 @@ function loadStockGrid() { ...@@ -346,7 +349,10 @@ function loadStockGrid() {
editor: { editor: {
type: "dateTime" type: "dateTime"
} }
} },
{
display: "COMMENTS评论", name: "comments", width: 200, minWidth: 60, type: "string", align: "left"
},
], ],
dataAction: "server", dataAction: "server",
url: web_app.name + '/epChangeForm/slicedEpChangeFormStockItems.ajax', url: web_app.name + '/epChangeForm/slicedEpChangeFormStockItems.ajax',
......
topsun-xt/src/main/webapp/biz/topsun/ep/change/epChangeFormList.js
View file @ c6015faa
...@@ -19,6 +19,7 @@ function loadGrid() { ...@@ -19,6 +19,7 @@ function loadGrid() {
exportExcelHandler: function () { exportExcelHandler: function () {
UICtrl.gridExport(gridManager); UICtrl.gridExport(gridManager);
}, },
//updateHandler: doUpdate,
printHandler: { printHandler: {
id: 'print', text: '打印', img:'fa-clipboard', click: function(){ id: 'print', text: '打印', img:'fa-clipboard', click: function(){
printHandler(); printHandler();
...@@ -98,6 +99,18 @@ function doView(id) { ...@@ -98,6 +99,18 @@ function doView(id) {
}); });
} }
function doUpdate() {
var row = DataUtil.getUpdateRow(gridManager);
if (!row) {
return;
}
UICtrl.addTabItem({
tabid: 'epChangeForm'+row.id,
text: "修改变更申请/通知单",
url: web_app.name + '/epChangeForm/showEpChangeFormDetail.job?bizId='+row.id
});
}
function printHandler(){ function printHandler(){
var row = DataUtil.getUpdateRow(gridManager); var row = DataUtil.getUpdateRow(gridManager);
if (!row) { if (!row) {
......
topsun-xt/src/main/webapp/biz/topsun/ep/change/epMaterialChangeFormDetail.js
View file @ c6015faa
...@@ -133,7 +133,10 @@ function loadGrid() { ...@@ -133,7 +133,10 @@ function loadGrid() {
editor: { editor: {
type: "dateTime" type: "dateTime"
} }
} },
{
display: "COMMENTS评论", name: "comments", width: 200, minWidth: 60, type: "string", align: "left"
},
], ],
dataAction: "server", dataAction: "server",
url: web_app.name + '/epChangeForm/slicedEpChangeFormImplItems.ajax', url: web_app.name + '/epChangeForm/slicedEpChangeFormImplItems.ajax',
...@@ -237,7 +240,10 @@ function loadStockGrid() { ...@@ -237,7 +240,10 @@ function loadStockGrid() {
editor: { editor: {
type: "dateTime" type: "dateTime"
} }
} },
{
display: "COMMENTS评论", name: "comments", width: 200, minWidth: 60, type: "string", align: "left"
},
], ],
dataAction: "server", dataAction: "server",
url: web_app.name + '/epChangeForm/slicedEpChangeFormStockItems.ajax', url: web_app.name + '/epChangeForm/slicedEpChangeFormStockItems.ajax',
......
topsun-xt/src/main/webapp/biz/topsun/ep/epSaleOrder/epSaleOrderCancelDetail.js
View file @ c6015faa
...@@ -58,6 +58,18 @@ function loadGrid() { ...@@ -58,6 +58,18 @@ function loadGrid() {
type: "text" type: "text"
} }
}, },
{
display: "单价", name: "price", width: 140, minWidth: 60, type: "string", align: "left",
editor: {
type: "text"
}
},
{
display: "总价", name: "amount", width: 140, minWidth: 60, type: "string", align: "left",
editor: {
type: "text"
}
},
{ {
display: "生产单号", name: "produceCode", width: 140, minWidth: 60, type: "string", align: "left", display: "生产单号", name: "produceCode", width: 140, minWidth: 60, type: "string", align: "left",
editor: { editor: {
......
topsun-xt/src/main/webapp/biz/topsun/ep/epSaleOrder/epSaleOrderCancelList.js
View file @ c6015faa
...@@ -34,6 +34,12 @@ function loadGrid() { ...@@ -34,6 +34,12 @@ function loadGrid() {
{ {
display: "单位", name: "vrkme", width: 140, minWidth: 60, type: "string", align: "left", display: "单位", name: "vrkme", width: 140, minWidth: 60, type: "string", align: "left",
}, },
{
display: "单价", name: "price", width: 140, minWidth: 60, type: "string", align: "left",
},
{
display: "总价", name: "amount", width: 140, minWidth: 60, type: "string", align: "left",
},
{ {
display: "生产单号", name: "produceCode", width: 140, minWidth: 60, type: "string", align: "left", display: "生产单号", name: "produceCode", width: 140, minWidth: 60, type: "string", align: "left",
}, },
......
topsun-xt/src/main/webapp/biz/topsun/sap/purchaseOrder/sapPurchaseOrderDetail.jsp
View file @ c6015faa
...@@ -39,6 +39,8 @@ ...@@ -39,6 +39,8 @@
required="false"/> required="false"/>
<x:inputC name="totalMoney" label="订单总金额" readonly="true" labelCol="1" fieldCol="2" <x:inputC name="totalMoney" label="订单总金额" readonly="true" labelCol="1" fieldCol="2"
required="false"/> required="false"/>
<x:inputC name="namel" label="供应商" readonly="true" labelCol="1" fieldCol="2"
required="false"/>
</div> </div>
</div> </div>
<x:title title="sap回执" name="group"/> <x:title title="sap回执" name="group"/>
......
topsun-xt/src/main/webapp/biz/topsun/sap/purchaseOrder/sapPurchaseOrderList.js
View file @ c6015faa
...@@ -39,6 +39,7 @@ function loadGrid() { ...@@ -39,6 +39,7 @@ function loadGrid() {
, {display: "采购订单号码", name: "ebeln", width: 150, minWidth: 60, type: "string", align: "center"} , {display: "采购订单号码", name: "ebeln", width: 150, minWidth: 60, type: "string", align: "center"}
, {display: "采购订单类型", name: "bsart", width: 150, minWidth: 60, type: "string", align: "center"} , {display: "采购订单类型", name: "bsart", width: 150, minWidth: 60, type: "string", align: "center"}
, {display: "采购订单类型描述", name: "batxt", width: 150, minWidth: 60, type: "string", align: "center"} , {display: "采购订单类型描述", name: "batxt", width: 150, minWidth: 60, type: "string", align: "center"}
, {display: "供应商", name: "namel", width: 200, minWidth: 60, type: "string", align: "center"}
, {display: "sap回执", name: "message", width: 200, minWidth: 60, type: "string", align: "center"} , {display: "sap回执", name: "message", width: 200, minWidth: 60, type: "string", align: "center"}
, {display: "创建日期", name: "fillinDate", width: 140, minWidth: 60, type: "string", align: "center"} , {display: "创建日期", name: "fillinDate", width: 140, minWidth: 60, type: "string", align: "center"}
......
topsun-xt/src/main/webapp/template/print/topsun/brandQuotation.ftl deleted 100644 → 0
View file @ f5e2150c
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<head>
<title> 品牌报价单</title>
<#include "/print/commonStyleTemplate.ftl" />
<style type="text/css">
td {
font-size: 13px;
}
</style>
</head>
<body>
<div style="text-align: center;font-size: large;font-weight:bold;"> ${companyNameEn?default("")?html}</div>
<div style="text-align: center">${address?default("")?html}</div>
<div style="text-align: center">tel：${tel?default("")?html} fax: ${fax?default("")?html}</div>
<div style="text-align: center">email: ${email?default("")?html}</div>
<div style="text-align: center">————————————————————————————</div>
<div class="billTitle"> 报价单</div>
<table cellspacing="0px" cellpadding="0px" class="tablePrint">
<div style="text-align: left">${fillinDate?default("")?html}</div>
<div style="text-align: left">Attn: ${Attn?default("")?html} </div>
<div style="text-align: left">From: ${From?default("")?html}</div>
<div style="text-align: left">Re: ${Re?default("")?html}</div>
<div style="text-align: left">${bsn?default("")?html}</div>
</table>
<table cellspacing="0px" cellpadding="0px" class="tableBorder">
<colgroup>
<col width='10%'/>
<col width='20%'/>
<col width='15%'/>
<col width='40%'/>
<col width='6%'/>
<col width='9%'/>
</colgroup>
<tr>
<td class="center">Item#（项目）</td>
<td class="center">Product Name(品名）</td>
<td class="center">Image（图片）</td>
<td class="center">Spec（规格）</td>
<td class="center">(Exw)出厂价 Unit Price (US$/pc)</td>
<td class="center">Remark（备注）</td>
</tr>
<#if gridData?? && gridData?size gt 0>
<#list gridData as detail>
<tr>
<td class="center">${detail.sequence?default("")?html}</td>
<td class="center">${detail.productName?default("")?html}</td>
<td class="center">${detail.picture?default("")?html}</td>
<td class="center">${detail.spec?default("")?html}</td>
<td class="center">${detail.price?default("")?html}</td>
<td class="center">${detail.remark?default("")?html}</td>
</tr>
</#list>
<#else>
<tr>
<td class="center">&nbsp;</td>
<td class="center">&nbsp;</td>
<td class="center">&nbsp;</td>
<td class="center">&nbsp;</td>
<td class="center">&nbsp;</td>
<td class="center">&nbsp;</td>
</tr>
</#if>
</table>
<div class="blank_div"></div>
<div style="text-align: left;font-size: large"> Terms</div>
<div style="text-align: left">${term1?default("")?html}</div>
<div style="text-align: left">${term2?default("")?html}</div>
<div style="text-align: left">${term3?default("")?html}</div>
<div style="text-align: left">${term4?default("")?html}</div>
<div style="text-align: left">${term5?default("")?html}</div>
<div class="blank_div"></div>
<div class="fontBold">审批明细</div>
<#include "/print/taskExecutionPrint.ftl" />
</body>
</html>
topsun-xt/src/main/webapp/template/print/topsun/epChangeForm.ftl
View file @ c6015faa
...@@ -9,36 +9,38 @@ ...@@ -9,36 +9,38 @@
td { td {
font-size: 13px; font-size: 13px;
} }
@page {
size: A4;
margin: 1.2cm 1cm 0cm;
@top-center {
content: element(header);
}
}
</style> </style>
</head> </head>
<body> <body>
<!-- 页眉部分 -->
<div class="billTitle"> <div style="position: running(header);" id="header">
<span style="position: absolute;margin-left: 50px"> <div class="billTitle" style="font-size: 25px">
<img src='data:image/jpg;base64,${bsnPng}' width="100px"/> 宝绅内部变更申请/通知单</div>
</span> <table cellspacing="0px" cellpadding="0px" class="tablePrint">
宝绅内部变更申请/通知单</div> <colgroup>
<div class="billTitle">Engineering Change Notice</div> <col width="20%"/>
<table cellspacing="0px" cellpadding="0px" class="tablePrint"> <col width="52%"/>
<colgroup> <col width="28%"/>
<col width="34%"/> <col width="28%"/>
<col width="34%"/> </colgroup>
</colgroup> <tr>
<tr> <td class="left">${changeNo?default("")?html}</td>
<td class="left">${changeNo?default("")?html}</td> <td class="right">
<td class="right">变更编号：${billCode?default("")?html}</td> <div style="text-align:right;font-weight:bold;font-size: 25px">Engineering Change Notice</div>
</tr> </td>
</table> <td class="right">变更编号：${billCode?default("")?html}</td>
<div class="title" style="background: #CC8F81;text-align: center">General Information 基本信息</div> </tr>
</table>
</div>
<div class="title" style="background: #CC8F81;text-align: center;margin-top: 100px">General Information 基本信息</div>
<table cellspacing="0px" cellpadding="0px" class="tableBorder"> <table cellspacing="0px" cellpadding="0px" class="tableBorder">
<#--<colgroup>
<col width='16%' />
<col width='17%' />
<col width='17%' />
<col width='17%' />
<col width='17%' />
<col width="16%" />
</colgroup>-->
<colgroup> <colgroup>
<col width='14%' /> <col width='14%' />
<col width='33%' /> <col width='33%' />
...@@ -46,11 +48,8 @@ ...@@ -46,11 +48,8 @@
</colgroup> </colgroup>
<tr> <tr>
<td class="left">DATE日期:<br/><@formatDate date=fillinDate/></td> <td class="left">DATE日期:<br/><@formatDate date=fillinDate/></td>
<#--<td class="center"><@formatDate date=fillinDate/></td>-->
<td class="left">BRAND品牌名称:<br/>${brandName?default("")?html}</td> <td class="left">BRAND品牌名称:<br/>${brandName?default("")?html}</td>
<#--<td class="center">${brandName?default("")?html}</td>-->
<td class="left">CHANGE REQUESTED BY (DEPT/NAME)变更申请部门/姓名:<br/>${deptName?default("")?html}</td> <td class="left">CHANGE REQUESTED BY (DEPT/NAME)变更申请部门/姓名:<br/>${deptName?default("")?html}</td>
<#--<td class="center">${deptName?default("")?html}</td>-->
</tr> </tr>
</table> </table>
<table cellspacing="0px" cellpadding="0px" class="tableBorder"> <table cellspacing="0px" cellpadding="0px" class="tableBorder">
...@@ -61,19 +60,12 @@ ...@@ -61,19 +60,12 @@
<td class="left">REASON FOR CHANGE变更原因:${reasonDesc?default("")?html} <td class="left">REASON FOR CHANGE变更原因:${reasonDesc?default("")?html}
<br/> <br/>
${reasonForChange?replace("nbsp", "&nbsp;&nbsp;&nbsp;&nbsp;")!default("")?html} ${reasonForChange?replace("nbsp", "&nbsp;&nbsp;&nbsp;&nbsp;")!default("")?html}
<br/>
${reasonForChange2?replace("nbsp", "&nbsp;&nbsp;&nbsp;&nbsp;")!default("")?html}
<span style="text-decoration: underline">其他：${otherReasonDesc?default("")?html}</span> <span style="text-decoration: underline">其他：${otherReasonDesc?default("")?html}</span>
</td> </td>
</tr> </tr>
</table> </table>
<#--<table cellspacing="0px" cellpadding="0px" class="tableBorder">-->
<#-- <colgroup>-->
<#-- <col width='100%' />-->
<#-- </colgroup>-->
<#-- <tr>-->
<#-- <td class="left">${reasonForChange?default("")?html}</td>-->
<#-- <td class="left">${otherReasonDesc?default("")?html}</td>-->
<#-- </tr>-->
<#--</table>-->
<table cellspacing="0px" cellpadding="0px" class="tableBorder"> <table cellspacing="0px" cellpadding="0px" class="tableBorder">
<colgroup> <colgroup>
<col width='100%' /> <col width='100%' />
...@@ -148,13 +140,11 @@ ...@@ -148,13 +140,11 @@
</table> </table>
<div class="blank_div"></div> <div class="blank_div"></div>
<#--<div class="fontBold">审批明细</div>-->
<#--<#include "/print/taskExecutionPrint.ftl" />-->
<div class="title" style="background: #CC8F81;text-align: center">Approvals / Checks 确认</div> <div class="title" style="background: #CC8F81;text-align: center">Approvals / Checks 确认</div>
<table cellspacing="0px" cellpadding="0px" class="tableBorder"> <table cellspacing="0px" cellpadding="0px" class="tableBorder">
<colgroup> <colgroup>
<col width='22%' /> <col width='22%' />
<col width='28%' /> <col width='25%' />
<col width='50%' /> <col width='50%' />
</colgroup> </colgroup>
<tr> <tr>
...@@ -180,18 +170,12 @@ ...@@ -180,18 +170,12 @@
</table> </table>
<div class="title" style="background: #CC8F81;text-align: center">Implementation 执行人（版具/模具等）</div> <div class="title" style="background: #CC8F81;text-align: center">Implementation 执行人（版具/模具等）</div>
<table cellspacing="0px" cellpadding="0px" class="tableBorder"> <table cellspacing="0px" cellpadding="0px" class="tableBorder">
<#-- <colgroup>-->
<#-- <col width='25%' />-->
<#-- <col width='25%' />-->
<#-- <col width='25%' />-->
<#-- <col width='25%' />-->
<#-- </colgroup>-->
<colgroup> <colgroup>
<col width='14%' /> <col width='14%' />
<col width='25%' /> <col width='25%' />
<col width='10%' /> <col width='10%' />
<col width='18%' /> <col width='12%' />
<col width='33%' /> <col width='39%' />
</colgroup> </colgroup>
<tr> <tr>
<td class="center" style="background: yellow">部门</td> <td class="center" style="background: yellow">部门</td>
...@@ -208,7 +192,7 @@ ...@@ -208,7 +192,7 @@
<td class="center">${detail.followMatter?default("")?html}</td> <td class="center">${detail.followMatter?default("")?html}</td>
<td class="center">${detail.executor?default("")?html}</td> <td class="center">${detail.executor?default("")?html}</td>
<td class="center">${detail.date?default("")?html}</td> <td class="center">${detail.date?default("")?html}</td>
<td class="center">${detail.comment?default("")?html}</td> <td class="center">${detail.comments?default("")?html}</td>
</tr> </tr>
</#list> </#list>
<#else> <#else>
...@@ -223,24 +207,12 @@ ...@@ -223,24 +207,12 @@
</table> </table>
<div class="title" style="background: #CC8F81;text-align: center">Stock / Inventory 库存</div> <div class="title" style="background: #CC8F81;text-align: center">Stock / Inventory 库存</div>
<table cellspacing="0px" cellpadding="0px" class="tableBorder"> <table cellspacing="0px" cellpadding="0px" class="tableBorder">
<#-- <colgroup>-->
<#-- <col width='25%' />-->
<#-- <col width='25%' />-->
<#-- <col width='25%' />-->
<#-- <col width='25%' />-->
<#-- </colgroup>-->
<#-- <colgroup>-->
<#-- <col width='14%' />-->
<#-- <col width='51%' />-->
<#-- <col width='16%' />-->
<#-- <col width='17%' />-->
<#-- </colgroup>-->
<colgroup> <colgroup>
<col width='14%' /> <col width='14%' />
<col width='25%' /> <col width='25%' />
<col width='10%' /> <col width='10%' />
<col width='18%' /> <col width='12%' />
<col width='33%' /> <col width='39%' />
</colgroup> </colgroup>
<tr> <tr>
<td class="center" style="background: yellow">部门</td> <td class="center" style="background: yellow">部门</td>
...@@ -256,7 +228,7 @@ ...@@ -256,7 +228,7 @@
<td class="center">${detail.description?default("")?html}</td> <td class="center">${detail.description?default("")?html}</td>
<td class="center">${detail.executor?default("")?html}</td> <td class="center">${detail.executor?default("")?html}</td>
<td class="center">${detail.date?default("")?html}</td> <td class="center">${detail.date?default("")?html}</td>
<td class="center">${detail.comment?default("")?html}</td> <td class="center">${detail.comments?default("")?html}</td>
</tr> </tr>
</#list> </#list>
<#else> <#else>
......
topsun-xt/src/main/webapp/template/print/topsun/factoryQuotation.ftl deleted 100644 → 0
View file @ f5e2150c
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<head>
<title> 工厂报价单</title>
<#include "/print/commonStyleTemplate.ftl" />
<style type="text/css">
td {
font-size: 13px;
}
</style>
</head>
<body>
<div class="billTitle"> ${companyName?default("")?html}</div>
<div style="text-align: center">${address?default("")?html}</div>
<div style="text-align: center">tel：${tel?default("")?html} fax: ${fax?default("")?html}</div>
<div style="text-align: center">email: ${email?default("")?html}</div>
<div style="text-align: center">————————————————————————————</div>
<div class="billTitle"> 报价单</div>
<table cellspacing="0px" cellpadding="0px" class="tablePrint">
<colgroup>
<col width='50%'/>
<col width="50%"/>
</colgroup>
<tr>
<td class="left">客户名称：${customerManagerId?default("")?html}</td>
<td class="right">报价单号：${quotationNo?default("")?html}</td>
</tr>
</table>
<table cellspacing="0px" cellpadding="0px" class="tablePrint">
<colgroup>
<col width='50%'/>
<col width="50%"/>
</colgroup>
<tr>
<td class="left">联系人：${personMemberName?default("")?html}</td>
<td class="right">报价日期：${fillinDate?default("")?html}</td>
</tr>
</table>
<table cellspacing="0px" cellpadding="0px" class="tableBorder">
<colgroup>
<col width='10%'/>
<col width='20%'/>
<col width='40%'/>
<col width='5%'/>
<col width='10%'/>
<col width='6%'/>
<col width='9%'/>
</colgroup>
<tr>
<td class="center">序号</td>
<td class="center">产品名称</td>
<td class="center">产品名称及规格</td>
<td class="center">单位</td>
<td class="center">币别</td>
<td class="center">单价</td>
<td class="center">备注</td>
</tr>
<#if gridData?? && gridData?size gt 0>
<#list gridData as detail>
<tr>
<td class="center">${detail.sequence?default("")?html}</td>
<td class="center">${detail.productCode?default("")?html}</td>
<td class="center">${detail.productName?default("")?html}</td>
<td class="center">${detail.productUnit?default("")?html}</td>
<td class="center">${detail.currency?default("")?html}</td>
<td class="center">${detail.price?default("")?html}</td>
<td class="center">${detail.remark?default("")?html}</td>
</tr>
</#list>
<#else>
<tr>
<td class="center">&nbsp;</td>
<td class="center">&nbsp;</td>
<td class="center">&nbsp;</td>
<td class="center">&nbsp;</td>
<td class="center">&nbsp;</td>
<td class="center">&nbsp;</td>
<td class="center">&nbsp;</td>
</tr>
</#if>
<tr style="height: 70px">
<td class="center">备注</td>
<td class="left" colspan="7">${quotationRemark?default("")?html}</td>
</tr>
<tr style="height: 70px">
<td class="left" colspan="7">${quotationNote?default("")?html}</td>
</tr>
</table>
<div class="blank_div"></div>
<div class="fontBold">审批明细</div>
<#include "/print/taskExecutionPrint.ftl" />
</body>
</html>
topsun/src/main/java/com/huigou/topsun/ep/change/application/impl/EpChangeFormApplicationImpl.java
View file @ c6015faa
...@@ -130,6 +130,7 @@ public class EpChangeFormApplicationImpl extends FlowBroker implements EpChangeF ...@@ -130,6 +130,7 @@ public class EpChangeFormApplicationImpl extends FlowBroker implements EpChangeF
if (org.getId().equals(epChangeFormImplItem.getExecutorId())){ if (org.getId().equals(epChangeFormImplItem.getExecutorId())){
epChangeFormImplItem.setConfirm("1"); epChangeFormImplItem.setConfirm("1");
epChangeFormImplItem.setDate(new Date()); epChangeFormImplItem.setDate(new Date());
epChangeFormImplItem.setComments(procUnitHandler.getOpinion());
} }
} }
changeFormImplItemApplication.saveEpChangeFormImplItems(bizId,formImplItemList); changeFormImplItemApplication.saveEpChangeFormImplItems(bizId,formImplItemList);
...@@ -140,6 +141,7 @@ public class EpChangeFormApplicationImpl extends FlowBroker implements EpChangeF ...@@ -140,6 +141,7 @@ public class EpChangeFormApplicationImpl extends FlowBroker implements EpChangeF
if (org.getId().equals(epChangeFormStockItem.getExecutorId())){ if (org.getId().equals(epChangeFormStockItem.getExecutorId())){
epChangeFormStockItem.setConfirm("1"); epChangeFormStockItem.setConfirm("1");
epChangeFormStockItem.setDate(new Date()); epChangeFormStockItem.setDate(new Date());
epChangeFormStockItem.setComments(procUnitHandler.getOpinion());
} }
} }
changeFormStockItemApplication.saveEpChangeFormStockItems(bizId,stockItemList); changeFormStockItemApplication.saveEpChangeFormStockItems(bizId,stockItemList);
...@@ -274,7 +276,7 @@ public class EpChangeFormApplicationImpl extends FlowBroker implements EpChangeF ...@@ -274,7 +276,7 @@ public class EpChangeFormApplicationImpl extends FlowBroker implements EpChangeF
List<String> strings = Arrays.asList(split); List<String> strings = Arrays.asList(split);
StringBuilder change = new StringBuilder(); StringBuilder change = new StringBuilder();
Map<String, String> finalReasonForChangeMap = reasonForChangeMap; Map<String, String> finalReasonForChangeMap = reasonForChangeMap;
finalReasonForChangeMap.keySet().forEach(key->{ finalReasonForChangeMap.keySet().stream().limit(3).forEach(key->{
if (strings.contains(key)){ if (strings.contains(key)){
change.append(" √ "); change.append(" √ ");
} }
...@@ -287,6 +289,19 @@ public class EpChangeFormApplicationImpl extends FlowBroker implements EpChangeF ...@@ -287,6 +289,19 @@ public class EpChangeFormApplicationImpl extends FlowBroker implements EpChangeF
}); });
map.put("reasonForChange",change.toString()); map.put("reasonForChange",change.toString());
StringBuilder change2 = new StringBuilder();
finalReasonForChangeMap.keySet().stream().skip(0).skip(1).skip(2).forEach(key->{
if (strings.contains(key)){
change2.append(" √ ");
}
if (StringUtil.isNotBlank(reasonForChangeMaterial)){
change2.append(finalReasonForChangeMap.get(key)).append("nbsp");
}
if (StringUtil.isNotBlank(reasonForChangePD)){
change2.append(key).append(" ").append(finalReasonForChangeMap.get(key)).append("nbsp");
}
});
map.put("reasonForChange2",change2.toString());
//处理生效日期类型 //处理生效日期类型
//例如：√ IMMEDIATE 立即变更 RUNNING CHANGE 正常变更（用完后变更） SEASON 换季更改 //例如：√ IMMEDIATE 立即变更 RUNNING CHANGE 正常变更（用完后变更） SEASON 换季更改
Map<String, String> changeEffective = DictUtil.getDictionary("changeEffective"); Map<String, String> changeEffective = DictUtil.getDictionary("changeEffective");
...@@ -331,6 +346,7 @@ public class EpChangeFormApplicationImpl extends FlowBroker implements EpChangeF ...@@ -331,6 +346,7 @@ public class EpChangeFormApplicationImpl extends FlowBroker implements EpChangeF
itemMap.put("comment",approvalMap.get("opinion")); itemMap.put("comment",approvalMap.get("opinion"));
} }
}); });
itemMap.put("date",DateUtil.getDateFormat((Date) itemMap.get("date"),"yyyy-MM-dd"));
}); });
List<Map<String, Object>> stockItemMaps = (List<Map<String, Object>>) stockItemMap.get("Rows"); List<Map<String, Object>> stockItemMaps = (List<Map<String, Object>>) stockItemMap.get("Rows");
stockItemMaps.forEach(itemMap->{ stockItemMaps.forEach(itemMap->{
...@@ -339,6 +355,7 @@ public class EpChangeFormApplicationImpl extends FlowBroker implements EpChangeF ...@@ -339,6 +355,7 @@ public class EpChangeFormApplicationImpl extends FlowBroker implements EpChangeF
itemMap.put("comment",approvalMap.get("opinion")); itemMap.put("comment",approvalMap.get("opinion"));
} }
}); });
itemMap.put("date",DateUtil.getDateFormat((Date) itemMap.get("date"),"yyyy-MM-dd"));
}); });
map.put("printTime", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm").format(LocalDateTime.now())); map.put("printTime", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm").format(LocalDateTime.now()));
map.put("implItemMaps", implItemMaps); map.put("implItemMaps", implItemMaps);
......
topsun/src/main/java/com/huigou/topsun/ep/change/domain/EpChangeFormImplItem.java
View file @ c6015faa
...@@ -60,4 +60,10 @@ public class EpChangeFormImplItem extends AbstractEntity { ...@@ -60,4 +60,10 @@ public class EpChangeFormImplItem extends AbstractEntity {
*/ */
@Column(name = "follow_matter") @Column(name = "follow_matter")
private String followMatter; private String followMatter;
/**
* 评论
*/
@Column(name = "comments")
private String comments;
} }
topsun/src/main/java/com/huigou/topsun/ep/change/domain/EpChangeFormStockItem.java
View file @ c6015faa
...@@ -60,4 +60,10 @@ public class EpChangeFormStockItem extends AbstractEntity { ...@@ -60,4 +60,10 @@ public class EpChangeFormStockItem extends AbstractEntity {
*/ */
@Column(name = "date") @Column(name = "date")
private Date date; private Date date;
/**
* 评论
*/
@Column(name = "comments")
private String comments;
} }
topsun/src/main/java/com/huigou/topsun/ep/order/application/impl/EpSaleOrderCancelApplicationImpl.java
View file @ c6015faa
...@@ -45,6 +45,7 @@ import org.springframework.util.Assert; ...@@ -45,6 +45,7 @@ import org.springframework.util.Assert;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.io.IOException; import java.io.IOException;
import java.math.BigDecimal;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -264,6 +265,10 @@ public class EpSaleOrderCancelApplicationImpl extends FlowBroker implements EpSa ...@@ -264,6 +265,10 @@ public class EpSaleOrderCancelApplicationImpl extends FlowBroker implements EpSa
epSaleOrderCancelItemVos.forEach(epSaleOrderCancelItemVo -> { epSaleOrderCancelItemVos.forEach(epSaleOrderCancelItemVo -> {
EpSaleOrderCancelItem epSaleOrderCancelItem = new EpSaleOrderCancelItem(); EpSaleOrderCancelItem epSaleOrderCancelItem = new EpSaleOrderCancelItem();
BeanUtil.copyProperties(epSaleOrderCancelItemVo, epSaleOrderCancelItem); BeanUtil.copyProperties(epSaleOrderCancelItemVo, epSaleOrderCancelItem);
BigDecimal price = epSaleOrderCancelItem.getPrice();
BigDecimal kwmeng = epSaleOrderCancelItem.getKwmeng();
BigDecimal multiply = price.multiply(kwmeng);
epSaleOrderCancelItem.setAmount(multiply);
epSaleOrderCancelItems.add(epSaleOrderCancelItem); epSaleOrderCancelItems.add(epSaleOrderCancelItem);
}); });
this.epSaleOrderCancelItemApplication.saveEpSaleOrderCancelItems(epSaleOrderCancel.getId(), epSaleOrderCancelItems); this.epSaleOrderCancelItemApplication.saveEpSaleOrderCancelItems(epSaleOrderCancel.getId(), epSaleOrderCancelItems);
......
topsun/src/main/java/com/huigou/topsun/ep/order/domain/EpSaleOrderCancelItem.java
View file @ c6015faa
package com.huigou.topsun.ep.order.domain; package com.huigou.topsun.ep.order.domain;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.huigou.data.domain.model.AbstractEntity; import com.huigou.data.domain.model.AbstractEntity;
import lombok.Data; import lombok.Data;
...@@ -71,4 +72,16 @@ public class EpSaleOrderCancelItem extends AbstractEntity { ...@@ -71,4 +72,16 @@ public class EpSaleOrderCancelItem extends AbstractEntity {
@Column(name = "PROCESS") @Column(name = "PROCESS")
private String process; private String process;
/**
* 单价
*/
@Column(name = "price")
private BigDecimal price;
/**
* 总价
*/
@Column(name = "amount")
private BigDecimal amount;
} }
topsun/src/main/java/com/huigou/topsun/ep/order/domain/vo/EpSaleOrderCancelItemVo.java
View file @ c6015faa
...@@ -3,7 +3,6 @@ package com.huigou.topsun.ep.order.domain.vo; ...@@ -3,7 +3,6 @@ package com.huigou.topsun.ep.order.domain.vo;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data; import lombok.Data;
import javax.persistence.Column;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
...@@ -66,4 +65,11 @@ public class EpSaleOrderCancelItemVo implements Serializable { ...@@ -66,4 +65,11 @@ public class EpSaleOrderCancelItemVo implements Serializable {
*/ */
@JsonProperty("process") @JsonProperty("process")
private String process; private String process;
/**
* 单价
*/
@JsonProperty("price")
private BigDecimal price;
} }
topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/application/impl/SapPurchaseOrderApplicationImpl.java
View file @ c6015faa
...@@ -14,6 +14,9 @@ import com.huigou.data.query.model.QueryModel; ...@@ -14,6 +14,9 @@ import com.huigou.data.query.model.QueryModel;
import com.huigou.topsun.base.bsnMessage.appliction.MannualStartWorkApplication; import com.huigou.topsun.base.bsnMessage.appliction.MannualStartWorkApplication;
import com.huigou.topsun.sap.common.DefaultHttpClient; import com.huigou.topsun.sap.common.DefaultHttpClient;
import com.huigou.topsun.sap.costReimbursement.domain.SapCostReimbursement; import com.huigou.topsun.sap.costReimbursement.domain.SapCostReimbursement;
import com.huigou.topsun.sap.permit.application.SapPermitApplication;
import com.huigou.topsun.sap.permit.vo.SapPermitItemVo;
import com.huigou.topsun.sap.permit.vo.SapPermitVo;
import com.huigou.topsun.sap.purchase.domain.SapPurchase; import com.huigou.topsun.sap.purchase.domain.SapPurchase;
import com.huigou.topsun.sap.purchase.domain.SapPurchaseItem; import com.huigou.topsun.sap.purchase.domain.SapPurchaseItem;
import com.huigou.topsun.sap.purchaseApproval.application.impl.SapPurchaseApprovalApplicationImpl; import com.huigou.topsun.sap.purchaseApproval.application.impl.SapPurchaseApprovalApplicationImpl;
...@@ -26,6 +29,8 @@ import com.huigou.topsun.sap.purchaseOrder.domain.vo.SapPurchaseOrderDto; ...@@ -26,6 +29,8 @@ import com.huigou.topsun.sap.purchaseOrder.domain.vo.SapPurchaseOrderDto;
import com.huigou.topsun.sap.purchaseOrder.domain.vo.SapPurchaseOrderItemVo; import com.huigou.topsun.sap.purchaseOrder.domain.vo.SapPurchaseOrderItemVo;
import com.huigou.topsun.sap.purchaseOrder.domain.vo.SapPurchaseOrderVo; import com.huigou.topsun.sap.purchaseOrder.domain.vo.SapPurchaseOrderVo;
import com.huigou.topsun.sap.purchaseOrder.repository.SapPurchaseOrderRepository; import com.huigou.topsun.sap.purchaseOrder.repository.SapPurchaseOrderRepository;
import com.huigou.topsun.sap.wasteSale.domain.WasteSale;
import com.huigou.topsun.sap.wasteSale.domain.WasteSaleItem;
import com.huigou.uasp.bmp.common.BizBillStatus; import com.huigou.uasp.bmp.common.BizBillStatus;
import com.huigou.uasp.bmp.fn.CodeGenerator; import com.huigou.uasp.bmp.fn.CodeGenerator;
import com.huigou.uasp.bmp.operator.OperatorApplication; import com.huigou.uasp.bmp.operator.OperatorApplication;
...@@ -42,12 +47,14 @@ import org.activiti.engine.impl.persistence.entity.ExecutionEntity; ...@@ -42,12 +47,14 @@ import org.activiti.engine.impl.persistence.entity.ExecutionEntity;
import org.activiti.engine.impl.persistence.entity.TaskEntity; import org.activiti.engine.impl.persistence.entity.TaskEntity;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.*; import java.util.*;
/** /**
...@@ -72,6 +79,10 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu ...@@ -72,6 +79,10 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
private MannualStartWorkApplication mannualStartWorkApplication; private MannualStartWorkApplication mannualStartWorkApplication;
@Autowired @Autowired
private OrgApplication orgApplication; private OrgApplication orgApplication;
@Autowired
private SapPermitApplication sapPermitApplication;
@Autowired
private TaskExecutor asyncWriteExecutor;
@Override @Override
protected String saveBizAndApprovalData() { protected String saveBizAndApprovalData() {
...@@ -166,6 +177,42 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu ...@@ -166,6 +177,42 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
sapPurchaseOrder.setStatusId(status.getId()); sapPurchaseOrder.setStatusId(status.getId());
SapPurchaseOrder save = sapPurchaseOrderRepository.save(sapPurchaseOrder); SapPurchaseOrder save = sapPurchaseOrderRepository.save(sapPurchaseOrder);
this.sendSapDate(save, "Y"); this.sendSapDate(save, "Y");
asyncWriteExecutor.execute(()->
//创建放行条
this.startSapPermit(sapPurchaseOrder)
);
}
public void startSapPermit(SapPurchaseOrder purchaseOrder){
SapPermitVo sapPermitVo = new SapPermitVo();
sapPermitVo.setCompany(purchaseOrder.getNamel());//供应商
sapPermitVo.setApplyPerson(purchaseOrder.getPersonMemberId());
sapPermitVo.setApplyPersonName(purchaseOrder.getPersonMemberName());
sapPermitVo.setDutyDepart(purchaseOrder.getDeptId());
sapPermitVo.setDutyDepartName(purchaseOrder.getDeptName());
sapPermitVo.setPermitDate(new Date());
List<SapPermitItemVo> sapPermitItemVos = new ArrayList<>();
List<SapPurchaseOrderItem> purchaseOrderItems = sapPurchaseOrderItemApplication.getPurchaseOrderItems(purchaseOrder.getId());
for (SapPurchaseOrderItem purchaseOrderItem : purchaseOrderItems) {
//退货项目创建放行条
if ("X".equals(purchaseOrderItem.getRetpo())){
SapPermitItemVo sapPermitItemVo = new SapPermitItemVo();
sapPermitItemVo.setBelongings(purchaseOrderItem.getMatnr() + "/" + purchaseOrderItem.getTxz01());
sapPermitItemVo.setUnit(purchaseOrderItem.getMeins());
String remark="采购订单项:"+purchaseOrder.getEbeln()+"："+purchaseOrderItem.getEbelp();
sapPermitItemVo.setRemark(remark);
sapPermitItemVo.setQuantity(new BigDecimal(purchaseOrderItem.getMenge()));
sapPermitItemVo.setUnitName(purchaseOrderItem.getMsehl());
sapPermitItemVos.add(sapPermitItemVo);
}
}
if (!CollectionUtils.isEmpty(sapPermitItemVos)){
sapPermitVo.setItemVos(sapPermitItemVos);
//创建放行条
sapPermitApplication.saveSapPermitVo(sapPermitVo);
}
} }
......
topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/domain/SapPurchaseOrder.java
View file @ c6015faa
...@@ -154,6 +154,12 @@ public class SapPurchaseOrder extends FlowBillAbstractEntity { ...@@ -154,6 +154,12 @@ public class SapPurchaseOrder extends FlowBillAbstractEntity {
@Column(name = "retpo") @Column(name = "retpo")
private String retpo; private String retpo;
/**
* 供应商名称
*/
@Column(name = "NAMEL")
private String namel;
@Override @Override
protected String getCodeRuleId() { protected String getCodeRuleId() {
return "sapPurchaseOrder"; return "sapPurchaseOrder";
......
topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/domain/vo/SapPurchaseOrderVo.java
View file @ c6015faa
...@@ -59,4 +59,8 @@ public class SapPurchaseOrderVo implements Serializable { ...@@ -59,4 +59,8 @@ public class SapPurchaseOrderVo implements Serializable {
@JsonProperty("EKNAM") @JsonProperty("EKNAM")
private String eknam; private String eknam;
@JsonProperty("NAMEL")
private String namel;
} }
topsun/src/main/resources/config/topsun/ep/change/epChangeForm.xml
View file @ c6015faa
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
SELECT SELECT
CONCAT( t.SUB_PROC_UNIT_NAME, "：", t.HANDLER_NAME ) AS approval_name, CONCAT( t.SUB_PROC_UNIT_NAME, "：", t.HANDLER_NAME ) AS approval_name,
t.HANDLER_NAME, t.HANDLER_NAME,
t.HANDLED_DATE, DATE_FORMAT(t.HANDLED_DATE, '%Y-%m-%d') as HANDLED_DATE,
t.OPINION t.OPINION
FROM FROM
wf_procunithandler t WHERE t.BIZ_ID = ? and t.RESULT = 1 and t.SUB_PROC_UNIT_ID != 'executorId' ORDER BY t.GROUP_ID,t.HANDLED_DATE ASC wf_procunithandler t WHERE t.BIZ_ID = ? and t.RESULT = 1 and t.SUB_PROC_UNIT_ID != 'executorId' ORDER BY t.GROUP_ID,t.HANDLED_DATE ASC
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment