四期

zhangc

2025-03-06 b4ec8b4cc3476b49b9bc47e11ec03c4eecaba880

四期

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

@@ -15,6 +15,8 @@
import com.zy.common.web.BaseController;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@@ -30,6 +32,8 @@
import java.util.Date;
import java.util.EnumSet;
import java.util.Map;

import static org.reflections.Reflections.log;

/**
 * 上报事件类型（eventType）：
@@ -51,6 +55,8 @@
@RestController
@RequestMapping("/agv")
public class AgvOpenController extends BaseController {

    private static final Logger log = LoggerFactory.getLogger(AgvMobileController.class);

    @Autowired
    AgvWrkMastService agvWrkMastService;
@@ -217,10 +223,14 @@
                case 57:
                    AgvBasDevp byDevNo = agvBasDevpService.getByDevNo(agvWrkMast.getSourceLocNo());
                    String locSts = "O";
                    if (byDevNo != null && "R".equals(byDevNo.getLocSts())) {
                        locSts = "O";
                    } else {
                    if (byDevNo != null) {
                        assert log != null;
                        log.info("料架离开时当前站点状态:{}", byDevNo.getLocSts());
                        if (("S".equals(byDevNo.getLocSts()) || "F".equals(byDevNo.getLocSts()))) {
                        locSts = byDevNo.getLocSts();
                        } else {
                            locSts = "O";
                        }
                    }
                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), locSts, "", null);
                    break;

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

@@ -168,8 +168,8 @@
                            locDto.getCsocode(),
                            locDto.getIsoseq(),
                            locDto.getProcessSts());
                    OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq());
                    AgvLocDetl locDetl = agvLocDetlService.selectItem(wrkMast.getSourceLocNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq());
                    //OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq());
                   // AgvLocDetl locDetl = agvLocDetlService.selectItem(wrkMast.getSourceLocNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq());
                    // 流水 -- 新增订单明细
//                    FlowLog flowLog = new FlowLog();
//                    flowLog.setFid(String.valueOf(flowId));