13

zhang

9 天以前 bd3b23b214c7090d83c91f9b9a172d4f548033dd

13

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

@@ -37,6 +37,7 @@

    boolean updateLocNo(String newLocNo, String oldLocNo);

    boolean updateLocNoOrTure(String newLocNo, String oldLocNo);
    /**
     * 获取当天相同规格货物的深库位号
     *

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

@@ -90,6 +90,12 @@
    }

    @Override
    public boolean updateLocNoOrTure(String newLocNo, String oldLocNo) {
         baseMapper.updateLocNo(newLocNo, oldLocNo);
        return true;
    }

    @Override
    public List<String> getSameDetlToday(String matnr, Integer start, Integer end) {
        return this.baseMapper.selectSameDetlToday(matnr, start, end);
    }

 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java

@@ -272,7 +272,7 @@
                    if (wrkMast.getEmptyMk().equals("N")) {
                        locSts = "F";
                        // 转移库存明细数据: 库存号 由工作档源库位变为目标库位
                        if (!locDetlService.updateLocNo(wrkMast.getLocNo(), wrkMast.getSourceLocNo())) {
                        if (!locDetlService.updateLocNoOrTure(wrkMast.getLocNo(), wrkMast.getSourceLocNo())) {
//                            exceptionHandle("库位移转 ===>> 转移库存明细数据失败；[源库位={0}],[目标库位={1}]", wrkMast.getSourceLocNo(), wrkMast.getLocNo());
                            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                            return FAIL.setMsg("库位移转 ===>> 转移库存明细数据失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");

 src/main/webapp/views/wrkMast/wrkMast.html

@@ -135,7 +135,7 @@
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/wrkMast/wrkMast.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/wrkMast/wrkMast.js?v=1" charset="utf-8"></script>

<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>