出库再入库

skyouc

3 天以前 88fc713144a877a4257b4173fbfadafd926c94de

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

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

import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -12,14 +14,23 @@

import com.zy.asrs.entity.result.WrkTraceVo;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.MatExcelListener;
import com.zy.asrs.utils.OrderExcelListener;
import com.zy.common.entity.MatExcel;
import com.zy.common.entity.OrderExcel;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import java.io.IOException;
import java.net.URLEncoder;
import java.util.*;

import javax.servlet.http.HttpServletResponse;

@RestController
public class OrderController extends BaseController {
@@ -104,9 +115,14 @@
            DocType docType = docTypeService.selectById(param.getDocType());
            if(!Cools.isEmpty(docType)){
                prefix = docType.getPakin() == 1 ? "RK" : "CK";
                status = (prefix == "RK" ? 1 : (prefix == "CK" ? 2 : 0));
                status = (prefix.equals("RK") ? 1 : (prefix.equals("CK") ? 2 : 0));
            }
            param.setOrderNo(prefix + snowflakeIdWorker.nextId());
        } else {
            DocType docType = docTypeService.selectById(param.getDocType());
            if(!Cools.isEmpty(docType)){
                status = (docType.getPakin() == 1 ? 1 :  2 );
            }
        }

        Order order = orderService.selectByNo(param.getOrderNo());
@@ -352,6 +368,41 @@
        }
    }

    /**
     * excel导入模板下载
     */
    @RequestMapping(value = "/orders/excel/import/mould")
    public void matExcelImportMould(HttpServletResponse response) throws IOException {
        List<OrderExcel> excels = new ArrayList<>();
        response.setContentType("application/vnd.ms-excel");
        response.setCharacterEncoding("utf-8");
        String fileName = URLEncoder.encode("单据Excel导入模板", "UTF-8");
        response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
        EasyExcel.write(response.getOutputStream(), OrderExcel.class)
                .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                .sheet("sheet1")
                .doWrite(excels);
    }



    /**
     * 单据导入
     * @author Ryan
     * @date 2026/1/8 17:17
     * @param file
     * @return com.core.common.R
     */
    @PostMapping(value = "/orders/excel/import/auth")
    @ManagerAuth(memo = "单据导入")
    @Transactional
    public R matExcelImport(MultipartFile file) throws IOException {
        OrderExcelListener listener = new OrderExcelListener(getUserId());
        EasyExcel.read(file.getInputStream(), OrderExcel.class, listener).sheet().doRead();
        return R.ok("成功同步" + listener.getTotal() + "条商品数据");
    }


    @RequestMapping(value = "/order/update/auth")
    @ManagerAuth
    public R update(Order order){