Page Comparison

20231218 采销预配

Enhancement

yearly settlement follow-up

how to test

1. use 2022 phy trade

2. add psl (invoice and psl) with the trade (2022)

3. add stock mgmt with the trade (2022)

then do yrly settlement in 2023. see if psl, stock date and remark update correctly.

Enhancement

Procurement and Sales Planning

1. accum_qty will be auto calculate and update in orm level for delete, update and insert

2. add tab after tab Trades in new phy trade page

3. when delete mapping rows in the lower table, could you please enable multiple select, which user is able to delete multiple row at one click

4. PACUUM QTY, PMAIN CONTRACT NO, PCONTRACT NO … (S as well), please add space into PXXX and SXXX)

5. put S ACCUM QTY before S MAIN CONTRACT NO

6. enable multiple select in main table, which user is able to delete those selected rows at one click

7. trying to insert P and S, after click confirm button, it shows save successfully, but can not see new insert row in main table.

8. should 配对框 show 未配对数量

need to do calculation for 未配对数量. coz when user insert p and s contract, FE needs to keep update 未配对数量 to follow mapping logic.

those 未配对数量 in main table. = 0 rows, should not be shown in the insert table.

Enhancement

PSP mapping issue

unmatchedQty = 可卖库存-已配对数量

e.g., phy_trade_id = 103235

可卖库存 = 合同数量（有实际数量用实际数量，无实际数量用合同数量）-对应的已出库数量 which should be 200

已配对数量:

there is no mapped in psp table for trade 103235, so 已配对数量 should be 0

unmatchedQty = 200 - 0 = 200, not 0

1. add counterparty in both tables

   1. insert psp upper and lower tables

   2. psp main table

2. unmatchedQty for sale contract incorrect due to sign of qty issue.

Enhancement

move bal_qty of stock_mgmt into database level.

currently we calcualte bal_qty in BE code lvl, which is not easy to maintain.

we will create a new column called match_bal_qty in stock_mgmt. Orm layer will update match_bal_qty whenever insert, update or delete.

orm layer done. we are able to get stock_bal_qty directly from database (noted that old data stock_bal_qty may be be correct, but could be update if any update with match_id row)

please remove bal_qty in code level and get bal_qty (stock_bal_qty ) from database directly including in PSP table.

testing, you can randomly put stock in / stock out and swap in/out with match id, see if the bal qty is correct.

Enhancement

STOCK APPLICATION

the correct flow should be

application

1. business user to click existing phy trade from top table

2. fill up necessary info in bottom table

3. save

4. after save, the data will be shown in the bottom table, and stock_lvl should be AP

5. note that the user_id should be business user_id

approval

1. add a button APPROVE

2. user multiple select rows in bottom table to approve

3. pop up a window, and user is able to adjust stock qty in pop up window, e.g.,

   1. STOCK application qty is 100

   2. user is able to change to 20

4. click Confirm button to approve

   1. if approved qty = stock application qty

      1. update stock_lvl to EX, which will be shown in stock details table

   2. if approved qty < stock application qty

      1. update current row stock application qty = original stock application qty - approved qty

      2. insert a new approved stock row

         1. user_id should be original user_id

         2. stock_lvl = EX

         3. stock qty = approved qty

      3. update data should be still shown in the bottom table

      4. new insert data should be shown in the stock details table

      5. validation:

         1. approved qty can not > application qty

         2. validate in FE and BE both

1. 1st table is phy trade table. if it is sale, then should be negative

2. lower table is stock in/out table, should be follow stock details rule to show negative or positive

Enhancement

business mode and strategy mapping issue

Enhancement

new business mode request from HT

Enhancement

231212 组别盈亏曲线

enable edit group in settings

Enhancement

231212 归档

Add Archive icon

user select phy trades, press ARCHIVE button to archive them.

Enhancement

231212 取消合同筛选

Enhancement

231207 列定位

在打乱默认格式的前提下使用向左定位，系统会把打乱的列排序恢复成默认排序，视频已发送给CC，

例如，默认列排序是1，2，3，4，5，6， 打乱成1，3，2，5，4，6以后，在3列选择向左定位，应该是1，3列固定不动，后面为2，5，4，6可以拖动；但是现在会恢复成1，2，3列固定不动，后面4，5，6可以拖动

Enhancement

phy yearly settlement API changes

1. press confirm button of settlement, API change to view gl

2. view in pop up window, remove tick box for each row, press insert / save, change API to

   1. return is phy trade select rows, please update phy trade table based on return

Enhancement

Procurement and Sales Planning

Enhancement

Download trade file bug in windows

when download file in trade sftp list, have issue in windows.

Enhancement

add additional header in token to different api_token and login_token

Enhancement

VaR app add end date auto update tick box

Enhancement

20231205 结算价

to show maf_group_id (group name) and user_id (user_name), non editable in settlement tab and updated settlement tab

Enhancement