1.減料途中幷板完善 2.訂單出庫作業優化

cp

2025-07-08 2712cf6566bc3304bda8b32d84875096fa0a64d0

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/TagController.java

@@ -5,11 +5,15 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.common.domain.CodeRes;
import com.zy.asrs.common.domain.entity.LocInPrintMatExcel;
import com.zy.asrs.common.domain.entity.MatExcel;
import com.zy.asrs.common.domain.entity.MatPrint;
import com.zy.asrs.common.domain.entity.OutLocOrderExcel;
import com.zy.asrs.common.utils.*;
import com.zy.asrs.common.wms.entity.LocInPrintMat;
import com.zy.asrs.common.wms.entity.Mat;
import com.zy.asrs.common.wms.entity.Tag;
import com.zy.asrs.common.wms.service.LocInPrintMatService;
import com.zy.asrs.common.wms.service.MatService;
import com.zy.asrs.common.wms.service.TagService;
import com.zy.asrs.framework.annotations.ManagerAuth;
@@ -41,6 +45,8 @@
    private MatService matService;
    @Autowired
    private TreeUtils treeUtils;
    @Autowired
    private LocInPrintMatService locInPrintMatService;


    @RequestMapping(value = "/tag/list/pda/auth")
@@ -203,6 +209,63 @@
        return R.ok().add(res);
    }

    // 打印
    @RequestMapping(value = "/loc/in/mat/print/auth")
    @ManagerAuth(memo = "商品编码打印")
    public R locInMatCodePrint(@RequestParam(value = "param[]") Long[] ids) {
        if(Cools.isEmpty(ids)) {
            return R.parse(CodeRes.EMPTY);
        }
        List<MatPrint> res = new ArrayList<>();
        for (Long id : ids){
            LocInPrintMat locInPrintMat = locInPrintMatService.getById(id);
            Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, locInPrintMat.getMatnr()));
            if (Cools.isEmpty(mat)){
                return R.error("品号:"+locInPrintMat.getMatnr()+"不存在，请先新增商品档案！！！").add("品号:"+locInPrintMat.getMatnr()+"不存在，请先新增商品档案！！！");
            }
            int count=1;
            if(!Cools.isEmpty(locInPrintMat.getAnfme())){
                count=locInPrintMat.getAnfme().intValue();
            }
            for(int i=1;i<=count;i++){
                // 打印数据注入
                MatPrint print = new MatPrint();
                print.setMatnr(mat.getMatnr());
                print.setBarcode(mat.getBarcode());
                print.setMaktx(mat.getMaktx());
                print.setSpecs(mat.getSpecs());
                print.setUnit(mat.getUnit());
                print.setMemo(mat.getMemo());

                print.setMaterial(mat.getMaterial());
                print.setDecrees(locInPrintMat.getDecrees());
                print.setImgNum(mat.getImgNum());
                print.setWeight(String.valueOf(mat.getWeight()));
                print.setModel(mat.getModel());
                print.setLength(String.valueOf(mat.getLength()));
                print.setWidth(mat.getWidth());
                print.setHeight(mat.getHeight());
//            // 打印数据注入
//            MatPrint print = new MatPrint();
//            print.setMatnr(locInPrintMat.getMatnr());
//            print.setMaktx(locInPrintMat.getMaktx());
//            print.setBatch(locInPrintMat.getBatch());
//            print.setAnfme(locInPrintMat.getAnfme());
//            print.setLocNo(locInPrintMat.getLocNo());
//            print.setOwnerId(locInPrintMat.getOwnerId());
//            print.setOwner(locInPrintMat.getOwner$());
                print.setId(locInPrintMat.getId());
                res.add(print);
            }

            locInPrintMat.setUpdateTime(new Date());
            locInPrintMat.setUpdateBy(getUserId());
            locInPrintMat.setStatus(2);
            locInPrintMatService.updateById(locInPrintMat);
        }
        return R.ok().add(res);
    }


    /*************************************** 数据相关 ***********************************************/

@@ -222,6 +285,16 @@
                .doWrite(excels);
    }

//    // excel导入-------判断是否有重复物料
//    @PostMapping(value = "/mat/excel/import/check/auth")
//    @ManagerAuth(memo = "商品档案数据导入")
//    @Transactional
//    public R matExcelImportCheck(MultipartFile file) throws IOException {
//        MatExcelListener listener = new MatExcelListener(getUserId(), getHostId());
//        EasyExcel.read(file.getInputStream(), MatExcel.class, listener).sheet().doRead();
//        return R.ok("成功同步"+listener.getTotal()+"条商品数据");
//    }

    // excel导入
    @PostMapping(value = "/mat/excel/import/auth")
    @ManagerAuth(memo = "商品档案数据导入")
@@ -232,4 +305,57 @@
        return R.ok("成功同步"+listener.getTotal()+"条商品数据");
    }


    /**
     * excel导入模板下载
     */
    @RequestMapping(value = "/out/loc/box/excel/import/mould")
    public void outLocBoxExcelImportMould(HttpServletResponse response) throws IOException {
        List<LocInPrintMatExcel> excels = new ArrayList<>();
        response.setContentType("application/vnd.ms-excel");
        response.setCharacterEncoding("utf-8");
        String fileName = URLEncoder.encode("导入待打印物料模板", "UTF-8");
        response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
        EasyExcel.write(response.getOutputStream(), LocInPrintMatExcel.class)
                .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                .sheet("待打印物料模板")
                .doWrite(excels);
    }

    // excel导入
    @PostMapping(value = "/out/loc/box/excel/import/auth")
    @ManagerAuth(memo = "导入待打印物料模板")
    @Transactional
    public R outLocBoxExcelImport(MultipartFile file) throws IOException {
        LocInPrintMatExcelListener listener = new LocInPrintMatExcelListener(getUserId(), getHostId());
        EasyExcel.read(file.getInputStream(), LocInPrintMatExcel.class, listener).sheet().doRead();
        return R.ok("成功导入"+listener.getTotal()[0]+"种待打印物料信息，共生成"+listener.getTotal()[1]+"条待打印条码！");
    }

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

    // excel导入
    @PostMapping(value = "/out/loc/box/excel/import/out/auth")
    @ManagerAuth(memo = "导入订单信息出库")
    @Transactional
    public R outLocBoxExcelImportOut(MultipartFile file) throws IOException {
        OutLocOrderExcelListener listener = new OutLocOrderExcelListener(getUserId(), getHostId());
        EasyExcel.read(file.getInputStream(), OutLocOrderExcel.class, listener).sheet().doRead();
        return R.ok("成功导入"+listener.getTotal()[0]+"条订单明细！");
    }

}