#

lsh

4 天以前 eb894e3c1dde980cb6cbaf559782bedb801db2ca

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

@@ -12,12 +12,14 @@

import com.zy.asrs.entity.result.WrkTraceVo;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.FileSaveExampleUtil;
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.util.*;

@@ -242,10 +244,12 @@
        double totalQty = 0;
        double wrkQty = 0;
        double lackQty = 0;
        double endQty = 0;
        for (OrderDetl orderDetl : orderDetls) {
            totalQty = totalQty + orderDetl.getAnfme();
            wrkQty = wrkQty + orderDetl.getQty();
            double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getQty()).orElse(0.0D);
            wrkQty = wrkQty + orderDetl.getWorkQty();
            endQty = endQty + orderDetl.getQty();
            double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
            if (issued > 0.0) {
                List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOrigin(), null);
                for (LocDetl locDetl : locDetls) {
@@ -267,6 +271,9 @@
            WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()));
            if (wrkMast == null) {
                WrkMastLog wrkMastLog = wrkMastLogService.selectOne(new EntityWrapper<WrkMastLog>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()));
                if (wrkMastLog.getIoType()==103){
                    wrkMastLog = wrkMastLogService.selectOne(new EntityWrapper<WrkMastLog>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()).eq("io_type",53));
                }
                if (wrkMastLog != null) {
                    wrkMast = new WrkMast();
                    BeanUtils.copyProperties(wrkMastLog, wrkMast);
@@ -295,6 +302,7 @@
                .add("totalQty", totalQty)
                .add("wrkQty", wrkQty)
                .add("lackQty", lackQty)
                .add("endQty",endQty)
        );
    }

@@ -357,7 +365,22 @@
        }
        return R.ok();
    }

    @RequestMapping(value = "/order/priAdd/auth")
    @ManagerAuth(memo = "手动增加订单优先级")
    @Transactional
    public R priAdd(@RequestParam Long orderId){
        Order order = orderService.selectById(orderId);
        wrkMastService.orderAddPri(order.getOrderNo());
        return R.ok();
    }
    @RequestMapping(value = "/order/priReduce/auth")
    @ManagerAuth(memo = "手动减少订单优先级")
    @Transactional
    public R priReduce(@RequestParam Long orderId){
        Order order = orderService.selectById(orderId);
        wrkMastService.orderReducePri(order.getOrderNo());
        return R.ok();
    }
    @RequestMapping(value = "/order/delete/auth")
    @ManagerAuth(memo = "手动删除订单")
    @Transactional
@@ -411,4 +434,32 @@
        return R.ok();
    }

    @RequestMapping(value = "/order/insert/labelUp/file/auth")
//    @ManagerAuth
    public R insertLabelUpFile(@RequestParam("orderId") String orderId,@RequestParam MultipartFile file){
        String[] split = orderId.split("-");
        int id = Integer.parseInt(split[1]);
        System.out.println("---开始---");
        String savePath = "D:/order/labelUp/file/"+id+"/"; // 指定保存文件的路径
        try{
            FileSaveExampleUtil.saveFile(file, savePath);
        }catch (Exception e){
            return R.error();
        }
        return R.ok();
    }

    @RequestMapping(value = "/order/view/labelUp/file/auth")
//    @ManagerAuth
    public R viewLabelUpFile(@RequestParam("orderId") Long orderId){
//        int id = Integer.parseInt(orderId);
        String savePath = "D:/order/labelUp/file/"+orderId+"/"; // 指定保存文件的路径
        try{
            List<FileSaveExampleUtil.FileDTO> fileDTOS = FileSaveExampleUtil.viewFileList(savePath);
            return R.ok(fileDTOS);
        }catch (Exception e){
            return R.error();
        }
    }

}