qinqi 2 лет назад
Родитель
Сommit
8d2bf3d478
1 измененных файлов с 35 добавлено и 1 удалено
  1. 35 1
      wwwroot/mes/pm/radtestform/testform_addgoods.ashx

+ 35 - 1
wwwroot/mes/pm/radtestform/testform_addgoods.ashx

@@ -28,7 +28,7 @@ public class testform_addgoods : IHttpHandler, IReadOnlySessionState
                 string order = HttpContext.Current.Request["order"] is object ? HttpContext.Current.Request["order"] : "asc";
                 DateTime dateBegin = Convert.ToDateTime(context.Request["datebeginMaster"]);
                 DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]).AddDays(1);
-                
+
                 //获取查询条件
                 List<CDAParameter> sqlPara = new List<CDAParameter>();
                 sqlPara.Add(new CDAParameter("ACCOUNTID",HttpContext.Current.Session["accountId"]));
@@ -66,6 +66,26 @@ public class testform_addgoods : IHttpHandler, IReadOnlySessionState
                 DateTime dateBegin = Convert.ToDateTime(context.Request["datebeginMaster"].ToString());
                 DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]).AddDays(1);
                 //添加产品处理
+                DataTable dataTable = conn.ExecuteDatatable(@"
+                        SELECT 
+                        PD.BARCODE 
+                      FROM TP_PM_PRODUCTIONDATA PD 
+                        WHERE PD.VALUEFLAG = 1
+                        AND PD.ACCOUNTID = @ACCOUNTID@
+                        AND PD.PROCEDUREID = @PROCEDUREID@
+                        AND PD.CREATETIME >= @DATEBEGIN@
+                        AND PD.CREATETIME < @DATEEND@
+                        AND NOT EXISTS (SELECT TG.GUID FROM TP_PM_TESTFORM2_GOODS TG WHERE TG.TESTFORMGUID = @TESTFORMGUID@ AND TG.VALUEFLAG = 1 AND TG.BARCODE = PD.BARCODE)
+                      GROUP BY PD.BARCODE 
+                      ORDER BY PD.BARCODE
+                ",
+               new CDAParameter("TESTFORMGUID",context.Request["testformguidMaster"]),
+                   new CDAParameter("PROCEDUREID",context.Request["procedureidMaster"]),
+                   new CDAParameter("DATEBEGIN", dateBegin, DataType.DateTime),
+                   new CDAParameter("DATEEND", dateEnd, DataType.DateTime),
+                   new CDAParameter("ACCOUNTID",HttpContext.Current.Session["accountId"])
+               );
+
                 int result = conn.ExecuteNonQuery(@"
                     INSERT INTO TP_PM_TESTFORM2_GOODS (
                         TESTFORMGUID,
@@ -97,6 +117,20 @@ public class testform_addgoods : IHttpHandler, IReadOnlySessionState
                     new CDAParameter("UPDATEUSERID",HttpContext.Current.Session["userId"])
                 );
 
+                //修改实验标识
+                for (int i = 0; i < dataTable.Rows.Count; i++)
+                {
+                    int resultup = conn.ExecuteNonQuery(@"
+                    UPDATE TP_PM_GROUTINGDAILYDETAIL 
+                    SET
+                        TESTFORMFLAG =1
+                    WHERE 
+                         BARCODE = @BARCODE@  
+                    ",
+                    new CDAParameter("BARCODE",dataTable.Rows[i]["BARCODE"])
+                    );
+                }
+                 
                 string jsonStr = new JsonResult(JsonStatus.success).ToJson();
 
                 context.Response.Write(jsonStr);