Просмотр исходного кода

订单手工关闭生成凭证添加来源

hu 3 лет назад
Родитель
Сommit
c2d0453dcc

+ 1 - 1
src/custom/restcontroller/webmanage/sale/invbal/SQL/未发货订单明细列表.sql

@@ -15,7 +15,7 @@ FROM sa_orderitems t1
          left join plm_unit t4 on t2.unitid=t4.unitid and t2.siteid=t4.siteid
          left join sys_enterprise t5 on t3.sys_enterpriseid=t5.sys_enterpriseid and t3.sys_enterpriseid=t5.sys_enterpriseid
          left join  sa_agents t6 on t6.sys_enterpriseid=t3.sys_enterpriseid and t3.siteid=t6.siteid
-WHERE t3.STATUS = '审核'
+WHERE t3.STATUS in ('提交','审核')
   and ifnull(t1.undeliqty, 0) !=0
   and t2.itemno=$itemno$
 	AND t1.siteid = $siteid$

+ 1 - 0
src/custom/restcontroller/webmanage/sale/order/Order.java

@@ -2415,6 +2415,7 @@ public class Order extends Controller {
             if (totalprice.compareTo(BigDecimal.ZERO) > 0) {
                 CashbillEntity entity = new CashbillEntity();
                 entity.setAmount(totalprice.negate());
+                entity.setSource("订单手工关闭");
                 entity.setOwnerid(sa_orderid);
                 entity.setOwnertable("sa_order");
                 entity.setRemarks("由"+orderRow.get(0).getString("sonum")+"订单手工关闭时自动产生");