123

Reportapi/MyCode.Project.Repositories/BusiOrderGoodsDocInRepository.cs

@@ -103,6 +103,50 @@ ORDER BY
         #endregion
 
 
+//        #region  GetPushGoodsDocInOrder(获取合并后的吉客云采购入库单订单)
+//        /// <summary>
+//        /// 获取合并后的吉客云采购入库单订单
+//        /// </summary>
+//        /// <returns></returns>
+//        public List<BusiOrderGoodsDocInSummary> GetPushGoodsDocInOrder()
+//        {
+//            string sql = $@"SELECT 
+//    -- 分组字段
+//    CONVERT(date, InOutDate2) AS InOutDate2,
+//    WarehouseCode AS WarehouseCode,
+//    WarehouseName AS WarehouseName,
+//    VendCode    ,[ApplyCompanyName],[VendCustomerName],	
+//    -- 合计数据
+//    SUM(Quantity) AS Quantity ,-- 总数量,
+//    SUM(BaceCurrencyCostAmount) AS BaceCurrencyCostAmount,--总入库金额,
+//    SUM(BaceCurrencyNoTaxAmount) AS BaceCurrencyNoTaxAmount,--总本币无税金额,
+//    SUM(BaceCurrencyWithTaxAmount) AS BaceCurrencyWithTaxAmount,--总本币含税金额,
+//    SUM(BaceCurrencyTaxAmount) AS BaceCurrencyTaxAmount,-- 总本币税额,
+//    SUM(TransNoTaxAmount) AS TransNoTaxAmount,--总原币无税金额,
+//    SUM(TransHasTaxAmount) AS TransHasTaxAmount,--总原币含税金额,
+//    SUM(TransTaxAmount) AS TransTaxAmount,--总原币税额,    
+//    -- 计数统计
+//    COUNT(DISTINCT GoodsdocNo) AS 入库单数,
+//    COUNT(*) AS 明细行数
+    
+//FROM [dbo].[BusiOrderGoodsDocIn]
+//WHERE Status IN (0)  -- 根据业务需求调整状态筛选
+//GROUP BY 
+//    CONVERT(DATE, InOutDate2),
+//    WarehouseCode,
+//    WarehouseName,
+//    VendCode  ,[ApplyCompanyName],[VendCustomerName]
+ 
+//ORDER BY 
+//    CONVERT(date, InOutDate2) DESC,
+//    WarehouseCode,
+//    VendCode ; ";
+//            var list = this.SelectList<BusiOrderGoodsDocInSummary>(sql);
+//            return list;
+//        }
+//        #endregion
+
+
 
     }
 }

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

@@ -377,7 +377,7 @@ namespace MyCode.Project.Services.Implementation
             if (addList.Count > 0)
             {
                 _busiOrderGoodsDocInRepository.Add(addList);
-             
+                //_workProcessService.Add<IJackYunTaskService>(this.MerchantId, "GetAndMergePushGoodsDocInOrder", "合并吉客云采购订单到新表", now, 1);
             }
 
         }

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

@@ -70,10 +70,10 @@ namespace MyCode.Project.Services.Implementation
                 throw new BaseException($"销售出库单 {orderHead.Sheet} 已经推送过，状态为：{orderHead.Status}，不允许重复推送");
             }
 
-            if (orderHead.TradeType != TRADE_TYPE_SALES_OUTBOUND)
+            //if (orderHead.TradeType != TRADE_TYPE_SALES_OUTBOUND)
-            {
+            //{
-                throw new BaseException($"订单类型 {orderHead.TradeType} 不是销售出库单（TradeType应为1），无法推送");
+            //    throw new BaseException($"订单类型 {orderHead.TradeType} 不是销售出库单（TradeType应为1），无法推送");
-            }
+            //}
 
             var param = _yTKJTShopParameterRepository
                 .Queryable()

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

@@ -63,10 +63,10 @@ namespace MyCode.Project.Services.Implementation
                 throw new BaseException("单据已经下推.");
             }
 
-            if (orderHead.TradeType != TRADE_TYPE_RETURN_ORDER)
+            //if (orderHead.TradeType != TRADE_TYPE_RETURN_ORDER)
-            {
+            //{
-                throw new BaseException($"订单类型 {orderHead.TradeType} 不是销售退货单（TradeType应为8），无法推送");
+            //    throw new BaseException($"订单类型 {orderHead.TradeType} 不是销售退货单（TradeType应为8），无法推送");
-            }
+            //}
 
             var param = _yTKJTShopParameterRepository
                 .Queryable()