Develop/YunTongJackYunTask
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
liqionghai 2025-07-16 14:41:39 +08:00
parent 74123dcad2
commit f4c865ab2c
13 changed files with 262 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
Reportapi/MyCode.Project.Domain/Message/Request/JackYun/CreateAndStockinGetRequestBizData.cs Normal file
View File

@ -0,0 +1,114 @@
using MyCode.Project.Infrastructure.JackYun;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace MyCode.Project.Domain.Message.Request.JackYun
{
public class CreateAndStockinGetRequestBizData : BaseRequestBizData
{
/// <summary>
/// 备注
/// </summary>
public String memo { get; set; }
/// <summary>
/// 来源，默认ERP
/// </summary>
public String source { get; set; }
/// <summary>
/// 制单人
/// </summary>
public String @operator { get; set; }
/// <summary>
/// 关联单据编号
/// 可随机，保证不重复即可
/// </summary>
public String relDataId { get; set; }
/// <summary>
/// 出库类型 101=采购入库 102=调拨入库 103=盘盈入库 104=其他入库
/// </summary>
public int inType { get; set; }
/// <summary>
/// 仓库code
/// </summary>
public String inWarehouseCode { get; set; }
/// <summary>
/// 申请人姓名
/// </summary>
public String applyUserName { get; set; }
/// <summary>
/// 入库申请单明细
/// </summary>
public List<StockInDetailViews> stockInDetailViews { get; set; }
///// <summary>
///// 收发货人信息
///// </summary>
//public StockInExpressInfo stockInExpressInfo { get; set; }
/// <summary>
/// 申请人部门
/// </summary>
public String applyDepartName { get; set; }
/// <summary>
/// 申请时间
/// </summary>
public DateTime applyDate { get; set; }
}
public class StockInDetailViews
{
/// <summary>
/// 价格
/// </summary>
public decimal skuPrice { get; set; }
/// <summary>
/// 关联实际业务明细表的id
/// </summary>
public long relDetailId { get; set; }
/// <summary>
/// 规格id
/// </summary>
public long skuId { get; set; }
/// <summary>
/// 数量
/// </summary>
public decimal skuCount { get; set; }
/// <summary>
/// 货品编号
/// </summary>
public String goodsNo { get; set; }
/// <summary>
/// 计量单位名称
/// </summary>
public String unitName { get; set; }
/// <summary>
/// 是否正品
/// </summary>
public Byte isCertified { get; set; }
/// <summary>
/// 条形码
/// </summary>
public String skuBarcode { get; set; }
}
}

67
Reportapi/MyCode.Project.Domain/Message/Response/JackYun/CreateAndStockinResp.cs Normal file
View File

@ -0,0 +1,67 @@
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 CreateAndStockinResp
{
/// <summary>
/// [单据号]
/// </summary>
public string relDataId;
/// <summary>
/// [单据行号]
/// </summary>
public string relDetailId;
/// <summary>
/// [变动方向]
/// </summary>
public string type;
/// <summary>
/// [SKU]
/// </summary>
public string outSkuCode;
/// <summary>
/// [BARCODE]
/// </summary>
public string skuBarcode;
/// <summary>
/// [单位]
/// </summary>
public string unitName;
/// <summary>
/// [数量]
/// </summary>
public decimal skuCount;
/// <summary>
/// [仓库]
/// </summary>
public string inWarehouseCode;
/// <summary>
/// [过账日期]
/// </summary>
public DateTime applyDate;
/// <summary>
/// [备注]
/// </summary>
public string rowRemark;
/// <summary>
/// [status]
/// </summary>
public int status;
}
}

9
Reportapi/MyCode.Project.Domain/MyCode.Project.Domain.csproj
View File

@ -62,6 +62,7 @@
<Compile Include="Message\Act\Common\ReportExportAct.cs" />
<Compile Include="Message\Act\Common\ExcelData.cs" />
<Compile Include="Message\Act\Common\RequestModel.cs" />
<Compile Include="Message\Request\JackYun\CreateAndStockinGetRequestBizData.cs" />
<Compile Include="Message\Request\JackYun\OrderTradeFullInfoGetRequestBizData.cs" />
<Compile Include="Message\Request\KingDee\BillDelete.cs" />
<Compile Include="Message\Request\KingDee\BillSave.cs" />
@ -71,6 +72,7 @@
<Compile Include="Message\Response\Common\IdName.cs" />
<Compile Include="Message\Response\Common\ItemResult.cs" />
<Compile Include="Message\Response\Common\ListHeadFieldData.cs" />
<Compile Include="Message\Response\JackYun\CreateAndStockinResp.cs" />
<Compile Include="Message\Response\JackYun\PushOrderListResp.cs" />
<Compile Include="Message\Response\KingDee\ErrorResponse.cs" />
<Compile Include="Message\Response\LxmZHMDReport\ReportCalRateResp.cs" />
@ -86,6 +88,7 @@
<Compile Include="Model\PushKingDeeOrder.cs" />
<Compile Include="Model\PushKingDeeOrderItem.cs" />
<Compile Include="Model\SysWorkprocess.cs" />
<Compile Include="Model\WMStoJackyunInventoryMovementView1.cs" />
<Compile Include="Model\YTKJTShopParameter.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Repositories\IApiLogRepository.cs" />
@ -95,10 +98,12 @@
<Compile Include="Repositories\IPushKingDeeOrderRepository.cs" />
<Compile Include="Repositories\IRepository.cs" />
<Compile Include="Repositories\IRepository`.cs" />
<Compile Include="Repositories\ISysWorkprocessHistoryRepository.cs" />
<Compile Include="Repositories\ISysWorkprocessRepository.cs" />
<Compile Include="Repositories\IWMStoJackyunInventoryMovementView1Repository.cs" />
<Compile Include="Repositories\IYTKJTShopParameterRepository.cs" />
<Compile Include="ZHMDModel\WMStoJackyunInventoryMovementView1.cs" />
<Compile Include="ZHMDRepositories\IWMStoJackyunInventoryMovementView1Repository.cs" />
<Compile Include="ZHMDModel\WMStoJackyunInventoryMovementView2.cs" />
<Compile Include="ZHMDRepositories\IWMStoJackyunInventoryMovementView2Repository.cs" />
</ItemGroup>
<ItemGroup>
<None Include="App.config" />

6
Reportapi/MyCode.Project.Domain/ZHMDModel/WMStoJackyunInventoryMovementView1.cs → Reportapi/MyCode.Project.Domain/ZHMDModel/WMStoJackyunInventoryMovementView2.cs
View File

@ -8,10 +8,10 @@ namespace MyCode.Project.Domain.ZHMDModel
///<summary>
///
///</summary>
[SugarTable("WMStoJackyun_InventoryMovement_View1")]
public partial class WMStoJackyunInventoryMovementView1
[SugarTable("WMStoJackyun_InventoryMovement_View2")]
public partial class WMStoJackyunInventoryMovementView2
{
public WMStoJackyunInventoryMovementView1(){
public WMStoJackyunInventoryMovementView2(){
}

3
Reportapi/MyCode.Project.Domain/ZHMDRepositories/IWMStoJackyunInventoryMovementView1Repository.cs → Reportapi/MyCode.Project.Domain/ZHMDRepositories/IWMStoJackyunInventoryMovementView2Repository.cs
View File

@ -8,10 +8,11 @@ using MyCode.Project.Domain;
using MyCode.Project.Domain.ZHMDModel;
using MyCode.Project.Infrastructure.Common;
using MyCode.Project.Domain.Message;
using MyCode.Project.Domain.Model;
namespace MyCode.Project.Domain.Repositories.ZHMDRepositories
{
public interface IWMStoJackyunInventoryMovementView1Repository
public interface IWMStoJackyunInventoryMovementView2Repository
{
List<WMStoJackyunInventoryMovementView1> GetList(DateTime now);

1
Reportapi/MyCode.Project.Repositories/MyCode.Project.Repositories.csproj
View File

@ -93,6 +93,7 @@
<Compile Include="PushKingDeeOrderItemRepository.cs" />
<Compile Include="PushKingDeeOrderRepository.cs" />
<Compile Include="SysWorkprocessRepository.cs" />
<Compile Include="WMStoJackyunInventoryMovementView1Repository.cs" />
<Compile Include="YTKJTShopParameterRepository.cs" />
<Compile Include="ZHMD\WMStoJackyunInventoryMovementView1Repository.cs" />
</ItemGroup>

25
Reportapi/MyCode.Project.Repositories/WMStoJackyunInventoryMovementView1Repository.cs
View File

@ -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
{
@ -17,10 +18,28 @@ namespace MyCode.Project.Repositories
public WMStoJackyunInventoryMovementView1Repository(MyCodeSqlSugarClient context) : base(context)
{ }
public List<CreateAndStockinResp> GetInventoryMovement()
{
string sql = $@"
SELECT [单据号] AS [relDataId]
,[单据行号] AS [relDetailId]
,[变动方向] AS [type]
,[SKU] AS [outSkuCode]
,[BARCODE] AS [skuBarcode]
,[单位] AS [unitName]
,[数量] AS [skuCount]
,[仓库] AS [inWarehouseCode]
,[过账日期] AS [applyDate]
,[备注] AS [rowRemark]
,[status] AS [status]
FROM [YunTong].[dbo].[WMStoJackyun_InventoryMovement_View1]
WHERE [status] = 0";
var list = this.SelectList<CreateAndStockinResp>(sql);
return list;
}
}
}
}

8
Reportapi/MyCode.Project.Repositories/ZHMD/WMStoJackyunInventoryMovementView1Repository.cs
View File

@ -9,13 +9,15 @@ using MyCode.Project.Domain.ZHMDModel;
using MyCode.Project.Infrastructure.Common;
using MyCode.Project.Infrastructure.Search;
using MyCode.Project.Domain.Repositories.ZHMDRepositories;
using MyCode.Project.Domain.Model;
namespace MyCode.Project.Repositories.ZHMD
{
public class WMStoJackyunInventoryMovementView1Repository: WMSRepository,IWMStoJackyunInventoryMovementView1Repository
public class WMStoJackyunInventoryMovementView2Repository: WMSRepository,IWMStoJackyunInventoryMovementView2Repository
{
public WMStoJackyunInventoryMovementView1Repository(WMSSqlSugarClient context) : base(context)
{ }
public WMStoJackyunInventoryMovementView2Repository(WMSSqlSugarClient context) : base(context)
{
}

35
Reportapi/MyCode.Project.Services/IServices/IJackYunStockinService.cs Normal file
View File

@ -0,0 +1,35 @@
using MyCode.Project.Domain.Message.Response.JackYun;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace MyCode.Project.Services
{
public interface IJackYunStockinService
{
///// <summary>
///// 调度运行抓吉客云销售订单
///// </summary>
///// <param name="now"></param>
//void TaskGetJackYunOrder(string now);
///// <summary>
///// 合并吉客云订单到新表
///// </summary>
///// <returns></returns>
//string GetAndMergeJackYunOrder(string now);
/// <summary>
/// 调度运行推送入库/出库申请
/// </summary>
/// <param name="now"></param>
/// <returns></returns>
void TaskSendInventoryMovement(DateTime now);
List<CreateAndStockinResp> GetInventoryMovement();
}
}

3
Reportapi/MyCode.Project.Services/IServices/IWMSService.cs
View File

@ -1,4 +1,5 @@
using MyCode.Project.Domain.ZHMDModel;
using MyCode.Project.Domain.Model;
using MyCode.Project.Domain.ZHMDModel;
using MyCode.Project.Repositories.Common;
using System;
using System.Collections.Generic;

4
Reportapi/MyCode.Project.Services/Implementation/WMSService.cs
View File

@ -24,10 +24,10 @@ namespace MyCode.Project.Services.Implementation
DateTime startTime = DateTime.Parse("2025-06-01");
private IWMStoJackyunInventoryMovementView1Repository _wMStoJackyunInventoryMovementView3Repository;
private IWMStoJackyunInventoryMovementView2Repository _wMStoJackyunInventoryMovementView3Repository;
private IRepository _repository;
private IWorkProcessService _workProcessService;
public WMSService(IWMStoJackyunInventoryMovementView1Repository wMStoJackyunInventoryMovementView3Repository, IRepository repository
public WMSService(IWMStoJackyunInventoryMovementView2Repository wMStoJackyunInventoryMovementView3Repository, IRepository repository
, IWorkProcessService workProcessService)
{
_workProcessService = workProcessService;

1
Reportapi/MyCode.Project.Services/MyCode.Project.Services.csproj
View File

@ -123,6 +123,7 @@
<Compile Include="Implementation\WebSocketService.cs" />
<Compile Include="Implementation\WorkProcessService.cs" />
<Compile Include="IServices\IAnsyDataProcessService.cs" />
<Compile Include="IServices\IJackYunStockinService.cs" />
<Compile Include="IServices\IWMSService.cs" />
<Compile Include="IServices\IJackYunTaskService.cs" />
<Compile Include="IServices\IJackYunService.cs" />

2
Reportapi/MyCode.Project.ZHMDGenerateCode/Program.cs
View File

@ -19,7 +19,7 @@ namespace MyCode.Project.GenerateCode
//要生成的仓储和实体对象，不用整个库全部生成，只生成想要的就行
var listTalbeName = new List<string>()
{ "WMStoJackyun_InventoryMovement_View1"};
{ "WMStoJackyun_InventoryMovement_View2"};
using (var db = new WMSSqlSugarClient())
{