Merge remote-tracking branch 'origin/mes_malata_prod' into mes_malata_prod

WebContent/app/view/scm/product/ProductSNRule.js

@@ -81,7 +81,7 @@ Ext.define('erp.view.scm.product.ProductSNRule',{
 			            }
 					},{
 						style :"text-align:center",
-						text: '<font color="red">长度</font>',
+						text: '长度',
 						logic:"necessaryField",
 						width: 80,
 						dataIndex: 'psr_length',
@@ -144,7 +144,7 @@ Ext.define('erp.view.scm.product.ProductSNRule',{
 						fields: ['psr_id', 'psr_type', 'psr_prefix', 'psr_length', 'psr_inman','psr_indate'],
 						data: [{},{}]
 					}),
-					necessaryFields:['psr_prefix', 'psr_length','psr_type'],
+					necessaryFields:['psr_prefix','psr_type'],
 					deleteRecord: function(record) {
 						if(record.get('psr_id') && record.get('psr_id') >= 0) {
 							var grid = this, url = "scm/product/deleteProductSNRuleDetail.action";

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

@@ -1297,6 +1297,10 @@ public class PdaSMTServiceImpl implements PdaSMTService {
 			 meg = "校验失败";
 		 }
 		 baseDao.execute(INSERT_SMTLOG,SystemSession.getUser().getEm_name(),"校验",meg+",料号："+prodcode,linecode,location,i,map.get("DL_PRODCODE"),"",map.get("DL_TABLE"),Integer.valueOf(returnMake(linecode,dl_prodcode,map.get("DL_TABLE")).get("hasmake").toString()) == -1 ? returnMake(linecode,dl_prodcode,map.get("DL_TABLE")).get("macode"):"");
+		if(success)
+		{
+			  baseDao.execute("update smtmessagelog  set sml_confirm = -1 where sml_linecode  = '"+linecode+"' and sml_type = '接料原物料号校验' and sml_location = '"+location+"' and sml_date > sysdate-1/2 and sml_table = '"+map.get("DL_TABLE")+"'");
+		}
 		 //ps_id,table,linecode,ma_code,table
 		 Map<String,Object> mapR = new HashMap <String, Object>();
 		 rs=baseDao.queryForRowSet("select * from (select psl_location from(select min(psl_detno)psl_detno,psl_location from productsmtlocation "
@@ -1324,7 +1328,7 @@ public class PdaSMTServiceImpl implements PdaSMTService {
 				baseDao.execute("update deviceline set dl_checkcount=nvl(dl_checkcount,0)+1 where dl_id=?",dl_id);
 				baseDao.execute("update devsmtlocation set dsl_ifcheck = 0 where dsl_linecode=? and dsl_makecode=? and dsl_table=? and dsl_status=0",linecode,ma_code,table);
 				baseDao.execute(INSERT_SMTLOG,SystemSession.getUser().getEm_name(),"校验","完成一次校验",linecode,"",0,map.get("DL_PRODCODE"),"",map.get("DL_TABLE"),Integer.valueOf(returnMake(linecode,dl_prodcode,map.get("DL_TABLE")).get("hasmake").toString()) == -1 ? returnMake(linecode,dl_prodcode,map.get("DL_TABLE")).get("macode"):"");
-                baseDao.execute("update smtmessagelog  set sml_confirm = -1 where sml_linecode  = '"+linecode+"' and sml_type = '接料原物料号校验' and sml_location = '"+location+"' and sml_date > sysdate-1/3 and sml_table = '"+map.get("DL_TABLE")+"'");
+              
 			}
 		}
 		 return mapR;
@@ -1469,7 +1473,7 @@ public class PdaSMTServiceImpl implements PdaSMTService {
 				SqlRowList rs = baseDao.queryForRowSet("select dl_prodcode,dl_table from deviceline where dl_linecode = ?",linecode);
 				if(rs.next()){
 					baseDao.execute(INSERT_SMTLOG,SystemSession.getUser().getEm_name(),"校验","重新校验",linecode,"",0,rs.getString("dl_prodcode"),"",rs.getString("dl_table"),Integer.valueOf(returnMake(linecode,rs.getString("dl_prodcode"),rs.getString("dl_table")).get("hasmake").toString()) == -1 ? returnMake(linecode,rs.getString("dl_prodcode"),rs.getString("dl_table")).get("macode"):"");
-                    baseDao.execute("update smtmessagelog  set sml_confirm = -1 where  sml_type = '接料原物料号校验' and sml_linecode  = '"+linecode+"' and sml_date > sysdate-1/3 and sml_table = '"+rs.getString("dl_table")+"'");
+                    baseDao.execute("update smtmessagelog  set sml_confirm = -1 where  sml_type = '接料原物料号校验' and sml_linecode  = '"+linecode+"' and sml_date > sysdate-1/2 and sml_table = '"+rs.getString("dl_table")+"'");
 				}
 			 return unLoading(linecode);
 		}