Merge branch 'phyzasrs' of http://47.97.1.152:5880/r/zy-asrs into phyzasrs-erp

whycq

2024-09-04 41326b3129ae3e4ef7a45bc16dba64dc9dd27404

 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;
@@ -54,6 +56,48 @@
    private MatService matService;
    @Autowired
    private AgvLocDetlService agvLocDetlService;

    @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
@@ -166,6 +210,68 @@
//        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
@@ -211,6 +317,32 @@
        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);
@@ -485,6 +617,7 @@
                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());
@@ -898,6 +1031,7 @@
                    orderDetl2.setDeadTime(isocode);
                    orderDetl2.setStatus(1);
                    orderDetl2.setQty(0.0D);
                    orderDetl2.setProcessSts(proSts);
                    if (!orderDetlService.insert(orderDetl2)) {
                        throw new CoolException("生成单据明细失败，请重新导入！");
                    }
@@ -975,6 +1109,7 @@
                        orderDetl3.setDeadTime(isocode);
                        orderDetl3.setStatus(1);
                        orderDetl3.setQty(0.0D);
                        orderDetl3.setProcessSts(proSts);
                        if (!orderDetlService.insert(orderDetl3)) {
                            throw new CoolException("生成单据明细失败，请重新导入！");
                        }