java_project
/
logisticsplatform-service
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

Merge branch 'dev' into pre-production

master
汤建军 11 months ago
parent
d47b953fe4 c9cc3e0b03
commit
8bfe0c5263
3 changed files with 18 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml
  2. 5
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
  3. 18
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java

1
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml
Unescape View File

@ -95,6 +95,7 @@
ldpl.service_number serviceNumber, ldpl.service_number serviceNumber,
ldpl.waybill_number waybillNumber, ldpl.waybill_number waybillNumber,
ldpl.order_package_code orderPackageCode, ldpl.order_package_code orderPackageCode,
ldpl.order_code,
ldpl.warehouse warehouse, ldpl.warehouse warehouse,
ldpl.firsts firsts, ldpl.firsts firsts,
ldpl.SECOND SECOND, ldpl.SECOND SECOND,

5
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
Unescape View File

@ -2940,8 +2940,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
if (flag){ if (flag){
throw new RuntimeException(s.getOrderCode()+"正在操作,请刷新后尝试"); throw new RuntimeException(s.getOrderCode()+"正在操作,请刷新后尝试");
}else { }else {
bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "orderCode:" + s.getOrderCode(),packageLockIds,5*60L); packageLockIds.addAll(a);
bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "orderCode:" + s.getOrderCode(),packageLockIds,1*60L);
} }
}else {
bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "orderCode:" + s.getOrderCode(),packageLockIds,1*60L);
} }
} }
}); });

18
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
Unescape View File

@ -1687,7 +1687,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
int indexOf = ids.indexOf(parcelListEntity.getId()); int indexOf = ids.indexOf(parcelListEntity.getId());
if (indexOf>0){ if (indexOf>0){
ids.remove(indexOf); ids.remove(indexOf);
bladeRedis.set("warehouseId:" + myCurrentWarehouse.getId() + "orderCode:" + parcelListEntity.getOrderCode(),ids); bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "orderCode:" + parcelListEntity.getOrderCode(),ids,1*60L);
} }
} }
//移除缓存 //移除缓存
@ -1802,8 +1802,10 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
throw new RuntimeException(v.get(0).getOrderCode()+"正在操作,请刷新后尝试"); throw new RuntimeException(v.get(0).getOrderCode()+"正在操作,请刷新后尝试");
}else { }else {
packageLockIds.addAll(a); packageLockIds.addAll(a);
bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "orderCode:" + v.get(0).getOrderCode(),packageLockIds,5*60L); bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "orderCode:" + v.get(0).getOrderCode(),packageLockIds,1*60L);
} }
}else {
bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "orderCode:" + v.get(0).getOrderCode(),packageLockIds,1*60L);
} }
} }
}); });
@ -2356,9 +2358,13 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
if (flag){ if (flag){
log.info("###################商配存在同时操作订单，订单号：" + s.getOrderCode() + "###################"); log.info("###################商配存在同时操作订单，订单号：" + s.getOrderCode() + "###################");
throw new RuntimeException(s.getOrderCode()+"正在操作,请刷新后尝试"); throw new RuntimeException(s.getOrderCode()+"正在操作,请刷新后尝试");
}else {
packageLockIds.addAll(a);
bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "orderCode:" + s.getOrderCode(),packageLockIds,1*60L);
} }
}else { }else {
bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "orderCode:" + s.getOrderCode(),packageLockIds,5*60L); bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "orderCode:" + s.getOrderCode(),packageLockIds,1*60L);
} }
} }
}); });
@ -3390,10 +3396,12 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
//当前操作包件存在于缓存中，此次操作无效 //当前操作包件存在于缓存中，此次操作无效
throw new RuntimeException(s.getOrderCode()+"正在操作,请刷新后尝试"); throw new RuntimeException(s.getOrderCode()+"正在操作,请刷新后尝试");
}else { }else {
bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + s.getOrderCode(),packageLockIds,5*60L); packageLockIds.addAll(a);
bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + s.getOrderCode(),packageLockIds,1*60L);
} }
}else { }else {
bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId()+"orderCode:" + s.getOrderCode(),packageLockIds,5*60L); bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + s.getOrderCode(),packageLockIds,1*60L);
} }
} }
}); });

Write Preview
Loading…
Cancel
Save