MAF CLOUD - NEW RELEASE + FIX UPDATES SEP 2023

Petro Win New app requirement

-P/L & Position Change From Daily Open Position app 当日开仓持仓盈亏和仓位变动
-pre-sett price 前结算价

• settlement price: 当日结算价

-pre size 昨日仓位
-price change 价格变动
-p/l change 盈亏变动

Enhancement

https://mafint.atlassian.net/browse/MAF-4234

230927 开票页面添加出入库日期

在开票页面的上面框里，添加列：出入库日期（带入合同页的出入库日期）

Enhancement

https://mafint.atlassian.net/browse/MAF-4269

Enhancement

https://mafint.atlassian.net/browse/MAF-4271

Enhancement

Enhancement

Enhancement

issue invoice can not save, FE exception urgent!

Enhancement

230925 实际价格为0的合同

我们有一部分合同实际价格为0的合同，是否终价显示的为否，能否改为实际价格为0的合同，是否终价显示为是？因为在我们理解中，合同实际价格空着不填的才是否，有些合同确实价格为0，比如盘盈盘亏，还有一些样品出口的合同，如果显示为否，我们在一些报表里就会看到这些合同（未点价合同表，未了结合同表等等）

if empty or null, it is false, if having value including 0, then true.

Enhancement

add total_actual_stock_qty in phy trade database

1. add total_actual_stock_qty in phy trade database

   1. added in testing server

2. amend calculateWhPsl

   1. stock_actual_qty

   2. qty_variation

Enhancement

new requirements VAR report

(Background) Each portfolio has a max allowed loss amt, so they want to a % to show % of VAR and Shortfall value.

2 things needed for this new requirement:

1. Add the “Max Allowed Loss Amt” in the Settings for the Var model for users to input the data:

Please add two percentage parameters in the Var chart. The formula is as follows:

VaR% = |VaR| / |Max allowed loss amt| * 100

Shortfall % = |Shortfall| / |Max allowed loss amt| * 100

var% and shortfall% keep to 2 dp

change to 最大亏损金额（自定义

put sample below shortfall %

Enhancement

230925 开票

FE exception

https://mafint.atlassian.net/browse/MAF-4272

230925 报表更新

1. 现货追保及止损表

1） 添加列：追保价（含升贴水）---在现在追保价的基础上，加上升贴水，计算得出追保价（含升贴水）contract_prem

2） 添加列：合同约定追保比例 ---带入现货合同页的合同约定追保比例

1. 未点价合同表

添加列：采/销---带入现货合同页的采/销

1. 未了结合同表

添加列：公司名称---带入现货合同页的公司名称

1. 未了结款项表

添加列：交易日期---带入现货合同页的交易日期

230922 采/销售量汇总

ensure they have the same settings to get correct result.

we use group or company level to control data access scope.

Enhancement

230922 出入库计划表 -group账号查看

open settings, change the group keys and resubmit.

issue 1: change settings or close app and create a new app

issue 2: change it to group level if it is group level.

Enhancement

add ? logic explanation in column header

try to list down necessary column in this ticket to add going forward.

1. stock mgmt → back to back → QTY (IN) Added and deployed.

Enhancement

cannot enter market data

Enhancement

add custom tax rate 关税日期 column in updated settlement table

Enhancement

230918 日期输入方法

in phy trade table,

if trade_date not in this year (2023) before saving, show yellow color, so at least to warning user that the date may incorrect.

Enhancement

230918 商务报表更新 现货追保及止损表

bug fixed

Enhancement

phy trade page FE exception can not save after updating

edit or add new row in phy trade table and save see can save successfully or not.

Enhancement

230816 库存明细 上级group

add username, group and created by etc columns in back to back table

add product column in back to back table

Enhancement

230831 更新的结算价 价格不一致 enhancements

settlement tax rate (结算税率) is empty , most of the trade modes except OFFSHORE are depends on it to calculate price before tax ,if settlement tax rate is not filled , price before tax would not be calculated and thus settlement amt before tax would not be calculated as well.

if it is not filled, then treat it as 0 tax rate.

Enhancement

group pl duplicate issue

it is empty list issue. anyway, if it is empty list, then BE would not yield to FE. seems like it work now.

Enhancement

发票存量表 enhancements; invoice balance report

it happened when there is not match_id value in stock_mgmt data. I have made some modification in code to cover this kinds of case.

Enhancement

230915 库存明细-默认出入库

in stock mgmt and bulk stock mgmt (in new phy trade)

if purchase → stock action auto stock in else stock out

Enhancement

230915 取消的合同

add status column in cancelled trades to determine which contracts have their settlement deleted

Enhancement

发票存量表 enhancements; invoice balance report

in settings:

group keys should be

1. COMPANY → company_name

2. PRODUCT → product

3. INVOICE NO.(1st 7 characters) → is_inv_group_no

4. ITEMS → is_inv_product

5. SPECIFICATION → invoice_spec

in table,

keys are:

1. company_name

2. is_inv_group_no

3. is_inv_product

4. invoice_spec

5. psl_unit

6. psl_ccy

BE has done is_pair part, need FE to update something to work

1. keys changes from BE rsp

   1. bal_qty → psl_qty

   2. bal_tax → psl_tax_amt

   3. bal_amt → psl_amt

2. add columns if is_pair ticket

   1. PURCHASE CONTRACT → purchase_contract_no

   2. PURCHASE COUNTERPARTY → purchase_counterparty

Enhancement

230915 开票-单价小数位显示错误

今天有一笔开票，数量为33.234吨，单价为8001.151，金额为265910.25，数量和金额都没问题，但是单价只显示两位小数点，点全电开票以后下载的开票申请里的单价是8001.15，导致产生错误，请帮忙修改一下单价的显示，不要保留两位小数，显示为我们实际的价格，开票的时候，数量和单价都可能会有多位小数点，只有发票金额需要保留两位小数点。

都显示实际的价格吧

Enhancement

230911 合同拆分后续

2） 合同拆分后，原合同和新拆分来的合同的约定仓储名称和约定仓储地址都没有了

3） 合同拆分后，原合同和新拆分的合同的合同实际数量还是原来的合同实际数量（修改为原来的合同实际数量就留在原合同里，新拆分出来的合同的合同实际数量空着）

4） 合同拆分后，新合同以下信息缺失：签署、合同版本、合同类别、收付款方式、约定收付款日（这些应该都与原合同保持一致）

5） 合同拆分后，新合同是否可以自动生成合同编号？不用再手动点一下生成合同编号

目前拆分合同只能拆分数量，是否可以在拆分框里多加点信息？

1） 在均分交易后面显示合同号和客户名称（不允许修改，只是方便商务在拆分的时候知道自己在拆哪个合同）

2） 在拆分数据信息里增加：客户名称, 品牌，产品规格，临时价格，合同实际价格，合同升贴水（这些信息自动带入原合同信息，但允许修改）

Enhancement

商务报表-未了结合同表 enhancements

1）未开票数量为0的合同还显示为部分开票，以下合同应该为已完结，不显示在未了结合同表里（第一个浙江济桐的合同不知道为什么有两个已结算）

 2） 请添加列：采/销

目前合同数量采购和销售都是正数，因此请添加列：采/销，并将销售合同数量显示为负值，方便我们看报表的时候检查一下

Enhancement

230914 收票录入重复

今天在补录进口收票的时候，发现记录也重复了，但是很奇怪，53.62吨的收票在刚保存的时候看是重复了，结果刷新以后再看又不重复了，但是48.655吨的收票刷新以后仍然是重复的

Enhancement

230816 库存明细 上级group

• choose username instead of email address so can add username to choose from the dropdown list

• add a GROUP column (similar to the one in paper trades) in stock details page so she can see which group the user belongs to

Enhancement

230831 商务报表-未了结合同表 PHY TRADE ON GOING STATUS

1. also add two columns: 交易日期，交易模式

2. if trade mode in 进出口，离岸，离岸跨币种, invoice status should be empty, you should not see 未开票 部分开票 已开票

3. if 款项未清, other status should not be shown. only show 款项未清

4. status key typo changes

   1. PARIAL → PARTIAL

5. change key UN_SETTLE to UN_SETTLE_PAYMENT

6. if final_settle_status == UN_SETTLE_PAYMENT then show → UN_SETTLE_PAYMENT (款项未清)

7. ignore other status, only show UN_SETTLE_PAYMENT (款项未清)

Enhancement

出入库计划表 stock mgmt plan enhancements

missing columns added

1. CONTRACT DELIVERY DATE

2. COUNTERPARTY

Enhancement

230911 款项余额为0的合同如何进行收付款认领

currently, in psl table, dropdown list only show un_payment_amt is not 0 contract to assign.

they have some special case to handle. sometimes, they need assign psl to un_payment_amt is 0 contract. such as refund, top-up margin etc.

so our solution

1. in psl page only, above the table, add a tick box PAID

2. default untick

3. if tick, then dropdown list show un_payment_amt is 0 only (other logic will keep the same as normal)

Enhancement

230913 采销资金 无法认领

allow changing of ledger type in ps ledger table and ps ledger allocate (middle table); invoice and received invoice remain unchanged

Enhancement

change phy trade qty new logic to settlement:

1. user is able to change qty of phy trade even there is settlement qty in update settlement table

2. if there is settlement qty, change qty wont impact trade and portfolio pl and position, the portfolio will still use original settlement qty

3. if there is no settlement qty, change qty will impact trade and portfolio pl and position, the portfolio will use new qty. note that if no sett qty, change qty will not change sett qty unlike previous logic

Enhancement

dashboard - the dashboard data cannot be refreshed in real time for certain account

Enhancement

issue invoice cannot save after changing from usd value to cny value

1. as spoken, we will dismiss ex_rate in psl, receive and issue tables.

2. if trade mode is import/export only, we remove inv amt > contract amt validation in FE in receive and issue tables.

Enhancement

stock mgmt plan enhancements

the correct logic below:

1. in settings page

   1. add GROUP (please refer to image below)

      1. default values added in

         1. COMPANY

         2. PRODUCT

         3. BRAND

         4. SPEC

         5. CONTRACT WH

         6. CONTRACT DELIVERY DATE

         7. COUNTERPARTY

      2. other values

         1. CONTRACT WH ADD

         2. BL NO.

         3. CON STOCK DATE

1. get phy trade data from DB, only if un stock qty is not 0

2. group by group keys from FE

3. sum up un stock qty based on group keys

4. columns based on group keys + sum up of un stock qty

Enhancement

230904 合同页未收货/出库数量计算不对

qty, actualQty, contractActualQty is under phy trade directly.

buy is positive and sell is negative. so we keep them

stock_qty different, BE will do calculation of stock qty. so we should keep sign of stock_qty from BE.

Enhancement

230831 更新的结算价 价格不一致 enhancements

1. sometimes contract amt is not calculated correctly ,i tweak a bit of its condition now it should always correct one

2. dong claims that some rows which does not have green cells cannot be filtered, i also update the condition now once filtered you will not see any rows that does not green cell remains in the table liao , you can check like this

3. check settlement amount before tax , dong complains that value of settlement amount before tax mainly for import/export and offshore ccy is empty, that's because they both share the same formula, you can check on CC's comments, now even not entered exchange rate it will treat as 1 to calculate price before tax thus it will calculate  settlement amount before tax as well

4. BE did not calculate the invoice related values like those value in trades tab, now all the invoice-related values in updated settlement should be the same as the one in trades tab liao

Exchange Rate is treated as 1 if they didnt input anything on that column

• Price before tax:

If phy trade mode is IMPORT / EXPORT (转口) or OFFSHORE-CROSS CCY (转口),
Price before tax = ( Settlement Price or Estimated Price ) * Exchange Rate / (1 + ( Settlement Tax Rate / 100 ))

Enhancement

split trade action in phy trade table

Enhancement

OPEN POSITION DETAILS duplicate issue in open position details, if one of steam (is []), there will duplicate rows issue.

Enhancement

ADM statement remove unrelated trade rows

Enhancement

APP NAME: PHY TRADE ON GOING STATUS, 未了结合同表

230831 商务报表-未了结合同表 PHY TRADE ON GOING STATUS

settings

1. start to date

   1. start: default 1st date of year

   2. to: today (cache)

2. auto-update

   1. default ticket

附件为样表，需要的数据都可以从合同页取到，只有一个未结算数量需要计算（等拆分合同功能做好以后，商务会以合同实际数量来定义是否结算）

未结算数量:合同实际数量为空白，自动带入合同数量；实际数量不为空白，则未结算数量为0

执行状态的定义已在附表里列出，如有问题请及时联系

New Feature

发票存量表 INVOICE BALANCE REPORT enhancements

issue 1: change from 8 to 7 first characters

for other issue:

we do group in BE for them:

1. in settings page

   1. add GROUP (please refer to image below)

      1. default values added in

         1. COMPANY

         2. PRODUCT

         3. INVOICE NO.(1st 7 characters)

         4. ITEMS

         5. TAX CLASSIFICATION NAME

   2. add PAIR tick box

      1. default is untick

      2. cache without reset

BE logic

1. FE will pass those keys into BE to group

2. get all receive invoices from database

3. get all issue invoices from database

4. note that: (please refer to select invoice function)

   1. for those invoices are not assigned yet, use company level to select

   2. for those invoice assigned already, use group phy_trade_id to select

5. if PAIR tick:

   1. get all issued invoice phy_trade_ids

   2. based on phy_trade_ids to get all stock_mgmt rows with match_ids

   3. based on those match_ids to get PURCHASE CONTRACT NO (phy_trade_id) accordingly

   4. add PURCHASE CONTRACT NO into issued invoice row accordingly.

   5. so BE can group based on group keys from settings and PURCHASE CONTRACT NO for received and issued invoice in point 6 below.

6. to sum invoices numbers in BE based on group keys from settings.

   1. BAL QTY (Bal Qty = received Qty - issued Qty)

   2. BAL TAX (BAL TAX = received inv tax amt - issued inv tax amt

   3. BAL AMOUNT = (received inv amt - issued inv amt)

   4. BAL AMOUNT WITHOUT TAX (received inv amt without tax - issued inv amt without tax)

7. return columns based on group keys + (PURCHASE CONTRACT NO + COUNTERPARTY) if PAIR ticked + invoices numbers

Enhancement

230831 在库库存表 inventory details app enhancements

1. in settings page

   1. add GROUP (please refer to image below)

      1. default values added in

         1. COMPANY

         2. PRODUCT

         3. BRAND

         4. SPEC

         5. WH NAME

         6.  STOCK TYPE

      2. other value for user to select

         1. WH ADDRESS

         2. CON STOCK DATE

         3. BL NO.

   2. add PAIR tick box

      1. default is untick

      2. cache without reset

BE logic

1. FE will pass those keys into BE to group

2. if PAIR tick:

   1. based on match_id to add PURCHASE CONTRACT NO (phy_trade_id for purchase trade) into stock out rsp from database.

   2. so BE can group based on group keys from settings and PURCHASE CONTRACT NO for stock in and stock out in point 3 below.

3. to sum INVENTORY value in BE based on group keys from settings.

4. return columns based on group keys + (PURCHASE CONTRACT NO + COUNTERPARTY) if PAIR ticked + INVENTORY

Enhancement

group pl duplicate issue

split phy trade in new phy trade table

1. there is a function in old phy trade table, which allow user to split their phy trade into 2 trades. please also add it into new phy trade table

2. there are some new rules to add current split function in BE

   1. if the contract is linked to invoice (either receive or issue), raise error

   2. if linked psl total amt is more than contract amt after splitted

      1. move extra psl rows into the new splitted phy trade

         1. note that BE may need to split psl row if amt can not matched.

         2. e.g., phy trade A amount is 10000, splitted into A 500 and B 500

         3. linked psl rows are 300, 400, 300

         4. in this case, we need split one of 300 into two rows 100 and 200

         5. then 500 rows linked to A and another 500 rows linked to B

   3. if linked stock mgmt contract qty is more than (contract actual qty or qty)

      1. same logic as psl amt.

logic:

1. BE will check if the split trade linked to invoice

   1. if any, raise error

2. after split trade

   1. existing trade

      1. will update qty and settlement_qty if any

      2. will update portfolio pl and position

   2. new trade

      1. only add new trade

      2. no settlement (need to add settlement)

      3. wont link any psl payment or stock mgmt

      4. in phy trade, inv_amt, inv_qty and payment_amt will clear to 0

after split trade

1. existing trade

   1. will update qty and settlement_qty if any

meaning if contract qty is 1000; settlement qty is 2222

when i split 100; contract qty will be 900 and settlement qty will be proportionated (100/1000*2222) so it will be 1999.80

Enhancement

客户合同号添加到各模块

1. 采销资金：

在未分配界面的合同编号下拉框里加上客户合同号，在未分配界面加上列：主合同号，客户合同号；在已分配界面加上列：客户合同号

1. 收票：

与采销资金一样，在未分配界面的合同编号下拉框里加上客户合同号，在未分配和已分配界面加上列：客户合同号

1. 开票:

在开票上面框里加上列：客户合同号

在未开票和已开票里加上列：客户合同号

1. 库存明细：

与采销资金一样，在合同编号下拉框里加上客户合同号

库存明细里加上列：客户合同号

Enhancement

allow to change qty in phy trade even there is a settlement qty in update settlement table

change qty, will change settlement qty accordingly.

testing:

1. ensure the phy trade has settlement already (you can see the data in update settlement table)

2. ensure there is settlement qty value in the row

3. go back to phy trade table to change the qty of the trade

4. after save, go to update settlement table to check if settlement qty change accordingly

5. go to portfolio and check if position and pl are correct.

Environment

Enhancement

user with no group when go to invoice or ps ledger etc will have this error bug fixed

Enhancement

cancelled trade wont be in new settlement table anymore.

Enhancement

if no value in margin called, will treat as 0 for the calculation

Enhancement

合同页未收货/出库数量计算不对 issue fixed

Enhancement

kgi statement price map wrongly

Enhancement

remove EX RATE in psl, receive and issue tables

Enhancement

allocate top table amt is not updated

Enhancement

收票（无终价不能收票）

the price = contract_actual_price or provisonal_price or 0

for received invoice first

Enhancement

合同页未收货/出库数量计算不对

in FE will convert unstock qty to negative if Sale is contract. Applied for these columns too, qty, stockQty, actualQty and contractActualQty. If Purchase contract will force to possitive.

Enhancement

Outstanding Qty & Credit Amt

应收发数量及授信金额表 enhancements

Enhancement

company data entity mgmt - counterparty company name in red after saving bug fixed

Enhancement

change translation in stock management for stock action from 现转仓/仓转现 to 换进/换出 （Swap in/out）

Enhancement

issue invoice cannot save after changing from usd value to cny value

在开票界面选 了一个模式是进出口的合同进行开票，把货币改成CNY,并且修改了单价为人民币价格以后，不能保存这笔开票，有错误提醒

logic for psl and invoice (receive and issue)

a. Currently when select Contract NO will replace ccy with contract ccy, remove the replacement? (psl and receive)

b. For PLS and INVOICE, only phyTradeMode is import/export then allow contract ccy and psl ccy to be different

c. have added psl_ex_rate in db to save exchange rate if psl/invoice ccy is different from contract ccy

FE:

1. add EX RATE in psl, receive, issue table

2. if psl_ccy is the different from selected contract ccy, psl_ex_rate becomes must value

logic

1. need to psl_amt/inv_amt * psl_ex_rate (1 if empty) to calculate un_amt

   1. in psl, receive and issue table

   2. also in phy trade table (unpay amt, un inv amt …)

 make it consistent, it apply to receive and issue table and psl

need to change ex rate accordingly so issue is fixed

Enhancement

add company_id in WAREHOUSE table

for company data,

1. new rule is only have company user is able to access, if no company created, FE to reject and raise error to remind user.

2. for Warehouse table, please add company id in each row for insert.

3. company_id is must item in DB now.

test

1. Group P/L Chart use it as dropdown and Portfolio P/L Details use it to map the label of company

2. paper and broker table

to check if company in dropdown list correct.

we only use main company.

Enhancement

group dashboard access permission level issue

Enhancement

invoice settings is company data. so no matter which user and access level. the data should be viewed to all users of company.

1. in invoice settings table, select API should be similar to warehouse settings table

2. invoice settings as dropdown list, it should be similar to warehouse dropdown list

all done in BE above

for FE:

when insert invoice_settings, please add company_id key and value to BE. it is must item.

view, insert, update, delete if no issue, then consider it as good to go.

Enhancement