修改了仓位

src/WMS.Web.Api/Controllers/SysConfigController.cs

@@ -351,14 +351,14 @@ namespace WMS.Web.Api.Controllers
         /// <returns></returns>
         [HttpGet]
         [Route("GetSubUcStockByName")]
-        public async Task<Result<List<UcSubStockResponse>>> GetSubUcStockByName([FromQuery] string name, [FromQuery] string stockCode = null)
+        public async Task<Result<List<UcSubStockResponse>>> GetSubUcStockByName([FromQuery] string name, [FromQuery] string stockCode = null, [FromQuery] string orgCode = null)
         {
             var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
             if (loginInfo == null || loginInfo.UserInfo == null)
                 return Result<List<UcSubStockResponse>>.ReFailure(ResultCodes.Token_Invalid_Error);
             var r = await _basicsRepositories.GetSubUcStockAsync(ManagementSystemCode.GLXT0004.ToString(), name, loginInfo.UserInfo.CompanyId);
             if (!string.IsNullOrEmpty(stockCode))
-                r = r.Where(w => w.StockCode == stockCode).ToList();
+                r = r.Where(w => w.StockCode == stockCode && w.ErpOrgCode==orgCode).ToList();
             return Result<List<UcSubStockResponse>>.ReSuccess(r);
         }
         /// <summary>

src/WMS.Web.Api/Properties/launchSettings.json

@@ -8,15 +8,15 @@
     }
   },
   "$schema": "http://json.schemastore.org/launchsettings.json",
-  //"profiles": {
-  //  "IIS Express": {
-  //    "commandName": "IISExpress",
-  //    "launchBrowser": true,
-  //    "launchUrl": "swagger",
-  //    "environmentVariables": {
-  //      "ASPNETCORE_ENVIRONMENT": "Development"
-  //    }
-  //  },
+  "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
     "WMS.Web.Api": {
       "commandName": "Project",
       "launchBrowser": false,

src/WMS.Web.Api/appsettings.json

@@ -17,8 +17,8 @@
   "AllowedHosts": "*", //允许所有主机
   "AllowedCores": "localhost,http://localhost:8080,http://192.168.1.188:8080", //跨域
   "AppOptions": {
-    //"DBConnectionString": "Server=rm-wz9215skklas0287pwo.mysql.rds.aliyuncs.com; Database=test_wmsdb;User Id=orico_erp;password=Orico2023;port=3306;CharSet=gb2312;Connect Timeout=150;", //测试数据库连接地址
-    "DBConnectionString": "Server=rm-wz9215skklas0287pwo.mysql.rds.aliyuncs.com; Database=wms_db;User Id=orico_erp;password=Orico2023;port=3306;CharSet=gb2312;Connect Timeout=150;", //正式数据库连接地址
+    "DBConnectionString": "Server=rm-wz9215skklas0287pwo.mysql.rds.aliyuncs.com; Database=test_wmsdb;User Id=orico_erp;password=Orico2023;port=3306;CharSet=gb2312;Connect Timeout=150;", //测试数据库连接地址
+    //"DBConnectionString": "Server=rm-wz9215skklas0287pwo.mysql.rds.aliyuncs.com; Database=wms_db;User Id=orico_erp;password=Orico2023;port=3306;CharSet=gb2312;Connect Timeout=150;", //正式数据库连接地址
     "RedisConnectionString": "47.106.232.90:6379,password=orico.2020,DefaultDatabase=3", //测试redis连接地址test_wmsdb
     //"RedisConnectionString": "47.106.232.90:6379,password=orico.2020,DefaultDatabase=2", //正式redis连接地址
     "RedisIpRateLimitingConnectionString": "47.110.156.96:16379,password=123456,DefaultDatabase=2", //redis连接地址

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

@@ -767,7 +767,7 @@
             <param name="name">客户名</param>
             <returns></returns>
         </member>
-        <member name="M:WMS.Web.Api.Controllers.SysConfigController.GetSubUcStockByName(System.String,System.String)">
+        <member name="M:WMS.Web.Api.Controllers.SysConfigController.GetSubUcStockByName(System.String,System.String,System.String)">
             <summary>
             获取仓位：模糊名称
             </summary>

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

@@ -4372,6 +4372,14 @@
             <param name="code"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.IService.Public.IErpBasicDataExtendService.GetProductInventoryStockName(System.Collections.Generic.List{WMS.Web.Core.Dto.SingleData.UcStockHeadOfficeResponse},System.String,System.String)">
+            <summary>
+            成品即时库存仓库
+            </summary>
+            <param name="list"></param>
+            <param name="code"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForBillType">
             <summary>
             查单据类型的值
@@ -6365,6 +6373,14 @@
             <param name="code"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.Services.Public.ErpBasicDataExtendService.GetProductInventoryStockName(System.Collections.Generic.List{WMS.Web.Core.Dto.SingleData.UcStockHeadOfficeResponse},System.String,System.String)">
+            <summary>
+            成品即时库存仓库
+            </summary>
+            <param name="list"></param>
+            <param name="code"></param>
+            <returns></returns>
+        </member>
         <!-- Badly formed XML comment ignored for member "P:WMS.Web.Domain.Services.Public.HttpClientEx.Url" -->
         <!-- Badly formed XML comment ignored for member "P:WMS.Web.Domain.Services.Public.HttpClientEx.Content" -->
         <!-- Badly formed XML comment ignored for member "F:WMS.Web.Domain.Services.Public.HttpClientEx.Cookie" -->

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

@@ -215,5 +215,13 @@ namespace WMS.Web.Domain.IService.Public
         /// <param name="code"></param>
         /// <returns></returns>
         string GetProductInventoryStockName(List<UcStockHeadOfficeResponse> list, string code);
+        /// <summary>
+        /// 成品即时库存仓库
+        /// </summary>
+        /// <param name="list"></param>
+        /// <param name="code"></param>
+        /// <returns></returns>
+        string GetProductInventoryStockName(List<UcStockHeadOfficeResponse> list, string code, string orgNo);
+
     }
 }

src/WMS.Web.Domain/Services/InStockTaskService.cs

@@ -262,7 +262,7 @@ namespace WMS.Web.Domain.Services
         {
             if (billNos == null || billNos.Count == 0)
             {
-                var beginTime = DateTime.Now.AddHours(-20);//默认拉去8小时以内的数据，ALTER BY YZH
+                var beginTime = DateTime.Now.AddHours(-100);//默认拉去8小时以内的数据，ALTER BY YZH
                                                            // var beginTime = DateTime.Now.AddDays(-200);//默认拉去8小时以内的数据，ALTER BY YZH这里要改回去
 
 
@@ -826,10 +826,11 @@ namespace WMS.Web.Domain.Services
             {
                 if (entity.Type == InstockType.Purchase)
                     Instock_sourceBillNos.Add(entity.SourceBillNo);
-                else if (entity.Type == InstockType.Stkdirecttransfers)
-                    TransferDirect_sourceBillNos.Add(entity.SourceBillNo);
                 else if (entity.Type == InstockType.StktransferInst)
                     Transferin_sourceBillNos.Add(entity.SourceBillNo);
+                else if (entity.Type == InstockType.Stkdirecttransfers)
+                    TransferDirect_sourceBillNos.Add(entity.SourceBillNo);
+
                 else if (entity.Type == InstockType.Assembled)
                     AssembledApp_sourceBillNos.Add(entity.SourceBillNo);
                 else if (entity.Type == InstockType.Miscellaneous)
@@ -837,13 +838,6 @@ namespace WMS.Web.Domain.Services
                 else if (entity.Type == InstockType.ProduceSotck)
                     ProduceSotck_sourceBillNos.Add(entity.SourceBillNo);
             }
-            if (Instock_sourceBillNos.Count() > 0)
-            {
-                var erp_result = await _erpService.BillQueryForPurchaseInStock(Instock_sourceBillNos, null);
-                if (!erp_result.IsSuccess)
-                    return Result<List<ErpInStockResultDto>>.ReFailure(erp_result.Message, erp_result.Status);
-                erp_list.AddRange(erp_result.Data);
-            }
             if (Transferin_sourceBillNos.Count() > 0)
             {
                 var erp_result = await _erpService.BillQueryForTransferin(Transferin_sourceBillNos, null);
@@ -851,6 +845,14 @@ namespace WMS.Web.Domain.Services
                     return Result<List<ErpInStockResultDto>>.ReFailure(erp_result.Message, erp_result.Status);
                 erp_list.AddRange(erp_result.Data);
             }
+            if (Instock_sourceBillNos.Count() > 0)
+            {
+                var erp_result = await _erpService.BillQueryForPurchaseInStock(Instock_sourceBillNos, null);
+                if (!erp_result.IsSuccess)
+                    return Result<List<ErpInStockResultDto>>.ReFailure(erp_result.Message, erp_result.Status);
+                erp_list.AddRange(erp_result.Data);
+            }
+
 
             if (ProduceSotck_sourceBillNos.Count() > 0)//生产入库
             {

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

@@ -512,7 +512,21 @@ namespace WMS.Web.Domain.Services.Public
         {
             if (list == null || list.Count == 0)
                 return "";
-            var stock = list.Where(x => x.Code == code).FirstOrDefault();
+            var stock = list.Where(x => x.Code == code ).FirstOrDefault();
+            return stock == null ? "" : stock.Name;
+        }
+
+        /// <summary>
+        /// 成品即时库存仓库
+        /// </summary>
+        /// <param name="list"></param>
+        /// <param name="code"></param>
+        /// <returns></returns>
+        public string GetProductInventoryStockName(List<UcStockHeadOfficeResponse> list, string code,string orgNo)
+        {
+            if (list == null || list.Count == 0)
+                return "";
+            var stock = list.Where(x => x.Code == code && x.ErpOrgCode== orgNo).FirstOrDefault();
             return stock == null ? "" : stock.Name;
         }
     }

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

@@ -606,7 +606,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 = "FSrcBillType,FBillNo,FStockOrgID,FMaterialID.FNumber,FDestStockID,FDestStockID.FNumber,FQty,FCreateDate,FEntryNote,FStockOrgID.FNumber,FSTKTRSINENTRY_FEntryID";
+                param.FieldKeys = "FBillNo,FStockOrgID,FMaterialID.FNumber,FDestStockID,FDestStockID.FNumber,FQty,FCreateDate,FEntryNote,FStockOrgID.FNumber,FSTKTRSINENTRY_FEntryID";
                 param.Limit = 10000;
                 //查询条件：备注其中的条件值以金蝶的值为准！！！
                 //1.创建时间在两天前和当天时间之间
@@ -616,22 +616,25 @@ namespace WMS.Web.Domain.Services.Public
                 //当金蝶系统物料明细行调出仓库和调入仓库相同, 数据不需要拉取
                 //param.FilterString = " FDocumentStatus='C' and FBillTypeID='e65a4f29743a44b7b67dc8145e1f9c92'";
                 param.FilterString = " 1=1";
-                //  param.FilterString += " and FSrcBillType<>'STK_TRANSFERIN' and FBillNo='FBDR226242'";
+                //param.FilterString += " and FSrcBillType<>'STK_TRANSFERIN' and FBillNo='FBDR257098'";
+               
                 param.FilterString += " and FSrcBillType<>'STK_TransferDirect'";
                 if (isCheck) param.FilterString += " and FDocumentStatus='C'";
                 param.FilterString += " and FSrcStockId!=FDestStockId";
-                for (int i = 0; i < stocks.Count(); i++)
-                {
-                    if (i == 0)
-                    {
-                        param.FilterString += " and (";
-                        param.FilterString += $"(FDestStockID.FNumber='{stocks[i].Code}' and FStockOrgID.FNumber='{stocks[i].ErpOrgCode}')";
-                    }
-                    else
-                        param.FilterString += $" or (FDestStockID.FNumber='{stocks[i].Code}' and FStockOrgID.FNumber='{stocks[i].ErpOrgCode}')";
-                    if (i == stocks.Count() - 1) param.FilterString += ")";
+               
+                           for (int i = 0; i < stocks.Count(); i++)
+                           {
+                               if (i == 0)
+                               {
+                                   param.FilterString += " and (";
+                                   param.FilterString += $"(FDestStockID.FNumber='{stocks[i].Code}' and FStockOrgID.FNumber='{stocks[i].ErpOrgCode}')";
+                               }
+                               else
+                                   param.FilterString += $" or (FDestStockID.FNumber='{stocks[i].Code}' and FStockOrgID.FNumber='{stocks[i].ErpOrgCode}')";
+                               if (i == stocks.Count() - 1) param.FilterString += ")";
 
-                }
+                           }
+                          
 
                 //根据原订单号查询
                 if (sourceBillNos != null && sourceBillNos.Count() > 0)
@@ -1629,7 +1632,7 @@ namespace WMS.Web.Domain.Services.Public
                     param.Limit = 10000;
                     //查询条件：备注其中的条件值以金蝶的值为准！！！
                     //param.FilterString = "FUseOrgId=100008";
-                    param.FilterString = "(FUseOrgId = 100008 or FUseOrgId = 19162897)";
+                    param.FilterString = "(FUseOrgId = 100008 or FUseOrgId=13431669 or FUseOrgId=40930803  or FUseOrgId = 19162897)";
 
                     //备注：因为供应商数据不是很多，就不能和获取物料一样循环获取；组织这里就获取10000条数据就行了
                     var beginTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff");

src/WMS.Web.Repositories/InStockTaskRepositories.cs

@@ -217,8 +217,16 @@ namespace WMS.Web.Repositories
                     for (int i = 0; i < resList.Count(); i++)
                     {
                         var bList = instockTaskBoxList.Where(w => w.BoxId == bid).OrderBy(x => x.CreateTime).ToList();
-                        resList[i].Receiver = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, bList[i].ReceiverId ?? 0);
-                        resList[i].ReceiveTime = bList[i].CreateTime.HasValue ? bList[i].CreateTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "";
+                        if (bList.Count == 1)
+                        {
+                            resList[i].Receiver = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, bList[0].ReceiverId ?? 0);
+                            resList[i].ReceiveTime = bList[0].CreateTime.HasValue ? bList[0].CreateTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "";
+                        }
+                        else
+                        {
+                            resList[i].Receiver = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, bList[i].ReceiverId ?? 0);
+                            resList[i].ReceiveTime = bList[i].CreateTime.HasValue ? bList[i].CreateTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "";
+                        }
                     }
                     //如果收货的条数大于入库的条数 代表有收货未入库的 需要添加
                     if (resList.Count() < instockTaskBoxList.Where(w => w.BoxId == bid).Count())

src/WMS.Web.Repositories/ProductInventoryRepositories.cs

@@ -132,6 +132,7 @@ namespace WMS.Web.Repositories
             if (org_result.IsSuccess)
                 orgs = org_result.Data.ToList();
 
+
             var p_stocks = await _basicsRepositories.GetUcStockByHeadOfficeAsync("", 1);
             #endregion
 
@@ -162,7 +163,7 @@ namespace WMS.Web.Repositories
                 #region dto组装
                 Id = s.Id,
                 Type = s.Type.GetRemark(),
-                Stock = _erpBasicDataExtendService.GetProductInventoryStockName(p_stocks, s.StockCode),
+                Stock = _erpBasicDataExtendService.GetProductInventoryStockName(p_stocks, s.StockCode,s.OrgCode),
                 Org = _erpBasicDataExtendService.GetOrgName(orgs, s.OrgCode),
                 MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.MaterialNumber),
                 MaterialNumber = s.MaterialNumber,