|
@@ -445,12 +445,14 @@ public class stockbill extends Controller {
|
|
|
|
|
|
|
|
|
|
|
|
|
ArrayList<Long> ids = rows.toArrayList("st_stockbillid", new ArrayList<>());
|
|
ArrayList<Long> ids = rows.toArrayList("st_stockbillid", new ArrayList<>());
|
|
|
- HashMap<Long, Integer> reportMap = Report.getViewCount(this, "st_stockbill", ids);
|
|
|
|
|
- for (Row row : rows) {
|
|
|
|
|
- if (reportMap.containsKey(row.getLong("st_stockbillid"))) {
|
|
|
|
|
- row.put("printcount", reportMap.get(row.getLong("st_stockbillid")));
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
|
|
+//
|
|
|
|
|
+// HashMap<Long, Integer> reportMap = Report.getViewCount(this, "st_stockbill", ids);
|
|
|
|
|
+// for (Row row : rows) {
|
|
|
|
|
+// if (reportMap.containsKey(row.getLong("st_stockbillid"))) {
|
|
|
|
|
+// row.put("printcount", reportMap.get(row.getLong("st_stockbillid")));
|
|
|
|
|
+// }
|
|
|
|
|
+// }
|
|
|
|
|
+
|
|
|
if (billtypes.contains("返修出库")) {
|
|
if (billtypes.contains("返修出库")) {
|
|
|
QuerySQL querySQLDatail = SQLFactory.createQuerySQL(this, "st_stockbill_items", "sku", "st_stockbillid").setTableAlias("t1");
|
|
QuerySQL querySQLDatail = SQLFactory.createQuerySQL(this, "st_stockbill_items", "sku", "st_stockbillid").setTableAlias("t1");
|
|
|
querySQLDatail.addJoinTable(JOINTYPE.left, "st_stockbill_items_sku", "t2", "t1.st_stockbill_itemsid=t2.st_stockbill_itemsid and t1.siteid = t2.siteid");
|
|
querySQLDatail.addJoinTable(JOINTYPE.left, "st_stockbill_items_sku", "t2", "t1.st_stockbill_itemsid=t2.st_stockbill_itemsid and t1.siteid = t2.siteid");
|
|
@@ -1832,7 +1834,7 @@ public class stockbill extends Controller {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
- public CashbillEntity getCashbillEntity(String billdate,BigDecimal amount, BigDecimal discountamount, Long ownerid, String source, String sourcenotes, String remarks) throws YosException {
|
|
|
|
|
|
|
+ public CashbillEntity getCashbillEntity(String billdate, BigDecimal amount, BigDecimal discountamount, Long ownerid, String source, String sourcenotes, String remarks) throws YosException {
|
|
|
CashbillEntity entity = new CashbillEntity(billdate);
|
|
CashbillEntity entity = new CashbillEntity(billdate);
|
|
|
entity.setAmount(amount);
|
|
entity.setAmount(amount);
|
|
|
entity.setDiscountamountamount(discountamount);
|
|
entity.setDiscountamountamount(discountamount);
|