修改打印标签

Administrator

2025-06-11 a65ac07c6cc7eba2dfb8416750f875f8a6ec636c

 Wms/WMS.BLL/HttpServer.cs

@@ -534,9 +534,9 @@
                {
                    areaList.Add(item);
                }

                var roadStr = Db.Queryable<SysStorageRoadway>().Where(m => m.IsDel == "0" && m.Status == "0").Select(m=>m.RoadwayNo).ToList();
                //巷道组信息
                var roadList = Db.Queryable<SysStorageLocat>().Where(m => m.IsDel == "0" && m.WareHouseNo == houseNo && areaList.Contains(m.AreaNo) && !string.IsNullOrWhiteSpace(m.RoadwayNo))
                var roadList = Db.Queryable<SysStorageLocat>().Where(m => m.IsDel == "0" && m.WareHouseNo == houseNo && areaList.Contains(m.AreaNo) && !string.IsNullOrWhiteSpace(m.RoadwayNo) && roadStr.Contains(m.RoadwayNo))
                    .GroupBy(m => m.RoadwayNo).OrderBy(m => m.RoadwayNo).Select(m => m.RoadwayNo).ToList();

                #endregion
@@ -1231,7 +1231,7 @@
                else
                {
                    locate2.Status = "1";
                    Db.Updateable(locate).ExecuteCommand();
                    Db.Updateable(locate2).ExecuteCommand();
                }
                
                Db.Updateable(stockDetail).ExecuteCommand();
@@ -1348,12 +1348,13 @@
        /// <param name="soNo"></param>
        /// <param name="detailId"></param>
        /// <param name="outMode"></param>
        /// <param name="palletNo"></param>
        /// <param name="userId"></param>
        /// <param name="url"></param>
        /// <param name="str"></param>
        /// <returns></returns>
        /// <exception cref="Exception"></exception>
        public List<OutCommandDto> IssueOutHouseLk(string soNo, string detailId,string outMode, int userId, string url, out string str)
        public List<OutCommandDto> IssueOutHouseLk(string soNo, string detailId,string outMode, string palletNo, int userId, string url, out string str)
        {
            try
            {
@@ -1463,7 +1464,22 @@
                        str = "储位损坏不能出库";
                        return outDto1;
                    }

                    if (locate.WareHouseNo != "W02")
                    {
                        str = "托盘不在货架库上";
                        return outDto1;
                    }
                    var locateEnd = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == outModeLocate && m.IsDel == "0");//当前出库的目标储位信息
                    if (locateEnd == null)
                    {
                        str = "出库的托盘储位信息错误(在储位表中未查询到)";
                        return outDto1;
                    }
                    else if (locateEnd.Status != "0")
                    {
                        str = "目标储位状态不是空储位";
                        return outDto1;
                    }
                    #endregion

                    if (locate.Status == "1") //有物品
@@ -1614,7 +1630,7 @@

                            //解析返回数据 
                            var wcsModel = JsonConvert.DeserializeObject<WcsModel2>(response);
                            if (wcsModel.code == 0)
                            if (wcsModel.code == 200)
                            {
                                //更改任务的发送返回时间//
                                new TaskServer().EditTaskIssueOk(list2, time1, time2);