盘点历史修改

web/src/main/java/com/zhehekeji/web/lib/OrderInfo.java

@@ -63,19 +63,19 @@ public class OrderInfo {
         }
         if (leftRight == 1) {
             //双伸
-            if(street.getLeftType() == 2){
+            if(street.getLeftType() == 1){
                 //外侧
                 if(separation == 2){
                     shelveId = street.getLeftOutsideShelveId();
                 }else {
-                    shelveId = street.getLeftOutsideShelveId();
+                    shelveId = street.getLeftInsideShelveId();
                 }
             }else {
                 shelveId = street.getLeftShelveId();
             }
         } else {
             //双伸
-            if(street.getRightType() == 2){
+            if(street.getRightType() == 1){
                 //外侧
                 if(separation == 2){
                     shelveId = street.getRightOutsideShelveId();

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

@@ -504,11 +504,31 @@ public class PlcService {
                             return street.getCamera1Id();
                         }
                     }else {
-                        if(plcCmdInfo.getSeparation1() == 2){
-                            //右侧  内货架  camera2
+                        if(plcCmdInfo.getSeparation1() == 1){
+                            //右侧  内货架  camera1
+                            return street.getCamera1Id();
+                        }else {
+                            //右侧  外货架  camera2
+                            return street.getCamera2Id();
+                        }
+                    }
+                }else {
+                    //左侧
+                    if(plcCmdInfo.getLeftRight2() == 1){
+
+                        if(plcCmdInfo.getSeparation2() == 1){
+                            //左侧  内货架  camera2
+                            return street.getCamera2Id();
+                        }else {
+                            //左侧  外货架  camera1
                             return street.getCamera1Id();
+                        }
                     }else {
-                            //右侧  外货架  camera1
+                        if(plcCmdInfo.getSeparation2() == 1){
+                            //右侧  内货架  camera1
+                            return street.getCamera1Id();
+                        }else {
+                            //右侧  外货架  camera2
                             return street.getCamera2Id();
                         }
                     }
@@ -517,25 +537,9 @@ public class PlcService {
                 Integer cameraId = street.getCamera1Id() != null && street.getCamera1Id() != 0 ? street.getCamera1Id() : street.getCamera2Id();
                 return cameraId;
             }
-            return null;
-        }
 
         }
 
-    public void kescTest6(PlcCmdInfo plcCmdInfo,String code,String wmsCode){
-        long startTime = System.currentTimeMillis();
-        log.info("test startTime",startTime);
-        check(plcCmdInfo,"C2-L",wmsCode,"2");
-        plcCmdInfo.setColumn1(plcCmdInfo.getColumn1()+1);
-        check(plcCmdInfo,"C3-L",wmsCode,"2");
-        plcCmdInfo.setColumn1(plcCmdInfo.getColumn1());
-        check(plcCmdInfo,"C4-L",wmsCode,"2");
-        plcCmdInfo.setColumn1(plcCmdInfo.getColumn1()+1);
-        check(plcCmdInfo,"C5",wmsCode,"2");
-        plcCmdInfo.setColumn1(plcCmdInfo.getColumn1()+1);
-        check(plcCmdInfo,"E1",wmsCode,"2");
-        long endTime = System.currentTimeMillis();
-        log.info("test endTime:{},time:{}millisecond",endTime,(endTime - startTime));
     }
 
     public Boolean check(PlcCmdInfo plcCmdInfo,String cmdCode,String wmsCode,String wmsTrayCode){

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

@@ -35,6 +35,9 @@ public class TestService {
             for(int i = 1;i<=row;i++){
                 for(int j = 1; j<= column;j++){
                     String code = "123456789013";
+                    if(j % 11 == 0){
+                        code = "dddd";
+                    }
                     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);

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

@@ -50,8 +50,8 @@ ksec:
   port: 3000
 # ------------ 实时视频流  全部页面的格式  行列数量
 videoStyleConfig:
-  videoStyleRow: 2
-  videoStyleColumn: 2
+  videoStyleRow: 4
+  videoStyleColumn: 4
 # ------------光源---
 # -------------type 0:没有光源   1：利珀光源控制器JYDam   2：利珀视觉控制器
 # -----------  num:总共多少个光源端口   index:需要控制的是哪个
@@ -64,7 +64,7 @@ lightSource:
 # -----goods 货物
 # 扫码模式  0:此处不盘点  1：球机扫码   2：sick扫码枪  3:南北达RFID
 scanCodeMode:
-  tray: 2
+  tray: 1
   goods: 0
   goodsCodeTypes:
     - 14