改箱调整

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

@@ -95,7 +95,7 @@ namespace WMS.Web.Api.Controllers
             if (loginInfo == null || loginInfo.UserInfo == null)
                 return Result.ReFailure(ResultCodes.Token_Invalid_Error);
 
-            return await _changeMoveBoxService.ChangeBoxSave(new List<SaveChangeBoxRecordRequest>() { dto }, loginInfo);
+            return await _changeMoveBoxService.ChangeBoxSave(new List<SaveChangeBoxRecordRequest>() { dto }, loginInfo, true, true, true);
         }
     }
 }

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

@@ -475,6 +475,11 @@
             目标箱子ID
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.ChangeBoxRecord.SaveChangeBoxRecordRequest.DestBoxBillNo">
+            <summary>
+            目标箱号
+            </summary>
+        </member>
         <member name="P:WMS.Web.Core.Dto.ChangeBoxRecord.SaveChangeBoxRecordRequest.SubStockId">
              <summary>
              目标箱仓位或重新上架选择仓位

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

@@ -3814,7 +3814,7 @@
         <member name="T:WMS.Web.Domain.Services.ChangeMoveBoxService">
             改箱 移箱服务
         </member>
-        <member name="M:WMS.Web.Domain.Services.ChangeMoveBoxService.ChangeBoxSave(System.Collections.Generic.List{WMS.Web.Core.Dto.ChangeBoxRecord.SaveChangeBoxRecordRequest},WMS.Web.Core.Dto.Login.LoginInDto,System.Boolean,System.Boolean)">
+        <member name="M:WMS.Web.Domain.Services.ChangeMoveBoxService.ChangeBoxSave(System.Collections.Generic.List{WMS.Web.Core.Dto.ChangeBoxRecord.SaveChangeBoxRecordRequest},WMS.Web.Core.Dto.Login.LoginInDto,System.Boolean,System.Boolean,System.Boolean)">
             <summary>
             改箱保存
             </summary>
@@ -3822,6 +3822,13 @@
             <param name="loginInfo"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.Services.ChangeMoveBoxService.CreateBox(WMS.Web.Core.Dto.ChangeBoxRecord.SaveChangeBoxRecordRequest)">
+            <summary>
+            自动生成箱信息
+            </summary>
+            <param name="dto"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Domain.Services.ChangeMoveBoxService.MoveBoxSave(System.Collections.Generic.List{WMS.Web.Core.Dto.MoveBoxRecord.SaveMoveBoxRecordRequest},System.Boolean,WMS.Web.Core.Dto.Login.LoginInDto)">
             <summary>
             移箱保存

src/WMS.Web.Core/Dto/ChangeBoxRecord/SaveChangeBoxRecordRequest.cs

@@ -23,12 +23,15 @@ namespace WMS.Web.Core.Dto.ChangeBoxRecord
         /// <summary>
         /// 目标箱子ID
         /// </summary>
-        [Required(ErrorMessage = "目标箱子不能为空")]
         public int DestBoxId { get; set; }
         /// <summary>
+        /// 目标箱号
+        /// </summary>
+        [Required(ErrorMessage = "目标箱号不能为空")]
+        public string DestBoxBillNo { get; set; }
+        /// <summary>
         /// 目标箱仓位或重新上架选择仓位
         ///</summary> 
-        [Required(ErrorMessage = "仓位不能为空")]
         public int SubStockId { get; set; } = 0;
         /// <summary>
         /// 明细

src/WMS.Web.Core/Dto/OpsBoxResponse.cs

@@ -67,7 +67,7 @@ namespace WMS.Web.Core.Dto
         /// 序列号生成时间
         /// </summary>
         [JsonProperty("barCreateTime")]
-        public DateTime? BarCreateTime { get; set; }
+        public DateTime? BarCreateTime { get; set; } = DateTime.Now;
         /// <summary>
         /// 序列号生成用户
         /// </summary>

src/WMS.Web.Domain/IService/IChangeMoveBoxService.cs

@@ -18,7 +18,7 @@ namespace WMS.Web.Domain.IService
    public interface IChangeMoveBoxService
     {
         //改箱保存
-        Task<Result> ChangeBoxSave(List<SaveChangeBoxRecordRequest> dto, LoginInDto loginInfo, bool isTransaction=true,bool IsInventory=true);
+        Task<Result> ChangeBoxSave(List<SaveChangeBoxRecordRequest> dto, LoginInDto loginInfo, bool isTransaction=true,bool IsInventory=true,bool IsPDA=false);
         //移箱保存
         Task<Result> MoveBoxSave(List<SaveMoveBoxRecordRequest> dto, bool IsUp, LoginInDto loginInfo);
         //出库回退

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

@@ -7,6 +7,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using WMS.Web.Core.Dto;
 using WMS.Web.Core.Dto.ChangeBoxRecord;
 using WMS.Web.Core.Dto.Inventory;
 using WMS.Web.Core.Dto.Login;
@@ -35,11 +36,12 @@ namespace WMS.Web.Domain.Services
         private readonly IBoxInventoryRepositories _boxInventoryRepositories;
         private readonly ILogger<ChangeMoveBoxService> _logger;
         private readonly ISerialNumbersRepositories _serialNumbersRepositories;
+        private readonly IBoxService _boxService;
         public ChangeMoveBoxService(IMapper mapper, ILoginService loginService,
             IChangeBoxRecordRepositories changeBoxRecordRepositories, IBasicsRepositories basbicsRepositories,
             IMoveBoxRecordRepositories moveBoxRecordRepositories, IBoxRepositories boxRepositories,
             ISerialNumberService serialNumberService, IBoxInventoryService boxInventoryService, IBoxInventoryRepositories boxInventoryRepositories,
-            ILogger<ChangeMoveBoxService> logger, ISerialNumbersRepositories serialNumbersRepositories)
+            ILogger<ChangeMoveBoxService> logger, ISerialNumbersRepositories serialNumbersRepositories, IBoxService boxService)
         {
             _mapper = mapper;
             _loginService = loginService;
@@ -52,6 +54,7 @@ namespace WMS.Web.Domain.Services
             _boxInventoryRepositories = boxInventoryRepositories;
             _logger = logger;
             _serialNumbersRepositories = serialNumbersRepositories;
+            _boxService = boxService;
         }
         /// <summary>
         /// 改箱保存
@@ -59,13 +62,33 @@ namespace WMS.Web.Domain.Services
         /// <param name="dto"></param>
         /// <param name="loginInfo"></param>
         /// <returns></returns>
-        public async Task<Result> ChangeBoxSave(List<SaveChangeBoxRecordRequest> dto, LoginInDto loginInfo, bool isTransaction = false, bool IsInventory = true)
+        public async Task<Result> ChangeBoxSave(List<SaveChangeBoxRecordRequest> dto, LoginInDto loginInfo, bool isTransaction = false, bool IsInventory = true, bool IsPDA = false)
         {
             _logger.LogInformation($"改箱:{JsonConvert.SerializeObject(dto)} 操作人:{loginInfo.UserInfo.StaffId}");
+            if (IsPDA)
+            {
+                var d = dto.First();
+                var dBox = await _boxRepositories.GetByNo(d.DestBoxBillNo);
+                if (dBox == null)
+                {
+                    var res = await CreateBox(d);
+                    if (!res.IsSuccess) return res;
+                    dBox = await _boxRepositories.GetByNo(d.DestBoxBillNo);
+                    dto.First().DestBoxId = dBox.Id;
+                }
+                else
+                {
+                    var destInventoryBoxs = await _boxInventoryRepositories.Get(dBox.Id);
+                    dto.First().DestBoxId = dBox.Id;
+                    if (destInventoryBoxs != null)
+                        dto.First().SubStockId = destInventoryBoxs.SubStockId;
+                }
+            }
             //1.有原箱时 需要判断 物料对应的序列号是否存在
             var srcIds = dto.Select(s => s.SrcBoxId).Distinct().ToList();
             var destIds = dto.Select(s => s.DestBoxId).Distinct().ToList();
             var boxs = await _boxInventoryRepositories.GetList(srcIds);
+
             var serialNumbers = dto.SelectMany(s => s.Details).SelectMany(s => s.SerialNumbers).ToList();
             var serialNumberList = await _serialNumbersRepositories.GetEntityList(serialNumbers);
             foreach (var d in dto)
@@ -187,6 +210,33 @@ namespace WMS.Web.Domain.Services
             }
             return Result.ReSuccess();
         }
+        /// <summary>
+        /// 自动生成箱信息
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        private async Task<Result> CreateBox(SaveChangeBoxRecordRequest dto)
+        {
+            List<OpsBoxResponse> list = new List<OpsBoxResponse>();
+            OpsBoxResponse response = new OpsBoxResponse() { BoxBillNo = dto.DestBoxBillNo };
+            foreach (var d in dto.Details)
+            {
+                List<OpsSerialNumbersResponse> s = new List<OpsSerialNumbersResponse>();
+                foreach (var sd in d.SerialNumbers)
+                {
+                    s.Add(new OpsSerialNumbersResponse() { SerialNumber = sd });
+                }
+                OpsBoxDetailsResponse dr = new OpsBoxDetailsResponse()
+                {
+                    MaterialId = d.MaterialId,
+                    Qty = d.Qty,
+                    SerialNumbers = s
+                };
+            }
+            list.Add(response);
+            return await _boxService.Sync(list);
+        }
+
         /// <summary>
         /// 移箱保存
         /// </summary>