xjm
/
ssjygl-xsct-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

dev
xiaocui 2021-04-16 10:54:38 +08:00
parent 5008286668 7aad6997bf
commit b9792f5ca0
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/common/DeviceThread.java
View File

@ -202,6 +202,13 @@ public class DeviceThread extends Thread {
} else {
scale = new XiShuiScale(which + "_scale", scaleconf.getString("ip"), scaleconf.getIntValue("port"));
}
} else if (supermarket_id == 5) {
// 2021-04-15 融嘉入口磅换了
if (which.startsWith(Enums.CtrlFlowEnum.R.name())) {
scale = new DingsongScale(which + "_scale", scaleconf.getString("ip"), scaleconf.getIntValue("port"));
} else {
scale = new XiShuiScale(which + "_scale", scaleconf.getString("ip"), scaleconf.getIntValue("port"));
}
} else if (supermarket_id == 7) {
scale = new KeLiScale(which + "_scale", scaleconf.getString("ip"), scaleconf.getIntValue("port"));
} else if (supermarket_id == 8 || supermarket_id == 9) {
@ -311,7 +318,7 @@ public class DeviceThread extends Thread {
try {
return scale.weigh15();
}catch (Exception e){
} catch (Exception e) {
log.error(e.getMessage(), e);
try {

2
ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java
View File

@ -95,7 +95,7 @@ public class Config extends JFinalConfig {
public static DeviceThread deviceThread = new DeviceThread();
public static SocketIOService socketio = null;
private static boolean client_run = true;
public static final String CLINET_VERSION = "20210311";
public static final String CLINET_VERSION = "20210415";
public static String getRootPath() {
return PathKit.getWebRootPath()