自动盘点修改

web/src/main/java/com/zhehekeji/web/controller/CameraController.java

@@ -45,7 +45,7 @@ public class CameraController {
 
     @GetMapping("/{id}")
     @ApiOperation(value = "球机")
-    public Result<Camera> list(@PathVariable Integer id) {
+    public Result<Camera> detail(@PathVariable Integer id) {
         return new Result<>(cameraService.detail(id));
     }
 

web/src/main/java/com/zhehekeji/web/service/PlcService.java

@@ -441,14 +441,14 @@ public class PlcService {
 
     public Integer getCameraByPlcCmd(PlcCmdInfo plcCmdInfo,Integer leftRight){
         Street street = streetService.getStreetByPlcId(plcCmdInfo.getPlcId());
-        //判断单双伸  type=1 单伸   2为双伸
+        //判断单双伸  type=0 单伸   1为双伸
         Integer type;
         if(leftRight == 1){
             type = street.getLeftType();
         }else {
             type = street.getRightType();
         }
-        if(type == 1){
+        if(type == 0){
             //单伸
             if (street.getCamera1Id() != null && street.getCamera2Id() != null && street.getCamera1Id() != 0 && street.getCamera2Id() != 0) {
                 if (leftRight == 1) {

web/src/main/java/com/zhehekeji/web/service/TestService.java

@@ -37,6 +37,7 @@ public class TestService {
                     String code = "3224112150069";
                     String taskId = i +"-"+ j+"-"+LocalDateTime.now().format(DateTimeFormatter.ofPattern("hhmmss"));
                     PlcCmdInfo plcCmdInfo = new PlcCmdInfo(street.getPlcId(),taskId,1,leftRight,j,i,1,1,1,1,1,1);
+                    plcCmdInfo.setTimes(1);
                     int co = j%3 + 1;
                     plcService.check(plcCmdInfo,"E"+co,code,"21234-trayCode");
                     try {

web/src/main/resources/application-prod.yml

@@ -68,7 +68,7 @@ sensor:
 # -----goods 货物
 # 扫码模式  1：球机扫码   2：扫码枪
 scanCodeMode:
-  tray: 2
+  tray: 0
   goods: 1
   goodsCodeTypes:
     - 14