goodscode 产品编码=》产品型号

wwwroot/mes/pc/materielquery/rpt.ashx

@@ -54,7 +54,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                             ds.Tables[0].Columns["Barcode"].ColumnName = "当前条码";
                             ds.Tables[0].Columns["LogoCodeName"].ColumnName = "产品商标";
                             ds.Tables[0].Columns["GoodsTypeName"].ColumnName = "产品类别";
-                            ds.Tables[0].Columns["GoodsCode"].ColumnName = "产品编码";
+                            ds.Tables[0].Columns["GoodsCode"].ColumnName = "产品型号";
                             ds.Tables[0].Columns["GoodsName"].ColumnName = "产品名称";
                             ds.Tables[0].Columns["Materialcode"].ColumnName = "物料编码";
                             ds.Tables[0].Columns["Outlabelcode"].ColumnName = "包装条码";
@@ -141,7 +141,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                 string sqlStr = @"SELECT  to_char(gdd.groutingdate,'yyyy-mm-dd') as 注浆日期
                                               ,t.fhtime         AS 交接时间
                                               ,gt.goodstypename AS 产品类型
-                                              ,g.goodscode      AS 产品编码
+                                              ,g.goodscode      AS 产品型号
                                               ,g.goodsname      AS 产品名称
                                               ,gdd.barcode      AS 产品条码
                                               ,gl.workshop || '车间' as 车间

wwwroot/mes/pc/materielquery/rpt_index.html

@@ -54,7 +54,7 @@
                             <th data-options="field:'交接时间',title:'交接时间',align:'center',sortable:false"></th>
                             <th data-options="field:'车间',title:'车间',align:'center',sortable:false"></th>
                             <th data-options="field:'产品类型',title:'产品类型',align:'center',sortable:false"></th>
-                            <th data-options="field:'产品编码',title:'产品编码',align:'center',sortable:false"></th>
+                            <th data-options="field:'产品型号',title:'产品型号',align:'center',sortable:false"></th>
                             <th data-options="field:'产品名称',title:'产品名称',align:'center',sortable:false"></th>
                             <th data-options="field:'产品条码',title:'产品条码',align:'center',sortable:false"></th>
                         </tr>

wwwroot/mes/rpt/rpt364/rpt.ashx

@@ -108,7 +108,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                             ds.Tables[0].Columns["Barcode"].ColumnName = "当前条码";
                             ds.Tables[0].Columns["LogoCodeName"].ColumnName = "产品商标";
                             ds.Tables[0].Columns["GoodsTypeName"].ColumnName = "产品类别";
-                            ds.Tables[0].Columns["GoodsCode"].ColumnName = "产品编码";
+                            ds.Tables[0].Columns["GoodsCode"].ColumnName = "产品型号";
                             ds.Tables[0].Columns["GoodsName"].ColumnName = "产品名称";
                             ds.Tables[0].Columns["Materialcode"].ColumnName = "物料编码";
                             ds.Tables[0].Columns["Outlabelcode"].ColumnName = "包装条码";

wwwroot/mes/rpt/rpt366/rpt.ashx

@@ -56,7 +56,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                 ON k.kilnid = t.kilnid
                                              WHERE t.valueflag = '1'
                                                AND t.accountid = 1
-                                               AND p.modeltype = 1 -- 登窑";
+                                               AND t.modeltype = 1 -- 登窑";
                 if (!string.IsNullOrEmpty(kilnid))
                 {
                     sqlStr += " and  t.kilnid in (" + kilnid + ") ";//-- 窑炉条件（多个）
@@ -106,7 +106,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                 string sqlStr = @"
                                 SELECT k.kilncode as 窑炉编码
                                       ,gt.goodstypename as 产品类别
-                                      ,g.goodscode as 产品编码
+                                      ,g.goodscode as 产品型号
                                       ,gdd.materialcode as 物料编码
                                       ,COUNT(t.productiondataid) as 产品数量
                                   FROM tp_pm_productiondata t
@@ -122,7 +122,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                     ON k.kilnid = t.kilnid
                                  WHERE t.valueflag = '1'
                                    AND t.accountid = 1
-                                   AND p.modeltype = 1 ";
+                                   AND t.modeltype = 1 ";
                 if (!string.IsNullOrEmpty(kilnid))
                 {
                     sqlStr += " and  t.kilnid in (" + kilnid + ") ";//-- 窑炉条件（多个）

wwwroot/mes/rpt/rpt366/rpt_index.html

@@ -26,7 +26,7 @@
                         <input class="easyui-datetimebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:165px; height:32px;">
                         - <input class="easyui-datetimebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:165px; height:32px;">
                         <span class="labelspan" style="width:235px;">产品类别<input class="easyui-combotree" id="goodstypecode" name="goodstypecode" data-options="required:false,prompt:'',tipPosition:'top',url:'../rpt.ashx?m=getGoodsType',method:'get',panelHeight:'200px',editable:true" style="width: 165px; height: 32px;"></span>
-                        产品编码：
+                        产品型号：
                         <input class="easyui-combobox" id="goodsid" name="goodsid" data-options="required:false,prompt:'',tipPosition:'top',url:'../rpt.ashx?m=getGoods&select=1',method:'get',valueField:'GOODSID',textField:'GOODSCODE',panelHeight:'300px',editable:'true',multiple:true" style="width:120px;height:32px;">
                         窑炉编码：
                         <input class="easyui-combobox" id="kilnMaster" name="kilnMaster" data-options="required:false,valueField:'value',textField:'text',editable:true,multiple:true,
@@ -48,6 +48,10 @@
                        data-options="method:'get',border:false,singleSelect:true,fit:true,fitColumns:true">
                     <thead>
                         <tr>
+                            <th data-options="field:'物料编码',title:'物料编码',align:'center',sortable:false"></th>
+                            <th data-options="field:'物料名称',title:'物料名称',align:'center',sortable:false"></th>
+                            <th data-options="field:'计划数量',title:'计划数量',align:'center',sortable:false"></th>
+                            <th data-options="field:'采购单位',title:'采购单位',align:'center',sortable:false"></th>
                         </tr>
                     </thead>
                 </table>
@@ -73,6 +77,8 @@
             var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-" + ctime.getDate() + " 23:59:59";
             $("#datebeginMaster").datetimebox("setValue", beginDate);
             $("#dateendMaster").datetimebox("setValue", endDate);
+
+            $("#materiaplan").combobox("select", '1');            
         });
 
         $("#materiaplan").combobox({
@@ -96,12 +102,11 @@
                         idField: 'SID',
                         queryParams: $('#ffMaster').serializeJson(),
                         url: 'rpt.ashx?m=0&id=' + request('id'),
-                        fixWidth: 400,
-                        mergeWidth: 280,
+                        fixWidth: 160,
+                        mergeWidth: 100,
                         splitChar: '_',
                         columnMenu: '#btnColumnMenu',
                         columnMoving: true,
-                  
                     });
 
                 }

wwwroot/mes/rpt/rpt367/rpt.ashx

@@ -22,7 +22,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                      SELECT     semi.DATACODE AS 数据节点,
                                 semi.WORKSHOP AS 车间,
                                 semi.MATERIALCODE AS 物料编码,
-                                semi.GOODSCODE AS 产品编码,
+                                semi.GOODSCODE AS 产品型号,
                                 semi.GOODSNAME AS 产品名称,
                                 COUNT(1) AS 库存量,
                                 SYSDATE AS 查询时间