【微浦MES】飞达模块调整

WebContent/app/view/pm/mes/Feeder.js

@@ -29,7 +29,7 @@ Ext.define('erp.view.pm.mes.Feeder',{
 					anchor: '100% 65%', 
 					items:[{
 						xtype: 'erpGridPanel2',
-						title:'保养维修记录',
+						title:'飞达操作记录',
 						anchor: '100% 65%', 
 						keyField: 'fl_id',
 						mainField: 'fl_feid',
@@ -120,12 +120,7 @@ Ext.define('erp.view.pm.mes.Feeder',{
 						    },
 						    buffered: true,
 						    sync: true		
-					},{
-						title:'使用记录',
-						items: [],
-						layout: 'anchor',
-						id: 'tab-list'
-					}]			
+					}]
 				}]
 			}] 
 		}); 

src/com/uas/mes/pda/service/impl/PdaSMTServiceImpl.java

@@ -302,6 +302,8 @@ public class PdaSMTServiceImpl implements PdaSMTService {
 		}
 		//更新飞达所在站位
 		baseDao.updateByCondition("feeder","fe_location='"+ location + "'","fe_code='"+fe_code+"'");
+		baseDao.execute("insert into feederlog(fl_id,fl_fecode,fl_feid,fl_type,fl_remark,fl_item,fl_man,fl_date)" +
+				" select  feederlog_seq.nextval,'"+fe_code+"',fe_id,'上料','上料至工单:"+dl_macode+",站位:"+location+"','条码:"+bar_code+"','"+SystemSession.getUser().getEm_name()+"',sysdate from feeder where fe_code = '"+fe_code+"'");
 		double ma_qty=0;
 		rs = baseDao.queryForRowSet("select ma_qty from make where ma_id=?",map.get("MA_ID"));
 		if(rs.next()){