123

Reportapi/MyCode.Project.Domain/Message/Request/JackYun/StorageGoodsDocOutV2Request.cs

@@ -13,6 +13,12 @@ namespace MyCode.Project.Domain.Message.Request.JackYun
     /// </summary>
     public class StorageGoodsDocOutV2Request : BaseRequestBizData
     {
+
+        /// <summary>
+        /// 上下文编号
+        /// </summary>
+        public string contextId { get; set; }
+
         /// <summary>
         /// 分页页码 
         /// </summary>

Reportapi/MyCode.Project.Domain/Message/Response/JackYun/BusiOrderGoodsDocInSummary.cs

@@ -0,0 +1,102 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MyCode.Project.Domain.Message.Response.JackYun
+{
+    public class BusiOrderGoodsDocInSummary
+    {
+        /// <summary>
+        /// 出入库日期
+        /// </summary>
+        public DateTime InOutDate2 { get; set; }
+
+        /// <summary>
+        /// 仓库编码
+        /// </summary>
+        public string WarehouseCode { get; set; }
+
+        /// <summary>
+        /// 仓库名称
+        /// </summary>
+        public string WarehouseName { get; set; }
+
+        /// <summary>
+        /// 商品编码
+        /// </summary>
+        public string GoodsNo { get; set; }
+
+        /// <summary>
+        /// 商品名称
+        /// </summary>
+        public string GoodsName { get; set; }
+
+        /// <summary>
+        /// 规格
+        /// </summary>
+        public string SkuName { get; set; }
+
+        /// <summary>
+        /// 单位
+        /// </summary>
+        public string UnitName { get; set; }
+
+        /// <summary>
+        /// 条码
+        /// </summary>
+        public string SkuBarcode { get; set; }
+
+        /// <summary>
+        /// 总数量
+        /// </summary>
+        public decimal Quantity { get; set; }
+
+        /// <summary>
+        /// 总入库金额
+        /// </summary>
+        public decimal BaceCurrencyCostAmount { get; set; }
+
+        /// <summary>
+        /// 总本币无税金额
+        /// </summary>
+        public decimal BaceCurrencyNoTaxAmount { get; set; }
+
+        /// <summary>
+        /// 总本币含税金额
+        /// </summary>
+        public decimal BaceCurrencyWithTaxAmount { get; set; }
+
+        /// <summary>
+        /// 总本币税额
+        /// </summary>
+        public decimal BaceCurrencyTaxAmount { get; set; }
+
+        /// <summary>
+        /// 总原币无税金额
+        /// </summary>
+        public decimal TransNoTaxAmount { get; set; }
+
+        /// <summary>
+        /// 总原币含税金额
+        /// </summary>
+        public decimal TransHasTaxAmount { get; set; }
+
+        /// <summary>
+        /// 总原币税额
+        /// </summary>
+        public decimal TransTaxAmount { get; set; }
+
+        /// <summary>
+        /// 入库单数
+        /// </summary>
+        public int OrderCount { get; set; }
+
+        /// <summary>
+        /// 明细行数
+        /// </summary>
+        public int DetailCount { get; set; }
+    }
+
+}

Reportapi/MyCode.Project.Domain/Model/PushKingDeeGoodsDocIn.cs

@@ -0,0 +1,314 @@
+using System;
+using System.Linq;
+using System.Text;
+using SqlSugar;
+
+namespace MyCode.Project.Domain.Model
+{
+    ///<summary>
+    ///
+    ///</summary>
+    [SugarTable("PushKingDeeGoodsDocIn")]
+    public partial class PushKingDeeGoodsDocIn
+    {
+           public PushKingDeeGoodsDocIn(){
+
+
+           }
+           /// <summary>
+           /// Desc:
+           /// Default:newid()
+           /// Nullable:False
+           /// </summary>           
+           [SugarColumn(IsPrimaryKey=true)]
+           public Guid ID {get;set;}
+
+           /// <summary>
+           /// Desc:出入库单号
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string GoodsdocNo {get;set;}
+
+           /// <summary>
+           /// Desc:出入库日期
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public DateTime? InOutDate2 {get;set;}
+
+           /// <summary>
+           /// Desc:系统出入库日期
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public DateTime? GmtCreate2 {get;set;}
+
+           /// <summary>
+           /// Desc:入库类型
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string InouttypeName {get;set;}
+
+           /// <summary>
+           /// Desc:仓库名称
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string WarehouseName {get;set;}
+
+           /// <summary>
+           /// Desc:币种
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string CurrencyCode {get;set;}
+
+           /// <summary>
+           /// Desc:币种名称
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string CurrencyCodeName {get;set;}
+
+           /// <summary>
+           /// Desc:汇率
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public decimal? CurrencyRate {get;set;}
+
+           /// <summary>
+           /// Desc:操作人
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string CreateUserName {get;set;}
+
+           /// <summary>
+           /// Desc:公司
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string CompanyName {get;set;}
+
+           /// <summary>
+           /// Desc:往来单位
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string VendCustomerName {get;set;}
+
+           /// <summary>
+           /// Desc:回传状态：0未回传；1回传失败；10不回传；11已回传
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string CallbackStatus {get;set;}
+
+           /// <summary>
+           /// Desc:申请公司
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string ApplyCompanyName {get;set;}
+
+           /// <summary>
+           /// Desc:申请部门
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string ApplyDepartName {get;set;}
+
+           /// <summary>
+           /// Desc:申请人
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string ApplyUserName {get;set;}
+
+           /// <summary>
+           /// Desc:渠道
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string ChannelName {get;set;}
+
+           /// <summary>
+           /// Desc:货品编号
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string GoodsNo {get;set;}
+
+           /// <summary>
+           /// Desc:货品名称
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string GoodsName {get;set;}
+
+           /// <summary>
+           /// Desc:规格
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string SkuName {get;set;}
+
+           /// <summary>
+           /// Desc:条码
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string SkuBarcode {get;set;}
+
+           /// <summary>
+           /// Desc:单位
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string UnitName {get;set;}
+
+           /// <summary>
+           /// Desc:数量
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public decimal? Quantity {get;set;}
+
+           /// <summary>
+           /// Desc:入库价
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public decimal? BaceCurrencyCostPrice {get;set;}
+
+           /// <summary>
+           /// Desc:入库金额
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public decimal? BaceCurrencyCostAmount {get;set;}
+
+           /// <summary>
+           /// Desc:本币无税单价
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public decimal? BaceCurrencyNoTaxPrice {get;set;}
+
+           /// <summary>
+           /// Desc:本币无税金额
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public decimal? BaceCurrencyNoTaxAmount {get;set;}
+
+           /// <summary>
+           /// Desc:本币含税单价
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public decimal? BaceCurrencyWithTaxPrice {get;set;}
+
+           /// <summary>
+           /// Desc:本币含税金额
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public decimal? BaceCurrencyWithTaxAmount {get;set;}
+
+           /// <summary>
+           /// Desc:baceCurrencyTaxAmount
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public decimal? BaceCurrencyTaxAmount {get;set;}
+
+           /// <summary>
+           /// Desc:税率
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public decimal? TaxRate {get;set;}
+
+           /// <summary>
+           /// Desc:原币无税单价
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public decimal? TransNoTaxPrice {get;set;}
+
+           /// <summary>
+           /// Desc:原币无税金额
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public decimal? TransNoTaxAmount {get;set;}
+
+           /// <summary>
+           /// Desc:原币含税单价
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public decimal? TransHasTaxPrice {get;set;}
+
+           /// <summary>
+           /// Desc:原币含税金额
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public decimal? TransHasTaxAmount {get;set;}
+
+           /// <summary>
+           /// Desc:原币税额
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public decimal? TransTaxAmount {get;set;}
+
+           /// <summary>
+           /// Desc:正次品  1-正品 0-次品
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public byte? IsCertified {get;set;}
+
+           /// <summary>
+           /// Desc:往来单位code
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string VendCode {get;set;}
+
+           /// <summary>
+           /// Desc:仓库code
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string WarehouseCode {get;set;}
+
+           /// <summary>
+           /// Desc:创建时间
+           /// Default:DateTime.Now
+           /// Nullable:False
+           /// </summary>           
+           public DateTime CreateTime {get;set;}
+
+           /// <summary>
+           /// Desc:更新时间
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public DateTime? UpdateTime {get;set;}
+
+           /// <summary>
+           /// Desc:0=未处理  1=已合并 2=已推送
+           /// Default:0
+           /// Nullable:True
+           /// </summary>           
+           public int? Status {get;set;}
+
+    }
+}

Reportapi/MyCode.Project.Domain/MyCode.Project.Domain.csproj

@@ -81,6 +81,7 @@
     <Compile Include="Message\Response\Common\ItemResult.cs" />
     <Compile Include="Message\Response\Common\ListHeadFieldData.cs" />
     <Compile Include="Message\Response\JackYun\BusiOrderGoodsDocInResponse.cs" />
+    <Compile Include="Message\Response\JackYun\BusiOrderGoodsDocInSummary.cs" />
     <Compile Include="Message\Response\JackYun\CreateAndStockinResp.cs" />
     <Compile Include="Message\Response\JackYun\PushOrderListResp.cs" />
     <Compile Include="Message\Response\JackYun\StorageGoodsDocOutV2Response.cs" />
@@ -102,6 +103,7 @@
     <Compile Include="Model\BusiOrderGoodsDocIn.cs" />
     <Compile Include="Model\JackOrders.cs" />
     <Compile Include="Model\JackOrdersItem.cs" />
+    <Compile Include="Model\PushKingDeeGoodsDocIn.cs" />
     <Compile Include="Model\PushKingDeeOrder.cs" />
     <Compile Include="Model\PushKingDeeOrderItem.cs" />
     <Compile Include="Model\ReturnChangeGoodsDetail.cs" />
@@ -115,6 +117,7 @@
     <Compile Include="Repositories\IBusiOrderGoodsDocInRepository.cs" />
     <Compile Include="Repositories\IJackOrdersItemRepository.cs" />
     <Compile Include="Repositories\IJackOrdersRepository.cs" />
+    <Compile Include="Repositories\IPushKingDeeGoodsDocInRepository.cs" />
     <Compile Include="Repositories\IPushKingDeeOrderItemRepository.cs" />
     <Compile Include="Repositories\IPushKingDeeOrderRepository.cs" />
     <Compile Include="Repositories\IRepository.cs" />

Reportapi/MyCode.Project.Domain/Repositories/IPushKingDeeGoodsDocInRepository.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using MyCode.Project.Infrastructure;
+using MyCode.Project.Domain;
+using MyCode.Project.Domain.Model;
+using MyCode.Project.Infrastructure.Common;
+using MyCode.Project.Domain.Message;
+
+namespace MyCode.Project.Domain.Repositories
+{
+	public interface IPushKingDeeGoodsDocInRepository : IRepository<PushKingDeeGoodsDocIn>
+	{
+		
+	}
+}

Reportapi/MyCode.Project.Repositories/BusiOrderGoodsDocInRepository.cs

@@ -9,6 +9,7 @@ using MyCode.Project.Domain.Model;
 using MyCode.Project.Domain.Repositories;
 using MyCode.Project.Infrastructure.Common;
 using MyCode.Project.Infrastructure.Search;
+using MyCode.Project.Domain.Message.Response.JackYun;
 
 namespace MyCode.Project.Repositories
 {
@@ -18,9 +19,73 @@ namespace MyCode.Project.Repositories
         { }
 
 
+//        SELECT 
+//    -- 分组字段
+//    CONVERT(date, InOutDate2) AS 出入库日期,
+//    WarehouseCode AS 仓库编码,
+//    WarehouseName AS 仓库名称,
+//    GoodsNo AS 商品编码,
+//    GoodsName AS 商品名称,
+//    SkuName AS 规格,
+//    UnitName AS 单位,
+    
+//    -- 合计数据
+//    SUM(Quantity) AS 总数量,
+//    SUM(BaceCurrencyCostAmount) AS 总入库金额,
+//    SUM(BaceCurrencyNoTaxAmount) AS 总本币无税金额,
+//    SUM(BaceCurrencyWithTaxAmount) AS 总本币含税金额,
+//    SUM(BaceCurrencyTaxAmount) AS 总本币税额,
+//    SUM(TransNoTaxAmount) AS 总原币无税金额,
+//    SUM(TransHasTaxAmount) AS 总原币含税金额,
+//    SUM(TransTaxAmount) AS 总原币税额,
+    
+//    -- 计数统计
+//    COUNT(DISTINCT GoodsdocNo) AS 入库单数,
+//    COUNT(*) AS 明细行数
+
+
+//FROM[dbo].[BusiOrderGoodsDocIn]
+//        WHERE Status IN(0)  -- 根据业务需求调整状态筛选
+//        GROUP BY
+//            CONVERT(date, InOutDate2),
+//    WarehouseCode,
+//    WarehouseName,
+//    GoodsNo,
+//    GoodsName,
+//    SkuName,
+//    UnitName
+//ORDER BY
+//    CONVERT(date, InOutDate2) DESC,
+//    WarehouseCode,
+//    GoodsNo;
+
+        #region  GetPushOrder(获取合并后的吉客云订单)
+        /// <summary>
+        /// 获取合并后的吉客云订单
+        /// </summary>
+        /// <returns></returns>
+        public List<PushOrderListResp> GetPushReturnOrder()
+        {
+            string sql = $@"
+   SELECT [shopCode], [shopName], [shopId], [warehouseName], [warehouseCode],     
+       [status], CONVERT(NVARCHAR(30),[consignTime],23)  [consignTime],
+       [goodsNo],  [goodsId],SUM([sellTotal]*-1) [sellTotal],
+       SUM([returnCount]*-1) [sellCount], SUM([ShareShouldReturnFee]*-1) AS [divideSellTotal],
+       [barcode],  [TradeType] ,[warehouseId],Unit
+FROM [JackOrders] a WITH (NOLOCK)
+    LEFT JOIN [dbo].[ReturnChangeGoodsDetail] b WITH (NOLOCK)
+        ON a.id = b.JackOrdersId
+WHERE a.status = 0 and [TradeType]=8 and returnCount <> 0
+GROUP BY [shopCode],[shopName], [shopId], [warehouseName], [warehouseCode],   [status],   CONVERT(NVARCHAR(30),[consignTime],23) ,[goodsNo],
+[goodsId], [barcode] ,[warehouseId],  [TradeType],Unit
+ORDER BY [shopCode],[consignTime] desc,[TradeType]
+";
+            var list = this.SelectList<PushOrderListResp>(sql);
+            return list;
+        }
+        #endregion
 
 
 
-
+    }
-	}
 }

Reportapi/MyCode.Project.Repositories/MyCode.Project.Repositories.csproj

@@ -90,6 +90,7 @@
     <Compile Include="JackOrdersItemRepository.cs" />
     <Compile Include="JackOrdersRepository.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="PushKingDeeGoodsDocInRepository.cs" />
     <Compile Include="PushKingDeeOrderItemRepository.cs" />
     <Compile Include="PushKingDeeOrderRepository.cs" />
     <Compile Include="ReturnChangeGoodsDetailRepository.cs" />

Reportapi/MyCode.Project.Repositories/PushKingDeeGoodsDocInRepository.cs

@@ -0,0 +1,26 @@
+using MyCode.Project.Repositories.Common;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using MyCode.Project.Domain.Message;
+using MyCode.Project.Domain.Model;
+using MyCode.Project.Domain.Repositories;
+using MyCode.Project.Infrastructure.Common;
+using MyCode.Project.Infrastructure.Search;
+
+namespace MyCode.Project.Repositories
+{
+    public class PushKingDeeGoodsDocInRepository: Repository<PushKingDeeGoodsDocIn>, IPushKingDeeGoodsDocInRepository
+    {
+        public PushKingDeeGoodsDocInRepository(MyCodeSqlSugarClient context) : base(context)
+        { }
+
+      
+
+
+	
+
+	}
+}

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

@@ -411,6 +411,7 @@ namespace MyCode.Project.Services.Implementation
 
                         trades.AddRange(list1.Data);
                         requestBizData.PageIndex = pageIndex;
+                        requestBizData.contextId = TotalResults;
                         pageIndex++;
                         Thread.Sleep(100);
                         response = Call(EnumAttribute.GetAttribute(ApiEnum.ERPSTORAGEGOODSDOCOUTV2).Value, "1.0", requestBizData);
@@ -468,9 +469,9 @@ namespace MyCode.Project.Services.Implementation
             //}).ToList();
 
 
-            //return reslut;
+            return trades;
+
 
-            return new List<ErpStorageGoodsDocOutV2ResponseBizData>();
         }
         #endregion
     }

Reportapi/MyCode.Project.WebApi/Web.config

@@ -22,9 +22,9 @@
   </system.webServer>
   <connectionStrings>
     <!-- 数据库测试-->
-  	  <add name="WMSConn" connectionString="Data Source=127.0.0.1; Initial Catalog=yuntong; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun2" providerName="System.Data.SqlClient" />
+  	  <add name="WMSConn" connectionString="Data Source=58.252.252.77,30003; Initial Catalog=yuntong; User ID=sa;Password=123; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun2" providerName="System.Data.SqlClient" />
 
-	  <add name="YunTongConn" connectionString="Data Source=127.0.0.1; Initial Catalog=yuntong; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun1" providerName="System.Data.SqlClient" />
+	  <add name="YunTongConn" connectionString="Data Source=58.252.252.77,30003; Initial Catalog=yuntong; User ID=sa;Password=123; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun1" providerName="System.Data.SqlClient" />
 
 	    <!--测试MYSQL内网-->
     <!--<add name="MasterConn" connectionString="" providerName="MySql.Data.MySqlClient" />-->