修改客户需求

zhaowc

2025-02-28 157abc191c34e57c1b958ae74fc3de6518ca8a30

 Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs

@@ -44,7 +44,7 @@
            try
            {
                //model.Type：单据类型 在这里代表前端页签类型：即标签页签：贴标物料； 数量页签：不贴表物料，原因：懒得加参数
                var data = Db.Queryable<BllArrivalNotice>().Where(m => m.IsDel == "0" && m.Status != "3" && m.Status != "4").Select(m => m.ASNNo).ToList();
                var data = Db.Queryable<BllArrivalNotice>().Where(m => m.IsDel == "0" && m.Status !="2" && m.Status != "3" && m.Status != "4").Select(m => m.ASNNo).ToList();
                var list = new List<ArrivalNoticeDetailDto>();
                if (model.Type.Contains("0"))//0贴标
                {
@@ -257,6 +257,42 @@
                else
                {
                    sqlMsg = "-1:托盘号不存在!";
                }

                return sqlMsg;
            }
            catch (Exception ex)
            {
                throw ex;
            }
        }



        /// <summary>
        /// 验证地码是否存在
        /// </summary>
        /// <param name="locatNo">地码</param>
        /// <returns>"":可使用 -1:不可使用（原因)</returns>
        public string IsEnableLocatNo(string locatNo)
        {
            string sqlMsg = "";
            string sqlString = string.Empty;
            try
            {
                sqlString = $"select * from SysStorageLocat where LocatNo = '{locatNo}' and WareHouseNo = 'W02' and isdel = '0';";
                var models = Db.Ado.SqlQuery<PalletBindVm>(sqlString);

                if (models.Count > 0)
                {
                    if (models[0].Status != "0")
                    {
                        sqlMsg = "-1:此库位使用中，请在库内请核实!";
                    }
                }
                else
                {
                    sqlMsg = "-1:库位不存在!";
                }

                return sqlMsg;
@@ -1762,8 +1798,8 @@
                    SupplierLot = "",
                    InspectMark = "0",
                    BitPalletMark = "1",
                    IsBale = "0",
                    IsBelt = "0",
                    IsBale = arrivalnotice.IsBale,
                    IsBelt = arrivalnotice.IsBelt,
                    CreateUser = userId
                };
                // 插入托盘绑定表
@@ -1836,8 +1872,8 @@
                        BitPalletMark = "1",
                        InspectStatus = sku.IsInspect,// 组盘的时候就要默认设定好是否合格
                        PackagNo = sku.PackagNo,
                        IsBale = null,
                        IsBelt = null,
                        IsBale = arrivalnotice.IsBale,
                        IsBelt = arrivalnotice.IsBelt,
                        CreateUser = userId,
                        CreateTime = serverTime
                    };
@@ -2574,8 +2610,8 @@
                        SupplierLot = detail.SupplierLot,
                        InspectMark = "0",
                        BitPalletMark = "1",
                        IsBale = "0",
                        IsBelt = "0",
                        IsBale = detail.IsBale,
                        IsBelt = detail.IsBelt,
                        CreateUser = userId,
                        Demo = model.Demo,