微浦MES，PDA--修改支持采集飞达进行上料，接料，下料，并且增加SMT备料功能，线别采用虚拟线

src/com/uas/mes/api/pda/PdaSMTController.java

@@ -420,5 +420,41 @@ public class PdaSMTController extends BaseApiController{
 		return success();
 	}
 
+	/**
+	 * 工单SMT提前备料根据输入的线别编号（虚拟线别），线别只能有一条记录，根据线别编号+工单号+板面
+	 * @param has_noma true 表示无工单，false表示有工单 ，可以允许用户无工单直接用产品编号或排位表数据进行上料防呆
+	 * @return
+	 */
+	@RequestMapping(value="/getPreDeviceLine.action",method = RequestMethod.GET)
+	public ModelMap getPreDeviceLine(String li_code,String  ma_code,String dl_table,boolean has_noma){
+		return success(pdaSMTService.getPreDeviceLine(li_code,ma_code,dl_table,has_noma));
+	}
+
+
+	/**
+	 * 备料上线
+	 * @param li_code
+	 * @param ma_code
+	 * @param dl_table
+	 * @return
+	 */
+	@RequestMapping(value="/preOnline.action",method = RequestMethod.POST)
+	public ModelMap preOnline(String li_code,String  ma_code,String dl_table){
+		return success(pdaSMTService.preOnline(li_code,ma_code,dl_table));
+	}
+
+	/**
+	 * 上料前采集站位或者飞达，校验站位是否存在，是否已经上料
+	 * @param li_code
+	 * @param ma_code
+	 * @param dl_table
+	 * @param location   //飞达或者站位
+	 * @return
+	 */
+	@RequestMapping(value="/loadingCheckLoc.action",method = RequestMethod.GET)
+	public ModelMap loadingCheckLoc(String li_code,String ma_code,String dl_table,String location){
+		return success(pdaSMTService.loadingCheckLoc(li_code,ma_code,dl_table,location));
+	}
+
 
 }

src/com/uas/mes/pda/service/PdaSMTService.java

@@ -86,4 +86,10 @@ public interface PdaSMTService {
 	Map<String, Object> feederBindLocation(String fecode, String location);
 
 	Map<String, Object> feederUnBindLocation(String fecode, String location);
+
+	Map<String, Object> getPreDeviceLine(String li_code,String  ma_code,String dl_table, boolean has_noma);
+
+	Map<String, Object> preOnline(String liCode, String maCode, String dlTable);
+
+	Map<String, Object> loadingCheckLoc(String li_code,String ma_code,String dl_table,String location);
 }