1

zhangchao

2024-10-23 c0b15f4c848d8e31e499570ea397bb88ea7c31db

1

 src/main/java/com/zy/asrs/entity/WrkDetl.java

@@ -20,7 +20,8 @@
public class WrkDetl implements Serializable {

    private static final long serialVersionUID = 1L;

    @TableField("tenant")
    private Long tenant;
    /**
     * 工作号
     */

 src/main/java/com/zy/asrs/entity/WrkMast.java

@@ -23,7 +23,8 @@
public class WrkMast implements Serializable {

    private static final long serialVersionUID = 1L;

    @TableField("tenant")
    private Long tenant;
    /**
     * 工作号
     */

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

@@ -879,7 +879,7 @@
                        wrkMast.setIoPri(14D);
                        wrkMastMapper.updateById(wrkMast);
                        // 生成工作档,将浅库位移转到新的库位中
                        moveLocForDeepLoc(slave, shallowLoc, mark);
                        moveLocForDeepLoc(slave, shallowLoc, mark,wrkMast.getTenant());
                        // 生成工作档、改变浅库位的源库/目标库 库位状态、下发堆垛机命令（立马执行)
//                        moveLocForDeepLocPakin(slave, shallowLoc, wrkMast);
                    }
@@ -1048,7 +1048,7 @@
                                wrkMast.setUpdMk("Y");
                                wrkMastMapper.updateById(wrkMast);
                                // 生成工作档,将浅库位移转到新的库位中
                                moveLocForDeepLoc(slave, shallowLoc, mark);
                                moveLocForDeepLoc(slave, shallowLoc, mark,wrkMast.getTenant());
                            }
                            News.error("{}任务出库失败，浅库位堵塞！浅库位号:{}", wrkMast.getWrkNo(), shallowLocNo);
                            continue;
@@ -1930,7 +1930,7 @@
     * 因双深库位阻塞，对浅库位进行移转（立即执行版)
     * tip：同步
     */
    private synchronized void moveLocForDeepLoc(CrnSlave crn, LocMast shallowLoc, Integer mark) {
    private synchronized void moveLocForDeepLoc(CrnSlave crn, LocMast shallowLoc, Integer mark,Long tenant) {

        try {
            News.warnNoLog("" + mark + "moveLocForDeepLoc" + " - 0" + " - 开始执行:因双深库位阻塞，对浅库位进行移转（立即执行版)");
@@ -2022,6 +2022,7 @@
            wrkMast.setLinkMis("N");
            wrkMast.setAppeTime(new Date());
            wrkMast.setModiTime(new Date());
            wrkMast.setTenant(tenant);
            int res = wrkMastMapper.insert(wrkMast);
            if (res == 0) {
                News.errorNoLog("" + mark + "moveLocForDeepLoc" + " - 2" + " - 保存工作档失败");
@@ -2038,6 +2039,7 @@
                    VersionUtils.setWrkDetl(wrkDetl, locDetl); // 版本控制
                    wrkDetl.setAppeTime(new Date());
                    wrkDetl.setModiTime(new Date());
                    wrkDetl.setTenant(tenant);
                    if (!wrkDetlService.save(wrkDetl)) {
                        News.errorNoLog("" + mark + "moveLocForDeepLoc" + " - 3" + " - 保存工作档明细失败");
                        throw new CoolException("保存工作档明细失败");

 src/main/java/com/zy/core/thread/SiemensDevpThread.java

@@ -400,7 +400,7 @@
            if (wrkNoFlag && staNoFlag) {
                break;
            }
        } while (writeCount < 12);
        } while (writeCount < 20);

        if (!write.IsSuccess) {
            staProtocol = station.get(staProtocol.getSiteId());