Administrator
2024-03-06 c364199e759b5c9f9b860272ad4df81d973b6868
Merge branch 'wxw'
1个文件已修改
19 ■■■■■ 已修改文件
Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
@@ -1423,6 +1423,7 @@
                        string toLocation = string.Empty;//目标位置
                        string unstackingMode2 = unstackingMode;//拆垛方式,0:机器人拆垛 1:PDA拆垛
                        #region 判断是否需要拆箱
                        string isChai = "0";//是否需要拆箱,0:否 1:是
                        var skuInfo = skuList.First(w => w.SkuNo == item.SkuNo);
                        if (skuInfo == null)
                        {
@@ -1437,9 +1438,19 @@
                        {
                            if (item.Qty % (decimal)packagInfo.L2Num != 0)//能整除说明不用拆箱,不能整除说明需要拆箱
                            {
                                isChai = "1";
                                unstackingMode2 = "1";//需要拆箱需走PDA拆垛
                            }
                        }
                        if (isChai == "0")
                        {
                            var boxInfo = Db.Queryable<DataBoxInfo>().Where(w => w.IsDel == "0" && w.PalletNo == item.PalletNo && w.BitBoxMark == "1").ToList();
                            if (boxInfo != null)//托盘上有零箱需要拆箱
                            {
                                isChai = "1";
                                unstackingMode2 = "1";//需要拆箱需走PDA拆垛
                            }
                        }
                        #endregion
                        if (unstackingMode2 == "0")//机器人拆垛
                        {
@@ -2812,7 +2823,13 @@
                            break;
                        }
                    }
                }
                    var boxInfo = Db.Queryable<DataBoxInfo>().Where(w => w.IsDel == "0" && w.PalletNo == item.PalletNo && w.BitBoxMark == "1").ToList();
                    if (boxInfo != null)//托盘上有零箱需要拆箱
                    {
                        result = "1";//需要拆箱
                        break;
                    }
                }
                return result;
            }
            catch (Exception ex)