关闭与erp的对接

zhang

5 天以前 63676447b730800bc7ba3df060bf867713db98f4

 src/main/java/com/zy/asrs/controller/OrderController.java

@@ -1,6 +1,7 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.enums.SqlLike;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
@@ -220,16 +221,20 @@
    @RequestMapping(value = "/order/detls/pakin/page/auth/v2")
    @ManagerAuth
    public R orderDetlsV2(@RequestParam(defaultValue = "1") Integer curr,
                        @RequestParam(defaultValue = "100") Integer limit,
                        @RequestParam(required = false) String orderByField,
                        @RequestParam(required = false) String orderByType,
                        @RequestParam Map<String, Object> param) {
                          @RequestParam(defaultValue = "100") Integer limit,
                          @RequestParam(required = false) String orderByField,
                          @RequestParam(required = false) String orderByType,
                          @RequestParam Map<String, Object> param) {
        EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        Object o = param.get("orderType");
        if (o != null) {
            String[] split = o.toString().split(",");
            wrapper.in("source", split);
            if (split[0].equals("39")) {
                wrapper.andNew().like("matnr", "401", SqlLike.RIGHT).or().like("matnr", "402", SqlLike.RIGHT).andNew().in("source", split);
            } else {
                wrapper.in("source", split);
            }
            param.remove("orderType");
        }
        convert(param, wrapper);
@@ -240,7 +245,6 @@
//                docIds.add(pakin.getDocId());
//            }
//        }

        return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
    }

@@ -299,10 +303,11 @@
        List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakin", 1));
        List<Long> docIds = new ArrayList<>();
        for (DocType pakin : pakins) {
            if (pakin.getDocId() == 36||pakin.getDocId() == 39) {
            if (pakin.getDocId() == 36 || pakin.getDocId() == 39 || pakin.getDocId() == 19) {
                docIds.add(pakin.getDocId());
            }
        }
        wrapper.like("matnr", "50", SqlLike.RIGHT);
        wrapper.in("source", docIds);
        return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
    }
@@ -348,6 +353,7 @@
                docIds.add(pakin.getDocId());
            }
        }
        wrapper.notLike("matnr", "401", SqlLike.RIGHT).notLike("matnr", "402", SqlLike.RIGHT);
        wrapper.in("source", docIds);
        Page<OrderDetl> page = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
        for (OrderDetl record : page.getRecords()) {
@@ -361,10 +367,10 @@
    @RequestMapping(value = "/order/bcpDb/detls/pakin/page/auth/v2")
    @ManagerAuth
    public R bcpDbOrderDetlsV2(@RequestParam(defaultValue = "1") Integer curr,
                             @RequestParam(defaultValue = "100") Integer limit,
                             @RequestParam(required = false) String orderByField,
                             @RequestParam(required = false) String orderByType,
                             @RequestParam Map<String, Object> param) {
                               @RequestParam(defaultValue = "100") Integer limit,
                               @RequestParam(required = false) String orderByField,
                               @RequestParam(required = false) String orderByType,
                               @RequestParam Map<String, Object> param) {
        EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        Object o = param.get("orderType");
@@ -382,10 +388,11 @@
//                docIds.add(pakin.getDocId());
//            }
//        }
        //wrapper.in("source", docIds);
        wrapper.like("order_no", "DC", SqlLike.RIGHT);
        //     wrapper.in("source", docIds);
        Page<OrderDetl> page = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
        for (OrderDetl record : page.getRecords()) {
            Double sumAnfme = agvLocDetlService.getSumAnfmeDb(record.getMatnr(), record.getThreeCode(), 1);
            Double sumAnfme = agvLocDetlService.getSumAnfmeDb2(record.getMatnr(), record.getThreeCode(), 1);
            record.setStock(sumAnfme == null ? 0 : sumAnfme);
        }
        return R.ok(page);
@@ -434,6 +441,14 @@
            return R.error("单据编号已存在");
        }
        Date now = new Date();
        if (param.getDocType() == 33) {
            for (OrderDetl orderDetl : param.getOrderDetlList()) {
                if (orderDetl.getMatnr().startsWith("401") || orderDetl.getMatnr().startsWith("402")) {
                    param.setOrderNo("DC" + param.getOrderNo());
                    break;
                }
            }
        }
        order = new Order(
                String.valueOf(snowflakeIdWorker.nextId()),    // 编号[非空]
                param.getOrderNo(),    // 订单编号
@@ -551,9 +566,15 @@
            }
        }
        if (param.getDocType().intValue() == 32) {
            String ono = "DB";
            for (OrderDetl orderDetl : param.getOrderDetlList()) {
                if (orderDetl.getMatnr().startsWith("401") || orderDetl.getMatnr().startsWith("402")) {
                    ono = "DC";
                }
            }
            order = new Order(
                    String.valueOf(snowflakeIdWorker.nextId()),    // 编号[非空]
                    "DB" + param.getOrderNo(),    // 订单编号
                    ono + param.getOrderNo(),    // 订单编号
                    DateUtils.convert(now),    // 单据日期
                    33L,    // 单据类型
                    null,    // 项目编号
@@ -941,13 +962,17 @@
    }

    @RequestMapping(value = "/order/update/auth")
    @ManagerAuth
    @ManagerAuth(memo = "修改订单状态")
    public R update(Order order) {
        if (Cools.isEmpty(order) || null == order.getId()) {
            return R.error("参数缺失");
        }
        order.setUpdateBy(getUserId());
        order.setUpdateTime(new Date());
        Long settle = order.getSettle();
        if (settle != null && settle == 6) {
            order.setMemo(Cools.isEmpty(order.getMemo()) ? "手动完结" : order.getMemo() + "手动完结");
        }
        if (!orderService.updateById(order)) {
            throw new CoolException("修改订单失败");
        }
@@ -1177,7 +1202,12 @@
            }
            // 生成调拨单
            if (docType.getDocId().intValue() == 32) {
                String dbUuid = "DB" + odNo;
                String dbUuid;
                if (!Cools.isEmpty(matnr) && (matnr.startsWith("401") || matnr.startsWith("402"))) {
                    dbUuid = "DC" + odNo;
                } else {
                    dbUuid = "DB" + odNo;
                }
                Order order2 = orderService.selectByNo(dbUuid);
                if (null == order2) {
                    order2 = new Order(
@@ -1444,7 +1474,12 @@
                odNo += "_O";
            }
            if (docName.contains("调拨单")) {
                odNo = "DB" + odNo;
                if (!Cools.isEmpty(matnr) && (matnr.startsWith("401") || matnr.startsWith("402"))) {
                    odNo = "DC" + odNo;
                } else {
                    odNo = "DB" + odNo;
                }
                //odNo = "DB" + odNo;
            } else if (docName.contains("加工单")) {
                odNo = "JG" + odNo;
            } else {