暂无
任务描述
需求描述
需求文档:
http://product-doc-wan.zhcxkj.com:9000/产品四组/王晓洛/虎鲸-我的listing/我的listing/index.html#g=1&p=在途弹窗(优化)
需求说明:
1、顶部的查询,渠道SKU支持批量查询、状态支持多选 (2H)
数据列表:
2、ShipmentID:新增备库订单号、包裹号,点击备库订单号,弹出订单信息查看窗口(4H)
新增调拨运费字段
3、发货仓库:合并发货仓库、运输方式、运输类型、新增物流轨迹追踪号,点击打开物流轨迹页面(4H)
仓库代码:仓库代码和邮编合并
发货数量和发货时间合并 原tips还保留
收货数量和收货时间合并 原tips还保留
4、收发差异改为:在途,需要前端特殊处理,当在途为负数时,默认显示0
5、状态:增加一个完结按钮,点击完结,弹窗确认是否完结货件,点击确认,货件状态更新为closed,点击取消,不进行任何操作(2H)
6、我的listing列表在途增加这个弹窗点击效果(1H)
7、涉及到FBA货件以前的一个定时服务,当货件状态为RECEIVING,当前时间距离收货时间超过30天,货件状态更新为closed、当货件状态为WORKING时,且发货数量为0时,当前时间距离创建时间超过90天,货件状态更新为closed (2H)
当其他服务定时拉取货件的时候,不在更新货件状态
验收标准
暂无
获取跟踪号和物流轨迹新弹框:
http://tracking.zhcxkj.com/#/track?trackingnumbers=完结货件:
获取erp货件信息SQL:
DROP TABLE
IF
EXISTS #tmpOrderListId SELECT
l.ID AS ID INTO #tmpOrderListId
FROM
RB_OrderInfo o WITH ( nolock )
INNER JOIN ( SELECT CONVERT ( VARCHAR (50), item ) ShipmentId FROM Charsplitforin ( '{string.Join(",", input)}', ',' ) ) x ON o.AmazonShipmentId= x.ShipmentId
LEFT JOIN RB_OrderList l WITH ( nolock ) ON o.OrderCode = l.OrderCode
AND o.CustomerID = l.CustomerID CREATE INDEX idx_id ON #tmpOrderListId (id);
SELECT
o.CustomerID,
o.OrderCode,
l.SellerSKU,
Sum(
CASE w.WareHouseType WHEN 1 THEN
Isnull(d.ProductNum, 0)
ELSE ( Isnull(l.ProductNum, 0) + Isnull(l.ProductNumUpdate, 0) ) END) / Isnull(Min( CASE WHEN ISNULL(l.GroupSKU, '') <> ''
AND (l.ProductNum + l.ProductNumUpdate) >= (ISNULL(l.GroupProductNum, 0) + ISNULL(l.GroupProductNumUpdate, 0))
AND (ISNULL(l.GroupProductNum, 0) + ISNULL(l.GroupProductNumUpdate, 0)) > 0
THEN (l.ProductNum + l.ProductNumUpdate) / (ISNULL(l.GroupProductNum, 0) + ISNULL(l.GroupProductNumUpdate, 0))
ELSE 1 END), 1) ProductNum,
o.OrderSourceID,
o.ShipTime,
o.AmazonShipmentId,
MIN(o.ServiceAdminID) ServiceAdminID,
MIN(o.ServiceAdminName) ServiceAdminName,
MIN(ep.OrderBuildType) OrderBuildType,
MIN( CASE WHEN ISNULL(p.ID, 0) > 0 AND ISNULL(p.TrackNumber,'')<>'' THEN p.TrackNumber
ELSE CASE WHEN CHARINDEX(',', TrackNumbers) > 0 THEN LEFT(TrackNumbers, CHARINDEX(',', TrackNumbers) - 1)
ELSE TrackNumbers END END) AS TrackNumbers,
p.LogisticsOrderNo,
SUM(itlog.ShipFee * itlog.Quantity) / SUM(itlog.Quantity) * ISNULL(MIN( CASE WHEN ISNULL(l.GroupSKU, '') <> ''
AND (l.ProductNum + l.ProductNumUpdate) >= (ISNULL(l.GroupProductNum, 0) + ISNULL(l.GroupProductNumUpdate, 0))
AND (ISNULL(l.GroupProductNum, 0) + ISNULL(l.GroupProductNumUpdate, 0)) > 0
THEN (l.ProductNum + l.ProductNumUpdate) / (ISNULL(l.GroupProductNum, 0) + ISNULL(l.GroupProductNumUpdate, 0))
ELSE 1 END), 1) AS AvgShippingFee,
MIN(o.WareHouseID) AS WareHouseID,
MIN(w.WarehouseName) AS WarehouseName,
MIN(t.TransportName) AS TransportName,
MIN(t.TransferType) TransportType,p.ID AS PackageId
FROM
RB_OrderInfo o WITH ( NOLOCK )
LEFT JOIN RB_OrderList l WITH ( NOLOCK ) ON o.OrderCode = l.OrderCode
AND o.CustomerID = l.CustomerID
INNER JOIN #tmpOrderListId oList ON l.ID = oList.ID
LEFT JOIN dbo.RB_OrderInfo_BeikuExpand ( NOLOCK ) ep ON ep.CustomerID = o.CustomerID
AND ep.OrderCode = o.OrderCode
LEFT JOIN RB_Procurement_Order_Package_OrderDetail d WITH ( NOLOCK ) ON d.OrderCode = o.OrderCode
AND d.CustomerID = o.CustomerID
AND d.OrderListID = l.ID
LEFT JOIN (
SELECT
whitlog.CustomerID,
whitlog.OrderListID,
SUM ( ( whitlog.BaseShipFee+ whitlog.ShipFee ) * whitlog.Quantity ) / SUM ( whitlog.Quantity ) ShipFee,
SUM ( whitlog.Quantity ) Quantity,
SUM ( whitlog.ClearedQuantity ) ClearedQuantity
FROM
RB_WareHouse_Inventory_Transfer_Log ( NOLOCK ) whitlog
INNER JOIN #tmpOrderListId oList ON whitlog.OrderListID = oList.ID
WHERE
whitlog.Quantity> 0
GROUP BY
whitlog.CustomerID,
whitlog.OrderListID
) itlog ON l.CustomerID = itlog.CustomerID
AND l.ID = itlog.OrderListID
LEFT JOIN RB_WareHouse w WITH ( NOLOCK ) ON o.CustomerID = w.CustomerID
AND o.WareHouseID = w.ID
LEFT JOIN RB_WareHouse rwto ( NOLOCK ) ON o.ToWareHouseID = rwto.ID
AND o.CustomerID = rwto.CustomerID
LEFT JOIN RB_Transport t WITH ( NOLOCK ) ON o.TransportID = t.ID
AND o.CustomerID = t.CustomerID
LEFT JOIN RB_Procurement_Order_Package p WITH ( NOLOCK ) ON p.ID = d.PackageID
AND p.CustomerID = d.CustomerID
LEFT JOIN dbo.RB_Transport ( NOLOCK ) pt ON p.TransportID = pt.ID
AND p.CustomerID = pt.CustomerID
LEFT OUTER JOIN dbo.RB_Product_GroupSku AS g WITH ( NOLOCK ) ON l.GroupSKU = g.GroupSku
AND l.CustomerID = g.CustomerID
AND l.SKU = g.SKU
WHERE
1 = 1
GROUP BY
o.OrderSourceID,
l.SellerSKU,
l.SKU ,
CASE
WHEN ISNULL( l.GroupSKU, '' ) <> ''
AND ( l.ProductNum + l.ProductNumUpdate ) >= ( ISNULL( l.GroupProductNum, 0 ) + ISNULL( l.GroupProductNumUpdate, 0 ) )
AND ( ISNULL( l.GroupProductNum, 0 ) + ISNULL( l.GroupProductNumUpdate, 0 ) ) > 0 THEN
( l.ProductNum + l.ProductNumUpdate ) / ( ISNULL( l.GroupProductNum, 0 ) + ISNULL( l.GroupProductNumUpdate, 0 ) ) ELSE 1 END,
o.AmazonShipmentId,
o.CustomerID,
o.OrderCode,
o.ShipTime,
o.AddTime,
o.OrderStatus,
l.AmazonCompeteRemark,
o.AmazonDestinationFulfillmentCenterId,
o.PostCode,
CASE
WHEN l.GroupSKU= '' THEN
l.SKU ELSE l.GroupSKU END,
p.ID,
p.LogisticsOrderNo