调整显示字段

zc

2024-08-21 b9d1914c7d4393b845458bfd428e81265238c7b9

调整显示字段

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

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

import com.alibaba.fastjson.JSON;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
@@ -78,7 +79,9 @@
        }
        List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
        List<LocDto> locDtos = new ArrayList<>();

        orderDetls = orderDetls.stream()
                .sorted(Comparator.comparing(OrderDetl::getMatnr).thenComparing(OrderDetl::getBatch))
                .collect(Collectors.toList());
        Set<String> exist = new HashSet<>();

        for (OrderDetl orderDetl : orderDetls) {
@@ -92,20 +95,39 @@
            } else {
                locDetls = locDetlService.queryStock(orderDetl.getSPgNO());
            }

            for (LocDetl locDetl : locDetls) {
                if (locDetl.getMatnr().equals(orderDetl.getMatnr())) {
                    if (issued > 0) {
                        LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
                                issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
                        List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
                        locDto.setStaNos(staNos);
                        locDto.setModel(locDetl.getModel());
                        locDtos.add(locDto);
                        exist.add(locDetl.getLocNo());
                        // 剩余待出数量递减
                        issued = issued - locDetl.getAnfme();
                    } else {
                        break;
                if (Cools.isEmpty(locDetl.getBatch())||Cools.isEmpty(orderDetl.getBatch())){
                    if (locDetl.getMatnr().equals(orderDetl.getMatnr())) {
                        if (issued > 0) {
                            LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
                                    issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
                            List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
                            locDto.setStaNos(staNos);
                            locDto.setModel(locDetl.getModel());
                            locDtos.add(locDto);
                            exist.add(locDetl.getLocNo());
                            // 剩余待出数量递减
                            issued = issued - locDetl.getAnfme();
                        } else {
                            break;
                        }
                    }
                }else {
                    if (locDetl.getMatnr().equals(orderDetl.getMatnr())&&locDetl.getBatch().equals(orderDetl.getBatch())) {
                        if (issued > 0) {
                            LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
                                    issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
                            List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
                            locDto.setStaNos(staNos);
                            locDto.setModel(locDetl.getModel());
                            locDtos.add(locDto);
                            exist.add(locDetl.getLocNo());
                            // 剩余待出数量递减
                            issued = issued - locDetl.getAnfme();
                        } else {
                            break;
                        }
                    }
                }
            }

 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java

@@ -298,7 +298,7 @@
        int ioType = taskDto.isAll() ? 101 : 103;
        StaDesc staDesc = staDescService.queryCrnStnAuto(ioType, locMast.getCrnNo(), staNo.getDevNo());
        // 生成工作号
        int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
         int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
        // 生成工作档
        WrkMast wrkMast = new WrkMast();
        wrkMast.setWrkNo(workNo);

 src/main/java/com/zy/third/erp/task/ERPInCancelScheduler.java

@@ -27,7 +27,7 @@


    @Transactional(rollbackFor = Throwable.class)
    @Scheduled(cron = "${erp.refreshtime}")
    //@Scheduled(cron = "${erp.refreshtime}")
    public void InCancelScheduler() {
        if (!erpEnabled) return;
        String sqlInCancelTB = "select * from erp_InCancelTB where LKName='中扬二期'";

 src/main/java/com/zy/third/erp/task/ERPOutCancelScheduler.java

@@ -28,7 +28,7 @@


    @Transactional(rollbackFor = Throwable.class)
    @Scheduled(cron = "${erp.refreshtime}")
    //@Scheduled(cron = "${erp.refreshtime}")
    public void InCancelScheduler() {
        //log.info("InCancelScheduler开始了");
        if (!erpEnabled) return;

 src/main/webapp/static/js/order/out.js

@@ -141,7 +141,7 @@
                        ,title: false
                        ,closeBtn: false
                        ,offset: '50px'
                        ,area: ['1200px', '700px']
                        ,area: ['80%', '80%']
                        ,shade: 0.5
                        ,shadeClose: false
                        ,btn: ['立即出库', '稍后处理']