#

luxiaotao1123

2021-06-03 958b12cccc9e0043eb0c6b9bb84ebdf554ebe1a1

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

@@ -41,6 +41,8 @@
    private CommonService commonService;
    @Autowired
    private WrkDetlService wrkDetlService;
    @Autowired
    private LocNormalService locNormalService;

    @Override
    public Page<OutStockBillEntry> queryOutStock(Page<OutStockBillEntry> page) {
@@ -56,7 +58,7 @@
        List<LocDetl> locList = new ArrayList<LocDetl>();
        for (Integer i = 0; i < matList.size(); i++) {
            /*自动根据物料编码选取最优出货顺序（先进先出，靠外货物先出）*/
            tempLocList = baseMapper.queryMatWithLoc(matList.get(i).getFNumber());
            tempLocList = baseMapper.queryMatWithLoc(matList.get(i).getFnumber());
            BigDecimal needNum = matList.get(i).getFAuxQty();
            BigDecimal locNum = BigDecimal.ZERO;
            if (tempLocList.size() > 0) {
@@ -73,6 +75,11 @@
            }
        }
        return locList;
    }

    @Override
    public Integer queryOutStockFInterID(String supplier) {
       return baseMapper.queryOutStockFInterID(supplier);
    }

    @Override
@@ -148,6 +155,7 @@
            wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 源站
            wrkMast.setStaNo(staDesc.getStnNo()); // 目标站
            wrkMast.setSourceLocNo(dto.getLocNo()); // 源库位
            wrkMast.setBarcode(locMast.getBarcode()); // 条码
            wrkMast.setFullPlt("Y"); // 满板：Y
            wrkMast.setPicking("N"); // 拣料
            wrkMast.setExitMk("N"); // 退出
@@ -174,7 +182,8 @@
                wrkDetl.setAppeUser(userId);
                wrkDetl.setModiTime(new Date());
                wrkDetl.setModiUser(userId);
                wrkDetl.setWarehouse(fbillNo);
                wrkDetl.setSupplier(fbillNo);
                wrkDetl.setMemo(detlDto.getLocDetl().getMemo());
                if (!wrkDetlService.insert(wrkDetl)) {
                    throw new CoolException("保存工作档明细失败");
                }