xiacm 3 лет назад
Родитель
Сommit
c02a241e4f

+ 1 - 5
wwwroot/mes/pc/mouldDailyPlan/mouldDailyPlan.ashx

@@ -78,23 +78,19 @@ public class mouldDailyPlan : IHttpHandler, IReadOnlySessionState
                                           ,mdd.plan_qty
                                           ,mdd.make_qty
                                           ,mdd.remarks
-                                          ,mdd.createtime
-                                          ,mu.username
                                           ,to_char(round(mdd.make_qty / mdd.plan_qty, 4) * 100, 'fm9999999990.00') || '%' AS hasmake
                                       FROM tp_mould_dailyplandetail mdd
                                       LEFT JOIN tp_mst_goods mg
                                         ON mdd.goodsid = mg.goodsid
                                       LEFT JOIN tp_pc_groutingline gl
                                         ON mdd.groutinglineid = gl.groutinglineid
-                                      LEFT JOIN tp_mst_user mu
-                                        ON mdd.createuserid = mu.userid
                                      WHERE mdd.valueflag = 1
                                        AND mdd.planid = @planid@
                                     ";
                 List<CDAParameter> sqlPara = new List<CDAParameter>();
                 sqlPara.Add(new CDAParameter("planid", planid));
                 
-                sqlStr += " order by mdd.createtime desc ";
+                sqlStr += " order by mdd.workshop,mg.goodsname,gl.groutinglinecode ";
                 try
                 {
                     JsonResult data = Easyui.ExecuteJsonResult(conn, sqlStr, sqlPara);

+ 3 - 3
wwwroot/mes/pc/mouldDailyPlan/mouldDailyPlan_index.html

@@ -62,13 +62,13 @@
                             <th data-options="field:'SID',title:'SID',align:'center',sortable:false,hidden:true"></th>
                             <th data-options="field:'PLANDATE',title:'计划日期',align:'center',sortable:false"></th>
                             <th data-options="field:'WORKSHOP',title:'车间',align:'center',sortable:false"></th>
-                            <th data-options="field:'GOODSNAME',title:'产品型号',align:'center',sortable:false"></th>
                             <th data-options="field:'GROUTINGLINECODE',title:'成型线',align:'center',sortable:false"></th>
+                            <th data-options="field:'GOODSNAME',title:'产品型号',align:'center',sortable:false"></th>
                             <th data-options="field:'PLAN_QTY',title:'计划数量',align:'center',sortable:false"></th>
                             <th data-options="field:'MAKE_QTY',title:'生产数量',align:'center',sortable:false"></th>
                             <th data-options="field:'HASMAKE',title:'完成率',align:'center',sortable:false"></th>
-                            <th data-options="field:'USERNAME',title:'创建人',align:'center',sortable:false"></th>
-                            <th data-options="field:'CREATETIME',title:'创建时间',align:'center',sortable:false"></th>
+                            <!--<th data-options="field:'USERNAME',title:'创建人',align:'center',sortable:false"></th>
+    <th data-options="field:'CREATETIME',title:'创建时间',align:'center',sortable:false"></th>-->
                             <th data-options="field:'REMARKS',title:'备注',align:'center',sortable:false"></th>
                         </tr>
                     </thead>