ztl 2 лет назад
Родитель
Сommit
4b913c286d

+ 2 - 2
wwwroot/Web.config

@@ -6,9 +6,9 @@
 <configuration>
 	<connectionStrings>
 		<!--三水正式服务器-->
-		<add name="ConnectionString" connectionString="Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=172.18.32.116)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=dkmes)));User Id=hgiboss;Password=dongke" providerName="Oracle.ManagedDataAccess.Client"/>
+		<!--<add name="ConnectionString" connectionString="Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=172.18.32.116)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=dkmes)));User Id=hgiboss;Password=dongke" providerName="Oracle.ManagedDataAccess.Client"/>-->
 		<!--三水测试服务器-->
-		<!--<add name="ConnectionString" connectionString="Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=172.18.32.31)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=dkmes)));User Id=dkmes;Password=dongke" providerName="Oracle.ManagedDataAccess.Client"/>-->
+		<add name="ConnectionString" connectionString="Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=172.18.32.31)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=dkmes)));User Id=dkmes;Password=dongke" providerName="Oracle.ManagedDataAccess.Client"/>
 		<!--<add name="ConnectionString" connectionString="Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=172.18.32.30)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=hgmestest)));User Id=hgiboss;Password=dk" providerName="Oracle.ManagedDataAccess.Client"/>-->
 	</connectionStrings>
 	<appSettings>

+ 17 - 13
wwwroot/mes/pm/radtestform/testform_importBarCode.ashx

@@ -40,15 +40,15 @@ public class testform_importBarCode : IHttpHandler, IReadOnlySessionState
             try
             {
                 #region 删除实验单所有产品
-                object a = context.Request["testformguidMaster"];
-                int result0 = conn.ExecuteNonQuery(@"
-                    DELETE 
-                        TP_PM_TESTFORM2_GOODS 
-                    WHERE 
-                        TESTFORMGUID = @TESTFORMGUID@ 
-                    ",
-                    new CDAParameter("TESTFORMGUID", context.Request["testformguidMaster"])
-                );
+                //object a = context.Request["testformguidMaster"];
+                //int result0 = conn.ExecuteNonQuery(@"
+                //    DELETE 
+                //        TP_PM_TESTFORM2_GOODS 
+                //    WHERE 
+                //        TESTFORMGUID = @TESTFORMGUID@ 
+                //    ",
+                //    new CDAParameter("TESTFORMGUID", context.Request["testformguidMaster"])
+                //);
                 #endregion
                 //判断字段包含
                 string barCodeStr = "";
@@ -57,7 +57,7 @@ public class testform_importBarCode : IHttpHandler, IReadOnlySessionState
                     if (dt.Rows[i]["产品条码"] + "" == "") {
                         continue;
                     }
-                    if (barCodeStr.IndexOf(dt.Rows[i]["产品条码"] + ",") > -1) { 
+                    if (barCodeStr.IndexOf(dt.Rows[i]["产品条码"] + ",") > -1) {
                         continue;
                     }
                     barCodeStr += dt.Rows[i]["产品条码"] + ",";
@@ -93,6 +93,13 @@ public class testform_importBarCode : IHttpHandler, IReadOnlySessionState
                         new CDAParameter("CREATEUSERID",HttpContext.Current.Session["userId"]),
                         new CDAParameter("UPDATEUSERID",HttpContext.Current.Session["userId"])
                     );
+                    
+                    int result1 = conn.ExecuteNonQuery(@"
+                        UPDATE TP_PM_GROUTINGDAILYDETAIL SET TESTFORMFLAG=2 WHERE BARCODE = @BARCODE@
+                        ",
+                        new CDAParameter("BARCODE",dt.Rows[i]["产品条码"].ToString())
+                    );
+
                 }
                 conn.Commit();
                 context.Response.Write(new JsonResult(JsonStatus.success).ToJson());
@@ -103,10 +110,7 @@ public class testform_importBarCode : IHttpHandler, IReadOnlySessionState
                 conn.Rollback();
                 context.Response.Write(new JsonResult(JsonStatus.otherError) { message = "行号:" + errorLineNo + " 数据错误,请检查!" }.ToJson());
             }
-
         }
-
-
     }
     public bool IsReusable
     {

BIN
wwwroot/mes/pm/radtestform/testform_importBarCode.xlsx


BIN
wwwroot/mes/upload/2023-12-21/研发实验单2023-12-21.xlsx