返回信息修改

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

@@ -4,6 +4,7 @@ import com.alibaba.excel.EasyExcel;
 import com.github.pagehelper.PageInfo;
 import com.zhehekeji.common.util.ValidatorUtil;
 import com.zhehekeji.core.pojo.Result;
+import com.zhehekeji.web.entity.CheckInfo;
 import com.zhehekeji.web.entity.Stock;
 import com.zhehekeji.web.pojo.category.PageSearch;
 import com.zhehekeji.web.pojo.stock.*;
@@ -144,7 +145,7 @@ public class StockController {
 
     @ApiOperation(value = "获取盘点信息")
     @RequestMapping(value = "/checkInfo", method = RequestMethod.POST)
-    public Result<Stock> checkInfo(@RequestBody StockCheckSearch stockCheck) {
+    public Result<CheckInfo> checkInfo(@RequestBody StockCheckSearch stockCheck) {
         int a = Integer.valueOf(stockCheck.getSRMNumber());
         String ss = String.format("%03d", a);
         stockCheck.setSRMNumber(ss);
@@ -152,7 +153,10 @@ public class StockController {
         log.info("stockCheck:{}",stockCheck);
         Stock stock = stockService.stock(stockCheck);
         log.info("stockCheck:res:{}",stock);
-        return Result.success(stock);
+        CheckInfo checkInfo= new CheckInfo();
+        checkInfo.setTrayCode(stock.getWmsTrayCode());
+        checkInfo.setCheckRlt(stock.getStatus()==2 || stock.getStatus()==3?1:0);
+        return Result.success(checkInfo);
     }
 
     @ApiOperation(value = "人工复核")

web/src/main/java/com/zhehekeji/web/entity/CheckInfo.java

@@ -0,0 +1,9 @@
+package com.zhehekeji.web.entity;
+
+import lombok.Data;
+
+@Data
+public class CheckInfo {
+    private String trayCode;
+    private int checkRlt;
+}

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

@@ -15,6 +15,7 @@ import com.zhehekeji.web.pojo.OrderVO;
 import com.zhehekeji.web.pojo.websocket.WebSocketVo;
 import com.zhehekeji.web.service.RFID.RFIDMap;
 import com.zhehekeji.web.service.RFID.RFIDSocket;
+import com.zhehekeji.web.service.RFID.RFIDSocketOld;
 import com.zhehekeji.web.service.hikLightSource.HikControlSocket;
 import com.zhehekeji.web.service.interfaces.RfidLiveService;
 import com.zhehekeji.web.service.ksec.KsecNettyClient;
@@ -705,9 +706,7 @@ public class PlcService {
         OrderInfo orderInfo = new OrderInfo(street, plcCmdInfo, 1, cmdCode);
         Stock stock = stockMapper.getByStreetAndDirectionAndSideAndRowColumn(orderInfo.getStreetId(), plcCmdInfo.getFromDirection(), orderInfo.getSeparation(), orderInfo.getRow(), orderInfo.getColumn());
         String scanCode = null;
-
         //货物使用球机扫码
-
         log.info("code:{}", scanCode);
         //核对异常
         Integer status = 1;
@@ -813,7 +812,7 @@ public class PlcService {
     public void RFIDStart(String ip, Integer port, Integer streetId, Integer direction) {
         RFIDSocket rfidSocket = new RFIDSocket(ip, port);
         log.info("rfid调用，ip：" + ip + ";port:" + port);
-        rfidSocket.startCheck(direction, false);
+        rfidSocket.startCheck(direction,false);
         RFIDMap.put(streetId, rfidSocket);
     }
 

web/src/main/java/com/zhehekeji/web/service/RFID/RFIDSocketOld.java

@@ -120,8 +120,8 @@ public class RFIDSocketOld {
                                 ((RFIDReaderHelper) mReaderHelper).setWorkAntenna((byte) 0xFF, (byte) 0x01);
                             }
                             //开始盘存180006B
-                            ((RFIDReaderHelper) mReaderHelper).iso180006BInventory((byte) 0xFF);
+                            //((RFIDReaderHelper) mReaderHelper).iso180006BInventory((byte) 0xFF);
-                            //((RFIDReaderHelper) mReaderHelper).inventory((byte) 0xFF, (byte) 0x0A);
+                            ((RFIDReaderHelper) mReaderHelper).inventory((byte) 0xFF, (byte) 0x0A);
 //                    i++;
                             Thread.sleep(70);
                         }

web/src/main/java/com/zhehekeji/web/service/ksec/KsecNettyClient.java

@@ -41,6 +41,7 @@ public class KsecNettyClient {
         KsecInfo heart = KsecInfo.heart();
         client.handler(new KescFilter(heart, plcService,this));
         // 连接服务端
+
         channel = client.connect(ksec.getIp(), ksec.getPort()).sync().channel();
     }