#优化

lsh

2024-08-22 f418901ce81d8c403949343eb490b392b99cd86a

#优化

 src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java

@@ -78,11 +78,11 @@
                                callApiLogSave(erpDetTb, "ERP_DETTB", "品号信息在立库不存在，请先添加商品！！！", false);
                            }
                        } else {
                            Order order = orderService.selectByNo(erpDetTb.getBillNo());
                            Order order = orderService.selectByNo(erpDetTb.getBillNo()+"---"+erpDetTb.getItm());
                            if (Cools.isEmpty(order)) {
                                order = new Order(
                                        String.valueOf(snowflakeIdWorker.nextId()),    // 编号[非空]
                                        erpDetTb.getBillNo(),    // 订单编号
                                        erpDetTb.getBillNo()+"---"+erpDetTb.getItm(),    // 订单编号
                                        DateUtils.convert(now),    // 单据日期
                                        null,    // 单据类型
                                        null,    // 项目编号
@@ -128,14 +128,14 @@
                                    }
                                }
                            }
                            Order order1 = orderService.selectByNo(erpDetTb.getBillNo());
                            Order order1 = orderService.selectByNo(erpDetTb.getBillNo()+"---"+erpDetTb.getItm());
                            if (!Cools.isEmpty(order1)) {
//                                OrderDetl orderDetl = orderDetlService.selectItem(order1.getId(), erpDetTb.getBillNo(), erpDetTb.getPrdMark());
                                OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no",erpDetTb.getBillNo()).eq("matnr",erpDetTb.getPrdNo()));
                                OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no",erpDetTb.getBillNo()+"---"+erpDetTb.getItm()).eq("matnr",erpDetTb.getPrdNo()));
                                if (Cools.isEmpty(orderDetl)) {
                                    orderDetl = new OrderDetl();
                                    orderDetl.setOrderId(order1.getId());
                                    orderDetl.setOrderNo(erpDetTb.getBillNo());
                                    orderDetl.setOrderNo(erpDetTb.getBillNo()+"---"+erpDetTb.getItm());
                                    orderDetl.setAnfme(erpDetTb.getQty());
                                    orderDetl.setQty(0.0D);
                                    orderDetl.setMatnr(erpDetTb.getPrdNo());

 src/main/java/com/zy/ints/task/scheduler/LkDetTbScheduler.java

@@ -61,18 +61,23 @@
            List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L));
            if (orders.size() > 0) {
                for (Order order : orders) {

                    List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
                    if (!Cools.isEmpty(orderDetls)) {
                        for (OrderDetl orderDetl : orderDetls) {
                            String orderNo = orderDetl.getOrderNo().split("---")[0];
                            Integer itm = Integer.getInteger(orderDetl.getOrderNo().split("---")[1]);
                            Date now = new Date();
                            List<LkDetTb> lkDetTbs = erpSqlServer.select(sqlSelectLkDetTb +
                                            " and bill_no='" + orderDetl.getOrderNo() + "'" +
                                            " and bill_no='" + orderNo + "'" +
                                            " and prd_no='" + orderDetl.getMatnr() + "'" +
                                            " and ITM='" + itm + "'" +
                                            " and prd_mark='" + orderDetl.getBatch() + "'"
                                    , LkDetTb.class);
                            List<LkDetTbBak> lkDetTbBaks = erpSqlServer.select(sqlSelectLkDetTbBak +
                                            " and bill_no='" + orderDetl.getOrderNo() + "'" +
                                            " and bill_no='" + orderNo + "'" +
                                            " and prd_no='" + orderDetl.getMatnr() + "'" +
                                            " and ITM='" + itm + "'" +
                                            " and prd_mark='" + orderDetl.getBatch() + "'"
                                    , LkDetTbBak.class);
                            if (lkDetTbs.size() == 1) {
@@ -90,8 +95,9 @@
                            } else {
                                String format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(now);
                                HashMap<String, Object> condition = new HashMap<>();
                                condition.put("bill_no", "'" + orderDetl.getOrderNo() + "'");
                                condition.put("bill_no", "'" + orderNo + "'");
                                condition.put("prd_no", "'" + orderDetl.getMatnr() + "'");
                                condition.put("itm", "'" + itm + "'");

                                DocType docType = docTypeService.selectById(order.getDocType());
                                if (!Cools.isEmpty(docType)) {