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

.

dev
lisai17@sina.com 2020-09-14 23:23:51 +08:00
parent 50a062a65b
commit b1a99adb0d
3 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -233,9 +233,9 @@ public class TransportSyncService {
TransportDeviceService.me.addLicenseHistory(lichisobj, which, lichisobj.get("trans_co_id") != null ? TruckRodState.state_2 : TruckRodState.state_1); TransportDeviceService.me.addLicenseHistory(lichisobj, which, lichisobj.get("trans_co_id") != null ? TruckRodState.state_2 : TruckRodState.state_1);
if (ot == null && !AuthLicenseService.me.isAuthLicense(result.getLicense())) { if (ot == null ) {
log.error("【%s】未授权，可能是在黑名单中，或者第一次入场", result.getLicense()); log.error("【%s】未授权，可能是在黑名单中", result.getLicense());
Config.socketio.pubMessage(new Record().set("truck_license", result.getLicense()).set("msg", result.getLicense() + " 未授权。可能是在黑名单中，或者第一次入场")); Config.socketio.pubMessage(new Record().set("truck_license", result.getLicense()).set("msg", result.getLicense() + " 未授权。可能是在黑名单中"));
return result; return result;
} }
@ -344,8 +344,8 @@ public class TransportSyncService {
// 从预付费车辆中找 // 从预付费车辆中找
OrderclusterTruck ot = OrderclusterTruckService.me.checkValidLicense(supermarket_id, result.getLicense()); OrderclusterTruck ot = OrderclusterTruckService.me.checkValidLicense(supermarket_id, result.getLicense());
if (ot == null && !AuthLicenseService.me.isAuthLicense(result.getLicense())) { if (ot == null ) {
log.error("车牌【%s】未授权，可能是在黑名单中，或者第一次入场", result.getLicense()); log.error("车牌【%s】未授权，可能是在黑名单中", result.getLicense());
//TODO: 发消息到web端？ //TODO: 发消息到web端？
return result; return result;
} }
@ -583,8 +583,8 @@ public class TransportSyncService {
OrderclusterTruck ot = OrderclusterTruckService.me.checkValidLicense(supermarket_id, truck_license); OrderclusterTruck ot = OrderclusterTruckService.me.checkValidLicense(supermarket_id, truck_license);
if (ot == null && !AuthLicenseService.me.isAuthLicense(truck_license)) { if (ot == null ) {
return Result.failedstr("车牌【%s】未授权，或者第一次入场", truck_license); return Result.failedstr("车牌【%s】未授权", truck_license);
} }
Transport oldtransport = TransportService.me.undoneTransport(supermarket_id, truck_license); Transport oldtransport = TransportService.me.undoneTransport(supermarket_id, truck_license);
@ -611,13 +611,6 @@ public class TransportSyncService {
@Override @Override
public boolean run() { public boolean run() {
try { try {
if (!AuthLicenseService.me.isAuthLicense(truck_license)) {
AuthLicense authlic = new AuthLicense();
authlic.setTruckLicense(truck_license);
authlic.save();
}
return transport.save() return transport.save()
&& SyncTaskService.me.save(new SyncTask().addSaveData(transport)) && SyncTaskService.me.save(new SyncTask().addSaveData(transport))
&& ModifyLogService.me.save(transport, null, Enums.DataOpType.SAVE.getId(), sysuser); && ModifyLogService.me.save(transport, null, Enums.DataOpType.SAVE.getId(), sysuser);
@ -653,8 +646,8 @@ public class TransportSyncService {
// 是预付，则肯定是销售或者外销，如果有物流公司id，则肯定是销售，否是外销 // 是预付，则肯定是销售或者外销，如果有物流公司id，则肯定是销售，否是外销
OrderclusterTruck ot = OrderclusterTruckService.me.checkValidLicense(supermarket_id, truck_license); OrderclusterTruck ot = OrderclusterTruckService.me.checkValidLicense(supermarket_id, truck_license);
if (ot == null && !AuthLicenseService.me.isAuthLicense(truck_license)) { if (ot == null ) {
return Result.failedstr("车牌【%s】未授权，或者第一次入场", truck_license); return Result.failedstr("车牌【%s】未授权", truck_license);
} }
Transport oldtransport = TransportService.me.undoneTransport(supermarket_id, truck_license); Transport oldtransport = TransportService.me.undoneTransport(supermarket_id, truck_license);

2
ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/invoice/receive/InvoiceReceiveSyncService.java
View File

@ -35,7 +35,7 @@ public class InvoiceReceiveSyncService extends BaseSyncService {
return Result.failed("砂站信息无效"); return Result.failed("砂站信息无效");
} }
if(supermarket.getIsdeploy() == 1){ if (supermarket.getIsdeploy() == 0) {
return Result.failedstr("[%s]砂站还未部署", supermarket.getName()); return Result.failedstr("[%s]砂站还未部署", supermarket.getName());
} }

6
ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterSyncService.java
View File

@ -88,7 +88,7 @@ public class OrderclusterSyncService extends BaseSyncService {
return Result.failed("砂站信息无效"); return Result.failed("砂站信息无效");
} }
if(supermarket.getIsdeploy() == 1){ if(supermarket.getIsdeploy() == 0){
return Result.failedstr("[%s]砂站还未部署", supermarket.getName()); return Result.failedstr("[%s]砂站还未部署", supermarket.getName());
} }
@ -218,7 +218,7 @@ public class OrderclusterSyncService extends BaseSyncService {
return Result.failed("砂站信息无效"); return Result.failed("砂站信息无效");
} }
if(supermarket.getIsdeploy() == 1){ if(supermarket.getIsdeploy() == 0){
return Result.failedstr("[%s]砂站还未部署", supermarket.getName()); return Result.failedstr("[%s]砂站还未部署", supermarket.getName());
} }
@ -395,7 +395,7 @@ public class OrderclusterSyncService extends BaseSyncService {
return Result.failed("砂站信息无效"); return Result.failed("砂站信息无效");
} }
if(supermarket.getIsdeploy() == 1){ if(supermarket.getIsdeploy() == 0){
return Result.failedstr("[%s]砂站还未部署", supermarket.getName()); return Result.failedstr("[%s]砂站还未部署", supermarket.getName());
} }