#

zjj

2 天以前 9360e541fb38bca1ae9d1f981eb3ada729671c37

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

@@ -6,7 +6,6 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.BasDevpMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.ManLocDetlServiceImpl;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import lombok.extern.slf4j.Slf4j;
@@ -47,10 +46,11 @@

    private static final Map<Integer,Integer> sourceSite = new HashMap<>();
    static {
        sourceSite.put(1041,1040);sourceSite.put(1042,1040);
        sourceSite.put(2011,2010);sourceSite.put(2012,2010);
        sourceSite.put(2001,2000);sourceSite.put(2002,2000);
        sourceSite.put(3011,3010);sourceSite.put(3010,1040);
        sourceSite.put(1041,1040);sourceSite.put(1042,1040);sourceSite.put(1040,1040);
        sourceSite.put(2011,2010);sourceSite.put(2012,2010);sourceSite.put(2010,2010);
        sourceSite.put(2001,2000);sourceSite.put(2002,2000);sourceSite.put(2000,2000);
        sourceSite.put(3011,3010);sourceSite.put(3010,1040);sourceSite.put(3012,3010);

    }

    public ReturnT<String> start(WrkMast wrkMast) {
@@ -85,7 +85,6 @@
            }
            assert locMast != null;
        }

        try {

            switch (wrkMast.getIoType()) {
@@ -426,8 +425,10 @@
            if (sourceSite.get(sourceStaNo) != null) {
                BasDevpMapper basDevpMapper = SpringUtils.getBean(BasDevpMapper.class);
                BasDevp basDevp = basDevpMapper.selectById(sourceSite.get(sourceStaNo));
                basDevp.setInQty(basDevp.getInQty() -1);
                basDevp.setInQty(Math.max(basDevp.getInQty() - 1, 0));
                basDevpMapper.updateById(basDevp);

                log.info("入库任务完成，"+basDevp.getDevNo()+"-1");
            }

            // 修改工作主档状态
@@ -461,7 +462,7 @@
                }
                assert node != null;
            }else {
                locMast = locMastService.selectById(wrkMast.getLocNo());
                locMast = locMastService.selectById(wrkMast.getSourceLocNo());
                if (null == locMast) {
//                exceptionHandle("工作档[workNo={0}]库位号错误[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -469,6 +470,12 @@
                }
                assert locMast != null;
            }
            if (null == locMast) {
//                exceptionHandle("工作档[workNo={0}]库位号错误[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                return FAIL.setMsg("工作档库位号错误; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
            }
            assert locMast != null;
            switch (wrkMast.getIoType()) {
                // 全板出库
                case 101: