Merge branch 'hwh'

hwh

2024-07-15 7ceb9b642fc01412fc4fe3e1a44f55cc79c10c88

Merge branch 'hwh'

 Pda/View/login.html

@@ -195,12 +195,12 @@
                            time: 2000 //2秒关闭（如果不配置，默认是3秒）
                        });
                    } else {
                        if(res.code==200){//成功
                        if(res.code==0){//成功
                            layer.msg('登陆成功', {
                                icon: 1,
                                time: 500 //2秒关闭（如果不配置，默认是3秒）
                            }, function () {
                                $.cookie('token', res.ToKen.TokenStr);
                                $.cookie('token', res.data);
                                //回调
                                location.href="/View/index.html";
                            });

 Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs

@@ -889,8 +889,6 @@
        //盘点下发出库
        public async Task<List<OutCommandDto>> CheckOutHouse(string crNo, string outMode, string url, string str)
        {
            try
            {
                #region 集合 
                var outDtoList = new List<OutCommandDto>(); //出库数据的集合 
                //记录错误信息的集合 
@@ -919,9 +917,7 @@
                //获取物料信息
                var skuNo = await Db.Queryable<SysMaterials>().Where(a => a.IsDel == "0" && a.Type == "4").Select(a => a.SkuNo).ToListAsync();
                var time = DateTime.Now;
                Db.BeginTran();
                try
                {
            //Db.BeginTran();
                    //循环盘点明细的信息生成出库任务
                    foreach (var item in list)
                    {
@@ -1159,7 +1155,7 @@
                        TypeName = "出库",
                        Msg = $"点击出库按钮盘点单号为：{crNo}的盘点单"
                    });
                    Db.CommitTran();
            //Db.CommitTran();

                    str = string.Empty;
                    if (flagList.Count(m => m == 1) > 0)
@@ -1182,6 +1178,8 @@
                    {
                        str += "5.要出库的托盘在零箱库、";
                    }
            if (!string.IsNullOrEmpty(str))
                throw Oops.Bah(str);
                    if (outDtoList.Count > 0)
                    {
                        // 正式运行程序放开
@@ -1189,8 +1187,6 @@
                        var jsonData = JsonConvert.SerializeObject(outDtoList);
                        string response = "";

                        try
                        {
                            var time1 = DateTime.Now;//发送时间 .ToString("yyyy-MM-dd HH:mm:ss")
                            //response = HttpHelper.DoPost(url, jsonData, "下发给WCS出库命令", "WCS"); //正式版本放开
                            var time2 = DateTime.Now;//返回时间 .ToString("yyyy-MM-dd HH:mm:ss")
@@ -1206,27 +1202,11 @@
                            //if (wcsModel.StatusCode == -1)
                            //{
                            //    new TaskServer().EditTaskIssueNo(list2, time1, time2, wcsModel.Msg);
                            //    throw new Exception(wcsModel.Msg);
                //    throw Oops.Bah(wcsModel.Msg);
                            //}
                        }
                        catch (Exception ex)
                        {
                            throw new Exception(ex.Message);
                        }
                    }
                    return outDtoList;
                }
                catch (Exception e)
                {
                    Db.RollbackTran();
                    throw new Exception(e.Message);
                }
                #endregion
            }
            catch (Exception e)
            {
                throw new Exception(e.Message);
            }
        }

        //盘点出库完成

 Wms/WMS.BLL/SysServer/PalletsServer.cs

@@ -125,8 +125,17 @@

                var str = pallNo.Substring(3, 5);
                string remove = pallNo.Substring(0, 3);
                int sibelius = Convert.ToInt16(str);
                int sibelius = 0;
                var num = 0;
                if (remove != "T" + DateTime.Now.ToString("yy"))
                {
                    remove = "T" + DateTime.Now.ToString("yy");
                    sibelius = 0;
                }
                else
                {
                    sibelius = Convert.ToInt16(str);
                }
                for (int i = 0; i < groupCount; i++)
                {
                    sibelius += 1;

 Wms/Wms/Controllers/DownApiController.cs

@@ -174,9 +174,8 @@
        /// <returns></returns>
        [Authorize]
        [HttpGet]
        [UnitOfWork]
        public async Task<IActionResult> CheckOutHouse(string crNo, string outMode)
        {
            try
            {
                //获取当前登录的用户ID
                var claimsIdentity = this.User.Identity as ClaimsIdentity;
@@ -194,11 +193,6 @@

                return Ok(new { code = 0, msg = str, data = list });

            }
            catch (Exception e)
            {
                return Ok(new { code = 1, msg = e.Message });
            }
        }

        /// <summary>