Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
apps-collaboration
Project
Project
Details
Activity
Releases
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
高燕
apps-collaboration
Commits
f857b45c
Commit
f857b45c
authored
Sep 22, 2020
by
gaoyingwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update:更新结算金额接口
parent
6ff6cf18
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
2 deletions
+22
-2
CollaborationController.java
...pps/collaboration/controller/CollaborationController.java
+9
-1
ColManagerImpl.java
...com/seeyon/apps/collaboration/manager/ColManagerImpl.java
+10
-0
summary.js
src/main/webapp/apps_res/collaboration/js/summary.js
+3
-1
No files found.
src/main/java/com/seeyon/apps/collaboration/controller/CollaborationController.java
View file @
f857b45c
...
@@ -115,6 +115,7 @@ import org.apache.commons.lang.StringEscapeUtils;
...
@@ -115,6 +115,7 @@ import org.apache.commons.lang.StringEscapeUtils;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.logging.Log
;
import
org.apache.commons.logging.Log
;
import
org.springframework.http.*
;
import
org.springframework.http.*
;
import
org.springframework.http.converter.HttpMessageConverter
;
import
org.springframework.http.converter.StringHttpMessageConverter
;
import
org.springframework.http.converter.StringHttpMessageConverter
;
import
org.springframework.web.client.RestTemplate
;
import
org.springframework.web.client.RestTemplate
;
import
org.springframework.web.servlet.ModelAndView
;
import
org.springframework.web.servlet.ModelAndView
;
...
@@ -2543,7 +2544,14 @@ public class CollaborationController extends BaseController {
...
@@ -2543,7 +2544,14 @@ public class CollaborationController extends BaseController {
// String namekeyunitprice = master.getFormTable().getFieldMap4Display().get("单价").getName();
// String namekeyunitprice = master.getFormTable().getFieldMap4Display().get("单价").getName();
// BigDecimal unitprice = (BigDecimal)master.getAllDataMap().get(namekeyunitprice);
// BigDecimal unitprice = (BigDecimal)master.getAllDataMap().get(namekeyunitprice);
try
{
try
{
// restTemplate.getMessageConverters().add(new StringHttpMessageConverter(Charset.forName("utf-8")));
List
<
HttpMessageConverter
<?>>
list
=
restTemplate
.
getMessageConverters
();
for
(
int
i
=
0
;
i
<
list
.
size
();
i
++)
{
HttpMessageConverter
<?>
httpMessageConverter
=
list
.
get
(
i
);
if
(
httpMessageConverter
.
getClass
().
equals
(
StringHttpMessageConverter
.
class
))
{
list
.
set
(
i
,
new
StringHttpMessageConverter
(
Charset
.
forName
(
"utf-8"
)));
}
}
// restTemplate.getMessageConverters().add(new StringHttpMessageConverter(Charset.forName("utf-8")));
Map
<
String
,
Object
>
respnose
=
restTemplate
.
postForObject
(
DIC_DATA_URL
,
null
,
Map
.
class
);
Map
<
String
,
Object
>
respnose
=
restTemplate
.
postForObject
(
DIC_DATA_URL
,
null
,
Map
.
class
);
if
(!(
Boolean
)
respnose
.
get
(
"success"
)){
if
(!(
Boolean
)
respnose
.
get
(
"success"
)){
colManager
.
updateColSummaryGeneralStateBySource
(
code
,
4
);
colManager
.
updateColSummaryGeneralStateBySource
(
code
,
4
);
...
...
src/main/java/com/seeyon/apps/collaboration/manager/ColManagerImpl.java
View file @
f857b45c
...
@@ -150,6 +150,8 @@ import org.json.JSONException;
...
@@ -150,6 +150,8 @@ import org.json.JSONException;
import
org.json.JSONObject
;
import
org.json.JSONObject
;
import
org.springframework.http.HttpHeaders
;
import
org.springframework.http.HttpHeaders
;
import
org.springframework.http.MediaType
;
import
org.springframework.http.MediaType
;
import
org.springframework.http.converter.HttpMessageConverter
;
import
org.springframework.http.converter.StringHttpMessageConverter
;
import
org.springframework.transaction.annotation.Propagation
;
import
org.springframework.transaction.annotation.Propagation
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.web.client.RestTemplate
;
import
org.springframework.web.client.RestTemplate
;
...
@@ -157,6 +159,7 @@ import org.springframework.web.servlet.ModelAndView;
...
@@ -157,6 +159,7 @@ import org.springframework.web.servlet.ModelAndView;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletRequest
;
import
java.io.*
;
import
java.io.*
;
import
java.nio.charset.Charset
;
import
java.sql.SQLException
;
import
java.sql.SQLException
;
import
java.sql.Timestamp
;
import
java.sql.Timestamp
;
import
java.util.*
;
import
java.util.*
;
...
@@ -11275,6 +11278,13 @@ public class ColManagerImpl implements ColManager {
...
@@ -11275,6 +11278,13 @@ public class ColManagerImpl implements ColManager {
String
url
=
p
.
getProperty
(
"erp"
);
String
url
=
p
.
getProperty
(
"erp"
);
// params.put("s", "hello");
// params.put("s", "hello");
// String url = "http://localhost:8990/drce/hello";
// String url = "http://localhost:8990/drce/hello";
List
<
HttpMessageConverter
<?>>
list
=
rest
.
getMessageConverters
();
for
(
int
i
=
0
;
i
<
list
.
size
();
i
++)
{
HttpMessageConverter
<?>
httpMessageConverter
=
list
.
get
(
i
);
if
(
httpMessageConverter
.
getClass
().
equals
(
StringHttpMessageConverter
.
class
))
{
list
.
set
(
i
,
new
StringHttpMessageConverter
(
Charset
.
forName
(
"utf-8"
)));
}
}
url
=
url
+
"?pagenumber={pagenumber}&printtype={printtype}&pagesize={pagesize}&cover={cover}&"
+
url
=
url
+
"?pagenumber={pagenumber}&printtype={printtype}&pagesize={pagesize}&cover={cover}&"
+
"pagesided={pagesided}&coversize={coversize}&neivinsize={neivinsize}&insertsize={insertsize}"
+
"pagesided={pagesided}&coversize={coversize}&neivinsize={neivinsize}&insertsize={insertsize}"
+
"&machineType={machinetype}&urgent={urgent}&copiesNum={copiesnumber}&coverColor={coverColor}&"
+
"&machineType={machinetype}&urgent={urgent}&copiesNum={copiesnumber}&coverColor={coverColor}&"
+
...
...
src/main/webapp/apps_res/collaboration/js/summary.js
View file @
f857b45c
...
@@ -4095,6 +4095,7 @@ $(function() {
...
@@ -4095,6 +4095,7 @@ $(function() {
clearInterval
(
myVar
);
clearInterval
(
myVar
);
var
param
=
{};
var
param
=
{};
param
.
pagenumber
=
fnx
.
$
(
"#field0006_id .cap4-text__browse"
).
text
();
//原稿页数
param
.
pagenumber
=
fnx
.
$
(
"#field0006_id .cap4-text__browse"
).
text
();
//原稿页数
param
.
company
=
fnx
.
$
(
"#field0003_id .cap4-text__browse"
).
text
();
//来稿单位
param
.
printtype
=
fnx
.
$
(
"#field0047_inner"
).
val
();
//印品种类
param
.
printtype
=
fnx
.
$
(
"#field0047_inner"
).
val
();
//印品种类
param
.
pagesize
=
nowvalue
;
//开型
param
.
pagesize
=
nowvalue
;
//开型
param
.
cover
=
fnx
.
$
(
"#field0054_id .icon"
).
attr
(
"class"
)
===
"icon CAP cap-icon-fuxuan-moren"
?
"0"
:
"1"
;
//亮膜
param
.
cover
=
fnx
.
$
(
"#field0054_id .icon"
).
attr
(
"class"
)
===
"icon CAP cap-icon-fuxuan-moren"
?
"0"
:
"1"
;
//亮膜
...
@@ -4140,6 +4141,7 @@ $(function() {
...
@@ -4140,6 +4141,7 @@ $(function() {
clearInterval
(
myVar
);
clearInterval
(
myVar
);
var
param
=
{};
var
param
=
{};
param
.
pagenumber
=
fnx
.
$
(
"#field0006_id .cap4-text__browse"
).
text
();
//原稿页数
param
.
pagenumber
=
fnx
.
$
(
"#field0006_id .cap4-text__browse"
).
text
();
//原稿页数
param
.
company
=
fnx
.
$
(
"#field0003_id .cap4-text__browse"
).
text
();
//来稿单位
param
.
printtype
=
fnx
.
$
(
"#field0047_inner"
).
val
();
//印品种类
param
.
printtype
=
fnx
.
$
(
"#field0047_inner"
).
val
();
//印品种类
param
.
pagesize
=
fnx
.
$
(
"#field0032_inner"
).
val
();
//开型
param
.
pagesize
=
fnx
.
$
(
"#field0032_inner"
).
val
();
//开型
param
.
cover
=
fnx
.
$
(
"#field0054_id .icon"
).
attr
(
"class"
)
===
"icon CAP cap-icon-fuxuan-moren"
?
"0"
:
"1"
;
//亮膜
param
.
cover
=
fnx
.
$
(
"#field0054_id .icon"
).
attr
(
"class"
)
===
"icon CAP cap-icon-fuxuan-moren"
?
"0"
:
"1"
;
//亮膜
...
@@ -4723,7 +4725,7 @@ $(function() {
...
@@ -4723,7 +4725,7 @@ $(function() {
var
param
=
{};
var
param
=
{};
param
.
pagenumber
=
fnx
.
$
(
"#field0006_id .cap4-text__browse"
).
text
();
//原稿页数
param
.
pagenumber
=
fnx
.
$
(
"#field0006_id .cap4-text__browse"
).
text
();
//原稿页数
param
.
printtype
=
fnx
.
$
(
"#field0047_inner"
).
val
();
//印品种类
param
.
printtype
=
fnx
.
$
(
"#field0047_inner"
).
val
();
//印品种类
param
.
pagesize
=
nowvalue
;
//开型
param
.
pagesize
=
fnx
.
$
(
"#field0032_inner"
).
val
()
;
//开型
param
.
cover
=
fnx
.
$
(
"#field0054_id .icon"
).
attr
(
"class"
)
===
"icon CAP cap-icon-fuxuan-moren"
?
"0"
:
"1"
;
//亮膜
param
.
cover
=
fnx
.
$
(
"#field0054_id .icon"
).
attr
(
"class"
)
===
"icon CAP cap-icon-fuxuan-moren"
?
"0"
:
"1"
;
//亮膜
param
.
cover1
=
fnx
.
$
(
"#field0055_id .icon"
).
attr
(
"class"
)
===
"icon CAP cap-icon-fuxuan-moren"
?
"0"
:
"1"
;
//哑膜
param
.
cover1
=
fnx
.
$
(
"#field0055_id .icon"
).
attr
(
"class"
)
===
"icon CAP cap-icon-fuxuan-moren"
?
"0"
:
"1"
;
//哑膜
param
.
cover2
=
fnx
.
$
(
"#field0056_id .icon"
).
attr
(
"class"
)
===
"icon CAP cap-icon-fuxuan-moren"
?
"0"
:
"1"
;
//烫金
param
.
cover2
=
fnx
.
$
(
"#field0056_id .icon"
).
attr
(
"class"
)
===
"icon CAP cap-icon-fuxuan-moren"
?
"0"
:
"1"
;
//烫金
...
...
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