11

2024-07-01 09:29:35 +08:00
parent 3990f747ce
commit 26d1774fb1
35 changed files with 1432 additions and 488 deletions
@@ -243,6 +243,11 @@ namespace BLL
        /// </summary>
        public const string WelderQueTemplateUrl = "File\\Excel\\WelderQue.xlsx";

+        /// <summary>
+        /// Coode导入模板
+        /// </summary>
+        public const string CoodeInTemplateUrl = "File\\Excel\\CoodeIn.xlsx";
+
        /// <summary>
        /// 委托单导入模板
        /// </summary>
@@ -564,6 +569,12 @@ namespace BLL
        /// </summary>
        public const string HJGL_PointManageMenuId = "3ACE25CE-C5CE-4CEC-AD27-0D5CF1DF2F01";

+        /// <summary>
+        /// 点口待审核
+        /// </summary>
+        public const string HJGL_PointForAuditMenuId = "7C4BD351-630C-4E2A-B9AD-F91C042ED7A0";
+
+
        /// <summary>
        /// 无损委托单
        /// </summary>
@@ -29,8 +29,9 @@ namespace BLL
                ProjectId = coode.ProjectId,
                Coode = coode.Coode,
                HeartNo = coode.HeartNo,
-                Amount = coode.Amount
-            };
+                Amount = coode.Amount,
+                IsUse = coode.IsUse
+        };
            db.Base_MaterialCoode.InsertOnSubmit(newCoode);
            db.SubmitChanges();
        }
@@ -49,6 +50,7 @@ namespace BLL
                NewCoode.Coode = coode.Coode;
                NewCoode.HeartNo = coode.HeartNo;
                NewCoode.Amount = coode.Amount;
+                NewCoode.IsUse=coode.IsUse;
                db.SubmitChanges();
            }
        }
@@ -99,7 +101,7 @@ namespace BLL
            dropName.DataValueField = "MaterialCoode";
            dropName.DataTextField = "MaterialCoode";
            var sql = from x in Funs.DB.Base_MaterialCoode
-                      where x.ProjectId == projectId
+                      where x.ProjectId == projectId & x.IsUse == true
                      orderby x.Coode, x.HeartNo
                      select new { x.MaterialCoodeId, MaterialCoode = x.Coode + ":" + x.HeartNo};
            dropName.DataSource = sql.ToList(); 
@@ -116,7 +118,7 @@ namespace BLL
            dropName.DataValueField = "Coode";
            dropName.DataTextField = "Coode";
            var sql = (from x in Funs.DB.Base_MaterialCoode
-                      where x.ProjectId == projectId select x.Coode).Distinct();       
+                      where x.ProjectId == projectId && x.IsUse==true select x.Coode).Distinct();       
            dropName.DataSource = sql;
            dropName.DataBind();

@@ -69,6 +69,7 @@ namespace BLL
            newDataInTemp.Value37 = dataInTemp.Value37;
            newDataInTemp.Value38 = dataInTemp.Value38;
            newDataInTemp.Value39 = dataInTemp.Value39;
+            newDataInTemp.Value40 = dataInTemp.Value40;
            newDataInTemp.ToopValue = dataInTemp.ToopValue;
            db.Sys_DataInTemp.InsertOnSubmit(newDataInTemp);
            db.SubmitChanges();
@@ -124,6 +125,8 @@ namespace BLL
                newDataInTemp.Value36 = dataInTemp.Value36;
                newDataInTemp.Value37 = dataInTemp.Value37;
                newDataInTemp.Value38 = dataInTemp.Value38;
+                newDataInTemp.Value39 = dataInTemp.Value39;
+                newDataInTemp.Value40 = dataInTemp.Value40;
                newDataInTemp.ToopValue = dataInTemp.ToopValue;
                try
                {