Browse Source

修改查询语句管理用户表 增加最小出窑数

忠帅 张 2 years ago
parent
commit
eb6970ff0f

+ 7 - 2
wwwroot/mes/pm/fqcconfig/fqcconfig.ashx

@@ -155,13 +155,15 @@ public class fqcconfig : IHttpHandler, IReadOnlySessionState
                     m.REMARKS,
                     m.VALUEFLAG,
                     m.ACCOUNTID,
-                    m.CREATEUSERID,
+                    us.USERCODE AS 创建工号,
                     m.CREATETIME,
-                    m.UPDATEUSERID,
+                    usr.USERCODE AS 更新工号,
                     m.UPDATETIME
                 FROM
                     TP_PM_FQCCONFIG m
                     LEFT JOIN TP_MST_DATADICTIONARY d ON m.INSPECTTYPE = d.DICTIONARYID
+					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@
@@ -262,6 +264,7 @@ public class fqcconfig : IHttpHandler, IReadOnlySessionState
                     --CONFIGID,
                     INSPECTTYPE,
                     OUTQUANTITY,
+                    MINOUTQUANTITY,
                     INSPECTIONQUANTITY,
                     DISPLAYNO,
                     REMARKS,
@@ -270,6 +273,7 @@ public class fqcconfig : IHttpHandler, IReadOnlySessionState
                     --@CONFIGID@,
                     @INSPECTTYPE@,
                     @OUTQUANTITY@,
+                    @MINOUTQUANTITY@,
                     @INSPECTIONQUANTITY@,
                     @DISPLAYNO@,
                     @REMARKS@,
@@ -279,6 +283,7 @@ public class fqcconfig : IHttpHandler, IReadOnlySessionState
                 //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"]),

+ 6 - 2
wwwroot/mes/pm/fqcconfig/fqcconfig_add.html

@@ -43,8 +43,12 @@
                     </div>
                 </div>
                 <div class="w-div">
-                    <div class="w-fieldname">出窑数量:</div>
-                    <div class="w-field"><input class="easyui-numberbox" id="OUTQUANTITY" name="OUTQUANTITY" data-options="required:true,prompt:'请填写OUTQUANTITY...',tipPosition:'top'" style="width:100%;height:32px;"></div>
+                    <div class="w-fieldname">最小出窑数量:</div>
+                    <div class="w-field"><input class="easyui-numberbox" id="MINOUTQUANTITY" name="MINOUTQUANTITY" data-options="required:true,prompt:'请填写最小出窑数...',tipPosition:'top'" style="width:100%;height:32px;"></div>
+                </div>
+                <div class="w-div">
+                    <div class="w-fieldname">最大出窑数量:</div>
+                    <div class="w-field"><input class="easyui-numberbox" id="OUTQUANTITY" name="OUTQUANTITY" data-options="required:true,prompt:'请填写最大出窑数...',tipPosition:'top'" style="width:100%;height:32px;"></div>
                 </div>
                 <div class="w-div">
                     <div class="w-fieldname">检验数量:</div>

+ 5 - 5
wwwroot/mes/pm/fqcconfig/fqcconfig_index.html

@@ -59,17 +59,17 @@
             <thead>
                 <tr>
                     <th data-options="field:'SID',title:'SID',width:220,align:'left',checkbox:true,hidden:true">SID</th>
-                    <th data-options="field:'CONFIGID',title:'检验ID',align:'left',sortable:true"></th>
+                    <th data-options="field:'CONFIGID',title:'检验ID',align:'left',sortable:true,hidden:true"></th>
                     <th data-options="field:'INSPECTTYPENAME',title:'检验类型',align:'left',sortable:true"></th>
                     <th data-options="field:'OUTQUANTITY',title:'出窑数量',align:'left',sortable:true"></th>
                     <th data-options="field:'INSPECTIONQUANTITY',title:'检验数量',align:'left',sortable:true"></th>
                     <th data-options="field:'DISPLAYNO',title:'显示顺序',align:'left',sortable:true"></th>
                     <th data-options="field:'REMARKS',title:'备注',align:'left',sortable:true"></th>
-                    <th data-options="field:'VALUEFLAG',title:'有效标识',align:'left',sortable:true"></th>
-                    <th data-options="field:'ACCOUNTID',title:'账套ID',align:'left',sortable:true"></th>
-                    <th data-options="field:'CREATEUSERID',title:'创建工号ID',align:'left',sortable:true"></th>
+                    <th data-options="field:'VALUEFLAG',title:'有效标识',align:'left',sortable:true,hidden:true"></th>
+                    <th data-options="field:'ACCOUNTID',title:'账套ID',align:'left',sortable:true,hidden:true"></th>
+                    <th data-options="field:'创建工号',title:'创建工号',align:'left',sortable:true,"></th>
                     <th data-options="field:'CREATETIME',title:'创建时间',align:'left',sortable:true"></th>
-                    <th data-options="field:'UPDATEUSERID',title:'更新工号ID',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>
                 </tr>
             </thead>