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

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

visual
pref_mail@163.com 6 months ago
parent
52182cf53e 40c915a0f3
commit
f4f09ff395
5 changed files with 77 additions and 42 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. 8
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
  2. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
  3. 1
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWarehousingEntryController.java
  4. 1
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseConfigServiceImpl.java
  5. 107
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java

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

@ -624,7 +624,7 @@
ldsl.sku,
ldsl.source_type,
ldrs.reservation_num,
count(ldsld.stock_package_code) AS stockupNum,
(SELECT IFNULL(SUM(stock_quantity),0) FROM logpm_distribution_stock WHERE reservation_id = ldrs.reservation_id AND stock_list_id = ldrs.stocklist_id) AS stockupNum,
(SELECT lds.stockup_area FROM logpm_distribution_stockup_info AS ldsi INNER JOIN logpm_distribution_stockup AS
lds ON ldsi.stockup_id = lds.id WHERE ldsi.reservation_id = ldrs.reservation_id) AS stockupArea
FROM
@ -632,7 +632,11 @@
INNER JOIN logpm_distribution_stock_list AS ldsl ON ldrs.stocklist_id = ldsl.id
INNER JOIN logpm_dis_stock_list_detail AS ldsld ON ldrs.reservation_id = ldsld.reservation_id and
ldrs.stocklist_id = ldsl.id
WHERE ldrs.reservation_id = #{reservationId}
WHERE
ldrs.is_deleted = 0
AND ldrs.reservation_id = #{reservationId}
AND ldrs.stock_list_status != 2
GROUP BY ldsl.id
</select>
<select id="getMarketReservationInfo" resultType="com.logpm.distribution.entity.DistributionReservationEntity">

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

@ -3829,7 +3829,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
entity.setAllocationId(stockupDTO.getAllocationId());
}
entity.setConditions("0");
entity.setType(2);
entity.setType(1);
entity.setOutboundType(distributionStockupEntity.getTypeService());
//修改订单备货状态
distributionAsyncService.updateStockArticleStock(one.getStockArticleId());

1
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWarehousingEntryController.java
Unescape View File

@ -182,6 +182,7 @@ public class WarehouseWarehousingEntryController extends BladeController {
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入warehouseWarehousingEntry")
public R submit(@Valid @RequestBody WarehouseWarehousingEntryDTO warehouseWarehousingEntryDTO) {
return R.status(warehouseWarehousingEntryService.saveOrUpdateOwn(warehouseWarehousingEntryDTO));
}

1
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseConfigServiceImpl.java
Unescape View File

@ -53,6 +53,7 @@ public class WarehouseConfigServiceImpl extends BaseServiceImpl<WarehouseConfigM
//关闭配置进行默认库位的清理
flag = basicdataGoodsAllocationClient.closeDefaultAllocation(goodsAllocationEntity.getId());
warehouseConfigEntity.setDefaultAllocation("");
this.updateById(warehouseConfigEntity);
return R.status(flag);
}

107
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java
Unescape View File

@ -131,6 +131,28 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
if (ObjectUtils.isNull(warehouseWarehousingEntryDTO.getType())) {
throw new ServiceException("入库类型不能为空！！");
}
//添加
//获取当前登录人仓库
BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getMyCurrentWarehouse();
if (Objects.isNull(basicdataWarehouseEntity)) {
log.warn("#####操作人，当前未查询到仓库信息");
return false;
}
int isAutoWarehouse;
BasicdataGoodsAllocationEntity defaultGoodsAllocation;
WarehouseConfigEntity warehouseConfig = warehouseConfigClient.getWarehouseConfig(basicdataWarehouseEntity.getId());
if (!Objects.isNull(warehouseConfig)) {
isAutoWarehouse = warehouseConfig.getIsAutoWarehouse() != null ? warehouseConfig.getIsAutoWarehouse() : 0;
if (Integer.parseInt(IsOrNoConstant.yes.getValue()) == isAutoWarehouse) {
//查询此仓库的默认库位
defaultGoodsAllocation = basicdataGoodsAllocationClient.findDefaultGoodsAllocation(basicdataWarehouseEntity.getId());
} else {
defaultGoodsAllocation = null;
}
} else {
defaultGoodsAllocation = null;
isAutoWarehouse = 0;
}
if ("2".equals(warehouseWarehousingEntryDTO.getType())) {
//直接入库
List<WarehouseWarehousingDetailEntity> list = warehouseWarehousingEntryDTO.getList();
@ -147,33 +169,33 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
}
WarehouseWarehousingEntryEntity entryEntity = new WarehouseWarehousingEntryEntity();
entryEntity.setId(warehouseWarehousingEntryDTO.getId());
//添加
//获取当前登录人仓库
BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getMyCurrentWarehouse();
if (Objects.isNull(basicdataWarehouseEntity)) {
log.warn("#####操作人，当前未查询到仓库信息");
return false;
}
warehouseWarehousingEntry.setWarehouseId(basicdataWarehouseEntity.getId());
warehouseWarehousingEntry.setWarehouse(basicdataWarehouseEntity.getName());
warehouseWarehousingEntry.setSource("添加");
warehouseWarehousingEntry.setConditions("3");
if (Objects.isNull(warehouseWarehousingEntry.getPositions())) {
//查看是否存在有默认入库的配置
if (Integer.parseInt(IsOrNoConstant.yes.getValue()) == isAutoWarehouse && !Objects.isNull(defaultGoodsAllocation)) {
warehouseWarehousingEntry.setPositions(defaultGoodsAllocation.getQrCode());
warehouseWarehousingEntry.setRemark("自动入库");
}
}
this.save(warehouseWarehousingEntry);
list.forEach(i -> {
//添加库存品
addInventory(i.getCreateInventory(), warehouseWarehousingEntryDTO, i);
});
//添加入库明细
// Iterator<WarehouseWarehousingDetailEntity> iterator = list.iterator();
// while (iterator.hasNext()){
// if(ObjectUtils.isNotNull(iterator.next().getConditions() ) && iterator.next().getConditions().equals("3")){
// iterator.remove();
// }
// }
if (!list.isEmpty()) {
list.forEach(i -> {
i.setWarehousingEntryId(warehouseWarehousingEntry.getId());
i.setConditions("3");
if (Objects.isNull(i.getAllocationName())) {
//查看是否存在有默认入库的配置
if (Integer.parseInt(IsOrNoConstant.yes.getValue()) == isAutoWarehouse && !Objects.isNull(defaultGoodsAllocation)) {
i.setAllocationName(defaultGoodsAllocation.getQrCode());
i.setAllocationId(defaultGoodsAllocation.getId());
i.setLoadingType(1);
}
}
//添加库存品
addInventory(i.getCreateInventory(), warehouseWarehousingEntryDTO, i);
}
);
warehouseWarehousingDetailService.saveBatch(list);
@ -263,14 +285,13 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
warehouseWarehousingDetailService.deleteLogic(detailEntityList);
}
}
} else {
//添加
//获取当前登录人仓库
BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getMyCurrentWarehouse();
if (Objects.isNull(basicdataWarehouseEntity)) {
log.warn("#####操作人，当前未查询到仓库信息");
return false;
if (Objects.isNull(warehouseWarehousingEntry.getPositions())) {
//查看是否存在有默认入库的配置
if (Integer.parseInt(IsOrNoConstant.yes.getValue()) == isAutoWarehouse && !Objects.isNull(defaultGoodsAllocation)) {
warehouseWarehousingEntry.setPositions(defaultGoodsAllocation.getQrCode());
warehouseWarehousingEntry.setRemark("自动入库");
}
}
warehouseWarehousingEntry.setWarehouseId(basicdataWarehouseEntity.getId());
warehouseWarehousingEntry.setWarehouse(basicdataWarehouseEntity.getName());
@ -288,6 +309,14 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
}
if (!list.isEmpty()) {
list.forEach(i -> {
if (Objects.isNull(i.getAllocationName())) {
//查看是否存在有默认入库的配置
if (Integer.parseInt(IsOrNoConstant.yes.getValue()) == isAutoWarehouse && !Objects.isNull(defaultGoodsAllocation)) {
i.setAllocationName(defaultGoodsAllocation.getQrCode());
i.setAllocationId(defaultGoodsAllocation.getId());
i.setLoadingType(1);
}
}
i.setWarehousingEntryId(warehouseWarehousingEntry.getId());
i.setConditions("1");
}
@ -540,22 +569,22 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
// WarehouseWarehousingEntryEntity entryEntity = JSONObject.parseObject(JSONObject.toJSONString(k), WarehouseWarehousingEntryEntity.class);
Integer isAutoWarehouse;
if (!Objects.isNull(entryEntity.getWarehouseId())){
if (!Objects.isNull(entryEntity.getWarehouseId())) {
//查询是否开启自动上架配置
WarehouseConfigEntity warehouseConfig = warehouseConfigClient.getWarehouseConfig(entryEntity.getWarehouseId());
if (!Objects.isNull(warehouseConfig)){
isAutoWarehouse = warehouseConfig.getIsAutoWarehouse() != null ? warehouseConfig.getIsAutoWarehouse() : 0;
if (!Objects.isNull(warehouseConfig)) {
isAutoWarehouse = warehouseConfig.getIsAutoWarehouse() != null ? warehouseConfig.getIsAutoWarehouse() : 0;
} else {
isAutoWarehouse = 0;
}
} else {
isAutoWarehouse = 0;
}
if (Integer.parseInt(IsOrNoConstant.yes.getValue()) == isAutoWarehouse){
isAutoWarehouse = 0;
}
} else {
isAutoWarehouse = 0;
}
if (Integer.parseInt(IsOrNoConstant.yes.getValue()) == isAutoWarehouse) {
//查询默认备货库位
BasicdataGoodsAllocationEntity defaultGoodsAllocation = basicdataGoodsAllocationClient.findDefaultGoodsAllocation(entryEntity.getWarehouseId());
if (!Objects.isNull(defaultGoodsAllocation)){
if (Objects.isNull(entryEntity.getPositions())){
if (!Objects.isNull(defaultGoodsAllocation)) {
if (Objects.isNull(entryEntity.getPositions())) {
entryEntity.setPositions(defaultGoodsAllocation.getQrCode());
}
}
@ -596,8 +625,8 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
detail.setTrayName(basicdataTrayEntity.getPalletName());
}
}
}else {
if (Integer.parseInt(IsOrNoConstant.yes.getValue()) == isAutoWarehouse){
} else {
if (Integer.parseInt(IsOrNoConstant.yes.getValue()) == isAutoWarehouse) {
//库位
WarehouseGoodsAllocationEntity warehouseGoodsAllocationEntity = warehouseGoodsAllocationClient.findByAllocationQrCode(entryEntity.getPositions());
if (Func.isNotEmpty(warehouseGoodsAllocationEntity)) {
@ -670,7 +699,7 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
break;
default:
s.setConditions("未知");
return ;
return;
}
BeanUtil.copyProperties(s, excel);
listExcel.add(excel);

Write Preview
Loading…
Cancel
Save