wms下发任务给wcs时上锁，防止erp发送中止任务

zwl

昨天 ff66ddf96807fac02e01c7d2ecdfd1ba808af9c5

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

@@ -14,6 +14,7 @@
import com.zy.asrs.mapper.TagMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.support.WorkPublishLockKeys;
import com.zy.asrs.utils.MatUtils;
import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.asrs.utils.Utils;
@@ -28,6 +29,7 @@
import com.zy.common.service.CommonService;
import com.zy.common.utils.HttpHandler;
import com.zy.common.utils.NodeUtils;
import com.zy.common.utils.RedisUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -121,6 +123,8 @@
    private WcsApiService wcsApiService;
    @Autowired
    private WorkService workService;
    @Autowired
    private RedisUtil redisUtil;
    @Autowired
    private BasCrnpService basCrnpService;
    @Autowired
@@ -406,6 +410,10 @@
        }
        if (param.getExecute() == null) {
            throw new CoolException("execute不能为空");
        }
        if (Objects.equals(param.getExecute(), 2)
                && redisUtil.hasKey(WorkPublishLockKeys.outboundUserNoLock(param.getOrderId()))) {
            return R.error("正在下发任务给WCS，无法中止");
        }

        List<WrkMast> activeTasks = findActiveOutboundTasks(param.getOrderId());
@@ -1599,7 +1607,7 @@
            // 7.11：entryWmsCode、outDoorNo 复用明细备用字段。
            wrkDetl.setStandby1(param.getEntryWmsCode());
            wrkDetl.setStandby2(param.getOutDoorNo());
            wrkDetl.setSupp(i+"/"+count);
            wrkDetl.setSupp(count+"");
            wrkDetl.setTeu(param.getTeu());

            if (!wrkDetlService.insert(wrkDetl)) {
@@ -1636,7 +1644,7 @@
                }else{
                    i++;
                }
                int teu = outTaskParam.getTeu();
                int teu = Cools.isEmpty(outTaskParam.getTeu())?0:outTaskParam.getTeu();
                R r = outOrder(outTaskParam, count, teu ,i);
                if (!Objects.equals(r.get("code"), 200)) {
                    throw new CoolException("出库建单失败");