Browse Source

欠货库存导出功能优化

hu 2 years ago
parent
commit
bcf029ef3b

+ 1 - 1
src/custom/restcontroller/webmanage/sale/invbal/SQL/商品列表.sql

@@ -11,7 +11,7 @@ SELECT t2.itemno,
 FROM plm_item t2
          left join plm_unit t4 on t2.unitid=t4.unitid and t2.siteid=t4.siteid
 	where t2.siteid = $siteid$
-	and ($where$)
+	and ($where$) and t2.status='审核' and t2.isonsale=1
 	group by t2.itemno,
        t2.itemid,
        t2.itemname,

+ 2 - 2
src/custom/restcontroller/webmanage/sale/invbal/invbal.java

@@ -122,9 +122,9 @@ public class invbal extends Controller {
 		boolean all = content.getBooleanValue("all");
 		JSONArray itemclassids = content.getJSONArray("itemclassids");
 		String where ="1=2";
-		SQLFactory sqlFactory =new SQLFactory(this,"订单明细未发商品列表", pageSize, pageNumber, pageSorting);
+		SQLFactory sqlFactory =new SQLFactory(this,"商品列表", pageSize, pageNumber, pageSorting);
 		if (isExport) {
-			sqlFactory = new SQLFactory(this,"订单明细未发商品列表");
+			sqlFactory = new SQLFactory(this,"商品列表");
 		}
 		if(!StringUtils.isBlank(itemno)){
 			sqlFactory=new SQLFactory(this,"商品列表", pageSize, pageNumber, pageSorting);