#

luxiaotao1123

2021-04-22 96b3548131415a2a036d1514a9a0d046f3facdb5

#

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

@@ -638,57 +638,4 @@

    }

    /**
     * 上传销售订单取消结果
     */
    @Scheduled(cron = "0/5 * * * * ? ")
    @Transactional
//    @PostConstruct
    public void uploadCancelOrdersExecute(){
//        try {
//            List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 3).isNotNull("number"));
//            if (Cools.isEmpty(orders)) {
//                return;
//            }
//            Map<String, Object> json = new HashMap<>();
//            List<UploadCancelResult> list = new ArrayList<>();
//            for (CustOrder custOrder : custOrders) {
//                UploadCancelResult result = new UploadCancelResult();
//                result.setNumber(custOrder.getNumber());
//                result.setUserCode(custOrder.getUserCode());
//                result.setQty(custOrder.getTotal());
//                result.setStatus(1);
//                list.add(result);
//            }
//            json.put("data", list);
//            String response = new HttpHandler.Builder()
//                    .setUri(URI)
//                    .setPath(UPLOAD_CANCEL_RESULT)
//                    .setJson(JSON.toJSONString(json))
//                    .build()
//                    .doPost();
//            if (!Cools.isEmpty(response)) {
////                log.info(response);
//                Date now = new Date();
//                Result result = JSON.parseObject(response, Result.class);
//                if (result.getCode() != 1) {
//                    return;
//                }
//                for (UploadCancelResult result1 : list) {
//                    // 转历史档
//                    int save = custOrderMapper.saveLog(result1.getNumber(), result1.getUserCode());
//                    if (save > 0) {
//                        if (custOrderMapper.delete(new EntityWrapper<CustOrder>().eq("number", result1.getNumber()).eq("user_code", result1.getUserCode())) == 0) {
//                            throw new CoolException("删除销售订单失败");
//                        }
//                    }
//                }
//            }
//        } catch (IOException e) {
//            e.printStackTrace();
//            throw new RuntimeException(e.getMessage());
//        }

    }

}

 src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java

@@ -239,6 +239,13 @@
        if (Cools.isEmpty(orderDetls)) {
            return R.error("此单据已失效，请联系管理员");
        }
        for (OrderDetl orderDetl : orderDetls) {
            try {
                Integer.parseInt(String.valueOf(orderDetl.getAnfme()));
            } catch (Exception e) {
                return R.error(orderDetl.getMaktx() + "数量必须为整数");
            }
        }
        OrderStoDto dto = new OrderStoDto().create(order.getOrderNo(), orderDetls);
        // 开始整理出库数据
        mainService.stockOutProcess(dto);