#

whycq

2024-11-01 9de70a6856dd8095ba17d04b01a9363782225ae2

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

@@ -8,11 +8,13 @@
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.AgvMobileStartPakin;
import com.zy.asrs.entity.param.OrderDomainParam;
import com.zy.asrs.entity.result.WrkTraceVo;
import com.zy.asrs.service.*;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import lombok.Synchronized;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.DataFormatter;
@@ -52,6 +54,52 @@
    private LocDetlService locDetlService;
    @Autowired
    private MatService matService;
    @Autowired
    private AgvLocDetlService agvLocDetlService;
    @Autowired
    private FlowLogService flowLogService;

    @GetMapping("/doc/type/list")
    @Transactional
    @ManagerAuth(memo = "入库单据类型")
    @Synchronized
    public R docTypeList(){
        List<DocType> result = new ArrayList<>();
        List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakin", 1));
        List<Long> unDocIds = new ArrayList<>();
        unDocIds.add(19L);
        unDocIds.add(30L);
        unDocIds.add(32L);
        unDocIds.add(36L);
        for (DocType pakin : pakins) {
            if (!unDocIds.contains(pakin.getDocId())) {
                result.add(pakin);
            }
        }
        return R.ok().add(result);
    }

    @GetMapping("/doc/type/out/list")
    @Transactional
    @ManagerAuth(memo = "出库单据类型")
    @Synchronized
    public R docTypeOutList(){
        List<DocType> result = new ArrayList<>();
        List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakout", 1));
        List<Long> unDocIds = new ArrayList<>();
        unDocIds.add(18L);
        unDocIds.add(31L);
        unDocIds.add(33L);
        unDocIds.add(34L);
        unDocIds.add(35L);
        unDocIds.add(37L);
        for (DocType pakin : pakins) {
            if (!unDocIds.contains(pakin.getDocId())) {
                result.add(pakin);
            }
        }
        return R.ok().add(result);
    }

    @RequestMapping(value = "/order/nav/list/auth")
    @ManagerAuth
@@ -130,7 +178,19 @@
                        @RequestParam(required = false)String orderByField,
                        @RequestParam(required = false)String orderByType,
                        @RequestParam Map<String, Object> param){
        return R.ok(orderDetlService.getPakoutPage(toPage(curr, limit, param, OrderDetl.class)));
        EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
//        return R.ok(orderDetlService.getPakoutPage(toPage(curr, limit, param, OrderDetl.class)));
        List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakin", 1));
        List<Long> docIds = new ArrayList<>();
        for (DocType pakin : pakins) {
            if (pakin.getDocId() != 32) {
                docIds.add(pakin.getDocId());
            }
        }
        wrapper.in("source",docIds);
        return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
//        EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
//        excludeTrash(param);
//        convert(param, wrapper);
@@ -152,6 +212,144 @@
//        return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
    }

    @RequestMapping(value = "/order/detls/pakin")
    @ManagerAuth
    public R orderDetlsIn(@RequestParam(defaultValue = "1")Integer curr,
                        @RequestParam(defaultValue = "100")Integer limit,
                        @RequestParam(required = false)String orderByField,
                        @RequestParam(required = false)String orderByType,
                        @RequestParam(required = false)Long docType,
                        @RequestParam Map<String, Object> param){
        EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
        param.remove("docType");
        excludeTrash(param);
        convert(param, wrapper);
//        return R.ok(orderDetlService.getPakoutPage(toPage(curr, limit, param, OrderDetl.class)));
        List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakin", 1));
        List<Long> docIds = new ArrayList<>();
        List<Long> unDocIds = new ArrayList<>();
        unDocIds.add(19L);
        unDocIds.add(30L);
        unDocIds.add(32L);
        unDocIds.add(36L);
        for (DocType pakin : pakins) {
            if (!unDocIds.contains(pakin.getDocId())) {
                docIds.add(pakin.getDocId());
            }
        }

        if (docIds.size() > 0) {
            if (docType > 0) {
                wrapper.in("source",docType);
            } else {
                wrapper.in("source",docIds);
            }

        } else {
            wrapper.in("source",0);
        }

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

    @RequestMapping(value = "/order/wait/detls/pakin/page/auth")
    @ManagerAuth
    public R waitOrderDetls(@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){
        EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
//        return R.ok(orderDetlService.getPakoutPage(toPage(curr, limit, param, OrderDetl.class)));
        List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakin", 1));
        List<Long> docIds = new ArrayList<>();
        for (DocType pakin : pakins) {
            if (pakin.getDocId() == 36) {
                docIds.add(pakin.getDocId());
            }
        }
        wrapper.in("source",docIds);
        return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
    }

    //  所有入库订单明细
    @RequestMapping(value = "/order/bcp/detls/pakin/page/auth")
    @ManagerAuth
    public R bcpOrderDetls(@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){
        EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
//        return R.ok(orderDetlService.getPakoutPage(toPage(curr, limit, param, OrderDetl.class)));
        List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakin", 1));
        List<Long> docIds = new ArrayList<>();
        for (DocType pakin : pakins) {
            if (pakin.getDocId() == 32) {
                docIds.add(pakin.getDocId());
            }
        }
        wrapper.in("source",docIds);
        return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
    }

    @RequestMapping(value = "/order/bcpDb/detls/pakin/page/auth")
    @ManagerAuth
    public R bcpDbOrderDetls(@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){
        EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
//        return R.ok(orderDetlService.getPakoutPage(toPage(curr, limit, param, OrderDetl.class)));
        List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakout", 1));
        List<Long> docIds = new ArrayList<>();
        for (DocType pakin : pakins) {
            if (pakin.getDocId() == 33) {
                docIds.add(pakin.getDocId());
            }
        }
        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);
            record.setStock(sumAnfme == null ? 0 : sumAnfme);
        }
        return R.ok(page);
    }
    @RequestMapping(value = "/order/backStocks/detls/pakin/page/auth")
    @ManagerAuth
    public R backStocksOrderDetls(@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){
        EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
//        return R.ok(orderDetlService.getPakoutPage(toPage(curr, limit, param, OrderDetl.class)));
        List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakout", 1));
        List<Long> docIds = new ArrayList<>();
        for (DocType pakin : pakins) {
            if (pakin.getDocId() == 36) {
                docIds.add(pakin.getDocId());
            }
        }
        wrapper.in("source",docIds);
        Page<OrderDetl> page = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
        for (OrderDetl record : page.getRecords()) {
            Double sumAnfme = agvLocDetlService.getSumAnfmeback(record.getMatnr(), record.getThreeCode(),1);
            record.setStock(sumAnfme == null ? 0 : sumAnfme);
        }
        return R.ok(page);
    }

    @RequestMapping(value = "/order/detl/all/auth")
    @ManagerAuth
    public R head(@RequestParam Long orderId){
@@ -163,6 +361,7 @@
    @Transactional
    public R formAdd(@RequestBody OrderDomainParam param){
        Order order = orderService.selectByNo(param.getOrderNo());
        long flowId = snowflakeIdWorker.nextId();
        if (order != null) {
            return R.error("单据编号已存在");
        }
@@ -207,18 +406,49 @@
            throw new CoolException("保存订单主档失败");
        }
        List<DetlDto> list = new ArrayList<>();
        Boolean flag = false;
        for (OrderDetl orderDetl : param.getOrderDetlList()) {
            if (Cools.isEmpty(orderDetl.getProcessSts())) {
                orderDetl.setProcessSts(3);
            }
            if (orderDetl.getProcessSts() == 1) {
                flag = true;
            }
            if (param.getDocType() != 32) {
                orderDetl.setProcessSts(3);
            }
            DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
            if (DetlDto.has(list, dto)) {
                OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getThreeCode(),orderDetl.getDeadTime());
                OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getThreeCode().trim(),orderDetl.getDeadTime());
                Double anfme = item.getAnfme();
                item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
                if (!orderDetlService.updateById(item)) {
                    throw new CoolException("保存订单明细档失败");
                }
                // 流水 -- 新增订单明细
//                FlowLog flowLog = new FlowLog();
//                flowLog.setFid(String.valueOf(flowId));
//                flowLog.setOpType(2L);
//                flowLog.setOrderNo(param.getOrderNo());
//                flowLog.setThreeCode(orderDetl.getThreeCode().trim());
//                flowLog.setMatnr(orderDetl.getMatnr());
//                flowLog.setMaktx(orderDetl.getMaktx());
//                flowLog.setOrderPrevious(anfme);
//                flowLog.setOrderCurrent(anfme + orderDetl.getAnfme());
//                flowLog.setOrderChanged(orderDetl.getAnfme());
//                flowLog.setQtyPrevious(orderDetl.getQty());
//                flowLog.setQtyCurrent(orderDetl.getQty());
//                flowLog.setQtyChanged(0.0D);
//                flowLog.setUserId(getUserId());
//                flowLog.setAppeTime(now);
//                if (!flowLogService.insert(flowLog)) {
//                    throw new CoolException("同步半成品调拨单流水记录失败");
//                }
            } else {
                list.add(dto);
                orderDetl.setOrderId(order.getId());
                orderDetl.setOrderNo(order.getOrderNo());
                orderDetl.setSource(param.getDocType().intValue());
                orderDetl.setCreateBy(getUserId());
                orderDetl.setCreateTime(now);
                orderDetl.setUpdateBy(getUserId());
@@ -228,8 +458,187 @@
                if (!orderDetlService.insert(orderDetl)) {
                    throw new CoolException("保存订单明细档失败");
                }
//                // 流水 -- 新增订单明细
//                FlowLog flowLog = new FlowLog();
//                flowLog.setFid(String.valueOf(flowId));
//                flowLog.setOpType(1L);
//                flowLog.setOrderNo(param.getOrderNo());
//                flowLog.setThreeCode(orderDetl.getThreeCode().trim());
//                flowLog.setMatnr(orderDetl.getMatnr());
//                flowLog.setMaktx(orderDetl.getMaktx());
//                flowLog.setOrderPrevious(0.0D);
//                flowLog.setOrderCurrent(orderDetl.getAnfme());
//                flowLog.setOrderChanged(orderDetl.getAnfme());
//                flowLog.setQtyPrevious(0.0D);
//                flowLog.setQtyCurrent(0.0D);
//                flowLog.setQtyChanged(0.0D);
//                flowLog.setUserId(getUserId());
//                flowLog.setAppeTime(now);
//                if (!flowLogService.insert(flowLog)) {
//                    throw new CoolException("同步半成品调拨单流水记录失败");
//                }
            }
        }
        if (param.getDocType().intValue() == 32) {
            order = new Order(
                    String.valueOf(snowflakeIdWorker.nextId()),    // 编号[非空]
                    "DB" + param.getOrderNo(),    // 订单编号
                    DateUtils.convert(now),    // 单据日期
                    33L,    // 单据类型
                    null,    // 项目编号
                    null,    //
                    null,    // 调拨项目编号
                    null,    // 初始票据号
                    null,    // 票据号
                    null,    // 客户编号
                    null,    // 客户
                    null,    // 联系方式
                    null,    // 操作人员
                    null,    // 合计金额
                    null,    // 优惠率
                    null,    // 优惠金额
                    null,    // 销售或采购费用合计
                    null,    // 实付金额
                    null,    // 付款类型
                    null,    // 业务员
                    null,    // 结算天数
                    null,    // 邮费支付类型
                    null,    // 邮费
                    null,    // 付款时间
                    null,    // 发货时间
                    null,    // 物流名称
                    null,    // 物流单号
                    1L,    // 订单状态
                    1,    // 状态
                    getUserId(),    // 添加人员
                    now,    // 添加时间
                    getUserId(),    // 修改人员
                    now,    // 修改时间
                    null    // 备注
            );
            if (!orderService.insert(order)) {
                throw new CoolException("生成半成品调拨单失败");
            }
            List<DetlDto> dbList = new ArrayList<>();
            for (OrderDetl orderDetl : param.getOrderDetlList()) {
                DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
                if (DetlDto.has(dbList, dto)) {
                    OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getThreeCode().trim(),orderDetl.getDeadTime());
                    item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
                    if (!orderDetlService.updateById(item)) {
                        throw new CoolException("生成半成品调拨单明细档失败");
                    }
                } else {
                    dbList.add(dto);
                    orderDetl.setOrderId(order.getId());
                    orderDetl.setOrderNo(order.getOrderNo());
                    orderDetl.setSource(33);
                    orderDetl.setCreateBy(getUserId());
                    orderDetl.setCreateTime(now);
                    orderDetl.setUpdateBy(getUserId());
                    orderDetl.setUpdateTime(now);
                    orderDetl.setStatus(1);
                    orderDetl.setQty(0.0D);
                    if (!orderDetlService.insert(orderDetl)) {
                        throw new CoolException("生成半成品调拨单明细档失败");
                    }
                }
            }

        }
        // 工序为1：待加工 生成加工单
        if (flag) {
            if (param.getDocType().intValue() == 32) {
                order = new Order(
                        String.valueOf(snowflakeIdWorker.nextId()),    // 编号[非空]
                        "JG" + param.getOrderNo(),    // 订单编号
                        DateUtils.convert(now),    // 单据日期
                        35L,    // 单据类型
                        null,    // 项目编号
                        null,    //
                        null,    // 调拨项目编号
                        null,    // 初始票据号
                        null,    // 票据号
                        null,    // 客户编号
                        null,    // 客户
                        null,    // 联系方式
                        null,    // 操作人员
                        null,    // 合计金额
                        null,    // 优惠率
                        null,    // 优惠金额
                        null,    // 销售或采购费用合计
                        null,    // 实付金额
                        null,    // 付款类型
                        null,    // 业务员
                        null,    // 结算天数
                        null,    // 邮费支付类型
                        null,    // 邮费
                        null,    // 付款时间
                        null,    // 发货时间
                        null,    // 物流名称
                        null,    // 物流单号
                        1L,    // 订单状态
                        1,    // 状态
                        getUserId(),    // 添加人员
                        now,    // 添加时间
                        getUserId(),    // 修改人员
                        now,    // 修改时间
                        null    // 备注
                );
                if (!orderService.insert(order)) {
                    throw new CoolException("生成半成品调拨单失败");
                }
                List<DetlDto> dbList = new ArrayList<>();
                for (OrderDetl orderDetl : param.getOrderDetlList()) {
                    if (orderDetl.getProcessSts() != 1) continue;
                    DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
                    if (DetlDto.has(dbList, dto)) {
                        OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getThreeCode().trim(),orderDetl.getDeadTime());
                        item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
                        if (!orderDetlService.updateById(item)) {
                            throw new CoolException("生成半成品调拨单明细档失败");
                        }
                    } else {
                        dbList.add(dto);
                        orderDetl.setOrderId(order.getId());
                        orderDetl.setOrderNo(order.getOrderNo());
                        orderDetl.setSource(35);
                        orderDetl.setCreateBy(getUserId());
                        orderDetl.setCreateTime(now);
                        orderDetl.setUpdateBy(getUserId());
                        orderDetl.setUpdateTime(now);
                        orderDetl.setStatus(1);
                        orderDetl.setQty(0.0D);
                        if (!orderDetlService.insert(orderDetl)) {
                            throw new CoolException("生成半成品调拨单明细档失败");
                        }
//                        // 流水 -- 新增订单明细
//                        FlowLog flowLog = new FlowLog();
//                        flowLog.setFid(String.valueOf(flowId));
//                        flowLog.setOpType(1L);
//                        flowLog.setOrderNo(param.getOrderNo());
//                        flowLog.setThreeCode(orderDetl.getThreeCode().trim());
//                        flowLog.setMatnr(orderDetl.getMatnr());
//                        flowLog.setMaktx(orderDetl.getMaktx());
//                        flowLog.setOrderPrevious(0.0D);
//                        flowLog.setOrderCurrent(orderDetl.getAnfme());
//                        flowLog.setOrderChanged(orderDetl.getAnfme());
//                        flowLog.setQtyPrevious(0.0D);
//                        flowLog.setQtyCurrent(0.0D);
//                        flowLog.setQtyChanged(0.0D);
//                        flowLog.setUserId(getUserId());
//                        flowLog.setAppeTime(now);
//                        if (!flowLogService.insert(flowLog)) {
//                            throw new CoolException("同步半成品调拨单流水记录失败");
//                        }

                    }

                }

            }
        }

        return R.ok("订单添加成功");
    }

@@ -238,6 +647,8 @@
    @Transactional
    public R formModify(@RequestBody OrderDomainParam param){
        Order order = orderService.selectById(param.getOrderId());
        long flowId = snowflakeIdWorker.nextId();
        int docType = param.getDocType().intValue();
        if (order == null || order.getStatus() == 0) {
            return R.error("订单不存在");
        }
@@ -261,17 +672,48 @@
        // 2.重组数据
        List<DetlDto> list = new ArrayList<>();
        for (OrderDetl orderDetl : param.getOrderDetlList()) {
            DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
            DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getAnfme(), orderDetl.getProcessSts());
            if (DetlDto.has(list, dto)) {
                OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getThreeCode(),orderDetl.getDeadTime());
                OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getThreeCode().trim(),orderDetl.getDeadTime());
                Double anfme = item.getAnfme();
                item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
                if (!orderDetlService.updateById(item)) {
                    throw new CoolException("保存订单明细档失败");
                }
//                // 流水 -- 新增订单明细
//                FlowLog flowLog = new FlowLog();
//                flowLog.setFid(String.valueOf(flowId));
//                flowLog.setOpType(2L);
//                flowLog.setOrderNo(param.getOrderNo());
//                flowLog.setThreeCode(orderDetl.getThreeCode().trim());
//                flowLog.setMatnr(orderDetl.getMatnr());
//                flowLog.setMaktx(orderDetl.getMaktx());
//                flowLog.setOrderPrevious(anfme);
//                flowLog.setOrderCurrent(anfme + orderDetl.getAnfme());
//                flowLog.setOrderChanged(orderDetl.getAnfme());
//                flowLog.setQtyPrevious(orderDetl.getQty());
//                flowLog.setQtyCurrent(orderDetl.getQty());
//                flowLog.setQtyChanged(0.0D);
//                flowLog.setUserId(getUserId());
//                flowLog.setAppeTime(now);
//                if (!flowLogService.insert(flowLog)) {
//                    throw new CoolException("同步半成品调拨单流水记录失败");
//                }
            } else {
                if (docType == 35 && orderDetl.getProcessSts() == 1) {
                    List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>()
                            .eq("matnr", orderDetl.getMatnr())
                            .eq("order_no", orderDetl.getOrderNo())
                            .eq("process_sts", 3));
                    for (AgvLocDetl agvLocDetl : agvLocDetls) {
                        agvLocDetl.setProcessSts(1);
                        agvLocDetlService.updateById(agvLocDetl);
                    }
                }
                list.add(dto);
                orderDetl.setOrderId(order.getId());
                orderDetl.setOrderNo(order.getOrderNo());
                orderDetl.setSource(docType);
                orderDetl.setCreateBy(getUserId());
                orderDetl.setCreateTime(now);
                orderDetl.setUpdateBy(getUserId());
@@ -281,6 +723,25 @@
                if (!orderDetlService.insert(orderDetl)) {
                    throw new CoolException("保存订单明细档失败");
                }
                // 流水 -- 新增订单明细
//                FlowLog flowLog = new FlowLog();
//                flowLog.setFid(String.valueOf(flowId));
//                flowLog.setOpType(2L);
//                flowLog.setOrderNo(param.getOrderNo());
//                flowLog.setThreeCode(orderDetl.getThreeCode().trim());
//                flowLog.setMatnr(orderDetl.getMatnr());
//                flowLog.setMaktx(orderDetl.getMaktx());
//                flowLog.setOrderPrevious(0.0D);
//                flowLog.setOrderCurrent(orderDetl.getAnfme());
//                flowLog.setOrderChanged(orderDetl.getAnfme());
//                flowLog.setQtyPrevious(orderDetl.getQty());
//                flowLog.setQtyCurrent(orderDetl.getQty());
//                flowLog.setQtyChanged(0.0D);
//                flowLog.setUserId(getUserId());
//                flowLog.setAppeTime(now);
//                if (!flowLogService.insert(flowLog)) {
//                    throw new CoolException("同步半成品调拨单流水记录失败");
//                }
            }
        }
        return R.ok("订单修改成功");
@@ -492,22 +953,24 @@
        Date now = new Date();
        DataFormatter dataFormatter = new DataFormatter();
        for (int i = 1; i < totalRows; i++) {
            Integer proSts = 0;
            Row row = sheet.getRow(i);
            //单据类型
            String docName =  dataFormatter.formatCellValue(row.getCell(0));
            String docName =  dataFormatter.formatCellValue(row.getCell(0)).trim();
            //单据编号
            String uuid = dataFormatter.formatCellValue(row.getCell(1));
            String uuid = dataFormatter.formatCellValue(row.getCell(1)).trim();
            //物料号
            String matnr = dataFormatter.formatCellValue(row.getCell(2));
            String matnr = dataFormatter.formatCellValue(row.getCell(2)).trim();
            //销售单号
            String csocode = dataFormatter.formatCellValue(row.getCell(3));
            String csocode = dataFormatter.formatCellValue(row.getCell(3)).trim();
            //自由项
            String isocode = dataFormatter.formatCellValue(row.getCell(4));
            String isocode = dataFormatter.formatCellValue(row.getCell(4)).trim();
            // 数量
            if(Cools.isEmpty(dataFormatter.formatCellValue(row.getCell(5)))){
                continue;
            }
            Double anfme = Double.parseDouble(dataFormatter.formatCellValue(row.getCell(5)));

            Mat mat = matService.selectByMatnr(matnr);
            if (null == mat) {
                throw new CoolException(matnr + "商品编码的商品不存在，请重新导入！");
@@ -517,17 +980,39 @@

            DocType docType = docTypeService.selectOne(new EntityWrapper<DocType>().eq("doc_name", docName));

            if(docType.getPakin() == 1){
                uuid += "_I";
            }else {
                uuid += "_O";
            // 单据类型为 半成品入库单才有工序
            if (docType.getDocId().intValue() == 32) {
                //工序
                if (Cools.isEmpty(dataFormatter.formatCellValue(row.getCell(6)))) {
                    // 工序为空，默认为无需加工
                    proSts = 3;
                } else {
                    String processSts = dataFormatter.formatCellValue(row.getCell(6));
                    //1: 待加工 2：已加工 3：无需加工
                    if ("待加工".equals(processSts)) {
                        proSts = 1;
                    } else if ("已加工".equals(processSts)) {
                        proSts = 2;
                    } else {
                        proSts = 3;
                    }
                }
            } else {
                proSts = 3;
            }

            Order order = orderService.selectByNo(uuid);
            String odNo = uuid;
            if(docType.getPakin() == 1){
                odNo += "_I";
            }else {
                odNo += "_O";
            }

            Order order = orderService.selectByNo(odNo);
            if (null == order) {
                order = new Order(
                        String.valueOf(snowflakeIdWorker.nextId()),    // 编号[非空]
                        uuid,    // 订单编号
                        odNo,    // 订单编号
                        null,    // 单据日期
                        docType.getDocId(),    // 单据类型
                        null,    // 项目编号
@@ -565,6 +1050,11 @@
                    throw new CoolException("生成单据主档失败，请重新导入！");
                }
            }else {
                //  有原订单在的情况
                DocType orderType = docTypeService.selectById(order.getDocType());
                if (!orderType.getDocName().equals(docName)) {
                    throw new CoolException("新订单：" + uuid + " 与系统内的订单号相同，单据类型不同。请确认新订单单据类型！");
                }
                order.setSettle(order.getSettle() == 1L ? 1L : 2L );
                orderService.updateById(order);
            }
@@ -573,6 +1063,7 @@
            if (orderDetl == null) {
                orderDetl = new OrderDetl();
                orderDetl.sync(mat);
                orderDetl.setSource(docType.getDocId().intValue());
                orderDetl.setBatch(null);
                orderDetl.setAnfme(anfme);
                orderDetl.setOrderId(order.getId());
@@ -585,14 +1076,174 @@
                orderDetl.setDeadTime(isocode);
                orderDetl.setStatus(1);
                orderDetl.setQty(0.0D);
                orderDetl.setProcessSts(proSts);
                if (!orderDetlService.insert(orderDetl)) {
                    throw new CoolException("生成单据明细失败，请重新导入！");
                }
            } else {
                if (anfme < 0)  {
                    throw new CoolException("订单数量不允许为负数！");
                }
                if(!orderDetlService.increaseAnfme(order.getId(), matnr, null, anfme,csocode,isocode)) {
                    throw new CoolException("生成单据明细失败，请重新导入！");
                }
            }
            // 生成调拨单
            if (docType.getDocId().intValue() == 32) {
                String dbUuid = "DB" + odNo;
                Order order2 = orderService.selectByNo(dbUuid);
                if (null == order2) {
                    order2 = new Order(
                            String.valueOf(snowflakeIdWorker.nextId()),    // 编号[非空]
                            dbUuid,    // 订单编号
                            null,    // 单据日期
                            33L,    // 单据类型
                            null,    // 项目编号
                            null,    //
                            null,    // 调拨项目编号
                            null,    // 初始票据号
                            null,    // 票据号
                            null,    // 客户编号
                            null,    // 客户
                            null,    // 联系方式
                            null,    // 操作人员
                            null,    // 合计金额
                            null,    // 优惠率
                            null,    // 优惠金额
                            null,    // 销售或采购费用合计
                            null,    // 实付金额
                            null,    // 付款类型
                            null,    // 业务员
                            null,    // 结算天数
                            null,    // 邮费支付类型
                            null,    // 邮费
                            null,    // 付款时间
                            null,    // 发货时间
                            null,    // 物流名称
                            null,    // 物流单号
                            1L,    // 订单状态
                            1,    // 状态
                            userId,    // 添加人员
                            now,    // 添加时间
                            userId,    // 修改人员
                            now,    // 修改时间
                            null    // 备注
                    );
                    if (!orderService.insert(order2)) {
                        throw new CoolException("生成单据主档失败，请重新导入！");
                    }
                }else {
                    order2.setSettle(order.getSettle() == 1L ? 1L : 2L );
                    orderService.updateById(order2);
                }

                OrderDetl orderDetl2 = orderDetlService.selectItem(order2.getId(), matnr, null,csocode,isocode);
                if (orderDetl2 == null) {
                    orderDetl2 = new OrderDetl();
                    orderDetl2.sync(mat);
                    orderDetl2.setSource(33);
                    orderDetl2.setBatch(null);
                    orderDetl2.setAnfme(anfme);
                    orderDetl2.setOrderId(order2.getId());
                    orderDetl2.setOrderNo(order2.getOrderNo());
                    orderDetl2.setCreateBy(userId);
                    orderDetl2.setCreateTime(now);
                    orderDetl2.setUpdateBy(userId);
                    orderDetl2.setUpdateTime(now);
                    orderDetl2.setThreeCode(csocode);
                    orderDetl2.setDeadTime(isocode);
                    orderDetl2.setStatus(1);
                    orderDetl2.setQty(0.0D);
                    orderDetl2.setProcessSts(proSts);
                    if (!orderDetlService.insert(orderDetl2)) {
                        throw new CoolException("生成单据明细失败，请重新导入！");
                    }
                } else {
                    if(!orderDetlService.increaseAnfme(order2.getId(), matnr, null, anfme,csocode,isocode)) {
                        throw new CoolException("生成单据明细失败，请重新导入！");
                    }
                }
            }

            // 工序为1：待加工 生成加工单
            if (proSts == 1) {
                if (docType.getDocId().intValue() == 32) {
                    String dbUuid = "JG" + odNo;
                    Order order3 = orderService.selectByNo(dbUuid);
                    if (null == order3) {
                        order3 = new Order(
                                String.valueOf(snowflakeIdWorker.nextId()),    // 编号[非空]
                                dbUuid,    // 订单编号
                                null,    // 单据日期
                                35L,    // 单据类型
                                null,    // 项目编号
                                null,    //
                                null,    // 调拨项目编号
                                null,    // 初始票据号
                                null,    // 票据号
                                null,    // 客户编号
                                null,    // 客户
                                null,    // 联系方式
                                null,    // 操作人员
                                null,    // 合计金额
                                null,    // 优惠率
                                null,    // 优惠金额
                                null,    // 销售或采购费用合计
                                null,    // 实付金额
                                null,    // 付款类型
                                null,    // 业务员
                                null,    // 结算天数
                                null,    // 邮费支付类型
                                null,    // 邮费
                                null,    // 付款时间
                                null,    // 发货时间
                                null,    // 物流名称
                                null,    // 物流单号
                                1L,    // 订单状态
                                1,    // 状态
                                userId,    // 添加人员
                                now,    // 添加时间
                                userId,    // 修改人员
                                now,    // 修改时间
                                null    // 备注
                        );
                        if (!orderService.insert(order3)) {
                            throw new CoolException("生成单据主档失败，请重新导入！");
                        }
                    }else {
                        order3.setSettle(order.getSettle() == 1L ? 1L : 2L );
                        orderService.updateById(order3);
                    }

                    OrderDetl orderDetl3 = orderDetlService.selectItem(order3.getId(), matnr, null,csocode,isocode);
                    if (orderDetl3 == null) {
                        orderDetl3 = new OrderDetl();
                        orderDetl3.sync(mat);
                        orderDetl3.setSource(35);
                        orderDetl3.setBatch(null);
                        orderDetl3.setAnfme(anfme);
                        orderDetl3.setOrderId(order3.getId());
                        orderDetl3.setOrderNo(order3.getOrderNo());
                        orderDetl3.setCreateBy(userId);
                        orderDetl3.setCreateTime(now);
                        orderDetl3.setUpdateBy(userId);
                        orderDetl3.setUpdateTime(now);
                        orderDetl3.setThreeCode(csocode);
                        orderDetl3.setDeadTime(isocode);
                        orderDetl3.setStatus(1);
                        orderDetl3.setQty(0.0D);
                        orderDetl3.setProcessSts(proSts);
                        if (!orderDetlService.insert(orderDetl3)) {
                            throw new CoolException("生成单据明细失败，请重新导入！");
                        }
                    } else {
                        if(!orderDetlService.increaseAnfme(order3.getId(), matnr, null, anfme,csocode,isocode)) {
                            throw new CoolException("生成单据明细失败，请重新导入！");
                        }
                    }
                }
            }

        }
        return R.ok("导入成功");
    }