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

Merge branch 'dev' into pre-production

visual
zhaoqiaobo 6 months ago
parent
b8737d3e66 6c6e812a3b
commit
eee99b9af6
6 changed files with 85 additions and 66 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. 18
      blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataDriverArteryEntity.java
  2. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
  3. 81
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java
  4. 11
      blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml
  5. 4
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineLoadSignOrderMapper.xml
  6. 35
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java

18
blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataDriverArteryEntity.java
Unescape View File

@ -221,4 +221,22 @@ public class BasicdataDriverArteryEntity extends TenantEntity {
@ApiModelProperty(value = "仓库名称")
private String warehouseName;
/**
* 结算渠道
*/
@ApiModelProperty(value = "结算渠道 1-微信 2-支付宝 3-银行卡 4-现金")
private Integer settlementChannel ;
/**
* 结算渠道
*/
@ApiModelProperty(value = "结算账号")
private String settlementAccount ;
/**
* 合同
*/
@ApiModelProperty(value = "合同")
private String contract;
}

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

@ -775,7 +775,7 @@
AND ldpll.warehouse_id = #{par.warehouseId}
AND ldsa.type_service = #{par.typeService}
<if test="par.orderCode != null and par.orderCode != '' ">
and ldpll.order_code like concat(#{par.orderCode},'%')
and ldpll.order_code like concat('%',#{par.orderCode},'%')
</if>
GROUP BY ldpll.stock_article_id
HAVING SUM(ldpll.quantity) > 0

81
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java
Unescape View File

@ -28,8 +28,10 @@ import com.google.zxing.WriterException;
import com.logpm.basic.entity.BasicMaterialEntity;
import com.logpm.basic.feign.IBasicMaterialClient;
import com.logpm.basicdata.entity.BasicdataClientEntity;
import com.logpm.basicdata.entity.BasicdataGoodsAllocationEntity;
import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
import com.logpm.basicdata.feign.IBasicdataClientClient;
import com.logpm.basicdata.feign.IBasicdataGoodsAllocationClient;
import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
import com.logpm.distribution.dto.DistributionParcelListDTO;
import com.logpm.distribution.dto.app.StockupDTO;
@ -60,14 +62,14 @@ import com.logpm.distribution.vo.PackageStockupVO;
import com.logpm.distribution.service.*;
import com.logpm.distribution.vo.*;
import com.logpm.trunkline.feign.ITrunklinePackageTrackLogClient;
import com.logpm.warehouse.entity.WarehouseConfigEntity;
import com.logpm.warehouse.entity.WarehouseUpdownGoodsEntity;
import com.logpm.warehouse.entity.WarehouseWaybillEntity;
import com.logpm.warehouse.feign.IWarehouseTrayGoodsClient;
import com.logpm.warehouse.feign.IWarehouseUpdownGoodsClient;
import com.logpm.warehouse.feign.IWarehouseWaybillClient;
import com.logpm.warehouse.feign.*;
import lombok.extern.slf4j.Slf4j;
import org.springblade.common.constant.DictBizConstant;
import org.springblade.common.constant.WorkNodeEnums;
import org.springblade.common.constant.common.IsOrNoConstant;
import org.springblade.common.constant.order.OrderStockupStatusConstant;
import org.springblade.common.constant.orderpackage.OrderPackageLoadingStatusConstant;
import org.springblade.common.constant.orderpackage.OrderPackageReservationStatusConstant;
@ -126,6 +128,9 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
private IBasicdataWarehouseClient basicdataWarehouseClient;
@Autowired
private IWarehouseUpdownGoodsClient warehouseUpdownGoodsClient;
@Autowired
private IWarehouseUpdownTypeClient warehouseUpdownTypeClient;
@Autowired
private IWarehouseTrayGoodsClient warehouseTrayGoodsClient;
@Autowired
@ -163,6 +168,11 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
private IUserClient userClient;
@Autowired
private ITrunklinePackageTrackLogClient trunklinePackageTrackLogClient;
@Autowired
private IWarehouseConfigClient warehouseConfigClient;
@Autowired
private IBasicdataGoodsAllocationClient allocationClient;
// private final IDistributionStockArticleService distributionStockArticleService;
@Override
@ -511,7 +521,27 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
if (ObjectUtils.isNull(myCurrentWarehouse)) {
throw new ServiceException("请选择仓库！");
}
QueryWrapper<DistributionParcelListEntity> queryWrapper = new QueryWrapper<>();
WarehouseConfigEntity warehouseConfig = warehouseConfigClient.getWarehouseConfig(myCurrentWarehouse.getId());
BasicdataGoodsAllocationEntity defaultGoodsAllocation;
Integer isAutoWarehouse;
if (!Objects.isNull(warehouseConfig)){
if (!Objects.isNull(warehouseConfig.getIsAutoWarehouse())){
//查询备货库位
isAutoWarehouse = warehouseConfig.getIsAutoWarehouse() != null ? warehouseConfig.getIsAutoWarehouse() : 0;
if (isAutoWarehouse == Integer.parseInt(IsOrNoConstant.yes.getValue())){
defaultGoodsAllocation = allocationClient.findDefaultGoodsAllocation(myCurrentWarehouse.getId());
} else {
defaultGoodsAllocation = null;
}
} else {
defaultGoodsAllocation = null;
isAutoWarehouse = 0;
}
} else {
defaultGoodsAllocation = null;
isAutoWarehouse = 0;
}
QueryWrapper<DistributionParcelListEntity> queryWrapper = new QueryWrapper<>();
String s = String.valueOf(o);
if (s.contains(",")) {
String[] split = s.split(",");
@ -541,33 +571,6 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
int sum = v.stream().mapToInt(DistributionParcelListEntity::getQuantity).sum();
List<Long> packageIds = new ArrayList<>();
v.forEach(i -> {
//查询有没有打托数据
// //查询包件有没有物料
// List<DistributionParcelDetailsEntity> list = distributionParcelDetailsService.list(Wrappers.<DistributionParcelDetailsEntity>query().lambda()
// .eq(DistributionParcelDetailsEntity::getParcelListId, i.getId())
// );
// if (!list.isEmpty()) {
// //有
// list.stream().collect(Collectors.groupingBy(DistributionParcelDetailsEntity::getEncoded))
// .forEach((kk, vv) -> {
// DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity();
// BeanUtil.copyProperties(vv.get(0), parcelListEntity);
// parcelListEntity.setQuantity(sum);
// parcelListEntity.setMaterialName(vv.get(0).getName());
// parcelListEntity.setMaterialCode(vv.get(0).getEncoded());
// parcelListEntity.setMaterialUnit(vv.get(0).getUnit());
// // 添加库存品信息
// //查询在库订单信息
// DistributionStockArticleEntity distributionStockArticleEntity = distributionStockArticleMapper.selectById(parcelListEntity.getStockArticleId());
// if (ObjectUtil.isEmpty(distributionStockArticleEntity.getMallId())) {
// throw new ServiceException("订单的客户数据异常，无法转换！！");
// }
// addStockList(distributionStockArticleEntity, parcelListEntity, 1);
// });
// }
DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity();
BeanUtil.copyProperties(i, parcelListEntity);
@ -594,6 +597,11 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
String content = "包件在"+myCurrentWarehouse.getName()+"由"+AuthUtil.getNickName()+"转库存品,"+"批次号:"+i.getOrderCode()+"物料名称:"+i.getMaterialName()+"物料编码:"+i.getMaterialCode();
JSONObject js = handleLogJSONObject(myCurrentWarehouse, AuthUtil.getUser(), i.getOrderPackageCode(), content, WorkNodeEnums.STOCK_TRANSFER.getCode());
aaa.add(js);
//查询当前仓是否存在有自动入库的配置
if (isAutoWarehouse == Integer.parseInt(IsOrNoConstant.yes.getValue()) && !Objects.isNull(defaultGoodsAllocation)){
//进行此包件的默认上架
warehouseUpdownTypeClient.upShelfPackage( i.getOrderPackageCode(),defaultGoodsAllocation.getId(),myCurrentWarehouse.getId(),"自动上架");
}
});
DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity();
BeanUtil.copyProperties(v.get(0), parcelListEntity);
@ -631,22 +639,11 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
DistributionStockArticleEntity stockArticleEntity = distributionStockArticleMapper.selectById(oo); //修改
stockArticleEntity.setId(oo);
stockArticleEntity.setGenre(2);
// stockArticleEntity.setTotalNumber(stockArticleEntity.getTotalNumber() - list1.size());
stockArticleEntity.setHandQuantity(0);
distributionStockArticleMapper.updateById(stockArticleEntity);
} else {
DistributionStockArticleEntity distributionStockArticleEntity = distributionStockArticleMapper.selectById(oo);
distributionStockArticleEntity.setHandQuantity(distributionStockArticleEntity.getHandQuantity() - list1.size());
// distributionStockArticleEntity.setTotalNumber(distributionStockArticleEntity.getTotalNumber() - list1.size());
//统计订单在库数量
// List<DistributionParcelListEntity> parcelListEntities = this.list(Wrappers.<DistributionParcelListEntity>query().lambda()
// .eq(DistributionParcelListEntity::getStockArticleId, oo)
// .eq(DistributionParcelListEntity::getWarehouseId, myCurrentWarehouse.getId())
// );
// int sum = parcelListEntities.stream().filter(p -> "1".equals(p.getConditions())).mapToInt(DistributionParcelListEntity::getQuantity).sum();
// distributionStockArticleEntity.setHandQuantity(sum);
// distributionStockArticleEntity.setIncomingNum(sum);
distributionStockArticleMapper.updateById(distributionStockArticleEntity);
}
});

11
blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml
Unescape View File

@ -549,15 +549,8 @@
case when review_time is null then '未复核' else '已复核' end signing_status,
review_time signing_time,
sign_num sign_num,
case
when sign_type = 1 then '司机扫描签收'
when sign_type = 2 then '司机批量签收'
when sign_type = 1 then '文员批量签收' end sign_type,
case
when load_type = 2 then '按件装车'
when load_type = 3 then '按订单装车'
when load_type = 4 then '一键装车'
when load_type = 5 then '补录装车' end loading_mode,
sign_type sign_type,
load_type loading_mode,
brand_name brand,
review_user_name examine_user_name,
case

4
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineLoadSignOrderMapper.xml
Unescape View File

@ -45,12 +45,12 @@
and ltlso.load_id = #{param.loadId}
</if>
<if test="param.signStatus != null and param.signStatus == '20'">
and ltlso.sign_status = '20'
and ltlso.sign_status in ('20','30')
and ltlso.sign_time &gt;= #{param.enterTimeStart}
and ltlso.sign_time &lt;= #{param.enterTimeEnd}
</if>
<if test="param.signStatus != null and param.signStatus == '10'">
and ltlso.sign_status != '20'
and ltlso.sign_status not in ('20','30')
and ltlso.create_time &gt;= #{param.enterTimeStart}
and ltlso.create_time &lt;= #{param.enterTimeEnd}
</if>

35
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
Unescape View File

@ -1684,12 +1684,6 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
List<TrunklineAdvanceMergeEntity> addList = new ArrayList<>();//需要加入合包码的数据集合
mergeDataListMap.keySet().forEach(mergeCode ->{
List<ImportCustomizedOuPaiDTO> ls = mergeDataListMap.get(mergeCode);
//取出第一条放入需要处理的集合
ImportCustomizedOuPaiDTO importCustomizedOuPaiDTO = ls.get(0);
if(!Objects.isNull(importCustomizedOuPaiDTO)){
importCustomizedOuPaiDTO.setOrderPackageCode(mergeCode);
addSourceList.add(importCustomizedOuPaiDTO);
}
ls.forEach(item ->{
TrunklineAdvanceMergeEntity trunklineAdvanceMergeEntity = new TrunklineAdvanceMergeEntity();
trunklineAdvanceMergeEntity.setMergeCode(mergeCode);
@ -1698,6 +1692,17 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
addList.add(trunklineAdvanceMergeEntity);
});
});
mergeDataListMap.keySet().forEach(mergeCode ->{
List<ImportCustomizedOuPaiDTO> ls = mergeDataListMap.get(mergeCode);
//取出第一条放入需要处理的集合
ImportCustomizedOuPaiDTO importCustomizedOuPaiDTO = ls.get(0);
if(!Objects.isNull(importCustomizedOuPaiDTO)){
importCustomizedOuPaiDTO.setOrderPackageCode(mergeCode);
addSourceList.add(importCustomizedOuPaiDTO);
}
});
importCustomizedOuPaiDTOS.addAll(addSourceList);
@ -2018,12 +2023,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
List<TrunklineAdvanceMergeEntity> addList = new ArrayList<>();//需要加入合包码的数据集合
mergeDataListMap.keySet().forEach(mergeCode ->{
List<ImportStandardOuPaiDTO> ls = mergeDataListMap.get(mergeCode);
//取出第一条放入需要处理的集合
ImportStandardOuPaiDTO importStandardOuPaiDTO = ls.get(0);
if(!Objects.isNull(importStandardOuPaiDTO)){
importStandardOuPaiDTO.setOrderPackageCode(mergeCode);
addSourceList.add(importStandardOuPaiDTO);
}
ls.forEach(item ->{
TrunklineAdvanceMergeEntity trunklineAdvanceMergeEntity = new TrunklineAdvanceMergeEntity();
trunklineAdvanceMergeEntity.setMergeCode(mergeCode);
@ -2032,6 +2032,17 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
addList.add(trunklineAdvanceMergeEntity);
});
});
mergeDataListMap.keySet().forEach(mergeCode ->{
List<ImportStandardOuPaiDTO> ls = mergeDataListMap.get(mergeCode);
//取出第一条放入需要处理的集合
ImportStandardOuPaiDTO importStandardOuPaiDTO = ls.get(0);
if(!Objects.isNull(importStandardOuPaiDTO)){
importStandardOuPaiDTO.setOrderPackageCode(mergeCode);
addSourceList.add(importStandardOuPaiDTO);
}
});
importStandardOuPaiDTOS.addAll(addSourceList);
//把importStandardOuPaiDTOS转成以orderPacakgeCode为一个Set集合

Write Preview
Loading…
Cancel
Save