From ba54e398d0fa596f6dc0604c53141bfc93cccf2c Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 12 十月 2022 09:47:12 +0800
Subject: [PATCH] nothing

---
 VueWebApi/DLL/DAL/ProductModelDAL.cs |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/VueWebApi/DLL/DAL/ProductModelDAL.cs b/VueWebApi/DLL/DAL/ProductModelDAL.cs
index 1193584..e0762fe 100644
--- a/VueWebApi/DLL/DAL/ProductModelDAL.cs
+++ b/VueWebApi/DLL/DAL/ProductModelDAL.cs
@@ -925,8 +925,8 @@
                     string sql0 = @"select ISNULL(IDENT_CURRENT('TBom_Main')+1,1) as id";
                     var dt = DapperHelper.selecttable(sql0);
                     //鍐欏叆BOM涓昏〃
-                    sql = @"insert into TBom_Main(materiel_code,quantity,status,version,lm_user,lm_date) 
-                            values(@materiel_code,@quantity,@status,@version,@username,@CreateDate)";
+                    sql = @"insert into TBom_Main(materiel_code,quantity,status,version,lm_user,lm_date,startdate) 
+                            values(@materiel_code,@quantity,@status,@version,@username,@CreateDate,@startdate)";
                     list.Add(new
                     {
                         str = sql,
@@ -937,7 +937,8 @@
                             status = status,
                             version = version,
                             username = username,
-                            CreateDate = DateTime.Now.ToString()
+                            CreateDate = DateTime.Now.ToString(),
+                            startdate= startdate
                         }
                     });
                     //鍐欏叆BOM瀛愯〃
@@ -1058,6 +1059,18 @@
             var dynamicParams = new DynamicParameters();
             try
             {
+                //鍒ゆ柇鐗╂枡绫诲瀷鏄惁鏈夊叧鑱旂墿鏂�
+                sql = @"select materiel_code from TK_Wrk_Man   where materiel_code in (select materiel_code from TBom_Main  where id=@bomid ) and bom_id=@bomid";
+                dynamicParams.Add("@bomid", bomid);
+                var data0 = DapperHelper.selectdata(sql, dynamicParams);
+                if (data0.Rows.Count > 0)
+                {
+                    mes.code = "300";
+                    mes.count = 0;
+                    mes.Message = "褰撳墠鐗╂枡娓呭崟宸茶宸ュ崟鍏宠仈浣跨敤,涓嶅厑璁镐慨鏀�!";
+                    mes.data = null;
+                    return mes;
+                }
                 //鑾峰彇Bom瀛愯〃鏁版嵁
                 sql = @"select A.seq,B.partcode,B.partname,B.partspec,B.uom_code,T.name as uom_name,
                          A.base_quantity,A.loss_quantity,A.total_quantity,A.pn_type   

--
Gitblit v1.9.3