Wms/WMS.BLL/BllQualityServer/QualityInspectServer.cs

@@ -80,7 +80,7 @@
                skuname = "%" + model.SkuName + "%", //物料名称
                lotno = model.LotNo, //批次号
                isqualified = model.IsQualified, //是否合格
                origin=model.Origin//来源
                origin = model.Origin//来源
            });
            return qualityList;
        }
@@ -166,7 +166,7 @@
            {
                sqlStr += $" and LotNo='{model.LotNo}' ";
            }
            BllArrivalNoticeDetail arrivalDetail = Db.SqlQueryable<BllArrivalNoticeDetail>(sqlStr).First();            
            BllArrivalNoticeDetail arrivalDetail = Db.SqlQueryable<BllArrivalNoticeDetail>(sqlStr).First();
            if (arrivalDetail == null)
            {
                throw new Exception("未找到入库单信息！");
@@ -195,7 +195,7 @@
            List<DataStockDetail> detail = Db.SqlQueryable<DataStockDetail>(sqlStr2).ToList();
            foreach (var item in detail)
            {
                List<BllBoxInfo> box = Db.Queryable<BllBoxInfo>().Where(a => a.IsDel == "0" && a.SkuNo == model.SkuNo && a.LotNo == model.LotNo).ToList();
                //List<BllBoxInfo> box = Db.Queryable<BllBoxInfo>().Where(a => a.IsDel == "0" && a.SkuNo == model.SkuNo && a.LotNo == model.LotNo).ToList();
                //判断合格状态是否合格
                if (model.IsQualified == "1")
                {
@@ -211,13 +211,18 @@
                    item.InspectStatus = "2"; //2不合格
                }

                Db.Updateable(box).ExecuteCommand();
                //Db.Updateable(box).ExecuteCommand();
                Db.Updateable(item).ExecuteCommand();
            }

            Db.Updateable(arrivalDetail).ExecuteCommand();
            var isquality = Db.Insertable(model).ExecuteCommand();

            //修改库存箱码质检状态
            string uptDataBoxStatusSql = $@"update DataBoxInfo set InspectStatus='1' where IsDel='0' and SkuNo='{model.SkuNo}' and LotNo='{model.LotNo}' and StockDetailId in (select Id from DataStockDetail where IsDel='0' and SkuNo='{model.SkuNo}' and LotNo='{model.LotNo}' and InspectStatus='1') ";
            int uptDataBoxStatus = Db.Ado.ExecuteCommand(uptDataBoxStatusSql);


            return isquality;
        }
        /// <summary>

 Wms/WMS.BLL/SysServer/UserInforServer.cs

@@ -75,6 +75,9 @@
            }
            else//锁定账号
            {
                //账号改为停用
                string uptUserStatusSql = $@"update SysUserInfor set Status=1 where UserName='{loginName}'";
                int uptUserStatus = Db.Ado.ExecuteCommand(uptUserStatusSql);
                return -2;
            }

@@ -181,7 +184,7 @@
        public async Task<int> UpdateUserinfo(UserInfoDto userdto)
        {
            //映射数据模型
            SysUserInfor userlist = _mapper.Map<SysUserInfor>(userdto);
            SysUserInfor userInfo = _mapper.Map<SysUserInfor>(userdto);
            //判断用户号是否唯一
            int count = await GetUserInfoByNo(userdto.UserNo, userdto.UserName, userdto.Id);
            int i = 0;
@@ -193,9 +196,22 @@
            {
                userdto.UpdateUser = _userManager.UserId;
                userdto.UpdateTime = DateTime.Now;
                i = await Db.Updateable(userlist)
                    .UpdateColumns(s => new { s.UserName, s.UserNo, s.Sex, s.RoleNo, s.RealName, s.Phone, s.Paper, s.Nationality, s.JobNo, s.Email, s.Demo, s.Addres, s.UpdateUser, s.UpdateTime })

                //状态恢复正常，清除密码错误次数
                if (userdto.Status == "0")
                {
                    userInfo.PwdErrNum = 0;
                    i = await Db.Updateable(userInfo)
                    .UpdateColumns(s => new { s.UserName, s.UserNo, s.Sex, s.RoleNo, s.RealName, s.Phone, s.Paper, s.Nationality, s.JobNo, s.Email, s.Demo, s.Addres, s.Status, s.PwdErrNum, s.UpdateUser, s.UpdateTime })
                    .ExecuteCommandAsync();
                }
                else
                {
                    i = await Db.Updateable(userInfo)
                    .UpdateColumns(s => new { s.UserName, s.UserNo, s.Sex, s.RoleNo, s.RealName, s.Phone, s.Paper, s.Nationality, s.JobNo, s.Email, s.Demo, s.Addres, s.Status, s.UpdateUser, s.UpdateTime })
                    .ExecuteCommandAsync();
                }

                if (i <= 0)
                    throw Oops.Bah("编辑用户信息失败");
            }

 Wms/Wms/Controllers/StatisticalController.cs

@@ -181,14 +181,11 @@
        /// <param name="inspectStatus">质量状态</param>
        /// <returns></returns>
        [HttpGet]
        public IActionResult GetBindList(string skuNo, string skuName, string palletNo, string lotNo, string boxNo, string status,
            string inspectMark, string bitPalletMark, string bitBoxMark, string inspectStatus, string ownerNo, string ownerName,
            string startTime, string endTIme, string WareHouseNo, string AreaNo)
        public IActionResult GetBindList(string skuNo, string skuName, string palletNo, string lotNo, string boxNo, string status, string inspectMark, string bitPalletMark, string bitBoxMark, string inspectStatus, string ownerNo, string ownerName, string startTime, string endTIme, string WareHouseNo, string AreaNo)
        {
            try
            {
                List<StockDetailDto> boxInfoList = _stockDetail.GetBindList(skuNo, skuName, palletNo, lotNo, boxNo, status, inspectMark,
                    bitPalletMark, bitBoxMark, inspectStatus, ownerNo, ownerName, startTime, endTIme, WareHouseNo, AreaNo);
                List<StockDetailDto> boxInfoList = _stockDetail.GetBindList(skuNo, skuName, palletNo, lotNo, boxNo, status, inspectMark, bitPalletMark, bitBoxMark, inspectStatus, ownerNo, ownerName, startTime, endTIme, WareHouseNo, AreaNo);
                return Ok(new { data = boxInfoList, code = 0, msg = "获取托盘明细成功" });
            }
            catch (Exception e)