[微浦MES]飞达资料界面增加更新数据

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

@@ -10,7 +10,7 @@ Ext.define('erp.controller.pm.mes.Feeder', {
     		'core.button.ResAudit','core.button.Update','core.button.TurnProdIOGet','core.button.ResSubmit',
     		'core.form.YnField','core.grid.YnColumn', 'core.grid.TfColumn','core.button.Submit','common.datalist.Toolbar',
     		'core.trigger.TextAreaTrigger','core.trigger.DbfindTrigger','core.button.Audit','common.datalist.GridPanel',
-    		'core.button.Scrap','core.button.RepairLog'
+    		'core.button.Scrap','core.button.RepairLog','core.button.Modify'
     	],
     init:function(){
     	var me = this;

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

@@ -1095,7 +1095,7 @@ public class PdaSMTServiceImpl implements PdaSMTService {
 			    rs0 = baseDao.queryForRowSet("select wm_concat(distinct dsl_location) dsl_location,count(1)cn from devsmtlocation "
 							+" where dsl_linecode=? and dsl_makecode=?  and dsl_status=0 and dsl_invalidtime is null  and dsl_table= ?"
 							+" and not exists (select 1 from productsmtlocation where  psl_psid=? and psl_table=? and "
-							+" (psl_location=dsl_location and (psl_prodcode=dsl_prodcode or psl_repcode=dsl_prodcode))) and rownum<20",
+							+" (psl_location=dsl_location and (psl_prodcode=dsl_prodcode or psl_prodcode=dsl_repcode))) and rownum<20",
 							dl_linecode,ma_oldcode,dl_table,rs.getString("ps_id"),table);
 				if(rs0.next()){
 					   if(rs0.getInt("cn") >0 ){