标准订单及销售出库单价格计算修改bug修复

src/custom/beans/stockbill/bills/XSCK.java

@@ -418,7 +418,7 @@ public class XSCK extends BasicBill {
     public ArrayList<String> updateAccountbalance_freez(boolean addorsub) throws YosException {
         ArrayList<String> sqllist = new ArrayList<>();
         /******** 冻结数据 ********/
-        Rows rows = dbConnect.runSqlQuery("select t4.sa_accountbalanceid,t3.sa_orderid,t3.sonum,t3.type,ROUND(sum(t1.qty*(t1.price+t1.custamount)), 2) amount from st_stockbill_items t1 \n" +
+        Rows rows = dbConnect.runSqlQuery("select t4.sa_accountbalanceid,t3.sa_orderid,t3.sonum,t3.type,ROUND(sum(t1.qty*(t1.price+ifnull(t1.custamount,0))), 2) amount from st_stockbill_items t1 \n" +
                 "                   inner join sa_orderitems t2 on t1.sa_orderitemsid=t2.sa_orderitemsid and t1.siteid=t2.siteid\n" +
                 "                  inner join sa_order t3 on t2.sa_orderid=t3.sa_orderid and t2.siteid=t3.siteid\n" +
                 "\t\t\t\t\t\t\t\t\tleft join sa_accountbalance t4 on t4.sa_accountclassid=t3.sa_accountclassid and t4.sys_enterpriseid=t3.sys_enterpriseid and t4.siteid=t3.siteid\n" +

src/custom/restcontroller/webmanage/sale/sendplan/SQL/销售出库单明细新增.sql

@@ -1,4 +1,4 @@
-insert into st_stockbill_items (siteid, st_stockbill_itemsid,st_stockbillid, sa_dispatch_itemsid, rowno, itemid, qty,amount,remarks,price,sa_orderitemsid,sa_orderid,defaultprice,stockid,custamount,itemno,itemname,model,skucontrol)
+insert into st_stockbill_items (siteid, st_stockbill_itemsid,st_stockbillid, sa_dispatch_itemsid, rowno, itemid, qty,amount,remarks,price,sa_orderitemsid,sa_orderid,defaultprice,stockid,custamount,itemno,itemname,model,skucontrol,custamount)
 select $siteid$,
        $st_stockbill_itemsid$,
        $st_stockbillid$,
@@ -17,4 +17,5 @@ select $siteid$,
        $itemno$,
        $itemname$,
        $model$,
-       $skucontrol$
+       $skucontrol$,
+       $custamount$