Merge remote-tracking branch 'origin/jxgtasrs' into jxgtasrs

zjj

2024-12-20 3695eb9fa6062ef00e685835cf384c02e60f7b17

 src/main/java/com/zy/common/utils/OutStockInterceptUtil.java

@@ -1,6 +1,7 @@
package com.zy.common.utils;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.SpringUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.BasDevp;
@@ -24,9 +25,10 @@
    public static final Map<Integer,Boolean> inSiteMap = new HashMap<Integer,Boolean>();

    static {
        inSiteMap.put(1040, true);
        inSiteMap.put(2010, true);inSiteMap.put(2000, true);
        inSiteMap.put(3010, true);
        inSiteMap.put(1040, true);inSiteMap.put(1042, true);
        inSiteMap.put(2010, true);inSiteMap.put(2012, true);
        inSiteMap.put(2000, true);inSiteMap.put(2002, true);
        inSiteMap.put(3010, true);inSiteMap.put(3012, true);
    }

    /**
@@ -44,8 +46,19 @@
            } else if (devMk.equals("2")) {
                 // 判断该站点入库任务是否完成
                WrkMastMapper wrkMastMapper = SpringUtils.getBean(WrkMastMapper.class);
                int count = wrkMastMapper.selectCount(new EntityWrapper<WrkMast>()
                        .eq("source_sta_no", site).in("io_type",1,10,53,57));
                Wrapper<WrkMast> wrapper = new EntityWrapper<WrkMast>().in("io_type", 1, 10, 53, 57);
                switch (site) {
                    case 1040: wrapper.in("sta_no","1043","1044");break;
                    case 1042: wrapper.in("sta_no","1043","1044");break;
                    case 2010: wrapper.in("sta_no","2013","2014"); break;
                    case 2012: wrapper.in("sta_no","2013","2014"); break;
                    case 2000: wrapper.in("sta_no","2003","2004");break;
                    case 2002: wrapper.in("sta_no","2003","2004");break;
                    case 3010: wrapper.in("sta_no","3013","3014");break;
                    case 3012: wrapper.in("sta_no","3013","3014");break;
                    default:
                }
                int count = wrkMastMapper.selectCount(wrapper);
                if (count == 0) {
                    basDevp.setDevMk("0"); // 没有入库任务，切换成出库模式
                    basDevpMapper.updateById(basDevp);