李士越 пре 10 месеци
родитељ
комит
7cee19c6c4
2 измењених фајлова са 9 додато и 7 уклоњено
  1. 4 4
      wwwroot/mes/rpt/rpt041/rpt.ashx
  2. 5 3
      wwwroot/mes/rpt/rpt041/rpt_index.html

+ 4 - 4
wwwroot/mes/rpt/rpt041/rpt.ashx

@@ -26,9 +26,9 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 	pfirst.username  PFIRSTUSERNAME, 
     (SELECT GOODSLEVELNAME FROM TP_MST_GOODSLEVEL WHERE GOODSLEVELID= pfirst.goodsleveltypeid) PFIRSTGOODSLEVE ,
 	(SELECT GOODSLEVELNAME FROM TP_MST_GOODSLEVEL WHERE GOODSLEVELID= pd.goodsleveltypeid) PDGOODSLEVE ,
-	sec.createtime  SECCREATETIME, 
--- 	sec.usercode AS 复检工号,
--- 	sec.username AS 复检姓名,
+	pd.createtime  PDCREATETIME, 
+ 	pd.usercode PDUSERCODE,
+ 	pd.username PDUSERNAME,
 	pd.BARCODE 
 FROM
 	tp_pm_productiondata_semicheck sec
@@ -39,7 +39,7 @@ FROM
 	LEFT JOIN TP_MST_GOODS goods ON goods.GOODSCODE = pd.GOODSCODE
 	LEFT JOIN TP_MST_LOGO logo ON logo.LOGOID = pd.LOGOID 
 	LEFT JOIN tp_pm_groutingdailydetail g ON g.groutingdailydetailid = pfirst.groutingdailydetailid
-	LEFT JOIN tp_mst_datadictionary d ON g.glazetypeid = d.dictionaryid 
+	LEFT JOIN tp_mst_datadictionary d ON g.glazetypeid = d.dictionaryid  
 WHERE
 	sec.valueflag = 1 ";
                 if (context.Request["firstdatebeginMaster"].ToString()!="")

+ 5 - 3
wwwroot/mes/rpt/rpt041/rpt_index.html

@@ -41,16 +41,18 @@
 			<thead>
 				<tr>
 					<th data-options="field:'ROWNO',title:'序号',width:220,align:'center',checkbox:true,hidden:true">SID</th>
-					<th data-options="field:'GOODSCODE',title:'产品编码',width:100,align:'center',sortable:false"></th>
+					<th data-options="field:'GOODSCODE',title:'产品编码',width:220,align:'center',sortable:false"></th>
 					<th data-options="field:'GOODSNAME',title:'产品名称',width:220,align:'center',sortable:false"></th>
 					<th data-options="field:'DICTIONARYVALUE',title:'釉料',width:220,align:'center',sortable:false"></th>
 					<th data-options="field:'LOGONAME',title:'商标',width:220,align:'center',sortable:false"></th>
 					<th data-options="field:'PFIRSTCREATETIME',title:'首检日期',width:220,align:'center',sortable:false"></th>
 					<th data-options="field:'PFIRSTUSERCODE',title:'首检工号',width:220,align:'center',sortable:false"></th>
 					<th data-options="field:'PFIRSTUSERNAME',title:'首检姓名',width:220,align:'center',sortable:false"></th>
-					<th data-options="field:'PFIRSTGOODSLEVE',title:'首检质量',width:330,align:'center',sortable:false"></th>
+					<th data-options="field:'PFIRSTGOODSLEVE',title:'首检质量',width:220,align:'center',sortable:false"></th>
 					<th data-options="field:'PDGOODSLEVE',title:'复检质量',width:220,align:'center',sortable:false"></th>
-					<th data-options="field:'SECCREATETIME',title:'复检日期',width:220,align:'center',sortable:false"></th>
+					<th data-options="field:'PDCREATETIME',title:'复检日期',width:220,align:'center',sortable:false"></th>
+					<th data-options="field:'PDUSERCODE',title:'复检工号',width:220,align:'center',sortable:false"></th>
+					<th data-options="field:'PDUSERNAME',title:'复检姓名',width:220,align:'center',sortable:false"></th>
 					<th data-options="field:'BARCODE',title:'产品条码',width:220,align:'center',sortable:false"></th>
 				</tr>
 			</thead>