From 42b021b392b9752c4520425d245213ed262c9059 Mon Sep 17 00:00:00 2001 From: zhangc <zc@123> Date: 星期六, 01 三月 2025 23:04:50 +0800 Subject: [PATCH] 四期 --- src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 32 +++++++++++++++++--------------- 1 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java index c72487c..94e67e3 100644 --- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java +++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java @@ -3,8 +3,10 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.plugins.Page; import com.core.common.Cools; +import com.zy.asrs.entity.AgvLocDetl; import com.zy.asrs.entity.DocType; import com.zy.asrs.entity.Order; +import com.zy.asrs.entity.OrderDetl; import com.zy.asrs.mapper.OrderDetlMapper; import com.zy.asrs.service.*; import com.zy.asrs.task.core.ReturnT; @@ -65,21 +67,21 @@ List<Order> orders = orderService.selectComplete(); for (Order order : orders) { //濡傛灉鏄皟鎷ㄥ崟鍒欒繘琛屽垽鏂� -// if (order.getDocType() == 33) { -// //鏌ヨ搴撳瓨涓槸鍚﹀瓨鍦ㄨ璁㈠崟鐨勭墿鏂欎俊鎭紝瀛樺湪鍒欎笉澶勭悊璇ヨ鍗� -// List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId()); -// Boolean flag = false; -// for (OrderDetl orderDetl : orderDetlList) { -// List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("matnr", orderDetl.getMatnr()).eq("three_code", orderDetl.getThreeCode())); -// if (!Cools.isEmpty(agvLocDetls)) { -// //鍙鏈変竴椤硅鍗曟槑缁嗗瓨鍦紝鍒欐爣璇嗕负true锛岃烦杩囪璁㈠崟 -// flag = true; -// } -// } -// if (flag) { -// continue; -// } -// } + if (order.getDocType() == 33) { + //鏌ヨ搴撳瓨涓槸鍚﹀瓨鍦ㄨ璁㈠崟鐨勭墿鏂欎俊鎭紝瀛樺湪鍒欎笉澶勭悊璇ヨ鍗� + List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId()); + Boolean flag = false; + for (OrderDetl orderDetl : orderDetlList) { + List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("matnr", orderDetl.getMatnr()).eq("three_code", orderDetl.getThreeCode())); + if (!Cools.isEmpty(agvLocDetls)) { + //鍙鏈変竴椤硅鍗曟槑缁嗗瓨鍦紝鍒欐爣璇嗕负true锛岃烦杩囪璁㈠崟 + flag = true; + } + } + if (flag) { + continue; + } + } ReturnT<String> result = orderSyncHandler.start(order); if (!result.isSuccess()) { //log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo()); -- Gitblit v1.9.1