From bdfbd1468eb8437d28e68407beaf205e36bec992 Mon Sep 17 00:00:00 2001 From: 18923810322 <1666941798@qq.com> Date: Fri, 9 May 2025 13:52:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Api/appsettings.json | 2 +- src/WMS.Web.Repositories/SerialNumbersRepositories.cs | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/WMS.Web.Api/appsettings.json b/src/WMS.Web.Api/appsettings.json index 5820f5ea..01c7471c 100644 --- a/src/WMS.Web.Api/appsettings.json +++ b/src/WMS.Web.Api/appsettings.json @@ -45,7 +45,7 @@ "ZhangTaoId": "6723b1acf19987"//金蝶账套Id }, "OpsOptions": { - "Url": "https://api.opsscm.test.f2b211.com/", //https://api.opsscm.test.f2b211.com/ //OPS供应链系统 + "Url": "https://api.opsscm.test.f2b211.com/", //https://api.opsscm.test.f2b211.com/ //OPS供应链系统 测试：http://127.0.0.1:8035 "UserName": "admin", //账户名 这是之前链接老ops 需要的用户名密码 现在链接 OPS供应链系统是不需要了 "PassWord": "888888" //密码 这是之前链接老ops 需要的用户名密码 现在链接 OPS供应链系统是不需要了 }, diff --git a/src/WMS.Web.Repositories/SerialNumbersRepositories.cs b/src/WMS.Web.Repositories/SerialNumbersRepositories.cs index aee0f0e2..23fbf2b0 100644 --- a/src/WMS.Web.Repositories/SerialNumbersRepositories.cs +++ b/src/WMS.Web.Repositories/SerialNumbersRepositories.cs @@ -314,8 +314,17 @@ namespace WMS.Web.Repositories if (entity.boxInventory != null) response.IsBoxInventory = entity.boxInventory.Details.SelectMany(s => s.SerialNumbers).Where(w => serialNumber.Equals(w)).Count() >= 1 ? true : false; response.IsTwo = entity.serial.IsTwo; + if(entity.serial.TwoSerialNumber!=null) + { response.TwoSerialNumber=entity.serial.TwoSerialNumber.Replace(entity.serial.SerialNumber,"").Replace(",",""); - response.IsNotCount=entity.serial.IsNotCount; + response.IsNotCount = entity.serial.IsNotCount; + } + else + { + response.TwoSerialNumber = ""; + response.IsNotCount = "0"; + } + response.IsNotCount = entity.serial.IsNotCount; return response; }