Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

BasicData/Tnb.BasicData.Entities/Consts/CodeTemplateConst.cs

@@ -0,0 +1,23 @@
+namespace Tnb.BasicData
+{
+    /// <summary>
+    /// 单据模板业务编码
+    /// </summary>
+    public class CodeTemplateConst
+    {
+        /// <summary>
+        /// 物料签收编码
+        /// </summary>
+        public const string MATERIAL_RECEIPT_CODE = "MaterialReceipt";
+        
+        /// <summary>
+        /// 生产投料编码
+        /// </summary>
+        public const string FEEDING_CODE = "Feeding";
+
+        /// <summary>
+        /// 生产任务单号单据模板编码
+        /// </summary>
+        public const string PRDMOTASK_CODE = "ProductionPlanAndSchedule";
+    }
+}

BasicData/Tnb.BasicData.Entities/Entity/BasLocation.cs

@@ -44,7 +44,7 @@ public partial class BasLocation : BaseEntity<string>
     /// 是否使用
     /// </summary>
     //[SugarColumn(ColumnDataType = "varchar(32)", SqlParameterDbType = typeof(CommonPropertyConvert))]
-    public int is_use { get; set; }
+    public int is_use { get; set; } 
 
     /// <summary>
     /// 是否最小