欠货库存导出功能优化

src/custom/restcontroller/webmanage/sale/aftersalesmag/aftersalesmagItems.java

@@ -101,8 +101,8 @@ public class aftersalesmagItems extends Controller {
                     iteminfo.put("sa_aftersalesmag_itemsid", rowsMap.get(itemid).get(0).getLong("sa_aftersalesmag_itemsid"));
                 }
                 succ = insertOrUpdate(sa_aftersalesmagid, sqlList, i, sa_aftersalesmag_itemsid, iteminfo, status);
-                i++;
             }
+            i++;
             if (succ) {
                 return getErrReturnObject().setErrMsg("非新建状态不能添加商品").toString();
             }

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

@@ -7,11 +7,12 @@ SELECT t2.itemno,
         '0' canbesent,
         '0' canbesale,
         '0' invbalqty,
-        '0' undelqty
+        '0' undelqty,
+        '' itemclass
 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 t2.status='审核' and t2.isonsale=1
+	and ($where$) and t2.status !='新建'
 	group by t2.itemno,
        t2.itemid,
        t2.itemname,

src/custom/restcontroller/webmanage/sale/invbal/SQL/订单明细未发商品列表.sql

@@ -7,7 +7,8 @@ SELECT t2.itemno,
         '0' canbesent,
         '0' canbesale,
         '0' invbalqty,
-        '0' undelqty
+        '0' undelqty,
+         '' itemclass
 FROM sa_orderitems t1
          inner join plm_item t2 on t1.siteid = t2.siteid and t1.itemid = t2.itemid
          inner join sa_order t3 on t1.siteid=t3.siteid and t1.sa_orderid=t3.sa_orderid

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

@@ -226,44 +226,34 @@ public class invbal extends Controller {
 			String itemclass=itemclassRowsMap.get(row.getString("itemid")).toJsonArray("itemclassname").toString().substring(1,itemclassRowsMap.get(row.getString("itemid")).toJsonArray("itemclassname").toString().length()-1);
 			row.put("itemclass", itemclass.replaceAll("\"", ""));
 			if(sumQtyRowsMap.get(row.getString("itemno")).isNotEmpty()){
-				row.put("unsoldqty", sumQtyRowsMap.get(row.getString("itemno")).get(0).getBigDecimal("qty"));
+				row.put("unsoldqty", sumQtyRowsMap.get(row.getString("itemno")).get(0).getBigDecimal("qty").stripTrailingZeros().toPlainString());
 			}else {
-				row.put("unsoldqty", BigDecimal.ZERO);
+				row.put("unsoldqty", BigDecimal.ZERO.stripTrailingZeros().toPlainString());
 			}
 			if(sumUnQtyRowsMap.get(row.getString("itemno")).isNotEmpty()){
-				row.put("undelqty", sumUnQtyRowsMap.get(row.getString("itemno")).get(0).getBigDecimal("undeliqty"));
-				row.put("qty", sumUnQtyRowsMap.get(row.getString("itemno")).get(0).getBigDecimal("qty"));
+				row.put("undelqty", sumUnQtyRowsMap.get(row.getString("itemno")).get(0).getBigDecimal("undeliqty").stripTrailingZeros().toPlainString());
+				row.put("qty", sumUnQtyRowsMap.get(row.getString("itemno")).get(0).getBigDecimal("qty").stripTrailingZeros().toPlainString());
 			}else {
-				row.put("undelqty", BigDecimal.ZERO);
-				row.put("qty", BigDecimal.ZERO);
+				row.put("undelqty", BigDecimal.ZERO.stripTrailingZeros().toPlainString());
+				row.put("qty", BigDecimal.ZERO.stripTrailingZeros().toPlainString());
 			}
 			if(!row.containsKey("invbalqty")){
-				row.put("invbalqty",BigDecimal.ZERO);
+				row.put("invbalqty",BigDecimal.ZERO.stripTrailingZeros().toPlainString());
 			}
 
 		}
 		for (Row row:rows) {
-			row.put("canbesent", row.getBigDecimal("invbalqty").subtract(row.getBigDecimal("unsoldqty")));
-			row.put("canbesale", (row.getBigDecimal("invbalqty").subtract(row.getBigDecimal("unsoldqty"))).subtract(row.getBigDecimal("undelqty")));
+			row.put("canbesent", (row.getBigDecimal("invbalqty").subtract(row.getBigDecimal("unsoldqty"))).stripTrailingZeros().toPlainString());
+			row.put("canbesale", ((row.getBigDecimal("invbalqty").subtract(row.getBigDecimal("unsoldqty"))).subtract(row.getBigDecimal("undelqty"))).stripTrailingZeros().toPlainString());
 		}
 		if(isExport){
+
+
 			//去除不需要导出项
 			rows.getFieldList().remove("itemid");
 			rows.getFieldList().remove("packageqty");
 			rows.getFieldList().remove("qty");
-			//添加
-			rows.getFieldList().add("canbesent");
-			rows.getFieldList().add("canbesale");
-			rows.getFieldList().add("invbalqty");
-			rows.getFieldList().add("undelqty");
-			ArrayList<String> keylist = rows.getFieldList();
-			for (String str:
-			keylist) {
-				Class fieldclazztype = rows.getFieldMeta(str).getFieldtype();
-			}
-			System.out.println(rows.get(0).toString());
-
-			Rows uploadRows = uploadExcelToObs("invbal", "Erp欠货库存列表", rows, getTitleMap());
+			Rows uploadRows = uploadExcelToObs("invbal", "库存列表", rows, getTitleMap());
 			return getSucReturnObject().setData(uploadRows).toString();
 		}
 		return getSucReturnObject().setData(rows).toString();