lisai17@sina.com 2020-09-14 22:39:00 +08:00
parent 7b6c06f02f
commit 1fd35f224f
4 changed files with 30 additions and 7 deletions

View File

@ -581,6 +581,12 @@ public class TransportSyncService {
return Result.failedstr("车牌【%s】在黑名单中", truck_license); return Result.failedstr("车牌【%s】在黑名单中", truck_license);
} }
OrderclusterTruck ot = OrderclusterTruckService.me.checkValidLicense(supermarket_id, truck_license);
if (ot == null && !AuthLicenseService.me.isAuthLicense(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);
if (oldtransport != null) { if (oldtransport != null) {

View File

@ -2,7 +2,7 @@
devMode=true devMode=true
#本地服务 和 云端服务 socket 通信 #本地服务 和 云端服务 socket 通信
socketserver.enable=true socketserver.enable=true
#socketserver.host=47.112.109.118 #socketserver.host=120.77.59.235
socketserver.host=localhost socketserver.host=localhost
socketserver.port=21002 socketserver.port=21002

View File

@ -31,9 +31,12 @@ public class InvoiceReceiveSyncService extends BaseSyncService {
receive.setReceiveUserName(receive_user.getName()); receive.setReceiveUserName(receive_user.getName());
Supermarket supermarket = SvrCacheData.SUP_CACHE.get(receive.getSupermarketId()); Supermarket supermarket = SvrCacheData.SUP_CACHE.get(receive.getSupermarketId());
if (supermarket == null) { if (supermarket == null) {
return Result.failed("未找到对应砂站信息"); return Result.failed("砂站信息无效");
}
if(supermarket.getIsdeploy() == 1){
return Result.failedstr("[%s]砂站还未部署", supermarket.getName());
} }
try { try {

View File

@ -83,8 +83,13 @@ public class OrderclusterSyncService extends BaseSyncService {
int mini_truck = obj.getIntValue("mini_truck"); int mini_truck = obj.getIntValue("mini_truck");
double total_weight = obj.getDouble("total_weight"); double total_weight = obj.getDouble("total_weight");
if (!SvrCacheData.SUP_CACHE.containsKey(supermarket_id)) { Supermarket supermarket = SvrCacheData.SUP_CACHE.get(supermarket_id);
return Result.failedstr("砂站id(%s)错误", supermarket_id); if (supermarket == null) {
return Result.failed("砂站信息无效");
}
if(supermarket.getIsdeploy() == 1){
return Result.failedstr("[%s]砂站还未部署", supermarket.getName());
} }
if (chksup.contains(supermarket_id)) { if (chksup.contains(supermarket_id)) {
@ -208,8 +213,13 @@ public class OrderclusterSyncService extends BaseSyncService {
String trucks, String trucks,
Sysuser sysuser Sysuser sysuser
) { ) {
if (!SvrCacheData.SUP_CACHE.containsKey(supermarket_id)) { Supermarket supermarket = SvrCacheData.SUP_CACHE.get(supermarket_id);
return Result.failedstr("砂站id(%s)错误", supermarket_id); if (supermarket == null) {
return Result.failed("砂站信息无效");
}
if(supermarket.getIsdeploy() == 1){
return Result.failedstr("[%s]砂站还未部署", supermarket.getName());
} }
List<Record> undonlist = OrderclusterService.me.undonlist(supermarket_id, customer_name); List<Record> undonlist = OrderclusterService.me.undonlist(supermarket_id, customer_name);
@ -385,6 +395,10 @@ public class OrderclusterSyncService extends BaseSyncService {
return Result.failed("砂站信息无效"); return Result.failed("砂站信息无效");
} }
if(supermarket.getIsdeploy() == 1){
return Result.failedstr("[%s]砂站还未部署", supermarket.getName());
}
Customer customerObj = Customer.dao.findById(model.getCustomerId()); Customer customerObj = Customer.dao.findById(model.getCustomerId());
// 传了客户id时用后端客户信息填充否则用前端传的 // 传了客户id时用后端客户信息填充否则用前端传的
if (customerObj != null) { if (customerObj != null) {