#

luxiaotao1123

2021-03-17 7391ec15384def3cf84c7c33c9a4e3efc4498e2a

#

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

@@ -41,6 +41,7 @@
    public static final String URI = "http://8.133.182.21:8080/api";
    public static final String GET_ORDERS = "cM/basis/getOrders";
    public static final String GET_BASIS = "cM/basis/getBasis";
    public static final String UPLOAD_BILL = "cM/basis/uploadBill";
    public static final String UPLOAD_STOCK = "cM/basis/uploadStock";

    @Autowired
@@ -365,7 +366,7 @@
                            // 表头
                            if (Cools.isEmpty(getOrderResult0.getNumber())) {
                                getOrderResult0.setNumber(number);
                                getOrderResult0.setVchType(34); // todo:luxiaotao
                                getOrderResult0.setVchType(11); // todo:luxiaotao
                                getOrderResult0.setBillDate(custOrder.getBillDate());
                                getOrderResult0.setBTypeID(custOrder.getBTypeId());
                                getOrderResult0.setKTypeID("宏挺仓库");
@@ -383,28 +384,28 @@

                    System.out.println(JSON.toJSONString(getOrderResult0));

                    int save = custOrderMapper.saveLog(getOrderResult0.getNumber());
                    if (save > 0) {
                        if (custOrderMapper.delete(new EntityWrapper<CustOrder>().eq("number", getOrderResult0.getNumber())) == 0) {
                            throw new CoolException("删除销售订单失败");

                    String response = new HttpHandler.Builder()
                            .setUri(URI)
                            .setPath(UPLOAD_BILL)
                            .setJson(JSON.toJSONString(getOrderResult0))
                            .build()
                            .doPost();
                    if (!Cools.isEmpty(response)) {
                        log.warn(response);
                        Result result = JSON.parseObject(response, Result.class);
                        if (result.getCode() != 1) {
                            return;
                        }
                        // 转历史档
                        int save = custOrderMapper.saveLog(getOrderResult0.getNumber());
                        if (save > 0) {
                            if (custOrderMapper.delete(new EntityWrapper<CustOrder>().eq("number", getOrderResult0.getNumber())) == 0) {
                                throw new CoolException("删除销售订单失败");
                            }
                            log.info("{}销售订单拣货结束", getOrderResult0.getNumber());
                        }
                    }

//                    String response = new HttpHandler.Builder()
//                            .setUri(URI)
//                            .setPath(GET_ORDERS)
//                            .setJson(JSON.toJSONString(getOrderResult0))
//                            .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;
//                        }
//                        // 转历史档
//                    }

                }
            }

 src/main/webapp/views/custOrder/custOrder.html

@@ -68,7 +68,7 @@
        <a class="layui-btn layui-btn-sm layui-btn-danger" lay-event="stockOut" style="font-size: 16px"><span style="display: none">{{d.number}}</span>拣货单</a>
    {{# } }}
    {{#if (d.status == 2 || d.status == 4){ }}
        <a class="layui-btn layui-btn-sm layui-btn-normal" lay-event="print" style="font-size: 16px">打印</a>
        <a class="layui-btn layui-btn-sm layui-btn-normal" lay-event="print" style="font-size: 16px"><span style="display: none">{{d.number}}</span>打印</a>
    {{# } }}
</script>