Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
S
sap-service
Project
Project
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
曲欣亮
sap-service
Commits
fcc1d804
Commit
fcc1d804
authored
Jul 23, 2019
by
Quxl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
x
parent
a9b1b172
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
20 deletions
+21
-20
PrformaInvoiceServiceImpl.java
...o/services/prforma_invoice/PrformaInvoiceServiceImpl.java
+5
-2
ShippingNotificationServiceImpl.java
...hipping_notfirmation/ShippingNotificationServiceImpl.java
+16
-18
No files found.
src/main/java/com/egolm/sso/services/prforma_invoice/PrformaInvoiceServiceImpl.java
View file @
fcc1d804
...
@@ -76,12 +76,15 @@ public class PrformaInvoiceServiceImpl implements PrformaInvoiceService {
...
@@ -76,12 +76,15 @@ public class PrformaInvoiceServiceImpl implements PrformaInvoiceService {
}
}
if
(
partnerList
!=
null
)
{
if
(
partnerList
!=
null
)
{
for
(
HEADER_PARTNER_DATA
HEADER_PARTNER_DATA
:
partnerList
)
{
for
(
HEADER_PARTNER_DATA
HEADER_PARTNER_DATA
:
partnerList
)
{
if
(
"AG"
.
equals
(
HEADER_PARTNER_DATA
.
getPARVW
()))
{
String
PARVW
=
HEADER_PARTNER_DATA
.
getPARVW
();
if
(
"AG"
.
equals
(
PARVW
))
{
headMap
.
put
(
"PARTNER_PARVW1"
,
HEADER_PARTNER_DATA
.
getPARVW
());
headMap
.
put
(
"PARTNER_PARVW1"
,
HEADER_PARTNER_DATA
.
getPARVW
());
headMap
.
put
(
"PARTNER_PARTN1"
,
HEADER_PARTNER_DATA
.
getPARTN
());
headMap
.
put
(
"PARTNER_PARTN1"
,
HEADER_PARTNER_DATA
.
getPARTN
());
}
else
if
(
"WE"
.
equals
(
HEADER_PARTNER_DATA
.
getPARVW
()
))
{
}
else
if
(
"WE"
.
equals
(
PARVW
))
{
headMap
.
put
(
"PARTNER_PARVW2"
,
HEADER_PARTNER_DATA
.
getPARVW
());
headMap
.
put
(
"PARTNER_PARVW2"
,
HEADER_PARTNER_DATA
.
getPARVW
());
headMap
.
put
(
"PARTNER_PARTN2"
,
HEADER_PARTNER_DATA
.
getPARTN
());
headMap
.
put
(
"PARTNER_PARTN2"
,
HEADER_PARTNER_DATA
.
getPARTN
());
}
else
{
throw
new
XRException
(
"Partner type undefined ["
+
PARVW
+
"] in HEADER_PARTNER_DATA"
);
}
}
}
}
}
}
...
...
src/main/java/com/egolm/sso/services/shipping_notfirmation/ShippingNotificationServiceImpl.java
View file @
fcc1d804
...
@@ -65,7 +65,6 @@ public class ShippingNotificationServiceImpl implements ShippingNotificationServ
...
@@ -65,7 +65,6 @@ public class ShippingNotificationServiceImpl implements ShippingNotificationServ
header
.
put
(
"DELIVERY_GEWEI"
,
HEADER_DELIVERY
.
getGEWEI
());
header
.
put
(
"DELIVERY_GEWEI"
,
HEADER_DELIVERY
.
getGEWEI
());
header
.
put
(
"DELIVERY_CMGST"
,
HEADER_DELIVERY
.
getCMGST
());
header
.
put
(
"DELIVERY_CMGST"
,
HEADER_DELIVERY
.
getCMGST
());
header
.
put
(
"DELIVERY_VKORG"
,
HEADER_DELIVERY
.
getVKORG
());
header
.
put
(
"DELIVERY_VKORG"
,
HEADER_DELIVERY
.
getVKORG
());
List
<
HEADER_PARTNER
>
HEADER_PARTNERs
=
HEADER_DELIVERY
.
getHEADER_PARTNER
();
List
<
HEADER_PARTNER
>
HEADER_PARTNERs
=
HEADER_DELIVERY
.
getHEADER_PARTNER
();
for
(
int
i
=
0
;
i
<
HEADER_PARTNERs
.
size
();
i
++)
{
for
(
int
i
=
0
;
i
<
HEADER_PARTNERs
.
size
();
i
++)
{
HEADER_PARTNER
HEADER_PARTNER
=
HEADER_PARTNERs
.
get
(
i
);
HEADER_PARTNER
HEADER_PARTNER
=
HEADER_PARTNERs
.
get
(
i
);
...
@@ -75,23 +74,22 @@ public class ShippingNotificationServiceImpl implements ShippingNotificationServ
...
@@ -75,23 +74,22 @@ public class ShippingNotificationServiceImpl implements ShippingNotificationServ
String
NAME2
=
HEADER_PARTNER
.
getNAME2
();
String
NAME2
=
HEADER_PARTNER
.
getNAME2
();
String
POSTL_COD1
=
HEADER_PARTNER
.
getPOSTL_COD1
();
String
POSTL_COD1
=
HEADER_PARTNER
.
getPOSTL_COD1
();
String
CITY1
=
HEADER_PARTNER
.
getCITY1
();
String
CITY1
=
HEADER_PARTNER
.
getCITY1
();
if
(
PARTNER_Q
!=
null
)
{
if
(
"AG"
.
equals
(
PARTNER_Q
))
{
header
.
put
(
"PARTNER_Q"
+(
i
+
1
),
PARTNER_Q
);
header
.
put
(
"PARTNER_Q1"
,
PARTNER_Q
);
}
header
.
put
(
"PARTNER_ID1"
,
PARTNER_ID
);
if
(
PARTNER_ID
!=
null
)
{
header
.
put
(
"PARTNER_NAME1_1"
,
NAME1
);
header
.
put
(
"PARTNER_ID"
+(
i
+
1
),
PARTNER_ID
);
header
.
put
(
"PARTNER_NAME2_1"
,
NAME2
);
}
header
.
put
(
"PARTNER_POSTLCOD1_1"
,
POSTL_COD1
);
if
(
NAME1
!=
null
)
{
header
.
put
(
"PARTNER_CITY1_1"
,
CITY1
);
header
.
put
(
"PARTNER_NAME1_"
+(
i
+
1
),
NAME1
);
}
else
if
(
"WE"
.
equals
(
PARTNER_Q
))
{
}
header
.
put
(
"PARTNER_Q2"
,
PARTNER_Q
);
if
(
NAME2
!=
null
)
{
header
.
put
(
"PARTNER_ID2"
,
PARTNER_ID
);
header
.
put
(
"PARTNER_NAME2_"
+(
i
+
1
),
NAME2
);
header
.
put
(
"PARTNER_NAME1_2"
,
NAME1
);
}
header
.
put
(
"PARTNER_NAME2_2"
,
NAME2
);
if
(
POSTL_COD1
!=
null
)
{
header
.
put
(
"PARTNER_POSTLCOD1_2"
,
POSTL_COD1
);
header
.
put
(
"PARTNER_POSTLCOD1_"
+(
i
+
1
),
POSTL_COD1
);
header
.
put
(
"PARTNER_CITY1_2"
,
CITY1
);
}
}
else
{
if
(
CITY1
!=
null
)
{
throw
new
XRException
(
"Partner type undefined ["
+
PARTNER_Q
+
"] in HEADER_PARTNER"
);
header
.
put
(
"PARTNER_CITY1_"
+(
i
+
1
),
CITY1
);
}
}
}
}
List
<
HEADER_DATE
>
HEADER_DATEs
=
HEADER_DELIVERY
.
getHEADER_DATE
();
List
<
HEADER_DATE
>
HEADER_DATEs
=
HEADER_DELIVERY
.
getHEADER_DATE
();
...
...
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