修改了 指派给 ，旧值为 ""，新值为 "chenjianghua"。
修改了 版本号 ，旧值为 "1"，新值为 "2"。
修改了 需求描述，区别为：

001- 需求背景：因为现在仓租费用没有自动导入利润表，从而导致估算的毛利虚增，影响数据100万左右。为了解决这个问题现在每月手动导入盛宝隆仓租，需要花费技术、财务大量时间处理数据和核对数据，并且导入的数据也不一定准。大约每月耗费时间1人天/月
001+ 需求背景：因为现在仓租费用没有自动导入利润表，从而导致估算的毛利虚增，影响数据100万左右。为了解决这个问题现在每月手动导入盛宝隆仓租，需要花费技术、财务大量时间处理数据和核对数据，并且导入的数据也不一定准。大约每月耗费时间1人天/月
002+
003+ 需求内容：下面的1至5项做成服务，每个月自动跑自动跑，不再需要人工介入
004+
005+ 1、每月2日从fee_warehousechargecount20121220158result1 获取上月的盛宝隆仓租数据
006+ 2、使用fee_warehousechargecount20121220158result1 的FNSKU 与RB_Amazon_Product_Base、RB_OrderSource的FNSKU匹配数据
007+ 3、从RB_Customer_Currency获取汇率信息把原币金额转换为人民币
008+ 4、第2、3步匹配的数据自动同步至Tmp_Report_OrderSettlement_20220225利润临时表之中
009+ 5、同步至Tmp_Report_OrderSettlement_20220225的数据自动同步到 RB_Report_OrderSettlement 利润表

001- 需求背景：因为现在仓租费用没有自动导入利润表，从而导致估算的毛利虚增，影响数据100万左右。为了解决这个问题现在每月手动导入盛宝隆仓租，需要花费技术、财务大量时间处理数据和核对数据，并且导入的数据也不一定准。大约每月耗费时间1人天/月
001+ <p>需求背景：因为现在仓租费用没有自动导入利润表，从而导致估算的毛利虚增，影响数据100万左右。为了解决这个问题现在每月手动导入盛宝隆仓租，需要花费技术、财务大量时间处理数据和核对数据，并且导入的数据也不一定准。大约每月耗费时间1人天/月</p>
002+ <p><br /></p>
003+ <p>需求内容：<strong>下面的1至5项做成服务，每个月自动跑</strong><strong>自动跑，不再需要人工介入</strong></p>
004+ <p><span><strong><br /></strong></span></p>
005+ <p>1、每月2日从fee_warehousechargecount20121220158result1 获取上月的盛宝隆仓租数据</p>
006+ <p>2、使用<span>fee_warehousechargecount20121220158result1 的FNSKU 与</span>RB_Amazon_Product_Base、RB_OrderSource的FNSKU匹配数据</p>
007+ <p>3、从RB_Customer_Currency获取汇率信息把原币金额转换为人民币</p>
008+ <p>4、第2、3步匹配的数据自动同步至Tmp_Report_OrderSettlement_20220225利润临时表之中</p>
009+ <p>5、同步至<span>Tmp_Report_OrderSettlement_20220225的数据自动同步到 RB_Report_OrderSettlement 利润表</span></p>

修改了 版本号 ，旧值为 "2"，新值为 "3"。
修改了 需求描述，区别为：

003- 需求内容：下面的1至5项做成服务，每个月自动跑自动跑，不再需要人工介入
003+ 需求内容：下面的1至5项做成服务，每个月自动跑，不再需要人工介入

003- <p>需求内容：<strong>下面的1至5项做成服务，每个月自动跑</strong><strong>自动跑，不再需要人工介入</strong></p>
003+ <p>需求内容：<strong>下面的1至5项做成服务，每个月自动跑</strong><strong>，不再需要人工介入</strong></p>

修改了 指派给 ，旧值为 "chenjianghua"，新值为 "Admin186"。
修改了 版本号 ，旧值为 "3"，新值为 "4"。
修改了 需求描述，区别为：

001- 需求背景：因为现在仓租费用没有自动导入利润表，从而导致估算的毛利虚增，影响数据100万左右。为了解决这个问题现在每月手动导入盛宝隆仓租，需要花费技术、财务大量时间处理数据和核对数据，并且导入的数据也不一定准。大约每月耗费时间1人天/月
001+ 需求背景：因为现在仓租费用没有自动导入利润表，从而导致估算的毛利虚增，影响数据100万左右。为了解决这个问题现在每月手动导入盛宝隆仓租，需要花费技术、财务大量时间处理数据和核对数据，并且导入的数据也不一定准。大约每月耗费时间2人天/月
003- 需求内容：下面的1至5项做成服务，每个月自动跑，不再需要人工介入
003+ 需求内容：下面的内容做成服务，每个月自动跑，不再需要人工介入
005- 1、每月2日从fee_warehousechargecount20121220158result1 获取上月的盛宝隆仓租数据
005+ 一、每月2日从Fee_WarehouseChargeCountResult 获取上月的盛宝隆仓租数据
006- 2、使用fee_warehousechargecount20121220158result1 的FNSKU 与RB_Amazon_Product_Base、RB_OrderSource的FNSKU匹配数据
006+ 二、使用Fee_WarehouseChargeCountResult 的FNSKU 与RB_Amazon_Product_Base、RB_OrderSource的FNSKU匹配数据
007- 3、从RB_Customer_Currency获取汇率信息把原币金额转换为人民币
007+ 从RB_Amazon_Product_Base表关联的字段：
008- 4、第2、3步匹配的数据自动同步至Tmp_Report_OrderSettlement_20220225利润临时表之中
008+ CustomerID
009- 5、同步至Tmp_Report_OrderSettlement_20220225的数据自动同步到 RB_Report_OrderSettlement 利润表
009+ OrderSourceID
010+ OrderSourceName
011+ ClientSKU AS ClientSKUOrderSourceSKU AS SellerSKU
012+ BusinessAdminID AS BusinessAdminIDBusinessUserName AS BusinessAdminName
013+ BusinessTeam AS BusinessTeamIDBusinessTeamName AS BusinessTeamName
014+ BusinessTeam AS SalesTeamIDBusinessTeamName AS SalesTeamName
015+ ASINorItemID AS ASINorItemID从RB_OrderSource表关联的字段：
016+
017+ OrderSourceCountry AS OrderSourceContry
018+ SaleAdminID AS SalesAdminID
019+ SaleAdminName AS SalesAdminName
020+
021+ 三、从RB_Customer_Currency获取汇率信息把原币金额转换为人民币
022+
023+ -ABS(ff.ChargingAmount * x.ExchangeRMB) = ImportFee
024+
025+ 四、第2、3步匹配处理的数据自动同步至Tmp_Report_OrderSettlement利润临时表之中
026+ 五、同步至Tmp_Report_OrderSettlement的数据自动同步到 RB_Report_OrderSettlement 利润表

001- <p>需求背景：因为现在仓租费用没有自动导入利润表，从而导致估算的毛利虚增，影响数据100万左右。为了解决这个问题现在每月手动导入盛宝隆仓租，需要花费技术、财务大量时间处理数据和核对数据，并且导入的数据也不一定准。大约每月耗费时间1人天/月</p>
001+ <p>需求背景：因为现在仓租费用没有自动导入利润表，从而导致估算的毛利虚增，影响数据100万左右。为了解决这个问题现在每月手动导入盛宝隆仓租，需要花费技术、财务大量时间处理数据和核对数据，并且导入的数据也不一定准。大约每月耗费时间2人天/月</p>
003- <p>需求内容：<strong>下面的1至5项做成服务，每个月自动跑</strong><strong>，不再需要人工介入</strong></p>
003+ <p>需求内容：<strong>下面的内容做成服务，每个月自动跑</strong><strong>，不再需要人工介入</strong></p>
005- <p>1、每月2日从fee_warehousechargecount20121220158result1 获取上月的盛宝隆仓租数据</p>
005+ <p>一、每月2日从Fee_WarehouseChargeCountResult 获取上月的盛宝隆仓租数据</p>
006- <p>2、使用<span>fee_warehousechargecount20121220158result1 的FNSKU 与</span>RB_Amazon_Product_Base、RB_OrderSource的FNSKU匹配数据</p>
006+ <p>二、使用<span><span>Fee_WarehouseChargeCountResult</span><span></span> 的FNSKU 与</span>RB_Amazon_Product_Base、RB_OrderSource的FNSKU匹配数据</p>
007- <p>3、从RB_Customer_Currency获取汇率信息把原币金额转换为人民币</p>
007+ <p><span>从RB_Amazon_Product_Base表关联的字段：</span></p>
008- <p>4、第2、3步匹配的数据自动同步至Tmp_Report_OrderSettlement_20220225利润临时表之中</p>
008+ <p><span>CustomerID</span></p>
009- <p>5、同步至<span>Tmp_Report_OrderSettlement_20220225的数据自动同步到 RB_Report_OrderSettlement 利润表</span></p>
009+ <p><span>OrderSourceID</span></p>
010+ <p><span>OrderSourceName</span></p>
011+ <p><span>ClientSKU AS ClientSKU<br />OrderSourceSKU AS SellerSKU</span></p>
012+ <p><span>BusinessAdminID AS BusinessAdminID<br />BusinessUserName AS BusinessAdminName</span></p>
013+ <p><span>BusinessTeam AS BusinessTeamID<br />BusinessTeamName AS BusinessTeamName</span></p>
014+ <p><span>BusinessTeam AS SalesTeamID<br />BusinessTeamName AS SalesTeamName</span></p>
015+ <p><span>ASINorItemID AS ASINorItemID<br /><br /></span>从RB_OrderSource表关联的字段：</p>
016+ <p>
017+ </p><p class="MsoNormal"><span>OrderSourceCountry AS OrderSourceContry</span></p>
018+ <p class="MsoNormal"><span>SaleAdminID AS SalesAdminID</span></p>
019+ <p class="MsoNormal"><span>SaleAdminName AS SalesAdminName</span></p>
020+
021+ <p>三、从RB_Customer_Currency获取汇率信息把原币金额转换为人民币</p>
022+ <p>
023+ </p><p class="MsoNormal"><span>-ABS(ff.ChargingAmount * x.ExchangeRMB) = ImportFee</span></p>
024+
025+ <p>四、第2、3步匹配处理的数据自动同步至Tmp_Report_OrderSettlement利润临时表之中</p>
026+ <p>五、同步至<span>Tmp_Report_OrderSettlement的数据自动同步到 RB_Report_OrderSettlement 利润表</span></p>

修改了 价值描述 ，旧值为 "因为现在仓租费用没有自动导入利润表，从而导致估算的毛利虚增，影响数据100万左右。为了解决这个问题现在每月手动导入盛宝隆仓租，需要花费技术、财务大量时间处理数据和核对数据，并且导入的数据也不一定准。大约每月耗费时间1人天/月"，新值为 "因为现在仓租费用没有自动导入利润表，从而导致估算的毛利虚增，影响数据100万左右。为了解决这个问题现在每月手动导入盛宝隆仓租，需要花费技术、财务大量时间处理数据和核对数据，并且导入的数据也不一定准。大约每月耗费时间2人天/月"。
修改了 每月价值量，旧值为 "1人天/月"，新值为 "2人天/月"。

修改了 评审时间，旧值为 "0000-00-00"，新值为 "2022-03-09"。
修改了 指派给 ，旧值为 "Admin186"，新值为 "liangguirong"。
修改了 当前状态，旧值为 "draft"，新值为 "active"。
修改了 由谁评审，旧值为 ""，新值为 "Admin186"。

修改了 所属模块，旧值为 "1644"，新值为 "1679"。
修改了 所属计划，旧值为 "504"，新值为 ""。

修改了 所属计划，旧值为 "537"，新值为 "540"。

修改了 当前状态，旧值为 "active"，新值为 "changed"。
修改了 版本号 ，旧值为 "4"，新值为 "5"。
修改了 由谁评审，旧值为 "Admin186"，新值为 ""。
修改了 评审时间，旧值为 "2022-03-09"，新值为 "0000-00-00"。
修改了 需求描述，区别为：

005- 一、每月2日从Fee_WarehouseChargeCountResult 获取上月的盛宝隆仓租数据
005+ 一、定时从盛宝隆仓租费-费用明细列表API获取仓租费用数据，同步至Fee_WarehouseChargeCountdetails
006- 二、使用Fee_WarehouseChargeCountResult 的FNSKU 与RB_Amazon_Product_Base、RB_OrderSource的FNSKU匹配数据
006+ 1.1 每月2日从API中获取2月份整月的数据（覆盖之前的）
007- 从RB_Amazon_Product_Base表关联的字段：
007+ 1.2 每月9日从API获取当前月的所有已出仓租费用数据（覆盖之前的）
008- CustomerID
008+ 1.3每月16日从API获取当前月的所有已出仓租费用数据（覆盖之前的）
009- OrderSourceID
009+ 1.4 每月23日从API获取当前月的所有已出仓租费用数据（覆盖之前的）
010- OrderSourceName
010+
011- ClientSKU AS ClientSKUOrderSourceSKU AS SellerSKU
011+ 二、Fee_WarehouseChargeCountdetails表数据按照仓租费用均摊逻辑把箱产品的仓租费用均摊至条码产品，并把均摊后的数据同步至Fee_WarehouseChargeCountResult
012- BusinessAdminID AS BusinessAdminIDBusinessUserName AS BusinessAdminName
012+ 箱总仓租费用 *（箱内X条码产品体积 / 箱内所有产品体积之和）= X条码产品的均摊费用
013- BusinessTeam AS BusinessTeamIDBusinessTeamName AS BusinessTeamName
013+
014- BusinessTeam AS SalesTeamIDBusinessTeamName AS SalesTeamName
014+ 三、Fee_WarehouseChargeCountResult新增字段OrderSourceID，费用均摊至Fee_WarehouseChargeCountResult表之后，对定时跑服务对数据进行匹配
015- ASINorItemID AS ASINorItemID从RB_OrderSource表关联的字段：
015+
016-
016+ 匹配逻辑1：
017- OrderSourceCountry AS OrderSourceContry
017+
018- SaleAdminID AS SalesAdminID
018+ 使用Fee_WarehouseChargeCountResult 的FNSKU 与RB_Amazon_Product_Base、RB_OrderSource的FNSKU匹配数据
019- SaleAdminName AS SalesAdminName
019+ 从RB_Amazon_Product_Base表关联的字段：
020-
020+ CustomerID
021- 三、从RB_Customer_Currency获取汇率信息把原币金额转换为人民币
021+ OrderSourceID
022-
022+ OrderSourceName
023- -ABS(ff.ChargingAmount * x.ExchangeRMB) = ImportFee
023+ ClientSKU AS ClientSKUOrderSourceSKU AS SellerSKU
024-
024+ BusinessAdminID AS BusinessAdminIDBusinessUserName AS BusinessAdminName
025- 四、第2、3步匹配处理的数据自动同步至Tmp_Report_OrderSettlement利润临时表之中
025+ BusinessTeam AS BusinessTeamIDBusinessTeamName AS BusinessTeamName
026- 五、同步至Tmp_Report_OrderSettlement的数据自动同步到 RB_Report_OrderSettlement 利润表
026+ BusinessTeam AS SalesTeamIDBusinessTeamName AS SalesTeamName
027+ ASINorItemID AS ASINorItemID从RB_OrderSource表关联的字段：
028+
029+ OrderSourceCountry AS OrderSourceContry
030+ SaleAdminID AS SalesAdminID
031+ SaleAdminName AS SalesAdminName
032+
033+ 匹配逻辑2：
034+ Fee_WarehouseChargeCountResult表中使用匹配逻辑1匹配不上的数据，继续使用表中的"ProductSku" "ChildFnsku"字段和赛盒wms库存库龄报告的"商品编码""FNSKU"字段匹配，两个字段都能同时匹配上之时，则取赛盒wms库存库龄报告表中的渠道编码填充到Fee_WarehouseChargeCountResult 表的"OrderSourceID"字段
035+
036+ 四、从RB_Customer_Currency获取汇率信息把原币金额转换为人民币
037+ -ABS(ff.ChargingAmount * x.ExchangeRMB) = ImportFee
038+
039+ 五、第3步匹配处理的数据自动同步至Tmp_Report_OrderSettlement利润临时表之中
040+ 六、同步至Tmp_Report_OrderSettlement的数据自动同步到 RB_Report_OrderSettlement 利润表

005- <p>一、每月2日从Fee_WarehouseChargeCountResult 获取上月的盛宝隆仓租数据</p>
005+ <p>一、定时从盛宝隆仓租费-费用明细列表API获取仓租费用数据，同步至<span>Fee_WarehouseChargeCountdetails</span></p>
006- <p>二、使用<span><span>Fee_WarehouseChargeCountResult</span><span></span> 的FNSKU 与</span>RB_Amazon_Product_Base、RB_OrderSource的FNSKU匹配数据</p>
006+ <p>1.1 每月2日从API中获取2月份整月的数据（覆盖之前的）</p>
007- <p><span>从RB_Amazon_Product_Base表关联的字段：</span></p>
007+ <p>1.2 每月9日从API获取当前月的所有已出仓租费用数据<span>（覆盖之前的</span><span>）</span></p>
008- <p><span>CustomerID</span></p>
008+ <p>1.3<span><span>每月16日从API获取当前月的所有已出仓租费用数据<span>（覆盖之前的</span><span>）</span></span></span></p>
009- <p><span>OrderSourceID</span></p>
009+ <p><span><span><span>1.4 每月23日从API获取当前月的所有已出仓租费用数据<span>（覆盖之前的</span><span>）</span></span></span></span></p>
010- <p><span>OrderSourceName</span></p>
010+ <p><span><span><br /></span></span></p>
011- <p><span>ClientSKU AS ClientSKU<br />OrderSourceSKU AS SellerSKU</span></p>
011+ <p><span><span><span><span>二、Fee_WarehouseChargeCount</span><span>details表数据按照仓租费用均摊逻辑</span></span></span></span>把箱产品的仓租费用均摊至条码产品，并把均摊后的数据同步至Fee_WarehouseChargeCountResult</p>
012- <p><span>BusinessAdminID AS BusinessAdminID<br />BusinessUserName AS BusinessAdminName</span></p>
012+ <p>箱总仓租费用 *（箱内X条码产品体积 / 箱内所有产品体积之和）= X条码产品的均摊费用</p>
013- <p><span>BusinessTeam AS BusinessTeamID<br />BusinessTeamName AS BusinessTeamName</span></p>
013+ <p><br /></p>
014- <p><span>BusinessTeam AS SalesTeamID<br />BusinessTeamName AS SalesTeamName</span></p>
014+ <p>三、<span>Fee_WarehouseChargeCountResult</span><span>新增字段<span style="color:#009900;font-weight:700;">OrderSourceID，</span><span style="color:#009900;font-weight:700;"></span></span>费用均摊至<span>Fee_WarehouseChargeCountResult</span><span>表之后</span>，对定时跑服务对数据进行匹配</p>
015- <p><span>ASINorItemID AS ASINorItemID<br /><br /></span>从RB_OrderSource表关联的字段：</p>
015+ <p><br /></p>
016- <p>
016+ <p><strong>匹配逻辑1：</strong></p>
017- </p><p class="MsoNormal"><span>OrderSourceCountry AS OrderSourceContry</span></p>
017+ <p><br /></p>
018- <p class="MsoNormal"><span>SaleAdminID AS SalesAdminID</span></p>
018+ <p>使用<span><span>Fee_WarehouseChargeCountResult</span><span></span> 的FNSKU 与</span>RB_Amazon_Product_Base、RB_OrderSource的FNSKU匹配数据</p>
019- <p class="MsoNormal"><span>SaleAdminName AS SalesAdminName</span></p>
019+ <p><span>从RB_Amazon_Product_Base表关联的字段：</span></p>
020-
020+ <p><span>CustomerID</span></p>
021- <p>三、从RB_Customer_Currency获取汇率信息把原币金额转换为人民币</p>
021+ <p><span>OrderSourceID</span></p>
022- <p>
022+ <p><span>OrderSourceName</span></p>
023- </p><p class="MsoNormal"><span>-ABS(ff.ChargingAmount * x.ExchangeRMB) = ImportFee</span></p>
023+ <p><span>ClientSKU AS ClientSKU<br />OrderSourceSKU AS SellerSKU</span></p>
024-
024+ <p><span>BusinessAdminID AS BusinessAdminID<br />BusinessUserName AS BusinessAdminName</span></p>
025- <p>四、第2、3步匹配处理的数据自动同步至Tmp_Report_OrderSettlement利润临时表之中</p>
025+ <p><span>BusinessTeam AS BusinessTeamID<br />BusinessTeamName AS BusinessTeamName</span></p>
026- <p>五、同步至<span>Tmp_Report_OrderSettlement的数据自动同步到 RB_Report_OrderSettlement 利润表</span></p>
026+ <p><span>BusinessTeam AS SalesTeamID<br />BusinessTeamName AS SalesTeamName</span></p>
027+ <p><span>ASINorItemID AS ASINorItemID<br /><br /></span>从RB_OrderSource表关联的字段：</p>
028+ <p><br /></p>
029+ <p class="MsoNormal"><span>OrderSourceCountry AS OrderSourceContry</span></p>
030+ <p class="MsoNormal"><span>SaleAdminID AS SalesAdminID</span></p>
031+ <p class="MsoNormal"><span>SaleAdminName AS SalesAdminName</span></p>
032+ <p class="MsoNormal"><span><br /></span></p>
033+ <p class="MsoNormal"><span><strong>匹配逻辑2：</strong></span></p>
034+ <p class="MsoNormal"><span><strong><span style="color:#009900;"><span>Fee_WarehouseChargeCountResult</span><span>表中使用</span>匹配逻辑1匹配不上的数据，继续使用</span></strong><span>表中的"<span>ProductSku</span>"</span> "<span></span><span>ChildFnsku</span>"字段和赛盒wms库存库龄报告的"<span>商品编码</span>"<span>"<span>FNSKU</span>"字段匹配，两个字段都能同时匹配上之时，则取<span>赛盒wms库存库龄报告表中的渠道编码填充到<span style="font-weight:700;"><span style="color:#009900;">Fee_WarehouseChargeCountResult 表的"<span style="color:#009900;font-weight:700;">OrderSourceID</span>"字段</span></span></span></span></span></p>
035+ <p class="MsoNormal"><span><br /></span></p>
036+ <p>四、从RB_Customer_Currency获取汇率信息把原币金额转换为人民币</p>
037+ <p class="MsoNormal"><span>-ABS(ff.ChargingAmount * x.ExchangeRMB) = ImportFee</span></p>
038+ <p class="MsoNormal"><span><br /></span></p>
039+ <p>五、第3步匹配处理的数据自动同步至Tmp_Report_OrderSettlement利润临时表之中</p>
040+ <p>六、同步至<span>Tmp_Report_OrderSettlement的数据自动同步到 RB_Report_OrderSettlement 利润表</span></p>

修改了 价值描述 ，旧值为 "因为现在仓租费用没有自动导入利润表，从而导致估算的毛利虚增，影响数据100万左右。为了解决这个问题现在每月手动导入盛宝隆仓租，需要花费技术、财务大量时间处理数据和核对数据，并且导入的数据也不一定准。大约每月耗费时间2人天/月"，新值为 "因为现在仓租费用没有自动导入利润表，从而导致估算的毛利虚增，影响数据100万左右。为了解决这个问题现在每月手动导入盛宝隆仓租，需要花费技术、财务大量时间处理数据和核对数据，并且导入的数据也不一定准。大约每月耗费时间8人天/月"。
修改了 每月价值量，旧值为 "2人天/月"，新值为 "8人天/月"。

修改了 指派给 ，旧值为 "liangguirong"，新值为 "Admin186"。
修改了 版本号 ，旧值为 "5"，新值为 "6"。
修改了 需求描述，区别为：

006- 1.1 每月2日从API中获取2月份整月的数据（覆盖之前的）
006+
007- 1.2 每月9日从API获取当前月的所有已出仓租费用数据（覆盖之前的）
007+ 每月8日保存计算时间是每月1日至每月7日
008- 1.3每月16日从API获取当前月的所有已出仓租费用数据（覆盖之前的）
008+ 每月15日保存计算时间是每月8日至每月14日
009- 1.4 每月23日从API获取当前月的所有已出仓租费用数据（覆盖之前的）
009+ 每月22日保存计算时间是每月15日至每月21日
010-
010+ 每月2日保存计算时间是上月22日至上月末的
011- 二、Fee_WarehouseChargeCountdetails表数据按照仓租费用均摊逻辑把箱产品的仓租费用均摊至条码产品，并把均摊后的数据同步至Fee_WarehouseChargeCountResult
011+
012- 箱总仓租费用 *（箱内X条码产品体积 / 箱内所有产品体积之和）= X条码产品的均摊费用
012+
013-
013+ 二、Fee_WarehouseChargeCountdetails表数据按照仓租费用均摊逻辑把箱产品的仓租费用均摊至条码产品，并把均摊后的数据同步至Fee_WarehouseChargeCountResult
014- 三、Fee_WarehouseChargeCountResult新增字段OrderSourceID，费用均摊至Fee_WarehouseChargeCountResult表之后，对定时跑服务对数据进行匹配
014+ 箱总仓租费用 *（箱内X条码产品体积 / 箱内所有产品体积之和）= X条码产品的均摊费用
016- 匹配逻辑1：
016+ 三、Fee_WarehouseChargeCountResult新增字段OrderSourceID，费用均摊至Fee_WarehouseChargeCountResult表之后，对定时跑服务对数据进行匹配
018- 使用Fee_WarehouseChargeCountResult 的FNSKU 与RB_Amazon_Product_Base、RB_OrderSource的FNSKU匹配数据
018+ 匹配逻辑1：
019- 从RB_Amazon_Product_Base表关联的字段：
019+
020- CustomerID
020+ 使用Fee_WarehouseChargeCountResult 的FNSKU 与RB_Amazon_Product_Base、RB_OrderSource的FNSKU匹配数据
021- OrderSourceID
021+ 从RB_Amazon_Product_Base表关联的字段：
022- OrderSourceName
022+ CustomerID
023- ClientSKU AS ClientSKUOrderSourceSKU AS SellerSKU
023+ OrderSourceID
024- BusinessAdminID AS BusinessAdminIDBusinessUserName AS BusinessAdminName
024+ OrderSourceName
025- BusinessTeam AS BusinessTeamIDBusinessTeamName AS BusinessTeamName
025+ ClientSKU AS ClientSKUOrderSourceSKU AS SellerSKU
026- BusinessTeam AS SalesTeamIDBusinessTeamName AS SalesTeamName
026+ BusinessAdminID AS BusinessAdminIDBusinessUserName AS BusinessAdminName
027- ASINorItemID AS ASINorItemID从RB_OrderSource表关联的字段：
027+ BusinessTeam AS BusinessTeamIDBusinessTeamName AS BusinessTeamName
028-
028+ BusinessTeam AS SalesTeamIDBusinessTeamName AS SalesTeamName
029- OrderSourceCountry AS OrderSourceContry
029+ ASINorItemID AS ASINorItemID从RB_OrderSource表关联的字段：
030- SaleAdminID AS SalesAdminID
030+
031- SaleAdminName AS SalesAdminName
031+ OrderSourceCountry AS OrderSourceContry
032-
032+ SaleAdminID AS SalesAdminID
033- 匹配逻辑2：
033+ SaleAdminName AS SalesAdminName
034- Fee_WarehouseChargeCountResult表中使用匹配逻辑1匹配不上的数据，继续使用表中的"ProductSku" "ChildFnsku"字段和赛盒wms库存库龄报告的"商品编码""FNSKU"字段匹配，两个字段都能同时匹配上之时，则取赛盒wms库存库龄报告表中的渠道编码填充到Fee_WarehouseChargeCountResult 表的"OrderSourceID"字段
034+
035-
035+ 匹配逻辑2：
036- 四、从RB_Customer_Currency获取汇率信息把原币金额转换为人民币
036+ Fee_WarehouseChargeCountResult表中使用匹配逻辑1匹配不上的数据，继续使用表中的"ProductSku" "ChildFnsku"字段和赛盒wms库存库龄报告的"商品编码""FNSKU"字段匹配，两个字段都能同时匹配上之时，则取赛盒wms库存库龄报告表中的渠道编码填充到Fee_WarehouseChargeCountResult 表的"OrderSourceID"字段
037- -ABS(ff.ChargingAmount * x.ExchangeRMB) = ImportFee
037+
038-
038+ 四、从RB_Customer_Currency获取汇率信息把原币金额转换为人民币
039- 五、第3步匹配处理的数据自动同步至Tmp_Report_OrderSettlement利润临时表之中
039+ -ABS(ff.ChargingAmount * x.ExchangeRMB) = ImportFee
040- 六、同步至Tmp_Report_OrderSettlement的数据自动同步到 RB_Report_OrderSettlement 利润表
040+
041+ 五、第3步匹配处理的数据自动同步至Tmp_Report_OrderSettlement利润临时表之中
042+ 六、同步至Tmp_Report_OrderSettlement的数据自动同步到 RB_Report_OrderSettlement 利润表

006- <p>1.1 每月2日从API中获取2月份整月的数据（覆盖之前的）</p>
006+ <p>
007- <p>1.2 每月9日从API获取当前月的所有已出仓租费用数据<span>（覆盖之前的</span><span>）</span></p>
007+ </p><p>每月8日保存计算时间是每月1日至每月7日</p>
008- <p>1.3<span><span>每月16日从API获取当前月的所有已出仓租费用数据<span>（覆盖之前的</span><span>）</span></span></span></p>
008+ <p>每月15日保存计算时间是每月8日至每月14日</p>
009- <p><span><span><span>1.4 每月23日从API获取当前月的所有已出仓租费用数据<span>（覆盖之前的</span><span>）</span></span></span></span></p>
009+ <p>每月22日保存计算时间是每月15日至每月21日</p>
010- <p><span><span><br /></span></span></p>
010+ <p>每月2日保存计算时间是上月22日至上月末的</p>
011- <p><span><span><span><span>二、Fee_WarehouseChargeCount</span><span>details表数据按照仓租费用均摊逻辑</span></span></span></span>把箱产品的仓租费用均摊至条码产品，并把均摊后的数据同步至Fee_WarehouseChargeCountResult</p>
011+
012- <p>箱总仓租费用 *（箱内X条码产品体积 / 箱内所有产品体积之和）= X条码产品的均摊费用</p>
012+ <p><span><span><br /></span></span></p>
013- <p><br /></p>
013+ <p><span><span><span><span>二、Fee_WarehouseChargeCount</span><span>details表数据按照仓租费用均摊逻辑</span></span></span></span>把箱产品的仓租费用均摊至条码产品，并把均摊后的数据同步至Fee_WarehouseChargeCountResult</p>
014- <p>三、<span>Fee_WarehouseChargeCountResult</span><span>新增字段<span style="color:#009900;font-weight:700;">OrderSourceID，</span><span style="color:#009900;font-weight:700;"></span></span>费用均摊至<span>Fee_WarehouseChargeCountResult</span><span>表之后</span>，对定时跑服务对数据进行匹配</p>
014+ <p>箱总仓租费用 *（箱内X条码产品体积 / 箱内所有产品体积之和）= X条码产品的均摊费用</p>
016- <p><strong>匹配逻辑1：</strong></p>
016+ <p>三、<span>Fee_WarehouseChargeCountResult</span><span>新增字段<span style="color:#009900;font-weight:700;">OrderSourceID，</span><span style="color:#009900;font-weight:700;"></span></span>费用均摊至<span>Fee_WarehouseChargeCountResult</span><span>表之后</span>，对定时跑服务对数据进行匹配</p>
018- <p>使用<span><span>Fee_WarehouseChargeCountResult</span><span></span> 的FNSKU 与</span>RB_Amazon_Product_Base、RB_OrderSource的FNSKU匹配数据</p>
018+ <p><strong>匹配逻辑1：</strong></p>
019- <p><span>从RB_Amazon_Product_Base表关联的字段：</span></p>
019+ <p><br /></p>
020- <p><span>CustomerID</span></p>
020+ <p>使用<span><span>Fee_WarehouseChargeCountResult</span><span></span> 的FNSKU 与</span>RB_Amazon_Product_Base、RB_OrderSource的FNSKU匹配数据</p>
021- <p><span>OrderSourceID</span></p>
021+ <p><span>从RB_Amazon_Product_Base表关联的字段：</span></p>
022- <p><span>OrderSourceName</span></p>
022+ <p><span>CustomerID</span></p>
023- <p><span>ClientSKU AS ClientSKU<br />OrderSourceSKU AS SellerSKU</span></p>
023+ <p><span>OrderSourceID</span></p>
024- <p><span>BusinessAdminID AS BusinessAdminID<br />BusinessUserName AS BusinessAdminName</span></p>
024+ <p><span>OrderSourceName</span></p>
025- <p><span>BusinessTeam AS BusinessTeamID<br />BusinessTeamName AS BusinessTeamName</span></p>
025+ <p><span>ClientSKU AS ClientSKU<br />OrderSourceSKU AS SellerSKU</span></p>
026- <p><span>BusinessTeam AS SalesTeamID<br />BusinessTeamName AS SalesTeamName</span></p>
026+ <p><span>BusinessAdminID AS BusinessAdminID<br />BusinessUserName AS BusinessAdminName</span></p>
027- <p><span>ASINorItemID AS ASINorItemID<br /><br /></span>从RB_OrderSource表关联的字段：</p>
027+ <p><span>BusinessTeam AS BusinessTeamID<br />BusinessTeamName AS BusinessTeamName</span></p>
028- <p><br /></p>
028+ <p><span>BusinessTeam AS SalesTeamID<br />BusinessTeamName AS SalesTeamName</span></p>
029- <p class="MsoNormal"><span>OrderSourceCountry AS OrderSourceContry</span></p>
029+ <p><span>ASINorItemID AS ASINorItemID<br /><br /></span>从RB_OrderSource表关联的字段：</p>
030- <p class="MsoNormal"><span>SaleAdminID AS SalesAdminID</span></p>
030+ <p><br /></p>
031- <p class="MsoNormal"><span>SaleAdminName AS SalesAdminName</span></p>
031+ <p class="MsoNormal"><span>OrderSourceCountry AS OrderSourceContry</span></p>
032- <p class="MsoNormal"><span><br /></span></p>
032+ <p class="MsoNormal"><span>SaleAdminID AS SalesAdminID</span></p>
033- <p class="MsoNormal"><span><strong>匹配逻辑2：</strong></span></p>
033+ <p class="MsoNormal"><span>SaleAdminName AS SalesAdminName</span></p>
034- <p class="MsoNormal"><span><strong><span style="color:#009900;"><span>Fee_WarehouseChargeCountResult</span><span>表中使用</span>匹配逻辑1匹配不上的数据，继续使用</span></strong><span>表中的"<span>ProductSku</span>"</span> "<span></span><span>ChildFnsku</span>"字段和赛盒wms库存库龄报告的"<span>商品编码</span>"<span>"<span>FNSKU</span>"字段匹配，两个字段都能同时匹配上之时，则取<span>赛盒wms库存库龄报告表中的渠道编码填充到<span style="font-weight:700;"><span style="color:#009900;">Fee_WarehouseChargeCountResult 表的"<span style="color:#009900;font-weight:700;">OrderSourceID</span>"字段</span></span></span></span></span></p>
034+ <p class="MsoNormal"><span><br /></span></p>
035- <p class="MsoNormal"><span><br /></span></p>
035+ <p class="MsoNormal"><span><strong>匹配逻辑2：</strong></span></p>
036- <p>四、从RB_Customer_Currency获取汇率信息把原币金额转换为人民币</p>
036+ <p class="MsoNormal"><span><strong><span style="color:#009900;"><span>Fee_WarehouseChargeCountResult</span><span>表中使用</span>匹配逻辑1匹配不上的数据，继续使用</span></strong><span>表中的"<span>ProductSku</span>"</span> "<span></span><span>ChildFnsku</span>"字段和赛盒wms库存库龄报告的"<span>商品编码</span>"<span>"<span>FNSKU</span>"字段匹配，两个字段都能同时匹配上之时，则取<span>赛盒wms库存库龄报告表中的渠道编码填充到<span style="font-weight:700;"><span style="color:#009900;">Fee_WarehouseChargeCountResult 表的"<span style="color:#009900;font-weight:700;">OrderSourceID</span>"字段</span></span></span></span></span></p>
037- <p class="MsoNormal"><span>-ABS(ff.ChargingAmount * x.ExchangeRMB) = ImportFee</span></p>
037+ <p class="MsoNormal"><span><br /></span></p>
038- <p class="MsoNormal"><span><br /></span></p>
038+ <p>四、从RB_Customer_Currency获取汇率信息把原币金额转换为人民币</p>
039- <p>五、第3步匹配处理的数据自动同步至Tmp_Report_OrderSettlement利润临时表之中</p>
039+ <p class="MsoNormal"><span>-ABS(ff.ChargingAmount * x.ExchangeRMB) = ImportFee</span></p>
040- <p>六、同步至<span>Tmp_Report_OrderSettlement的数据自动同步到 RB_Report_OrderSettlement 利润表</span></p>
040+ <p class="MsoNormal"><span><br /></span></p>
041+ <p>五、第3步匹配处理的数据自动同步至Tmp_Report_OrderSettlement利润临时表之中</p>
042+ <p>六、同步至<span>Tmp_Report_OrderSettlement的数据自动同步到 RB_Report_OrderSettlement 利润表</span></p>

修改了 版本号 ，旧值为 "6"，新值为 "7"。
修改了 需求描述，区别为：

006-
006+
007- 每月8日保存计算时间是每月1日至每月7日
007+ 每月8日保存计算时间是每月1日至每月7日
008- 每月15日保存计算时间是每月8日至每月14日
008+ 每月15日保存计算时间是每月8日至每月14日
009- 每月22日保存计算时间是每月15日至每月21日
009+ 每月22日保存计算时间是每月15日至每月21日
010- 每月2日保存计算时间是上月22日至上月末的
010+ 每月2日保存计算时间是上月22日至上月末的
011-
011+
012-
012+ 二、Fee_WarehouseChargeCountdetails表数据按照仓租费用均摊逻辑把箱产品的仓租费用均摊至条码产品，并把均摊后的数据同步至Fee_WarehouseChargeCountResult
013- 二、Fee_WarehouseChargeCountdetails表数据按照仓租费用均摊逻辑把箱产品的仓租费用均摊至条码产品，并把均摊后的数据同步至Fee_WarehouseChargeCountResult
013+ 箱总仓租费用 *（箱内X条码产品体积 / 箱内所有产品体积之和）= X条码产品的均摊费用
014- 箱总仓租费用 *（箱内X条码产品体积 / 箱内所有产品体积之和）= X条码产品的均摊费用
014+
015-
015+ 三、费用均摊至Fee_WarehouseChargeCountResult表之后，对定时跑服务对数据进行匹配
016- 三、Fee_WarehouseChargeCountResult新增字段OrderSourceID，费用均摊至Fee_WarehouseChargeCountResult表之后，对定时跑服务对数据进行匹配
016+
017-
017+ 匹配逻辑1：
018- 匹配逻辑1：
018+
019-
019+ 使用Fee_WarehouseChargeCountResult 的FNSKU 与RB_Amazon_Product_Base、RB_OrderSource的FNSKU匹配数据
020- 使用Fee_WarehouseChargeCountResult 的FNSKU 与RB_Amazon_Product_Base、RB_OrderSource的FNSKU匹配数据
020+ 从RB_Amazon_Product_Base表关联的字段：
021- 从RB_Amazon_Product_Base表关联的字段：
021+ CustomerID
022- CustomerID
022+ OrderSourceID
023- OrderSourceID
023+ OrderSourceName
024- OrderSourceName
024+ ClientSKU AS ClientSKUOrderSourceSKU AS SellerSKU
025- ClientSKU AS ClientSKUOrderSourceSKU AS SellerSKU
025+ BusinessAdminID AS BusinessAdminIDBusinessUserName AS BusinessAdminName
026- BusinessAdminID AS BusinessAdminIDBusinessUserName AS BusinessAdminName
026+ BusinessTeam AS BusinessTeamIDBusinessTeamName AS BusinessTeamName
027- BusinessTeam AS BusinessTeamIDBusinessTeamName AS BusinessTeamName
027+ BusinessTeam AS SalesTeamIDBusinessTeamName AS SalesTeamName
028- BusinessTeam AS SalesTeamIDBusinessTeamName AS SalesTeamName
028+ ASINorItemID AS ASINorItemID从RB_OrderSource表关联的字段：
029- ASINorItemID AS ASINorItemID从RB_OrderSource表关联的字段：
029+
030-
030+ OrderSourceCountry AS OrderSourceContry
031- OrderSourceCountry AS OrderSourceContry
031+ SaleAdminID AS SalesAdminID
032- SaleAdminID AS SalesAdminID
032+ SaleAdminName AS SalesAdminName
033- SaleAdminName AS SalesAdminName
033+
034-
034+ 匹配逻辑2：
035- 匹配逻辑2：
035+ Fee_WarehouseChargeCountResult表中使用匹配逻辑1匹配不上的数据且ErpChannelSourceId不为空值时，继续使用表中的"ProductSku" "ChildFnsku"字段和赛盒wms库存库龄报告的"商品编码""FNSKU"字段匹配，两个字段都能同时匹配上之时，则取赛盒wms库存库龄报告表中的渠道编码填充到Fee_WarehouseChargeCountResult 表的"ErpChannelSourceId"字段
036- Fee_WarehouseChargeCountResult表中使用匹配逻辑1匹配不上的数据，继续使用表中的"ProductSku" "ChildFnsku"字段和赛盒wms库存库龄报告的"商品编码""FNSKU"字段匹配，两个字段都能同时匹配上之时，则取赛盒wms库存库龄报告表中的渠道编码填充到Fee_WarehouseChargeCountResult 表的"OrderSourceID"字段
036+ 四、从RB_Customer_Currency获取汇率信息把原币金额转换为人民币
037-
037+ -ABS(ff.ChargingAmount * x.ExchangeRMB) = ImportFee
038- 四、从RB_Customer_Currency获取汇率信息把原币金额转换为人民币
038+
039- -ABS(ff.ChargingAmount * x.ExchangeRMB) = ImportFee
039+ 五、第3步匹配处理的数据自动同步至Tmp_Report_OrderSettlement利润临时表之中
040-
040+ 六、同步至Tmp_Report_OrderSettlement的数据自动同步到 RB_Report_OrderSettlement 利润表
041- 五、第3步匹配处理的数据自动同步至Tmp_Report_OrderSettlement利润临时表之中
041+
042- 六、同步至Tmp_Report_OrderSettlement的数据自动同步到 RB_Report_OrderSettlement 利润表
042+ 同步利润表逻辑：
043+ pb.CustomerID, ff.ChargingDate AS SettlementDate, pb.OrderSourceID, pb.OrderSourceName, '' AS ClientOrderCode, '' AS OrderCode, '' AS TransactionId, ff.ChargingDate AS PayTime, ff.ChargingDate AS ShipTime, os.OrderSourceCountry AS OrderSourceContry, Y.Id AS WareHouseID, Y.WareHouseName AS WareHouseName, 0 AS TransportID, '' AS TransportName, '' AS TrackNumbers, -- -ABS(ff.ChargingAmount * x.ExchangeRMB) AS TotalPrice, 0 AS TotalPrice, x.ExchangeRMB AS ExchangeRMB, --人民币兑美元汇率 @USD_Exchange AS USD_ExchangeRMB, x.Currency AS Currency, '' AS OperatorName, '盛宝隆仓租导入2022010122020210-36092.536117675' AS OrderDescription, ff.ProductSku AS SKU, pb.ClientSKU AS ClientSKU, pb.OrderSourceSKU AS SellerSKU, ff.ChildFnsku AS OrderItemId, 0 AS ProductSalesPrice, 0 AS ProductShipPrice, pb.ProductNameCN AS ProductNameCN, 0 AS ProductGrossWeight, 0 AS LastSupplierPrice, 1 AS ProductNum, 0 AS ProdutNumUpdate, '' AS GroupSKU, 0 AS GroupProductNum, '' AS AssignDevelopAdminName, '' AS DevelopAdminName, '' AS EditAdminName, '' AS ImageAdminName, pb.BusinessAdminID AS BusinessAdminID, pb.BusinessUserName AS BusinessAdminName, '' AS BuyerName, '' AS CheckAdminName, pb.BusinessTeam AS BusinessTeamID, pb.BusinessTeamName AS BusinessTeamName, -ABS(ff.ChargingAmount * x.ExchangeRMB) AS Profits, --0 AS Profits, 0 AS Incomes, -ABS(ff.ChargingAmount * x.ExchangeRMB) AS Expenses, 0 AS SalesPrice, 0 AS TransportPay, 0 AS SalesRefunds, 0 AS PromotionRebates, 0 AS OtherCredits, 0 AS CommisionFee, 0 AS FBATransactionFees, -- -ABS(ff.ChargingAmount * x.ExchangeRMB) AS OrderSourceOtherDebits, 0 AS OrderSourceOtherDebits, 0 AS BuyPrice, 0 AS PackageFees, 0 AS OverSeasShipFees, 0 AS FirstLegFees, 0 AS TariffFees, 0 AS ExchangeLost, 0 AS ProductReturnsFee, ff.ChargingDate AS AddTime, 1 AS OrderSourceType, 0 AS PackagedCost, ff.ChargingDate AS OrderAddedTime, 0 AS OrderStatus, 3 AS OrderState, os.SaleAdminID AS SalesAdminID, os.SaleAdminName AS SalesAdminName, --销售小组 pb.BusinessTeam AS SalesTeamID, pb.BusinessTeamName AS SalesTeamName, ff.ChargingDate AS ConfirmTime, ff.ChargingDate AS PayDate, ff.ChargingDate AS SettlementShortDate, '' AS DevIDSellerId, '' AS SellerUserID, '' AS PaypalAccount, 0 AS CostOfAdvertising, 0 AS IsBiSycnComplete, GETDATE() AS BiSycnCompleteTime, ff.ChargingDate AS ShipDate, GETDATE() AS UpdateTime, CONVERT(INT,ff.CustomerCode) AS OrderListID, 0 AS SalesVatFee, 0 AS SubsidyPrice, 0 AS DistributionPrice, pb.ASINorItemID AS ASINorItemID, '' AS ProductGroupSKU, 0 AS AddOrderReasonType, 0 AS WareHouseManagementPrice, 0 AS CustomFeeOtherCostPrice, 0 AS TaxRefundFee, 0 AS Tax, 0 AS MarketplaceFacilitatorTax, -ABS(ff.ChargingAmount * x.ExchangeRMB) AS ImportFee, 0 AS PromotionType, 0 AS CostOfStorageFee, 0 AS RelationID, 0 AS IsBuildFee, ff.ID AS FeeWarehouseChargeID

006- <p>
006+ <p><br /></p>
007- </p><p>每月8日保存计算时间是每月1日至每月7日</p>
007+ <p>每月8日保存计算时间是每月1日至每月7日</p>
008- <p>每月15日保存计算时间是每月8日至每月14日</p>
008+ <p>每月15日保存计算时间是每月8日至每月14日</p>
009- <p>每月22日保存计算时间是每月15日至每月21日</p>
009+ <p>每月22日保存计算时间是每月15日至每月21日</p>
010- <p>每月2日保存计算时间是上月22日至上月末的</p>
010+ <p>每月2日保存计算时间是上月22日至上月末的</p>
011-
011+ <p><span><span><br /></span></span></p>
012- <p><span><span><br /></span></span></p>
012+ <p><span><span><span><span>二、Fee_WarehouseChargeCount</span><span>details表数据按照仓租费用均摊逻辑</span></span></span></span>把箱产品的仓租费用均摊至条码产品，并把均摊后的数据同步至Fee_WarehouseChargeCountResult</p>
013- <p><span><span><span><span>二、Fee_WarehouseChargeCount</span><span>details表数据按照仓租费用均摊逻辑</span></span></span></span>把箱产品的仓租费用均摊至条码产品，并把均摊后的数据同步至Fee_WarehouseChargeCountResult</p>
013+ <p>箱总仓租费用 *（箱内X条码产品体积 / 箱内所有产品体积之和）= X条码产品的均摊费用</p>
014- <p>箱总仓租费用 *（箱内X条码产品体积 / 箱内所有产品体积之和）= X条码产品的均摊费用</p>
014+ <p><br /></p>
015- <p><br /></p>
015+ <p>三、费用均摊至<span>Fee_WarehouseChargeCountResult</span><span>表之后</span>，对定时跑服务对数据进行匹配</p>
016- <p>三、<span>Fee_WarehouseChargeCountResult</span><span>新增字段<span style="color:#009900;font-weight:700;">OrderSourceID，</span><span style="color:#009900;font-weight:700;"></span></span>费用均摊至<span>Fee_WarehouseChargeCountResult</span><span>表之后</span>，对定时跑服务对数据进行匹配</p>
016+ <p><br /></p>
017- <p><br /></p>
017+ <p><strong>匹配逻辑1：</strong></p>
018- <p><strong>匹配逻辑1：</strong></p>
018+ <p><br /></p>
019- <p><br /></p>
019+ <p>使用<span><span>Fee_WarehouseChargeCountResult</span><span></span> 的FNSKU 与</span>RB_Amazon_Product_Base、RB_OrderSource的FNSKU匹配数据</p>
020- <p>使用<span><span>Fee_WarehouseChargeCountResult</span><span></span> 的FNSKU 与</span>RB_Amazon_Product_Base、RB_OrderSource的FNSKU匹配数据</p>
020+ <p><span>从RB_Amazon_Product_Base表关联的字段：</span></p>
021- <p><span>从RB_Amazon_Product_Base表关联的字段：</span></p>
021+ <p><span>CustomerID</span></p>
022- <p><span>CustomerID</span></p>
022+ <p><span>OrderSourceID</span></p>
023- <p><span>OrderSourceID</span></p>
023+ <p><span>OrderSourceName</span></p>
024- <p><span>OrderSourceName</span></p>
024+ <p><span>ClientSKU AS ClientSKU<br />OrderSourceSKU AS SellerSKU</span></p>
025- <p><span>ClientSKU AS ClientSKU<br />OrderSourceSKU AS SellerSKU</span></p>
025+ <p><span>BusinessAdminID AS BusinessAdminID<br />BusinessUserName AS BusinessAdminName</span></p>
026- <p><span>BusinessAdminID AS BusinessAdminID<br />BusinessUserName AS BusinessAdminName</span></p>
026+ <p><span>BusinessTeam AS BusinessTeamID<br />BusinessTeamName AS BusinessTeamName</span></p>
027- <p><span>BusinessTeam AS BusinessTeamID<br />BusinessTeamName AS BusinessTeamName</span></p>
027+ <p><span>BusinessTeam AS SalesTeamID<br />BusinessTeamName AS SalesTeamName</span></p>
028- <p><span>BusinessTeam AS SalesTeamID<br />BusinessTeamName AS SalesTeamName</span></p>
028+ <p><span>ASINorItemID AS ASINorItemID<br /><br /></span>从RB_OrderSource表关联的字段：</p>
029- <p><span>ASINorItemID AS ASINorItemID<br /><br /></span>从RB_OrderSource表关联的字段：</p>
029+ <p><br /></p>
030- <p><br /></p>
030+ <p class="MsoNormal"><span>OrderSourceCountry AS OrderSourceContry</span></p>
031- <p class="MsoNormal"><span>OrderSourceCountry AS OrderSourceContry</span></p>
031+ <p class="MsoNormal"><span>SaleAdminID AS SalesAdminID</span></p>
032- <p class="MsoNormal"><span>SaleAdminID AS SalesAdminID</span></p>
032+ <p class="MsoNormal"><span>SaleAdminName AS SalesAdminName</span></p>
033- <p class="MsoNormal"><span>SaleAdminName AS SalesAdminName</span></p>
033+ <p class="MsoNormal"><span><br /></span></p>
034- <p class="MsoNormal"><span><br /></span></p>
034+ <p class="MsoNormal"><span><strong>匹配逻辑2：</strong></span></p>
035- <p class="MsoNormal"><span><strong>匹配逻辑2：</strong></span></p>
035+ <p class="MsoNormal"><span><strong><span style="color:#009900;"><span>Fee_WarehouseChargeCountResult</span><span>表中使用</span>匹配逻辑1匹配不上的数据且<span style="color:#000000;font-weight:700;">ErpChannelSourceId不为空值时</span>，</span></strong></span><strong><span style="color:#009900;">继续使用</span></strong>表中的"ProductSku" "ChildFnsku"字段和赛盒wms库存库龄报告的"商品编码""FNSKU"字段匹配，两个字段都能同时匹配上之时，则取赛盒wms库存库龄报告表中的渠道编码填充到<span style="font-weight:700;"><span style="color:#009900;"><span style="color:#000000;">Fee_WarehouseChargeCountResult 表的"</span><span style="color:#000000;">ErpChannelSourceId</span><span style="color:#000000;">"字段</span></span></span></p>
036- <p class="MsoNormal"><span><strong><span style="color:#009900;"><span>Fee_WarehouseChargeCountResult</span><span>表中使用</span>匹配逻辑1匹配不上的数据，继续使用</span></strong><span>表中的"<span>ProductSku</span>"</span> "<span></span><span>ChildFnsku</span>"字段和赛盒wms库存库龄报告的"<span>商品编码</span>"<span>"<span>FNSKU</span>"字段匹配，两个字段都能同时匹配上之时，则取<span>赛盒wms库存库龄报告表中的渠道编码填充到<span style="font-weight:700;"><span style="color:#009900;">Fee_WarehouseChargeCountResult 表的"<span style="color:#009900;font-weight:700;">OrderSourceID</span>"字段</span></span></span></span></span></p>
036+ <p>四、从RB_Customer_Currency获取汇率信息把原币金额转换为人民币</p>
037- <p class="MsoNormal"><span><br /></span></p>
037+ <p class="MsoNormal"><span>-ABS(ff.ChargingAmount * x.ExchangeRMB) = ImportFee</span></p>
038- <p>四、从RB_Customer_Currency获取汇率信息把原币金额转换为人民币</p>
038+ <p class="MsoNormal"><span><br /></span></p>
039- <p class="MsoNormal"><span>-ABS(ff.ChargingAmount * x.ExchangeRMB) = ImportFee</span></p>
039+ <p>五、第3步匹配处理的数据自动同步至Tmp_Report_OrderSettlement利润临时表之中</p>
040- <p class="MsoNormal"><span><br /></span></p>
040+ <p>六、同步至<span>Tmp_Report_OrderSettlement的数据自动同步到 RB_Report_OrderSettlement 利润表</span></p>
041- <p>五、第3步匹配处理的数据自动同步至Tmp_Report_OrderSettlement利润临时表之中</p>
041+ <p><span><br /></span></p>
042- <p>六、同步至<span>Tmp_Report_OrderSettlement的数据自动同步到 RB_Report_OrderSettlement 利润表</span></p>
042+ <p><span>同步利润表逻辑：</span></p>
043+ <p><span> pb.CustomerID,<br /> ff.ChargingDate AS SettlementDate,<br /> pb.OrderSourceID,<br /> pb.OrderSourceName,<br /> '' AS ClientOrderCode,<br /> '' AS OrderCode,<br /> '' AS TransactionId,<br /> ff.ChargingDate AS PayTime,<br /> ff.ChargingDate AS ShipTime,<br /> os.OrderSourceCountry AS OrderSourceContry,<br /> Y.Id AS WareHouseID,<br /> Y.WareHouseName AS WareHouseName,<br /> 0 AS TransportID,<br /> '' AS TransportName,<br /> '' AS TrackNumbers,<br /> -- -ABS(ff.ChargingAmount * x.ExchangeRMB) AS TotalPrice,<br /> 0 AS TotalPrice,<br /> x.ExchangeRMB AS ExchangeRMB,<br /> --人民币兑美元汇率<br /> @USD_Exchange AS USD_ExchangeRMB,<br /> x.Currency AS Currency,<br /> '' AS OperatorName,<br /> '盛宝隆仓租导入2022010122020210-36092.536117675' AS OrderDescription,<br /> ff.ProductSku AS SKU,<br /> pb.ClientSKU AS ClientSKU,<br /> pb.OrderSourceSKU AS SellerSKU,<br /> ff.ChildFnsku AS OrderItemId,<br /> 0 AS ProductSalesPrice,<br /> 0 AS ProductShipPrice,<br /> pb.ProductNameCN AS ProductNameCN,<br /> 0 AS ProductGrossWeight,<br /> 0 AS LastSupplierPrice,<br /> 1 AS ProductNum,<br /> 0 AS ProdutNumUpdate,<br /> '' AS GroupSKU,<br /> 0 AS GroupProductNum,<br /> '' AS AssignDevelopAdminName,<br /> '' AS DevelopAdminName,<br /> '' AS EditAdminName,<br /> '' AS ImageAdminName,<br /> pb.BusinessAdminID AS BusinessAdminID,<br /> pb.BusinessUserName AS BusinessAdminName,<br /> '' AS BuyerName,<br /> '' AS CheckAdminName,<br /> pb.BusinessTeam AS BusinessTeamID,<br /> pb.BusinessTeamName AS BusinessTeamName,<br /> -ABS(ff.ChargingAmount * x.ExchangeRMB) AS Profits,<br /> --0 AS Profits,<br /> 0 AS Incomes,<br /> -ABS(ff.ChargingAmount * x.ExchangeRMB) AS Expenses,<br /> 0 AS SalesPrice,<br /> 0 AS TransportPay,<br /> 0 AS SalesRefunds,<br /> 0 AS PromotionRebates,<br /> 0 AS OtherCredits,<br /> 0 AS CommisionFee,<br /> 0 AS FBATransactionFees,<br /> -- -ABS(ff.ChargingAmount * x.ExchangeRMB) AS OrderSourceOtherDebits,<br /> 0 AS OrderSourceOtherDebits,<br /> 0 AS BuyPrice,<br /> 0 AS PackageFees,<br /> 0 AS OverSeasShipFees,<br /> 0 AS FirstLegFees,<br /> 0 AS TariffFees,<br /> 0 AS ExchangeLost,<br /> 0 AS ProductReturnsFee,<br /> ff.ChargingDate AS AddTime,<br /> 1 AS OrderSourceType,<br /> 0 AS PackagedCost,<br /> ff.ChargingDate AS OrderAddedTime,<br /> 0 AS OrderStatus,<br /> 3 AS OrderState,<br /> os.SaleAdminID AS SalesAdminID,<br /> os.SaleAdminName AS SalesAdminName,<br /> --销售小组<br /> pb.BusinessTeam AS SalesTeamID,<br /> pb.BusinessTeamName AS SalesTeamName,<br /> ff.ChargingDate AS ConfirmTime,<br /> ff.ChargingDate AS PayDate,<br /> ff.ChargingDate AS SettlementShortDate,<br /> '' AS DevIDSellerId,<br /> '' AS SellerUserID,<br /> '' AS PaypalAccount,<br /> 0 AS CostOfAdvertising,<br /> 0 AS IsBiSycnComplete,<br /> GETDATE() AS BiSycnCompleteTime,<br /> ff.ChargingDate AS ShipDate,<br /> GETDATE() AS UpdateTime,<br /> CONVERT(INT,ff.CustomerCode) AS OrderListID,<br /> 0 AS SalesVatFee,<br /> 0 AS SubsidyPrice,<br /> 0 AS DistributionPrice,<br /> pb.ASINorItemID AS ASINorItemID,<br /> '' AS ProductGroupSKU,<br /> 0 AS AddOrderReasonType,<br /> 0 AS WareHouseManagementPrice,<br /> 0 AS CustomFeeOtherCostPrice,<br /> 0 AS TaxRefundFee,<br /> 0 AS Tax,<br /> 0 AS MarketplaceFacilitatorTax,<br /> -ABS(ff.ChargingAmount * x.ExchangeRMB) AS ImportFee,<br /> 0 AS PromotionType,<br /> 0 AS CostOfStorageFee,<br /> 0 AS RelationID,<br /> 0 AS IsBuildFee,<br /> ff.ID AS FeeWarehouseChargeID<br /></span></p>

修改了 版本号 ，旧值为 "7"，新值为 "8"。
修改了 需求描述，区别为：

006-
006+ 每天获取结算时间为前一天的
007- 每月8日保存计算时间是每月1日至每月7日
007+
008- 每月15日保存计算时间是每月8日至每月14日
008+ 二、Fee_WarehouseChargeCountdetails表数据按照仓租费用均摊逻辑把箱产品的仓租费用均摊至条码产品，并把均摊后的数据同步至Fee_WarehouseChargeCountResult
009- 每月22日保存计算时间是每月15日至每月21日
009+ 箱总仓租费用 *（箱内X条码产品体积 / 箱内所有产品体积之和）= X条码产品的均摊费用
010- 每月2日保存计算时间是上月22日至上月末的
010+
011-
011+ 三、费用均摊至Fee_WarehouseChargeCountResult表之后，对定时跑服务对数据进行匹配
012- 二、Fee_WarehouseChargeCountdetails表数据按照仓租费用均摊逻辑把箱产品的仓租费用均摊至条码产品，并把均摊后的数据同步至Fee_WarehouseChargeCountResult
012+
013- 箱总仓租费用 *（箱内X条码产品体积 / 箱内所有产品体积之和）= X条码产品的均摊费用
013+ 匹配逻辑1：
015- 三、费用均摊至Fee_WarehouseChargeCountResult表之后，对定时跑服务对数据进行匹配
015+ 使用Fee_WarehouseChargeCountResult 的FNSKU 与RB_Amazon_Product_Base、RB_OrderSource的FNSKU匹配数据
016-
016+ 从RB_Amazon_Product_Base表关联的字段：
017- 匹配逻辑1：
017+ CustomerID
018-
018+ OrderSourceID
019- 使用Fee_WarehouseChargeCountResult 的FNSKU 与RB_Amazon_Product_Base、RB_OrderSource的FNSKU匹配数据
019+ OrderSourceName
020- 从RB_Amazon_Product_Base表关联的字段：
020+ ClientSKU AS ClientSKUOrderSourceSKU AS SellerSKU
021- CustomerID
021+ BusinessAdminID AS BusinessAdminIDBusinessUserName AS BusinessAdminName
022- OrderSourceID
022+ BusinessTeam AS BusinessTeamIDBusinessTeamName AS BusinessTeamName
023- OrderSourceName
023+ BusinessTeam AS SalesTeamIDBusinessTeamName AS SalesTeamName
024- ClientSKU AS ClientSKUOrderSourceSKU AS SellerSKU
024+ ASINorItemID AS ASINorItemID从RB_OrderSource表关联的字段：
025- BusinessAdminID AS BusinessAdminIDBusinessUserName AS BusinessAdminName
025+
026- BusinessTeam AS BusinessTeamIDBusinessTeamName AS BusinessTeamName
026+ OrderSourceCountry AS OrderSourceContry
027- BusinessTeam AS SalesTeamIDBusinessTeamName AS SalesTeamName
027+ SaleAdminID AS SalesAdminID
028- ASINorItemID AS ASINorItemID从RB_OrderSource表关联的字段：
028+ SaleAdminName AS SalesAdminName
029-
029+
030- OrderSourceCountry AS OrderSourceContry
030+ 匹配逻辑2：
031- SaleAdminID AS SalesAdminID
031+ Fee_WarehouseChargeCountResult表中使用匹配逻辑1匹配不上的数据且ErpChannelSourceId不为空值时，继续使用表中的"ProductSku" "ChildFnsku"字段和赛盒wms库存库龄报告的"商品编码""FNSKU"字段匹配，两个字段都能同时匹配上之时，则取赛盒wms库存库龄报告表中的渠道编码填充到Fee_WarehouseChargeCountResult 表的"ErpChannelSourceId"字段
032- SaleAdminName AS SalesAdminName
032+ 四、从RB_Customer_Currency获取汇率信息把原币金额转换为人民币
033-
033+ -ABS(ff.ChargingAmount * x.ExchangeRMB) = ImportFee
034- 匹配逻辑2：
034+
035- Fee_WarehouseChargeCountResult表中使用匹配逻辑1匹配不上的数据且ErpChannelSourceId不为空值时，继续使用表中的"ProductSku" "ChildFnsku"字段和赛盒wms库存库龄报告的"商品编码""FNSKU"字段匹配，两个字段都能同时匹配上之时，则取赛盒wms库存库龄报告表中的渠道编码填充到Fee_WarehouseChargeCountResult 表的"ErpChannelSourceId"字段
035+ 五、第3步匹配处理的数据自动同步至Tmp_Report_OrderSettlement利润临时表之中
036- 四、从RB_Customer_Currency获取汇率信息把原币金额转换为人民币
036+ 六、同步至Tmp_Report_OrderSettlement的数据自动同步到 RB_Report_OrderSettlement 利润表
037- -ABS(ff.ChargingAmount * x.ExchangeRMB) = ImportFee
037+
038-
038+ 同步利润表逻辑：
039- 五、第3步匹配处理的数据自动同步至Tmp_Report_OrderSettlement利润临时表之中
039+ pb.CustomerID, ff.ChargingDate AS SettlementDate, pb.OrderSourceID, pb.OrderSourceName, '' AS ClientOrderCode, '' AS OrderCode, '' AS TransactionId, ff.ChargingDate AS PayTime, ff.ChargingDate AS ShipTime, os.OrderSourceCountry AS OrderSourceContry, Y.Id AS WareHouseID, Y.WareHouseName AS WareHouseName, 0 AS TransportID, '' AS TransportName, '' AS TrackNumbers, -- -ABS(ff.ChargingAmount * x.ExchangeRMB) AS TotalPrice, 0 AS TotalPrice, x.ExchangeRMB AS ExchangeRMB, --人民币兑美元汇率 @USD_Exchange AS USD_ExchangeRMB, x.Currency AS Currency, '' AS OperatorName, '盛宝隆仓租导入2022010122020210-36092.536117675' AS OrderDescription, ff.ProductSku AS SKU, pb.ClientSKU AS ClientSKU, pb.OrderSourceSKU AS SellerSKU, ff.ChildFnsku AS OrderItemId, 0 AS ProductSalesPrice, 0 AS ProductShipPrice, pb.ProductNameCN AS ProductNameCN, 0 AS ProductGrossWeight, 0 AS LastSupplierPrice, 1 AS ProductNum, 0 AS ProdutNumUpdate, '' AS GroupSKU, 0 AS GroupProductNum, '' AS AssignDevelopAdminName, '' AS DevelopAdminName, '' AS EditAdminName, '' AS ImageAdminName, pb.BusinessAdminID AS BusinessAdminID, pb.BusinessUserName AS BusinessAdminName, '' AS BuyerName, '' AS CheckAdminName, pb.BusinessTeam AS BusinessTeamID, pb.BusinessTeamName AS BusinessTeamName, -ABS(ff.ChargingAmount * x.ExchangeRMB) AS Profits, --0 AS Profits, 0 AS Incomes, -ABS(ff.ChargingAmount * x.ExchangeRMB) AS Expenses, 0 AS SalesPrice, 0 AS TransportPay, 0 AS SalesRefunds, 0 AS PromotionRebates, 0 AS OtherCredits, 0 AS CommisionFee, 0 AS FBATransactionFees, -- -ABS(ff.ChargingAmount * x.ExchangeRMB) AS OrderSourceOtherDebits, 0 AS OrderSourceOtherDebits, 0 AS BuyPrice, 0 AS PackageFees, 0 AS OverSeasShipFees, 0 AS FirstLegFees, 0 AS TariffFees, 0 AS ExchangeLost, 0 AS ProductReturnsFee, ff.ChargingDate AS AddTime, 1 AS OrderSourceType, 0 AS PackagedCost, ff.ChargingDate AS OrderAddedTime, 0 AS OrderStatus, 3 AS OrderState, os.SaleAdminID AS SalesAdminID, os.SaleAdminName AS SalesAdminName, --销售小组 pb.BusinessTeam AS SalesTeamID, pb.BusinessTeamName AS SalesTeamName, ff.ChargingDate AS ConfirmTime, ff.ChargingDate AS PayDate, ff.ChargingDate AS SettlementShortDate, '' AS DevIDSellerId, '' AS SellerUserID, '' AS PaypalAccount, 0 AS CostOfAdvertising, 0 AS IsBiSycnComplete, GETDATE() AS BiSycnCompleteTime, ff.ChargingDate AS ShipDate, GETDATE() AS UpdateTime, CONVERT(INT,ff.CustomerCode) AS OrderListID, 0 AS SalesVatFee, 0 AS SubsidyPrice, 0 AS DistributionPrice, pb.ASINorItemID AS ASINorItemID, '' AS ProductGroupSKU, 0 AS AddOrderReasonType, 0 AS WareHouseManagementPrice, 0 AS CustomFeeOtherCostPrice, 0 AS TaxRefundFee, 0 AS Tax, 0 AS MarketplaceFacilitatorTax, -ABS(ff.ChargingAmount * x.ExchangeRMB) AS ImportFee, 0 AS PromotionType, 0 AS CostOfStorageFee, 0 AS RelationID, 0 AS IsBuildFee, ff.ID AS FeeWarehouseChargeID
040- 六、同步至Tmp_Report_OrderSettlement的数据自动同步到 RB_Report_OrderSettlement 利润表
041-
042- 同步利润表逻辑：
043- pb.CustomerID, ff.ChargingDate AS SettlementDate, pb.OrderSourceID, pb.OrderSourceName, '' AS ClientOrderCode, '' AS OrderCode, '' AS TransactionId, ff.ChargingDate AS PayTime, ff.ChargingDate AS ShipTime, os.OrderSourceCountry AS OrderSourceContry, Y.Id AS WareHouseID, Y.WareHouseName AS WareHouseName, 0 AS TransportID, '' AS TransportName, '' AS TrackNumbers, -- -ABS(ff.ChargingAmount * x.ExchangeRMB) AS TotalPrice, 0 AS TotalPrice, x.ExchangeRMB AS ExchangeRMB, --人民币兑美元汇率 @USD_Exchange AS USD_ExchangeRMB, x.Currency AS Currency, '' AS OperatorName, '盛宝隆仓租导入2022010122020210-36092.536117675' AS OrderDescription, ff.ProductSku AS SKU, pb.ClientSKU AS ClientSKU, pb.OrderSourceSKU AS SellerSKU, ff.ChildFnsku AS OrderItemId, 0 AS ProductSalesPrice, 0 AS ProductShipPrice, pb.ProductNameCN AS ProductNameCN, 0 AS ProductGrossWeight, 0 AS LastSupplierPrice, 1 AS ProductNum, 0 AS ProdutNumUpdate, '' AS GroupSKU, 0 AS GroupProductNum, '' AS AssignDevelopAdminName, '' AS DevelopAdminName, '' AS EditAdminName, '' AS ImageAdminName, pb.BusinessAdminID AS BusinessAdminID, pb.BusinessUserName AS BusinessAdminName, '' AS BuyerName, '' AS CheckAdminName, pb.BusinessTeam AS BusinessTeamID, pb.BusinessTeamName AS BusinessTeamName, -ABS(ff.ChargingAmount * x.ExchangeRMB) AS Profits, --0 AS Profits, 0 AS Incomes, -ABS(ff.ChargingAmount * x.ExchangeRMB) AS Expenses, 0 AS SalesPrice, 0 AS TransportPay, 0 AS SalesRefunds, 0 AS PromotionRebates, 0 AS OtherCredits, 0 AS CommisionFee, 0 AS FBATransactionFees, -- -ABS(ff.ChargingAmount * x.ExchangeRMB) AS OrderSourceOtherDebits, 0 AS OrderSourceOtherDebits, 0 AS BuyPrice, 0 AS PackageFees, 0 AS OverSeasShipFees, 0 AS FirstLegFees, 0 AS TariffFees, 0 AS ExchangeLost, 0 AS ProductReturnsFee, ff.ChargingDate AS AddTime, 1 AS OrderSourceType, 0 AS PackagedCost, ff.ChargingDate AS OrderAddedTime, 0 AS OrderStatus, 3 AS OrderState, os.SaleAdminID AS SalesAdminID, os.SaleAdminName AS SalesAdminName, --销售小组 pb.BusinessTeam AS SalesTeamID, pb.BusinessTeamName AS SalesTeamName, ff.ChargingDate AS ConfirmTime, ff.ChargingDate AS PayDate, ff.ChargingDate AS SettlementShortDate, '' AS DevIDSellerId, '' AS SellerUserID, '' AS PaypalAccount, 0 AS CostOfAdvertising, 0 AS IsBiSycnComplete, GETDATE() AS BiSycnCompleteTime, ff.ChargingDate AS ShipDate, GETDATE() AS UpdateTime, CONVERT(INT,ff.CustomerCode) AS OrderListID, 0 AS SalesVatFee, 0 AS SubsidyPrice, 0 AS DistributionPrice, pb.ASINorItemID AS ASINorItemID, '' AS ProductGroupSKU, 0 AS AddOrderReasonType, 0 AS WareHouseManagementPrice, 0 AS CustomFeeOtherCostPrice, 0 AS TaxRefundFee, 0 AS Tax, 0 AS MarketplaceFacilitatorTax, -ABS(ff.ChargingAmount * x.ExchangeRMB) AS ImportFee, 0 AS PromotionType, 0 AS CostOfStorageFee, 0 AS RelationID, 0 AS IsBuildFee, ff.ID AS FeeWarehouseChargeID

006- <p><br /></p>
006+ <p>每天获取结算时间为前一天的</p>
007- <p>每月8日保存计算时间是每月1日至每月7日</p>
007+ <p><br /></p>
008- <p>每月15日保存计算时间是每月8日至每月14日</p>
008+ <p><span><span><span><span>二、Fee_WarehouseChargeCount</span><span>details表数据按照仓租费用均摊逻辑</span></span></span></span>把箱产品的仓租费用均摊至条码产品，并把均摊后的数据同步至Fee_WarehouseChargeCountResult</p>
009- <p>每月22日保存计算时间是每月15日至每月21日</p>
009+ <p>箱总仓租费用 *（箱内X条码产品体积 / 箱内所有产品体积之和）= X条码产品的均摊费用</p>
010- <p>每月2日保存计算时间是上月22日至上月末的</p>
010+ <p><br /></p>
011- <p><span><span><br /></span></span></p>
011+ <p>三、费用均摊至<span>Fee_WarehouseChargeCountResult</span><span>表之后</span>，对定时跑服务对数据进行匹配</p>
012- <p><span><span><span><span>二、Fee_WarehouseChargeCount</span><span>details表数据按照仓租费用均摊逻辑</span></span></span></span>把箱产品的仓租费用均摊至条码产品，并把均摊后的数据同步至Fee_WarehouseChargeCountResult</p>
012+ <p><br /></p>
013- <p>箱总仓租费用 *（箱内X条码产品体积 / 箱内所有产品体积之和）= X条码产品的均摊费用</p>
013+ <p><strong>匹配逻辑1：</strong></p>
015- <p>三、费用均摊至<span>Fee_WarehouseChargeCountResult</span><span>表之后</span>，对定时跑服务对数据进行匹配</p>
015+ <p>使用<span><span>Fee_WarehouseChargeCountResult</span><span></span> 的FNSKU 与</span>RB_Amazon_Product_Base、RB_OrderSource的FNSKU匹配数据</p>
016- <p><br /></p>
016+ <p><span>从RB_Amazon_Product_Base表关联的字段：</span></p>
017- <p><strong>匹配逻辑1：</strong></p>
017+ <p><span>CustomerID</span></p>
018- <p><br /></p>
018+ <p><span>OrderSourceID</span></p>
019- <p>使用<span><span>Fee_WarehouseChargeCountResult</span><span></span> 的FNSKU 与</span>RB_Amazon_Product_Base、RB_OrderSource的FNSKU匹配数据</p>
019+ <p><span>OrderSourceName</span></p>
020- <p><span>从RB_Amazon_Product_Base表关联的字段：</span></p>
020+ <p><span>ClientSKU AS ClientSKU<br />OrderSourceSKU AS SellerSKU</span></p>
021- <p><span>CustomerID</span></p>
021+ <p><span>BusinessAdminID AS BusinessAdminID<br />BusinessUserName AS BusinessAdminName</span></p>
022- <p><span>OrderSourceID</span></p>
022+ <p><span>BusinessTeam AS BusinessTeamID<br />BusinessTeamName AS BusinessTeamName</span></p>
023- <p><span>OrderSourceName</span></p>
023+ <p><span>BusinessTeam AS SalesTeamID<br />BusinessTeamName AS SalesTeamName</span></p>
024- <p><span>ClientSKU AS ClientSKU<br />OrderSourceSKU AS SellerSKU</span></p>
024+ <p><span>ASINorItemID AS ASINorItemID<br /><br /></span>从RB_OrderSource表关联的字段：</p>
025- <p><span>BusinessAdminID AS BusinessAdminID<br />BusinessUserName AS BusinessAdminName</span></p>
025+ <p><br /></p>
026- <p><span>BusinessTeam AS BusinessTeamID<br />BusinessTeamName AS BusinessTeamName</span></p>
026+ <p class="MsoNormal"><span>OrderSourceCountry AS OrderSourceContry</span></p>
027- <p><span>BusinessTeam AS SalesTeamID<br />BusinessTeamName AS SalesTeamName</span></p>
027+ <p class="MsoNormal"><span>SaleAdminID AS SalesAdminID</span></p>
028- <p><span>ASINorItemID AS ASINorItemID<br /><br /></span>从RB_OrderSource表关联的字段：</p>
028+ <p class="MsoNormal"><span>SaleAdminName AS SalesAdminName</span></p>
029- <p><br /></p>
029+ <p class="MsoNormal"><span><br /></span></p>
030- <p class="MsoNormal"><span>OrderSourceCountry AS OrderSourceContry</span></p>
030+ <p class="MsoNormal"><span><strong>匹配逻辑2：</strong></span></p>
031- <p class="MsoNormal"><span>SaleAdminID AS SalesAdminID</span></p>
031+ <p class="MsoNormal"><span><strong><span style="color:#009900;"><span>Fee_WarehouseChargeCountResult</span><span>表中使用</span>匹配逻辑1匹配不上的数据且<span style="color:#000000;font-weight:700;">ErpChannelSourceId不为空值时</span>，</span></strong></span><strong><span style="color:#009900;">继续使用</span></strong>表中的"ProductSku" "ChildFnsku"字段和赛盒wms库存库龄报告的"商品编码""FNSKU"字段匹配，两个字段都能同时匹配上之时，则取赛盒wms库存库龄报告表中的渠道编码填充到<span style="font-weight:700;"><span style="color:#009900;"><span style="color:#000000;">Fee_WarehouseChargeCountResult 表的"</span><span style="color:#000000;">ErpChannelSourceId</span><span style="color:#000000;">"字段</span></span></span></p>
032- <p class="MsoNormal"><span>SaleAdminName AS SalesAdminName</span></p>
032+ <p>四、从RB_Customer_Currency获取汇率信息把原币金额转换为人民币</p>
033- <p class="MsoNormal"><span><br /></span></p>
033+ <p class="MsoNormal"><span>-ABS(ff.ChargingAmount * x.ExchangeRMB) = ImportFee</span></p>
034- <p class="MsoNormal"><span><strong>匹配逻辑2：</strong></span></p>
034+ <p class="MsoNormal"><span><br /></span></p>
035- <p class="MsoNormal"><span><strong><span style="color:#009900;"><span>Fee_WarehouseChargeCountResult</span><span>表中使用</span>匹配逻辑1匹配不上的数据且<span style="color:#000000;font-weight:700;">ErpChannelSourceId不为空值时</span>，</span></strong></span><strong><span style="color:#009900;">继续使用</span></strong>表中的"ProductSku" "ChildFnsku"字段和赛盒wms库存库龄报告的"商品编码""FNSKU"字段匹配，两个字段都能同时匹配上之时，则取赛盒wms库存库龄报告表中的渠道编码填充到<span style="font-weight:700;"><span style="color:#009900;"><span style="color:#000000;">Fee_WarehouseChargeCountResult 表的"</span><span style="color:#000000;">ErpChannelSourceId</span><span style="color:#000000;">"字段</span></span></span></p>
035+ <p>五、第3步匹配处理的数据自动同步至Tmp_Report_OrderSettlement利润临时表之中</p>
036- <p>四、从RB_Customer_Currency获取汇率信息把原币金额转换为人民币</p>
036+ <p>六、同步至<span>Tmp_Report_OrderSettlement的数据自动同步到 RB_Report_OrderSettlement 利润表</span></p>
037- <p class="MsoNormal"><span>-ABS(ff.ChargingAmount * x.ExchangeRMB) = ImportFee</span></p>
037+ <p><span><br /></span></p>
038- <p class="MsoNormal"><span><br /></span></p>
038+ <p><span>同步利润表逻辑：</span></p>
039- <p>五、第3步匹配处理的数据自动同步至Tmp_Report_OrderSettlement利润临时表之中</p>
039+ <p><span> pb.CustomerID,<br /> ff.ChargingDate AS SettlementDate,<br /> pb.OrderSourceID,<br /> pb.OrderSourceName,<br /> '' AS ClientOrderCode,<br /> '' AS OrderCode,<br /> '' AS TransactionId,<br /> ff.ChargingDate AS PayTime,<br /> ff.ChargingDate AS ShipTime,<br /> os.OrderSourceCountry AS OrderSourceContry,<br /> Y.Id AS WareHouseID,<br /> Y.WareHouseName AS WareHouseName,<br /> 0 AS TransportID,<br /> '' AS TransportName,<br /> '' AS TrackNumbers,<br /> -- -ABS(ff.ChargingAmount * x.ExchangeRMB) AS TotalPrice,<br /> 0 AS TotalPrice,<br /> x.ExchangeRMB AS ExchangeRMB,<br /> --人民币兑美元汇率<br /> @USD_Exchange AS USD_ExchangeRMB,<br /> x.Currency AS Currency,<br /> '' AS OperatorName,<br /> '盛宝隆仓租导入2022010122020210-36092.536117675' AS OrderDescription,<br /> ff.ProductSku AS SKU,<br /> pb.ClientSKU AS ClientSKU,<br /> pb.OrderSourceSKU AS SellerSKU,<br /> ff.ChildFnsku AS OrderItemId,<br /> 0 AS ProductSalesPrice,<br /> 0 AS ProductShipPrice,<br /> pb.ProductNameCN AS ProductNameCN,<br /> 0 AS ProductGrossWeight,<br /> 0 AS LastSupplierPrice,<br /> 1 AS ProductNum,<br /> 0 AS ProdutNumUpdate,<br /> '' AS GroupSKU,<br /> 0 AS GroupProductNum,<br /> '' AS AssignDevelopAdminName,<br /> '' AS DevelopAdminName,<br /> '' AS EditAdminName,<br /> '' AS ImageAdminName,<br /> pb.BusinessAdminID AS BusinessAdminID,<br /> pb.BusinessUserName AS BusinessAdminName,<br /> '' AS BuyerName,<br /> '' AS CheckAdminName,<br /> pb.BusinessTeam AS BusinessTeamID,<br /> pb.BusinessTeamName AS BusinessTeamName,<br /> -ABS(ff.ChargingAmount * x.ExchangeRMB) AS Profits,<br /> --0 AS Profits,<br /> 0 AS Incomes,<br /> -ABS(ff.ChargingAmount * x.ExchangeRMB) AS Expenses,<br /> 0 AS SalesPrice,<br /> 0 AS TransportPay,<br /> 0 AS SalesRefunds,<br /> 0 AS PromotionRebates,<br /> 0 AS OtherCredits,<br /> 0 AS CommisionFee,<br /> 0 AS FBATransactionFees,<br /> -- -ABS(ff.ChargingAmount * x.ExchangeRMB) AS OrderSourceOtherDebits,<br /> 0 AS OrderSourceOtherDebits,<br /> 0 AS BuyPrice,<br /> 0 AS PackageFees,<br /> 0 AS OverSeasShipFees,<br /> 0 AS FirstLegFees,<br /> 0 AS TariffFees,<br /> 0 AS ExchangeLost,<br /> 0 AS ProductReturnsFee,<br /> ff.ChargingDate AS AddTime,<br /> 1 AS OrderSourceType,<br /> 0 AS PackagedCost,<br /> ff.ChargingDate AS OrderAddedTime,<br /> 0 AS OrderStatus,<br /> 3 AS OrderState,<br /> os.SaleAdminID AS SalesAdminID,<br /> os.SaleAdminName AS SalesAdminName,<br /> --销售小组<br /> pb.BusinessTeam AS SalesTeamID,<br /> pb.BusinessTeamName AS SalesTeamName,<br /> ff.ChargingDate AS ConfirmTime,<br /> ff.ChargingDate AS PayDate,<br /> ff.ChargingDate AS SettlementShortDate,<br /> '' AS DevIDSellerId,<br /> '' AS SellerUserID,<br /> '' AS PaypalAccount,<br /> 0 AS CostOfAdvertising,<br /> 0 AS IsBiSycnComplete,<br /> GETDATE() AS BiSycnCompleteTime,<br /> ff.ChargingDate AS ShipDate,<br /> GETDATE() AS UpdateTime,<br /> CONVERT(INT,ff.CustomerCode) AS OrderListID,<br /> 0 AS SalesVatFee,<br /> 0 AS SubsidyPrice,<br /> 0 AS DistributionPrice,<br /> pb.ASINorItemID AS ASINorItemID,<br /> '' AS ProductGroupSKU,<br /> 0 AS AddOrderReasonType,<br /> 0 AS WareHouseManagementPrice,<br /> 0 AS CustomFeeOtherCostPrice,<br /> 0 AS TaxRefundFee,<br /> 0 AS Tax,<br /> 0 AS MarketplaceFacilitatorTax,<br /> -ABS(ff.ChargingAmount * x.ExchangeRMB) AS ImportFee,<br /> 0 AS PromotionType,<br /> 0 AS CostOfStorageFee,<br /> 0 AS RelationID,<br /> 0 AS IsBuildFee,<br /> ff.ID AS FeeWarehouseChargeID<br /></span></p>
040- <p>六、同步至<span>Tmp_Report_OrderSettlement的数据自动同步到 RB_Report_OrderSettlement 利润表</span></p>
041- <p><span><br /></span></p>
042- <p><span>同步利润表逻辑：</span></p>
043- <p><span> pb.CustomerID,<br /> ff.ChargingDate AS SettlementDate,<br /> pb.OrderSourceID,<br /> pb.OrderSourceName,<br /> '' AS ClientOrderCode,<br /> '' AS OrderCode,<br /> '' AS TransactionId,<br /> ff.ChargingDate AS PayTime,<br /> ff.ChargingDate AS ShipTime,<br /> os.OrderSourceCountry AS OrderSourceContry,<br /> Y.Id AS WareHouseID,<br /> Y.WareHouseName AS WareHouseName,<br /> 0 AS TransportID,<br /> '' AS TransportName,<br /> '' AS TrackNumbers,<br /> -- -ABS(ff.ChargingAmount * x.ExchangeRMB) AS TotalPrice,<br /> 0 AS TotalPrice,<br /> x.ExchangeRMB AS ExchangeRMB,<br /> --人民币兑美元汇率<br /> @USD_Exchange AS USD_ExchangeRMB,<br /> x.Currency AS Currency,<br /> '' AS OperatorName,<br /> '盛宝隆仓租导入2022010122020210-36092.536117675' AS OrderDescription,<br /> ff.ProductSku AS SKU,<br /> pb.ClientSKU AS ClientSKU,<br /> pb.OrderSourceSKU AS SellerSKU,<br /> ff.ChildFnsku AS OrderItemId,<br /> 0 AS ProductSalesPrice,<br /> 0 AS ProductShipPrice,<br /> pb.ProductNameCN AS ProductNameCN,<br /> 0 AS ProductGrossWeight,<br /> 0 AS LastSupplierPrice,<br /> 1 AS ProductNum,<br /> 0 AS ProdutNumUpdate,<br /> '' AS GroupSKU,<br /> 0 AS GroupProductNum,<br /> '' AS AssignDevelopAdminName,<br /> '' AS DevelopAdminName,<br /> '' AS EditAdminName,<br /> '' AS ImageAdminName,<br /> pb.BusinessAdminID AS BusinessAdminID,<br /> pb.BusinessUserName AS BusinessAdminName,<br /> '' AS BuyerName,<br /> '' AS CheckAdminName,<br /> pb.BusinessTeam AS BusinessTeamID,<br /> pb.BusinessTeamName AS BusinessTeamName,<br /> -ABS(ff.ChargingAmount * x.ExchangeRMB) AS Profits,<br /> --0 AS Profits,<br /> 0 AS Incomes,<br /> -ABS(ff.ChargingAmount * x.ExchangeRMB) AS Expenses,<br /> 0 AS SalesPrice,<br /> 0 AS TransportPay,<br /> 0 AS SalesRefunds,<br /> 0 AS PromotionRebates,<br /> 0 AS OtherCredits,<br /> 0 AS CommisionFee,<br /> 0 AS FBATransactionFees,<br /> -- -ABS(ff.ChargingAmount * x.ExchangeRMB) AS OrderSourceOtherDebits,<br /> 0 AS OrderSourceOtherDebits,<br /> 0 AS BuyPrice,<br /> 0 AS PackageFees,<br /> 0 AS OverSeasShipFees,<br /> 0 AS FirstLegFees,<br /> 0 AS TariffFees,<br /> 0 AS ExchangeLost,<br /> 0 AS ProductReturnsFee,<br /> ff.ChargingDate AS AddTime,<br /> 1 AS OrderSourceType,<br /> 0 AS PackagedCost,<br /> ff.ChargingDate AS OrderAddedTime,<br /> 0 AS OrderStatus,<br /> 3 AS OrderState,<br /> os.SaleAdminID AS SalesAdminID,<br /> os.SaleAdminName AS SalesAdminName,<br /> --销售小组<br /> pb.BusinessTeam AS SalesTeamID,<br /> pb.BusinessTeamName AS SalesTeamName,<br /> ff.ChargingDate AS ConfirmTime,<br /> ff.ChargingDate AS PayDate,<br /> ff.ChargingDate AS SettlementShortDate,<br /> '' AS DevIDSellerId,<br /> '' AS SellerUserID,<br /> '' AS PaypalAccount,<br /> 0 AS CostOfAdvertising,<br /> 0 AS IsBiSycnComplete,<br /> GETDATE() AS BiSycnCompleteTime,<br /> ff.ChargingDate AS ShipDate,<br /> GETDATE() AS UpdateTime,<br /> CONVERT(INT,ff.CustomerCode) AS OrderListID,<br /> 0 AS SalesVatFee,<br /> 0 AS SubsidyPrice,<br /> 0 AS DistributionPrice,<br /> pb.ASINorItemID AS ASINorItemID,<br /> '' AS ProductGroupSKU,<br /> 0 AS AddOrderReasonType,<br /> 0 AS WareHouseManagementPrice,<br /> 0 AS CustomFeeOtherCostPrice,<br /> 0 AS TaxRefundFee,<br /> 0 AS Tax,<br /> 0 AS MarketplaceFacilitatorTax,<br /> -ABS(ff.ChargingAmount * x.ExchangeRMB) AS ImportFee,<br /> 0 AS PromotionType,<br /> 0 AS CostOfStorageFee,<br /> 0 AS RelationID,<br /> 0 AS IsBuildFee,<br /> ff.ID AS FeeWarehouseChargeID<br /></span></p>

修改了 评审时间，旧值为 "0000-00-00"，新值为 "2022-03-29"。
修改了 指派给 ，旧值为 "Admin186"，新值为 "liangguirong"。
修改了 当前状态，旧值为 "changed"，新值为 "active"。
修改了 由谁评审，旧值为 ""，新值为 "Admin186"。

修改了 所属计划，旧值为 "540"，新值为 "541"。

修改了 当前状态，旧值为 "active"，新值为 "changed"。
修改了 版本号 ，旧值为 "8"，新值为 "9"。
修改了 由谁评审，旧值为 "Admin186"，新值为 ""。
修改了 评审时间，旧值为 "2022-03-29"，新值为 "0000-00-00"。
修改了 需求描述，区别为：

014-
014+ （1）使用Fee_WarehouseChargeCountResult表FNSKU+渠道SKU字段去订单表匹配。取更新时间最新的获取字段（FNSKU+来源渠道+来源渠道SKU），然后使用这3个字段去RB_Amazon_Product_Base表匹配，关联出需要的数据
015- 使用Fee_WarehouseChargeCountResult 的FNSKU 与RB_Amazon_Product_Base、RB_OrderSource的FNSKU匹配数据
015+ （2）上面（1）的逻辑匹配不上的，使用Fee_WarehouseChargeCountResult表FNSKU+渠道SKU字段去RB_Amazon_Product_Base表匹配，取更新时间最新的然后获取需要的数据
025-
025+ OrderSourceCountry AS OrderSourceContry
026- OrderSourceCountry AS OrderSourceContry
026+ SaleAdminID AS SalesAdminID
027- SaleAdminID AS SalesAdminID
027+ SaleAdminName AS SalesAdminName
028- SaleAdminName AS SalesAdminName
028+
029-
029+ 匹配逻辑2：
030- 匹配逻辑2：
030+ Fee_WarehouseChargeCountResult表中使用匹配逻辑1匹配不上的数据且ErpChannelSourceId不为空值时，继续使用表中的"ProductSku" "ChildFnsku"字段和赛盒wms库存库龄报告的"商品编码""FNSKU"字段匹配，两个字段都能同时匹配上之时，则取赛盒wms库存库龄报告表中的渠道编码填充到Fee_WarehouseChargeCountResult 表的"ErpChannelSourceId"字段
031- Fee_WarehouseChargeCountResult表中使用匹配逻辑1匹配不上的数据且ErpChannelSourceId不为空值时，继续使用表中的"ProductSku" "ChildFnsku"字段和赛盒wms库存库龄报告的"商品编码""FNSKU"字段匹配，两个字段都能同时匹配上之时，则取赛盒wms库存库龄报告表中的渠道编码填充到Fee_WarehouseChargeCountResult 表的"ErpChannelSourceId"字段
031+

014- <p><br /></p>
014+ <p>（1）使用<span>Fee_WarehouseChargeCountResult</span><span></span>表FNSKU+渠道SKU字段去订单表匹配。<span><span style="color:#FF9900;">取更新时间最新</span>的</span>获取字段（FNSKU+来源渠道+来源渠道SKU），然后使用这3个字段去<span>RB_Amazon_Product_Base</span>表匹配，关联出需要的数据</p>
015- <p>使用<span><span>Fee_WarehouseChargeCountResult</span><span></span> 的FNSKU 与</span>RB_Amazon_Product_Base、RB_OrderSource的FNSKU匹配数据</p>
015+ <p>（2）上面（1）的逻辑匹配不上的，使用<span>Fee_WarehouseChargeCountResult</span><span></span>表FNSKU+渠道SKU字段去<span>RB_Amazon_Product_Base</span>表匹配，取更新时间最新的然后获取需要的数据<br /></p>
025- <p><br /></p>
025+ <p class="MsoNormal"><span>OrderSourceCountry AS OrderSourceContry</span></p>
026- <p class="MsoNormal"><span>OrderSourceCountry AS OrderSourceContry</span></p>
026+ <p class="MsoNormal"><span>SaleAdminID AS SalesAdminID</span></p>
027- <p class="MsoNormal"><span>SaleAdminID AS SalesAdminID</span></p>
027+ <p class="MsoNormal"><span>SaleAdminName AS SalesAdminName</span></p>
028- <p class="MsoNormal"><span>SaleAdminName AS SalesAdminName</span></p>
028+ <p class="MsoNormal"><span><br /></span></p>
029- <p class="MsoNormal"><span><br /></span></p>
029+ <p class="MsoNormal"><span><strong>匹配逻辑2：</strong></span></p>
030- <p class="MsoNormal"><span><strong>匹配逻辑2：</strong></span></p>
030+ <p class="MsoNormal"><span><span style="color:#009900;"><span>Fee_WarehouseChargeCountResult</span><span>表中使用</span>匹配逻辑1匹配不上的数据且<span style="color:#000000;font-weight:700;">ErpChannelSourceId不为空值时</span>，</span></span><strong><span style="color:#009900;">继续使用</span></strong>表中的"ProductSku" "ChildFnsku"字段和赛盒wms库存库龄报告的"商品编码""FNSKU"字段匹配，两个字段都能同时匹配上之时，则取赛盒wms库存库龄报告表中的渠道编码填充到<span style="font-weight:700;"><span style="color:#009900;"><span style="color:#000000;">Fee_WarehouseChargeCountResult 表的"</span><span style="color:#000000;">ErpChannelSourceId</span><span style="color:#000000;">"字段</span></span></span></p>
031- <p class="MsoNormal"><span><strong><span style="color:#009900;"><span>Fee_WarehouseChargeCountResult</span><span>表中使用</span>匹配逻辑1匹配不上的数据且<span style="color:#000000;font-weight:700;">ErpChannelSourceId不为空值时</span>，</span></strong></span><strong><span style="color:#009900;">继续使用</span></strong>表中的"ProductSku" "ChildFnsku"字段和赛盒wms库存库龄报告的"商品编码""FNSKU"字段匹配，两个字段都能同时匹配上之时，则取赛盒wms库存库龄报告表中的渠道编码填充到<span style="font-weight:700;"><span style="color:#009900;"><span style="color:#000000;">Fee_WarehouseChargeCountResult 表的"</span><span style="color:#000000;">ErpChannelSourceId</span><span style="color:#000000;">"字段</span></span></span></p>
031+ <p><br /></p>

修改了 受益业务部门，旧值为 ""，新值为 "会计部"。
修改了 关键词 ，旧值为 ""，新值为 "预计 5月5日发版"。

修改了 关闭原因 ，旧值为 ""，新值为 "duplicate"。
修改了 重复需求ID，旧值为 "0"，新值为 "11751"。
修改了 当前状态 ，旧值为 "changed"，新值为 "closed"。
修改了 指派给 ，旧值为 "liangguirong"，新值为 "closed"。
修改了 所处阶段 ，旧值为 "planned"，新值为 "closed"。
修改了 关闭日期 ，旧值为 "0000-00-00 00:00:00"，新值为 "2022-09-23 17:49:40"。
修改了 由谁关闭 ，旧值为 ""，新值为 "liangguirong"。

修改了 所属模块，旧值为 "1679"，新值为 "1748"。