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

修复bug

Browse Source
This commit is contained in:
18942506660
2024-03-05 17:00:03 +08:00
parent 430f8dfdfc
commit 98a5e98f0a
2 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -176,6 +176,14 @@
<param name="qty"></param> <param name="qty"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:WMS.Web.Domain.Entitys.Box.OutStock(System.Int32,System.Decimal)">
<summary>
出库
</summary>
<param name="materialId"></param>
<param name="qty"></param>
<returns></returns>
</member>
<member name="T:WMS.Web.Domain.Entitys.BoxDetails"> <member name="T:WMS.Web.Domain.Entitys.BoxDetails">
<summary> <summary>
老ops箱信息明细 老ops箱信息明细
@@ -4319,6 +4327,14 @@
<param name="isTransaction"></param> <param name="isTransaction"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:WMS.Web.Domain.Services.ChangeMoveBoxService.ChangeBox_OutStock(WMS.Web.Domain.Entitys.OutStock,System.Boolean)">
<summary>
出库
</summary>
<param name="outStock"></param>
<param name="isTransaction"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.ExportExcelService.Export``1(System.Collections.Generic.List{``0},System.String,System.Int32,System.Int32,WMS.Web.Domain.Values.FileDownLoadOrderType,Npoi.Mapper.Mapper,System.Nullable{System.Int32})"> <member name="M:WMS.Web.Domain.Services.ExportExcelService.Export``1(System.Collections.Generic.List{``0},System.String,System.Int32,System.Int32,WMS.Web.Domain.Values.FileDownLoadOrderType,Npoi.Mapper.Mapper,System.Nullable{System.Int32})">
<summary> <summary>
列表页导出 列表页导出

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

@@ -1609,8 +1609,8 @@ namespace WMS.Web.Domain.Services.Public
//3.未出库数量>0 //3.未出库数量>0
//4.日期>=系统上线之日 //4.日期>=系统上线之日
//5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 //5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步
//6.物料 物料属性=费用或资产的排除 不拉取 //6.物料 物料属性=费用或资产或服务的排除 不拉取
param.FilterString = "FDocumentStatus='C' and FRemainOutQty>=0 and FMaterialID.FERPCLSID not in (10,11)"; param.FilterString = "FDocumentStatus='C' and FRemainOutQty>=0 and FMaterialID.FERPCLSID not in (10,11,6)";
//param.FilterString += " and FStockID.FNumber in (" + stocks_codes + ")"; //param.FilterString += " and FStockID.FNumber in (" + stocks_codes + ")";
//param.FilterString += " and FDeliveryOrgID.FNumber in (" + stocks_orgs + ")"; //param.FilterString += " and FDeliveryOrgID.FNumber in (" + stocks_orgs + ")";
for (int i = 0; i < stocks.Count(); i++) for (int i = 0; i < stocks.Count(); i++)
@@ -1703,8 +1703,8 @@ namespace WMS.Web.Domain.Services.Public
//2.审核状态：已审核 //2.审核状态：已审核
//3.单据类型:标准 //3.单据类型:标准
//5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 //5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步
//6.物料 物料属性=费用或资产的排除 不拉取 //6.物料 物料属性=费用或资产或服务的排除 不拉取
param.FilterString = "FDocumentStatus='C' and FBillTypeID='ce8f49055c5c4782b65463a3f863bb4a' and FMaterialID.FERPCLSID not in (10,11)"; param.FilterString = "FDocumentStatus='C' and FBillTypeID='ce8f49055c5c4782b65463a3f863bb4a' and FMaterialID.FERPCLSID not in (10,11,6)";
//string srt = JsonConvert.SerializeObject(stocks_codes); //string srt = JsonConvert.SerializeObject(stocks_codes);
//param.FilterString += " and FSrcStockId.FNumber in (" + stocks_codes + ")"; //param.FilterString += " and FSrcStockId.FNumber in (" + stocks_codes + ")";
//param.FilterString += " and FStockOutOrgId.FNumber in (" + stocks_orgs + ")"; //param.FilterString += " and FStockOutOrgId.FNumber in (" + stocks_orgs + ")";
@@ -1796,8 +1796,8 @@ namespace WMS.Web.Domain.Services.Public
//2.审核状态：已审核 //2.审核状态：已审核
//3.单据类型:标准 //3.单据类型:标准
//4.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 //4.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步
//6.物料 物料属性=费用或资产的排除 不拉取 //6.物料 物料属性=费用或资产或服务的排除 不拉取
param.FilterString = "FDocumentStatus='C' and FBillTypeID='de3bcacc98434ec68a358aa5abcd9183' and FMaterialID.FERPCLSID not in (10,11)"; param.FilterString = "FDocumentStatus='C' and FBillTypeID='de3bcacc98434ec68a358aa5abcd9183' and FMaterialID.FERPCLSID not in (10,11,6)";
//string srt = JsonConvert.SerializeObject(stocks_codes); //string srt = JsonConvert.SerializeObject(stocks_codes);
//param.FilterString += " and FSrcStockID.FNumber in (" + stocks_codes + ")"; //param.FilterString += " and FSrcStockID.FNumber in (" + stocks_codes + ")";
//param.FilterString += " and FStockOrgID.FNumber in (" + stocks_orgs + ")"; //param.FilterString += " and FStockOrgID.FNumber in (" + stocks_orgs + ")";
@@ -1889,8 +1889,8 @@ namespace WMS.Web.Domain.Services.Public
//2.审核状态：已审核 //2.审核状态：已审核
//3.单据类型:标准 //3.单据类型:标准
//4.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 FBillTypeID //4.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 FBillTypeID
//6.物料 物料属性=费用或资产的排除 不拉取 //6.物料 物料属性=费用或资产或服务的排除 不拉取
param.FilterString = "FDocumentStatus='C' and FAffairType='Dassembly' and FBillTypeID='3441ac133848446f824d0ab760c8b3c7' and FMaterialID.FERPCLSID not in (10,11)"; param.FilterString = "FDocumentStatus='C' and FAffairType='Dassembly' and FBillTypeID='3441ac133848446f824d0ab760c8b3c7' and FMaterialID.FERPCLSID not in (10,11,6)";
//string srt = JsonConvert.SerializeObject(stocks_codes); //string srt = JsonConvert.SerializeObject(stocks_codes);
//param.FilterString += " and FStockID.FNumber in (" + stocks_codes + ")"; //param.FilterString += " and FStockID.FNumber in (" + stocks_codes + ")";
//param.FilterString += " and FStockOrgId.FNumber in (" + stocks_orgs + ")"; //param.FilterString += " and FStockOrgId.FNumber in (" + stocks_orgs + ")";
@@ -1982,8 +1982,8 @@ namespace WMS.Web.Domain.Services.Public
//2.审核状态：已审核 //2.审核状态：已审核
//3.单据类型:标准 //3.单据类型:标准
//4.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 //4.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步
//6.物料 物料属性=费用或资产的排除 不拉取 //6.物料 物料属性=费用或资产或服务的排除 不拉取
param.FilterString = "FDocumentStatus='C' and FBillTypeID='54533291F9A44D38809F70000499BEE9' and FMaterialID.FERPCLSID not in (10,11)"; param.FilterString = "FDocumentStatus='C' and FBillTypeID='54533291F9A44D38809F70000499BEE9' and FMaterialID.FERPCLSID not in (10,11,6)";
//string srt = JsonConvert.SerializeObject(stocks_codes); //string srt = JsonConvert.SerializeObject(stocks_codes);
//param.FilterString += " and FStockId.FNumber in (" + stocks_codes + ")"; //param.FilterString += " and FStockId.FNumber in (" + stocks_codes + ")";
//param.FilterString += " and FStockOrgId.FNumber in (" + stocks_orgs + ")"; //param.FilterString += " and FStockOrgId.FNumber in (" + stocks_orgs + ")";
@@ -2075,8 +2075,8 @@ namespace WMS.Web.Domain.Services.Public
//2.审核状态：已审核 //2.审核状态：已审核
//3.单据类型:标准 //3.单据类型:标准
//4.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 FBillTypeID //4.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 FBillTypeID
//6.物料 物料属性=费用或资产的排除 不拉取 //6.物料 物料属性=费用或资产或服务的排除 不拉取
param.FilterString = "FDocumentStatus='C' and FAffairType='Assembly' and FBillTypeID='3441ac133848446f824d0ab760c8b3c7' and FMaterialID.FERPCLSID not in (10,11)"; param.FilterString = "FDocumentStatus='C' and FAffairType='Assembly' and FBillTypeID='3441ac133848446f824d0ab760c8b3c7' and FMaterialID.FERPCLSID not in (10,11,6)";
//string srt = JsonConvert.SerializeObject(stocks_codes); //string srt = JsonConvert.SerializeObject(stocks_codes);
//param.FilterString += " and FStockIDSETY.FNumber in (" + stocks_codes + ")"; //param.FilterString += " and FStockIDSETY.FNumber in (" + stocks_codes + ")";
//param.FilterString += " and FStockOrgId.FNumber in (" + stocks_orgs + ")"; //param.FilterString += " and FStockOrgId.FNumber in (" + stocks_orgs + ")";
@@ -2174,8 +2174,8 @@ namespace WMS.Web.Domain.Services.Public
//2.审核状态：已审核 //2.审核状态：已审核
//4.日期>=系统上线之日 //4.日期>=系统上线之日
//5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步 //5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步
//6.物料 物料属性=费用或资产的排除 不拉取 //6.物料 物料属性=费用或资产或服务的排除 不拉取
param.FilterString = "FDocumentStatus='C' and FMaterialID.FERPCLSID not in (10,11)"; param.FilterString = "FDocumentStatus='C' and FMaterialID.FERPCLSID not in (10,11,6)";
//param.FilterString += " and FStockID.FNumber in (" + stocks_codes + ")"; //param.FilterString += " and FStockID.FNumber in (" + stocks_codes + ")";
//param.FilterString += " and FDeliveryOrgID.FNumber in (" + stocks_orgs + ")"; //param.FilterString += " and FDeliveryOrgID.FNumber in (" + stocks_orgs + ")";
for (int i = 0; i < stocks.Count(); i++) for (int i = 0; i < stocks.Count(); i++)