订单提交报错修复

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

@@ -628,6 +628,7 @@ public class aftersalesmag extends Controller {
                 BigDecimal returnamount = rows.get(0).getBigDecimal("returnamount").negate();
                 CashbillEntity cashbillEntity = new CashbillEntity();
                 cashbillEntity.setAmount(returnamount);
+                cashbillEntity.setDiscountamountamount(BigDecimal.ZERO);
                 cashbillEntity.setOwnerid(sa_aftersalesmagid);
                 cashbillEntity.setOwnertable("sa_aftersalesmag");
                 cashbillEntity.setRemarks("由返退单号" + rows.get(0).getString("billno") + "复核时生成");
@@ -757,6 +758,7 @@ public class aftersalesmag extends Controller {
                 BigDecimal returnamount = rows.get(0).getBigDecimal("returnamount");
                 CashbillEntity cashbillEntity = new CashbillEntity();
                 cashbillEntity.setAmount(returnamount);
+                cashbillEntity.setDiscountamountamount(BigDecimal.ZERO);
                 cashbillEntity.setOwnerid(sa_aftersalesmagid);
                 cashbillEntity.setOwnertable("sa_aftersalesmag");
                 cashbillEntity.setRemarks("由返退单号" + rows.get(0).getString("billno") + "反复核时生成" );
@@ -948,6 +950,7 @@ public class aftersalesmag extends Controller {
                 BigDecimal returnamount = rows.get(0).getBigDecimal("returnamount");
                 CashbillEntity cashbillEntity = new CashbillEntity();
                 cashbillEntity.setAmount(returnamount);
+                cashbillEntity.setDiscountamountamount(BigDecimal.ZERO);
                 cashbillEntity.setOwnerid(sa_aftersalesmagid);
                 cashbillEntity.setOwnertable("sa_aftersalesmag");
                 cashbillEntity.setRemarks("退货单号：" + rows.get(0).getString("billno") + ";订单号：" + rows.get(0).getString("sonum"));

src/custom/restcontroller/webmanage/sale/order/Order.java

@@ -1684,7 +1684,7 @@ public class Order extends Controller {
         if(type.equals("配件订单")){
             Rows rowsdetails=dbConnect.runSqlQuery("select t1.price,t1.amount,t1.sa_orderitemsid,t1.itemid,ifnull(t2.iswriteoff,0) iswriteoff,t3.begdate,t3.enddate from sa_orderitems t1 " +
                     "left join plm_item t2 on t1.itemid=t2.itemid and t1.siteid=t2.siteid " +
-                    "left join sa_warrantycard t3 on t1.cardno=t3.cardno and t1.siteid=t3.siteid and t3.isvoid=0 and t3.deleted=0");
+                    "left join sa_warrantycard t3 on t1.cardno=t3.cardno and t1.siteid=t3.siteid and t3.isvoid=0 and t3.deleted=0 where t1.sa_orderid="+sa_orderid);
             for(Row rowsdetail :rowsdetails){
                 String billingstatus="";
                 BigDecimal price=rowsdetail.getBigDecimal("price");
@@ -1705,7 +1705,7 @@ public class Order extends Controller {
                       }
                   }
                 }
-                sqllist.add("upadte sa_orderitems set price="+price+",amount="+amount+",billingstatus='"+billingstatus+"' where sa_orderitemsid="+rowsdetail.getLong("sa_orderitemsid"));
+                sqllist.add("update sa_orderitems set price="+price+",amount="+amount+",billingstatus='"+billingstatus+"' where sa_orderitemsid="+rowsdetail.getLong("sa_orderitemsid"));
             }
         }
         dbConnect.runSqlUpdate(sqllist);
@@ -4027,6 +4027,7 @@ public class Order extends Controller {
                 System.out.println("1111");
                 CashbillEntity entity = new CashbillEntity();
                 entity.setAmount(totalprice.negate());
+                entity.setDiscountamountamount(BigDecimal.ZERO);
                 entity.setSource("订单手工关闭");
                 entity.setSourcenote(orderRow.get(0).getString("sonum"));
                 entity.setOwnerid(sa_orderid);
@@ -4042,6 +4043,7 @@ public class Order extends Controller {
                 System.out.println("222");
                 CashbillEntity entity = new CashbillEntity();
                 entity.setAmount(amount_orderaccount.negate());
+                entity.setDiscountamountamount(BigDecimal.ZERO);
                 entity.setSource("订单手工关闭");
                 entity.setSourcenote(orderRow.get(0).getString("sonum"));
                 entity.setOwnerid(sa_orderid);
@@ -4057,6 +4059,7 @@ public class Order extends Controller {
 
                 CashbillEntity promotionentity = new CashbillEntity();
                 promotionentity.setAmount((totalprice.subtract(amount_orderaccount)).negate());
+                promotionentity.setDiscountamountamount(BigDecimal.ZERO);
                 promotionentity.setSource("订单手工关闭");
                 promotionentity.setSourcenote(orderRow.get(0).getString("sonum"));
                 promotionentity.setOwnerid(sa_orderid);

src/custom/restcontroller/webmanage/sale/order/OrderItems.java

@@ -1517,6 +1517,7 @@ public class OrderItems extends Controller {
         if (ce.compareTo(BigDecimal.ZERO) != 0) {
             CashbillEntity cashbillEntity = new CashbillEntity();
             cashbillEntity.setAmount(ce);
+            cashbillEntity.setDiscountamountamount(BigDecimal.ZERO);
             cashbillEntity.setOwnerid(sa_orderid);
             cashbillEntity.setOwnertable("sa_order");
             cashbillEntity

src/custom/restcontroller/webmanage/sale/order/OrderItemsHelper.java

@@ -168,6 +168,7 @@ public class OrderItemsHelper extends BaseClass {
             //生成收入凭证
             CashbillEntity entity = new CashbillEntity();
             entity.setAmount(approvedamount);
+            entity.setDiscountamountamount(BigDecimal.ZERO);
             entity.setOwnerid(sa_orderid);
             entity.setOwnertable("sa_order");
             entity.setSource("订单自动返利");

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

@@ -809,6 +809,7 @@ public class promotion extends Controller {
                 long sa_accountclassid = accountclassrows.get(0).getLong("sa_accountclassid");
                 CashbillEntity entity = new CashbillEntity();
                 entity.setAmount(saledamount.multiply(rebateratio));
+                entity.setDiscountamountamount(BigDecimal.ZERO);
                 entity.setOwnerid(sa_promotion_authid);
                 entity.setOwnertable("sa_promotion_auth");
                 entity.setSource("返利");

src/custom/restcontroller/webmanage/sale/rebateaccount/rebateaccounthead.java

@@ -492,6 +492,7 @@ public class rebateaccounthead extends Controller {
                 if (row.getBigDecimal("approvedamount").compareTo(BigDecimal.ZERO) > 0) {
                     CashbillEntity entity = new CashbillEntity();
                     entity.setAmount(row.getBigDecimal("approvedamount"));
+                    entity.setDiscountamountamount(BigDecimal.ZERO);
                     entity.setOwnerid(row.getLong("sa_rebateaccountid"));
                     entity.setOwnertable("sa_rebateaccount");
                     entity.setSource("返利");
@@ -509,6 +510,7 @@ public class rebateaccounthead extends Controller {
                 if (row.getBigDecimal("approvedamount").compareTo(BigDecimal.ZERO) > 0) {
                     CashbillEntity entity = new CashbillEntity();
                     entity.setAmount(row.getBigDecimal("approvedamount").negate());
+                    entity.setDiscountamountamount(BigDecimal.ZERO);
                     entity.setOwnerid(row.getLong("sa_rebateaccountid"));
                     entity.setOwnertable("sa_rebateaccount");
                     entity.setSource("返利");

src/custom/restcontroller/webmanage/sale/toolbill/ToolBill.java

@@ -717,6 +717,7 @@ public class ToolBill extends Controller {
     public CashbillEntity getCashbillEntity(BigDecimal amount, Long ownerid, String source, String remarks) throws YosException {
         CashbillEntity entity = new CashbillEntity();
         entity.setAmount(amount);
+        entity.setDiscountamountamount(BigDecimal.ZERO);
         entity.setOwnerid(ownerid);
         entity.setOwnertable("sa_order");
         entity.setSource(source);

src/custom/restcontroller/webmanage/sale/transferbill/Transferbill.java

@@ -135,6 +135,7 @@ public class Transferbill extends Controller {
         sa_cashbillidList.add(cashbillIncome.getLong("sa_cashbillid"));
 
         cashbillEntity.setAmount(amount);
+        cashbillEntity.setDiscountamountamount(BigDecimal.ZERO);
         JSONObject cashbillIncome1 = Accountbalance.createCashbillIncome(this, sys_enterpriseid, inaccountclassid, cashbillEntity, true, false);
         sqlList.addAll(cashbillIncome1.getJSONArray("sqlList").toJavaList(String.class));
         sa_cashbillidList.add(cashbillIncome1.getLong("sa_cashbillid"));