【万利达MES-PAD】【在线机台获取未备料站位信息】

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

@@ -303,4 +303,15 @@ public class PdaSMTController extends BaseApiController{
 	public ModelMap barcodeGetLocation(String barcode,String devicelineinfo){
 		return success(pdaSMTService.barcodeGetLocation(barcode,devicelineinfo));
 	}
+
+	/*
+	SMT-获取当前工单未备料站位信息
+	getNonMakePrepareList
+	 */
+
+	@RequestMapping(value="/getNonMakePrepareList.action")
+	public ModelMap getNonMakePrepareList(String devicelineinfo){
+		return success(pdaSMTService.getNonMakePrepareList(devicelineinfo));
+	}
+
 }

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

@@ -65,4 +65,7 @@ public interface PdaSMTService {
 	void updateMakePrepare(String id);
 
 	Map<String, Object> barcodeGetLocation(String barcode,String devicelineinfo);
+
+
+	List<Map<String, Object>> getNonMakePrepareList(String devicelineinfo);
 }

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

@@ -1881,4 +1881,20 @@ public class PdaSMTServiceImpl implements PdaSMTService {
 					}
 				}
 		}
+
+	@Override
+	public List<Map<String, Object>> getNonMakePrepareList(String devicelineinfo) {
+
+		Map<Object, Object> map = FlexJsonUtil.fromJson(devicelineinfo);
+		Object dl_macode = map.get("DL_MACODE");
+		Object linecode= map.get("DL_LINECODE");
+		Object table = map.get("DL_TABLE");
+		Object ps_prodcode = map.get("DL_PRODCODE");
+
+		SqlRowList rs;
+		rs = baseDao.queryForRowSet("select psl_location,psl_prodcode,wm_concat(case when psl_repcode = psl_prodcode then '' else psl_repcode end) psl_repcode from (select  psl_location,psl_prodcode, psl_repcode from PRODUCTSMTLOCATION left join PRODUCTSMT on ps_id = psl_psid where ps_prodcode = ? and ps_linecode = ? and ps_table = ? and not EXISTS (select 1 from  MakePrepareDetail left join  MakePrepare on md_mpid = mp_id where mp_prodcode= ps_prodcode and mp_linecode = ps_linecode and mp_table = ps_table and  md_location = psl_location and md_barcode is not null and mp_status <> '已审核' AND mp_makecode = ?) group by  psl_location, psl_prodcode,psl_repcode)group by  psl_location, psl_prodcode",ps_prodcode,linecode,table,dl_macode);
+		// select psl_location,psl_prodcode,wm_concat(case when psl_repcode = psl_prodcode then '' else psl_repcode end) psl_repcode from (select  psl_location,psl_prodcode, psl_repcode from PRODUCTSMTLOCATION left join PRODUCTSMT on ps_id = psl_psid where ps_prodcode = '310106900001_B00005' and ps_linecode = 'SMT-09' and ps_table = 'B' and not EXISTS (select 1 from  MakePrepareDetail left join  MakePrepare on md_mpid = mp_id where mp_prodcode= ps_prodcode and mp_linecode = ps_linecode and mp_table = ps_table and  md_location = psl_location and md_barcode is not null and mp_status <> '已审核' AND mp_makecode = '310106900001_B00005') group by  psl_location, psl_prodcode,psl_repcode)group by  psl_location, psl_prodcode
+
+		return rs.getResultList();
+	}
 }