Merge branch 'master' of http://s.dev01.dkiboss.com:9001/DK-MES-2.0/HEGII.ss.mes.web

wwwroot/mes/pm/fqcconfig/fqcconfig.ashx

@@ -8,6 +8,8 @@ using System.Collections.Specialized;
 using System.Data;
 using Curtain.DataAccess;
 using DK.XuWei.WebMes;
+using System.Linq;
+
 
 /// <summary>
 /// TP_PM_FQCCONFIG
@@ -136,79 +138,90 @@ public class fqcconfig : IHttpHandler, IReadOnlySessionState
     /// <returns>json</returns>
     private string search(NameValueCollection form)
     {
-        using(IDataAccess conn=DataAccess.Create())
+        using (IDataAccess conn = DataAccess.Create())
         {
             int page = HttpContext.Current.Request["page"] is object ? Convert.ToInt32(HttpContext.Current.Request["page"]) : 1;
             int rows = HttpContext.Current.Request["rows"] is object ? Convert.ToInt32(HttpContext.Current.Request["rows"]) : 10;
             string sort = HttpContext.Current.Request["sort"] is object ? HttpContext.Current.Request["sort"] : "";
             string order = HttpContext.Current.Request["order"] is object ? HttpContext.Current.Request["order"] : "";
-
-            string sqlStr = @"
-                SELECT 
+            //分页查询总数据
+            string sql = @" WITH RankedEmployees AS ( 
+                    SELECT 
                     m.CONFIGID AS SID,
-                    m.CONFIGID,
-                    m.INSPECTTYPE,
-                    d.DICTIONARYVALUE AS INSPECTTYPENAME,
+                    m.CONFIGID,   
                     m.OUTQUANTITY,
                     m.INSPECTIONQUANTITY,
                     m.MINOUTQUANTITY,
                     m.DISPLAYNO,
                     m.REMARKS,
                     m.VALUEFLAG,
-                    m.ACCOUNTID,
-                    us.USERCODE AS 创建工号,
-                    m.CREATETIME,
+                    m.ACCOUNTID, 
+                    m.CREATETIME, 
+                    m.UPDATETIME,
                     usr.USERCODE AS 更新工号,
-                    m.UPDATETIME
+                    us.USERCODE AS 创建工号, 
+                    CASE WHEN  m.CLASSES = 1 THEN '一天一班' ELSE '一天二班' END AS  CLASSES,
+                    m.INSPECTTYPES, 
+                    ROW_NUMBER() OVER (ORDER BY  m.CONFIGID) AS rn 
                 FROM
-                    TP_PM_FQCCONFIG m
-                    LEFT JOIN TP_MST_DATADICTIONARY d ON m.INSPECTTYPE = d.DICTIONARYID
+                    TP_PM_FQCCONFIG m 
 					LEFT JOIN TP_MST_USER us ON us.USERID=M.CREATEUSERID
 					LEFT JOIN TP_MST_USER usr ON usr.USERID=M.CREATEUSERID
                 WHERE 
                     m.VALUEFLAG = '1'
-                    AND m.ACCOUNTID = @ACCOUNTID@
-            ";
-            List<CDAParameter> sqlPara = new List<CDAParameter>();
-            sqlPara.Add(new CDAParameter("ACCOUNTID", HttpContext.Current.Session["accountId"]));
-
-            if(!string.IsNullOrEmpty(form["CONFIGID"]))
+                    AND m.ACCOUNTID = @ACCOUNTID@";
+            sql += form["CONFIGID"] == "" || form["CONFIGID"] == null ? "" : " AND m.CONFIGID = '" + form["CONFIGID"] + "'";
+            sql += form["INSPECTTYPES"] == "" || form["INSPECTTYPES"] == null ? "" : " AND INSTR( m.INSPECTTYPES," + form["INSPECTTYPES"] + " ) > 0 ";
+            sql += form["OUTQUANTITY"] == "" || form["OUTQUANTITY"] == null ? "" : " AND INSTR( m.OUTQUANTITY," + form["OUTQUANTITY"] + " ) > 0 ";
+            sql += form["INSPECTIONQUANTITY"] == "" || form["INSPECTIONQUANTITY"] == null ? "" : " AND INSTR( m.INSPECTIONQUANTITY," + form["INSPECTIONQUANTITY"] + " ) > 0 ";
+            sql += form["DISPLAYNO"] == "" || form["DISPLAYNO"] == null ? "" : " AND INSTR( m.DISPLAYNO," + form["DISPLAYNO"] + " ) > 0 ";
+            sql += form["REMARKS"] == "" || form["REMARKS"] == null ? "" : " AND INSTR( m.REMARKS," + form["REMARKS"] + " ) > 0 ";
+            sql += sort != "" ? sort != "INSPECTTYPENAME"?" ORDER BY " + sort + " " + order : "": "";
+            sql += ") SELECT * FROM RankedEmployees WHERE rn  BETWEEN " + (page == 0 ? (page - 1) * 10 : (page - 1) * 10 + 1) + " AND " + rows * page;
+            DataTable bt = conn.ExecuteDatatable(sql, new CDAParameter("ACCOUNTID", HttpContext.Current.Session["accountId"]));
+            //添加检验类型中文名称
+            bt.Columns.Add("INSPECTTYPENAME", typeof(string));
+            //添加大小件
+            bt.Columns.Add("CONFIGTYPE", typeof(string));
+            //查找主键id
+            var columnValues = bt.AsEnumerable().Select(row => row.Field<decimal>("CONFIGID")).ToList();
+            //当没有数据时跳出
+            if (columnValues.Count == 0)
             {
-                sqlStr += " AND m.CONFIGID = @CONFIGID@ ";
-                sqlPara.Add(new CDAParameter("CONFIGID", form["CONFIGID"]));
+                return "";
             }
-            if(!string.IsNullOrEmpty(form["INSPECTTYPE"]))
+            //依据主键id查找副表TP_PM_FQCCONFIG_DETAIL
+            DataTable lbt = conn.ExecuteDatatable(@"SELECT * FROM TP_PM_FQCCONFIG_DETAIL WHERE CONFIGID IN(" + string.Join(",", bt.AsEnumerable().Select(row => row.Field<decimal>("CONFIGID")).ToList()) + ") AND VALUEFLAG = 1");
+            //依据检验类型通过逗号分割去查找TP_MST_DATADICTIONARY中的数据
+            DataTable dbt = conn.ExecuteDatatable(@"SELECT * FROM TP_MST_DATADICTIONARY WHERE DICTIONARYID IN(" + string.Join(",", bt.AsEnumerable().Select(row => row.Field<string>("INSPECTTYPES")).ToList()) + ") AND VALUEFLAG = 1");
+            //循环总数居
+            for (int i = 0; i < bt.Rows.Count; i++)
             {
-                sqlStr += " AND INSTR( m.INSPECTTYPE, @INSPECTTYPE@ ) > 0 ";
-                sqlPara.Add(new CDAParameter("INSPECTTYPE", form["INSPECTTYPE"]));
+                //查找当前数据的检验类型并按逗号分割
+                var xbt = bt.AsEnumerable().Where(ex => ex.Field<decimal>("CONFIGID") == decimal.Parse(bt.Rows[i][1].ToString())).Select(ex => ex.Field<string>("INSPECTTYPES")).FirstOrDefault().Split(',').ToList();
+                //根据TP_MST_DATADICTIONARY包含当前检验类型的数据查找检验类型中文名称
+                var query = (from row in dbt.AsEnumerable()
+                             where xbt.Contains(row.Field<decimal>("DICTIONARYID").ToString())
+                             select row).Select(row => row.Field<string>("DICTIONARYVALUE")).ToList();
+                //添加检验类型中文名称(将集合按照逗号分割变为字符串)
+                bt.Rows[i][16] = string.Join(",", query);
+                //添加大小件(根据主键id查找副表第一条的计划类型)
+                bt.Rows[i][17] = lbt.AsEnumerable().Where(ex => ex.Field<decimal>("CONFIGID") == decimal.Parse(bt.Rows[i][1].ToString())).Select(row => row.Field<string>("CONFIGTYPE")).FirstOrDefault();
             }
-            if(!string.IsNullOrEmpty(form["OUTQUANTITY"]))
+            //检验类型进行排序时
+            if (sort != "" && sort == "INSPECTTYPENAME")
             {
-                sqlStr += " AND INSTR( m.OUTQUANTITY, @OUTQUANTITY@ ) > 0 ";
-                sqlPara.Add(new CDAParameter("OUTQUANTITY", form["OUTQUANTITY"]));
-            }
-            if(!string.IsNullOrEmpty(form["INSPECTIONQUANTITY"]))
-            {
-                sqlStr += " AND INSTR( m.INSPECTIONQUANTITY, @INSPECTIONQUANTITY@ ) > 0 ";
-                sqlPara.Add(new CDAParameter("INSPECTIONQUANTITY", form["INSPECTIONQUANTITY"]));
-            }
-            if(!string.IsNullOrEmpty(form["DISPLAYNO"]))
-            {
-                sqlStr += " AND INSTR( m.DISPLAYNO, @DISPLAYNO@ ) > 0 ";
-                sqlPara.Add(new CDAParameter("DISPLAYNO", form["DISPLAYNO"]));
-            }
-            if(!string.IsNullOrEmpty(form["REMARKS"]))
-            {
-                sqlStr += " AND INSTR( m.REMARKS, @REMARKS@ ) > 0 ";
-                sqlPara.Add(new CDAParameter("REMARKS", form["REMARKS"]));
-            }
-            if(sort != "")
-            {
-                sqlStr += " ORDER BY " + sort + " " + order;
+                //转化为视图
+                DataView dv = new DataView(bt);
+                //排序
+                dv.Sort = "INSPECTTYPENAME  " + order;
+                //将视图转换成表
+                bt = dv.ToTable(true, "SID", "CONFIGID", "OUTQUANTITY", "INSPECTIONQUANTITY", "MINOUTQUANTITY", "DISPLAYNO", "REMARKS", "VALUEFLAG", "ACCOUNTID", "CREATETIME", "UPDATETIME", "更新工号", "创建工号", "CLASSES", "rn", "INSPECTTYPENAME", "CONFIGTYPE");
+
             }
-            int total = 0;
-            DataTable dt = conn.SelectPages(page, rows,out total, sqlStr, sqlPara.ToArray());
-            return new JsonResult(dt) { total = total}.ToJson();
+            //查找总数
+            DataTable dt = conn.ExecuteDatatable(@"SELECT COUNT(* )FROM TP_PM_FQCCONFIG WHERE  VALUEFLAG = 1");
+            return new JsonResult(bt) { total = int.Parse(dt.Rows[0][0].ToString()) }.ToJson();
         }
     }
 
@@ -218,13 +231,13 @@ public class fqcconfig : IHttpHandler, IReadOnlySessionState
     /// <returns>json</returns>
     private string detail()
     {
-        using(IDataAccess conn= DataAccess.Create())
+        using (IDataAccess conn = DataAccess.Create())
         {
+            //通过id查找总数据
             DataTable dt = conn.ExecuteDatatable(@"
-                SELECT 
+                 SELECT 
                     m.CONFIGID,
-                    m.INSPECTTYPE,
-                    d.DICTIONARYVALUE AS INSPECTTYPENAME,
+                    m.INSPECTTYPES, 
                     m.OUTQUANTITY,
                     m.INSPECTIONQUANTITY,
                     m.MINOUTQUANTITY,
@@ -235,18 +248,38 @@ public class fqcconfig : IHttpHandler, IReadOnlySessionState
                     m.CREATEUSERID,
                     m.CREATETIME,
                     m.UPDATEUSERID,
+                    CASE WHEN  m.CLASSES = 1 THEN '一天一班' ELSE '一天二班' END AS  CLASSES,
                     m.UPDATETIME
                 FROM
-                    TP_PM_FQCCONFIG m
-                    LEFT JOIN TP_MST_DATADICTIONARY d ON m.INSPECTTYPE = d.DICTIONARYID
+                    TP_PM_FQCCONFIG m 
                 WHERE 
                     m.VALUEFLAG = '1'
                     AND m.ACCOUNTID = @ACCOUNTID@
                     AND m.CONFIGID = @CONFIGID@
                 ",
-                new CDAParameter("ACCOUNTID",HttpContext.Current.Session["accountId"]),
-                new CDAParameter("CONFIGID",HttpContext.Current.Request["id"])
+                new CDAParameter("ACCOUNTID", HttpContext.Current.Session["accountId"]),
+                new CDAParameter("CONFIGID", HttpContext.Current.Request["id"])
             );
+            //通过主表id查找副表数据
+            DataTable bt = conn.ExecuteDatatable(@"SELECT * FROM TP_PM_FQCCONFIG_DETAIL WHERE CONFIGID=@CONFIGID@ AND VALUEFLAG = 1", new CDAParameter("CONFIGID", HttpContext.Current.Request["id"]));
+            //添加大小件
+            dt.Columns.Add("CONFIGTYPE");
+            //添加检验类型中文名称
+            dt.Columns.Add("INSPECTTYPENAME");
+            //通过检验类型id查找检验类型中文名称
+            DataTable dbt = conn.ExecuteDatatable(@"SELECT DICTIONARYVALUE FROM TP_MST_DATADICTIONARY WHERE DICTIONARYID IN(" + string.Join(",", dt.AsEnumerable().Select(row => row.Field<string>("INSPECTTYPES")).ToList()) + ") AND VALUEFLAG = 1");
+            //定义临时变量
+            string linshi = "";
+            //循环查找的数据
+            for (int i = 0; i < dbt.Rows.Count; i++)
+            {
+                //进行拼接
+                linshi += dbt.Rows[i][0];
+            }
+            //补齐大小件数据(通过副表查到的数据)
+            dt.Rows[0][14] = bt.Rows[0][3];
+            //补齐检验类型中文名称
+            dt.Rows[0][15] = linshi;
             return new JsonResult(dt).ToJson();
         }
     }
@@ -257,42 +290,63 @@ public class fqcconfig : IHttpHandler, IReadOnlySessionState
     /// <returns>json</returns>
     private string insert(NameValueCollection form)
     {
-        using(IDataAccess conn= DataAccess.Create())
+        using (IDataAccess conn = DataAccess.Create())
         {
             //string primaryKey = conn.GetSequenceNextval("SEQ_TP_PM_FQCCONFIG_ID").ToString();
             //string primaryKey = Guid.NewGuid().ToString().Replace("_", "");
+            //查找(提前拿到)下一条id
+            DataTable dt = conn.ExecuteDatatable(@"SELECT SEQ_PM_FQCCONFIG_ID.nextval  FROM dual");
+            //添加数据
             int result = conn.ExecuteNonQuery(@"
-                INSERT INTO TP_PM_FQCCONFIG (
-                    --CONFIGID,
-                    INSPECTTYPE,
+                INSERT INTO TP_PM_FQCCONFIG ( 
+                    CONFIGID,
                     OUTQUANTITY,
                     MINOUTQUANTITY,
                     INSPECTIONQUANTITY,
                     DISPLAYNO,
                     REMARKS,
-                    ACCOUNTID,CREATEUSERID,UPDATEUSERID
-                ) VALUES (
-                    --@CONFIGID@,
-                    @INSPECTTYPE@,
+                    ACCOUNTID,CREATEUSERID,UPDATEUSERID,CLASSES,INSPECTTYPES 
+                ) VALUES ( 
+                    @CONFIGID@,
                     @OUTQUANTITY@,
                     @MINOUTQUANTITY@,
                     @INSPECTIONQUANTITY@,
                     @DISPLAYNO@,
                     @REMARKS@,
-                    @ACCOUNTID@,@CREATEUSERID@,@UPDATEUSERID@
-                )
-                ",
-                //new CDAParameter("CONFIGID",primaryKey),
-                new CDAParameter("INSPECTTYPE",form["INSPECTTYPE"]),
-                new CDAParameter("OUTQUANTITY",form["OUTQUANTITY"]),
-                new CDAParameter("MINOUTQUANTITY",form["MINOUTQUANTITY"]),
-                new CDAParameter("INSPECTIONQUANTITY",form["INSPECTIONQUANTITY"]),
-                new CDAParameter("DISPLAYNO",form["DISPLAYNO"]),
-                new CDAParameter("REMARKS",form["REMARKS"]),
-                new CDAParameter("ACCOUNTID",HttpContext.Current.Session["accountId"]),
-                new CDAParameter("CREATEUSERID",HttpContext.Current.Session["userId"]),
-                new CDAParameter("UPDATEUSERID",HttpContext.Current.Session["userId"])
-            );
+                    @ACCOUNTID@,@CREATEUSERID@,@UPDATEUSERID@, @CLASSES@,'" + form["INSPECTTYPES"] + "' ) ",
+            new CDAParameter("CONFIGID", dt.Rows[0][0]),
+            new CDAParameter("OUTQUANTITY", form["OUTQUANTITY"]),
+            new CDAParameter("MINOUTQUANTITY", form["MINOUTQUANTITY"]),
+            new CDAParameter("INSPECTIONQUANTITY", form["INSPECTIONQUANTITY"]),
+            new CDAParameter("DISPLAYNO", form["DISPLAYNO"]),
+            new CDAParameter("REMARKS", form["REMARKS"]),
+            new CDAParameter("ACCOUNTID", HttpContext.Current.Session["accountId"]),
+            new CDAParameter("CREATEUSERID", HttpContext.Current.Session["userId"]),
+             //班次
+             new CDAParameter("CLASSES", int.Parse(form["CLASSES"])),
+            new CDAParameter("UPDATEUSERID", HttpContext.Current.Session["userId"])
+
+        );
+            //通过检验类型去添加副表
+            foreach (var item in form["INSPECTTYPES"].Split(','))
+            {
+                int result2 = conn.ExecuteNonQuery(@"
+                INSERT INTO TP_PM_FQCCONFIG_DETAIL ( 
+                    CONFIGID,
+                    INSPECTTYPE,
+                    CONFIGTYPE,
+                    VALUEFLAG 
+                ) VALUES ( 
+                    @CONFIGID@,
+                    @INSPECTTYPE@,
+                    @CONFIGTYPE@,
+                    @VALUEFLAG@)",
+               new CDAParameter("CONFIGID", dt.Rows[0][0]),
+               new CDAParameter("INSPECTTYPE", item),
+               new CDAParameter("CONFIGTYPE", form["CONFIGTYPE"]),
+               new CDAParameter("VALUEFLAG", 1)
+           );
+            }
             return new JsonResult(JsonStatus.success).ToJson();
         }
     }
@@ -303,31 +357,61 @@ public class fqcconfig : IHttpHandler, IReadOnlySessionState
     /// <returns>json</returns>
     private string update(NameValueCollection form)
     {
-        using(IDataAccess conn=DataAccess.Create())
+        using (IDataAccess conn = DataAccess.Create())
         {
+            //通过主表id删除当前副表所关联的所有值
             int result = conn.ExecuteNonQuery(@"
+                UPDATE TP_PM_FQCCONFIG_DETAIL 
+                SET VALUEFLAG = 0 WHERE CONFIGID = @CONFIGID@ ",
+          new CDAParameter("CONFIGID", HttpContext.Current.Request["id"])
+      );
+            //更新主表
+            int result2 = conn.ExecuteNonQuery(@"
                 UPDATE TP_PM_FQCCONFIG 
                 SET
-                    INSPECTTYPE = @INSPECTTYPE@,
-                    OUTQUANTITY = @OUTQUANTITY@,
-                    MINOUTQUANTITY = @MINOUTQUANTITY@,
-                    INSPECTIONQUANTITY = @INSPECTIONQUANTITY@,
-                    DISPLAYNO = @DISPLAYNO@,
-                    REMARKS = @REMARKS@,
-                    UPDATEUSERID = @UPDATEUSERID@,
-                    UPDATETIME = sysdate
-                WHERE 
-                    CONFIGID = @CONFIGID@
-                ",
-                new CDAParameter("INSPECTTYPE",form["INSPECTTYPE"]),
-                new CDAParameter("OUTQUANTITY",form["OUTQUANTITY"]),
-                new CDAParameter("MINOUTQUANTITY",form["MINOUTQUANTITY"]),
-                new CDAParameter("INSPECTIONQUANTITY",form["INSPECTIONQUANTITY"]),
-                new CDAParameter("DISPLAYNO",form["DISPLAYNO"]),
-                new CDAParameter("REMARKS",form["REMARKS"]),
-                new CDAParameter("UPDATEUSERID",HttpContext.Current.Session["userId"]),
-                new CDAParameter("CONFIGID",HttpContext.Current.Request["id"])
+                    INSPECTTYPES = '" + form["INSPECTTYPES"] + "'," +
+                    "OUTQUANTITY = @OUTQUANTITY@, " +
+                    "MINOUTQUANTITY = @MINOUTQUANTITY@," +
+                    " INSPECTIONQUANTITY = @INSPECTIONQUANTITY@," +
+                    " DISPLAYNO = @DISPLAYNO@," +
+                    " REMARKS = @REMARKS@," +
+                    " UPDATEUSERID = @UPDATEUSERID@," +
+                    " CLASSES = @CLASSES@," +
+                    "CONFIGTYPE=@CONFIGTYPE@," +
+                    " UPDATETIME = sysdate" +
+                    "  WHERE CONFIGID = @CONFIGID@ ",
+                new CDAParameter("OUTQUANTITY", form["OUTQUANTITY"]),
+                new CDAParameter("MINOUTQUANTITY", form["MINOUTQUANTITY"]),
+                new CDAParameter("INSPECTIONQUANTITY", form["INSPECTIONQUANTITY"]),
+                new CDAParameter("DISPLAYNO", form["DISPLAYNO"]),
+                new CDAParameter("REMARKS", form["REMARKS"]),
+                //班次
+                new CDAParameter("CLASSES", form["CLASSES"]),
+                 //大小件
+                 new CDAParameter("CONFIGTYPE", form["CONFIGTYPE"]),
+                new CDAParameter("UPDATEUSERID", HttpContext.Current.Session["userId"]),
+                new CDAParameter("CONFIGID", HttpContext.Current.Request["id"])
             );
+            //通过检验类型去添加副表
+            foreach (var item in form["INSPECTTYPES"].Split(','))
+            {
+                int result3 = conn.ExecuteNonQuery(@"
+                INSERT INTO TP_PM_FQCCONFIG_DETAIL ( 
+                    CONFIGID,
+                    INSPECTTYPE,
+                    CONFIGTYPE,
+                    VALUEFLAG 
+                ) VALUES ( 
+                    @CONFIGID@,
+                    @INSPECTTYPE@,
+                    @CONFIGTYPE@,
+                    @VALUEFLAG@)",
+               new CDAParameter("CONFIGID", HttpContext.Current.Request["id"]),
+               new CDAParameter("INSPECTTYPE", item),
+               new CDAParameter("CONFIGTYPE", form["CONFIGTYPE"]),
+               new CDAParameter("VALUEFLAG", 1)
+           );
+            }
             return new JsonResult(JsonStatus.success).ToJson();
         }
     }
@@ -350,6 +434,14 @@ public class fqcconfig : IHttpHandler, IReadOnlySessionState
                     ",
                     new CDAParameter("CONFIGID", HttpContext.Current.Request["id"])
                 );
+                int result2 = conn.ExecuteNonQuery(@"
+                    DELETE 
+                        TP_PM_FQCCONFIG_DETAIL 
+                    WHERE 
+                        INSTR(',' || @CONFIGID@ || ',' , ',' || CONFIGID || ',') > 0 
+                    ",
+                new CDAParameter("CONFIGID", HttpContext.Current.Request["id"])
+            );
                 return new JsonResult(JsonStatus.success).ToJson();
             }
             else

wwwroot/mes/pm/fqcconfig/fqcconfig_add.html

@@ -37,9 +37,26 @@
             </div>
             <div id="fqcconfigMore2" style="display:block;">
                 <div class="w-div">
+                    <div class="w-fieldname">物件类型：</div>
+                    <div class="w-field">
+                        <input class="easyui-combobox w-input" id="CONFIGTYPE" name="CONFIGTYPE" data-options="required:true,prompt:'请填写大/小件...',tipPosition:'top',data:[
+		   {'text':'大件','value':'大件'},
+		   {'text':'小件','value':'小件'},
+           {'text':'型式检验','value':'型式检验'},
+		   ]  ,panelHeight:'100px',editable:false" style="width:100%;height:32px;">
+                    </div>
+                    <div class="w-fieldname">班次：</div>
+                    <div class="w-field">
+                        <input class="easyui-combobox w-input" id="CLASSES" name="CLASSES" data-options="required:true,prompt:'请填写班次...',tipPosition:'top',data:[
+		   {'text':'一天一班','value':'1'},
+		   {'text':'一天二班','value':'2'},
+		   ]  ,panelHeight:'100px',editable:false" style="width:100%;height:32px;">
+                    </div>
+                </div>
+                <div class="w-div">
                     <div class="w-fieldname">检验类型：</div>
                     <div class="w-field">
-                        <input class="easyui-combobox w-input" id="INSPECTTYPE" name="INSPECTTYPE" data-options="required:true,prompt:'请填写INSPECTTYPE...',tipPosition:'top',url:'/mes/list.ashx?m=inspecttype',method:'get',valueField:'ID',textField:'TEXT',panelHeight:'200px',editable:false" style="width:100%;height:32px;">
+                        <input class="easyui-combobox w-input" id="INSPECTTYPES" name="INSPECTTYPES" data-options="required:true,prompt:'请填写INSPECTTYPES...',tipPosition:'top',url:'/mes/list.ashx?m=inspecttype',method:'get',valueField:'ID',textField:'TEXT',panelHeight:'200px',editable:false,multiple:true" style="width:100%;height:32px;">
                     </div>
                 </div>
                 <div class="w-div">

wwwroot/mes/pm/fqcconfig/fqcconfig_detail.html

@@ -22,7 +22,7 @@
             <div class="w-div">
                 <div class="w-fieldbar" onclick="$('#fqcconfigMore1').toggle()" style="cursor:pointer;"></div>
             </div>
-            <div id="fqcconfigMore1" style="display:block;">
+            <div id="fqcconfigMore1" style="display:block;"> 
                 <div class="w-div">
                     <div class="w-fieldname">检验ID：</div>
                     <div class="w-field"><div id="CONFIGID" data-field="true" class="w-fieldvalue"></div></div>
@@ -57,8 +57,16 @@
             </div>
             <div id="fqcconfigMore2" style="display:block;">
                 <div class="w-div">
+                    <div class="w-fieldname">物件类型：</div>
+                    <div class="w-field"><div id="CONFIGTYPE" data-field="true" class="w-fieldvalue"></div></div>
+                </div>
+                <div class="w-div">
+                    <div class="w-fieldname">班次ID：</div>
+                    <div class="w-field"><div id="CLASSES" data-field="true" class="w-fieldvalue"></div></div>
+                </div>
+                <div class="w-div">
                     <div class="w-fieldname">检验类型：</div>
-                    <div class="w-field"><div id="INSPECTTYPE" data-field="true" class="w-fieldvalue"></div></div>
+                    <div class="w-field"><div id="INSPECTTYPENAME" data-field="true" class="w-fieldvalue"></div></div>
                 </div>
                 <div class="w-div">
                     <div class="w-fieldname">出窑数量：</div>

wwwroot/mes/pm/fqcconfig/fqcconfig_edit.html

@@ -60,10 +60,30 @@
                 <div class="w-fieldbar" onclick="$('#fqcconfigMore2').toggle()" style="cursor:pointer;"></div>
             </div>
             <div id="fqcconfigMore2" style="display:block;">
+
+                <div class="w-div">
+                    <div class="w-fieldname">物件类型：</div>
+                    <div class="w-field">
+                        <input class="easyui-combobox w-input" id="CONFIGTYPE" name="CONFIGTYPE" data-options="required:true,prompt:'请填写INSPECTTYPE...',tipPosition:'top',data:[
+		   {'text':'大件','value':'大件'},
+		   {'text':'小件','value':'小件'},
+           {'text':'型式检验','value':'型式检验'},
+		   ] ,panelHeight:'200px',editable:false" style="width:100%;height:32px;">
+                    </div>
+                </div>
+                <div class="w-div">
+                    <div class="w-fieldname">班次：</div>
+                    <div class="w-field">
+                        <input class="easyui-combobox w-input" id="CLASSES" name="CLASSES" data-options="required:true,prompt:'请填写INSPECTTYPE...',tipPosition:'top',data:[
+		   {'text':'一天一班','value':'1'},
+		   {'text':'一天二班','value':'21'},
+		   ],panelHeight:'200px',editable:false" style="width:100%;height:32px;">
+                    </div>
+                </div>
                 <div class="w-div">
                     <div class="w-fieldname">检验类型：</div>
                     <div class="w-field">
-                        <input class="easyui-combobox w-input" id="INSPECTTYPE" name="INSPECTTYPE" data-options="required:true,prompt:'请填写INSPECTTYPE...',tipPosition:'top',url:'/mes/list.ashx?m=inspecttype',method:'get',valueField:'ID',textField:'TEXT',panelHeight:'200px',editable:false" style="width:100%;height:32px;">
+                        <input class="easyui-combobox w-input" id="INSPECTTYPES" name="INSPECTTYPES" data-options="required:true,prompt:'请填写INSPECTTYPE...',tipPosition:'top',url:'/mes/list.ashx?m=inspecttype',method:'get',valueField:'ID',textField:'TEXT',panelHeight:'200px',editable:false,multiple:true" style="width:100%;height:32px;">
                     </div>
                 </div>
                 <div class="w-div">

wwwroot/mes/pm/fqcconfig/fqcconfig_index.html

@@ -72,6 +72,9 @@
                     <th data-options="field:'CREATETIME',title:'创建时间',align:'left',sortable:true"></th>
                     <th data-options="field:'更新工号',title:'更新工号',align:'left',sortable:true"></th>
                     <th data-options="field:'UPDATETIME',title:'更新时间',align:'left',sortable:true"></th>
+                    <th data-options="field:'CONFIGTYPE',title:'计划类型',align:'left',sortable:true"></th>
+                    <th data-options="field:'CLASSES',title:'班次配置',align:'left',sortable:true"></th>
+
                 </tr>
             </thead>
         </table>
@@ -113,9 +116,9 @@
         function fqcconfigButtonDelete_Click() {
             $('#fqcconfigDatagrid').datagridPost({
                 title:'删除操作',
-                url: 'fqcconfig.ashx?m=d',
-                onValidate: function (r) { return true; }
+                url: 'fqcconfig.ashx?m=d'
             });
+            fqcconfigButtonSearchSubmit_Click();
         }
 
         //详细按钮