合并最新

2022-12-20 09:32:32 +08:00
parent 844e9f1488
commit 1abdaa9476
654 changed files with 73563 additions and 9746 deletions
@@ -45,6 +45,19 @@ namespace BLL
            return (unit != null);
        }

+        public static Model.Base_Unit getUnitByCollCropCodeUnitName(string CollCropCode, string unitName)
+        {
+            var getUnit = Funs.DB.Base_Unit.FirstOrDefault(e => e.CollCropCode == CollCropCode);
+            if (getUnit != null)
+            {
+                return getUnit;
+            }
+            else
+            {
+                return Funs.DB.Base_Unit.FirstOrDefault(e => e.UnitName == unitName);
+            }
+        }
+
        #region 单位信息维护
        /// <summary>
        /// 添加单位信息