Browse Source

修复:将试管放入异常处理区试管位置不对

master
sige 1 year ago
parent
commit
e838e6fa02
  1. BIN
      app.db
  2. 9
      src/main/java/com/iflytop/digester/controller/TestController.java
  3. 12
      src/main/java/com/iflytop/digester/deviceinstance/TransferRobotArmInstance.java

BIN
app.db

9
src/main/java/com/iflytop/digester/controller/TestController.java

@ -23,6 +23,15 @@ public class TestController extends UfApiControllerBase {
}
@ResponseBody
@PostMapping("/api/test/move-tube-from-liquid-plate-to-error-slot")
public UfApiResponse moveTubeFromLiquidPlateToErrorSlot(@RequestBody Map<String,Object> params) {
List<Integer> srcIndexes = (List<Integer>)params.get("srcIndexes");
List<Integer> destIndexes = (List<Integer>)params.get("destIndexes");
this.device.transferArm.moveTubesToErrorSlot(srcIndexes, destIndexes);
return this.success();
}
@ResponseBody
@PostMapping("/api/test/liquid-add")
public UfApiResponse liquidAdd(@RequestBody Map<String,Object> params) {
List<Integer> tubes = (List<Integer>)params.get("tubes");

12
src/main/java/com/iflytop/digester/deviceinstance/TransferRobotArmInstance.java

@ -36,13 +36,15 @@ public class TransferRobotArmInstance {
this.lockArm(lock);
// 执行移动试管到异常槽位
for (Integer tubeIndex : srcIndexes) {
for ( int i=0; i<srcIndexes.size(); i++ ) {
Integer srcTubeIndex = srcIndexes.get(i);
Integer destTubeIndex = destIndexes.get(i);
String snippetKey = "TubeMoveToErrorSlot";
Map<String,Object> snippetParams = new HashMap<>();
snippetParams.put("LiquidPlatePos", UfMdbOption.getInteger("LiquidPlateTube." + tubeIndex, 0));
snippetParams.put("TransLrSrcPos", UfMdbOption.getInteger("TransLrMotorLiquidPlateTube." + tubeIndex, 0));
snippetParams.put("HeatingPlatePos", UfMdbOption.getInteger("HeatPlateErrorSlotTube." + tubeIndex, 0));
snippetParams.put("TransLrDestPos", UfMdbOption.getInteger("TransLrMotorHeatingPlateTube." + tubeIndex, 0));
snippetParams.put("TransLrSrcPos", UfMdbOption.getInteger("TransLrMotorLiquidPlateTube." + srcTubeIndex, 0));
snippetParams.put("TransLrDestPos", UfMdbOption.getInteger("TransLrMotorHeatingPlateTube." + destTubeIndex, 0));
snippetParams.put("LiquidPlatePos", UfMdbOption.getInteger("LiquidPlateTube." + srcTubeIndex, 0));
snippetParams.put("HeatingPlatePos", UfMdbOption.getInteger("HeatPlateErrorSlotTube." + destTubeIndex, 0));
UfCmdSnippetExecutor.execute(snippetKey, snippetParams);
}
this.unlockArm(lock);

Loading…
Cancel
Save