添加/编辑入库单去掉生产日期和过期日期验证

wxw

2025-10-26 b3aa8a4429343e0efcdeef78ea96c45d4023474f

 Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs

@@ -410,22 +410,41 @@
                        }
                        string lot1 = detailModel.Lot1;
                        string lot2 = detailModel.Lot2;
                        if (sku.IsControlled == "0")//是否请验，0：是 1：否
                        //if (sku.IsControlled == "0")//是否请验，0：是 1：否
                        //{
                        //    //需要请验物料 生产日期、有效期不能为空
                        //    DateTime lot12;
                        //    DateTime lot22;
                        //    if (!DateTime.TryParse(detailModel.Lot1, out lot12))
                        //    {
                        //        throw new Exception("需要请验物料生产日期转换失败");
                        //    }
                        //    if (!DateTime.TryParse(detailModel.Lot2, out lot22))
                        //    {
                        //        throw new Exception("需要请验料过期日期转换失败");
                        //    }
                        //    lot1 = lot12.ToString("yyyy-MM-dd");
                        //    lot2 = lot22.ToString("yyyy-MM-dd");
                        //}
                        if (!string.IsNullOrEmpty(lot1))
                        {
                            //需要请验物料 生产日期、有效期不能为空
                            DateTime lot12;
                            DateTime lot22;
                            if (!DateTime.TryParse(detailModel.Lot1, out lot12))
                            {
                                throw new Exception("需要请验物料生产日期转换失败");
                            }
                            if (!DateTime.TryParse(detailModel.Lot2, out lot22))
                            {
                                throw new Exception("需要请验料过期日期转换失败");
                            }
                            lot1 = lot12.ToString("yyyy-MM-dd");
                        }
                        if (!string.IsNullOrEmpty(lot2))
                        {
                            DateTime lot22;
                            if (!DateTime.TryParse(detailModel.Lot1, out lot22))
                            {
                                throw new Exception("需要请验物料生产日期转换失败");
                            }
                            lot2 = lot22.ToString("yyyy-MM-dd");
                        }

                        if (string.IsNullOrWhiteSpace(detailModel.PackagNo))
                        {
                            detailModel.PackagNo = sku.PackagNo;
@@ -640,47 +659,67 @@

                        // 2. 将字符串类型的IsControlled转换为bool（根据实际取值规则调整）
                        // 比如："1"表示受控，"0"表示不受控；或"True"/"False"；或"是"/"否"
                        bool isControlled;
                        if (!bool.TryParse(material.IsControlled, out isControlled))
                        {
                            // 处理非标准格式（如"1"/"0"）
                            isControlled = material.IsControlled == "1" ||
                                           string.Equals(material.IsControlled, "是", StringComparison.OrdinalIgnoreCase);
                        }
                        //bool isControlled;
                        //if (!bool.TryParse(material.IsControlled, out isControlled))
                        //{
                        //    // 处理非标准格式（如"1"/"0"）
                        //    isControlled = material.IsControlled == "1" ||
                        //                   string.Equals(material.IsControlled, "是", StringComparison.OrdinalIgnoreCase);
                        //}

                        // 3. 根据受控状态验证日期
                        if (isControlled)
                        //if (material.IsControlled=="0")
                        //{
                        //    // 受控状态：生产日期必填
                        //    if (string.IsNullOrWhiteSpace(detailModel.Lot1))
                        //        return $"-1:物料{detailModel.SkuNo}为需请验物料，生产日期不可为空;";

                        //    // 受控状态：过期日期必填
                        //    if (string.IsNullOrWhiteSpace(detailModel.Lot2))
                        //        return $"-1:物料{detailModel.SkuNo}为需请验物料，过期日期不可为空;";

                        //    // 验证日期格式有效性
                        //    if (!DateTime.TryParse(detailModel.Lot1, out DateTime productionDate))
                        //        return $"-1:物料{detailModel.SkuNo}的生产日期格式错误，请使用有效日期格式;";

                        //    if (!DateTime.TryParse(detailModel.Lot2, out DateTime expiryDate))
                        //        return $"-1:物料{detailModel.SkuNo}的过期日期格式错误，请使用有效日期格式;";

                        //    // 验证过期日期不能早于生产日期
                        //    if (expiryDate <= productionDate)
                        //        return $"-1:物料{detailModel.SkuNo}的过期日期不能早于生产日期;";
                        //}

                        if (!string.IsNullOrEmpty(detailModel.Lot1))
                        {
                            // 受控状态：生产日期必填
                            if (string.IsNullOrWhiteSpace(detailModel.Lot1))
                                return $"-1:物料{detailModel.SkuNo}为受控物料，生产日期不可为空;";

                            // 受控状态：过期日期必填
                            if (string.IsNullOrWhiteSpace(detailModel.Lot2))
                                return $"-1:物料{detailModel.SkuNo}为受控物料，过期日期不可为空;";

                            // 验证日期格式有效性
                            if (!DateTime.TryParse(detailModel.Lot1, out DateTime productionDate))
                                return $"-1:物料{detailModel.SkuNo}的生产日期格式错误，请使用有效日期格式;";

                            if (!DateTime.TryParse(detailModel.Lot2, out DateTime expiryDate))
                                return $"-1:物料{detailModel.SkuNo}的过期日期格式错误，请使用有效日期格式;";

                            // 验证过期日期不能早于生产日期
                            if (expiryDate <= productionDate)
                                return $"-1:物料{detailModel.SkuNo}的过期日期不能早于生产日期;";
                            DateTime lot12;
                            if (!DateTime.TryParse(detailModel.Lot1, out lot12))
                            {
                                throw new Exception("需要请验物料生产日期转换失败");
                            }
                            detailModel.Lot1 = lot12.ToString("yyyy-MM-dd");
                        }
                        if (!string.IsNullOrEmpty(detailModel.Lot2))
                        {
                            DateTime lot22;
                            if (!DateTime.TryParse(detailModel.Lot1, out lot22))
                            {
                                throw new Exception("需要请验物料生产日期转换失败");
                            }
                            detailModel.Lot2 = lot22.ToString("yyyy-MM-dd");
                        }

                        // 不受控状态：日期非必填，无需验证

                        // 原有批次相关验证（保留）
                        if (TypeLot.Contains(model.Type))
                        {
                            if (string.IsNullOrWhiteSpace(detailModel.Lot1))
                                throw new Exception("生产日期不可为空!");
                        //if (TypeLot.Contains(model.Type))
                        //{
                        //    if (string.IsNullOrWhiteSpace(detailModel.Lot1))
                        //        throw new Exception("生产日期不可为空!");

                            if (string.IsNullOrWhiteSpace(detailModel.Lot2))
                                throw new Exception("过期日期不可为空!");
                        }
                        //    if (string.IsNullOrWhiteSpace(detailModel.Lot2))
                        //        throw new Exception("过期日期不可为空!");
                        //}

                        // 验证物料和批次号是否重复
                        if (dbDetailModels.Any(m => m.SkuNo == detailModel.SkuNo