FQC导出增加备注,前端增加备注保存

wwwroot/main/FqcProductCheck/api/AddFQCInspect_WCF.ashx

@@ -189,7 +189,7 @@ public class AddFQCInspect_WCF : IHttpHandler, IReadOnlySessionState
                                new CDAParameter("ACCOUNTID", Convert.ToInt32(HttpContext.Current.Session["accountId"])),
                                new CDAParameter("CREATEUSERID", Convert.ToInt32(HttpContext.Current.Session["userId"])),
                                new CDAParameter("UPDATEUSERID", Convert.ToInt32(HttpContext.Current.Session["userId"])),
-                               new CDAParameter("REMARKS", "")
+                               new CDAParameter("REMARKS", saveTable.Rows[i]["REMARKS"].ToString())
                            );
 
                         }

wwwroot/main/FqcProductCheck/api/GetItemsDataDetail_WCF.ashx

@@ -58,7 +58,8 @@ public class GetItemsDataDetail_WCF : IHttpHandler
                         FD.ITEMSDETAILID,
                         FD.INSPECTITEM,
                         FD.INSPECTVALUE,
-                        FD.ISQUALIFIED 
+                        FD.ISQUALIFIED,
+                        FD.REMARKS
                     FROM TP_PM_FQCITEMSDATA FD
                     LEFT JOIN TP_MST_DATADICTIONARY D ON FD.INSPECTTYPE = D.DICTIONARYID
                     WHERE FD.VALUEFLAG = '1'

wwwroot/main/FqcProductCheck/index.html

@@ -622,13 +622,15 @@
 
                                                                             $("#" + i + "结果1").val(itemsdataJson["rows"][z]["INSPECTVALUE"]);
                                                                         $("#" + i + "合格").val(itemsdataJson["rows"][z]["ISQUALIFIED"]);
+                                                                        $("#" + i + "备注").val(itemsdataJson["rows"][z]["REMARKS"]);
                                                                        
                                                                     } else {
                                                                         for (var m = 1; m <= parseInt(itemsJson["rows"][i]["INSPECTCOUNT"]); m++) {
                                                                             $("#" + i + "结果" + m).val(itemsdataJson["rows"][z]["INSPECTVALUE"]);
                                                                             z = z + 1;
                                                                         }
-                                                                        $("#" + i + "合格").val(itemsdataJson["rows"][z-1]["ISQUALIFIED"]);
+                                                                        $("#" + i + "合格").val(itemsdataJson["rows"][z - 1]["ISQUALIFIED"]);
+                                                                        $("#" + i + "备注").val(itemsdataJson["rows"][z - 1]["REMARKS"]);
                                                                     }
                                                                 }
                                                                 else if (itemsJson["rows"][i]["INSPECTMARKVALUE"] == "定量") {
@@ -636,6 +638,7 @@
 
                                                                         $("#" + i + "结果1").val(itemsdataJson["rows"][z]["INSPECTVALUE"]);
                                                                         $("#" + i + "合格").val(itemsdataJson["rows"][z]["ISQUALIFIED"]);
+                                                                        $("#" + i + "备注").val(itemsdataJson["rows"][z]["REMARKS"]);
 
                                                                     } else {
                                                                         for (var m = 1; m <= parseInt(itemsJson["rows"][i]["INSPECTCOUNT"]); m++) {
@@ -644,7 +647,8 @@
                                                                                 z = z + 1;
                                                                             }
                                                                         }
-                                                                        $("#" + i + "合格").val(itemsdataJson["rows"][z-1]["ISQUALIFIED"]);
+                                                                        $("#" + i + "合格").val(itemsdataJson["rows"][z - 1]["ISQUALIFIED"]);
+                                                                        $("#" + i + "备注").val(itemsdataJson["rows"][z - 1]["REMARKS"]);
                                                                     }
                                                                 }
 
@@ -836,6 +840,7 @@
 
                                                                         $("#" + i + "结果1").val(itemsdataJson["rows"][z]["INSPECTVALUE"]);
                                                                         $("#" + i + "合格").val(itemsdataJson["rows"][z]["ISQUALIFIED"]);
+                                                                        $("#" + i + "备注").val(itemsdataJson["rows"][z]["REMARKS"]);
 
                                                                     } else {
                                                                         for (var m = 1; m <= parseInt(itemsJson["rows"][i]["INSPECTCOUNT"]); m++) {
@@ -843,6 +848,7 @@
                                                                             z = z + 1;
                                                                         }
                                                                         $("#" + i + "合格").val(itemsdataJson["rows"][z - 1]["ISQUALIFIED"]);
+                                                                        $("#" + i + "备注").val(itemsdataJson["rows"][z - 1]["REMARKS"]);
                                                                     }
                                                                 }
                                                                 else if (itemsJson["rows"][i]["INSPECTMARKVALUE"] == "定量") {
@@ -850,6 +856,7 @@
 
                                                                         $("#" + i + "结果1").val(itemsdataJson["rows"][z]["INSPECTVALUE"]);
                                                                         $("#" + i + "合格").val(itemsdataJson["rows"][z]["ISQUALIFIED"]);
+                                                                        $("#" + i + "备注").val(itemsdataJson["rows"][z]["REMARKS"]);
 
                                                                     } else {
                                                                         for (var m = 1; m <= parseInt(itemsJson["rows"][i]["INSPECTCOUNT"]); m++) {
@@ -859,6 +866,7 @@
                                                                             }
                                                                         }
                                                                         $("#" + i + "合格").val(itemsdataJson["rows"][z - 1]["ISQUALIFIED"]);
+                                                                        $("#" + i + "备注").val(itemsdataJson["rows"][z - 1]["REMARKS"]);
                                                                     }
                                                                 }
 

wwwroot/main/excel/excelRW.ashx

@@ -20,9 +20,9 @@ public class excelRW : IHttpHandler
             string inspectname = context.Request["inspectname"].ToString();
 
             DataTable saveTable = conn.ExecuteDatatable(@"
-                SELECT barcode,goodscode,goodstypename,groutingdate,inspectitem ,unitname,technicalrequirement
+                SELECT barcode,goodscode,goodstypename,groutingdate,inspectitem ,unitname,technicalrequirement,remarks,xuhao,ITEMSDETAILID
                           ,listagg(inspectvalue, ', ') within GROUP(ORDER BY inspectvalue) AS inspectvalue,isqualified
-                      FROM (SELECT fd.barcode,g.goodscode,gt.goodstypename,g.groutingdate ,fd.inspectitem
+                      FROM (SELECT fd.barcode,g.goodscode,gt.goodstypename,g.groutingdate ,fd.inspectitem,fd.remarks,fdd.xuhao,fdd.ITEMSDETAILID
                                   ,CASE
                                        WHEN fdd.unitname IS NULL THEN
                                         '-'
@@ -61,7 +61,8 @@ public class excelRW : IHttpHandler
                              WHERE fd.barcode = @BARCODE@
                                AND f.inspectname = @INSPECTNAME@
                                AND fd.valueflag = 1)
-                     GROUP BY barcode ,goodscode,goodstypename,groutingdate,inspectitem,unitname,technicalrequirement,isqualified  ",
+                     GROUP BY barcode ,goodscode,goodstypename,groutingdate,inspectitem,unitname,technicalrequirement,isqualified,remarks,xuhao,ITEMSDETAILID  
+                    ORDER BY XUHAO,ITEMSDETAILID DESC",
                new CDAParameter("BARCODE", barcode),
                new CDAParameter("INSPECTNAME", inspectname)
                );
@@ -77,18 +78,26 @@ public class excelRW : IHttpHandler
 
                 for (int i = 0; i < saveTable.Rows.Count; i++)
                 {
-                     //增加备注（显示所有不合格的项目）
+                    //增加备注（显示所有不合格的项目）
                     if (saveTable.Rows[i]["isqualified"].ToString() == "不合格")
                     {
                         if (remarks == "")
                         {
                             remarks = saveTable.Rows[i]["inspectitem"].ToString();
+                            if (!string.IsNullOrEmpty(saveTable.Rows[i]["remarks"].ToString()))
+                            {
+                                remarks += "["+saveTable.Rows[i]["remarks"].ToString()+"]";
+                            }
                         }
                         else
                         {
                             remarks +=  ","+ saveTable.Rows[i]["inspectitem"].ToString();
+                            if (!string.IsNullOrEmpty(saveTable.Rows[i]["remarks"].ToString()))
+                            {
+                                remarks += "["+saveTable.Rows[i]["remarks"].ToString()+"]";
+                            }
                         }
-                        
+
                     }
 
                     if (i < 70)