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

Merge remote-tracking branch 'origin/dev' into dev

dist.1.3.0
zhaoqiaobo 9 months ago
parent
1a56c005c6 be7a38736c
commit
1dbe0d881d
10 changed files with 301 additions and 119 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      blade-biz-common/src/main/java/org/springblade/common/constant/LauncherConstant.java
  2. 1
      blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesDeliverVO.java
  3. 2
      blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalPackageMapper.xml
  4. 9
      blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java
  5. 3
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
  6. 10
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml
  7. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
  8. 330
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
  9. 12
      blade-service/logpm-factory-data/logpm-factory-data-base/src/main/resources/application-prod.yml
  10. 11
      blade-service/logpm-factory-data/logpm-factory-data-base/src/main/resources/application.yml

2
blade-biz-common/src/main/java/org/springblade/common/constant/LauncherConstant.java
Unescape View File

@ -102,7 +102,7 @@ public interface LauncherConstant {
/**
* 本地登录 pord地址
*/
String APPLICATION_PROD_LOGIN_ADDR = "192.168.5.14:13000";
String APPLICATION_PROD_LOGIN_ADDR = "172.16.128.147:8888";
/**

1
blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesDeliverVO.java
Unescape View File

@ -11,4 +11,5 @@ public class AftersalesDeliverVO {
private Date taskTime; //配送时间
private String driverName; //配送司机
private String vehicleName; //车牌
private Long id; //车次ID
}

2
blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalPackageMapper.xml
Unescape View File

@ -65,7 +65,7 @@
</select>
<select id="getDeliver" resultType="com.logpm.aftersales.vo.AftersalesDeliverVO">
SELECT
lddl.train_number,lddl.vehicle_name,lddl.task_time,lddl.driver_name
lddl.train_number,lddl.vehicle_name,lddl.task_time,lddl.driver_name,lddl.id
FROM
logpm_distribution_reservation_package AS ldrp
LEFT JOIN logpm_distribution_reservation AS ldr ON ldrp.reservation_id = ldr.id

9
blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java
Unescape View File

@ -357,6 +357,13 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
if (ObjectUtils.isNotNull(aftersalesWorkOrder.getAftersalesProcessingResultsDTO()) && ObjectUtils.isNotNull(aftersalesWorkOrder.getAftersalesProcessingResultsDTO().getCompensationMethod())) {
aftersalesWorkOrder.setWorkOrderStatus(WorkOrderStatusConstant.chulijeiguoyitianxei.getValue());
}
if (!Func.isEmpty(aftersalesWorkOrder.getVehicleRoute())){
if (aftersalesWorkOrder.getVehicleRoute().indexOf("&gt;")>0){
String string = aftersalesWorkOrder.getVehicleRoute().replaceAll("&gt;", ">");
aftersalesWorkOrder.setVehicleRoute(string);
}
}
baseMapper.insert(aftersalesWorkOrder);
} else {
//修改
@ -414,8 +421,6 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
}
//
baseMapper.updateById(aftersalesWorkOrder);
}
//添加包件信息
if (ObjectUtils.isNotNull(aftersalesWorkOrder.getPackageEntityList())) {

3
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
Unescape View File

@ -653,6 +653,9 @@
<if test="par.mallName != null and par.mallName != '' ">
and ldsa.mall_name like concat('%',#{par.mallName},'%')
</if>
<if test="par.mallId != null and par.mallId != '' ">
and ldsa.mall_id = #{par.mallId}
</if>
<if test="par.storeName != null and par.storeName != '' ">
and ldsa.store_name like concat('%',#{par.storeName},'%')
</if>

10
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml
Unescape View File

@ -555,8 +555,14 @@
</select>
<select id="getDetailOne" resultType="com.logpm.distribution.vo.DistrilbutionBillLadingDetailsVO">
select lad.id,lad.pick_up_time ,lad.consignee ,lad.pick_up_plate ,lad.delivery_document ,lad.certificate_type
,lad.total_cost
select lad.id,
lad.pick_up_time ,
lad.consignee ,
lad.pick_up_plate ,
lad.delivery_document ,
lad.certificate_type ,
lad.total_cost,
lad.remark
from logpm_distrilbution_bill_lading lad
<where>
lad.id = #{id}

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

@ -2666,7 +2666,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
return Resp.scanSuccessWithData("签收成功", str, orderPackageCodes);
} catch (Exception e) {
log.error(">>>>> 签收异常报错", e);
throw new CustomerException("当前登录信息不已失效，请重新登录");
throw new CustomerException("当前登录信息已失效，请重新登录");
}
}

330
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
Unescape View File

@ -154,6 +154,8 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
private IDisStockListDetailService disStockListDetailService;
@Autowired
private BladeRedis redis;
@Autowired
@Resource
private FactoryDataMessageSender factoryDataMessageSender;
@Resource
@ -378,92 +380,157 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
}*/
//修改库存品
if (!distrilbutionBillLading.getStockDTOList().isEmpty()) {
List<DistributionStockListDTO> stockDTOList = distrilbutionBillLading.getStockDTOList();
boolean flag = stockDTOList.stream().anyMatch(distributionStockListDTO -> Func.isEmpty(distributionStockListDTO.getInventoryQuantity())|| distributionStockListDTO.getInventoryQuantity().equals(0));
if (flag){
String collect = stockDTOList.stream().filter(distributionStockListDTO -> Func.isEmpty(distributionStockListDTO.getInventoryQuantity())).map(DistributionStockListDTO::getIncomingBatch).collect(Collectors.joining(","));
log.info("自提修改库存品未填写数量>>>未填写库存品批次号:{}",collect);
throw new RuntimeException("请填写正确的库存品数量");
}
//全部库存品数据
List<DistributionDeliveryDetailsEntity> listDetails = distributionDeliveryDetailsService.list(Wrappers.<DistributionDeliveryDetailsEntity>query().lambda()
.eq(DistributionDeliveryDetailsEntity::getBillLadingId, distrilbutionBillLading.getId())
.ne(DistributionDeliveryDetailsEntity::getInventoryStatus, "2")
);
Map<Long, List<DistributionDeliveryDetailsEntity>> map = null;
if (!listDetails.isEmpty()){
List<Long> ids = new ArrayList<>();
//有
//修改
listDetails.forEach(i -> {
boolean b = distrilbutionBillLading.getStockDTOList().stream().anyMatch(a -> i.getStockListId().equals(a.getId()));
//查询是否存签收扫描数量
map = listDetails.stream().collect(Collectors.groupingBy(DistributionDeliveryDetailsEntity::getStockListId));
}
for (DistributionStockListDTO distributionStockListDTO : stockDTOList) {
if (!map.isEmpty()){
DistributionDeliveryDetailsEntity distributionDeliveryDetailsEntity = map.get(distributionStockListDTO.getId()).get(0);
Integer quantity = distributionDeliveryDetailsEntity.getQuantity();
int i = quantity - distributionStockListDTO.getInventoryQuantity();
DistributionDeliveryDetailsEntity deliveryDetails = new DistributionDeliveryDetailsEntity();
deliveryDetails.setId(distributionDeliveryDetailsEntity.getId());
List<DistributionStockEntity> list1 = distributionStockService.list(Wrappers.<DistributionStockEntity>query().lambda()
.eq(DistributionStockEntity::getBillLadingId, distrilbutionBillLading.getId())
.eq(DistributionStockEntity::getStockListId, i.getStockListId())
.eq(DistributionStockEntity::getStockListId, distributionDeliveryDetailsEntity.getStockListId())
.eq(DistributionStockEntity::getType, "2")
);
if (i != 0){
deliveryDetails.setStockStatus("1");
if (i > 0){
deliveryDetails.setQuantity(distributionDeliveryDetailsEntity.getQuantity() - i);
if (b) {
//有
Iterator<DistributionStockListDTO> iterator = distrilbutionBillLading.getStockDTOList().iterator();
while (iterator.hasNext()) {
DistributionStockListDTO next = iterator.next();
if (i.getStockListId().equals(next.getId())) {
DistributionDeliveryDetailsEntity deliveryDetails = new DistributionDeliveryDetailsEntity();
deliveryDetails.setQuantity(next.getInventoryQuantity());
deliveryDetails.setId(i.getId());
distributionDeliveryDetailsService.updateById(deliveryDetails);
Integer inventoryQuantity = next.getInventoryQuantity(); //修改数量
Integer quantity = i.getQuantity();//原来的数量
int num = 0;
if (inventoryQuantity > quantity) {
num = inventoryQuantity - quantity; //多 添加了数量
//修改库存占用数量
distributionAsyncService.getInventoryNumUpdate(i.getStockListId(), num, 1);
//kk备货
if ("20".equals(i.getConditions())) {
//xiugai
DistributionDeliveryDetailsEntity d = new DistributionDeliveryDetailsEntity();
d.setId(i.getId());
d.setConditions(BillLadingStatusConstant.daitihuo.getValue());
distributionDeliveryDetailsService.updateById(d);
}
} else if (inventoryQuantity < quantity) {
num = quantity - inventoryQuantity; //少 减少了数量
/*if(list1.size() < 1){
}else{
//有备货
}*/
if ("20".equals(i.getConditions())) {
//todo 已完成
//减少
//查询原有包件
List<DisStockListDetailEntity> stockListDetailEntities = disStockListDetailService.list(Wrappers.<DisStockListDetailEntity>query().lambda()
.eq(DisStockListDetailEntity::getStockListId, distributionStockListDTO.getId())
.eq(DisStockListDetailEntity::getReservationId, distrilbutionBillLading.getId())
.ne(DisStockListDetailEntity::getStockPackageStatus, "2")
);
boolean a = false;
if (!stockListDetailEntities.isEmpty()){
int sum = stockListDetailEntities.stream().filter(f -> !Func.isEmpty(f.getStockPackageCode())).mapToInt(DisStockListDetailEntity::getNum).sum();
log.info("自提修改库存品>>>>>>>>当前计划数量:{},备货数量:{}",deliveryDetails.getQuantity(),sum);
// 优先取消未备货
if (sum > 0){
//存在备货
throw new RuntimeException("该库存品已备货无法减少");
// if (sum >= deliveryDetails.getQuantity()) {
// //满足备货或者备货数量超过
//
// }else {
//
//
// }
}else {
//todo 未完成
int size = list1.size(); //扫描的数量
int i1 = quantity - size; //未扫的数量
if (i1 > num) {
//可以减少
//修改库存占用数量
distributionAsyncService.getInventoryNumUpdate(i.getStockListId(), num, 2);
} else {
//todo 未扫小于减少
}
//对于包件进行随机删除
List<Long> ids = stockListDetailEntities.subList(0, i).stream().map(DisStockListDetailEntity::getId).collect(Collectors.toList());
disStockListDetailService.removeBatchByIds(ids);
distributionAsyncService.getInventoryNumUpdate(distributionStockListDTO.getId(), i, 2);
}
}
iterator.remove();
//回复对应库存品的冻结数量
//删除对应的包件维度数据
if (!list1.isEmpty()){
int sum = list1.stream().mapToInt(DistributionStockEntity::getStockQuantity).sum();
if (sum == deliveryDetails.getQuantity()){
deliveryDetails.setStockStatus("3");
}else {
deliveryDetails.setStockStatus("1");
}
}
}else {
if (list1.isEmpty()) {
//取消库存占用数量
distributionAsyncService.getInventoryNumUpdate(i.getStockListId(), i.getQuantity(), 2);
//增加
//生成包件
deliveryDetails.setQuantity(distributionDeliveryDetailsEntity.getQuantity() - i);
List<DisStockListDetailEntity> disStockListDetailEntities = new ArrayList<>();
for (int i1 = 0; i1 < -i; i1++) {
DisStockListDetailEntity disStockListDetailEntity = new DisStockListDetailEntity();
disStockListDetailEntity.setReservationId(distrilbutionBillLading.getId());
disStockListDetailEntity.setStockListId(distributionStockListDTO.getId());
disStockListDetailEntity.setNum(1);
disStockListDetailEntity.setWarehouseId(distributionStockListDTO.getWarehouseId());
disStockListDetailEntity.setWarehouseName(distributionStockListDTO.getWarehouseName());
disStockListDetailEntity.setStockPackageStatus("3");
disStockListDetailEntity.setStockLockingStatus("10");
disStockListDetailEntity.setStockStatus("10");
disStockListDetailEntity.setStockSignfoStatus("10");
disStockListDetailEntity.setSku(distributionStockListDTO.getCargoNumber());
disStockListDetailEntity.setStockType("10");
disStockListDetailEntities.add(disStockListDetailEntity);
}
disStockListDetailService.saveBatch(disStockListDetailEntities);
//对于该库存品冻结数量进行增加
distributionAsyncService.getInventoryNumUpdate(distributionStockListDTO.getId(), i, 2);
if (!list1.isEmpty()){
deliveryDetails.setStockStatus("2");
}
//没有 删除
ids.add(i.getId());
}
distributionDeliveryDetailsService.updateById(deliveryDetails);
}
} else {
DistributionDeliveryDetailsEntity deliveryDetails = new DistributionDeliveryDetailsEntity();
deliveryDetails.setBillLadingId(distrilbutionBillLading.getId());
deliveryDetails.setStockListId(distributionStockListDTO.getId());
deliveryDetails.setQuantity(distributionStockListDTO.getInventoryQuantity());
deliveryDetails.setInventoryStatus("3");
deliveryDetails.setConditions("10");
deliveryDetails.setStockStatus("1");
distributionDeliveryDetailsService.save(deliveryDetails);
distributionAsyncService.getInventoryNumUpdate(deliveryDetails.getStockListId(), deliveryDetails.getQuantity(), 1);
//增加
List<DisStockListDetailEntity> disStockListDetailEntities = new ArrayList<>();
for (int i1 = 0; i1 < deliveryDetails.getQuantity(); i1++) {
DisStockListDetailEntity disStockListDetailEntity = new DisStockListDetailEntity();
disStockListDetailEntity.setReservationId(distrilbutionBillLading.getId());
disStockListDetailEntity.setStockListId(distributionStockListDTO.getId());
disStockListDetailEntity.setNum(1);
disStockListDetailEntity.setWarehouseId(distributionStockListDTO.getWarehouseId());
disStockListDetailEntity.setWarehouseName(distributionStockListDTO.getWarehouseName());
disStockListDetailEntity.setStockPackageStatus("3");
disStockListDetailEntity.setStockLockingStatus("10");
disStockListDetailEntity.setStockStatus("10");
disStockListDetailEntity.setStockSignfoStatus("10");
disStockListDetailEntity.setSku(distributionStockListDTO.getCargoNumber());
disStockListDetailEntity.setStockType("10");
disStockListDetailEntities.add(disStockListDetailEntity);
}
disStockListDetailService.saveBatch(disStockListDetailEntities);
//进行包件维度的构建
}
map.remove(distributionStockListDTO.getId());
}
if (!map.isEmpty()) {
List<Long> ids = new ArrayList<>();
//进行删除
map.forEach((k,v)->{
ids.add(v.get(0).getId());
distributionAsyncService.getInventoryNumUpdate(k, v.get(0).getQuantity(), 2);
//删除
disStockListDetailService.remove(Wrappers.<DisStockListDetailEntity>query().lambda()
.eq(DisStockListDetailEntity::getReservationId,distrilbutionBillLading.getId())
.eq(DisStockListDetailEntity::getStockListId,k)
.eq(DisStockListDetailEntity::getStockPackageStatus,"2")
);
});
//删除没有的库存品
if (!ids.isEmpty()) {
@ -474,7 +541,100 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
distributionDeliveryDetailsService.updateById(deliveryDetails);
});
}
}
// if (!listDetails.isEmpty()) {
// List<Long> ids = new ArrayList<>();
// //有
// //修改
// listDetails.forEach(i -> {
// boolean b = distrilbutionBillLading.getStockDTOList().stream().anyMatch(a -> i.getStockListId().equals(a.getId()));
// //查询是否存签收扫描数量
// List<DistributionStockEntity> list1 = distributionStockService.list(Wrappers.<DistributionStockEntity>query().lambda()
// .eq(DistributionStockEntity::getBillLadingId, distrilbutionBillLading.getId())
// .eq(DistributionStockEntity::getStockListId, i.getStockListId())
// .eq(DistributionStockEntity::getType, "2")
// );
// if (b) {
// //有
// Iterator<DistributionStockListDTO> iterator = distrilbutionBillLading.getStockDTOList().iterator();
// while (iterator.hasNext()) {
// DistributionStockListDTO next = iterator.next();
// if (i.getStockListId().equals(next.getId())) {
// DistributionDeliveryDetailsEntity deliveryDetails = new DistributionDeliveryDetailsEntity();
// deliveryDetails.setQuantity(next.getInventoryQuantity());
// deliveryDetails.setId(i.getId());
// distributionDeliveryDetailsService.updateById(deliveryDetails);
// Integer inventoryQuantity = next.getInventoryQuantity(); //修改数量
// Integer quantity = i.getQuantity();//原来的数量
// int num = 0;
//
// if (inventoryQuantity > quantity) {
// num = inventoryQuantity - quantity; //多 添加了数量
// //修改库存占用数量
// distributionAsyncService.getInventoryNumUpdate(i.getStockListId(), num, 1);
// //kk备货
// if ("20".equals(i.getConditions())) {
// //xiugai
// DistributionDeliveryDetailsEntity d = new DistributionDeliveryDetailsEntity();
// d.setId(i.getId());
// d.setConditions(BillLadingStatusConstant.daitihuo.getValue());
// d.setInventoryStatus("3");
// distributionDeliveryDetailsService.updateById(d);
// }
// } else if (inventoryQuantity < quantity) {
// num = quantity - inventoryQuantity; //少 减少了数量
// /*if(list1.size() < 1){
//
// }else{
// //有备货
// }*/
//
// if ("20".equals(i.getConditions())) {
// //todo 已完成
//
// } else {
// //todo 未完成
// int size = list1.size(); //扫描的数量
// int i1 = quantity - size; //未扫的数量
// if (i1 > num) {
// //可以减少
// //修改库存占用数量
// distributionAsyncService.getInventoryNumUpdate(i.getStockListId(), num, 2);
// } else {
// //todo 未扫小于减少
//
// }
//
// }
//
// }
// iterator.remove();
// }
//
// }
// } else {
//
// if (list1.isEmpty()) {
// //取消库存占用数量
// distributionAsyncService.getInventoryNumUpdate(i.getStockListId(), i.getQuantity(), 2);
// }
// //没有 删除
// ids.add(i.getId());
//
// }
// });
// //删除没有的库存品
// if (!ids.isEmpty()) {
// ids.forEach(a -> {
// DistributionDeliveryDetailsEntity deliveryDetails = new DistributionDeliveryDetailsEntity();
// deliveryDetails.setId(a);
// deliveryDetails.setInventoryStatus("2");
// distributionDeliveryDetailsService.updateById(deliveryDetails);
// });
// }
// }
} else {
updateStockBill(distrilbutionBillLading);
}
@ -741,12 +901,13 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
if (!distrilbutionBillLading.getPrintList().isEmpty()) {
addPrint(distrilbutionBillLading);
}
}
//添加库存品信息
if (!distrilbutionBillLading.getStockDTOList().isEmpty()) {
boolean flag = distrilbutionBillLading.getStockDTOList().stream().anyMatch(distributionStockListDTO -> Func.isEmpty(distributionStockListDTO.getInventoryQuantity()) || distributionStockListDTO.getInventoryQuantity().equals(0));
if (flag){
String collect = distrilbutionBillLading.getStockDTOList().stream().filter(distributionStockListDTO -> Func.isEmpty(distributionStockListDTO.getInventoryQuantity())).map(DistributionStockListDTO::getIncomingBatch).collect(Collectors.joining(","));
log.info("自提添加库存品未填写数量>>>未填写库存品批次号:{}",collect);
throw new RuntimeException("请填写正确的库存品数量");
}
//没有
List<DistributionDeliveryDetailsEntity> detailsEntities = new ArrayList<>();
Boolean finalLas = las;
@ -757,18 +918,35 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
details.setQuantity(i.getInventoryQuantity());
details.setConditions(BillLadingStatusConstant.daitihuo.getValue());
details.setRealityQuantity(0);
if (finalLas) {
details.setInventoryStatus("2");
} else {
details.setInventoryStatus("1");
}
List<DisStockListDetailEntity> list = new ArrayList<>();
for (int i1 = 0; i1 < details.getQuantity(); i1++) {
DisStockListDetailEntity disStockListDetailEntity = new DisStockListDetailEntity();
disStockListDetailEntity.setReservationId(distrilbutionBillLading.getId());
disStockListDetailEntity.setStockListId(details.getStockListId());
disStockListDetailEntity.setNum(1);
disStockListDetailEntity.setWarehouseId(i.getWarehouseId());
disStockListDetailEntity.setWarehouseName(i.getWarehouseName());
disStockListDetailEntity.setStockPackageStatus("1");
disStockListDetailEntity.setStockLockingStatus("10");
disStockListDetailEntity.setStockStatus("10");
disStockListDetailEntity.setStockSignfoStatus("10");
disStockListDetailEntity.setSku(i.getCargoNumber());
disStockListDetailEntity.setStockType("10");
list.add(disStockListDetailEntity);
}
disStockListDetailService.saveBatch(list);
detailsEntities.add(details);
//修改库存数量
distributionAsyncService.getInventoryNumUpdate(i.getId(), i.getInventoryQuantity(), 1);
distributionAsyncService.getInventoryNumUpdate(i.getId(), i.getInventoryQuantity(), 2);
});
distributionDeliveryDetailsService.saveBatch(detailsEntities);
}
}
//添加库存品信息
//添加费用
if (!distrilbutionBillLading.getFei().isEmpty()) {
//删除和自提相关的所有费用
@ -1694,7 +1872,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
List<Long> collect = parcelListEntities.stream().map(DistributionParcelListEntity::getId).collect(Collectors.toList());
distributionParcelListService.update(Wrappers.<DistributionParcelListEntity>update()
.in("id", collect)
.set("order_package_reservation_status", OrderPackageReservationStatusConstant.daiyuyue.getValue())
.set("order_package_reservation_status", OrderPackageReservationStatusConstant.yiyueyue.getValue())
);
}else {
log.error("#########################无可用包件orderIds:{}",addOrderIds);

12
blade-service/logpm-factory-data/logpm-factory-data-base/src/main/resources/application-prod.yml
Unescape View File

@ -30,18 +30,18 @@ spring:
validation-query: select 1
#oracle校验
#validation-query: select 1 from dual
url: ${blade.datasource.report.master.url}
username: ${blade.datasource.report.master.username}
password: ${blade.datasource.report.master.password}
url: ${blade.datasource.factorydata-base.master.url}
username: ${blade.datasource.factorydata-base.master.username}
password: ${blade.datasource.factorydata-base.master.password}
627683:
druid:
#独立校验配置
validation-query: select 1
#oracle校验
#validation-query: select 1 from dual
url: ${blade.datasource.report.627683.url}
username: ${blade.datasource.report.627683.username}
password: ${blade.datasource.report.627683.password}
url: ${blade.datasource.factorydata-base.627683.url}
username: ${blade.datasource.factorydata-base.627683.username}
password: ${blade.datasource.factorydata-base.627683.password}
blade:
data-scope:
enabled: false

11
blade-service/logpm-factory-data/logpm-factory-data-base/src/main/resources/application.yml
Unescape View File

@ -29,14 +29,3 @@ spring:
main:
allow-circular-references: true
xxl:
job:
accessToken: ''
admin:
addresses: http://127.0.0.1:7009/xxl-job-admin
executor:
appname: logpm-factory-data-xxljob
ip: 127.0.0.1
logpath: ../data/applogs/logpm-factory-data-xxljob/jobhandler
logretentiondays: -1
port: 17019

Write Preview
Loading…
Cancel
Save