Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
B
business-java
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
CI / CD Analytics
Repository Analytics
Value Stream Analytics
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Proteus
business-java
Commits
60ca454c
Commit
60ca454c
authored
May 12, 2020
by
CORP\sonam.kamble
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added to show product detail summary for employee at multiple position.
parent
741b7c2a
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
23 additions
and
14 deletions
+23
-14
webitm-dashboard/ibase/dashboard/common/bean/SellsPlanSummary.java
...shboard/ibase/dashboard/common/bean/SellsPlanSummary.java
+13
-8
webitm-dashboard/ibase/dashboard/module-resource/sfa/metadataxml/jnj/W19JJOH002/sell_plan_product_summary.xml
.../metadataxml/jnj/W19JJOH002/sell_plan_product_summary.xml
+1
-1
webitm-dashboard/ibase/dashboard/module-resource/sfa/metadataxml/jnj/W19JJOH002/sell_plan_review_any.xml
...e/sfa/metadataxml/jnj/W19JJOH002/sell_plan_review_any.xml
+2
-2
webitm-dashboard/ibase/dashboard/module-resource/sfa/metadataxml/jnj/W19JJOH002/sell_plan_review_any_drill.xml
...metadataxml/jnj/W19JJOH002/sell_plan_review_any_drill.xml
+1
-1
webitm-dashboard/ibase/dashboard/module-resource/sfa/metadataxml/jnj/W19JJOH002/sell_plan_review_summary_table.xml
...dataxml/jnj/W19JJOH002/sell_plan_review_summary_table.xml
+1
-1
webitm-dashboard/ibase/dashboard/module-resource/sfa/sql/jnj/W19JJOH002.sql
...base/dashboard/module-resource/sfa/sql/jnj/W19JJOH002.sql
+5
-1
No files found.
webitm-dashboard/ibase/dashboard/common/bean/SellsPlanSummary.java
View file @
60ca454c
...
...
@@ -82,7 +82,7 @@ public class SellsPlanSummary extends ValidatorEJB
rs
=
null
;
//Gets Team Hierarchy of Login User
planDataSql
.
append
(
" SELECT POS_CODE, POS_CODE__REPTO, EMP_CODE, "
)
planDataSql
.
append
(
" SELECT POS_CODE,
DESCR,
POS_CODE__REPTO, EMP_CODE, "
)
.
append
(
" (SELECT EMP_CODE FROM ORG_STRUCTURE WHERE POS_CODE = O1.POS_CODE__REPTO) AS REPORT_TO, "
)
.
append
(
" LEVEL as LVL "
)
.
append
(
" FROM ORG_STRUCTURE O1 "
)
...
...
@@ -105,7 +105,7 @@ public class SellsPlanSummary extends ValidatorEJB
while
(
maxLevelInt
>
0
)
{
BaseLogger
.
log
(
"3"
,
null
,
null
,
"SQL RESULT AFTER EXECUTED ::::::::maxLevel::::::::: "
+
maxLevelInt
);
ArrayList
<
HashMap
<
String
,
String
>>
currentLevelData
=
getCurrentLevelData
(
teamData
,
tranDb
,
maxLevelInt
,
prdCode
);
ArrayList
<
HashMap
<
String
,
String
>>
currentLevelData
=
getCurrentLevelData
(
teamData
,
tranDb
,
maxLevelInt
,
prdCode
);
allLevelData
.
addAll
(
currentLevelData
);
maxLevelInt
--;
}
...
...
@@ -160,7 +160,8 @@ public class SellsPlanSummary extends ValidatorEJB
{
String
empCode
=
checkNull
(
currentLevelEmp
.
get
(
"EMP_CODE"
),
false
);
String
posCode
=
checkNull
(
currentLevelEmp
.
get
(
"POS_CODE"
),
false
);
empPosCodes
.
add
(
empCode
+
"~SEP~"
+
posCode
);
String
prdCodeDescr
=
checkNull
(
currentLevelEmp
.
get
(
"DESCR"
),
false
);
empPosCodes
.
add
(
empCode
+
"~SEP~"
+
posCode
+
"~SEP~"
+
prdCodeDescr
);
}
}
for
(
String
empPosCode
:
empPosCodes
)
...
...
@@ -168,8 +169,9 @@ public class SellsPlanSummary extends ValidatorEJB
String
[]
empPosCodeArr
=
empPosCode
.
split
(
"~SEP~"
);
String
empCode
=
checkNull
(
empPosCodeArr
[
0
],
false
);
String
posCode
=
checkNull
(
empPosCodeArr
[
1
],
false
);
String
prdCodeDescr
=
checkNull
(
empPosCodeArr
[
2
],
false
);
//ArrayList<HashMap<String, String>> empSellSummData = getSummarySellsData(empCode, tranDb, prdCode);
ArrayList
<
HashMap
<
String
,
String
>>
empSellSummData
=
getSummarySellsData
(
empCode
,
posCode
,
tranDb
,
prdCode
);
ArrayList
<
HashMap
<
String
,
String
>>
empSellSummData
=
getSummarySellsData
(
empCode
,
posCode
,
tranDb
,
prdCode
,
prdCodeDescr
);
currentLevelSummary
.
addAll
(
empSellSummData
);
}
...
...
@@ -177,16 +179,18 @@ public class SellsPlanSummary extends ValidatorEJB
}
//private ArrayList<HashMap<String, String>> getSummarySellsData(String empCode, String tranDb, String prdCode)
private
ArrayList
<
HashMap
<
String
,
String
>>
getSummarySellsData
(
String
empCode
,
String
posCode
,
String
tranDb
,
String
prdCode
)
private
ArrayList
<
HashMap
<
String
,
String
>>
getSummarySellsData
(
String
empCode
,
String
posCode
,
String
tranDb
,
String
prdCode
,
String
posCodeDescr
)
{
StringBuffer
summaryDataSql
=
new
StringBuffer
();
summaryDataSql
.
append
(
"SELECT "
)
.
append
(
" '"
+
empCode
+
"' AS EMP_CODE, "
)
.
append
(
" '"
+
posCodeDescr
+
"' AS POS_CODE_DESCR, "
)
.
append
(
" '"
+
posCode
+
"' AS POS_CODE, "
)
.
append
(
" I.ITEM_CODE, "
)
.
append
(
" I.PRODUCT_CODE, "
)
.
append
(
" (SELECT DESCR FROM ITEM WHERE ITEM_CODE = I.ITEM_CODE) PRODUCT_NAME, "
)
//.append(" (SELECT DESCR FROM ITEM WHERE ITEM_CODE = I.ITEM_CODE) PRODUCT_NAME, ")
.
append
(
" (SELECT DESCR FROM ITEM WHERE ITEM_CODE = I.ITEM_CODE) DEALER_NAME, "
)
.
append
(
" SUM(SPD.SELL_IN_QTY) AS SELL_IN_QTY, "
)
.
append
(
" SUM(SPD.SELL_OUT_QTY) AS SELL_OUT_QTY, "
)
.
append
(
" SUM(SPD.SELL_IN_VALUE) AS SELL_IN_VALUE, "
)
...
...
@@ -207,9 +211,10 @@ public class SellsPlanSummary extends ValidatorEJB
summaryDataSql
.
append
(
"AND SP.STATUS = 'S' "
)
//.append("AND SP.SALES_PERS IN ( ")
.
append
(
"AND SP.POS_CODE IN ( "
)
//.append(" SELECT EMP_CODE ")
//.append(" SELECT EMP_CODE ")
.
append
(
" SELECT POS_CODE "
)
.
append
(
" FROM ORG_STRUCTURE O1 "
)
//.append(" FROM ORG_STRUCTURE O1 ")
.
append
(
" FROM ORG_STRUCTURE O1 WHERE NVL(FN_GET_IS_PLANNING_MGR(POS_CODE),'FALSE') = 'FALSE' "
)
//.append(" START WITH EMP_CODE = '" + empCode + "' ")
.
append
(
" START WITH POS_CODE = '"
+
posCode
+
"' "
)
.
append
(
" CONNECT BY PRIOR POS_CODE = POS_CODE__REPTO "
)
...
...
webitm-dashboard/ibase/dashboard/module-resource/sfa/metadataxml/jnj/W19JJOH002/sell_plan_product_summary.xml
View file @
60ca454c
...
...
@@ -23,7 +23,7 @@
</filter>
</filters>
<page_title>
<![CDATA[Sell Planning Review - Summary]]>
</page_title>
<datasource
id=
"1"
dataSourceType=
"datamodel"
filterKey=
'POS_CODE'
filterExpr=
'
context["POS_CODE"] == "$POS_CODE"
'
>
<![CDATA[SELL_PLAN_REVIEW_ALL_DM]]>
</datasource>
<datasource
id=
"1"
dataSourceType=
"datamodel"
filterKey=
'POS_CODE'
filterExpr=
'
"$POS_CODE".indexOf(context["POS_CODE"] ) != -1
'
>
<![CDATA[SELL_PLAN_REVIEW_ALL_DM]]>
</datasource>
<view
id=
"1"
name=
"Default"
type=
"flatonly"
>
<component
datasource=
"1"
id=
"1"
type=
"COMPOSITE"
>
...
...
webitm-dashboard/ibase/dashboard/module-resource/sfa/metadataxml/jnj/W19JJOH002/sell_plan_review_any.xml
View file @
60ca454c
...
...
@@ -57,9 +57,9 @@
info_column: 'SELL_IN',
sub_info_text: 'Sell Out',
sub_info_column: 'SELL_OUT',
copykeys : '
REPORT_TO,EMP_CODE,POS_CODE__REPTO,POS_CODE,EMP_NAM
E,SELL_IN,SELL_OUT,HIER_THEME,PRD_CODE',
copykeys : '
POS_CODE__LOGIN,POS_COD
E,SELL_IN,SELL_OUT,HIER_THEME,PRD_CODE',
_OBJECT_KEY : 'POS_CODE',
_STORAGE_KEY : 'POS_CODE__
REPTO'
_STORAGE_KEY : 'POS_CODE__
LOGIN'
},
detailModel: {
image_column: 'USER:EMP_CODE',
...
...
webitm-dashboard/ibase/dashboard/module-resource/sfa/metadataxml/jnj/W19JJOH002/sell_plan_review_any_drill.xml
View file @
60ca454c
...
...
@@ -62,7 +62,7 @@
info_column: 'SELL_IN',
sub_info_text: 'Sell Out',
sub_info_column: 'SELL_OUT',
copykeys : '
REPORT_TO,EMP_CODE,POS_CODE__REPTO,POS_CODE,EMP_NAM
E,SELL_IN,SELL_OUT,HIER_THEME,PRD_CODE'
copykeys : '
POS_CODE__REPTO,POS_COD
E,SELL_IN,SELL_OUT,HIER_THEME,PRD_CODE'
},
detailModel: {
image_column: 'USER:EMP_CODE',
...
...
webitm-dashboard/ibase/dashboard/module-resource/sfa/metadataxml/jnj/W19JJOH002/sell_plan_review_summary_table.xml
View file @
60ca454c
...
...
@@ -31,7 +31,7 @@
<link_metadata>
<![CDATA[]]>
</link_metadata>
<column_group
id=
"1"
>
<columns>
<column
index=
"1"
type=
"string"
cellType=
"protected"
name=
"
PRODUCT
_NAME"
>
<![CDATA[Product Name]]>
</column>
<column
index=
"1"
type=
"string"
cellType=
"protected"
name=
"
DEALER
_NAME"
>
<![CDATA[Product Name]]>
</column>
<column
index=
"2"
type=
"number"
cellType=
"protected"
name=
"SELL_IN_QTY"
>
<![CDATA[Sell-in Quantity]]>
</column>
<column
index=
"3"
type=
"number"
cellType=
"protected"
name=
"SELL_IN_VALUE"
>
<![CDATA[Sell-in Value]]>
</column>
<column
index=
"4"
type=
"number"
cellType=
"protected"
name=
"SELL_OUT_QTY"
>
<![CDATA[Sell-out Quantity]]>
</column>
...
...
webitm-dashboard/ibase/dashboard/module-resource/sfa/sql/jnj/W19JJOH002.sql
View file @
60ca454c
...
...
@@ -8,6 +8,10 @@ delete from DATA_MODEL_USE where DATA_MODEL = 'SELL_PLAN_REVIEW_ALL_DM';
Insert
into
DATA_MODEL
(
DATA_MODEL
,
DESCR
,
DATA_SOURCE
,
SOURCE_DET
,
SOURCE_INPUT
,
FORMAT
,
CHG_DATE
,
CHG_USER
,
CHG_TERM
,
VALID_DAYS
,
SCOPE_NAME
,
SYNC_DATA_MODEL
,
COLUMN_ORDER
)
values
(
'SELL_PLAN_REVIEW_ALL_DM'
,
'Sells Plan Review Dashboard NSM, GSM, RSM and ABM ALL ROLES DM'
,
'S'
,
'
SELECT
( SELECT LISTAGG(POS_CODE,
''
,
''
) WITHIN GROUP (ORDER BY EMP_CODE DESC)
FROM ORG_STRUCTURE
WHERE EMP_CODE = ?
) AS POS_CODE__LOGIN,
? AS PRD_CODE,
SELL_PLAN_DET.EMP_CODE,
SELL_PLAN_DET.REPORT_TO,
...
...
@@ -87,7 +91,7 @@ AND SELL_PLAN_DET.DESIGN_CODE <> ''ERE''
ORDER BY
SELL_PLAN_DET.EMP_CODE,
SELL_PLAN_DET.SORT_ORDER
'
,
':
PRD_CODE,:empCode,:empCode,:PRD_CODE'
,
'json'
,
SYSDATE
,
'ADMIN'
,
'SYSTEM'
,
null
,
'PRD_CODE'
||
'&'
||
'
empCode'
,
null
,
null
);
'
,
':
empCode,:PRD_CODE,:empCode,:empCode,:PRD_CODE'
,
'json'
,
SYSDATE
,
'ADMIN'
,
'SYSTEM'
,
null
,
'PRD_CODE&
empCode'
,
null
,
null
);
...
...
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