Browse Source

fix:优化代码

pull/37/head
pref_mail@163.com 12 months ago
parent
commit
c0cfda0727
  1. 1
      blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java
  2. 2
      blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java
  3. 2
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java
  4. 1
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java
  5. 1
      blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java
  6. 7
      blade-service/logpm-report/src/main/java/com/logpm/report/mapper/StockOutDetailMapper.java
  7. 2
      blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/IndexCountServiceImpl.java
  8. 1
      blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/StockOutDetailServiceImp.java

1
blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java

@ -2,6 +2,7 @@ package org.springblade.common.constant;
/**
* 模块子工程名称
* @author chao
*/
public interface ModuleNameConstant {

2
blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java

@ -2083,7 +2083,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
}
AftersalesCustomerMallEntity finalChoice = null; //最终 确定的AftersalesCustomerMallEntity
for (AftersalesCustomerMallEntity aftersalesCustomerMallEntity : aftersalesCustomerMallList) {
if (aftersalesCustomerMallEntity.getConditions().equals("1")) {
if ("1".equals(aftersalesCustomerMallEntity.getConditions())) {
finalChoice = aftersalesCustomerMallEntity;
break;
}

2
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java

@ -95,7 +95,7 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
private static Long ids;
private Long ids;
@Override

1
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java

@ -243,6 +243,7 @@ public class DistributionDeliveryInfoServiceImpl extends BaseServiceImpl<Distrib
return page.setRecords(distributionDeliveryInfoVOS);
}
@Override
public List<DistributionStockArticleVO> selectDistributionDeliveryorderByDeliveryId(Map<String, Object> distributionStockArticle) {
String deliveryId = (String) distributionStockArticle.get("deliveryId");
List<DistributionStockArticleVO> distributionDeliveryInfoVOS = baseMapper.selectDistributionDeliveryOrderPageByDeliveryId(Long.parseLong(deliveryId));

1
blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java

@ -419,6 +419,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
* @param orderStatusDTO
* @return
*/
@Override
public boolean retryHandleStatusData(OrderStatusDTO orderStatusDTO){
R res = handleStatusData(orderStatusDTO, true);
return res.getCode() == 200;

7
blade-service/logpm-report/src/main/java/com/logpm/report/mapper/StockOutDetailMapper.java

@ -22,5 +22,10 @@ public interface StockOutDetailMapper {
Long getCount(StockOutDetailVO where);
Integer getWarehouseIdByWarehouseName(@Param("name") String $name);
/**
* 根据仓库名称获取仓库id
* @param name 仓库名称
* @return 仓库ID
*/
Integer getWarehouseIdByWarehouseName(@Param("name") String name);
}

2
blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/IndexCountServiceImpl.java

@ -42,10 +42,10 @@ public class IndexCountServiceImpl implements IndexCountService {
/**
* 获取在库统计数据
*/
@Override
@Cacheable(value = "indexCount=10")
public IndexCountVO indexCount() {
IndexCountVO indexCountVo = new IndexCountVO();
List<Long> warehouse = billingService.getWarehouse();
indexCountVo.setInStoreData(inStoreData(warehouse));

1
blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/StockOutDetailServiceImp.java

@ -40,6 +40,7 @@ public class StockOutDetailServiceImp implements StockOutDetailService {
* @param query 基本参数 page
* @param stockOutDetailVO 搜索参数
*/
@Override
public IPage<StockOutDetailVO> report(Query query, StockOutDetailVO stockOutDetailVO) {
// query.put("warehouse_id", getWarehouseIdByName((String) query.get("warehouseName")));

Loading…
Cancel
Save