#

luxiaotao1123

2021-04-01 b5e964367ac427a49ebfaa48d0d1517d5295bd72

 src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java

@@ -294,13 +294,15 @@
                List<GetOrderResult0> list = JSON.parseArray(result.getData(), GetOrderResult0.class);
                if (!Cools.isEmpty(list)) {
                    boolean complete = true;
                    Set<String> existNumbers = new HashSet<>();
                    for (GetOrderResult0 data : list) {
                        if (custOrderService.selectCount(new EntityWrapper<CustOrder>()
                                .eq("number", data.getNumber())
//                                .ne("bType_id", data.getBTypeID())
                                ) > 0) {
//                            log.error("{}单号已存在", data.getNumber());
                            complete = false;
//                            complete = false;
                            existNumbers.add(data.getNumber());
                            continue;
                        }
                        for (GetOrderResultDetl0 detl0 : data.getDetail()) {
@@ -309,18 +311,19 @@
                                    data.getBillDate(),    // 单据日期[非空]
                                    data.getBTypeID(),    // 客户编号
                                    data.getETypeID(),    // 经手人编号[非空]
                                    data.getVchcode(),  // 单据自增ID
                                    detl0.getUserCode(),    // 商品编号
                                    detl0.getQty(),    // 商品数量
                                    detl0.getQty(),    // 总数量
                                    detl0.getPrice(),    // 商品单价
                                    detl0.getRowNo(),       // 商品明细行号
                                    detl0.getComment(),    // 商品备注[非空]
                                    0,    // 状态
                                    now,    // 添加时间
                                    now,    // 修改时间
                                    data.getSummary()    // 备注
                            );
                            boolean insert = custOrderService.insert(custOrder);
                            if (!insert) {
                            if (!custOrderService.insert(custOrder)) {
                                complete = false;
                                log.error("保存销售订单失败！");
                            }
@@ -329,7 +332,9 @@
                    if (complete) {
                        List<String> collect = list.stream().map(GetOrderResult0::getNumber).distinct().collect(Collectors.toList());
                        for (String number : collect) {
                            custOrderService.updateStatus(number, 1);
                            if (!existNumbers.contains(number)) {
                                custOrderService.updateStatus(number, 1);
                            }
                        }
                    }

@@ -345,12 +350,12 @@
    /**
     * 完成销售订单
     */
//    @Scheduled(cron = "0/10 * * * * ? ")
    @Scheduled(cron = "0/10 * * * * ? ")
    @Transactional
//    @PostConstruct
    public void finishOrdersExecute(){
        try {
            List<CustOrder> custOrders = custOrderService.selectList(new EntityWrapper<CustOrder>().eq("status", 4));
            List<CustOrder> custOrders = custOrderService.selectList(new EntityWrapper<CustOrder>().eq("status", 4).isNotNull("vch_code"));
            if (!Cools.isEmpty(custOrders)) {
                List<String> numbers = custOrders.stream().map(CustOrder::getNumber).distinct().collect(Collectors.toList());
                for (String number : numbers) {
@@ -369,6 +374,7 @@
                                getOrderResult0.setBillDate(custOrder.getBillDate());
                                getOrderResult0.setBTypeID(custOrder.getBTypeId());
                                getOrderResult0.setKTypeID("宏挺仓库");
                                getOrderResult0.setVchcode(custOrder.getVchcode());
                            }
                            // 表体
                            GetOrderResultDetl0 detl0 = new GetOrderResultDetl0();
@@ -376,6 +382,7 @@
                            detl0.setQty(custOrder.getTotal());
                            detl0.setPrice(custOrder.getPrice());
                            detl0.setComment(custOrder.getComment());
                            detl0.setRowNo(custOrder.getRowNo());
                            list.add(detl0);
                            iterator.remove();
                        }