QC检验明细表修改检验值取值方式

DK.Client/ReportModule/R08/F_RPT_080114.cs

@@ -450,6 +450,7 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
             }
             //赋值给控件 
             this.cbInpectName.Items.AddRange(listOnit.ToArray());
+            this.cbInpectName.Text = string.Empty;
         }
         /// <summary>
         /// 是否按钮数据切换

DK.Service/PCModuleService/PCModuleLogic.cs

@@ -6998,7 +6998,7 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleService
                 "p.INSPECTITEM AS 检验项目, " +
                 "fd.technicalrequirement as 检验依据, " +
                 "p.BARCODE ||'[' || gdd.GOODSCODE || ']' BARCODE," +
-                "  CASE WHEN  p.INSPECTVALUE = '1' AND tpf.INSPECTMARK = '630' THEN  cast('合格'as nvarchar2(10)) ELSE p.INSPECTVALUE END INSPECTVALUE" +
+                "  CASE  WHEN tpf.inspectmark = 630 THEN  CASE  WHEN p.isqualified = 1 THEN  '合格'  ELSE '不合格'  END  ELSE to_char(p.inspectvalue) END AS inspectvalue" +
                 " from TP_PM_FQCITEMSDATA p" +
                 " LEFT JOIN TP_PM_FQCITEMSDETAIL tpf ON p.INSPECTITEM = tpf.INSPECTITEM AND p.ITEMSID = tpf.ITEMSID" +
                 " left join tp_pm_fqcitemsdetail fd on p.itemsdetailid = fd.itemsdetailid" +
@@ -7019,9 +7019,19 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleService
                                             tpf.XUHAO,p.ITEMSDETAILID, 
                                              p.INSPECTITEM AS 检验项目,
                                              fd.technicalrequirement as 检验依据,
-                                             p.BARCODE ||'[' || gdd.GOODSCODE || ']' BARCODE,
-                                             CASE WHEN  p.INSPECTVALUE = '1' AND tpf.INSPECTMARK = '630' THEN  cast('合格'as nvarchar2(10)) ELSE p.INSPECTVALUE END INSPECTVALUE
-                                            from TP_PM_FQCITEMSDATA p
+                                             p.BARCODE ||'[' || gdd.GOODSCODE || ']' BARCODE, 
+                                           CASE
+                                       WHEN tpf.inspectmark = 630 THEN
+                                      CASE
+                                        WHEN p.isqualified = 1 THEN
+                                            '合格'
+                                            ELSE
+                                            '不合格'
+                                             END
+                                       ELSE
+                                       to_char(p.inspectvalue) 
+                                   END AS inspectvalue
+from TP_PM_FQCITEMSDATA p
                                             LEFT JOIN TP_PM_FQCITEMSDETAIL tpf ON p.INSPECTITEM = tpf.INSPECTITEM AND p.ITEMSID = tpf.ITEMSID
                                             left join tp_pm_fqcitemsdetail fd on p.itemsdetailid = fd.itemsdetailid
                                             left join TP_PM_GROUTINGDAILYDETAIL gdd on gdd.BARCODE = p.barcode
@@ -7030,7 +7040,7 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleService
                                             AND p.CREATETIME<=:CREATETIMEEND
                                             AND (p.ITEMSID = :ITEMSID OR :ITEMSID  IS NULL  OR :ITEMSID='')
                                             AND (p.BARCODE = :BARCODE OR :BARCODE  IS NULL  OR :BARCODE='')
-                                            )  PIVOT  (listagg ('['||INSPECTVALUE||']', ',') WITHIN GROUP (ORDER BY INSPECTVALUE) FOR BARCODE IN (" + goodscodes + "))  ORDER BY tpf.XUHAO,tpf.ITEMSDETAILID DESC ";
+                                            )  PIVOT  (listagg ('['||INSPECTVALUE||']', ',') WITHIN GROUP (ORDER BY INSPECTVALUE) FOR BARCODE IN (" + goodscodes + "))  ORDER BY XUHAO,ITEMSDETAILID DESC ";
 
 
                 }