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

fix: 

修复包件查询方法中查询不对

增加盘点任务没有封存数据 需要全仓寻找的数据的情况
master
pref_mail@163.com 11 months ago
parent
14d969ef50
commit
8ba29828e6
10 changed files with 162 additions and 112 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-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java
  2. 4
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java
  3. 3
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml
  4. 4
      blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java
  5. 2
      blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java
  6. 3
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTaskApiController.java
  7. 186
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java
  8. 50
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseRetentionRecordServiceImpl.java
  9. 14
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java
  10. 6
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java

2
blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java
Unescape View File

@ -65,7 +65,7 @@ public interface IDistributionParcelListClient {
BladePage<DistributionParcelListEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
@GetMapping(API_PREFIX+"/findByPacketBarCode")
DistributionParcelListEntity findByPacketBarCode(@RequestParam String unitNo);
List<DistributionParcelListEntity> findByPacketBarCode(@RequestParam String unitNo);
@GetMapping(API_PREFIX+"/findByPacketBarCodeAndWarehouseId")
DistributionParcelListEntity findByPacketBarCodeAndWarehouseId(@RequestParam String unitNo,@RequestParam Long warehouseId);

4
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java
Unescape View File

@ -99,10 +99,10 @@ public class DistributionParcelListClient implements IDistributionParcelListClie
@Override
@GetMapping(API_PREFIX+"/findByPacketBarCode")
public DistributionParcelListEntity findByPacketBarCode(String unitNo) {
public List<DistributionParcelListEntity> findByPacketBarCode(String unitNo) {
QueryWrapper<DistributionParcelListEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("order_package_code",unitNo);
return distributionParcelListService.getOne(queryWrapper);
return distributionParcelListService.list(queryWrapper);
}
@Override

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

@ -104,7 +104,8 @@
ldsl.market_id marketId,
ldsl.material_id materialId,
ldsl.id id,
ldsl.brand_name brandName
ldsl.brand_name brandName,
ldsl.source_type
from logpm_distribution_stock_list ldsl
<where>
ldsl.warehouse_id = #{par.warehouseId} and ldsl.quantity_stock > 0 and ldsl.source_type = 2

4
blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java
Unescape View File

@ -365,8 +365,8 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
log.info("############handleDataToPlatform: 处理数据到platform unitNo={}", unitNo);
//先查询包件是否已存入到新系统数据库
DistributionParcelListEntity distributionParcelListEntity = distributionParcelListClient.findByPacketBarCode(unitNo);
if (Objects.isNull(distributionParcelListEntity)) {
List<DistributionParcelListEntity> distributionParcelListEntity = distributionParcelListClient.findByPacketBarCode(unitNo);
if (ObjectUtils.isEmpty(distributionParcelListEntity)) {
//未找到包件信息那就去新增
//1.根据包条码去老系统数据库找到对应的包条信息
AdvanceDetailEntity advanceDetailEntity = advanceDetailClient.getOneByUnitNo(unitNo);

2
blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java
Unescape View File

@ -1322,7 +1322,7 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
List<OrderDetailEntity> orderDetailList = orderDetailClient.findByOrderCode(orderCode,oldWarehouseId);
for (OrderDetailEntity orderDetailEntity:orderDetailList){
String unitNo = orderDetailEntity.getUnitNo();
DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCode(unitNo);
DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(unitNo,basicdataWarehouseEntity.getId());
if(!Objects.isNull(parcelListEntity)){
log.info("###########saveOrderPackage: 包条已存在，不同步 unitNo={}",unitNo);
continue;

3
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTaskApiController.java
Unescape View File

@ -19,6 +19,8 @@ import lombok.extern.log4j.Log4j2;
import org.springblade.common.exception.CustomerException;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringUtil;
@ -568,6 +570,7 @@ public class WarehouseTaskApiController {
@ApiOperation(value = "查询包件信息", notes = "code,type")
public R selectPackageInfo(@RequestBody TaskSearchDTO taskSearchDTO) {
String method = "###########selectPackageInfo: ";
log.info(method+"查询包件信息 参数：{}",taskSearchDTO);
String orderPackageCode = taskSearchDTO.getCode();//包件码
Long questId = taskSearchDTO.getQuestId();//包件码

186
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java
Unescape View File

@ -47,6 +47,7 @@ import com.logpm.warehouse.service.*;
import com.logpm.warehouse.vo.*;
import lombok.AllArgsConstructor;
import lombok.extern.log4j.Log4j2;
import org.jetbrains.annotations.Nullable;
import org.mapstruct.factory.Mappers;
import org.springblade.common.constant.RedisKeyConstant;
import org.springblade.common.constant.common.IsOrNoConstant;
@ -192,74 +193,8 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
List<BasicdataTrayEntity> trayEntityList = basicdataTrayClient.getTrayEntityList();
parcelListInfo.forEach(i -> {
QuestDetailEntity detailEntity = new QuestDetailEntity();
detailEntity.setId(getTaskID());
detailEntity.setCreateTime(new Date());
detailEntity.setTenantId(user.getTenantId());
detailEntity.setCreateUser(user.getUserId());
Long deptId = getDeptByMaxDept(user.getDeptId());
detailEntity.setCreateDept(deptId);
detailEntity.setIsDeleted(0);
detailEntity.setStatus(1);
detailEntity.setQuestId(taskQuest);
detailEntity.setOrderCode(i.getOrderCode());
detailEntity.setOrderId(i.getStockArticleId());
detailEntity.setSendWarehouseName(i.getSendWarehouseName());
detailEntity.setBrandName(i.getBrandName());
detailEntity.setHasData(1);
// detailEntity.setQuestType();
//盘点对象;1.定制品 2零担 3 库存品
//查询托盘名称
if (ObjectUtils.isNotNull(i.getTrayId())) {
// boolean b = trayEntityList.stream().anyMatch(a -> i.getTrayId().equals(String.valueOf(a.getId()) ));
// log.info("托盘是否有值>>>>>>>>>>{}",b);
Optional<BasicdataTrayEntity> first = trayEntityList.stream().filter(t -> i.getTrayId().equals(String.valueOf(t.getId()))).findFirst();
if (first.isPresent()) {
BasicdataTrayEntity basicdataTrayEntity = first.get();
detailEntity.setTrayName(basicdataTrayEntity.getPalletName());
}
}
Integer conditions = i.getConditions();
if (conditions.equals(1)) {
detailEntity.setQuestTarget(1);
} else if (conditions.equals(2)) {
detailEntity.setQuestTarget(3);
}
if (ObjectUtils.isNotNull(i.getConditions()) && i.getConditions().equals(1)) {
detailEntity.setQuestTarget(i.getConditions());
} else if (ObjectUtils.isNotNull(i.getConditions()) && i.getConditions().equals(2)) {
detailEntity.setQuestTarget(3); // 库存品
} else {
log.info("包件信息！数据信息不存在！！");
return;
}
// detailEntity.setQuestTarget(1);
detailEntity.setOrderPackageCode(i.getOrderPackageCode());
detailEntity.setWaybillNumber(i.getWaybillNumber());
detailEntity.setOrderPackageId(i.getId());
detailEntity.setCategoryName(i.getFirsts());
detailEntity.setThirdProduct(i.getThirdProduct());
detailEntity.setFirsts(i.getFirsts());
detailEntity.setSecond(i.getSecond());
detailEntity.setStockId(i.getStockId()); //库存品ID
detailEntity.setQuestStatus(0);
detailEntity.setStockNum(ObjectUtils.isNotNull(i.getQuantity()) ? i.getQuantity() : 0);
detailEntity.setWarehouseId(i.getWarehouseId());
detailEntity.setPositionCode(i.getPositionCode());
detailEntity.setTrayCode(i.getTrayCode());
// detailEntity.setGroundingAllocationId();
// detailEntity.setGroundingPositionCode();
detailEntity.setTrayId(i.getTrayId());
detailEntity.setAllocationId(i.getAllocationId());
detailEntity.setIsNew(0);
detailEntity.setMaterialCode(i.getMaterialCode());
detailEntity.setMaterialName(i.getMaterialName());
detailEntity.setMarketName(i.getMallName());
detailEntity.setIncomingBatch(i.getOrderCode());
QuestDetailEntity detailEntity = buildQuestDetailEntity(taskQuest, i, user, trayEntityList);
if (detailEntity == null) return;
detailEntityList.add(detailEntity);
});
@ -300,6 +235,79 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
}
}
@Nullable
private QuestDetailEntity buildQuestDetailEntity(Long taskQuest, DistributionParcelListEntity i, BladeUser user, List<BasicdataTrayEntity> trayEntityList) {
QuestDetailEntity detailEntity = new QuestDetailEntity();
detailEntity.setId(getTaskID());
detailEntity.setCreateTime(new Date());
detailEntity.setTenantId(i.getTenantId());
detailEntity.setCreateUser(user.getUserId());
Long deptId = getDeptByMaxDept(user.getDeptId());
detailEntity.setCreateDept(deptId);
detailEntity.setIsDeleted(0);
detailEntity.setStatus(1);
detailEntity.setQuestId(taskQuest);
detailEntity.setOrderCode(i.getOrderCode());
detailEntity.setOrderId(i.getStockArticleId());
detailEntity.setSendWarehouseName(i.getSendWarehouseName());
detailEntity.setBrandName(i.getBrandName());
detailEntity.setHasData(1);
// detailEntity.setQuestType();
//盘点对象;1.定制品 2零担 3 库存品
//查询托盘名称
if (ObjectUtils.isNotNull(i.getTrayId())) {
// boolean b = trayEntityList.stream().anyMatch(a -> i.getTrayId().equals(String.valueOf(a.getId()) ));
// log.info("托盘是否有值>>>>>>>>>>{}",b);
// Optional<BasicdataTrayEntity> first = trayEntityList.stream().filter(t -> i.getTrayId().equals(String.valueOf(t.getId()))).findFirst();
// if (first.isPresent()) {
// BasicdataTrayEntity basicdataTrayEntity = first.get();
// detailEntity.setTrayName(basicdataTrayEntity.getPalletName());
// }
}
Integer conditions = i.getConditions();
if (conditions.equals(1)) {
detailEntity.setQuestTarget(1);
} else if (conditions.equals(2)) {
detailEntity.setQuestTarget(3);
}
if (ObjectUtils.isNotNull(i.getConditions()) && i.getConditions().equals(1)) {
detailEntity.setQuestTarget(i.getConditions());
} else if (ObjectUtils.isNotNull(i.getConditions()) && i.getConditions().equals(2)) {
detailEntity.setQuestTarget(3); // 库存品
} else {
log.info("包件信息！数据信息不存在！！");
return null;
}
// detailEntity.setQuestTarget(1);
detailEntity.setOrderPackageCode(i.getOrderPackageCode());
detailEntity.setWaybillNumber(i.getWaybillNumber());
detailEntity.setOrderPackageId(i.getId());
detailEntity.setCategoryName(i.getFirsts());
detailEntity.setThirdProduct(i.getThirdProduct());
detailEntity.setFirsts(i.getFirsts());
detailEntity.setSecond(i.getSecond());
detailEntity.setStockId(i.getStockId()); //库存品ID
detailEntity.setQuestStatus(0);
detailEntity.setStockNum(ObjectUtils.isNotNull(i.getQuantity()) ? i.getQuantity() : 0);
detailEntity.setWarehouseId(i.getWarehouseId());
detailEntity.setPositionCode(i.getPositionCode());
detailEntity.setTrayCode(i.getTrayCode());
// detailEntity.setGroundingAllocationId();
// detailEntity.setGroundingPositionCode();
detailEntity.setTrayId(i.getTrayId());
detailEntity.setAllocationId(i.getAllocationId());
detailEntity.setIsNew(0);
detailEntity.setMaterialCode(i.getMaterialCode());
detailEntity.setMaterialName(i.getMaterialName());
detailEntity.setMarketName(i.getMallName());
detailEntity.setIncomingBatch(i.getOrderCode());
return detailEntity;
}
/**
* 获取用户部门最大的部门ID
*
@ -443,6 +451,14 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
BladeUser user = AuthUtil.getUser();
for (DistributionStockListVO distributionStockListVO : stockListInfo) {
// 订单转换的
if("1".equals(distributionStockListVO.getSourceType())){
}else {
// 导入的‘
}
Integer quantityStock = distributionStockListVO.getQuantityStock();
if (quantityStock == 0) {
continue;
@ -466,6 +482,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
detailEntity.setQuestId(taskQuest);
detailEntity.setOrderCode(distributionStockListVO.getOrderCode());
detailEntity.setHasData(0);
//盘点对象;1.定制品 2零担 3 库存品
detailEntity.setQuestTarget(3);
detailEntity.setStockNum(num);
@ -2697,7 +2714,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
}
if (taskSearchDTO.getTypeState().equals(1)) {
//有
if (questDetailEntity.getHasData().equals(0)) {
if (ObjectUtils.isNull(questDetailEntity.getHasData())||questDetailEntity.getHasData().equals(0)) {
continue;
}
//查询包件信息
@ -2851,6 +2868,11 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
@Override
public R selectPackageInfo(TaskSearchDTO taskSearchDTO) {
log.warn("###########selectPackageInfo: 盘点扫码库位 ");
BladeUser user = AuthUtil.getUser();
//查询查询托盘名称
// List<BasicdataTrayEntity> trayEntityList = basicdataTrayClient.getTrayEntityList();
Long warehouseId = taskSearchDTO.getWarehouseId();
String code = taskSearchDTO.getCode();
Long questId = taskSearchDTO.getQuestId();
@ -2885,7 +2907,31 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
return extracted;
}
return R.fail(5000, "包件信息不存在！！");
// 需要去业务系统上进行查询信息
List<DistributionParcelListEntity> byPacketBarCode = distributionParcelListClient.findByPacketBarCode(questDetail.getOrderPackageCode());
if(ObjectUtils.isEmpty(byPacketBarCode)){
return R.fail(5000, "包件信息不存在！！");
}else{
for (DistributionParcelListEntity distributionParcelListEntity : byPacketBarCode) {
if(distributionParcelListEntity.getWarehouseId().equals(warehouseId)){
QuestDetailEntity questDetailEntity1 = buildQuestDetailEntity(questId, distributionParcelListEntity, user, null);
// 这里新增2
questDetailEntity1.setIsNew(1);
List<QuestDetailEntity> list = Arrays.asList(questDetailEntity1);
baseMapper.insertQuestDetail(taskSearchDTO.getQuestNum(),list);
return R.data(list);
}
}
}
}
for (QuestDetailEntity i : questDetailEntityList) {
if (i.getQuestStatus().equals(1)) {

50
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseRetentionRecordServiceImpl.java
Unescape View File

@ -123,31 +123,31 @@ public class WarehouseRetentionRecordServiceImpl extends BaseServiceImpl<Warehou
@Override
public R retentionScanPackage(String orderPackageCode) {
//查询装车记录表，存入滞留包件记录
//查询配送装车记录表是否有包件记录
DistributionLoadscanEntity loadscanEntity = distributionLoadscanClient.getByOrderPackageCode(orderPackageCode);
if (Objects.isNull(loadscanEntity)) {
log.warn("#################retentionScanPackage: 未找到配送装车记录 orderPackageCode=" + orderPackageCode);
return R.fail(403, "未找到配送装车记录");
}
DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCode(orderPackageCode);
if (Objects.isNull(parcelListEntity)) {
log.warn("#################retentionScanPackage: 未找到包件数据 orderPackageCode=" + orderPackageCode);
return R.fail(403, "未找到包件数据");
}
WarehouseRetentionRecordEntity retentionRecordEntity = new WarehouseRetentionRecordEntity();
retentionRecordEntity.setOrderCode(parcelListEntity.getOrderCode());
retentionRecordEntity.setPackageCode(orderPackageCode);
retentionRecordEntity.setWaybillNo(parcelListEntity.getWaybillNumber());
retentionRecordEntity.setRetentionCarNo(loadscanEntity.getTrainNumber());
retentionRecordEntity.setRetentionWarehouseId(loadscanEntity.getWarehouseId());
retentionRecordEntity.setRetentionWarehouseName(loadscanEntity.getWarehouseName());
retentionRecordEntity.setRetentionType(2);
retentionRecordEntity.setAssembleCarDate(loadscanEntity.getScanTime());
retentionRecordEntity.setAssembleCarPersonId(loadscanEntity.getCreateUser());
retentionRecordEntity.setRemark(loadscanEntity.getMsg());
save(retentionRecordEntity);
// //查询装车记录表，存入滞留包件记录
// //查询配送装车记录表是否有包件记录
// DistributionLoadscanEntity loadscanEntity = distributionLoadscanClient.getByOrderPackageCode(orderPackageCode);
// if (Objects.isNull(loadscanEntity)) {
// log.warn("#################retentionScanPackage: 未找到配送装车记录 orderPackageCode=" + orderPackageCode);
// return R.fail(403, "未找到配送装车记录");
// }
//// DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCode(orderPackageCode);
//// if (Objects.isNull(parcelListEntity)) {
//// log.warn("#################retentionScanPackage: 未找到包件数据 orderPackageCode=" + orderPackageCode);
//// return R.fail(403, "未找到包件数据");
//// }
//
// WarehouseRetentionRecordEntity retentionRecordEntity = new WarehouseRetentionRecordEntity();
// retentionRecordEntity.setOrderCode(parcelListEntity.getOrderCode());
// retentionRecordEntity.setPackageCode(orderPackageCode);
// retentionRecordEntity.setWaybillNo(parcelListEntity.getWaybillNumber());
// retentionRecordEntity.setRetentionCarNo(loadscanEntity.getTrainNumber());
// retentionRecordEntity.setRetentionWarehouseId(loadscanEntity.getWarehouseId());
// retentionRecordEntity.setRetentionWarehouseName(loadscanEntity.getWarehouseName());
// retentionRecordEntity.setRetentionType(2);
// retentionRecordEntity.setAssembleCarDate(loadscanEntity.getScanTime());
// retentionRecordEntity.setAssembleCarPersonId(loadscanEntity.getCreateUser());
// retentionRecordEntity.setRemark(loadscanEntity.getMsg());
// save(retentionRecordEntity);
return R.success("success");
}

14
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java
Unescape View File

@ -3354,7 +3354,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
List<OrderDetailEntity> orderDetailList = orderDetailClient.findByOrderCode(orderCode,oldWarehouseId);
for (OrderDetailEntity orderDetailEntity:orderDetailList){
String unitNo = orderDetailEntity.getUnitNo();
DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCode(unitNo);
DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(unitNo,basicdataWarehouseEntity.getId());
if(!Objects.isNull(parcelListEntity)){
log.info("###########saveOrderPackage: 包条已存在，不同步 unitNo={}",unitNo);
continue;
@ -4118,7 +4118,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
for (WarehouseTrayGoodsEntity trayGoodsEntity:sourceTrayGoodsList){
String orderPackageCode = trayGoodsEntity.getAssociationValue();
log.info("#################panduanPackageByWarehouse: 当前处理的包条 {}",orderPackageCode);
DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCode(orderPackageCode);
DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode,targetTrayTypeEntity.getWarehouseId());
if(Objects.isNull(parcelListEntity)){
log.info("#################panduanPackageByWarehouse: 包件信息不存在 {}",orderPackageCode);
continue;
@ -4146,7 +4146,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
for (WarehouseTrayGoodsEntity trayGoodsEntity:sourceTrayGoodsList){
String orderPackageCode = trayGoodsEntity.getAssociationValue();
log.info("#################panduanPackageByCustomer: 当前处理的包条 {}",orderPackageCode);
DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCode(orderPackageCode);
DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode,targetTrayTypeEntity.getWarehouseId());
if(Objects.isNull(parcelListEntity)){
log.info("#################panduanPackageByCustomer: 包件信息不存在 {}",orderPackageCode);
continue;
@ -4175,7 +4175,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
for (WarehouseTrayGoodsEntity trayGoodsEntity:sourceTrayGoodsList){
String orderPackageCode = trayGoodsEntity.getAssociationValue();
log.info("#################panduanPackageByStore: 当前处理的包条 {}",orderPackageCode);
DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCode(orderPackageCode);
DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode,targetTrayTypeEntity.getWarehouseId());
if(Objects.isNull(parcelListEntity)){
log.info("#################panduanPackageByStore: 包件信息不存在 {}",orderPackageCode);
continue;
@ -4203,7 +4203,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
for (WarehouseTrayGoodsEntity trayGoodsEntity:sourceTrayGoodsList){
String orderPackageCode = trayGoodsEntity.getAssociationValue();
log.info("#################panduanPackageByMarket: 当前处理的包条 {}",orderPackageCode);
DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCode(orderPackageCode);
DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode,targetTrayTypeEntity.getWarehouseId());
if(Objects.isNull(parcelListEntity)){
log.info("#################panduanPackageByMarket: 包件信息不存在 {}",orderPackageCode);
continue;
@ -4231,7 +4231,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
for (WarehouseTrayGoodsEntity trayGoodsEntity:sourceTrayGoodsList){
String orderPackageCode = trayGoodsEntity.getAssociationValue();
log.info("#################panduanPackageByOrderCode: 当前处理的包条 {}",orderPackageCode);
DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCode(orderPackageCode);
DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode,targetTrayTypeEntity.getWarehouseId());
if(Objects.isNull(parcelListEntity)){
log.info("#################panduanPackageByOrderCode: 包件信息不存在 {}",orderPackageCode);
continue;
@ -4253,7 +4253,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
for (WarehouseTrayGoodsEntity trayGoodsEntity:sourceTrayGoodsList){
String orderPackageCode = trayGoodsEntity.getAssociationValue();
log.info("#################panduanPackageByService: 当前处理的包条 {}",orderPackageCode);
DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCode(orderPackageCode);
DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode,targetTrayTypeEntity.getWarehouseId());
if(Objects.isNull(parcelListEntity)){
log.info("#################panduanPackageByService: 包件信息不存在 {}",orderPackageCode);
continue;

6
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java
Unescape View File

@ -327,7 +327,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
Long allocationId = one.getAllocationId();
Long updownGoodsId = one.getId();
//查询包件的物料信息
DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCode(orderPackageCode);
DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode,one.getWarehouseId());
if(Objects.isNull(parcelListEntity)){
log.error("#############packageChangeStockByTray: 包件信息不存在 orderPackageCode={}",orderPackageCode);
return;
@ -377,7 +377,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
String trayCode = one.getTrayCode();
Long trayGoodsId = one.getId();
//查询包件的物料信息
DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCode(orderPackageCode);
DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode,warehouseId);
if(Objects.isNull(parcelListEntity)){
log.error("#############packageChangeStockByTray: 包件信息不存在 orderPackageCode={}",orderPackageCode);
return;
@ -1881,7 +1881,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
public MovePackInfoVO moveAllocationScanPackage(String orderPackageCode, Long allocationId,Long warehouseId) {
MovePackInfoVO movePackInfoVO = new MovePackInfoVO();
//查询包件信息
DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCode(orderPackageCode);
DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode,warehouseId);
if(Objects.isNull(parcelListEntity)){
log.warn("#################moveAllocationScanPackage: 包件不存在 orderPackageCode={}",orderPackageCode);
throw new CustomerException(403,"包件不存在");

Write Preview
Loading…
Cancel
Save