欠货库存查询合并成一个查询条件 产品信息（可以根据名称和编码查询）

src/custom/restcontroller/webmanage/sale/invbal/invbal.java

@@ -116,8 +116,7 @@ public class invbal extends Controller {
 	@API(title = "查询Erp库存列表", apiversion = R.ID20230408091703.v1.class)
 	public String queryErpInvbalList() throws YosException, IOException {
 		boolean isExport = content.getBooleanValue("isExport");
-		String itemno = content.getStringValue("itemno");
-		String itemname = content.getStringValue("itemname");
+		String iteminfo = content.getStringValue("iteminfo");
 		String agentinfo = content.getStringValue("agentinfo");
 		boolean all = content.getBooleanValue("all");
 		JSONArray itemclassids = content.getJSONArray("itemclassids");
@@ -126,20 +125,20 @@ public class invbal extends Controller {
 		if (isExport) {
 			sqlFactory = new SQLFactory(this,"商品列表");
 		}
-		if(!StringUtils.isBlank(itemno)){
+		if(!StringUtils.isBlank(iteminfo)){
 			sqlFactory=new SQLFactory(this,"商品列表", pageSize, pageNumber, pageSorting);
 			if (isExport) {
 				sqlFactory = new SQLFactory(this,"商品列表");
 			}
-			where=where+" or t2.itemno like '%"+itemno+"%'";
-		}
-		if(!StringUtils.isBlank(itemname)){
-			sqlFactory=new SQLFactory(this,"商品列表", pageSize, pageNumber, pageSorting);
-			if (isExport) {
-				sqlFactory = new SQLFactory(this,"商品列表");
-			}
-			where=where+" or t2.itemname like '%"+itemname+"%' ";
+			where=where+" or t2.itemno like '%"+iteminfo+"%' or t2.itemname like '%"+iteminfo+"%' ";
 		}
+//		if(!StringUtils.isBlank(itemname)){
+//			sqlFactory=new SQLFactory(this,"商品列表", pageSize, pageNumber, pageSorting);
+//			if (isExport) {
+//				sqlFactory = new SQLFactory(this,"商品列表");
+//			}
+//			where=where+" or t2.itemname like '%"+itemname+"%' ";
+//		}
 		if (itemclassids.size() > 0) {
 			sqlFactory=new SQLFactory(this,"商品列表", pageSize, pageNumber, pageSorting);
 			if (isExport) {
@@ -166,7 +165,7 @@ public class invbal extends Controller {
 				sqlFactory = new SQLFactory(this,"订单明细未发商品列表");
 			}
 			//System.out.println(StringUtils.isBlank(itemname) && StringUtils.isBlank(itemno) && itemclassids.size()==0);
-			if(StringUtils.isBlank(itemname) && StringUtils.isBlank(itemno) && itemclassids.size()==0){
+			if(StringUtils.isBlank(iteminfo) && StringUtils.isBlank(iteminfo) && itemclassids.size()==0){
 				where=where+" or 1=1 and (t6.agentnum like '%"+agentinfo+"%' or t5.enterprisename like '%"+agentinfo+"%') ";
 			}else {
 				where=where+" and (t6.agentnum like '%"+agentinfo+"%' or t5.enterprisename like '%"+agentinfo+"%') ";