#

1

1 天以前 b43bef45af4d88d4b71c27e6c167010e65b6a040

#

 src/main/java/com/zy/asrs/controller/OpenController.java

@@ -480,7 +480,7 @@
        param.setTaskNo(Integer.parseInt(taskCode.substring(0, taskCode.indexOf("-"))));
        boolean taskAgvReport = openService.TaskAgvReport(param);
        if (taskAgvReport){
            agvBindAndBin(String.valueOf(param.getTaskNo()));
//            agvBindAndBin(String.valueOf(param.getTaskNo()));
            return new R(0,"成功");
        }
        return R.error("任务号不存在");

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

@@ -864,10 +864,6 @@
                }
            }

            locMast.setLocSts("R");
            if(!locMastService.updateById(locMast)){
                throw new CoolException("新增agv入库任务失败");
            }
            BasAgvLocNoService basAgvLocNoService = SpringUtils.getBean(BasAgvLocNoService.class);
            BasAgvLocNo basAgvLocNoSou = basAgvLocNoService.selectOne(new EntityWrapper<BasAgvLocNo>().eq("loc_no", param.getLocNo()));
            AgvBindCtnrAndBinParam agvBindCtnrAndBinParam = new AgvBindCtnrAndBinParam();
@@ -881,6 +877,11 @@
            if(resultBind.getCode() != 200){
                throw new CoolException("agv入库绑定失败");
            }
            locMast.setBarcode(param.getBarcode());
            locMast.setLocSts("R");
            if(!locMastService.updateById(locMast)){
                throw new CoolException("新增agv入库任务失败");
            }
            OrderInAndOutUtil.updateOrder(Boolean.TRUE,order.getId(), 2L, userId);
        }
    }

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

@@ -10,6 +10,8 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.transaction.support.TransactionSynchronizationAdapter;
import org.springframework.transaction.support.TransactionSynchronizationManager;

import java.util.ArrayList;
import java.util.Date;
@@ -29,6 +31,8 @@
    private LocMastService locMastService;
    @Autowired
    private LocDetlService locDetlService;
    @Autowired
    private OpenService openService;


    public ReturnT<String> start(BasAgvMast basAgvMast) {
@@ -52,6 +56,15 @@
                    basAgvWrkDetlService.delete(new EntityWrapper<BasAgvWrkDetl>().eq("wrk_no", basAgvMast.getTaskNo()));
                    basAgvMast.setStatus(3);
                    basAgvMastService.updateById(basAgvMast);
                    // ✅ 事务提交后执行
                    TransactionSynchronizationManager.registerSynchronization(
                            new TransactionSynchronizationAdapter() {
                                @Override
                                public void afterCommit() {
                                    openService.agvBindAndBin(String.valueOf(basAgvMast.getTaskNo()));
                                }
                            }
                    );
                    break;
                case 1:
                    LocMast sourceLoc1 = locMastService.selectById(basAgvMast.getSourceLocNo());

 src/main/java/com/zy/common/constant/AgvConstant.java

@@ -8,7 +8,7 @@
    public static final String AGV_URL = "http://10.10.10.200:8181";

    public static final String AGV_hikRpcService = "rcms/services/rest/hikRpcService";
    public static final String AGV_1LBind = "rcms/services/rest/hikRpcService/bindCtnrAndBin";
    public static final String AGV_1LBind = "rcms/services/rest/hikRpcService";
    public static final String AGV_bindPodAndBerth = "bindPodAndBerth";//bangding 2
    public static final String AGV_bindCtnrAndBin = "bindCtnrAndBin";//bangding 1
    public static String getAGVADAPTOR(int f) {