修改问题

IPC-610

2025-01-02 286db121ac6b7e56b1b579ebcdd191526890f4af

 Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs

@@ -1358,6 +1358,8 @@
            try
            {
                #region 判断信息
                //开启事务
                Db.BeginTran();

                var stockDetail = Db.Queryable<DataStockDetail>().Where(w => w.IsDel == "0" && w.PalletNo == palletNo).ToList();
                if (stockDetail.Count == 0)
@@ -1374,6 +1376,8 @@
                    throw new Exception("该托盘未在平库内,请检查!");
                }

                

                //起始储位信息
                var storageLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == locatNo);
                if (storageLocat == null)
@@ -1389,8 +1393,7 @@

                #endregion

                //开启事务
                Db.BeginTran();
               

                //需先判断目标地址前方是否有空储位

@@ -1422,8 +1425,18 @@
                        {
                            throw new Exception("托盘上物料箱码信息不存在,请检查!");
                        }
                        //var boxno = boxInfo.GroupBy(w => w.BoxNo).ToList();
                        var boxno = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.StockDetailId == item.Id).GroupBy(m => new
                        {
                            m.BoxNo
                        }).Select(it => new DataBoxInfo()
                        {
                            BoxNo = it.BoxNo
                        }).ToList();

                        //记录托盘上信息给MES
                        foreach (var item2 in boxInfo) { 
                        foreach (var item2 in boxno) {
                            var a = item.ProductionTime.ToString();
                            data.Add(new RequertBeiliaoInfoModel()
                            {
                                no = item2.BoxNo,
@@ -1431,8 +1444,8 @@
                                materiel_name = item.SkuName,
                                qty = item.Qty,
                                batch = item.LotNo,
                                producttime = item.ProductionTime,
                                expiry = item.ExpirationTime
                                producttime = item.ProductionTime.ToString().Substring(0,10),
                                expiry = item.ExpirationTime.ToString().Substring(0, 10)

                            });
                        }
@@ -1459,14 +1472,16 @@
                if (EndLocat != null && EndLocat.AreaNo == "B12")
                {
                    //获取令牌
                    var token = new Token().GetMesToken(mesTokenUrl);
                    //var token = new Token().GetMesToken(mesTokenUrl);
                    var token = "";
                    Dictionary<string, string> mesDic = new Dictionary<string, string>()
                    {
                        {"Authorization",token }
                    };
                    var mescode = Db.Queryable<BllExportNotice>().Where(w => w.SONo == stockDetail.First().SONo).First();
                    var mesData = new RequertBeiliaoModel()
                    {
                        morder_no = stockDetail.First().SONo,
                        morder_no = mescode.OrderCode,
                        pallet = stockDetail.First().PalletNo,
                        layer_no = EndLocat.LocatNo,
                        items = data
@@ -1476,7 +1491,7 @@
                    var response = HttpHelper.DoPost(mesUrl, jsonData, "备料完成运至缓存区反馈至MES", "MES", mesDic);

                    var obj = JsonConvert.DeserializeObject<MesModel>(response);//解析返回数据
                    if (obj.status != "0")
                    if (obj.status != "success")
                    {
                        throw new Exception("备料同步MES失败：" + obj.message);
                    }
@@ -1501,7 +1516,6 @@
             

        }

        #endregion

        #region 箱码查询