From fc9d08ef427c4fce72f469edbbb193c92249fd01 Mon Sep 17 00:00:00 2001 From: whycq <you@example.com> Date: 星期二, 27 六月 2023 18:43:10 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/ConsoleController.java | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java index 6379d35..1bfdeab 100644 --- a/src/main/java/com/zy/asrs/controller/ConsoleController.java +++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java @@ -29,14 +29,11 @@ import com.zy.core.properties.SlaveProperties; import com.zy.core.properties.SystemProperties; import com.zy.core.thread.BarcodeThread; -import com.zy.core.thread.MelsecCrnThread; import com.zy.core.thread.ScaleThread; +import com.zy.core.thread.SiemensCrnThread; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.*; @@ -170,6 +167,19 @@ return R.ok().add(list); } + @PostMapping("/latest/inSta/data/barcode") + @ManagerAuth(memo = "鏉$爜鎵弿浠疄鏃舵暟鎹�") + public R barcodeData(Integer barcodeId){ + BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcodeId); + if (null == barcodeThread) { + return R.ok(); + } + BarcodeDataVo vo = new BarcodeDataVo(); + vo.setBarcodeId(barcodeId); + vo.setCodeValue(barcodeThread.getBarcode()); + return R.ok().add(vo); + } + @PostMapping("/latest/data/scale") @ManagerAuth(memo = "纾呯Г瀹炴椂鏁版嵁") public R scaleLatestData(){ @@ -245,7 +255,7 @@ CrnDetailVo vo = new CrnDetailVo(); for (CrnSlave crnSlave : slaveProperties.getCrn()) { if (crnSlave.getId().equals(crnNo)) { - MelsecCrnThread crnThread = (MelsecCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId()); + SiemensCrnThread crnThread = (SiemensCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId()); CrnProtocol crnProtocol = crnThread.getCrnProtocol(); vo.setCrnNo(crnNo); vo.setWorkNo(crnProtocol.getTaskNo()); @@ -282,7 +292,7 @@ return R.ok(); } - @PostMapping("/barcode/output/site") + @GetMapping("/barcode/output/site") public R crnOutput(){ // StringBuilder str = new StringBuilder(); // String s; -- Gitblit v1.9.1