#

luxiaotao1123

2022-05-12 65770aa39d487c43ff342773c268367d597d3567

#

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

@@ -18,10 +18,7 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.*;

/**
 * 移动端接口控制器
@@ -128,6 +125,30 @@
        return R.ok();
    }

    @RequestMapping("/pakout/query/auth/v2")
    @ManagerAuth
    public R pakoutQueryV2(@RequestParam(required = false) String barcode,
                           @RequestParam(required = false) Integer staNo,
                           @RequestParam(required = false) String matnr){
        if (Cools.isEmpty(barcode) && Cools.isEmpty(matnr)) {
            return R.ok();
        }
        if (!Cools.isEmpty(barcode)) {
            WrkMast wrkMast = wrkMastService.selectByBarcode(barcode);
            if (wrkMast != null) {
                List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
                // 去除已出库确认的明细
                wrkDetls.removeIf(wrkDetl -> wrkDetl.getInspect() == 1);
                return R.ok().add(wrkDetls);
            }
        }
        if (!Cools.isEmpty(matnr)) {
            List<WrkDetl> wrkDetls = wrkDetlService.selectPakoutQuery(staNo, matnr);
            return R.ok().add(wrkDetls);
        }
        return R.ok();
    }

    @RequestMapping("/pakout/confirm/auth")
    @ManagerAuth
    @Transactional
@@ -135,6 +156,11 @@
        if (Cools.isEmpty(list)) {
            return R.ok();
        }

        // todo:luxiaotao 拣料出库可修改工作档明细



        Set<Integer> wrkNos = new HashSet<>();
        for (WrkDetl wrkDetl : list) {
            wrkNos.add(wrkDetl.getWrkNo());

 src/main/java/com/zy/asrs/service/WrkMastService.java

@@ -13,4 +13,6 @@

    List<WrkMast> selectToBeHistoryData();

    WrkMast selectByBarcode(String barcode);

}

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

@@ -2,13 +2,16 @@

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.WrkMastService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

import java.util.List;

@Slf4j
@Service("wrkMastService")
public class WrkMastServiceImpl extends ServiceImpl<WrkMastMapper, WrkMast> implements WrkMastService {

@@ -27,4 +30,13 @@
        return this.baseMapper.selectToBeHistoryData();
    }

    @Override
    public WrkMast selectByBarcode(String barcode) {
        List<WrkMast> wrkMasts = this.selectList(new EntityWrapper<WrkMast>().eq("barcode", barcode));
        if (Cools.isEmpty(wrkMasts)) {
            return null;
        }
        return wrkMasts.get(0);
    }

}