质量报表增加冷补

wwwroot/mes/rpt/rpt.ashx

@@ -93,7 +93,7 @@ order by tt.stype, tt.displayno, tt.ssid
                                         '[不合格]'
                                    END goodsleveltypename
                               FROM tp_sys_goodsleveltype t
-                             WHERE t.goodsleveltypeid IN (4, 5, 6, 7)
+                             WHERE t.goodsleveltypeid IN (4, 5, 6, 7, 16)
                              ORDER BY t.goodsleveltypeid
                             ");
                             context.Response.Write(dt.ToJson());

wwwroot/mes/rpt/rpt368/rpt.ashx

@@ -200,6 +200,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                                    when 5 then '副品[合格]'
                                                                    when 6 then '重烧[不合格]'
                                                                    when 7 then '次品[不合格]'
+                                                                   when 16 then '冷补[不合格]'
                                                                    else '' end as 检查结果
                                           ,t.defectname AS 不合格原因
                                           ,t.defectpositionname AS 不合格位置
@@ -346,7 +347,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                 //查询不合格品明细
                 if (!ispass && !string.IsNullOrEmpty(context.Request["datebeginDB"]))
                 {
-                    sqlStr += " AND t.goodsleveltypeid in (1,2,6,7) ";
+                    sqlStr += " AND t.goodsleveltypeid in (1,2,6,7,16) ";
                 }
 
                 sqlStr += @"  ORDER BY t.displayno

wwwroot/mes/rpt/rpt368/rpt_index.html

@@ -36,7 +36,7 @@
                         <!--<input class="easyui-combobox" id="goodsleveltypeMaster" name="goodsleveltypeMaster" data-options="required:false,prompt:'',tipPosition:'top',url:'../rpt.ashx?m=getCheckResult',method:'get',valueField:'GOODSLEVELTYPEID',textField:'GOODSLEVELTYPENAME',panelHeight:'300px',editable:'true',multiple:true,limitToList:true" style="width: 180px; height: 32px;">-->
                         <input class="easyui-combobox" id="goodsleveltypeMaster" name="goodsleveltypeMaster" data-options="required:false,valueField:'value',textField:'text',editable:true,multiple:true,
                                data:[{'text': '半检合格[合格]', 'value': '0'},{'text': '半检返工[不合格]', 'value': '1'},{'text': '半检报废[不合格]', 'value': '2'}
-                               ,{'text': '正品[合格]', 'value': '4'},{'text': '副品[合格]', 'value': '5'},{'text': '重烧[不合格]', 'value': '6'},{'text': '次品[不合格]', 'value': '7'}]"
+                               ,{'text': '正品[合格]', 'value': '4'},{'text': '副品[合格]', 'value': '5'},{'text': '重烧[不合格]', 'value': '6'},{'text': '冷补[不合格]', 'value': '16'},{'text': '次品[不合格]', 'value': '7'}]"
                                style=" width: 180px; height: 32px;">
                         不合格原因：
                         <input class="easyui-combobox" id="defectMaster" name="defectMaster" data-options="required:false,prompt:'',tipPosition:'top',url:'../rpt.ashx?m=getDefectReason',method:'get',valueField:'DEFECTID',textField:'DEFECTNAME',panelHeight:'300px',editable:'true',multiple:true,limitToList:true" style="width: 180px; height: 32px;">