#计划组货单下发上报

lty

7 天以前 db91e03deeaac1bb3344d0b5cb9e1240f1f8caac

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

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

import com.alibaba.excel.EasyExcel;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -11,16 +12,23 @@
import com.zy.asrs.entity.param.OrderDomainParam;

import com.zy.asrs.entity.result.WrkTraceVo;
import com.zy.asrs.importexcle.ImportOrderDto;
import com.zy.asrs.importexcle.ImportOrderListener;
import com.zy.asrs.mapper.OrderDetlMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.FileSaveExampleUtil;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;
import java.io.IOException;
import java.util.*;

@RestController
@@ -45,6 +53,29 @@
    @Autowired
    private WrkMastLogService wrkMastLogService;

    @Resource
    private OrderDetlMapper orderDetlMapper;

    @PostMapping("/importOrder")
    @ManagerAuth(memo = "单据导入")
    @ApiOperation(value = "单据导入", produces = MediaType.APPLICATION_JSON_VALUE)
    public R importOrderData(@RequestParam("file") MultipartFile multipartFile) {
        try {
            importOrder(multipartFile);
        } catch (Exception e) {
            e.printStackTrace();
            return R.error(e.getMessage());
        }
        return R.ok("导入成功");
    }

    @Transactional(rollbackFor = Exception.class)
    public void importOrder(MultipartFile multipartFile) throws IOException {
        // 考核数据的判重使用order_id,check_type的组合唯一索引解决
        EasyExcel.read(multipartFile.getInputStream(), ImportOrderDto.class,
                new ImportOrderListener(orderService, orderDetlMapper,docTypeService, snowflakeIdWorker,getUserId())).sheet().doReadSync();
    }

    @RequestMapping(value = "/order/nav/list/auth")
    @ManagerAuth
    public R navList(@RequestParam(required = false) String orderNo){
@@ -52,7 +83,7 @@
        if (!Cools.isEmpty(orderNo)) {
            wrapper.like("order_no", orderNo);
        }
        wrapper.le("settle", 2).eq("status", 1);
        wrapper.le("settle", 2).eq("status", 1).ne("doc_type",25);
        wrapper.orderBy("create_time", false);
        List<Order> orders = orderService.selectList(wrapper);
        // 保留出库单
@@ -73,6 +104,34 @@
        return R.ok().add(orders);
    }

    @RequestMapping(value = "/order/nav/listMes/auth")
    @ManagerAuth
    public R navListMes(@RequestParam(required = false) String orderNo){
        EntityWrapper<Order> wrapper = new EntityWrapper<>();
        if (!Cools.isEmpty(orderNo)) {
            wrapper.like("order_no", orderNo);
        }
        wrapper.le("settle", 2).eq("status", 0).eq("doc_type", 25);
        wrapper.orderBy("create_time", false);
        List<Order> orders = orderService.selectList(wrapper);
//        // 保留出库单
//        if (!Cools.isEmpty(orders)) {
//            Iterator<Order> iterator = orders.iterator();
//            while (iterator.hasNext()) {
//                Order order = iterator.next();
//                if (order.getDocType() != null) {
//                    DocType docType = docTypeService.selectById(order.getDocType());
//                    if (docType != null) {
//                        if (docType.getPakout() == 0) {
//                            iterator.remove();
//                        }
//                    }
//                }
//            }
//        }
        return R.ok().add(orders);
    }

    @RequestMapping(value = "/order/head/page/auth")
    @ManagerAuth
    public R head(@RequestParam(defaultValue = "1")Integer curr,