ERP接口代码更新，WCS代码优化，出入库分配优化

wangxinhui

4 天以前 a0a0df2e824b6fe7e5a3c0afce78127fecf84fc9

 ÏîÄ¿´úÂë/WMS/WMSServices/WIDESEA_BasicService/UserInfoService.cs

@@ -1,4 +1,5 @@
using System;
using AutoMapper;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -7,6 +8,8 @@
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Const;
using WIDESEA_Core.Helper;
using WIDESEA_DTO;
using WIDESEA_DTO.Basic;
using WIDESEA_DTO.ERP;
using WIDESEA_IBasicRepository;
using WIDESEA_IBasicService;
@@ -18,33 +21,44 @@
    public class UserInfoService : ServiceBase<Dt_UserInfo, IUserInfoRepository>, IUserInfoService
    {
        private readonly ISys_UserRepository _userRepository;
        public UserInfoService(IUserInfoRepository BaseDal, ISys_UserRepository userRepository) : base(BaseDal)
        private readonly IMapper _mapper;
        public UserInfoService(IUserInfoRepository BaseDal, ISys_UserRepository userRepository,IMapper mapper) : base(BaseDal)
        {
            _userRepository = userRepository;
            _mapper = mapper;
        }

        public IUserInfoRepository Repository => BaseDal;

        public WebResponseContent ReceiveUser(UserInfoDTO model)
        /// <summary>
        /// æŽ¥æ”¶äºŒæœŸå‘˜å·¥ä¿¡æ¯
        /// </summary>
        /// <param name="eRPUserInfoDTO"></param>
        /// <returns></returns>
        public WebResponseContent ReceiveStaff(ERPUserInfoDTO eRPUserInfoDTO)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                if (model.OperateType == "0")
                if (eRPUserInfoDTO == null)
                {
                    Dt_UserInfo userInfo = new Dt_UserInfo()
                    return content.Error("员工信息不能传入为空");
                }
                List<Dt_UserInfo> OlduserInfos = BaseDal.QueryData();

                if (eRPUserInfoDTO.OperateType == 1)
                {
                    //判断重复插入
                    Dt_UserInfo? userInfoOld = OlduserInfos.FirstOrDefault(x => x.Code == eRPUserInfoDTO.StaffCode);
                    if (userInfoOld != null)
                    {
                        Code = model.Code,
                        DeptName = model.DeptName,
                        DeptNo = model.DeptNo,
                        InvOrgId = model.InvOrgId,
                        Name = model.Name,
                        State = model.State
                    };
                        return content.Error($"工号{userInfoOld.Code}，员工{userInfoOld.Name}已存在");
                    }
                    Dt_UserInfo userInfo = _mapper.Map<Dt_UserInfo>(eRPUserInfoDTO);
                    Sys_User user = new Sys_User()
                    {
                        UserName = userInfo.Code,
                        RoleId = 0,
                        UserPwd = "TC123456".EncryptDES(AppSecret.User),
                        UserPwd = "LLD123456".EncryptDES(AppSecret.User),
                        RoleName = "",
                        Enable = (byte)userInfo.State,
                        LastModifyPwdDate = DateTime.Now,
@@ -53,59 +67,47 @@
                        Creater = "系统",
                        UserTrueName = userInfo.Name,
                    };
                    //新增
                    BaseDal.AddData(userInfo);
                    _userRepository.AddData(user);
                }
                else if (model.OperateType == "1")
                else if (eRPUserInfoDTO.OperateType == 2)
                {
                    Dt_UserInfo userInfo = BaseDal.QueryFirst(x => x.Code == model.Code);
                    if (userInfo == null)
                    //判断是否存在
                    Dt_UserInfo? userInfoOld = OlduserInfos.FirstOrDefault(x => x.Code == eRPUserInfoDTO.StaffCode);
                    if (userInfoOld == null)
                    {
                        Dt_UserInfo userInfoAddNew = new Dt_UserInfo()
                        {
                            Code = model.Code,
                            DeptName = model.DeptName,
                            DeptNo = model.DeptNo,
                            InvOrgId = model.InvOrgId,
                            Name = model.Name,
                            State = model.State
                        };
                        Sys_User userAddNew = new Sys_User()
                        {
                            UserName = userInfo.Code,
                            RoleId = 0,
                            UserPwd = "TC123456".EncryptDES(AppSecret.User),
                            RoleName = "",
                            Enable = (byte)userInfo.State,
                            LastModifyPwdDate = DateTime.Now,
                            Address = "系统服务器",
                            TenantId = 0,
                            Creater = "系统",
                            UserTrueName = userInfo.Name,
                        };
                        BaseDal.AddData(userInfoAddNew);
                        _userRepository.AddData(userAddNew);
                        return content.Error($"更新工号{eRPUserInfoDTO.StaffCode}，员工{eRPUserInfoDTO.StaffName}不存在");
                    }
                    else
                    Dt_UserInfo userInfo = _mapper.Map<Dt_UserInfo>(eRPUserInfoDTO);
                    userInfo.Id = userInfoOld.Id;
                    Sys_User user = _userRepository.QueryFirst(x=>x.UserName== userInfo.Code);
                    if (userInfoOld == null)
                    {
                        userInfo.State = model.State;
                        userInfo.DeptName = model.DeptName;
                        userInfo.DeptNo = model.DeptNo;
                        userInfo.InvOrgId = model.InvOrgId;
                        userInfo.Name = model.Name;
                        BaseDal.UpdateData(userInfo);
                        return content.Error($"更新工号{eRPUserInfoDTO.StaffCode}，员工{eRPUserInfoDTO.StaffName}，WMS账号不存在");
                    }
                    user.Enable = (byte)userInfo.State;
                    user.UserTrueName = userInfo.Name;
                    //更新
                    BaseDal.UpdateData(userInfo);
                    _userRepository.UpdateData(user);
                }
                else if (model.OperateType == "2")
                else if (eRPUserInfoDTO.OperateType == 3)
                {
                    Dt_UserInfo userInfo = BaseDal.QueryFirst(x => x.Code == model.Code);
                    if (userInfo == null)
                    //判断是否存在
                    Dt_UserInfo? userInfoOld = OlduserInfos.FirstOrDefault(x => x.Code == eRPUserInfoDTO.StaffCode);
                    if (userInfoOld == null)
                    {
                        return WebResponseContent.Instance.Error($"未找到该员工号【{model.Code}】信息");
                        return content.Error($"更新工号{eRPUserInfoDTO.StaffCode}，员工{eRPUserInfoDTO.StaffName}不存在");
                    }
                    BaseDal.DeleteData(userInfo);
                    BaseDal.DeleteData(userInfoOld);
                }
                return WebResponseContent.Instance.OK();
                else
                {
                    return content.Error("未找到操作类型");
                }
                //更新数据
                return content.OK("接收成功");
            }
            catch (Exception ex)
            {