非采购上架接口优化

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

@@ -465,6 +465,11 @@
             单据类型
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.EnumStatusResponse.ShelfMethod">
+            <summary>
+            非采购上架方式
+            </summary>
+        </member>
         <member name="T:WMS.Web.Core.Dto.Erp.Customer.ErpCustomerDto">
             <summary>
             客户
@@ -1570,6 +1575,36 @@
             同步成功或者失败
             </summary>
         </member>
+        <member name="T:WMS.Web.Core.Dto.InStock.NoPurchaseShelfRequest">
+            <summary>
+            非采购单上架请求对象-按箱
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStock.NoPurchaseShelfRequest.TaskId">
+            <summary>
+            单据ID(等同-入库任务单ID)
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStock.NoPurchaseShelfRequest.ShelfMethod">
+            <summary>
+            上架方式
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStock.NoPurchaseShelfRequest.Boxs">
+            <summary>
+            箱集合
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStock.NoPurchaseShelfRequest.TaskDetails">
+            <summary>
+            入库任务单明细
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStock.NoPurchaseShelfRequest.Details">
+            <summary>
+            入库单明细
+            </summary>
+        </member>
         <member name="T:WMS.Web.Core.Dto.InStock.PurchaseShelfRequest">
             <summary>
             采购上架-请求对象
@@ -1625,6 +1660,11 @@
              入库数量
             </summary> 
         </member>
+        <member name="P:WMS.Web.Core.Dto.InStock.SaveInStockDetailsRequest.SerialNumbers">
+            <summary>
+            序列号集
+            </summary>
+        </member>
         <member name="T:WMS.Web.Core.Dto.InStock.SaveInStockRequest">
             <summary>
             保存入库单-请求对象

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

@@ -459,6 +459,12 @@
             </summary>
             <param name="creatorId"></param>
         </member>
+        <member name="M:WMS.Web.Domain.Entitys.InStockTask.NoPurchaseShelf(System.Int32)">
+            <summary>
+            非采购上架
+            </summary>
+            <param name="creatorId"></param>
+        </member>
         <member name="T:WMS.Web.Domain.Entitys.InStockTaskBox">
             <summary>
             erp入库任务单的对应box箱信息表
@@ -1530,6 +1536,14 @@
             <param name="loginInfo"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.IService.IInStockService.ShelfNoPurchase(WMS.Web.Core.Dto.InStock.NoPurchaseShelfRequest,WMS.Web.Core.Dto.Login.LoginInDto)">
+            <summary>
+            上架-非采购订单
+            </summary>
+            <param name="dto"></param>
+            <param name="loginInDto"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Domain.IService.IInStockService.GetInfoByBox(System.String)">
             <summary>
             获取任务单：根据箱号信息
@@ -1537,7 +1551,7 @@
             <param name="boxBillNo"></param>
             <returns></returns>
         </member>
-        <member name="M:WMS.Web.Domain.IService.IInStockService.Update(WMS.Web.Core.Dto.InStockTask.UpdateInStockTaskRequest,System.Int32,System.Boolean,System.Boolean)">
+        <member name="M:WMS.Web.Domain.IService.IInStockService.Update(WMS.Web.Core.Dto.InStockTask.UpdateInStockTaskRequest,System.Int32,System.Nullable{System.Boolean},System.Boolean,System.Boolean)">
             <summary>
             修改-入库任务信息
             </summary>
@@ -2299,7 +2313,7 @@
         <member name="T:WMS.Web.Domain.Services.ChangeMoveBoxService">
             改箱 移箱服务
         </member>
-        <member name="M:WMS.Web.Domain.Services.ChangeMoveBoxService.ChangeBoxSave(WMS.Web.Core.Dto.ChangeBoxRecord.SaveChangeBoxRecordRequest,WMS.Web.Core.Dto.Login.LoginInDto)">
+        <member name="M:WMS.Web.Domain.Services.ChangeMoveBoxService.ChangeBoxSave(WMS.Web.Core.Dto.ChangeBoxRecord.SaveChangeBoxRecordRequest,WMS.Web.Core.Dto.Login.LoginInDto,System.Boolean)">
             <summary>
             改箱保存
             </summary>
@@ -2343,6 +2357,14 @@
             <param name="loginInfo"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.Services.InStockService.ShelfNoPurchase(WMS.Web.Core.Dto.InStock.NoPurchaseShelfRequest,WMS.Web.Core.Dto.Login.LoginInDto)">
+            <summary>
+            非采购单上架-按箱
+            </summary>
+            <param name="dto"></param>
+            <param name="loginInDto"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Domain.Services.InStockService.GetInfoByBox(System.String)">
             <summary>
             获取任务单：根据箱号信息
@@ -2350,7 +2372,7 @@
             <param name="boxBillNo"></param>
             <returns></returns>
         </member>
-        <member name="M:WMS.Web.Domain.Services.InStockService.Save(WMS.Web.Core.Dto.InStock.PurchaseShelfRequest,WMS.Web.Domain.Values.InstockType,System.Int32,System.Boolean)">
+        <member name="M:WMS.Web.Domain.Services.InStockService.ShelfSave(WMS.Web.Core.Dto.InStock.PurchaseShelfRequest,WMS.Web.Domain.Values.InstockType,System.Int32,System.Boolean)">
             <summary>
             采购上架-保存
             </summary>
@@ -2359,7 +2381,16 @@
             <param name="isTransaction"></param>
             <returns></returns>
         </member>
-        <member name="M:WMS.Web.Domain.Services.InStockService.Update(WMS.Web.Core.Dto.InStockTask.UpdateInStockTaskRequest,System.Int32,System.Boolean,System.Boolean)">
+        <member name="M:WMS.Web.Domain.Services.InStockService.ShelfNoPurchaseSave(WMS.Web.Core.Dto.InStock.NoPurchaseShelfRequest,WMS.Web.Core.Dto.Login.LoginInDto,System.Boolean)">
+            <summary>
+            非采购上架-按箱-保存
+            </summary>
+            <param name="dto"></param>
+            <param name="staffId"></param>
+            <param name="isTransaction"></param>
+            <returns></returns>
+        </member>
+        <member name="M:WMS.Web.Domain.Services.InStockService.Update(WMS.Web.Core.Dto.InStockTask.UpdateInStockTaskRequest,System.Int32,System.Nullable{System.Boolean},System.Boolean,System.Boolean)">
             <summary>
             修改-入库任务信息
             </summary>
@@ -3387,6 +3418,21 @@
             序列号操作类型
             </summary>
         </member>
+        <member name="T:WMS.Web.Domain.Values.ShelfMethod">
+            <summary>
+            非采购上架方式
+            </summary>
+        </member>
+        <member name="F:WMS.Web.Domain.Values.ShelfMethod.Box">
+            <summary>
+            按箱上架
+            </summary>
+        </member>
+        <member name="F:WMS.Web.Domain.Values.ShelfMethod.Product">
+            <summary>
+            按产品上架
+            </summary>
+        </member>
         <member name="T:WMS.Web.Domain.Values.Single.SingleAction">
             <summary>
             对接单点的接口方法-枚举

src/WMS.Web.Core/Dto/InStock/SaveInStockDetailsRequest.cs

@@ -55,5 +55,10 @@ namespace WMS.Web.Core.Dto.InStock
         ///</summary> 
         [Required(ErrorMessage = "入库数量不能为空")]
         public decimal Qty { get; set; }
+
+        /// <summary>
+        /// 序列号集
+        /// </summary>
+        public List<string> SerialNumbers { get; set; } = new List<string>();
     }
 }

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

@@ -127,7 +127,7 @@ namespace WMS.Web.Domain.Services
             bool isRollback = false;
             bool isTransaction = false;
             //保存非采购上架的数据
-            var shelfSave_result = await this.ShelfNoPurchaseSave(dto,loginInDto.UserInfo.StaffId, isTransaction);
+            var shelfSave_result = await this.ShelfNoPurchaseSave(dto, loginInDto, isTransaction);
             if(!shelfSave_result.IsSuccess) isRollback = true;
             //提交事务
             var isSuccess = _basicsRepositories.CommitTransaction(isRollback, _transaction);
@@ -209,7 +209,7 @@ namespace WMS.Web.Domain.Services
         /// <param name="staffId"></param>
         /// <param name="isTransaction"></param>
         /// <returns></returns>
-        private async Task<Result> ShelfNoPurchaseSave(NoPurchaseShelfRequest dto,int staffId, bool isTransaction = true)
+        private async Task<Result> ShelfNoPurchaseSave(NoPurchaseShelfRequest dto, LoginInDto loginInfo, bool isTransaction = true)
         {
 
             //1.修改-入库任务单的信息
@@ -218,7 +218,7 @@ namespace WMS.Web.Domain.Services
             updateInStockTaskRequest.Boxs = dto.Boxs;
             updateInStockTaskRequest.Details = dto.TaskDetails;
             //2.修改后返回当前实体
-            var update_result = await this.Update(updateInStockTaskRequest, staffId, null, isTransaction, true);
+            var update_result = await this.Update(updateInStockTaskRequest, loginInfo.UserInfo.StaffId, null, isTransaction, true);
             if (!update_result.IsSuccess)
                 return update_result; 
 
@@ -226,23 +226,35 @@ namespace WMS.Web.Domain.Services
             var entity = new InStock();
             entity.Type = update_result.Data.Type;
             entity.Details = _mapper.Map<List<InStockDetails>>(dto.Details);
-            entity.Create(staffId);
+            entity.Create(loginInfo.UserInfo.StaffId);
 
             //需要填写序列号
             //需要修改库存
             //需要同步金蝶
 
+            //添加入库单信息
             entity = await _inStockRepositories.Add(entity, isTransaction);
-
+            if(entity==null)
-            if (entity != null)
-                return Result.ReSuccess();
-            else
                 return Result.ReFailure(ResultCodes.DateWriteError);
 
-            //当按产品上架：就要调用该箱的操作；
+            //当按产品上架：就要调用改箱的操作；
-            var changeBox = new SaveChangeBoxRecordRequest();
+            if (dto.ShelfMethod == (int)ShelfMethod.Product)
-
+            {
-            //await _changeMoveBoxService.ChangeBoxSave()
+                var changeBox = new SaveChangeBoxRecordRequest();
+                changeBox.DestBoxId = dto.Boxs.FirstOrDefault().BoxId;
+                foreach (var item in dto.Details)
+                {
+                    var changeBoxRD = new SaveChangeBoxRecordDetailsRequest();
+                    changeBoxRD.MaterialId = item.MaterialId;
+                    changeBoxRD.Qty = item.Qty;
+                    changeBoxRD.SerialNumbers = item.SerialNumbers;
+                }
+                //改箱保存操作
+                var changeBoxSave_Result = await _changeMoveBoxService.ChangeBoxSave(changeBox, loginInfo, isTransaction);
+                if (!changeBoxSave_Result.IsSuccess)
+                    return changeBoxSave_Result;
+            }
+            return Result.ReSuccess();
 
         }
         /// <summary>