bug修复

src/custom/restcontroller/sale/cashbill/SQL/收支凭证详情查询.sql

@@ -26,6 +26,7 @@ SELECT t1.sa_cashbillid,
        t1.class,
        t1.balance,
        t1.period,
+       t1.billdate,
        (t1.amount - t1.writeoffamount) unwriteoffamount,
        t4.billno                       offsettingbillno
 FROM sa_cashbill t1

src/custom/restcontroller/sale/cashbill/cashbill.java

@@ -304,7 +304,7 @@ public class cashbill extends Controller {
     public String insertormodify_creditbill() throws YosException {
         Long sa_cashbillid = content.getLong("sa_cashbillid");
         Long type = content.getLong("type"); //收支类型（1:收；0:支）
-//        Long sys_enterpriseid = content.getLong("sys_enterpriseid");
+        Long sys_enterpriseid = content.getLong("sys_enterpriseid");
         Long sa_accountclassid = content.getLong("sa_accountclassid");
         String billcode = "";
         if (type == 1) {

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

@@ -372,8 +372,8 @@ public class stockbill extends Controller {
             }
         }
         if(billtypes.contains("返修出库")){
-            QuerySQL querySQLDatail = SQLFactory.createQuerySQL(this, "st_stockbill_items", "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 ","sku");
+            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, "plm_item", "t3", "t3.itemid=t1.itemid and t3.siteid = t1.siteid ","itemno","itemname","spec","model");
             querySQLDatail.setWhere("t1.st_stockbillid",ids);
             Rows rowsdatail = querySQLDatail.query();