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

fix:修改原来的预约、备货、车次的号生成规则

dist.1.3.0
pref_mail@163.com 6 months ago
parent
cebe554e20
commit
b5b02e6f86
3 changed files with 11 additions and 22 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. 4
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
  2. 27
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
  3. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java

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

@ -7410,7 +7410,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
BladeUser user = AuthUtil.getUser(); BladeUser user = AuthUtil.getUser();
SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd"); SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
String format1 = format.format(new Date()); String format1 = format.format(new Date());
BasicdataWarehouseEntity warehouseByDepartment = warehouseClient.getWarehouseByDepartment(user.getDeptId()); BasicdataWarehouseEntity warehouseByDepartment = warehouseClient.getMyCurrentWarehouse();
if (ObjectUtil.isNotEmpty(warehouseByDepartment)) { if (ObjectUtil.isNotEmpty(warehouseByDepartment)) {
sb.append(warehouseByDepartment.getWarehouseCode()); sb.append(warehouseByDepartment.getWarehouseCode());
sb.append(format1); sb.append(format1);
@ -7435,7 +7435,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
BladeUser user = AuthUtil.getUser(); BladeUser user = AuthUtil.getUser();
SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd"); SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
String format1 = format.format(new Date()); String format1 = format.format(new Date());
BasicdataWarehouseEntity warehouseByDepartment = warehouseClient.getWarehouseByDepartment(user.getDeptId()); BasicdataWarehouseEntity warehouseByDepartment = warehouseClient.getMyCurrentWarehouse();
if (ObjectUtil.isNotEmpty(warehouseByDepartment)) { if (ObjectUtil.isNotEmpty(warehouseByDepartment)) {
sb.append(warehouseByDepartment.getWarehouseCode()); sb.append(warehouseByDepartment.getWarehouseCode());
sb.append(format1); sb.append(format1);

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

@ -523,9 +523,9 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
log.error("参数错误+{" + distributionReservationDTO + "}"); log.error("参数错误+{" + distributionReservationDTO + "}");
return R.status(false); return R.status(false);
} }
BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
if (Func.isEmpty(distributionReservationDTO.getWarehouseId())) { if (Func.isEmpty(distributionReservationDTO.getWarehouseId())) {
// 获取商场的仓库 // 获取商场的仓库
BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
distributionReservationDTO.setWarehouseId(myCurrentWarehouse.getId()); distributionReservationDTO.setWarehouseId(myCurrentWarehouse.getId());
distributionReservationDTO.setWarehouseName(myCurrentWarehouse.getName()); distributionReservationDTO.setWarehouseName(myCurrentWarehouse.getName());
if (Func.isEmpty(distributionReservationDTO.getWarehouseId())) { if (Func.isEmpty(distributionReservationDTO.getWarehouseId())) {
@ -534,19 +534,6 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
} }
} }
//
// if (Func.isEmpty(distributionReservationDTO.getWarehouseName())){
// log.error("WarehouseName参数错误+{" + distributionReservationDTO.getWarehouseName() + "}");
// return R.status(false);
// }
// BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
// if (Func.isEmpty(myCurrentWarehouse)) {
// return R.fail("无仓库信息!!!");
// }
//构建预约单 //构建预约单
DistributionReservationEntity reservationEntity = new DistributionReservationEntity(); DistributionReservationEntity reservationEntity = new DistributionReservationEntity();
Func.copy(distributionReservationDTO, reservationEntity); Func.copy(distributionReservationDTO, reservationEntity);
@ -958,7 +945,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
BladeUser user = AuthUtil.getUser(); BladeUser user = AuthUtil.getUser();
SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd"); SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
String format1 = format.format(new Date()); String format1 = format.format(new Date());
BasicdataWarehouseEntity warehouseByDepartment = basicdataWarehouseClient.getWarehouseByDepartment(user.getDeptId()); BasicdataWarehouseEntity warehouseByDepartment = basicdataWarehouseClient.getMyCurrentWarehouse();
if (ObjectUtil.isNotEmpty(warehouseByDepartment)) { if (ObjectUtil.isNotEmpty(warehouseByDepartment)) {
sb.append(warehouseByDepartment.getWarehouseCode()); sb.append(warehouseByDepartment.getWarehouseCode());
sb.append(format1); sb.append(format1);
@ -982,7 +969,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
BladeUser user = AuthUtil.getUser(); BladeUser user = AuthUtil.getUser();
SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd"); SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
String format1 = format.format(new Date()); String format1 = format.format(new Date());
BasicdataWarehouseEntity warehouseByDepartment = basicdataWarehouseClient.getWarehouseByDepartment(user.getDeptId()); BasicdataWarehouseEntity warehouseByDepartment = basicdataWarehouseClient.getMyCurrentWarehouse();
if (ObjectUtil.isNotEmpty(warehouseByDepartment)) { if (ObjectUtil.isNotEmpty(warehouseByDepartment)) {
sb.append(warehouseByDepartment.getWarehouseCode()); sb.append(warehouseByDepartment.getWarehouseCode());
sb.append(format1); sb.append(format1);
@ -1007,7 +994,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
BladeUser user = AuthUtil.getUser(); BladeUser user = AuthUtil.getUser();
SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd"); SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
String format1 = format.format(new Date()); String format1 = format.format(new Date());
BasicdataWarehouseEntity warehouseByDepartment = basicdataWarehouseClient.getWarehouseByDepartment(user.getDeptId()); BasicdataWarehouseEntity warehouseByDepartment = basicdataWarehouseClient.getMyCurrentWarehouse();
if (ObjectUtil.isNotEmpty(warehouseByDepartment)) { if (ObjectUtil.isNotEmpty(warehouseByDepartment)) {
sb.append(warehouseByDepartment.getWarehouseCode()); sb.append(warehouseByDepartment.getWarehouseCode());
sb.append(format1); sb.append(format1);
@ -1031,7 +1018,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
BladeUser user = AuthUtil.getUser(); BladeUser user = AuthUtil.getUser();
SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd"); SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
String format1 = format.format(new Date()); String format1 = format.format(new Date());
BasicdataWarehouseEntity warehouseByDepartment = basicdataWarehouseClient.getWarehouseByDepartment(user.getDeptId()); BasicdataWarehouseEntity warehouseByDepartment = basicdataWarehouseClient.getMyCurrentWarehouse();
if (ObjectUtil.isNotEmpty(warehouseByDepartment)) { if (ObjectUtil.isNotEmpty(warehouseByDepartment)) {
sb.append(warehouseByDepartment.getWarehouseCode()); sb.append(warehouseByDepartment.getWarehouseCode());
sb.append(format1); sb.append(format1);
@ -1328,7 +1315,9 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
DistributionStockupInfoEntity stockupInfoEntity = new DistributionStockupInfoEntity(); DistributionStockupInfoEntity stockupInfoEntity = new DistributionStockupInfoEntity();
stockupInfoEntity.setStockUpType(StockupTypeConstant.shipei.getValue()); stockupInfoEntity.setStockUpType(StockupTypeConstant.shipei.getValue());
stockupInfoEntity.setReservationId(ids.get(i)); stockupInfoEntity.setReservationId(ids.get(i));
stockupInfoEntity.setStockupId(stockupEntity.getId()); if(stockupEntity!=null){
stockupInfoEntity.setStockupId(stockupEntity.getId());
}
distributionStockupInfoService.save(stockupInfoEntity); distributionStockupInfoService.save(stockupInfoEntity);
reservationEntity.setStockupStatus(ReservationStockupStatusConstant.daibeihuo.getValue()); reservationEntity.setStockupStatus(ReservationStockupStatusConstant.daibeihuo.getValue());
} }

2
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
Unescape View File

@ -1760,7 +1760,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
} }
String deptId = AuthUtil.getDeptId(); String deptId = AuthUtil.getDeptId();
BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getWarehouseByDepartment(deptId); BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getMyCurrentWarehouse();
List<String> ls = new ArrayList<>(); List<String> ls = new ArrayList<>();
for (int i = 0; i < packageNum; i++) { for (int i = 0; i < packageNum; i++) {

Write Preview
Loading…
Cancel
Save