From b4ec8b4cc3476b49b9bc47e11ec03c4eecaba880 Mon Sep 17 00:00:00 2001 From: zhangc <zc@123> Date: 星期四, 06 三月 2025 19:27:52 +0800 Subject: [PATCH] 四期 --- src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 4 ++-- src/main/java/com/zy/asrs/controller/AgvOpenController.java | 18 ++++++++++++++---- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/AgvOpenController.java b/src/main/java/com/zy/asrs/controller/AgvOpenController.java index 4748ef8..01361fc 100644 --- a/src/main/java/com/zy/asrs/controller/AgvOpenController.java +++ b/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; /** * 涓婃姤浜嬩欢绫诲瀷锛坋ventType锛夛細 @@ -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 { - locSts = byDevNo.getLocSts(); + 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; diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java index 48d963c..7c43a50 100644 --- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java +++ b/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)); -- Gitblit v1.9.1