金蝶仓库

src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml

@@ -44,7 +44,7 @@
         </member>
         <member name="M:WMS.Web.Api.Controllers.ChangeBoxRecordController.Save(WMS.Web.Core.Dto.ChangeBoxRecord.SaveChangeBoxRecordRequest)">
             <summary>
-            保存
+            改箱保存-PDA
             </summary>
             <param name="dto"></param>
             <returns></returns>
@@ -194,7 +194,7 @@
         </member>
         <member name="M:WMS.Web.Api.Controllers.MoveBoxRecordController.Save(WMS.Web.Core.Dto.MoveBoxRecord.SaveMoveBoxRecordRequest)">
             <summary>
-            保存
+            移箱保存-PDA
             </summary>
             <param name="dto"></param>
             <returns></returns>
@@ -213,7 +213,7 @@
         </member>
         <member name="M:WMS.Web.Api.Controllers.OutStockController.Save(WMS.Web.Core.Dto.OutStock.SaveOutStockRequest)">
             <summary>
-            保存(出库)
+            出库保存(出库)-PDA
             </summary>
             <param name="dto"></param>
             <returns></returns>
@@ -253,7 +253,7 @@
         </member>
         <member name="M:WMS.Web.Api.Controllers.OutStockTaskController.GetOutStockTaskByNo(System.String)">
             <summary>
-            根据出库单任务编号搜索
+            根据出库单任务编号搜索-PDA出库
             </summary>
             <param name="billNo"></param>
             <returns></returns>
@@ -318,7 +318,7 @@
         </member>
         <member name="M:WMS.Web.Api.Controllers.TakeStockController.Save(System.Collections.Generic.List{WMS.Web.Core.Dto.TakeStock.SaveTakeStockRequest})">
             <summary>
-            保存
+            盘点保存-PDA
             </summary>
             <param name="dto"></param>
             <returns></returns>

src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml

@@ -2325,6 +2325,51 @@
             老ops箱信息
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.OpsBoxResponse.OpsBoxId">
+            <summary>
+            对应老OPS的箱ID
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.OpsBoxResponse.BoxBillNo">
+            <summary>
+            箱编号（老OPS生成的箱号）
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.OpsBoxResponse.SupplierId">
+            <summary>
+            供应商Id
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.OpsBoxResponse.OrgId">
+            <summary>
+            组织Id
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.OpsBoxResponse.CreateTime">
+            <summary>
+            创建时间（对应老OPS的创建时间）
+            </summary>
+        </member>
+        <member name="F:WMS.Web.Core.Dto.OpsBoxResponse.Details">
+            <summary>
+            明细
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.OpsBoxDetailsResponse.MaterialId">
+            <summary>
+            物料ID
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.OpsBoxDetailsResponse.Qty">
+            <summary>
+            数量（装箱数量）
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.OpsBoxDetailsResponse.SerialNumbers">
+            <summary>
+            序列号集
+            </summary>
+        </member>
         <member name="T:WMS.Web.Core.Dto.OutStockTask.GetOutStockTaskByNoResponse">
             <summary>
             根据单号搜索出库单任务信息

src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml

@@ -1572,6 +1572,30 @@
             <param name="supplierId"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.IService.Public.IErpBasicDataExtendService.GetStockName(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.ErpStockDto},System.Int32)">
+            <summary>
+            获取仓库名称
+            </summary>
+            <param name="erpStocks"></param>
+            <param name="stockId"></param>
+            <returns></returns>
+        </member>
+        <member name="M:WMS.Web.Domain.IService.Public.IErpBasicDataExtendService.GetStockName(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.ErpStockDto},System.String)">
+            <summary>
+            获取仓库名称
+            </summary>
+            <param name="erpStocks"></param>
+            <param name="code"></param>
+            <returns></returns>
+        </member>
+        <member name="M:WMS.Web.Domain.IService.Public.IErpBasicDataExtendService.GetStockCode(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.ErpStockDto},System.Int32)">
+            <summary>
+            获取仓库编码
+            </summary>
+            <param name="erpStocks"></param>
+            <param name="stockId"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForPurchaseInStock">
             <summary>
             erp:单据查询-采购入库单
@@ -2172,6 +2196,11 @@
             <param name="loginInfo"></param>
             <returns></returns>
         </member>
+        <member name="T:WMS.Web.Domain.Services.BoxService">
+            <summary>
+            箱服务信息
+            </summary>
+        </member>
         <member name="T:WMS.Web.Domain.Services.ChangeMoveBoxService">
             改箱 移箱服务
         </member>
@@ -2413,6 +2442,30 @@
             <param name="supplierId"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.Services.Public.ErpBasicDataExtendService.GetStockName(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.ErpStockDto},System.Int32)">
+            <summary>
+            获取仓库名称
+            </summary>
+            <param name="erpStocks"></param>
+            <param name="stockId"></param>
+            <returns></returns>
+        </member>
+        <member name="M:WMS.Web.Domain.Services.Public.ErpBasicDataExtendService.GetStockName(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.ErpStockDto},System.String)">
+            <summary>
+            获取仓库名称
+            </summary>
+            <param name="erpStocks"></param>
+            <param name="code"></param>
+            <returns></returns>
+        </member>
+        <member name="M:WMS.Web.Domain.Services.Public.ErpBasicDataExtendService.GetStockCode(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.ErpStockDto},System.Int32)">
+            <summary>
+            获取仓库编码
+            </summary>
+            <param name="erpStocks"></param>
+            <param name="stockId"></param>
+            <returns></returns>
+        </member>
         <member name="T:WMS.Web.Domain.Services.Public.ErpService">
             <summary>
             erp数据交互服务

src/WMS.Web.Domain/IService/Public/IErpBasicDataExtendService.cs

@@ -58,5 +58,29 @@ namespace WMS.Web.Domain.IService.Public
         /// <param name="supplierId"></param>
         /// <returns></returns>
         string GetSupplierName(List<ErpSupplierDto> erpSuppliers, int supplierId);
+
+        /// <summary>
+        /// 获取仓库名称
+        /// </summary>
+        /// <param name="erpStocks"></param>
+        /// <param name="stockId"></param>
+        /// <returns></returns>
+        string GetStockName(List<ErpStockDto> erpStocks, int stockId);
+
+        /// <summary>
+        /// 获取仓库名称
+        /// </summary>
+        /// <param name="erpStocks"></param>
+        /// <param name="code"></param>
+        /// <returns></returns>
+        string GetStockName(List<ErpStockDto> erpStocks, string code);
+
+        /// <summary>
+        /// 获取仓库编码
+        /// </summary>
+        /// <param name="erpStocks"></param>
+        /// <param name="stockId"></param>
+        /// <returns></returns>
+        string GetStockCode(List<ErpStockDto> erpStocks, int stockId);
     }
 }

src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs

@@ -100,5 +100,41 @@ namespace WMS.Web.Domain.Services.Public
             var supplier = erpSuppliers.Where(x => x.Id == supplierId).FirstOrDefault();
             return supplier == null ? "" : supplier.Name;
         }
+
+        /// <summary>
+        /// 获取仓库名称
+        /// </summary>
+        /// <param name="erpStocks"></param>
+        /// <param name="stockId"></param>
+        /// <returns></returns>
+        public string GetStockName(List<ErpStockDto> erpStocks, int stockId)
+        {
+            var stock = erpStocks.Where(x => x.Id == stockId).FirstOrDefault();
+            return stock == null ? "" : stock.Name;
+        }
+
+        /// <summary>
+        /// 获取仓库名称
+        /// </summary>
+        /// <param name="erpStocks"></param>
+        /// <param name="code"></param>
+        /// <returns></returns>
+        public string GetStockName(List<ErpStockDto> erpStocks, string code)
+        {
+            var stock = erpStocks.Where(x => x.Code == code).FirstOrDefault();
+            return stock == null ? "" : stock.Name;
+        }
+
+        /// <summary>
+        /// 获取仓库编码
+        /// </summary>
+        /// <param name="erpStocks"></param>
+        /// <param name="stockId"></param>
+        /// <returns></returns>
+        public string GetStockCode(List<ErpStockDto> erpStocks, int stockId)
+        {
+            var stock = erpStocks.Where(x => x.Id == stockId).FirstOrDefault();
+            return stock == null ? "" : stock.Code;
+        }
     }
 }

src/WMS.Web.Domain/Services/Public/ErpService.cs

@@ -200,7 +200,7 @@ namespace WMS.Web.Domain.Services.Public
                 //2.禁用状态：A否，B是
                 //3.使用组织：只查询“深圳市元创时代科技有限公司”这个组织；组织ID=100008--固定值查询（测试端和正式是一样的）
                 param.FilterString = "FDocumentStatus='C' and FForbidStatus='A' and FUseOrgId=100008";
-                param.OrderString = "FCreateDate ASC";          
+                param.OrderString = "FCreateDate ASC";
 
                 //4.循环拿金蝶数据
                 bool isHave = true;
@@ -215,13 +215,13 @@ namespace WMS.Web.Domain.Services.Public
                     //4.2.参数json化
                     query.Data = JsonConvert.SerializeObject(param);
                     var json = JsonConvert.SerializeObject(query);
-                    
+
                     //4.3.请求查询接口并返回数据
                     var result_json = await _client.ExecuteBillQueryAsync(json);
                     var result = JsonConvert.DeserializeObject<List<List<string>>>(result_json);
                     //4.4.判断数据是否全部拉取完成：并停止循环的条件
                     if (result == null || result.Count == 0)
-                        isHave = false;                   
+                        isHave = false;
                     //4.5.拼装
                     foreach (var item in result)
                     {
@@ -244,11 +244,11 @@ namespace WMS.Web.Domain.Services.Public
                 _logger.LogInformation($"物料拉取-总条数：{erp_materials_list.Count}");
                 return ResultList<ErpMaterialDto>.ReSuccess(erp_materials_list);
             }
-            else 
+            else
             {
                 return ResultList<ErpMaterialDto>.ReSuccess(materials);
             }
-            
+
         }
 
         /// <summary>
@@ -324,11 +324,11 @@ namespace WMS.Web.Domain.Services.Public
         /// erp:供应商
         /// </summary>
         /// <returns></returns>
-        public async Task<ResultList<ErpSupplierDto>> BillQueryForSupplier() 
+        public async Task<ResultList<ErpSupplierDto>> BillQueryForSupplier()
         {
             try
             {
-                //1.获取缓存中的物料数据；
+                //1.获取缓存中的供应商数据；
                 var cache_key = "erp_supplier_list";
                 var suppliers = _memoryCache.Get<List<ErpSupplierDto>>(cache_key);
                 if (suppliers == null || suppliers.Count == 0)
@@ -371,7 +371,7 @@ namespace WMS.Web.Domain.Services.Public
                         list.Add(lis);
 
                     }
-                    //5.物料集合进行缓存
+                    //5.供应商集合进行缓存
                     _memoryCache.Set(cache_key, list, new MemoryCacheEntryOptions().SetAbsoluteExpiration(TimeSpan.FromHours(12)));
                     _logger.LogInformation($"供应商拉取-总条数：{list.Count}");
                     return ResultList<ErpSupplierDto>.ReSuccess(list);
@@ -397,36 +397,57 @@ namespace WMS.Web.Domain.Services.Public
         {
             try
             {
-                var token_result = await this.Init();
+                //1.获取缓存中的仓库数据；
-                if (!token_result.IsSuccess)
+                var cache_key = "erp_supplier_list";
-                    return ResultList<ErpStockDto>.ReFailure(token_result);
+                var stocks = _memoryCache.Get<List<ErpStockDto>>(cache_key);
-                var query = new ErpBillQueryDto(token_result.Data);
+                if (stocks == null || stocks.Count == 0)
-                var param = new ErpBillQueryParamDto(FormIdParam.BD_STOCK.ToString());
-                param.FieldKeys = "FStockId,FName,FNumber,FUseOrgId";
-                param.FilterString = "";//FOrgID=100008
-                query.Data = JsonConvert.SerializeObject(param);
-                var json = JsonConvert.SerializeObject(query);
-
-                var result_json = await _client.ExecuteBillQueryAsync(json);
-                var result = JsonConvert.DeserializeObject<List<List<string>>>(result_json);
-
-                var list = new List<ErpStockDto>();
-                foreach (var item in result)
                 {
-                    var lis = new ErpStockDto();
+                    //2.先登录金蝶-拿到token
-                    lis.Id = int.Parse(item[0]);
+                    var token_result = await this.Init();
-                    lis.Name = item[1];
+                    if (!token_result.IsSuccess)
-                    lis.Code = item[2];
+                        return ResultList<ErpStockDto>.ReFailure(token_result);
-                    lis.OrgId = Convert.ToInt32(item[3]);
+                    //3.获取金蝶仓库：拼接参数和条件
-                    list.Add(lis);
+                    var query = new ErpBillQueryDto(token_result.Data);
+                    var param = new ErpBillQueryParamDto(FormIdParam.BD_STOCK.ToString());
+                    param.FieldKeys = "FStockId,FName,FNumber,FUseOrgId";
+                    param.Limit = 10000;
+                    //查询条件：备注其中的条件值以金蝶的值为准！！！
+                    param.FilterString = "";
+                    //备注：因为供应商数据不是很多，就不能和获取物料一样循环获取；组织这里就获取10000条数据就行了
+                    var beginTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff");
+                    _logger.LogInformation($"仓库拉取-开始时间：{beginTime}");
+                    //4.参数json化
+                    query.Data = JsonConvert.SerializeObject(param);
+                    var json = JsonConvert.SerializeObject(query);
+                    //5.请求查询接口并返回数据
+                    var result_json = await _client.ExecuteBillQueryAsync(json);
+                    var result = JsonConvert.DeserializeObject<List<List<string>>>(result_json);
+                    //6.拼装
+                    var list = new List<ErpStockDto>();
+                    foreach (var item in result)
+                    {
+                        var lis = new ErpStockDto();
+                        lis.Id = int.Parse(item[0]);
+                        lis.Name = item[1];
+                        lis.Code = item[2];
+                        lis.OrgId = Convert.ToInt32(item[3]);
+                        list.Add(lis);
 
+                    }
+                    //5.供应商集合进行缓存
+                    _memoryCache.Set(cache_key, list, new MemoryCacheEntryOptions().SetAbsoluteExpiration(TimeSpan.FromHours(12)));
+                    _logger.LogInformation($"仓库拉取-总条数：{list.Count}");
+                    return ResultList<ErpStockDto>.ReSuccess(list);
+                }
+                else
+                {
+                    return ResultList<ErpStockDto>.ReSuccess(stocks);
                 }
-                return ResultList<ErpStockDto>.ReSuccess(list);
 
             }
             catch (Exception)
             {
-                return ResultList<ErpStockDto>.ReFailure("错误", 10002);
+                return ResultList<ErpStockDto>.ReFailure(ResultCodes.ErpStockError);
             }
         }
         /// <summary>

src/WMS.Web.Domain/Values/ResultCodes.cs

@@ -37,6 +37,7 @@ namespace WMS.Web.Domain.Values
 
         public static ValueTuple<int, string> ErpOrgError = (80004, "获取Erp相关组织数据失败，请稍候再试！");
         public static ValueTuple<int, string> ErpSupplierError = (80005, "获取Erp相关供应商数据失败，请稍候再试！");
+        public static ValueTuple<int, string> ErpStockError = (80005, "获取Erp相关仓库数据失败，请稍候再试！");
 
     }
 }