采购入库单

Reportapi/MyCode.Project.Repositories/BusiOrderGoodsDocInRepository.cs

@@ -68,10 +68,10 @@ namespace MyCode.Project.Repositories
         {
             string sql = $@"SELECT 
     -- 分组字段
-    CONVERT(date, InOutDate2) AS InOutDate2,
+    CONVERT(date, MAX(InOutDate2)) AS InOutDate2,
     WarehouseCode AS WarehouseCode,
     WarehouseName AS WarehouseName,
-    [GoodsdocNo] AS [GoodsdocNo]   ,[ApplyCompanyName],[VendCustomerName],	
+    [SourceBillNo] AS GoodsdocNo   ,[ApplyCompanyName],[VendCustomerName],	
     -- 合计数据
     SUM(Quantity) AS Quantity ,-- 总数量,
     SUM(BaceCurrencyCostAmount) AS BaceCurrencyCostAmount,--总入库金额,
@@ -87,16 +87,14 @@ namespace MyCode.Project.Repositories
     
 FROM [dbo].[BusiOrderGoodsDocIn]
 WHERE Status IN (0)  -- 根据业务需求调整状态筛选
-GROUP BY 
+GROUP BY     
-    CONVERT(DATE, InOutDate2),
     WarehouseCode,
     WarehouseName,
-    [GoodsdocNo]   ,[ApplyCompanyName],[VendCustomerName]
+    [SourceBillNo]   ,[ApplyCompanyName],[VendCustomerName] 
- 
 ORDER BY 
-    CONVERT(date, InOutDate2) DESC,
+   InOutDate2 DESC,
     WarehouseCode,
-    [GoodsdocNo]; ";
+    GoodsdocNo;  ";
             var list = this.SelectList<BusiOrderGoodsDocInSummary>(sql);
             return list;
         }

Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs

@@ -351,6 +351,7 @@ namespace MyCode.Project.Services.Implementation
             var warehouseCodes = shopConfigs.Select(t => t.FPURCHASINGWAREHOUSECODE).Distinct().ToList();
             var guolv = shopConfigs.Select(t => new { t.FPURCHASINGWAREHOUSECODE, t.FPURCHASEDATE }).ToList();
             trades = trades.Where(t => warehouseCodes.Contains(t.warehouseCode)).ToList();
+           
             foreach (var item in guolv)
             {               
                 trades.RemoveAll(t => item.FPURCHASINGWAREHOUSECODE == t.warehouseCode && item.FPURCHASEDATE > t.inOutDate2);

Reportapi/MyCode.Project.Services/Implementation/JackYunTaskService.cs

@@ -343,7 +343,8 @@ namespace MyCode.Project.Services.Implementation
             DateTime runTime = DateTime.Parse(now);
             var list = _jackYunService.GetPurchaseInboundData(runTime);
             SetPurchaseInboundData(list);
-            //_workProcessService.Add<IJackYunTaskService>(this.MerchantId, "GetAndMergePushGoodsDocInOrder", "合并吉客云采购订单到新表", now, 1);
+            if(list.Count>0)
+                _workProcessService.Add<IJackYunTaskService>(this.MerchantId, "GetAndMergePushGoodsDocInOrder", "合并吉客云采购订单到新表", now, 1);
         }
         #endregion
 
@@ -360,9 +361,14 @@ namespace MyCode.Project.Services.Implementation
                 trades = trades.Where(t => !ids.Contains(t.RecId)).ToList();
             List<BusiOrderGoodsDocIn> addList = new List<BusiOrderGoodsDocIn>();
             addList = AutoMapperHelper.AutoMappToList<BusiOrderGoodsDocIn, BusiOrderGoodsDocInResponse>(trades);
+
+            var shopConfigs = _yTKJTShopParameterRepository.Queryable().Where(t => t.FDOCUMENTSTATUS == "C" && t.FPURCHASERECEIVING == "1").ToList();
+            var guolv = shopConfigs.Select(t => new { t.FPURCHASINGWAREHOUSECODE, t.FPURCHASEDATE }).ToList();
+
             addList.ForEach(item =>
             {
-                
+            
+             
                 item.ID = Guid.NewGuid();
                 DateTime startTime = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
                 item.InOutDate2 = startTime.AddMilliseconds(item.InOutDate.Value).ToLocalTime();
@@ -370,14 +376,18 @@ namespace MyCode.Project.Services.Implementation
                 item.Status = 0;
                 item.CreateTime = DateTime.Now;
                 item.CreateUserName = "";
-           
+                var one = guolv.Where(h => h.FPURCHASINGWAREHOUSECODE == item.WarehouseCode).FirstOrDefault();
+                if (one == null || one.FPURCHASEDATE > item.InOutDate2)
+                {
+                    item.ID = Guid.Empty;
+                }
 
             });
-
+            addList = addList.Where(t => t.ID != Guid.Empty).ToList();
             if (addList.Count > 0)
             {
                 _busiOrderGoodsDocInRepository.Add(addList);
-                //_workProcessService.Add<IJackYunTaskService>(this.MerchantId, "GetAndMergePushGoodsDocInOrder", "合并吉客云采购订单到新表", now, 1);
+               
             }
 
         }
@@ -441,11 +451,11 @@ namespace MyCode.Project.Services.Implementation
                 _PushKingDeeGoodsDocInRepository.Add(pushKingDeeOrders);
        
             }
-            //pushKingDeeOrders.ForEach(t =>
+            pushKingDeeOrders.ForEach(t =>
-            //{
+            {
-            //    _workProcessService.Add<IOrderPushService>(this.MerchantId, "PushOrderToKingDee", "推送退货订单到云星空或者WMS", t.Id, 1);
+                _workProcessService.Add<IPurchaseStockInService>(this.MerchantId, "PushPurchaseStockInToKingDee", "推送采购入库单到金蝶云星空", t.ID, 1);
-            //    Thread.Sleep(300);
+                Thread.Sleep(300);
-            //});
+            });
 
             return JsonHelper.ToJson(list);
         }

Reportapi/MyCode.Project.Services/Implementation/PurchaseStockInService.cs

@@ -116,7 +116,7 @@ namespace MyCode.Project.Services.Implementation
             // 从BusiOrderGoodsDocIn表获取明细数据
             var detailList = _busiOrderGoodsDocInRepository
                 .Queryable()
-                .Where(t => t.GoodsdocNo == goodsDocIn.GoodsdocNo)
+                .Where(t => t.SourceBillNo == goodsDocIn.GoodsdocNo)
                 .ToList();
 
             if (detailList == null || detailList.Count == 0)