Merge branch 'master' into Liudl

bklLiudl

11 小时以前 d3e81088f1afdc01b14af6bdac533116ab0cdb60

 Wms/Wms/Controllers/PdaAsnController.cs

@@ -3,13 +3,17 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Options;
using Model.InterFaceModel;
using Model.ModelDto;
using Model.ModelDto.BllAsnDto;
using Model.ModelDto.DataDto;
using Model.ModelVm;
using Model.ModelVm.BllAsnVm;
using Model.ModelVm.PdaVm;
using Model.ModelVm.SysVm;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Security.Claims;
using Utility;
using Utility.Tools;
@@ -36,7 +40,6 @@
            _PdaAsnSvc = pdaAsnSvc; 
            _userManager = userManager;
        }
        

        #region JC34

@@ -197,7 +200,7 @@
        /// </summary>
        /// <param name="boxNo">BoxNo:箱号</param>
        /// <returns></returns>
        [HttpPost]
        [HttpGet]
        public IActionResult GetWmsBoxInfos(string boxNo)
        {
            try
@@ -264,7 +267,7 @@


        /// <summary>
        /// 绑定托盘
        /// 车间入库
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
@@ -323,8 +326,6 @@


        #endregion



        #region 公用方法
        /// <summary>
@@ -758,7 +759,6 @@

        #endregion
         

        #region 平库入库
        /// <summary>
        /// 平库确认入库
@@ -876,5 +876,67 @@


        #endregion

        #region 线编标签
        /// <summary>
        /// 平库确认入库
        /// </summary>
        /// <param name="model">物料编码；物料名称</param>
        /// <returns></returns>
        [HttpPost]
        public IActionResult GetSkuInfo(GetMaterialsVm model)
        {
            try
            {
                var models = _PdaAsnSvc.GetSkuInfo(model);

                return Ok(new { code = 0, msg = "获取物料信息成功!", data = models });
            }
            catch (Exception e)
            {
                return Ok(new { code = 1, msg = e.Message });
            }
        }

        /// <summary>
        /// 生成新标签 并返回打印数据
        /// </summary>
        /// <param name="model">标签信息</param>
        /// <returns>打印数据</returns>
        [HttpPost]
        public IActionResult AddLabels(LabelsVm model) 
        {
            try
            {
                var claimsIdentity = this.User.Identity as ClaimsIdentity;
                if (claimsIdentity == null)
                {
                    throw new Exception("未获取到用户信息");
                }
                string UserId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
                if (string.IsNullOrWhiteSpace(UserId))
                {
                    throw new Exception("未获取到用户信息");
                }
                model.userId = int.Parse(UserId);
                var models = _PdaAsnSvc.AddLabels(model);

                var data = new BoxListInfoDto();
                data.SkuNo = model.SkuNo;
                data.SkuName = model.SkuName;
                data.LotNo = model.LotNo;
                data.Date1 = model.TimeFrom == null ? "" : Convert.ToDateTime(model.TimeFrom).ToString("yyyy-MM-dd");
                data.Date2 = model.TimeEnd == null ? "" : Convert.ToDateTime(model.TimeEnd).ToString("yyyy-MM-dd");
                data.BoxNoList = models.Select(m => m.BoxNo).ToList();


                return Ok(new { code = 0, msg = "箱码生成成功!", data = data });
            }
            catch (Exception e)
            {
                return Ok(new { code = 1, msg = e.Message });
            }
        }
        #endregion
    }
}