Page Comparison

translate in new phy trade - physical and warrant

Enhancement

New Physical Trades

采/销售量汇总

Users need to choose summary mode first: CONTRACT or STOCK 业务口径或者财务口径

Aggregate all contracts based on P/S DATE, PRODUCT, PURCHASE/SALE, TRADE MODE, and calculate the sum of QTY, AMT, AMT BEFORE TAX

columns:

P/S DATE 采/销日期：based on the time dimensions (note a) and summary mode (note b)

PRODUCT 品种

PURCHASE/SALE 采/销

TRADE MODE 交易模式

QTY 数量： based on summary mode (note b)

AMT 采/销成本： QTY * PRICE （priority：CONTRACT ACTUAL PRICE > PROVISIONAL PRICE)

AMT BEFORE TAX 采/销不含税成本： AMT/ （1+ CONTRACT TAX RATE）

note a:

Three time dimensions: daily, weekly, monthly

Daily：specific date

weekly: 某月第几周

monthly：几月

note b:

Two summary modes based on CONTRACT or STOCK

CONTRACT 业务口径：P/S DATE is based on trade date in new physical trade table, QTY is (priority: CONTRACT ACTUAL QTY > QTY in physical trade)

STOCK 财务口径：P/S DATE is based on stock date in stock management, QTY is stock_contract_qty

P/S DATE 采/销日期：based on the time dimensions (note a) and summary mode (note b)

PRODUCT 品种

PURCHASE/SALE 采/销

TRADE MODE 交易模式

QTY 数量： based on summary mode (note b)

AMT 采/销成本： QTY * PRICE （priority：CONTRACT ACTUAL PRICE > PROVISIONAL PRICE)

AMT BEFORE TAX 采/销不含税成本： AMT/ （1+ CONTRACT TAX RATE）

1. Date dimension handle by BE

2. group by PRODUCT 品种, PURCHASE/SALE 采/销, TRADE MODE 交易模式 handle by FE table

3. AMT 采/销成本： QTY * PRICE （priority：CONTRACT ACTUAL PRICE > PROVISIONAL PRICE)

   AMT BEFORE TAX 采/销不含税成本： AMT/ （1+ CONTRACT TAX RATE） → should be same as phy trade table formula.

make it more flexible, we put group keys in settings and let users to choose. the dropdown list could from BE dashboard meta data

PRODUCT 品种

PURCHASE/SALE 采/销

TRADE MODE 交易模式

Enhancement

New Physical Trades

Add new columns in STOCK MANAGEMENT

some changes in the table:

1. remove TO WH NAME

2. stock action will use stock action in dropdown list

3. stock_type will use stock type in dropdown list

4. if stock_action value is [1, 3, 5], qty show positive in table, if stock_action value is in [2,4,6], qty show negative in table. but when pass it to BE, it is always positive of value

5. Does Scope column needs to be removed? Because currently BE did not return this param anymore

YES, no more Scope

Match ID no longer using dropdown list right, if so does the previous logic remained the same or need to do some changes? 

No more logic for Match ID and also remove Bal Qty in FE.

Stock Action:

• Stock Out 出库

• Stock In 入库

• Swap In 仓转现

• Swap Out 现转仓

• Relocate In 移进库

• Relocate Out 移出库

Stock Type

• Physical 现货

• Warrant 仓单

Note: DELIVERY MODE will changes to non-editable, auto fill when there are delivery rule value returned from CONTRACT NO. dropdown （provisionally）

Enhancement

New Physical Trades

Update in STOCK MANAGEMENT

1: Add more information in CONTRACT NO. dropdown list

• BRAND

• QTY (priority: CONTRACT ACTUAL QTY > QTY)

• UNSTOCK QTY

2: Add BRAND column (from phy trade)

before SPEC

auto fill by Contract No

3: FE auto fill WH NAME with CONTRACT WH (phy trade)

• editable

4: FE auto fill BRAND and SPEC once CONTRACT NO. is chosen

• These two columns are editable

• If BRAND/SPEC is different from what in new physical trade table , highlight them green

1. in stock_mgmt DB, i have added two more keys called stock_brand and stock_spec

2. when user choose contract no which have brand and spec from phy trade table, if Brand and Spec in stock mgmt table columns are empty, please auto fill up. otherwise, please keep original value

3. if stock_brand and stock_spec value are different from contract brand and spec, highligh them in green

4. when save (update or insert), please store value in stock_mgmt Database → stock_brand and stock_spec

Enhancement

New Physical Trades

free trial user can create 20 groups now

Enhancement

New Physical Trades

Reallocation function in stock management page

there is an action called REALLOCATION. It means move cargo from one warehouse to another warehouse. So we will add a new button called REALLOCATION to function it easily

1. user is able to multi select rows with positive qty (which means stock_action is in 1, 3, 5)

2. then click REALLOCATION button (use icon for button, hint ALLOCATION when move mouse over the icon)

3. pop up a new window for user to reallocate

4. click SAVE to call reallocate_api

1. TO WH NAME: dropdown list

2. QTY: must be positive number

API:

1. BE will insert two rows in DB for each row

   1. 1st row: copy original selected row,

      1. remove stock_id

      2. stock_action: move out

      3. stock_qty: qty

      4. match_id: original stock_id

   2. 2nd row: copy original selected row:

      1. remove stock_id

      2. stock_action: move in

      3. wh_id: TO WH NAME

      4. stock_qty: qty

      5. match_id: original stock_id

Enhancement

New Physical Trades

stock management table update

1. disable match_Id edit, view only

2. delivery mode editable

   1. dropdown list

   2. from phy_trade side

   3. when update, BE should update phy_trade based on phy_trade_id

Modify WAREHOUSE column in TRADES tab

1. WAREHOUSE in new phy trades table should be no editable From WH NAME in STOCK MANAGEMENT

2. change WH ADDESS to CONTRACT WH ADD

Enhancement

New Physical Trades

STOCK MANAGEMENT swap

swap function is similar to reallocate function.

reallocate function is to insert two row with different wh_id

swap function is to insert two row with different stock_type

so in swap window:

1. user choose stock_type and qty

2. stock_type should be different from original (selected) row. (validation in FE)

Enhancement

New Physical Trades

stock mgmt table issue fixed

1. stock mgmt will be empty wh entity empty when select contract no, but when save it will auto appear - please add wh entity in the dropdown list.

once you update cargo ops data, all the rows with same Contract No will change together.

means delivery mode, bl no, loadport, lp etd, disport, dp eta, cc date, do date, will follow previous contract no and update accordingly

Enhancement

New Physical Trades

change wh_id to stock_wh_id in stock mgmt table

1. to different wh_id from physical trade and stock mgmt table, now we change wh_id to stock_wh_id in stock mgmt table

2. in stock mgmt table, if WH NAME is empty, when user select contract no, FE will auto fill it based on wh_id in physical trade

   1. if WH NAME has value, it wont be update based on selected contract no.

3. but user is able to edit WH NAME in the stock mgmt table. because it is actual wh name and the value will be stored in stock mgmt able stock_wh_id

4. highlight in green if stock_wh_id different from wh_id in contract no dropdown list.

if wh name different in stock mgmt and new phy trade, it will show in green

same for brand and spec

Enhancement

New Physical Trades

add two keys in stock mgmt

1. link_phy_trade_id:

   1. 匹配合同号

   2. LINK CONTRACT NO.

   3. dropdown down list from phy_trade_id

   4. only filter out sale trade in dropdown list

2. stock_contract_qty:

   1. 合约数量

   2. CONTRACT QTY

   3. float

   4. sign of number is same as qty in table

   5. to BE must be positive

Enhancement

New Physical Trades

new physical trade table - contract wh address empty - when change contract wh in new physical trade table, contract wh add is empty bug fixed

Enhancement

New Physical Trades

New app in dashboard - Unpriced Contract Schedule

For contracts whose CONTRACT ACTUAL PEICE and PRICING PRICE are both blank

data from physical trade：

公司名称 ENTITY OF CONTRACT

产品 PRODUCT

客户 COUNTERPARTY

合同号 CONTRACT NO.

升贴水 CONTRACT PREMIUM

作价方 PRICING PARTY

约定点价日期 PRICING DATE

约定点价合约 PRICING CONTRACT

New

未点价数量 UNPRICE QTY

UNPRICE QTY = (priority: CONTRACT ACTUAL QTY > QTY)

Preload is s_date and e_date, as the setting only consist Start Date and End Date

Enhancement

New Physical Trades

stock mgmt table empty fields bug fixed

Enhancement

New Physical Trades

unstock qty currently we are using stock_qty to calculate.

now we change to stock_contract_qty to calculate

contract qty (stock_contract_qty) in stock mgmt table should reflect in stock qty in new phy trade table

in new phy trade table : unstock qty = qty - stock qty

1. link_phy_trade_id:

   1. 匹配合同号

   2. LINK CONTRACT NO.

   3. dropdown down list from phy_trade_id

   4. only filter out sale trade in dropdown list

2. stock_contract_qty:

   1. 合约数量

   2. CONTRACT QTY

   3. float

   4. sign of number is same as qty in table

   5. to BE must be positive

Enhancement

New Physical Trades

stock mgmt filter in table bug fixed

Enhancement

New Physical Trades

stock mgmt table layout bug fixed

Enhancement

New Physical Trades

Company level account has no permission to access settings

If the account is company level and not in the group, it has no permission to access settings in GROUP MANAGEMENT

ex: test2 is company level, but can’t enter the access settings in Group D - 能化部 - 塑料

Now the logic is only ADMIN in the group can enter Access settings.

The new logic: Both ADMIN of the group and the Group Owner can change the access settings

please remove Access Settings filter in FE. BE already handle the validation check. it is priority task and we need to push today. once it is done, please move to in process, so kelin can assist in checking.

hi Kelin, view, insert and delete all has validation check in BE. only group admin and group owner can view, insert and delete (tick and untick)

1. Make columns no editable in PSL & Invoice

update restriction (it means those rows have psl_id)

In PSL, RECEIVE and ISSUE, both assigned and unassigned (only tables, not include allocate window), set all columns no editable except CONTRACT NO.

for insert new one, still allow user to edit before saving.

Enhancement

New Physical Trades

2. Add delete button in access permission table. so we can tick the row and delete

Enhancement

New Physical Trades

3. group - after changing parent company details not updated and translate parent group

Enhancement

Groups

4. in ps ledger, remove psl type column since ps ledger is meant for recording payment transactions but payment value still need return to BE

Enhancement

New Physical Trades

5. ps ledger - assigned/unassigned/issued/unissued drop down list

Enhancement

New Physical Trades

1. ps ledger and receive (psl in access setting for assigned/unassigned dropdown list)

• unassigned is company level, anyone can view/edit/delete

• assigned is group level, only member in same group can view/edit/ delete. Company level can view/edit/delete group level data as well

issue (psl in access setting for issued/unissued dropdown list)

• unissued is company level as no contract no yet so cannot determine which items belong to who yet (doesnt use created by to determine)

• issued is group level, only member in same group can view/edit/ delete. Company level can view/edit/delete group level data as well; due to group level, user cannot delete other user’s invoice items in unissued/issued table

采销资金/收票:                                                                      

未分配：公司级，所有group都能看到，各个group下的人只能合并，分批或是直接认领合同号，不能修改和删除任何数据，也不能用添加行新增数据                                                                                       

已分配：group级别，同一group的人能看到，其他group不能看到，只能修改合同号或是取消合同号使其回到未分配里，其他数据不能修改或删除 

开票:  

未开票/已开票：group级别，同一group的人能看到，其他group的人不能看到                     

以上所有数据公司级别的人都能看到       （添加行和删除权限是否可以放给指定的账号？目前创建人可以删除存在BUG,当分批以后，创建人就变成了商务执行人员）

Solution

1. Set Dg group as company level

2. set other operation team as group level    

3. for those 未分配 psl, will select by company level no matter the user is under group level or company level.

Testing:

1. two groups under one company.

2. one group under company level for psl API (you can set access level in admin page)

3. one group under group level for psl API

Enhancement

New Physical Trades

2. VIEW operation missing in Accession Permission tab of PSL

for PSL， there are only DELETE and CREATE, type VIEW missing

Enhancement

New Physical Trades

3. phy trade diag check

currently, it may have some portfolio pl calculation issue from phy trades. It is caused by many many reasons, so we provide a page for user to do self check.

1. add a tab in the last in page new phy trade, called DAIG CHECK

2. go to the tab, call select API to get response for diag type list for user to choose to check

3. select one diag type click check to call API get error trades in the table below. if rsp is empty, it means no error

4. 'DUPLICATED PRICING IDS',

   1. to check if any duplicated pricing id in linked paper trades

5. 'TRADE AND PRICING QTY DISCREPANCIES'

   1. to check if qty in linked paper trades and qty (actual qty or qty) in pricing are discrepant

in duplicated pricing ids:

it is only to test if any duplicated pricing ids in the trades (linked to physical trade). so we only focus on Phy Pricing IDs column. please ignore other columns for this diag type.

We will have more diag types to check in the future.

Enhancement

New Physical Trades

4. add Accession Permission tab table in Admin page

1. only admin is able to view (FE control)

2. only admin is able to edit (BE control)

3. only access_level is able to edit

Enhancement

New Physical Trades

5. Issue - item and tax rate are empty after saving bug fixed

Enhancement

New Physical Trades

6. master group (has children groups) is able to access children groups data

Enhancement

New Physical Trades

7. Cannot generate demurrage report bug fixed

Enhancement

Demurrage Calculations

8. Cannot delete item in trade table bug fixed

Enhancement

New Physical Trades

9. Currently we have performance issue in dashboard.

so let’s limit No. of apps loading once a time

1. limit to 2 apps one time to call, only load another 2 app after current finished

2. personal dashboard and group dashboard both

Enhancement

Individual & Group Dashboard Guide

10. maf group hierarchy

currently, MAF group only have two types:

1. group level

2. company level

Now in group level, we add hierarchy tree structure to maf group level. it is similar to portfolio structure.

once it is done, then one group could be parent of other groups.

ATM, we only support two levels groups

1. company level

2. master group

3. group

test case

1. create group

   1. if there is parent group,

      1. BE will check if parent group has the same owner of creator

2. delete group:

   1. if deleted group has children groups

      1. if deleted group does not have parent group, then all children groups parent group will empty

      2. else all children groups parent group will update to the deleted group parent group

3. update group

   1. if change owner of group, will raise error if

      1. updated group has parent or

      2. updated group has children groups

   2. validate infinity parent loop

      1. if parent group is the same as updated group, will raise error

      2. if cross parent group, will raise error

         1. e.g., A is B parent, B is A parent.

Enhancement

Groups

11. live server error in group fixed

Enhancement

Groups

12. make save button always loading if no reaction once click p2

In GENERAL LEDGER, OLD PHYSICAL TRADES

once user clicked save button, if no response, make this button always show loading( user can’t click it again until there is response)

Enhancement

New Physical Trades

13. MTM update error in DEALS tab fixed. once change to company level for access permission. it should work

Enhancement

New Physical Trades