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
d62da8a4
Commit
d62da8a4
authored
Sep 16, 2020
by
gaoyingwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update:更新erp抓取订单接口,发送协同,返回门户接口
parent
1a240868
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
638 additions
and
167 deletions
+638
-167
CollaborationController.java
...pps/collaboration/controller/CollaborationController.java
+100
-71
PrintDataVO.java
...in/java/com/seeyon/apps/collaboration/vo/PrintDataVO.java
+67
-4
CollaborationResource.java
.../com/seeyon/ctp/rest/resources/CollaborationResource.java
+158
-66
summary.js
src/main/webapp/apps_res/collaboration/js/summary.js
+313
-26
No files found.
src/main/java/com/seeyon/apps/collaboration/controller/CollaborationController.java
View file @
d62da8a4
This diff is collapsed.
Click to expand it.
src/main/java/com/seeyon/apps/collaboration/vo/PrintDataVO.java
View file @
d62da8a4
...
...
@@ -13,7 +13,7 @@ public class PrintDataVO {
private
String
name
;
//印品名称
private
String
id
;
//文档链接(文档id)
private
String
pagenumber
;
//原稿页数
private
Timestamp
date
;
//预取日期 z
private
String
date
;
//预取日期 z
private
String
number
;
//文档编号 z
private
String
contacts
;
//联系人
private
String
phone
;
//联系电话
...
...
@@ -32,11 +32,74 @@ public class PrintDataVO {
private
BigDecimal
copiesnumber
;
//份数
private
BigDecimal
unitprice
;
//单价 x
private
String
remark
;
//备注 z
private
String
coverColor
;
//封面颜色
private
String
neivinColor
;
//内页颜色
private
String
insertColor
;
//插页颜色
private
String
otherSize
;
//其他纸张
private
String
otherColor
;
//其他颜色
private
String
senior
;
//高级
private
BigDecimal
typesettingPrice
;
//排版费
public
PrintDataVO
()
{
super
();
}
public
String
getCoverColor
()
{
return
coverColor
;
}
public
void
setCoverColor
(
String
coverColor
)
{
this
.
coverColor
=
coverColor
;
}
public
String
getNeivinColor
()
{
return
neivinColor
;
}
public
void
setNeivinColor
(
String
neivinColor
)
{
this
.
neivinColor
=
neivinColor
;
}
public
String
getInsertColor
()
{
return
insertColor
;
}
public
void
setInsertColor
(
String
insertColor
)
{
this
.
insertColor
=
insertColor
;
}
public
String
getOtherSize
()
{
return
otherSize
;
}
public
void
setOtherSize
(
String
otherSize
)
{
this
.
otherSize
=
otherSize
;
}
public
String
getOtherColor
()
{
return
otherColor
;
}
public
void
setOtherColor
(
String
otherColor
)
{
this
.
otherColor
=
otherColor
;
}
public
String
getSenior
()
{
return
senior
;
}
public
void
setSenior
(
String
senior
)
{
this
.
senior
=
senior
;
}
public
BigDecimal
getTypesettingPrice
()
{
return
typesettingPrice
;
}
public
void
setTypesettingPrice
(
BigDecimal
typesettingPrice
)
{
this
.
typesettingPrice
=
typesettingPrice
;
}
public
String
getPrinttype
()
{
return
printtype
;
}
...
...
@@ -85,11 +148,11 @@ public class PrintDataVO {
this
.
pagenumber
=
pagenumber
;
}
public
Timestamp
getDate
()
{
public
String
getDate
()
{
return
date
;
}
public
void
setDate
(
Timestamp
date
)
{
public
void
setDate
(
String
date
)
{
this
.
date
=
date
;
}
...
...
@@ -229,7 +292,7 @@ public class PrintDataVO {
this
.
remark
=
remark
;
}
public
PrintDataVO
(
String
source
,
String
company
,
String
name
,
String
id
,
String
pagenumber
,
Timestamp
date
,
String
number
,
String
contacts
,
String
phone
,
String
secret
,
String
printtype
,
String
pagesize
,
String
cover
,
String
pagesided
,
String
coversize
,
String
neivinsize
,
String
insertsize
,
String
machinetype
,
String
distribution
,
String
urgent
,
BigDecimal
totalprice
,
BigDecimal
copiesnumber
,
BigDecimal
unitprice
,
String
remark
)
{
public
PrintDataVO
(
String
source
,
String
company
,
String
name
,
String
id
,
String
pagenumber
,
String
date
,
String
number
,
String
contacts
,
String
phone
,
String
secret
,
String
printtype
,
String
pagesize
,
String
cover
,
String
pagesided
,
String
coversize
,
String
neivinsize
,
String
insertsize
,
String
machinetype
,
String
distribution
,
String
urgent
,
BigDecimal
totalprice
,
BigDecimal
copiesnumber
,
BigDecimal
unitprice
,
String
remark
)
{
this
.
source
=
source
;
this
.
company
=
company
;
this
.
name
=
name
;
...
...
src/main/java/com/seeyon/ctp/rest/resources/CollaborationResource.java
View file @
d62da8a4
This diff is collapsed.
Click to expand it.
src/main/webapp/apps_res/collaboration/js/summary.js
View file @
d62da8a4
This diff is collapsed.
Click to expand it.
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