【英唐精密MES】【换料异常调整】

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

@@ -265,7 +265,7 @@ public class PdaSMTServiceImpl implements PdaSMTService {
 		 * @Date 2018-01-22
 		 * 校验是否湿敏条码
 		 * */
-		checkMsdBarCode(bar_code);
+		//checkMsdBarCode(bar_code);
 		//上料
 		rs = baseDao.queryForRowSet("select wm_concat(psl_repcode) repcode ,max(psl_prodcode)psl_prodcode,count(1) cn ,max(psl_feeder) psl_feeder, max(psl_baseqty) psl_baseqty from productsmtlocation "
 			+ " where  psl_psid=? and psl_location=? and psl_table=?",map.get("PS_ID"),location,map.get("DL_TABLE"));
@@ -282,9 +282,9 @@ public class PdaSMTServiceImpl implements PdaSMTService {
 		 * @Date 2018-01-22
 		 *  上料、接料、换料 更新状态为“已上线” 并记录日志
 		 * */
-		if(checkMsdBarCode(bar_code)){
-			updateMsdbarcodeOnLine(bar_code);
-		}
+//		if(checkMsdBarCode(bar_code)){
+//			updateMsdbarcodeOnLine(bar_code);
+//		}
 		//记录日志上料
 	    baseDao.execute(INSERT_SMTLOG,SystemSession.getUser().getEm_name(),"上料","上料成功,"+(has_make == -1 ? "工单":"产品")+":"+dl_macode+","+(("product").equals(type)?"物料编号":"料卷号")+":"+bar_code,linecode,location,0,ps_prodcode,("product").equals(type)?"物料"+pr_code:"料卷"+bar_code,map.get("DL_TABLE"),has_make == -1?dl_macode:"");
 	    Map<String,Object> mapR = new HashMap<String,Object>();
@@ -623,7 +623,7 @@ public class PdaSMTServiceImpl implements PdaSMTService {
 		 * @Date 2018-01-22
 		 * 校验是否湿敏条码
 		 * */
-		checkMsdBarCode(bar_code);
+		//checkMsdBarCode(bar_code);
 		double ma_qty=0;
 		rs2 = baseDao.queryForRowSet("select ma_qty from make where ma_id=?",map.get("MA_ID"));
 		if(rs2.next()){
@@ -661,9 +661,9 @@ public class PdaSMTServiceImpl implements PdaSMTService {
 		 * @Date 2018-01-22
 		 *  上料、接料、换料 更新状态为“已上线” 并记录日志
 		 * */
-		if(checkMsdBarCode(bar_code)){
-			updateMsdbarcodeOnLine(bar_code);
-		}
+//		if(checkMsdBarCode(bar_code)){
+//			updateMsdbarcodeOnLine(bar_code);
+//		}
 		//记录日志接料
 		baseDao.execute(INSERT_SMTLOG,SystemSession.getUser().getEm_name(),"接料","接料成功,"+(has_make == -1 ? "工单":"产品")+":"+ma_code+","+(("product").equals(type)?"物料编号":"料卷号")+":"+bar_code,linecode,location,0,ps_prodcode,(("product").equals(type)?"物料":"料卷")+":"+bar_code,map.get("DL_TABLE"),has_make == -1?ma_code:"");
 		Map<String,Object> mapReturn = new HashMap <String, Object>(); 
@@ -766,7 +766,7 @@ public class PdaSMTServiceImpl implements PdaSMTService {
 		 * @Date 2018-01-22
 		 * 校验是否湿敏条码
 		 * */
-		checkMsdBarCode(bar_code);
+		//checkMsdBarCode(bar_code);
 		double ma_qty=0;
 		rs0=baseDao.queryForRowSet("select ma_qty from make where ma_id=?",map.get("MA_ID"));
 		if(rs0.next()){
@@ -837,9 +837,9 @@ public class PdaSMTServiceImpl implements PdaSMTService {
 		 * @Date 2018-01-22
 		 *  上料、接料、换料 更新状态为“已上线” 并记录日志
 		 * */
-		if(checkMsdBarCode(bar_code)){
-			updateMsdbarcodeOnLine(bar_code);
-		}
+//		if(checkMsdBarCode(bar_code)){
+//			updateMsdbarcodeOnLine(bar_code);
+//		}
 	    Map<String,Object> mapReturn = new HashMap <String, Object>(); 
 		mapReturn.put("DSL_LOCATION",location);
 		mapReturn.put("DSL_BARCODE",("product").equals(type)?"":bar_code);