1.修改齐库推送规则，快递非签收不做通知

2.修改1688发货推送，忽略厂家代发入仓订单的采购单推送
3.修改手动发货接口，限制厂家代发入仓订单的请求
4.新增设置快递单和入仓采购单接口 (厂家代发入仓订单专属)
5.修改订单列表接口，快递单层返回入库采购单号
6.取消订单同时删除采购限时任务
7.修改订单同步，检测到取消订单删除采购限时任务

BBWYB.Server.API/Controllers/PurchaseOrderController.cs

@@ -113,7 +113,7 @@ namespace BBWYB.Server.API.Controllers
         }
 
         /// <summary>
-        /// 厂商代发入仓发货
+        /// 设置快递单和入仓采购单(厂商代发入仓订单专用)
         /// </summary>
         /// <param name="request"></param>
         [HttpPost]

BBWYB.Server.Business/Extensions/OrderStateExtension.cs

@@ -125,10 +125,12 @@ namespace BBWYB.Server.Business
         /// 计算采购单状态
         /// </summary>
         /// <param name="orderPurchaseInfo"></param>
+        /// <param name="intoStoreType"></param>
         /// <param name="fsql"></param>
         /// <param name="orderPurchaseSkuList"></param>
         /// <param name="purchaseExpressOrderList"></param>
         public static void CalculationOrderState(this OrderPurchaseInfo orderPurchaseInfo,
+                                                 Enums.IntoStoreType intoStoreType,
                                                  IFreeSql fsql,
                                                  IList<OrderPurchaseSkuInfo> orderPurchaseSkuList = null,
                                                  IList<PurchaseExpressOrder> purchaseExpressOrderList = null)
@@ -145,18 +147,15 @@ namespace BBWYB.Server.Business
             if (orderPurchaseInfo.OrderState == Enums.PurchaseOrderState.已取消)
                 return;
 
+            if (purchaseExpressOrderList == null)
+                return;
 
-            if (orderPurchaseInfo.PurchasePlatform == Enums.Platform.阿里巴巴)
+            if (orderPurchaseInfo.PurchasePlatform == Enums.Platform.阿里巴巴 && intoStoreType != Enums.IntoStoreType.厂商代发入仓)  //支持采购sku和关联信息
             {
                 if (orderPurchaseSkuList == null)
                     orderPurchaseSkuList = fsql.Select<OrderPurchaseSkuInfo>().Where(ops => ops.PurchaseOrderId == orderPurchaseInfo.PurchaseOrderId).ToList();
-            }
 
-            if (purchaseExpressOrderList == null)
-                return;
 
-            if (orderPurchaseInfo.PurchasePlatform == Enums.Platform.阿里巴巴)  //支持采购sku和关联信息
-            {
                 #region 待发货
                 if (orderPurchaseSkuList.Count() == orderPurchaseSkuList.Count(ops => string.IsNullOrEmpty(ops.WaybillNo)))
                 {
@@ -186,7 +185,6 @@ namespace BBWYB.Server.Business
                 #endregion
             }
 
-
             #region 待收货
             if (purchaseExpressOrderList.Count(exo => exo.ExpressState == "QianShou") == 0)
             {

BBWYB.Server.Business/Order/OrderBusiness.cs

@@ -175,6 +175,21 @@ namespace BBWYB.Server.Business
                                                    });
                 #endregion
 
+                #region 查询入仓采购单信息
+                var inStoreRelationList = fsql.Select<InStorePurchaseOrdeRrelationInfo>().Where(i => orderIdList.Contains(i.OrderId)).ToList();
+                if (inStoreRelationList.Count() > 0)
+                {
+                    foreach (var purchaseExpressOrder in purchaseExpressOrderList)
+                    {
+                        purchaseExpressOrder.InStorePurchaseOrderIdList = inStoreRelationList.Where(i => i.OrderId == purchaseExpressOrder.OrderId &&
+                                                                                                         i.PurchaseOrderId == purchaseExpressOrder.PurchaseOrderId &&
+                                                                                                         i.WaybillNo == purchaseExpressOrder.WaybillNo)
+                                                                                             .Select(i => i.InStorePurchaseOrderId)
+                                                                                             .ToList();
+                    }
+                }
+                #endregion
+
                 #region 处理订单成本明细
                 var orderCostDetailList = fsql.Select<OrderCostDetail>().Where(ocd => orderIdList.Contains(ocd.OrderId) && ocd.IsEnabled == true).ToList<OrderCostDetailResponse>();
                 foreach (var order in orderList)
@@ -373,7 +388,11 @@ namespace BBWYB.Server.Business
                 Remark = request.Remark
             });
 
-            fsql.Update<Order>(request.OrderId).Set(o => o.OrderState, Enums.OrderState.已取消).ExecuteAffrows();
+            fsql.Transaction(() =>
+            {
+                fsql.Update<Order>(request.OrderId).Set(o => o.OrderState, Enums.OrderState.已取消).ExecuteAffrows();
+                fsql.Delete<TimeLimitTask>().Where(t => t.OrderId == request.OrderId).ExecuteAffrows();
+            });
 
             try
             {

BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs

@@ -1252,7 +1252,7 @@ namespace BBWYB.Server.Business
             if (newPeo != null)
                 purchaseExpressOrderList.Add(newPeo);
             var oldPurchaseOrderState = purchaseOrder.OrderState;
-            purchaseOrder.CalculationOrderState(fsql, orderPurchaseSkuList, purchaseExpressOrderList);
+            purchaseOrder.CalculationOrderState(dbOrder.IntoStoreType.Value, fsql, orderPurchaseSkuList, purchaseExpressOrderList);
             if (oldPurchaseOrderState != purchaseOrder.OrderState)
                 updatePurchaseOrder = fsql.Update<OrderPurchaseInfo>(purchaseOrder.Id).Set(opi => opi.OrderState, purchaseOrder.OrderState);
             #endregion
@@ -1292,6 +1292,23 @@ namespace BBWYB.Server.Business
             if (request.ExpressId == "zhuanxianwuliu" && string.IsNullOrEmpty(request.WaybillNo))
                 request.WaybillNo = $"wdh{idGenerator.NewLong()}";
 
+            #region 查询当前采购单的订单信息
+            var dbOrder = fsql.Select<OrderPurchaseInfo, Order>().InnerJoin((opi, o) => opi.OrderId == o.Id)
+                                                                           .Where((opi, o) => opi.PurchaseOrderId == request.PurchaseOrderId && opi.IsEnabled == true)
+                                                                           .ToOne((opi, o) => new Order
+                                                                           {
+                                                                               Id = o.Id,
+                                                                               OrderSn = o.OrderSn,
+                                                                               OrderState = o.OrderState,
+                                                                               ShopId = o.ShopId,
+                                                                               IntoStoreType = o.IntoStoreType
+                                                                           });
+            if (dbOrder == null)
+                throw new BusinessException("未查询到采购单的订单信息");
+            if (dbOrder.IntoStoreType == Enums.IntoStoreType.厂商代发入仓)
+                throw new BusinessException("厂家代发入仓订单请使用【设置快递单和入仓采购单接口(厂家代发入仓专用)】");
+            #endregion
+
             #region 准备数据库更新对象
             List<PurchaseExpressOrder> insertPurchaseExpressOrderList = new List<PurchaseExpressOrder>();
             IList<IUpdate<OrderPurchaseSkuInfo>> updateOrderPurchaseSkuList = new List<IUpdate<OrderPurchaseSkuInfo>>();
@@ -1324,21 +1341,6 @@ namespace BBWYB.Server.Business
             bool isDbExists = fsql.Select<PurchaseExpressOrder>(request.WaybillNo).Any();
             #endregion
 
-            #region 查询当前采购单的订单信息
-            var dbOrder = fsql.Select<OrderPurchaseInfo, Order>().InnerJoin((opi, o) => opi.OrderId == o.Id)
-                                                                           .Where((opi, o) => opi.PurchaseOrderId == request.PurchaseOrderId && opi.IsEnabled == true)
-                                                                           .ToOne((opi, o) => new Order
-                                                                           {
-                                                                               Id = o.Id,
-                                                                               OrderSn = o.OrderSn,
-                                                                               OrderState = o.OrderState,
-                                                                               ShopId = o.ShopId,
-                                                                               IntoStoreType = o.IntoStoreType
-                                                                           });
-            if (dbOrder == null)
-                throw new BusinessException("未查询到采购单的订单信息");
-            #endregion
-
             #region 店铺信息
             var shop = fsqlManager.MDSfsql.Select<Shops>().Where(s => s.ShopId == dbOrder.ShopId.ToString()).ToOne();
             if (shop == null)
@@ -1451,7 +1453,7 @@ namespace BBWYB.Server.Business
             #endregion
 
             #region 计算采购单状态
-            orderPurchaseInfo.CalculationOrderState(fsql, orderPurchaseSkuList, purchaseExpressOrderList.Union(insertPurchaseExpressOrderList).ToList());
+            orderPurchaseInfo.CalculationOrderState(dbOrder.IntoStoreType.Value, fsql, orderPurchaseSkuList, purchaseExpressOrderList.Union(insertPurchaseExpressOrderList).ToList());
             updateOrderPurchase = fsql.Update<OrderPurchaseInfo>(orderPurchaseInfo.Id)
                                       .Set(opi => opi.OrderState, orderPurchaseInfo.OrderState);
             #endregion
@@ -1495,6 +1497,183 @@ namespace BBWYB.Server.Business
             if (dbOrder.IntoStoreType != Enums.IntoStoreType.厂商代发入仓)
                 throw new BusinessException("此订单非厂商代发入仓");
 
+            List<PurchaseExpressOrder> insertPurchaseExpressOrderList = new List<PurchaseExpressOrder>();
+            List<ExpressOrderRelationInfo> insertExpressOrderRelationList = new List<ExpressOrderRelationInfo>();
+            List<InStorePurchaseOrdeRrelationInfo> insertInStorePurchaseOrderRelationList = new List<InStorePurchaseOrdeRrelationInfo>();
+            //IList<IUpdate<OrderPurchaseSkuInfo>> updateOrderPurchaseSkuList = new List<IUpdate<OrderPurchaseSkuInfo>>();
+            IUpdate<OrderPurchaseInfo> updateOrderPurchase = null;
+            IUpdate<Order> updateOrder = null;
+
+            #region 查询该笔采购单的快递单信息
+            //var purchaseExpressOrderList = fsql.Select<PurchaseExpressOrder>().Where(x => x.PurchaseOrderId == request.PurchaseOrderId).ToList();
+            var purchaseExpressOrderList = fsql.Select<ExpressOrderRelationInfo, PurchaseExpressOrder>()
+                                               .InnerJoin((eori, peo) => eori.WayBillNo == peo.WaybillNo)
+                                               .Where((eori, peo) => eori.PurchaseOrderId == request.PurchaseOrderId).ToList((eori, peo) => new PurchaseExpressOrder
+                                               {
+                                                   CreateTime = peo.CreateTime,
+                                                   ExpressContent = peo.ExpressContent,
+                                                   ExpressChangedTime = peo.ExpressChangedTime,
+                                                   ExpressState = peo.ExpressState,
+                                                   IsSubscribeKD100 = peo.IsSubscribeKD100,
+                                                   //OrderId = eori.OrderId,
+                                                   //PurchaseOrderId = eori.PurchaseOrderId,
+                                                   ShopId = eori.ShopId.Value,
+                                                   SourceExpressId = peo.SourceExpressId,
+                                                   SourceExpressName = peo.SourceExpressName,
+                                                   TargetExpressId = peo.TargetExpressId,
+                                                   TargetExpressName = peo.TargetExpressName,
+                                                   WaybillNo = peo.WaybillNo
+                                               });
+
+            var wayBillNos = request.InStorePurchaseOrderManualDeliveryList.Select(x => x.WaybillNo).ToList();
+            var dbPurchaseExpressOrderList = fsql.Select<PurchaseExpressOrder>(wayBillNos).ToList();
+            #endregion
+
+            #region 查询该订单的入库采购单关系
+            var dbInStoreRelationList = fsql.Select<InStorePurchaseOrdeRrelationInfo>().Where(x => x.OrderId == request.OrderId).ToList();
+            #endregion
+
+            #region 店铺信息
+            var shop = fsqlManager.MDSfsql.Select<Shops>().Where(s => s.ShopId == dbOrder.ShopId.ToString()).ToOne();
+            if (shop == null)
+                throw new BusinessException("未查询到采购单所属店铺");
+            #endregion
+
+            #region 查询订单的全部采购单信息
+            var orderPurchaseInfoList = fsql.Select<OrderPurchaseInfo>().Where(opi => opi.OrderId == dbOrder.Id && opi.IsEnabled == true).ToList();
+            var orderPurchaseInfo = orderPurchaseInfoList.FirstOrDefault(opi => opi.PurchaseOrderId == request.PurchaseOrderId);
+            if (orderPurchaseInfo == null)
+                throw new BusinessException("未查询到采购单信息");
+            #endregion
+
+            foreach (var peoRequest in request.InStorePurchaseOrderManualDeliveryList)
+            {
+                bool isExists = purchaseExpressOrderList.Any(exo => exo.WaybillNo == peoRequest.WaybillNo);
+                bool isDbExists = dbPurchaseExpressOrderList.Any(exo => exo.WaybillNo == peoRequest.WaybillNo);
+
+                #region 订阅快递100
+                bool isSubscribeKD100 = false;
+                if (peoRequest.ExpressId != "zhuanxianwuliu" && !isDbExists)
+                {
+                    try
+                    {
+                        kuaiDi100Manager.SubscribeKuaiDi100(peoRequest.WaybillNo, peoRequest.ExpressId, "http://bbwyb.qiyue666.com/api/purchaseorder/kuaidi100publish");
+                        isSubscribeKD100 = true;
+                    }
+                    catch (Exception ex)
+                    {
+                        if (!ex.Message.Contains("重复订阅"))
+                        {
+                            nLogManager.Default().Error(ex, $"ManualDelivery,Request:{JsonConvert.SerializeObject(request)}");
+
+                            #region 订阅失败发送钉钉通知
+                            var dingdingMsg = new StringBuilder();
+                            dingdingMsg.AppendLine($"错误:{ex.Message}");
+                            dingdingMsg.AppendLine($"采购订单号:{request.PurchaseOrderId}");
+                            dingdingMsg.AppendLine($"拳探订单号:{dbOrder.Id}");
+                            dingdingMsg.AppendLine($"拳探订单Sn:{dbOrder.OrderSn}");
+                            dingdingMsg.AppendLine($"源物流公司:无");
+                            dingdingMsg.AppendLine($"目标物流公司:{peoRequest.ExpressName} {peoRequest.ExpressId}");
+                            dingdingMsg.AppendLine($"快递单号:{peoRequest.WaybillNo}");
+                            dingdingMsg.AppendLine("触发环节:手动发货");
+                            dingdingMsg.Append($"店铺名:{shop.ShopName}");
+                            Task.Factory.StartNew(() => SendDingDingOnKD100SubscribeFail(dingdingMsg.ToString()), CancellationToken.None, TaskCreationOptions.None, taskSchedulerManager.PurchaseOrderCallbackTaskScheduler);
+                            #endregion
+                        }
+                    }
+                }
+                #endregion
+
+                #region 创建快递单
+                if (!isDbExists)
+                {
+                    var purchaseExpressOrder = new PurchaseExpressOrder()
+                    {
+                        //OrderId = dbOrder.Id,
+                        CreateTime = DateTime.Now,
+                        //PurchaseOrderId = request.PurchaseOrderId,
+                        ShopId = dbOrder.ShopId ?? 0,
+                        TargetExpressId = peoRequest.ExpressId,
+                        TargetExpressName = peoRequest.ExpressName,
+                        WaybillNo = peoRequest.WaybillNo,
+                        ExpressState = kuaiDi100Manager.GetExpressState(1),  //快递100发货状态值 默认揽收
+                        IsSubscribeKD100 = isSubscribeKD100,
+                        ExpressContent = "手动发货",
+                        ExpressChangedTime = DateTime.Now
+                    };
+                    insertPurchaseExpressOrderList.Add(purchaseExpressOrder);
+                }
+                #endregion
+
+                #region 创建快递单关系
+                if (!isExists)
+                {
+                    var expressOrderRelation = new ExpressOrderRelationInfo()
+                    {
+                        Id = idGenerator.NewLong(),
+                        CreateTime = DateTime.Now,
+                        OrderId = dbOrder.Id,
+                        PurchaseOrderId = request.PurchaseOrderId,
+                        ShopId = dbOrder.ShopId.Value,
+                        WayBillNo = peoRequest.WaybillNo
+                    };
+                    insertExpressOrderRelationList.Add(expressOrderRelation);
+                }
+                #endregion
+
+                #region 入库采购单号
+                var waitInsertInStoreRelationList = peoRequest.InStorePurchaseOrderIdList.Where(x => !dbInStoreRelationList.Any(r => r.WaybillNo == peoRequest.WaybillNo &&
+                                                                                                                                    r.InStorePurchaseOrderId == x)).ToList();
+                if (waitInsertInStoreRelationList.Count() > 0)
+                {
+                    insertInStorePurchaseOrderRelationList.AddRange(waitInsertInStoreRelationList.Select(x => new InStorePurchaseOrdeRrelationInfo()
+                    {
+                        CreateTime = DateTime.Now,
+                        Id = idGenerator.NewLong(),
+                        InStorePurchaseOrderId = x,
+                        OrderId = request.OrderId,
+                        PurchaseOrderId = request.PurchaseOrderId,
+                        ShopId = dbOrder.ShopId,
+                        WaybillNo = peoRequest.WaybillNo
+                    }));
+                }
+                #endregion
+            }
+
+            #region 计算采购单状态
+            orderPurchaseInfo.CalculationOrderState(dbOrder.IntoStoreType.Value, fsql, null, purchaseExpressOrderList.Union(insertPurchaseExpressOrderList).ToList());
+            updateOrderPurchase = fsql.Update<OrderPurchaseInfo>(orderPurchaseInfo.Id)
+                                      .Set(opi => opi.OrderState, orderPurchaseInfo.OrderState);
+            #endregion
+
+            #region 计算订单状态
+            dbOrder.CalculationOrderState(fsql, null, orderPurchaseInfoList);
+            updateOrder = fsql.Update<Order>(dbOrder.Id)
+                              .Set(o => o.OrderState, dbOrder.OrderState);
+            #endregion
+
+            #region 通知C端状态
+            Task.Factory.StartNew(() => SendPurchaseOrderStateToC(dbOrder.Id, dbOrder.OrderState.Value), CancellationToken.None, TaskCreationOptions.None, taskSchedulerManager.PurchaseOrderCallbackTaskScheduler);
+            #endregion
+
+            fsql.Transaction(() =>
+            {
+                if (insertPurchaseExpressOrderList.Count() > 0)
+                    fsql.Insert(insertPurchaseExpressOrderList).ExecuteAffrows();
+                if (insertExpressOrderRelationList.Count() > 0)
+                    fsql.Insert(insertExpressOrderRelationList).ExecuteAffrows();
+                if (insertInStorePurchaseOrderRelationList.Count() > 0)
+                    fsql.Insert(insertInStorePurchaseOrderRelationList).ExecuteAffrows();
+
+                //if (updateOrderPurchaseSkuList.Count() > 0)
+                //{
+                //    foreach (var update in updateOrderPurchaseSkuList)
+                //        update.ExecuteAffrows();
+                //}
+                updateOrderPurchase?.ExecuteAffrows();
+                updateOrder?.ExecuteAffrows();
+            });
+
         }
 
         public void ManualSign(ManualSignRequest request)
@@ -1731,11 +1910,6 @@ namespace BBWYB.Server.Business
             string wayBillNoResponseInfo = string.Empty;
             try
             {
-                List<PurchaseExpressOrder> insertPurchaseExpressOrderList = new List<PurchaseExpressOrder>();
-                List<ExpressOrderRelationInfo> insertExpressOrderRelationInfoList = new List<ExpressOrderRelationInfo>();
-                IList<IUpdate<OrderPurchaseSkuInfo>> updateOrderPurchaseSkuList = new List<IUpdate<OrderPurchaseSkuInfo>>();
-                IUpdate<OrderPurchaseInfo> updateOrderPurchase = null;
-                IUpdate<Order> updateOrder = null;
 
                 #region 查询当前采购单的订单信息
                 currentProgress = "查询当前采购单的订单信息";
@@ -1751,6 +1925,16 @@ namespace BBWYB.Server.Business
                                                                                });
                 if (dbOrder == null)
                     throw new Exception("未查询到采购单的订单信息");
+
+                if (dbOrder.IntoStoreType == Enums.IntoStoreType.厂商代发入仓)
+                    return;
+
+                List<PurchaseExpressOrder> insertPurchaseExpressOrderList = new List<PurchaseExpressOrder>();
+                List<ExpressOrderRelationInfo> insertExpressOrderRelationInfoList = new List<ExpressOrderRelationInfo>();
+                IList<IUpdate<OrderPurchaseSkuInfo>> updateOrderPurchaseSkuList = new List<IUpdate<OrderPurchaseSkuInfo>>();
+                IUpdate<OrderPurchaseInfo> updateOrderPurchase = null;
+                IUpdate<Order> updateOrder = null;
+
                 orderId = dbOrder.Id;
                 shopId = dbOrder.ShopId;
                 #endregion
@@ -1909,7 +2093,7 @@ namespace BBWYB.Server.Business
                 #endregion
 
                 #region 计算采购单状态
-                orderPurchaseInfo.CalculationOrderState(fsql, orderPurchaseSkuList, purchaseExpressOrderList.Union(insertPurchaseExpressOrderList).ToList());
+                orderPurchaseInfo.CalculationOrderState(dbOrder.IntoStoreType.Value, fsql, orderPurchaseSkuList, purchaseExpressOrderList.Union(insertPurchaseExpressOrderList).ToList());
                 updateOrderPurchase = fsql.Update<OrderPurchaseInfo>(orderPurchaseInfo.Id)
                                           .Set(opi => opi.OrderState, orderPurchaseInfo.OrderState);
                 #endregion
@@ -2462,14 +2646,14 @@ namespace BBWYB.Server.Business
                             temp.ExpressState = state;
 
                         var oldPurchaseOrderState = purchaseOrder.OrderState;
-                        purchaseOrder.CalculationOrderState(fsql, currentPurchaseOrderSkuList, currentPurchaseExpressOrderList);
+                        purchaseOrder.CalculationOrderState(order.IntoStoreType.Value, fsql, currentPurchaseOrderSkuList, currentPurchaseExpressOrderList);
                         if (purchaseOrder.OrderState != oldPurchaseOrderState)
                         {
                             var update = fsql.Update<OrderPurchaseInfo>(purchaseOrder.Id).Set(po => po.OrderState, purchaseOrder.OrderState);
                             updateOrderPurchaseList.Add(update);
 
                             #region 通知齐库打包落仓情况
-                            if (order.IntoStoreType == Enums.IntoStoreType.发回齐越)
+                            if (order.IntoStoreType == Enums.IntoStoreType.发回齐越 && state == "QianShou")
                             {
                                 var currentOrderPurchaseRelationList = orderPurchaseRelationList.Where(opri => opri.PurchaseOrderId == purchaseOrder.PurchaseOrderId).ToList();
 

BBWYB.Server.Business/Sync/OrderSyncBusiness.cs

@@ -5,6 +5,7 @@ using BBWYB.Server.Model.Db;
 using BBWYB.Server.Model.Dto;
 using FreeSql;
 using Newtonsoft.Json.Linq;
+using Org.BouncyCastle.Bcpg;
 using SDKAdapter;
 using SDKAdapter.OperationPlatform.Client;
 using SDKAdapter.OperationPlatform.Models;
@@ -76,6 +77,7 @@ namespace BBWYB.Server.Business.Sync
 
                 //采购限时任务列表
                 var payedQTOrderIdList = qtOrderList.Items.Where(qto => qto.IsPay).Select(qto => qto.OrderId).ToList();
+
                 var dbPurchaseTimeLimitTaskList = fsql.Select<TimeLimitTask>().Where(t => t.TaskType == Enums.TimeLimitTaskType.采购任务 &&
                                                                                           payedQTOrderIdList.Contains(t.OrderId)).ToList();
 
@@ -83,6 +85,7 @@ namespace BBWYB.Server.Business.Sync
                 List<OrderSku> insertOrderSkuList = new List<OrderSku>();
                 List<OrderConsignee> insertOrderConsigneeList = new List<OrderConsignee>();
                 List<TimeLimitTask> insertTimeLimitTaskList = new List<TimeLimitTask>();
+                List<string> deleteTimeLimitTaskOrderIdList = new List<string>();
 
                 List<IUpdate<Model.Db.Order>> updateOrderList = new List<IUpdate<Model.Db.Order>>();
 
@@ -192,7 +195,12 @@ namespace BBWYB.Server.Business.Sync
                             updateOrderState = Enums.OrderState.等待采购;
 
                         if (dbOrder.OrderState != Enums.OrderState.已取消 && orderState == Enums.OrderState.已取消)
+                        {
                             updateOrderState = Enums.OrderState.已取消;
+                            if (dbPurchaseTimeLimitTaskList.Any(t => t.OrderId == qtOrder.OrderId))
+                                deleteTimeLimitTaskOrderIdList.Add(qtOrder.OrderId);
+                        }
+
                         #endregion
 
                         var updateModifyTime = dbOrder.ModifyTime != qtOrder.ModifyTime;
@@ -235,6 +243,9 @@ namespace BBWYB.Server.Business.Sync
                     if (updateOrderList.Count() > 0)
                         foreach (var update in updateOrderList)
                             update.ExecuteAffrows();
+
+                    if (deleteTimeLimitTaskOrderIdList.Count() > 0)
+                        fsql.Delete<TimeLimitTask>().Where(t => deleteTimeLimitTaskOrderIdList.Contains(t.OrderId)).ExecuteAffrows();
                 });
             }
             catch (Exception ex)
@@ -247,7 +258,7 @@ namespace BBWYB.Server.Business.Sync
         {
             foreach (var order in orderList)
             {
-                if (!order.IsPay || order.PayTime == null)
+                if (!order.IsPay || order.PayTime == null || order.OrderState == "-1")
                     continue;
                 var waitInserTimeLimitTasks = order.OrderSkuList.Where(osku => !dbTimeLimits.Any(x => x.OrderId == order.OrderId && x.SkuId == osku.SkuId))
                                                                 .Select(osku => new TimeLimitTask()

BBWYB.Server.Model/Db/Order/InStorePurchaseOrdeRrelationInfo.cs

@@ -0,0 +1,35 @@
+using FreeSql.DataAnnotations;
+
+namespace BBWYB.Server.Model.Db
+{
+
+    /// <summary>
+    /// 入库采购单关系表
+    /// </summary>
+    [Table(Name = "instorepurchaseorderrelationinfo", DisableSyncStructure = true)]
+	public partial class InStorePurchaseOrdeRrelationInfo
+    {
+
+		[Column(IsPrimary = true)]
+		public long Id { get; set; }
+
+		[Column(DbType = "datetime")]
+		public DateTime? CreateTime { get; set; }
+
+		[Column(StringLength = 100)]
+		public string InStorePurchaseOrderId { get; set; }
+
+		[Column(StringLength = 100)]
+		public string OrderId { get; set; }
+
+		[Column(StringLength = 100)]
+		public string PurchaseOrderId { get; set; }
+
+		public long? ShopId { get; set; }
+
+		[Column(StringLength = 100)]
+		public string WaybillNo { get; set; }
+
+	}
+
+}

BBWYB.Server.Model/Dto/Request/PurchaseOrder/PurchaserDeliveryRequest.cs

@@ -4,11 +4,36 @@
     {
         public string OrderId { get; set; }
 
+        public string PurchaseOrderId { get; set; }
+
+        /// <summary>
+        /// 订单SkuId (OrderSku对象的SkuId)
+        /// </summary>
+        public string SkuId { get; set; }
+
         public IList<InStorePurchaseOrderManualDeliveryRequest> InStorePurchaseOrderManualDeliveryList { get; set; }
     }
 
-    public class InStorePurchaseOrderManualDeliveryRequest: ManualDeliveryRequest
+    public class InStorePurchaseOrderManualDeliveryRequest
     {
+        /// <summary>
+        /// 快递公司Id
+        /// </summary>
+        public string ExpressId { get; set; }
+
+        /// <summary>
+        /// 快递公司名称
+        /// </summary>
+        public string ExpressName { get; set; }
+
+        /// <summary>
+        /// 快递单号
+        /// </summary>
+        public string WaybillNo { get; set; }
+
+        /// <summary>
+        /// 入库采购单集合
+        /// </summary>
         public IList<string> InStorePurchaseOrderIdList { get; set; }
     }
 }

BBWYB.Server.Model/Dto/Response/Order/PurchaseExpressOrderResponse.cs

@@ -2,11 +2,16 @@
 
 namespace BBWYB.Server.Model.Dto
 {
-    public class PurchaseExpressOrderResponse: PurchaseExpressOrder
+    public class PurchaseExpressOrderResponse : PurchaseExpressOrder
     {
         /// <summary>
         /// 归属SkuId,逗号间隔 (拳探SKU)
         /// </summary>
         public string BelongSkuIds { get; set; }
+
+        /// <summary>
+        /// 入仓采购单号
+        /// </summary>
+        public IList<string> InStorePurchaseOrderIdList { get; set; }
     }
 }