diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
index ffcad7d9..530843fc 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
@@ -590,6 +590,11 @@
组织
+
+
+ 组织编码
+
+
供应商
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
index 5acc482e..3825613f 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
@@ -80,6 +80,11 @@
数量
+
+
+ 组织编码
+
+
仓库code
@@ -190,6 +195,11 @@
箱子ID
+
+
+ 组织编码
+
+
仓库编码
@@ -550,6 +560,11 @@
组织ID
+
+
+ 组织编码
+
+
物料ID
@@ -728,6 +743,11 @@
组织ID
+
+
+ 组织编码
+
+
物料ID
@@ -783,6 +803,11 @@
物料ID
+
+
+ 组织编码
+
+
仓库编码
@@ -818,6 +843,11 @@
类型：1为入库，2为出库
+
+
+ 组织编码
+
+
仓库编码
diff --git a/src/WMS.Web.Core/Dto/Erp/ErpInStockResultDto.cs b/src/WMS.Web.Core/Dto/Erp/ErpInStockResultDto.cs
index ad082a7d..d3600620 100644
--- a/src/WMS.Web.Core/Dto/Erp/ErpInStockResultDto.cs
+++ b/src/WMS.Web.Core/Dto/Erp/ErpInStockResultDto.cs
@@ -18,6 +18,11 @@ namespace WMS.Web.Core.Dto.Erp
///
public int OrgId { get; set; }
+ ///
+ /// 组织编码
+ ///
+ public string OrgCode { get; set; }
+
///
/// 供应商
///
diff --git a/src/WMS.Web.Domain/Entitys/BackRecordDetails.cs b/src/WMS.Web.Domain/Entitys/BackRecordDetails.cs
index e33adaf1..c5398eec 100644
--- a/src/WMS.Web.Domain/Entitys/BackRecordDetails.cs
+++ b/src/WMS.Web.Domain/Entitys/BackRecordDetails.cs
@@ -33,6 +33,10 @@ namespace WMS.Web.Domain.Entitys
///
public decimal Qty { get; set; }
///
+ /// 组织编码
+ ///
+ public string OrgCode { get; set; }
+ ///
/// 仓库code
///
public string StockCode { get; set; }
diff --git a/src/WMS.Web.Domain/Entitys/BoxInventory.cs b/src/WMS.Web.Domain/Entitys/BoxInventory.cs
index 54f2b777..03a36d17 100644
--- a/src/WMS.Web.Domain/Entitys/BoxInventory.cs
+++ b/src/WMS.Web.Domain/Entitys/BoxInventory.cs
@@ -21,6 +21,10 @@ namespace WMS.Web.Domain.Entitys
///
public int BoxId { get; set; }
///
+ /// 组织编码
+ ///
+ public string OrgCode { get; set; }
+ ///
/// 仓库编码
///
public string StockCode { get; set; }
diff --git a/src/WMS.Web.Domain/Entitys/InStockDetails.cs b/src/WMS.Web.Domain/Entitys/InStockDetails.cs
index 5c07233f..c600abac 100644
--- a/src/WMS.Web.Domain/Entitys/InStockDetails.cs
+++ b/src/WMS.Web.Domain/Entitys/InStockDetails.cs
@@ -43,6 +43,10 @@ namespace WMS.Web.Domain.Entitys
///
public int OrgId { get; set; }
///
+ /// 组织编码
+ ///
+ public string OrgCode { get; set; }
+ ///
/// 物料ID
///
public int MaterialId { get; set; }
diff --git a/src/WMS.Web.Domain/Entitys/InstockTaskDetails.cs b/src/WMS.Web.Domain/Entitys/InstockTaskDetails.cs
index c6f0ffda..3ca4659c 100644
--- a/src/WMS.Web.Domain/Entitys/InstockTaskDetails.cs
+++ b/src/WMS.Web.Domain/Entitys/InstockTaskDetails.cs
@@ -29,6 +29,12 @@ namespace WMS.Web.Domain.Entitys
/// 组织ID
///
public int OrgId { get; set; }
+
+ ///
+ /// 组织编码
+ ///
+ public string OrgCode { get; set; }
+
///
/// 物料ID
///
diff --git a/src/WMS.Web.Domain/Entitys/InventoryDetails.cs b/src/WMS.Web.Domain/Entitys/InventoryDetails.cs
index fac216c2..1293ee6f 100644
--- a/src/WMS.Web.Domain/Entitys/InventoryDetails.cs
+++ b/src/WMS.Web.Domain/Entitys/InventoryDetails.cs
@@ -21,6 +21,10 @@ namespace WMS.Web.Domain.Entitys
///
public int MaterialId { get; set; }
///
+ /// 组织编码
+ ///
+ public string OrgCode { get; set; }
+ ///
/// 仓库编码
///
public string StockCode { get; set; }
diff --git a/src/WMS.Web.Domain/Entitys/InventoryInOutDetails.cs b/src/WMS.Web.Domain/Entitys/InventoryInOutDetails.cs
index b912d1fa..5a4eb51b 100644
--- a/src/WMS.Web.Domain/Entitys/InventoryInOutDetails.cs
+++ b/src/WMS.Web.Domain/Entitys/InventoryInOutDetails.cs
@@ -26,6 +26,11 @@ namespace WMS.Web.Domain.Entitys
///
public InventoryInOutType Type { get; set; }
+ ///
+ /// 组织编码
+ ///
+ public string OrgCode { get; set; }
+
///
/// 仓库编码
///
diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs
index 07dc914e..dd1e05d6 100644
--- a/src/WMS.Web.Domain/Services/Public/ErpService.cs
+++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs
@@ -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);
}