18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加组织编码orgCode

Browse Source
This commit is contained in:
tongfei
2023-11-21 14:04:08 +08:00
parent c6c0ae54bd
commit d0a94dc734
10 changed files with 79 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
View File

@@ -590,6 +590,11 @@
组织
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpInStockResultDto.OrgCode">
<summary>
组织编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpInStockResultDto.SupplierId">
<summary>
供应商

30
src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
View File

@@ -80,6 +80,11 @@
数量
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.BackRecordDetails.OrgCode">
<summary>
组织编码
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.BackRecordDetails.StockCode">
<summary>
仓库code
@@ -190,6 +195,11 @@
箱子ID
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.BoxInventory.OrgCode">
<summary>
组织编码
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.BoxInventory.StockCode">
<summary>
仓库编码
@@ -550,6 +560,11 @@
组织ID
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.InStockDetails.OrgCode">
<summary>
组织编码
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.InStockDetails.MaterialId">
<summary>
物料ID
@@ -728,6 +743,11 @@
组织ID
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.InStockTaskDetails.OrgCode">
<summary>
组织编码
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.InStockTaskDetails.MaterialId">
<summary>
物料ID
@@ -783,6 +803,11 @@
物料ID
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.InventoryDetails.OrgCode">
<summary>
组织编码
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.InventoryDetails.StockCode">
<summary>
仓库编码
@@ -818,6 +843,11 @@
类型：1为入库，2为出库
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.InventoryInOutDetails.OrgCode">
<summary>
组织编码
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.InventoryInOutDetails.StockCode">
<summary>
仓库编码

5
src/WMS.Web.Core/Dto/Erp/ErpInStockResultDto.cs
View File

@@ -18,6 +18,11 @@ namespace WMS.Web.Core.Dto.Erp
/// </summary>
public int OrgId { get; set; }
/// <summary>
/// 组织编码
/// </summary>
public string OrgCode { get; set; }
/// <summary>
/// 供应商
/// </summary>

4
src/WMS.Web.Domain/Entitys/BackRecordDetails.cs
View File

@@ -33,6 +33,10 @@ namespace WMS.Web.Domain.Entitys
/// </summary>
public decimal Qty { get; set; }
/// <summary>
/// 组织编码
/// </summary>
public string OrgCode { get; set; }
/// <summary>
/// 仓库code
/// </summary>
public string StockCode { get; set; }

4
src/WMS.Web.Domain/Entitys/BoxInventory.cs
View File

@@ -21,6 +21,10 @@ namespace WMS.Web.Domain.Entitys
/// </summary>
public int BoxId { get; set; }
/// <summary>
/// 组织编码
/// </summary>
public string OrgCode { get; set; }
/// <summary>
/// 仓库编码
/// </summary>
public string StockCode { get; set; }

4
src/WMS.Web.Domain/Entitys/InStockDetails.cs
View File

@@ -43,6 +43,10 @@ namespace WMS.Web.Domain.Entitys
/// </summary>
public int OrgId { get; set; }
/// <summary>
/// 组织编码
/// </summary>
public string OrgCode { get; set; }
/// <summary>
/// 物料ID
/// </summary>
public int MaterialId { get; set; }

6
src/WMS.Web.Domain/Entitys/InstockTaskDetails.cs
View File

@@ -29,6 +29,12 @@ namespace WMS.Web.Domain.Entitys
/// 组织ID
/// </summary>
public int OrgId { get; set; }
/// <summary>
/// 组织编码
/// </summary>
public string OrgCode { get; set; }
/// <summary>
/// 物料ID
/// </summary>

4
src/WMS.Web.Domain/Entitys/InventoryDetails.cs
View File

@@ -21,6 +21,10 @@ namespace WMS.Web.Domain.Entitys
/// </summary>
public int MaterialId { get; set; }
/// <summary>
/// 组织编码
/// </summary>
public string OrgCode { get; set; }
/// <summary>
/// 仓库编码
/// </summary>
public string StockCode { get; set; }

5
src/WMS.Web.Domain/Entitys/InventoryInOutDetails.cs
View File

@@ -26,6 +26,11 @@ namespace WMS.Web.Domain.Entitys
/// </summary>
public InventoryInOutType Type { get; set; }
/// <summary>
/// 组织编码
/// </summary>
public string OrgCode { get; set; }
/// <summary>
/// 仓库编码
/// </summary>

18
src/WMS.Web.Domain/Services/Public/ErpService.cs
View File

@@ -162,7 +162,7 @@ namespace WMS.Web.Domain.Services.Public
//3.获取金蝶采购订单：拼接参数和条件
var query = new ErpBillQueryDto(token_result.Data);
var param = new ErpBillQueryParamDto(FormIdParam.PUR_PurchaseOrder.ToString());
param.FieldKeys = "FBillNo,FSupplierId,FPurchaseOrgId,FMaterialId,FSOSTOCKID,FQty,FEntryNote,FCreateDate,FCHUCHANGPRICE,FSOSTOCKID.FNumber,FStockInQty";
param.FieldKeys = "FBillNo,FSupplierId,FPurchaseOrgId,FMaterialId,FSOSTOCKID,FQty,FEntryNote,FCreateDate,FCHUCHANGPRICE,FSOSTOCKID.FNumber,FStockInQty,FPurchaseOrgId.FNumber";
param.Limit = 10000;
//查询条件：备注其中的条件值以金蝶的值为准！！！
//1.创建时间在两天前和当天时间之间
@@ -231,6 +231,7 @@ namespace WMS.Web.Domain.Services.Public
lis.FactoryPrice = Convert.ToDecimal(item[8]);
lis.StockCode = item[9];
lis.DeliveredQty = Convert.ToDecimal(item[10]);
lis.OrgCode = item[11];
lis.Type = (int)InstockType.Purchase;
erp_list.Add(lis);
}
@@ -269,7 +270,7 @@ namespace WMS.Web.Domain.Services.Public
//3.获取金蝶其他入库订单：拼接参数和条件
var query = new ErpBillQueryDto(token_result.Data);
var param = new ErpBillQueryParamDto(FormIdParam.STK_MISCELLANEOUS.ToString());
param.FieldKeys = "FBillNo,FStockOrgId,FMATERIALID,FSTOCKID,FSTOCKID.FNumber,FQty,FCreateDate,FEntryNote";
param.FieldKeys = "FBillNo,FStockOrgId,FMATERIALID,FSTOCKID,FSTOCKID.FNumber,FQty,FCreateDate,FEntryNote,FStockOrgId.FNumber";
param.Limit = 10000;
//查询条件：备注其中的条件值以金蝶的值为准！！！
//1.创建时间在两天前和当天时间之间
@@ -334,6 +335,7 @@ namespace WMS.Web.Domain.Services.Public
lis.Qty = Convert.ToDecimal(item[5]);
lis.CreateTime = Convert.ToDateTime(item[6]);
lis.Remark = item[7];
lis.OrgCode = item[8];
lis.Type = (int)InstockType.Miscellaneous;
erp_list.Add(lis);
}
@@ -372,7 +374,7 @@ namespace WMS.Web.Domain.Services.Public
//3.获取金蝶直接调拨入库订单：拼接参数和条件
var query = new ErpBillQueryDto(token_result.Data);
var param = new ErpBillQueryParamDto(FormIdParam.STK_TransferDirect.ToString());
param.FieldKeys = "FBillNo,FStockOrgId,FMaterialId,FDestStockId,FDestStockId.FNumber,FQty,FCreateDate,FNoteEntry";
param.FieldKeys = "FBillNo,FStockOrgId,FMaterialId,FDestStockId,FDestStockId.FNumber,FQty,FCreateDate,FNoteEntry,FStockOrgId.FNumber";
param.Limit = 10000;
//查询条件：备注其中的条件值以金蝶的值为准！！！
//1.创建时间在两天前和当天时间之间
@@ -437,6 +439,7 @@ namespace WMS.Web.Domain.Services.Public
lis.Qty = Convert.ToDecimal(item[5]);
lis.CreateTime = Convert.ToDateTime(item[6]);
lis.Remark = item[7];
lis.OrgCode = item[8];
lis.Type = (int)InstockType.Stkdirecttransfers;
erp_list.Add(lis);
}
@@ -475,7 +478,7 @@ namespace WMS.Web.Domain.Services.Public
//3.获取金蝶分步式入库订单：拼接参数和条件
var query = new ErpBillQueryDto(token_result.Data);
var param = new ErpBillQueryParamDto(FormIdParam.STK_TRANSFERIN.ToString());
param.FieldKeys = "FBillNo,FStockOrgID,FMaterialID,FDestStockID,FDestStockID.FNumber,FQty,FCreateDate,FEntryNote";
param.FieldKeys = "FBillNo,FStockOrgID,FMaterialID,FDestStockID,FDestStockID.FNumber,FQty,FCreateDate,FEntryNote,FStockOrgID.FNumber";
param.Limit = 10000;
//查询条件：备注其中的条件值以金蝶的值为准！！！
//1.创建时间在两天前和当天时间之间
@@ -540,6 +543,7 @@ namespace WMS.Web.Domain.Services.Public
lis.Qty = Convert.ToDecimal(item[5]);
lis.CreateTime = Convert.ToDateTime(item[6]);
lis.Remark = item[7];
lis.OrgCode = item[8];
lis.Type = (int)InstockType.StktransferInst;
erp_list.Add(lis);
}
@@ -578,7 +582,7 @@ namespace WMS.Web.Domain.Services.Public
//3.获取金蝶分步式入库订单：拼接参数和条件
var query = new ErpBillQueryDto(token_result.Data);
var param = new ErpBillQueryParamDto(FormIdParam.STK_AssembledApp.ToString());
param.FieldKeys = "FBillNo,FOwnerIdHead,FMaterialID,FStockID,FStockID.FNumber,FQty,FCreateDate,FDescription";
param.FieldKeys = "FBillNo,FOwnerIdHead,FMaterialID,FStockID,FStockID.FNumber,FQty,FCreateDate,FDescription,FOwnerIdHead.FNumber";
param.Limit = 10000;
//查询条件：备注其中的条件值以金蝶的值为准！！！
//1.创建时间在两天前和当天时间之间
@@ -644,6 +648,7 @@ namespace WMS.Web.Domain.Services.Public
lis.Qty = Convert.ToDecimal(item[5]);
lis.CreateTime = Convert.ToDateTime(item[6]);
lis.Remark = item[7];
lis.OrgCode = item[8];
lis.Type = (int)InstockType.Assembled;
erp_list.Add(lis);
}
@@ -682,7 +687,7 @@ namespace WMS.Web.Domain.Services.Public
//3.获取金蝶分步式入库订单：拼接参数和条件
var query = new ErpBillQueryDto(token_result.Data);
var param = new ErpBillQueryParamDto(FormIdParam.STK_AssembledApp.ToString());
param.FieldKeys = "FBillNo,FSubProOwnerIdH,FMaterialID,FStockIDSETY,FStockIDSETY.FNumber,FQtySETY,FCreateDate,FDescriptionSETY";
param.FieldKeys = "FBillNo,FSubProOwnerIdH,FMaterialID,FStockIDSETY,FStockIDSETY.FNumber,FQtySETY,FCreateDate,FDescriptionSETY,FSubProOwnerIdH.FNumber";
param.Limit = 10000;
//查询条件：备注其中的条件值以金蝶的值为准！！！
//1.创建时间在两天前和当天时间之间
@@ -748,6 +753,7 @@ namespace WMS.Web.Domain.Services.Public
lis.Qty = Convert.ToDecimal(item[5]);
lis.CreateTime = Convert.ToDateTime(item[6]);
lis.Remark = item[7];
lis.OrgCode = item[8];
lis.Type = (int)InstockType.Assembled;
erp_list.Add(lis);
}