修改出库单编辑页面

Administrator

2024-03-06 65ecd34acf0a3d33e6c1e10c93e351716d749e2f

 Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs

@@ -224,7 +224,7 @@
                    {
                        SkuNo = d.SkuNo,
                        LotNo = d.LotNo,
                        Qty = int.Parse(d.CompleteQty.ToString())
                        Qty = (decimal)d.CompleteQty
                    };
                    list.Add(item);
                }
@@ -247,8 +247,8 @@
                #endregion

                notice.Status = "6";
                notice.UpdateTime = DateTime.Now;
                notice.UpdateUser = userId;
                notice.CheckTime = DateTime.Now;
                notice.CheckUser = userId;
                Db.Updateable(notice).ExecuteCommand();

                new OperationSOServer().AddLogOperationSo("出库作业", "出库单据", notice.SONo, "复核", $"复核了单据号为{notice.SONo}的单据信息", userId);
@@ -360,6 +360,9 @@
                        break;
                    case "6"://代储出库
                        skuType = "(2)";
                        break;
                    case "8"://寄存出库
                        skuType = "(3)";
                        break;
                    default: //其它出库
                        skuType = "(0,1,2,3,4)";
@@ -1420,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)
                        {
@@ -1434,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")//机器人拆垛
                        {
@@ -2609,6 +2623,7 @@
                    LocatNo = a.LocatNo,
                    RoadwayNo = a.RoadwayNo,
                    PalletNo = a.PalletNo,
                    Demo = a.Demo,
                }).ToList();

                return list;
@@ -2808,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)