1.对入库拍照功能解耦

zwl

6 天以前 5b00928c8570a3ba21a1170b4642ef88635d90da

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

@@ -5,16 +5,24 @@
import com.core.common.Cools;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.result.FindLocNoAttributeVo;
import com.zy.asrs.mapper.WrkMastLogMapper;
import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.InboundCameraCaptureService;
import com.zy.asrs.service.WrkMastService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

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

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

    @Autowired
    private WrkMastLogMapper wrkMastLogMapper;

    @Override
    public int getWorkingMast(Integer devpNo) {
@@ -29,6 +37,18 @@
    @Override
    public List<WrkMast> selectToBeHistoryData() {
        return this.baseMapper.selectToBeHistoryData();
    }

    @Override
    public List<WrkMast> selectPendingInboundCameraCapture() {
        return this.baseMapper.selectPendingInboundCameraCapture(
                InboundCameraCaptureService.CAPTURE_PENDING,
                InboundCameraCaptureService.CAPTURE_RUNNING);
    }

    @Override
    public boolean updateMemoIfCurrent(Integer wrkNo, String current, String next) {
        return this.baseMapper.updateMemoIfCurrent(wrkNo, current, next) > 0;
    }

    @Override
@@ -63,4 +83,29 @@
    public WrkMast selectWrkMast(Integer workNo, String barcode) {
        return this.baseMapper.selectWrkMast(workNo, barcode);
    }

    @Override
    public int outboundSeqMaxContiguousPlt(String userNo, String batchSeq) {
        List<Integer> fromMast = baseMapper.listOutboundPltTypesByUserNo(userNo, batchSeq);
        List<Integer> fromLog = wrkMastLogMapper.listOutboundPltTypesByUserNo(userNo, batchSeq);
        Set<Integer> filled = new HashSet<>();
        addPositivePlt(fromMast, filled);
        addPositivePlt(fromLog, filled);
        int h = 0;
        while (filled.contains(h + 1)) {
            h++;
        }
        return h;
    }

    private static void addPositivePlt(List<Integer> list, Set<Integer> target) {
        if (list == null) {
            return;
        }
        for (Integer p : list) {
            if (p != null && p > 0) {
                target.add(p);
            }
        }
    }
}