WMS

dengjunjie

2024-12-18 eb9439d4c635ec89482951dc532327126d142354

WMS

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/CustomerInfoRepository.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Model.Models;

namespace WIDESEA_IBasicRepository
{
    /// <summary>
    /// å®¢æˆ·ä¿¡æ¯ä»“储实现层
    /// </summary>
    public class CustomerInfoRepository : RepositoryBase<Dt_CustomerInfo>, ICustomerInfoRepository
    {
        public CustomerInfoRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
        {
        }
    }
}

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/UserInfoRepository.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,21 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Core.BaseRepository;
using WIDESEA_IBasicRepository;
using WIDESEA_Model.Models;

namespace WIDESEA_BasicRepository
{
    /// <summary>
    /// å‘˜å·¥ä¿¡æ¯ä»“储实现层
    /// </summary>
    public class UserInfoRepository : RepositoryBase<Dt_UserInfo>, IUserInfoRepository
    {
        public UserInfoRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
        {
        }
    }
}

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/CustomerInfoService.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,69 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using WIDESEA_BasicRepository;
using WIDESEA_Core;
using WIDESEA_Core.BaseServices;
using WIDESEA_DTO.Basic;
using WIDESEA_DTO.ERP;
using WIDESEA_IBasicRepository;
using WIDESEA_IBasicService;
using WIDESEA_Model.Models;

namespace WIDESEA_BasicService
{
    public class CustomerInfoService : ServiceBase<Dt_CustomerInfo, ICustomerInfoRepository>, ICustomerInfoService
    {
        public CustomerInfoService(ICustomerInfoRepository BaseDal) : base(BaseDal)
        {
        }

        public ICustomerInfoRepository Repository => BaseDal;

        public WebResponseContent ReceiveCustomer(CustomerInfoDTO model)
        {
            try
            {
                //if (model.OperateType == "0")
                //{
                Dt_CustomerInfo customer = new Dt_CustomerInfo()
                {
                    Code = model.Code,
                    Name = model.ShortName,
                    NickName = model.Name,
                    State = model.State,
                };
                BaseDal.AddData(customer);
                //}
                //else if (model.OperateType == "1")
                //{
                //    Dt_Customer customer = BaseDal.QueryFirst(x => x.Code == model.Code);
                //    if (customer == null)
                //    {
                //        return WebResponseContent.Instance.Error($"未找到该客户信息");
                //    }
                //    customer.State = model.State;
                //    customer.Name = model.ShortName;
                //    customer.NickName = model.Name;
                //    BaseDal.UpdateData(customer);
                //}
                //else if (model.OperateType == "2")
                //{
                //    Dt_Customer customer = BaseDal.QueryFirst(x => x.Code == model.Code);
                //    if (customer == null)
                //    {
                //        return WebResponseContent.Instance.Error($"未找到该客户信息");
                //    }
                //    BaseDal.DeleteData(customer);
                //}
                return WebResponseContent.Instance.OK();
            }
            catch (Exception ex)
            {
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }
    }
}

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/UserInfoService.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,74 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Core;
using WIDESEA_Core.BaseServices;
using WIDESEA_DTO.ERP;
using WIDESEA_IBasicRepository;
using WIDESEA_IBasicService;
using WIDESEA_Model.Models;

namespace WIDESEA_BasicService
{
    public class UserInfoService : ServiceBase<Dt_UserInfo, IUserInfoRepository>, IUserInfoService
    {
        public UserInfoService(IUserInfoRepository BaseDal) : base(BaseDal)
        {
        }

        public IUserInfoRepository Repository => BaseDal;

        public WebResponseContent ReceiveUser(UserInfoDTO model)
        {
            try
            {
                if (model.OperateType == "0")
                {
                    Dt_UserInfo userInfo = new Dt_UserInfo()
                    {
                        Code = model.Code,
                        DeptName = model.DeptName,
                        DeptNo = model.DeptNo,
                        InvOrgId = model.InvOrgId,
                        Name = model.Name,
                        State = model.State,
                        Type = model.Type,
                    };

                    BaseDal.AddData(userInfo);
                }
                else if (model.OperateType == "1")
                {
                    Dt_UserInfo userInfo = BaseDal.QueryFirst(x => x.Code == model.Code);
                    if (userInfo == null)
                    {
                        return WebResponseContent.Instance.Error($"未找到该员工号【{model.Code}】信息");
                    }
                    userInfo.State = model.State;
                    userInfo.Type = model.Type;
                    userInfo.DeptName = model.DeptName;
                    userInfo.DeptNo = model.DeptNo;
                    userInfo.InvOrgId = model.InvOrgId;
                    userInfo.Name = model.Name;
                    BaseDal.UpdateData(userInfo);
                }
                else if (model.OperateType == "2")
                {
                    Dt_UserInfo userInfo = BaseDal.QueryFirst(x => x.Code == model.Code);
                    if (userInfo == null)
                    {
                        return WebResponseContent.Instance.Error($"未找到该员工号【{model.Code}】信息");
                    }
                    BaseDal.DeleteData(userInfo);
                }
                return WebResponseContent.Instance.OK();
            }
            catch (Exception ex)
            {
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }
    }
}

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Basic/InnerCodeDTO.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace WIDESEA_DTO.Basic
{
    public class InnerCodeDTO
    {
        public string matCode { get; set; }
        public string batchNo { get; set; }
        public string purchaseOrderNo { get; set; }
        public int qty { get; set; }
    }
}

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_DTO/ERP/CustomerInfoDTO.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,43 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Core.Attributes;

namespace WIDESEA_DTO.ERP
{
    [ModelValidate()]
    public class CustomerInfoDTO
    {
        /// <summary>
        /// å®¢æˆ·ç¼–码
        /// </summary>
        [PropertyValidate("", NotNullAndEmpty = true)]
        public string Code { get; set; }

        /// <summary>
        /// å®¢æˆ·å…¨ç§°
        /// </summary>
        [PropertyValidate("", NotNullAndEmpty = true)]
        public string Name { get; set; }

        /// <summary>
        /// å®¢æˆ·ç®€ç§°
        /// </summary>
        [PropertyValidate("", NotNullAndEmpty = true)]
        public string ShortName { get; set; }

        /// <summary>
        /// çŠ¶æ€
        /// </summary>
        [PropertyValidate("", NotNullAndEmpty = true)]
        public bool State { get; set; }

        /// <summary>
        /// æ“ä½œç±»åž‹
        /// </summary>
        [PropertyValidate("", NotNullAndEmpty = true)]
        public string OperateType { get; set; }
    }
}

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_DTO/ERP/UserInfoDTO.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,61 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Core.Attributes;

namespace WIDESEA_DTO.ERP
{
    [ModelValidate()]
    public class UserInfoDTO
    {
        /// <summary>
        /// å‘˜å·¥å·
        /// </summary>
        [PropertyValidate("", NotNullAndEmpty = true)]
        public string Code { get; set; }

        /// <summary>
        /// éƒ¨é—¨ç¼–码
        /// </summary>
        [PropertyValidate("", NotNullAndEmpty = true)]
        public string DeptNo { get; set; }

        /// <summary>
        /// éƒ¨é—¨åç§°
        /// </summary>
        [PropertyValidate("", NotNullAndEmpty = true)]
        public string DeptName { get; set; }

        /// <summary>
        /// å‘˜å·¥åç§°
        /// </summary>
        [PropertyValidate("", NotNullAndEmpty = true)]
        public string Name { get; set; }

        /// <summary>
        /// çŠ¶æ€
        /// </summary>
        [PropertyValidate("", NotNullAndEmpty = true)]
        public int State { get; set; }

        /// <summary>
        /// åº“存组织
        /// </summary>
        [PropertyValidate("", NotNullAndEmpty = true)]
        public string InvOrgId { get; set; }

        /// <summary>
        /// ç±»åž‹
        /// </summary>
        [PropertyValidate("", NotNullAndEmpty = true)]
        public int Type { get; set; }

        /// <summary>
        /// æ“ä½œç±»åž‹
        /// </summary>
        [PropertyValidate("", NotNullAndEmpty = true)]
        public string OperateType { get; set; }
    }
}

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MES/MesResponseContent.cs

@@ -13,7 +13,7 @@
        /// <summary>
        /// 
        /// </summary>
        public bool bSucc { get; set; }
        public bool BSucc { get; set; }
        /// <summary>
        /// 
        /// </summary>
@@ -50,5 +50,26 @@
            /// </summary>
            public string Contacts { get; set; }
        }

        public static MesResponseContent Instance
        {
            get { return new MesResponseContent(); }
        }

        public MesResponseContent OK(string message = null)
        {
            BSucc = true;
            StrCode = "0000";
            StrMsg = message == null ? "执行成功" : message;
            return this;
        }

        public MesResponseContent Error(string message = null)
        {
            BSucc = false;
            StrCode = "404";
            StrMsg = message == null ? "执行失败" : message;
            return this;
        }
    }
}

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MES/TestToolModel.cs

@@ -5,7 +5,7 @@
using System.Threading.Tasks;
using WIDESEA_Core.Attributes;

namespace WIDESEA_DTO
namespace WIDESEA_DTO.MES
{
    /// <summary>
    /// æµ‹è¯•æž¶å‡ºä»“模型

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_IBasicRepository/ICustomerInfoRepository.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Model.Models;

namespace WIDESEA_IBasicRepository
{
    /// <summary>
    /// å®¢æˆ·ä¿¡æ¯ä»“储接口层
    /// </summary>
    public interface ICustomerInfoRepository : IRepository<Dt_CustomerInfo>
    {
    }
}

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_IBasicRepository/IUserInfoRepository.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Model.Models;
using WIDESEA_Model.Models;

namespace WIDESEA_IBasicRepository
{
    /// <summary>
    /// å‘˜å·¥ä¿¡æ¯ä»“储接口层
    /// </summary>
    public interface IUserInfoRepository: IRepository<Dt_UserInfo>
    {
    }
}

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_IBasicService/ICustomerInfoService.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,21 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Core;
using WIDESEA_Core.BaseServices;
using WIDESEA_DTO.Basic;
using WIDESEA_DTO.ERP;
using WIDESEA_IBasicRepository;
using WIDESEA_Model.Models;

namespace WIDESEA_IBasicService
{
    public interface ICustomerInfoService : IService<Dt_CustomerInfo>
    {
        ICustomerInfoRepository Repository { get; }

        WebResponseContent ReceiveCustomer(CustomerInfoDTO model);
    }
}

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_IBasicService/IUserInfoService.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Core;
using WIDESEA_Core.BaseServices;
using WIDESEA_DTO.ERP;
using WIDESEA_IBasicRepository;
using WIDESEA_Model.Models;

namespace WIDESEA_IBasicService
{
    public interface IUserInfoService:IService<Dt_UserInfo>
    {
        IUserInfoRepository Repository { get; }

        WebResponseContent ReceiveUser(UserInfoDTO content);
    }
}

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IReceiveOrderDetailService.cs

@@ -13,5 +13,6 @@
    {
        WebResponseContent AddReceiveOrderDetail(string serNum, string orderNo);
        WebResponseContent GetReceiveOrderInfos(SaveModel saveModel);
        WebResponseContent ScaninnerCode(string innerCode);
    }
}

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs

@@ -27,6 +27,7 @@
using WIDESEA_Core.Enums;
using WIDESEA_DTO;
using WIDESEA_DTO.ERP;
using WIDESEA_DTO.MES;
using WIDESEA_DTO.Stock;
using WIDESEA_ITaskInfoRepository;
using WIDESEA_Model.Models;

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/ReceiveOrderDetailService.cs

@@ -162,6 +162,35 @@
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }
        public WebResponseContent ScaninnerCode(string innerCode)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                var innerCodes = innerCode.Split(',');
                var matCode = innerCodes.FirstOrDefault(x => x.Contains("M:"));//.Replace("M:", "");
                if (matCode == null) throw new Exception("未获取到物料码");
                var batchNo = innerCodes.FirstOrDefault(x => x.Contains("BS:"));//.Replace("BS:", "")
                if (batchNo == null) throw new Exception("未获取到批次号");
                var purchaseOrderNo = innerCodes.FirstOrDefault(x => x.Contains("PO:"));//.Replace("PO:", "")
                if (purchaseOrderNo == null) throw new Exception("未获取到采购单号");
                var qty = innerCodes.FirstOrDefault(x => x.Contains("Q:"));
                if (qty == null) throw new Exception("未获取到数量");
                InnerCodeDTO innerCodeDTO = new InnerCodeDTO()
                {
                    matCode = matCode.Replace("M:", ""),
                    batchNo = batchNo.Replace("BS:", ""),
                    purchaseOrderNo = purchaseOrderNo.Replace("PO:", ""),
                    qty = Convert.ToInt32(qty.Replace("Q:", ""))
                };
                content.OK("扫描成功", data: innerCodeDTO);
            }
            catch (Exception ex)
            {
                content.Error(ex.Message);
            }
            return content;
        }
        public WebResponseContent GetReceiveOrderInfos(SaveModel saveModel)
        {
            WebResponseContent content = new WebResponseContent();

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_CustomerInfo.cs

ÎļþÃû´Ó ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_Customer.cs ÐÞ¸Ä
@@ -6,10 +6,10 @@
using System.Threading.Tasks;
using WIDESEA_Core.DB.Models;

namespace WIDESEA_Model.Models.Basic
namespace WIDESEA_Model.Models
{
    [SugarTable(nameof(Dt_Customer),"客户信息")]
    public class Dt_Customer : BaseEntity
    [SugarTable(nameof(Dt_CustomerInfo),"客户信息")]
    public class Dt_CustomerInfo : BaseEntity
    {
        [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "主键")]
        public int Id { get; set; }

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_UserInfo.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,58 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Core.DB.Models;

namespace WIDESEA_Model.Models
{
    [SugarTable(nameof(Dt_UserInfo), "员工信息")]
    public class Dt_UserInfo : BaseEntity
    {
        [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "主键")]
        public int Id { get; set; }

        /// <summary>
        /// å‘˜å·¥å·
        /// </summary>
        [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "员工号")]
        public string Code { get; set; }

        /// <summary>
        /// éƒ¨é—¨ç¼–码
        /// </summary>
        [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "部门编码")]
        public string DeptNo { get; set; }
        /// <summary>
        /// éƒ¨é—¨åç§°
        /// </summary>
        [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "部门名称")]
        public string DeptName { get; set; }

        /// <summary>
        /// å‘˜å·¥åç§°
        /// </summary>
        [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "员工名称")]
        public string Name { get; set; }

        /// <summary>
        /// çŠ¶æ€ 0:禁用、1:可用；默认为1
        /// </summary>
        [SugarColumn(IsNullable = false, ColumnDescription = "状态")]
        public int State { get; set; }

        /// <summary>
        /// åº“存组织
        /// </summary>
        [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "库存组织")]
        public string InvOrgId { get; set; }

        /// <summary>
        /// ç±»åž‹ 1=仓管员，2=质检员
        /// </summary>
        [SugarColumn(IsNullable = false, ColumnDescription = "类型")]
        public int Type { get; set; }
    }
}

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesTaskService.cs

@@ -3,8 +3,10 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Core;
using WIDESEA_Core.BaseServices;
using WIDESEA_DTO;
using WIDESEA_DTO.MES;
using WIDESEA_ITaskInfoRepository;
using WIDESEA_ITaskInfoService;
using WIDESEA_Model.Models;
@@ -13,6 +15,10 @@
{
    public partial class TaskService : ServiceBase<Dt_Task, ITaskRepository>, ITaskService
    {
        public static ITaskService Instance
        {
            get { return App.GetService<ITaskService>(); }
        }
        /// <summary>
        /// æµ‹è¯•æž¶å‡ºä»“
        /// </summary>

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/CustomerInfoController.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using WIDESEA_Core.BaseController;
using WIDESEA_IBasicService;
using WIDESEA_Model.Models;

namespace WIDESEA_WMSServer.Controllers.Basic
{
    [Route("api/[controller]")]
    [ApiController]
    public class CustomerInfoController : ApiBaseController<ICustomerInfoService, Dt_CustomerInfo>
    {
        public CustomerInfoController(ICustomerInfoService service) : base(service)
        {
        }
    }
}

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/UserInfoController.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
using Microsoft.AspNetCore.Mvc;
using WIDESEA_Core.BaseController;
using WIDESEA_IBasicService;
using WIDESEA_Model.Models;

namespace WIDESEA_WMSServer.Controllers.Basic
{
    [Route("api/[controller]")]
    [ApiController]
    public class UserInfoController : ApiBaseController<IUserInfoService, Dt_UserInfo>
    {
        public UserInfoController(IUserInfoService service) : base(service)
        {
        }
    }
}

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs

@@ -31,14 +31,18 @@
        private readonly ISupplierInfoService _supplierInfoService;
        private readonly IMaterielInfoService _materielInfoService;
        private readonly IOutboundOrderService _outboundOrderService;
        private readonly ICustomerInfoService _customerInfoService;
        private readonly IUserInfoService _userInfoService;

        public ErpController(IPurchaseOrderRepository purchaseOrderRepository, IPurchaseOrderService purchaseOrderService, ISupplierInfoService supplierInfoService, IMaterielInfoService materielInfoService, IOutboundOrderService outboundOrderService)
        public ErpController(IPurchaseOrderRepository purchaseOrderRepository, IPurchaseOrderService purchaseOrderService, ISupplierInfoService supplierInfoService, IMaterielInfoService materielInfoService, IOutboundOrderService outboundOrderService,ICustomerInfoService customerInfoService, IUserInfoService userInfoService)
        {
            _purchaseOrderRepository = purchaseOrderRepository;
            _purchaseOrderService = purchaseOrderService;
            _supplierInfoService = supplierInfoService;
            _materielInfoService = materielInfoService;
            _outboundOrderService = outboundOrderService;
            _customerInfoService = customerInfoService;
            _userInfoService = userInfoService;
        }

        /// <summary>
@@ -50,6 +54,19 @@
        public ErpResponseContent ReceivePurchaseOrder([FromBody] Root<PurchaseOrderModel> model)
        {
            WebResponseContent content = _purchaseOrderService.ReceivePurchaseOrder(model.Content);
            if (content.Status) return Instance.OK();
            else return Instance.Error(content.Message);
        }

        /// <summary>
        /// æŽ¥æ”¶ERP仓库员工和质检员工数据
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost, Route("ReceiveUser"), AllowAnonymous, MethodParamsValidate]
        public ErpResponseContent ReceiveUser([FromBody] Root<UserInfoDTO> model)
        {
            WebResponseContent content = _userInfoService.ReceiveUser(model.Content);
            if (content.Status) return Instance.OK();
            else return Instance.Error(content.Message);
        }
@@ -81,6 +98,19 @@
        }

        /// <summary>
        /// æŽ¥æ”¶ERP客户信息
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost, Route("ReceiveCustomer"), AllowAnonymous, MethodParamsValidate]
        public ErpResponseContent ReceiveCustomer([FromBody] Root<CustomerInfoDTO> model)
        {
            WebResponseContent content = _customerInfoService.ReceiveCustomer(model.Content);
            if (content.Status) return Instance.OK();
            else return Instance.Error(content.Message);
        }

        /// <summary>
        /// æŽ¥æ”¶ERP出库单信息
        /// </summary>
        /// <param name="erpOutOrder"></param>

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/ReceiveOrderDetailController.cs

@@ -15,7 +15,6 @@
        public ReceiveOrderDetailController(IReceiveOrderDetailService service) : base(service)
        {
        }

        /// <summary>
        /// åˆ›å»ºæ”¶è´§å•æ˜Žç»†(PDA扫码收货)
        /// </summary>

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MES/MesController.cs

@@ -10,6 +10,7 @@
using WIDESEA_ITaskInfoService;
using WIDESEA_TaskInfoService;
using WIDESEA_DTO.ERP;
using WIDESEA_DTO.MES;

namespace WIDESEA_WMSServer.Controllers.MES
{
@@ -24,7 +25,7 @@
        private readonly IOutboundOrderService _outboundOrderService;
        private readonly ITaskService _taskService;

        public MesController(IPurchaseOrderRepository purchaseOrderRepository, IPurchaseOrderService purchaseOrderService, ISupplierInfoService supplierInfoService, IMaterielInfoService materielInfoService, IOutboundOrderService outboundOrderService,ITaskService taskService)
        public MesController(IPurchaseOrderRepository purchaseOrderRepository, IPurchaseOrderService purchaseOrderService, ISupplierInfoService supplierInfoService, IMaterielInfoService materielInfoService, IOutboundOrderService outboundOrderService, ITaskService taskService)
        {
            _purchaseOrderRepository = purchaseOrderRepository;
            _purchaseOrderService = purchaseOrderService;
@@ -33,16 +34,15 @@
            _outboundOrderService = outboundOrderService;
            _taskService = taskService;
        }

        /// <summary>
        /// æŽ¥æ”¶MES测试架出库
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost, Route("TestToolOut"), AllowAnonymous, MethodParamsValidate]
        public MesResponseContent TestToolOut([FromBody] Root<TestToolOutModel> model)
        {
          return  _taskService.TestToolOut(model.Content);
        }
        //[HttpPost, Route("TestToolOut"), AllowAnonymous, MethodParamsValidate]
        //public MesResponseContent TestToolOut([FromBody] Root<TestToolOutModel> model)
        //{
        //    return _taskService.TestToolOut(model.Content);
        //}
    }
}