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

各砂站运输量统计表列表查询修改, 进站流程新增日志

dev
徐杰盟 2023-12-26 09:50:42 +08:00
parent 6410ff6aef
commit f824b3f4c9
4 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java
View File

@ -2406,13 +2406,13 @@ public class OrderStatService {
if (invoice_type != null) {
if (sale_type != null && (sale_type == 0 || sale_type == 1)) {
customer_sale_list = Db.find(sql, sale_type, stm, etm, invoice_type, sale_type, stm, etm, invoice_type, sale_type, stm, etm, invoice_type);
customer_sale_list = Db.find(sql, sale_type, invoice_type,stm, etm,sale_type, sale_type,invoice_type, stm, etm, sale_type, sale_type,invoice_type, stm, etm, sale_type);
} else {
customer_sale_list = Db.find(sql, stm, etm, invoice_type, stm, etm, invoice_type, stm, etm, invoice_type);
}
} else {
if (sale_type != null && (sale_type == 0 || sale_type == 1)) {
customer_sale_list = Db.find(sql, sale_type, stm, etm, sale_type, stm, etm, sale_type, stm, etm);
customer_sale_list = Db.find(sql, sale_type, stm, etm, sale_type, sale_type, stm, etm, sale_type,sale_type, stm, etm, sale_type);
} else {
customer_sale_list = Db.find(sql, stm, etm, stm, etm, stm, etm);
}

3
ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/controllers/Controller.java
View File

@ -1,5 +1,6 @@
package com.cowr.local.ssjygl.devicectrl.controllers;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.cowr.local.ssjygl.devicectrl.device.AbsScale;
import com.cowr.local.ssjygl.devicectrl.device.Camera;
@ -104,6 +105,7 @@ public abstract class Controller implements Runnable {
return;
}
if (licenseQueue.size() > 0) {
log.debug("【%s】 当前车辆队列", JSON.toJSONString(licenseQueue));
return;
}
long st = System.currentTimeMillis();
@ -116,6 +118,7 @@ public abstract class Controller implements Runnable {
licenseQueue.drainTo(l);
licenseQueue.add(new LicenseJPGPair(license, file));
licenseQueue.addAll(l);
log.debug("【%s】 当前车辆队列", JSON.toJSONString(licenseQueue));
} else {
licenseQueue.add(new LicenseJPGPair(license, file));
}

6
ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/controllers/InController.java
View File

@ -1,5 +1,6 @@
package com.cowr.local.ssjygl.devicectrl.controllers;
import com.alibaba.fastjson.JSON;
import com.cowr.local.ssjygl.devicectrl.device.AbsScale;
import com.cowr.local.ssjygl.devicectrl.device.Camera;
import com.cowr.local.ssjygl.devicectrl.device.LEDThread;
@ -101,6 +102,8 @@ public class InController extends Controller implements Runnable {
// 识别结果加入队列后，在上传之前，需要判断是否有同进同出锁
if (getCtrllock() != null) {
log.debug("【%s】 getCtrllock", JSON.toJSONString(getCtrllock()));
if (getCtrllock().isLocked()) {
try {
while (getCtrllock().isLocked()) {
@ -118,8 +121,9 @@ public class InController extends Controller implements Runnable {
}
try {
log.debug("【%s】 PostLicenseResult", JSON.toJSONString(pair));
PostLicenseResult postLicenseResult = postLicense(CliCacheData.SUP.getId(), pair.license, pair.file, getWhich());
log.debug("【%s】 PostLicenseResult", JSON.toJSONString(postLicenseResult));
if (postLicenseResult.isUploaded()) {
if (postLicenseResult.getLicense() == null) {

7
ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportSyncService.java
View File

@ -127,22 +127,29 @@ public class TransportSyncService {
if (!Enums.CtrlFlowEnum.isValid(which)) {
deleteImg(file); // 数据无效时，删除图片
log.debug("删除图片");
return result;
}
if (which.startsWith(Enums.CtrlFlowEnum.R.name())) {
in(supermarket_id, result, file, which);
log.debug("进场成功");
} else if (which.startsWith(Enums.CtrlFlowEnum.C.name())) {
out(supermarket_id, result, file, which);
log.debug("出场成功");
} else if (which.startsWith(Enums.CtrlFlowEnum.T.name())) {
common(supermarket_id, result, file, which);
log.debug("common() 成功");
}
if (result.isAccess()) {
Config.socketio.pubRefreshInSup(TransportDeviceService.me.real());
log.debug("推送成功");
}
Config.socketio.pubRefreshReal(TransportDeviceService.me.real());
log.debug("pubRefreshReal() 推送成功");
result.setUploaded(true);
return result;