test

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

@@ -136,6 +136,20 @@
             <param name="dto"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Api.Controllers.OutStockTaskController.Repeal(WMS.Web.Core.Dto.OperateRequest)">
+            <summary>
+            作废
+            </summary>
+            <param name="dto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:WMS.Web.Api.Controllers.OutStockTaskController.merge(WMS.Web.Core.Dto.OperateRequest)">
+            <summary>
+            合并
+            </summary>
+            <param name="dto"></param>
+            <returns></returns>
+        </member>
         <member name="T:WMS.Web.Api.Controllers.SysConfigController">
             <summary>
             系统配置

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

@@ -965,6 +965,16 @@
             类型：1-整箱移货上级，2-整箱移货下级
             </summary>
         </member>
+        <member name="T:WMS.Web.Core.Dto.OperateRequest">
+            <summary>
+            操作 Id集合
+            </summary>
+        </member>
+        <member name="T:WMS.Web.Core.Dto.OperatePagedRequest">
+            <summary>
+            操作 Id集合
+            </summary>
+        </member>
         <member name="T:WMS.Web.Core.Dto.OutStockTask.OutStockTaskQueryInfoResponse">
             <summary>
             出库单任务列表
@@ -1120,6 +1130,11 @@
             主键 订单编号
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.OutStock.OutStockQueryInfoResponse.BillNo">
+            <summary>
+            单据编号
+            </summary>
+        </member>
         <member name="P:WMS.Web.Core.Dto.OutStock.OutStockQueryInfoResponse.Status">
             <summary>
             单据状态

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

@@ -552,6 +552,11 @@
             主键 订单编号
             </summary>
         </member>
+        <member name="P:WMS.Web.Domain.Entitys.OutStock.BillNo">
+            <summary>
+            单据编号
+            </summary>
+        </member>
         <member name="P:WMS.Web.Domain.Entitys.OutStock.Status">
             <summary>
             单据状态
@@ -588,6 +593,11 @@
             </summary>
             <param name="creatorId"></param>
         </member>
+        <member name="M:WMS.Web.Domain.Entitys.OutStock.GenerateNo">
+            <summary>
+            生成单据号
+            </summary>
+        </member>
         <member name="T:WMS.Web.Domain.Entitys.OutStockDetails">
              <summary>
             wms出库单明细
@@ -678,6 +688,24 @@
             明细
             </summary>
         </member>
+        <member name="M:WMS.Web.Domain.Entitys.OutStockTask.GenerateNo">
+            <summary>
+            生成单据号
+            </summary>
+        </member>
+        <member name="M:WMS.Web.Domain.Entitys.OutStockTask.Repeal(System.Int32)">
+            <summary>
+            作废
+            </summary>
+        </member>
+        <member name="M:WMS.Web.Domain.Entitys.OutStockTask.Merge(System.Collections.Generic.List{WMS.Web.Domain.Entitys.OutStockTask},System.Int32)">
+            <summary>
+            合并
+            </summary>
+            <param name="list"></param>
+            <param name="creatorId"></param>
+            <returns></returns>
+        </member>
         <member name="T:WMS.Web.Domain.Entitys.OutStockTaskDetails">
             <summary>
             erp出库任务单明细
@@ -910,6 +938,21 @@
             公司Id
             </summary>
         </member>
+        <member name="M:WMS.Web.Domain.Infrastructure.IOutStockRepositories.GetEntityList(System.Collections.Generic.List{System.Int32})">
+            查询实体集合
+        </member>
+        <member name="M:WMS.Web.Domain.Infrastructure.IOutStockRepositories.EditEntityList(System.Collections.Generic.List{WMS.Web.Domain.Entitys.OutStock},System.Boolean)">
+            修改实体集合
+        </member>
+        <member name="M:WMS.Web.Domain.Infrastructure.IOutStockTaskRepositories.GetEntityList(System.Collections.Generic.List{System.Int32})">
+            查询实体集合
+        </member>
+        <member name="M:WMS.Web.Domain.Infrastructure.IOutStockTaskRepositories.EditEntityList(System.Collections.Generic.List{WMS.Web.Domain.Entitys.OutStockTask},System.Boolean)">
+            修改实体集合
+        </member>
+        <member name="M:WMS.Web.Domain.Infrastructure.IOutStockTaskRepositories.DeleteEntityList(System.Collections.Generic.List{System.Int32},System.Boolean)">
+            删除实体集合
+        </member>
         <member name="M:WMS.Web.Domain.Infrastructure.ITransactionRepositories.GetTransaction">
             <summary>
             获取事务 用来处理即时库存
@@ -1425,6 +1468,14 @@
             出库服务
             </summary>
         </member>
+        <member name="M:WMS.Web.Domain.Services.OutStockService.Save(System.Collections.Generic.List{WMS.Web.Core.Dto.OutStock.SaveOutStockRequest},WMS.Web.Core.Dto.Login.LoginInDto)">
+            <summary>
+            出库单
+            </summary>
+            <param name="dto"></param>
+            <param name="loginInfo"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Domain.Services.OutStockService.Sync(System.Int32)">
             <summary>
             同步金蝶
@@ -1432,6 +1483,20 @@
             <param name="id"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.Services.OutStockService.Repeal(WMS.Web.Core.Dto.OperateRequest,WMS.Web.Core.Dto.Login.LoginInDto)">
+            <summary>
+            出库任务作废
+            </summary>
+            <param name="dto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:WMS.Web.Domain.Services.OutStockService.merge(WMS.Web.Core.Dto.OperateRequest,WMS.Web.Core.Dto.Login.LoginInDto)">
+            <summary>
+            出库任务合并
+            </summary>
+            <param name="dto"></param>
+            <returns></returns>
+        </member>
         <member name="T:WMS.Web.Domain.Services.Public.ErpService">
             <summary>
             erp数据交互服务

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

@@ -236,7 +236,7 @@ namespace WMS.Web.Domain.Services.Public
             reqData.GrantType = "password";
             reqData.UserName = username;
             reqData.Scope = "credentials";
-
+            _logger.LogInformation($"username："+ username+";password:"+password);
             var md5 = System.Security.Cryptography.MD5.Create();
             var md5Pwd= BitConverter.ToString(md5.ComputeHash(Encoding.Default.GetBytes(password)));
             md5Pwd = md5Pwd.Replace("-", string.Empty);
@@ -250,9 +250,10 @@ namespace WMS.Web.Domain.Services.Public
             string NewToken = Guid.NewGuid().ToString("N");
             try
             {
+                _logger.LogInformation($"username1：" + username + ";password:" + password);
                 string result = _httpClientHelp.PostHttp(_soaOptions.Url_V3 + "/uc/authorize", reqData);
                 var jObject = JsonObject.Parse(result);
-
+                _logger.LogInformation($"username2：" + username + ";password:" + password);
                 LoginInDto r = new LoginInDto();
                 r.UserInfo = new UserInfoDto();
                 r.TokenInfo = new AccessTokenDto();