feature:同步品相接口加上设备编码的过滤

src/main/java/com/qlm/controller/jinzai/ProductController.java

@@ -1,5 +1,6 @@
 package com.qlm.controller.jinzai;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -7,6 +8,7 @@ import java.util.stream.Collectors;
 import com.alibaba.fastjson.JSONObject;
 import com.jfinal.aop.Clear;
 import com.jfinal.kit.JsonKit;
+import com.jfinal.kit.StrKit;
 import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Record;
 import com.qlm.annotation.RequestUrl;
@@ -38,13 +40,20 @@ public class ProductController extends CommonController{
 	@Clear
 	public void getProduceData(){
 		JSONObject obj = new JSONObject();
-		//todo 可能会传产线ID ，没有传就全部 兼容老流程
-		List<Record> t_jz_productList = Db.find("SELECT i.sku,i.kouwei,p.product_name,i.id,i.product_id,p.xiang_num,p.tuo_num from t_jz_item i left join t_jz_product p on (i.product_id = p.id) where p.line_on = 1 and i.sku is not null");
-	
-		
+		String device_no = getPara("device_no");
+		List<Record> t_jz_productList = new ArrayList<>();
+		if(StrKit.notBlank(device_no)){
+			StringBuilder sql = new StringBuilder("SELECT i.sku, i.kouwei, p.product_name, i.id, i.product_id, p.xiang_num, p.tuo_num");
+			sql.append(" from t_jz_item i");
+			sql.append(" left join t_jz_product p on (i.product_id = p.id)");
+			sql.append(" left join t_line_product lp on (p.id = lp.product_id)");
+			sql.append(" left join t_jz_device tjd on (lp.line_id = tjd.id)");
+			sql.append(" where tjd.device_no = ? and p.line_on = 1 and i.sku is not null");
+			t_jz_productList = Db.find(sql.toString(), device_no);
+		}else{
+			t_jz_productList = Db.find("SELECT i.sku,i.kouwei,p.product_name,i.id,i.product_id,p.xiang_num,p.tuo_num from t_jz_item i left join t_jz_product p on (i.product_id = p.id) where p.line_on = 1 and i.sku is not null");
+		}
 		obj.put("products", t_jz_productList);
-		
-		
 		renderJson(obj);
 	}
 }