From 8db40b5b6913070731476d4add5331c79dbd27b1 Mon Sep 17 00:00:00 2001 From: "lisai17@sina.com" Date: Mon, 26 Oct 2020 12:17:18 +0800 Subject: [PATCH] . --- .../order/invalidverify/OrderInvalidVerifySyncService.java | 4 ---- .../ssjygl/order/ordercluster/OrderclusterSyncService.java | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/invalidverify/OrderInvalidVerifySyncService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/invalidverify/OrderInvalidVerifySyncService.java index e57242a..9518b4f 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/invalidverify/OrderInvalidVerifySyncService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/invalidverify/OrderInvalidVerifySyncService.java @@ -31,10 +31,6 @@ public class OrderInvalidVerifySyncService { return Result.failed("只能对已收货的订单提出作废申请"); } - if (order.getInvoiceType() == 2) { - return Result.failed("专票作废只能由财务处理"); - } - OrderInvalidVerify old = OrderInvalidVerify.dao.findFirst("select * from order_invalid_verify t \n" + " where t.state = ? \n" + " and t.order_sn = ? \n" + diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterSyncService.java index f67c937..64b3d65 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterSyncService.java @@ -121,6 +121,7 @@ public class OrderclusterSyncService extends BaseSyncService { return Result.failed("未配置商品单价"); } + // 按客户查询未完成的订单量 List undonlist = OrderclusterService.me.undonlist(customer_id); if (undonlist != null && !undonlist.isEmpty()) { @@ -129,13 +130,16 @@ public class OrderclusterSyncService extends BaseSyncService { for(Record record : undonlist){ Date record_cutoff_time = record.getDate("cutoff_time"); + // 判断日期不是已经存在 if(record_cutoff_time.getTime() == cutoff_time.getTime()){ return Result.failedstr("客户[%s][%s]在砂站[%s]还有未完成的配额", customerObj.getName(), DateTimeUtil.sdfymd.get().format(cutoff_time), SvrCacheData.SUP_CACHE.get(supermarket_id).getName()); }else{ + // 累加总量 plan_total_weight = plan_total_weight.add(record.getBigDecimal("total_weight")); } } + // 按客户统计已完成量 BigDecimal overweight = OrderclusterService.me.getOverWeightByCustomer(customer_id); // 按客户找集团订单已完成量 if(plan_total_weight.subtract(overweight).multiply(unitprice).compareTo(prepayCustomer.getSurplus()) > 0 ){