增加搜索盘点任务号等功能

web/src/main/java/com/zhehekeji/web/pojo/stock/CheckLogSearch.java

@@ -12,6 +12,13 @@ public class CheckLogSearch {
 
     private String lotnum;
 
+    private String checkNum;
+
+
+    private String wmsCode;
+
+    private String status;
+
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private LocalDateTime startTimestamp;
 

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

@@ -41,6 +41,18 @@ public class CheckLogService {
         if(search.getStartTimestamp() != null && search.getEndTimestamp() != null){
             wrapper.ge("create_time",search.getStartTimestamp()).le("create_time",search.getEndTimestamp());
         }
+
+        if(search.getCheckNum() != null && !search.getCheckNum().equals("")){
+            wrapper.like("check_num",search.getCheckNum());
+        }
+
+        if(search.getStatus() != null && !search.getStatus().equals("")){
+            wrapper.eq("status",search.getStatus());
+        }
+
+        if(search.getWmsCode() != null && !search.getWmsCode().equals("")){
+            wrapper.like("wms_Tray_Code",search.getWmsCode());
+        }
         if(!StringUtils.isEmpty(shelveIds)){
             wrapper.in("shelve_id",shelveIds);
         }

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

@@ -644,7 +644,7 @@ public class PlcService {
         SensorGun sensorGun = sensorService.getSensorByPlc(street.getId(),plcCmdInfo.getLeftRight1());
 
         if(sensorGun == null){
-            trayCode = "识别异常";
+            trayCode = "扫码异常";
             trayCheck = Boolean.FALSE;
             log.error("no sensor gun config in database ,street id:{},direction:{}",street.getId(),plcCmdInfo.getLeftRight1());
         }else {
@@ -658,13 +658,13 @@ public class PlcService {
                     trayCode = "";
                     trayCheck = Boolean.TRUE;
                 }else {
-                    trayCode = "识别异常";
+                    trayCode = "扫码异常";
                     trayCheck = Boolean.FALSE;
                     log.warn("sick ocr error:{}",trayCode);
                 }
             }else {
                 if(StringUtils.isEmpty(trayCode) || trayCode.equals("NoRead")){
-                    trayCode = "识别异常";
+                    trayCode = "扫码异常";
                     trayCheck = Boolean.FALSE;
                     log.warn("sick ocr error:{}",trayCode);
                 }else {

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

@@ -81,7 +81,7 @@ public class StockCheckRunnable implements Runnable {
                 if(StringUtils.isEmpty(trayCode)){
                     log.error("row:{},cloumn:{}",plcCmdInfo.getRow1(),plcCmdInfo.getColumn1());
                     log.error("detectBestBarCode:{}",trayCode);
-                    trayCode = "识别异常";
+                    trayCode = "扫码异常";
                     trayCheck = Boolean.FALSE;
                 }else {
                     trayCheck = wmsTrayCode.equals(trayCode);

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

@@ -298,6 +298,7 @@ public class StockService {
             stockExportExcel.setCode(stock.getTrayCode());
             stockExportExcel.setLotnum(stock.getLotnum());
             stockExportExcel.setColumn(stock.getColumn());
+            stockExportExcel.setWmsCode(stock.getWmsTrayCode());
             //stockExportExcel.setCount(stock.getCount());
             stockExportExcel.setRow(stock.getRow());
             shevleMaps.forEach((k,v)->{

web/src/main/java/com/zhehekeji/web/service/sick/SickSocket.java

@@ -17,10 +17,11 @@ public class SickSocket {
 
     private static final Logger tcpLogger = LoggerFactory.getLogger("sick");
     public static void main(String[] args) {
-        String code = readOCR("192.168.8.236", 2002);
+        String code = readOCR("127.0.0.1", 2002);
         System.out.println(code);
     }
 
+
     public static String readOCR(String ip,int port){
         Socket socket = new Socket();
         String code = "NoRead";
@@ -29,6 +30,7 @@ public class SickSocket {
         try {
             socket.connect(new InetSocketAddress(ip,port),3000);
             log.info("connect success");
+            socket.setSoTimeout(5000);
             os = socket.getOutputStream();
             is = socket.getInputStream();
             int i = 0;
@@ -41,6 +43,7 @@ public class SickSocket {
                 tcpLogger.info("count:{},ip:{},code:{}",i,ip,code);
                 if(code!= null){
                     code = code.replace("\\n","");
+                    code = code.replace("\n","");
                 }
                 i++;
             }