upright
/
backend-duoji-monitor
mirror of https://gitlab.hzleaper.com:81/duoji/backend-duoji-monitor.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

取消其他盘点方式，只采用rfid来进行盘点

Browse Source
镇海石化
LAPTOP-S9HJSOEB\昊天 9 months ago
parent 9dbfc249dc
commit fd4ca98813
4 changed files with 68 additions and 80 deletions
Show Stats Download Patch File Download Diff File

14
web/pom.xml
Unescape Escape View File

@ -110,13 +110,13 @@
<scope>system</scope>
<systemPath>${project.basedir}/src/main/resources/libs/lib_reader.jar</systemPath>
</dependency>
<dependency>
<groupId>gnu.io</groupId>
<artifactId>rxtxcomm</artifactId>
<version>1.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/src/main/resources/libs/RXTXcomm.jar</systemPath>
</dependency>
<!-- <dependency>-->
<!-- <groupId>gnu.io</groupId>-->
<!-- <artifactId>rxtxcomm</artifactId>-->
<!-- <version>1.0</version>-->
<!-- <scope>system</scope>-->
<!-- <systemPath>${project.basedir}/src/main/resources/libs/RXTXcomm.jar</systemPath>-->
<!-- </dependency>-->
</dependencies>
<build>

17
web/src/main/java/com/zhehekeji/web/config/WebSocketConfig.java
Unescape Escape View File

@ -1,17 +0,0 @@
package com.zhehekeji.web.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.socket.server.standard.ServerEndpointExporter;
@Configuration
public class WebSocketConfig {
/**
* 如果使用Springboot默认内置的tomcat容器，则必须注入ServerEndpoint的bean；
* 如果使用外置的web容器，则不需要提供ServerEndpointExporter，下面的注入可以注解掉
*/
@Bean
public ServerEndpointExporter serverEndpointExporter(){
return new ServerEndpointExporter();
}
}

2
web/src/main/java/com/zhehekeji/web/service/CronTab.java
Unescape Escape View File

@ -72,7 +72,7 @@ public class CronTab {
lightTimeMap.put(streetId,System.currentTimeMillis());
}
@Scheduled(cron = "0 0/1 * * * ?")
// @Scheduled(cron = "0 0/1 * * * ?")
public void lightStatus() {
log.debug(" lightStatus");
long timeStamp = System.currentTimeMillis();

115
web/src/main/java/com/zhehekeji/web/service/PlcService.java
Unescape Escape View File

@ -7,7 +7,6 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.zhehekeji.common.util.PathUtil;
import com.zhehekeji.web.config.ConfigProperties;
import com.zhehekeji.web.config.WebSocketConfig;
import com.zhehekeji.web.entity.*;
import com.zhehekeji.web.lib.*;
import com.zhehekeji.web.mapper.*;
@ -669,49 +668,49 @@ public class PlcService {
log.info("扫码类型：" + configProperties.getScanCodeMode().getTray());
//托盘使用sick扫码枪
// SensorGun sensorGun = sensorService.getSensorByPlc(street.getId(), plcCmdInfo.getLeftRight1());
SensorGun sensorGun = sensorService.getSensorByPlc(street.getId(), plcCmdInfo.getLeftRight1());
Future<String> sickFuture = executor.submit(() -> {
long startsickTime = System.currentTimeMillis();
String code = "";
if (sensorGun == null) {
code = "扫码枪未配置";
log.error("no sensor gun config in database ,street id:{},direction:{}", street.getId(), plcCmdInfo.getLeftRight1());
} else {
try {
code = SickSocket.readOCR(sensorGun.getIp(), sensorGun.getPort(), configProperties.getScanCodeMode().getSickScanTime());
} catch (Exception e) {
}
log.info("sensor tray code:{}", code);
if ("".equals(wmsTrayCode)) {
//托盘码为空，无货物
//只要扫码枪未识别出条码，即认为盘点正确
if (StringUtils.isEmpty(code) || code.equals("NoRead")) {
code = "";
} else {
code = "扫码枪识别异常";
log.warn("sick ocr error:{}", code);
}
} else {
if (StringUtils.isEmpty(code) || code.equals("NoRead")) {
code = "扫码枪识别异常";
log.warn("sick ocr error:{}", code);
} else {
log.info("sick ocr:{}", code);
//扫到就认为正常
code = "";
}
}
}
long endsickTime = System.currentTimeMillis();
log.info("sick time:{}millisecond", startsickTime - endsickTime);
return code;
});
// SensorGun sensorGun = sensorService.getSensorByPlc(street.getId(), plcCmdInfo.getLeftRight1());
// Future<String> sickFuture = executor.submit(() -> {
//
// long startsickTime = System.currentTimeMillis();
// String code = "";
// if (sensorGun == null) {
// code = "扫码枪未配置";
// log.error("no sensor gun config in database ,street id:{},direction:{}", street.getId(), plcCmdInfo.getLeftRight1());
// } else {
// try {
// code = SickSocket.readOCR(sensorGun.getIp(), sensorGun.getPort(), configProperties.getScanCodeMode().getSickScanTime());
// } catch (Exception e) {
//
// }
// log.info("sensor tray code:{}", code);
// if ("".equals(wmsTrayCode)) {
// //托盘码为空，无货物
// //只要扫码枪未识别出条码，即认为盘点正确
// if (StringUtils.isEmpty(code) || code.equals("NoRead")) {
// code = "";
// } else {
// code = "扫码枪识别异常";
// log.warn("sick ocr error:{}", code);
// }
// } else {
// if (StringUtils.isEmpty(code) || code.equals("NoRead")) {
// code = "扫码枪识别异常";
// log.warn("sick ocr error:{}", code);
// } else {
//
// log.info("sick ocr:{}", code);
// //扫到就认为正常
// code = "";
// }
// }
// }
//
// long endsickTime = System.currentTimeMillis();
//
// log.info("sick time:{}millisecond", startsickTime - endsickTime);
// return code;
//
// });
// RFID
// RFID rfid = rfidService.getRFIDByPlc(street.getId(),plcCmdInfo.getLeftRight1());
@ -734,8 +733,15 @@ public class PlcService {
tags = RFIDStop(plcCmdInfo);
log.info("盘点rfid扫描结果：" + tags);
}
if (tags != null && tags.size() > 0) {
//镇海深巷道，进行假盘点
if(plcCmdInfo.getSeparation1() == 1){
if (tags.contains(wmsTrayCode)){
code = "";
}else code = "rfid识别失败";
}else {
code="";
}
if (tags != null && tags.size() > 0) {
// if ( tags.contains(wmsTrayCode)) {
// log.info("扫描成功");
//
@ -783,22 +789,21 @@ public class PlcService {
if (rfid == null || "".equals(rfid)) {
trayRFIDCheck = Boolean.TRUE;
}
//trayCode += rfid;
if ("".equals(trayCode)) {
trayCode = "盘点正确";
trayCode = wmsTrayCode;
}else {
trayCode = rfid;
}
//trayCode += rfid;
// if ("".equals(trayCode)) {
//
// trayCode = wmsTrayCode;
// }
} catch (InterruptedException | ExecutionException e) {
e.printStackTrace();
}
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;
//托盘和货物都正确
@ -809,7 +814,7 @@ public class PlcService {
stock = Stock.builder()
.checkNum(plcCmdInfo.getOrderNum())
.lotnum(plcCmdInfo.getLotnum())
.code(scanCode)
// .code(scanCode)
.wmsCode(wmsCode)
.wmsTrayCode(wmsTrayCode)
.trayCode(trayCode)
@ -830,7 +835,7 @@ public class PlcService {
stock.setCheckNum(plcCmdInfo.getOrderNum());
stock.setTrayCode(trayCode);
stock.setWmsTrayCode(wmsTrayCode);
stock.setCode(scanCode);
// stock.setCode(scanCode);
stock.setWmsCode(wmsCode);
stockMapper.updateById(stock);
}

Write Preview
Loading…
Cancel
Save