From 3b3558434a76d6db3aaf640871e999b098da1ff8 Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期三, 16 七月 2025 15:23:25 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 26 +++++++++++-- src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 70 ++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java index 44551b7..81d5769 100644 --- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java +++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java @@ -94,8 +94,26 @@ @Scheduled(cron = "0/5 * * * * ? ") @Async("orderThreadPool") - //@Scheduled(cron = "0/5 * * * * ? ") - //@Async("orderThreadPool") + public void completeAndReportOrderInAndOutUtil3() { +// String erpReport = Parameter.get().getErpReport(); +// if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) { + List<Order> orders = OrderInAndOutUtil.selectComplete(null); + for (Order order : orders) { + try { + ReturnT<String> result = orderSyncHandler.checkDBDD(order); + if (!result.isSuccess()) { + log.error("闆嗗洟鍐呴儴璋冩嫧鍗曟嵁[orderNo={}]杞笂鎶ヨ〃澶辫触", order.getOrderNo()); + } + } catch (Exception e) { + e.printStackTrace(); + log.error("闆嗗洟鍐呴儴璋冩嫧鍗曟嵁[orderNo={}]杞笂鎶ヨ〃澶辫触", order.getOrderNo()); + } + } +// } + } + + @Scheduled(cron = "0/5 * * * * ? ") + @Async("orderThreadPool") public void completeAndReportOrderInAndOutUtil2() { // String erpReport = Parameter.get().getErpReport(); // if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) { @@ -104,11 +122,11 @@ try { ReturnT<String> result = orderSyncHandler.checkXSFH(order); if (!result.isSuccess()) { - log.error("鍗曟嵁[orderNo={}]杞笂鎶ヨ〃澶辫触", order.getOrderNo()); + log.error("閿�鍞彂璐у崟鎹甗orderNo={}]杞笂鎶ヨ〃澶辫触", order.getOrderNo()); } } catch (Exception e) { e.printStackTrace(); - log.error("鍗曟嵁[orderNo={}]杞笂鎶ヨ〃澶辫触", order.getOrderNo()); + log.error("閿�鍞彂璐у崟鎹甗orderNo={}]杞笂鎶ヨ〃澶辫触", order.getOrderNo()); } } // } diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java index c2692bd..c5ed98c 100644 --- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java @@ -131,7 +131,7 @@ if (null == docType) { return SUCCESS; } - if (docType.getDocName().equals("閿�鍞彂璐�")) { + if (docType.getDocName().equals("閿�鍞彂璐�") || docType.getDocName().equals("闆嗗洟鍐呴儴璋冩嫧")) { return SUCCESS; } Order orderSou = orderService.selectByNo(order.getOrderNo()); @@ -243,6 +243,74 @@ return SUCCESS; } + @Transactional + public ReturnT<String> checkDBDD(Order order) { + DocType docType = docTypeService.selectById(order.getDocType()); + if (null == docType) { + return SUCCESS; + } + if (!docType.getDocName().equals("闆嗗洟鍐呴儴璋冩嫧")) { + return SUCCESS; + } + Order orderSou = orderService.selectByNo(order.getOrderNo()); + if (!orderSou.getSettle().equals(2L)) { + return FAIL.setMsg("璁㈠崟鐘舵�佷笉姝g‘锛岃鑱旂郴绠$悊鍛�"); + } + + List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId()); + boolean complete = true; + for (OrderDetl orderDetl : orderDetls) { + if (orderDetl.getAnfme() > orderDetl.getQty()) { + complete = false; + break; + } + } + if (complete) { + List<OrderDetl> old = orderDetlService.selectByOrderId(orderSou.getId()); + if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_no", order.getOrderNo()))) { + throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�"); + } + List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNo(order.getOrderNo()); + for (WrkDetl wrkDetl : wrkDetls) { + OrderDetl orderDetl = new OrderDetl(); + orderDetl.sync(wrkDetl); + orderDetl.setQty(wrkDetl.getAnfme()); + orderDetl.setOrderId(orderSou.getId()); + orderDetl.setOrderNo(orderSou.getOrderNo()); + orderDetl.setStatus(1); + orderDetl.setCreateTime(orderSou.getCreateTime()); + orderDetl.setCreateBy(orderSou.getCreateBy()); + orderDetl.setUpdateTime(orderSou.getUpdateTime()); + orderDetl.setUpdateBy(orderSou.getUpdateBy()); + orderDetl.setId(null); + //鍏堟寜鐓ф壒娆″尮閰嶏紝鍐嶆寜鐓ф棤鎵规鍙锋壒娆★紝鍥犱负閿�鍞彂璐э紝鎵规鍙峰彲鑳藉甫锛屾湁鍙兘涓嶆惡甯︼紝鎵�浠ュ氨浼氭湁闂锛涜�屼笖鑰冭檻鍒颁竴鏉¤鍗曢噷濡傛灉鐩稿悓鐗╂枡锛屼竴鏉″甫鎵规锛屼竴鏉′笉甯︽壒娆★紝鎯呭喌 + for (OrderDetl xxx : old) { + if (xxx.beSimilar(wrkDetl)) { + orderDetl.setRemark(xxx.getRemark()); + } + } + if (Cools.isEmpty(orderDetl.getRemark())) { + for (OrderDetl xxx : old) { + if (xxx.beSimilarByWrkDetl(wrkDetl)) { + orderDetl.setRemark(xxx.getRemark()); + } + } + } + if (!orderDetlService.insert(orderDetl)) { + throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�"); + } + } + + // 淇敼璁㈠崟鐘舵�� 2.浣滀笟涓� ===>> 4.寰呬笂鎶� + if (!orderService.updateSettle(orderSou.getId(), 4L, null)) { + throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳"); + } + // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.缁撴潫 + OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(), order.getId(), 6L, null); + } + return SUCCESS; + } + @Transactional public ReturnT<String> startOrderReport(Order order) { -- Gitblit v1.9.1