Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
dc-cost-system
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
bltdc
dc-cost-system
Commits
19962d26
Commit
19962d26
authored
Jun 09, 2019
by
wutong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
推送费用单到财务系统变成出纳单的接口增加大类字段;为财务系统提供接口,传个单号,给他费用大类
parent
f2b97f78
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
33 additions
and
5 deletions
+33
-5
CostApiController.java
...om/blt/other/other_cost/controller/CostApiController.java
+23
-0
CostApiService.java
...java/com/blt/other/other_cost/service/CostApiService.java
+3
-0
CostApiServiceImpl.java
...blt/other/other_cost/service/impl/CostApiServiceImpl.java
+5
-4
PurchasingListDetailController.java
...purchasing/controller/PurchasingListDetailController.java
+2
-1
No files found.
cost-core/src/main/java/com/blt/other/other_cost/controller/CostApiController.java
View file @
19962d26
...
@@ -4,7 +4,9 @@ import com.blt.other.other_commons.utils.DateTimeUtil;
...
@@ -4,7 +4,9 @@ import com.blt.other.other_commons.utils.DateTimeUtil;
import
com.blt.other.other_cost.dto.LogisticsCostDto
;
import
com.blt.other.other_cost.dto.LogisticsCostDto
;
import
com.blt.other.other_cost.dto.ManageCostDto
;
import
com.blt.other.other_cost.dto.ManageCostDto
;
import
com.blt.other.other_cost.service.CostApiService
;
import
com.blt.other.other_cost.service.CostApiService
;
import
com.blt.other.other_cost.service.CostService
;
import
com.blt.other.other_database.model.CostDomain
;
import
com.blt.other.other_database.model.CostDomain
;
import
com.blt.other.other_purchasing.dto.BuyListDto
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
@@ -105,4 +107,25 @@ public class CostApiController {
...
@@ -105,4 +107,25 @@ public class CostApiController {
}
}
return
result
;
return
result
;
}
}
/**
* 吴通新增
* 根据费用单号获取费用单大类
* @param costNo
* @return
*/
@GetMapping
(
"/{costNo}"
)
public
Map
<
String
,
Object
>
getTypeName
(
@PathVariable
(
"costNo"
)
String
costNo
)
{
// 获取费用单详细信息
Map
<
String
,
Object
>
result
=
new
HashMap
<>();
try
{
CostDomain
costDomain
=
costApiService
.
getCostDetails
(
costNo
);
result
.
put
(
"success"
,
true
);
result
.
put
(
"data"
,
costDomain
.
getTypeName
());
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
result
.
put
(
"success"
,
false
);
}
return
result
;
}
}
}
cost-core/src/main/java/com/blt/other/other_cost/service/CostApiService.java
View file @
19962d26
...
@@ -43,4 +43,7 @@ public interface CostApiService {
...
@@ -43,4 +43,7 @@ public interface CostApiService {
* @return
* @return
*/
*/
List
<
CostDomain
>
getNoPayCost
(
List
<
String
>
costNoList
);
List
<
CostDomain
>
getNoPayCost
(
List
<
String
>
costNoList
);
CostDomain
getCostDetails
(
String
costNo
);
}
}
cost-core/src/main/java/com/blt/other/other_cost/service/impl/CostApiServiceImpl.java
View file @
19962d26
package
com
.
blt
.
other
.
other_cost
.
service
.
impl
;
package
com
.
blt
.
other
.
other_cost
.
service
.
impl
;
import
com.alibaba.fastjson.JSONArray
;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.fastjson.JSONObject
;
import
com.blt.other.other_auth.dao.UserDao
;
import
com.blt.other.other_auth.dao.UserDao
;
import
com.blt.other.other_commons.utils.CurUtils
;
import
com.blt.other.other_commons.utils.CurUtils
;
...
@@ -16,7 +15,6 @@ import com.blt.other.other_cost.service.UserCostFinansysService;
...
@@ -16,7 +15,6 @@ import com.blt.other.other_cost.service.UserCostFinansysService;
import
com.blt.other.other_cost.utils.CostUtils
;
import
com.blt.other.other_cost.utils.CostUtils
;
import
com.blt.other.other_database.model.CostDetailDomain
;
import
com.blt.other.other_database.model.CostDetailDomain
;
import
com.blt.other.other_database.model.CostDomain
;
import
com.blt.other.other_database.model.CostDomain
;
import
com.blt.other.other_database.model.CostTypeKindDomain
;
import
com.blt.other.other_database.model.UserDomain
;
import
com.blt.other.other_database.model.UserDomain
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
...
@@ -28,8 +26,6 @@ import org.springframework.transaction.annotation.Transactional;
...
@@ -28,8 +26,6 @@ import org.springframework.transaction.annotation.Transactional;
import
org.springframework.util.StringUtils
;
import
org.springframework.util.StringUtils
;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
import
java.util.ArrayList
;
import
java.util.Calendar
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
...
@@ -202,4 +198,9 @@ public class CostApiServiceImpl implements CostApiService {
...
@@ -202,4 +198,9 @@ public class CostApiServiceImpl implements CostApiService {
public
List
<
CostDomain
>
getNoPayCost
(
List
<
String
>
costNoList
){
public
List
<
CostDomain
>
getNoPayCost
(
List
<
String
>
costNoList
){
return
costDao
.
selectNoPayCost
(
costNoList
);
return
costDao
.
selectNoPayCost
(
costNoList
);
}
}
@Override
public
CostDomain
getCostDetails
(
String
costNo
)
{
return
costDao
.
selectByCostNo
(
costNo
);
}
}
}
cost-core/src/main/java/com/blt/other/other_purchasing/controller/PurchasingListDetailController.java
View file @
19962d26
...
@@ -374,7 +374,8 @@ public class PurchasingListDetailController {
...
@@ -374,7 +374,8 @@ public class PurchasingListDetailController {
detailKey
=
buy
.
getBuyno
();
detailKey
=
buy
.
getBuyno
();
}
}
requestEntity
.
add
(
"DetailKey"
,
detailKey
);
// 回调必要的key参数(DetailKey)不能为空;
requestEntity
.
add
(
"DetailKey"
,
detailKey
);
// 回调必要的key参数(DetailKey)不能为空;
//吴通新增添加SKU大类推送
requestEntity
.
add
(
"TypeName"
,
buy
.
getSkuTypeName
());
Map
<
String
,
Object
>
map
=
requestEntity
.
toSingleValueMap
();
Map
<
String
,
Object
>
map
=
requestEntity
.
toSingleValueMap
();
String
s
=
JSON
.
toJSONString
(
map
);
String
s
=
JSON
.
toJSONString
(
map
);
logger
.
warn
(
"提交财务审核信息:"
+
s
);
logger
.
warn
(
"提交财务审核信息:"
+
s
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment