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

Merge branch 'dev' into pre-production

master
pref_mail@163.com 9 months ago
parent
4e81ba4e53 641cf98f2b
commit
a94336147e
9 changed files with 155 additions and 84 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. 14
      blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesAbnormalRecordController.java
  2. 4
      blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalRecordMapper.java
  3. 6
      blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalRecordMapper.xml
  4. 30
      blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java
  5. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java
  6. 14
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
  7. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupInfoServiceImpl.java
  8. 2
      blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryDataServiceImpl.java
  9. 165
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java

14
blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesAbnormalRecordController.java
Unescape View File

@ -45,7 +45,7 @@ import java.util.Objects;
@Api(value = "异常列表", tags = "异常列表接口")
public class AftersalesAbnormalRecordController extends BladeController {
private final IBasicdataWarehouseClient basicdataWarehouseClient;
private final IAftersalesAbnormalRecordService aftersalesAbnormalRecordService;
@ResponseBody
@ -58,11 +58,7 @@ public class AftersalesAbnormalRecordController extends BladeController {
try{
//当前登录人选择的仓库
BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
if(!Objects.isNull(myCurrentWarehouse)){
abnormalRecordDTO.setWarehouseId(myCurrentWarehouse.getId());
}
return aftersalesAbnormalRecordService.findPageList(abnormalRecordDTO);
}catch (CustomerException e){
log.error(e.message,e);
@ -89,11 +85,7 @@ public class AftersalesAbnormalRecordController extends BladeController {
return R.fail(405,"异常id为空");
}
//当前登录人选择的仓库
BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
if(!Objects.isNull(myCurrentWarehouse)){
abnormalRecordDTO.setWarehouseId(myCurrentWarehouse.getId());
}
return aftersalesAbnormalRecordService.dealAbnormal(abnormalRecordDTO);
}catch (CustomerException e){

4
blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalRecordMapper.java
Unescape View File

@ -8,11 +8,13 @@ import com.logpm.aftersales.entity.AftersalesAbnormalRecordEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@Mapper
public interface AftersalesAbnormalRecordMapper extends BaseMapper<AftersalesAbnormalRecordEntity> {
IPage<AftersalesAbnormalRecordEntity> findPageList(IPage<Object> page, @Param("param") AbnormalRecordDTO abnormalRecordDTO);
IPage<AftersalesAbnormalRecordEntity> findPageList(IPage<Object> page, @Param("param") AbnormalRecordDTO abnormalRecordDTO, @Param("warehouseIds") List<Long> warehouseIds);
JSONObject findListByCarsNoAndUpWarehouseId(@Param("carsNo") String carsNo, @Param("warehouseId") Long warehouseId);
}

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

@ -6,6 +6,12 @@
select *
from logpm_aftersales_abnormal_record
where 1=1
<if test="warehouseIds !=null ">
and warehouse_id in
<foreach collection="warehouseIds" item="id" open="(" close=")" separator=",">
#{id}
</foreach>
</if>
<if test="param.type !=null and param.type != ''">
and `type` = #{param.type}
</if>

30
blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java
Unescape View File

@ -7,6 +7,8 @@ import com.logpm.aftersales.dto.AbnormalRecordDTO;
import com.logpm.aftersales.entity.AftersalesAbnormalRecordEntity;
import com.logpm.aftersales.mapper.AftersalesAbnormalRecordMapper;
import com.logpm.aftersales.service.IAftersalesAbnormalRecordService;
import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
import com.logpm.trunkline.feign.ITrunklineCarsLoadScanClient;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@ -15,8 +17,11 @@ import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
@Slf4j
@Service
@ -25,19 +30,42 @@ public class AftersalesAbnormalRecordServiceImpl extends BaseServiceImpl<Aftersa
private final ITrunklineCarsLoadScanClient trunklineCarsLoadScanClient;
private final IBasicdataWarehouseClient basicdataWarehouseClient;
@Override
public R findPageList(AbnormalRecordDTO abnormalRecordDTO) {
IPage<Object> page = new Page<>();
page.setCurrent(abnormalRecordDTO.getPageNum());
page.setSize(abnormalRecordDTO.getPageSize());
IPage<AftersalesAbnormalRecordEntity> pageList = baseMapper.findPageList(page,abnormalRecordDTO);
List<Long> warehouseIdList = null;
//当前登录人选择的仓库
BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
if(!Objects.isNull(myCurrentWarehouse)){
abnormalRecordDTO.setWarehouseId(myCurrentWarehouse.getId());
warehouseIdList = new ArrayList<>();
warehouseIdList.add(myCurrentWarehouse.getId());
}else {
List<BasicdataWarehouseEntity> myWarehouseList = basicdataWarehouseClient.getMyWarehouseList();
warehouseIdList = myWarehouseList.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList());
}
IPage<AftersalesAbnormalRecordEntity> pageList = baseMapper.findPageList(page,abnormalRecordDTO,warehouseIdList);
return R.data(pageList);
}
@Override
public R dealAbnormal(AbnormalRecordDTO abnormalRecordDTO) {
//当前登录人选择的仓库
BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
if(!Objects.isNull(myCurrentWarehouse)){
abnormalRecordDTO.setWarehouseId(myCurrentWarehouse.getId());
}
Long abnormalRecordId = abnormalRecordDTO.getAbnormalRecordId();
AftersalesAbnormalRecordEntity abnormalRecordEntity = baseMapper.selectById(abnormalRecordId);
if(!Objects.isNull(abnormalRecordEntity)){

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

@ -73,7 +73,7 @@ public class DistributionParcelListClient implements IDistributionParcelListClie
.eq(ObjectUtils.isNotNull(parcelListEntity.getId()),DistributionParcelListEntity::getId,parcelListEntity.getId())
.eq(ObjectUtils.isNotNull(parcelListEntity.getWarehouseId()),DistributionParcelListEntity::getWarehouseId,parcelListEntity.getWarehouseId())
.eq(ObjectUtils.isNotNull(parcelListEntity.getStockArticleId()),DistributionParcelListEntity::getStockArticleId,parcelListEntity.getStockArticleId())
.notIn(ObjectUtils.isNotNull(parcelListEntity.getOrderPackageStatus()),DistributionParcelListEntity::getOrderPackageStatus,parcelListEntity.getOrderPackageStatus().split(","))
.notIn(ObjectUtils.isNotNull(parcelListEntity.getOrderPackageStatus()),DistributionParcelListEntity::getOrderPackageStatus,parcelListEntity.getOrderPackageStatus())
);
}

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

@ -217,7 +217,7 @@
LEFT JOIN logpm_distribution_bill_lading_scan ldbls ON ldbls.parcel_list_id = ldrzp.parcel_list_id
) AS c ON c.parcel_list_id = ldpl.id
<where>
ldpl.is_deleted = 0 AND m.is_deleted = 0 AND n.is_deleted = 0
ldpl.is_deleted = 0
<if test="param.warehouse !='' and param.warehouse != null">
and lww.name like concat('%',#{param.warehouse},'%')
</if>
@ -299,12 +299,12 @@
<if test="param.startWarehouseEntryTimeEnd != null and param.startWarehouseEntryTimeEnd !='' and param.lastWarehouseEntryTimeEnd !=''and param.lastWarehouseEntryTimeEnd != null">
and ldpl.warehouse_entry_time_end BETWEEN #{param.startWarehouseEntryTimeEnd} AND #{param.lastWarehouseEntryTimeEnd}
</if>
<if test="param.startLoadingTime != null and param.lastLoadingTime != null and param.startLoadingTime != '' and param.lastLoadingTime != ''">
AND ldl.scan_time BETWEEN #{param.startLoadingTime} AND #{param.lastLoadingTime}
</if>
<if test="param.startSigningTime != null and param.lastSigningTime != null and param.startSigningTime != '' and param.lastSigningTime != ''">
AND ldl.signing_time BETWEEN #{param.startSigningTime} AND #{param.lastSigningTime}
</if>
<!-- <if test="param.startLoadingTime != null and param.lastLoadingTime != null and param.startLoadingTime != '' and param.lastLoadingTime != ''">-->
<!-- AND ldl.scan_time BETWEEN #{param.startLoadingTime} AND #{param.lastLoadingTime}-->
<!-- </if>-->
<!-- <if test="param.startSigningTime != null and param.lastSigningTime != null and param.startSigningTime != '' and param.lastSigningTime != ''">-->
<!-- AND ldl.signing_time BETWEEN #{param.startSigningTime} AND #{param.lastSigningTime}-->
<!-- </if>-->
</where>

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

@ -114,7 +114,6 @@ public class DistributionStockupInfoServiceImpl extends BaseServiceImpl<Distribu
//商配。市配备货任务
List<DistributionStockupInfoEntity> entityList = this.list(Wrappers.<DistributionStockupInfoEntity>query().lambda()
.eq(DistributionStockupInfoEntity::getReservationId, reservationId)
.ne(DistributionStockupInfoEntity::getStockUpType, 3)
.ne(DistributionStockupInfoEntity::getStockStatus, "4")
);
if (entityList.size()==1){
@ -131,7 +130,6 @@ public class DistributionStockupInfoServiceImpl extends BaseServiceImpl<Distribu
case 2:
List<DistributionStockupInfoEntity> billLadingentityList = this.list(Wrappers.<DistributionStockupInfoEntity>query().lambda()
.eq(DistributionStockupInfoEntity::getReservationId, reservationId)
.eq(DistributionStockupInfoEntity::getStockUpType, 3)
.ne(DistributionStockupInfoEntity::getStockStatus, "4")
);
if (billLadingentityList.size() == 1){

2
blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryDataServiceImpl.java
Unescape View File

@ -38,7 +38,7 @@ public class OuPaiFactoryDataServiceImpl implements IOuPaiFactoryDataService {
} else if (event == 2) {
//包件收货
// todo 暂时关闭数据推送到新系统
//code = ouPaiFactoryService.saveOuPaiPackageStatusByCode(key,event);
// code = ouPaiFactoryService.saveOuPaiPackageStatusByCode(key,event);
// 老系统的
// 包件收货需要验证 收货单是否在系统中存在

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

@ -19,6 +19,7 @@ package com.logpm.warehouse.service.impl;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -333,10 +334,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
* @return
*/
public Long getTaskID() {
Random random = new Random();
long min = 100000000000000000L; // 最小值为10的18次方
long max = 9223372036854775807L; // Long类型的最大值
return min + (long) (random.nextDouble() * (max - min));
return IdWorker.getId();
}
/**
@ -623,22 +621,22 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
}
boolean save = this.save(taskQuest);
// 存入子表 todo 暂时不要商场
// if (!taskQuest.getList().isEmpty()) {
//// List<TaskQuestChildEntity> list = taskQuest.getList();
//// for (TaskQuestChildEntity taskQuestChildEntity : list) {
//// taskQuestChildEntity.setWarehouseId(id);
//// taskQuestChildEntity.setQuestId(taskQuest.getId());
////
//// }
//// taskQuestChildService.saveBatch(list);
//// //添加包件信息
//// List<Long> collect = list.stream().map(TaskQuestChildEntity::getRefId).collect(Collectors.toList());
//// addQuestDetail(myCurrentWarehouse.getId(), collect, questNum, taskQuest.getId());
// } else {
// addQuestDetail(myCurrentWarehouse.getId(), null, questNum, taskQuest.getId());
// }
if (!taskQuest.getList().isEmpty()) {
List<TaskQuestChildEntity> list = taskQuest.getList();
for (TaskQuestChildEntity taskQuestChildEntity : list) {
taskQuestChildEntity.setWarehouseId(id);
taskQuestChildEntity.setQuestId(taskQuest.getId());
addQuestDetail(myCurrentWarehouse.getId(), null, questNum, taskQuest.getId());
}
taskQuestChildService.saveBatch(list);
//添加包件信息
List<Long> collect = list.stream().map(TaskQuestChildEntity::getRefId).collect(Collectors.toList());
addQuestDetail(myCurrentWarehouse.getId(), collect, questNum, taskQuest.getId());
} else {
addQuestDetail(myCurrentWarehouse.getId(), null, questNum, taskQuest.getId());
}
// addQuestDetail(myCurrentWarehouse.getId(), null, questNum, taskQuest.getId());
return save ? R.success("添加成功") : R.fail("添加失败");
}
@ -1274,13 +1272,16 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
String[] split1 = i.getTrayId().split(",");
for (String s : split1) {
List<BasicdataTrayEntity> collect = trayEntityList.stream().filter(w -> w.getId().equals(Long.valueOf(s))).collect(Collectors.toList());
//托盘
if (ObjectUtils.isNull(collect)) {
i.setTrayName(collect.get(0).getPalletName());
} else if (ObjectUtils.isNotNull(i.getTrayName()) && !i.getTrayName().contains(i.getTrayName())) {
i.setTrayName(i.getTrayCode() + "," + collect.get(0).getPalletName());
if(StringUtil.isNoneBlank(s)){
List<BasicdataTrayEntity> collect = trayEntityList.stream().filter(w -> w.getId().equals(Long.valueOf(s))).collect(Collectors.toList());
//托盘
if (ObjectUtils.isNull(collect)) {
i.setTrayName(collect.get(0).getPalletName());
} else if (ObjectUtils.isNotNull(i.getTrayName()) && !i.getTrayName().contains(i.getTrayName())) {
i.setTrayName(i.getTrayCode() + "," + collect.get(0).getPalletName());
}
}
}
}
@ -1628,12 +1629,9 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
@Override
public IPage<TaskContractVO> selectcontractList(IPage<Object> page, TaskSearchDTO taskSearchDTO) {
List<Long> collect = this.getmyWarehouseList();
baseMapper.setSqlMode();
String goodsType = taskSearchDTO.getGoodsType();
// LambdaQueryWrapper<QuestDetailEntity> queryWrapper = Wrappers.<QuestDetailEntity>query().lambda()
// .eq(QuestDetailEntity::getQuestType, 3)
// .eq(QuestDetailEntity::getQuestId, taskSearchDTO.getTaskId());
BladeUser user = AuthUtil.getUser();
List<TaskContractVO> list = new ArrayList<>();
QuestDetailEntity questDetail = new QuestDetailEntity();
questDetail.setQuestId(taskSearchDTO.getQuestId());
@ -1646,7 +1644,36 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
IPage<TaskContractVO> taskPageList = new Page<>();
List<QuestDetailEntity> questDetailEntityList = baseMapper.selectTaskInfo(taskSearchDTO.getQuestNum(), questDetail);
if (Func.isEmpty(questDetailEntityList)) {
return null;
// 从业务系统获取数据
DistributionParcelListEntity byPacketBarCodeAndWarehouseId = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(questDetail.getCode(), taskSearchDTO.getWarehouseId());
if (ObjectUtils.isNotNull(byPacketBarCodeAndWarehouseId)){
// 得到下面的订单信息
List<DistributionParcelListEntity> byPacketBarCode = distributionParcelListClient.findEntityListByOrderCode(byPacketBarCodeAndWarehouseId.getOrderCode(), taskSearchDTO.getWarehouseId());
if(ObjectUtils.isEmpty(byPacketBarCode)){
throw new ServiceException("包件信息不存在");
}else{
List<QuestDetailEntity> list1 = new ArrayList<>();
for (DistributionParcelListEntity distributionParcelListEntity : byPacketBarCode) {
if(distributionParcelListEntity.getWarehouseId().equals(taskSearchDTO.getWarehouseId())){
QuestDetailEntity questDetailEntity1 = buildQuestDetailEntity(taskSearchDTO.getQuestId(), distributionParcelListEntity, user, null);
// 这里新增2
questDetailEntity1.setIsNew(1);
list1.add(questDetailEntity1);
}
}
baseMapper.insertQuestDetail(taskSearchDTO.getQuestNum(),list1);
// return taskPageList.setRecords(list);
questDetailEntityList = list1;
}
}
}
Map<Integer, List<QuestDetailEntity>> questDetailMap = questDetailEntityList.stream().collect(Collectors.groupingBy(QuestDetailEntity::getQuestTarget));
//订制品
@ -1827,8 +1854,10 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
private TaskTrayVO getTaskTrayInfo(List<QuestDetailEntity> list1) {
// return baseMapper.selecttrayList(page,taskSearchDTO,collect);// 查询有没有当次盘点任务的托盘数据
List<TaskTrayVO> list = new ArrayList<>();
TaskTrayVO taskTrayVO = new TaskTrayVO();
if(list1.isEmpty()){
return taskTrayVO;
}
QuestDetailEntity questDetailEntity = list1.get(0);
String trayId = questDetailEntity.getTrayId();
@ -2010,6 +2039,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
*/
@Transactional(rollbackFor = Exception.class)
public int getTaskInventory(TaskSearchDTO taskSearchDTO, Long warehouseId, BasicdataTrayEntity trayByTrayCode) {
BladeUser user = AuthUtil.getUser();
//查询是否在当前任务内
List<TaskQuestChildEntity> list = taskQuestChildService.list(Wrappers.<TaskQuestChildEntity>query().lambda()
.eq(TaskQuestChildEntity::getQuestId, taskSearchDTO.getQuestId())
@ -2054,33 +2084,41 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
case "3": //3包件码
//查询订单ID
//查询订单信息
questDetail.setQuestTarget(1);//
questDetail.setOrderPackageCode(i.getAssociationValue());//包条码
questDetail.setOrderPackageId(i.getAssociationId());//包件ID
DistributionParcelListEntity parcelList = new DistributionParcelListEntity();
parcelList.setId(i.getAssociationId());
parcelList.setOrderPackageCode(i.getAssociationValue());
List<DistributionParcelListEntity> parcelList1 = distributionParcelListClient.getParcelList(parcelList);
if (!parcelList1.isEmpty()) {
questDetail.setOrderId(parcelList1.get(0).getStockArticleId());
} else {
continue;
}
DistributionStockArticleEntity distributionStockArticleEntity = getStockArticleInfo(parcelList1.get(0).getStockArticleId());
if (!list.stream().anyMatch(d -> d.getRefName().equals(distributionStockArticleEntity.getMallName()))) {
continue;
}
questDetail.setOrderCode(distributionStockArticleEntity.getOrderCode());//
WarehouseUpdownGoodsEntity warehouseUpdownGoodsEntity = getUpdownGoodsPack(i.getAssociationId(), "3", i.getAssociationValue(), warehouseId);
if (Optional.ofNullable(warehouseUpdownGoodsEntity).isPresent()) {
questDetail.setPositionCode(warehouseUpdownGoodsEntity.getPositionCode());//完整货位
questDetail.setAllocationId(String.valueOf(warehouseUpdownGoodsEntity.getAllocationId()));
}
// questDetail.setQuestTarget(1);//
// questDetail.setOrderPackageCode(i.getAssociationValue());//包条码
// questDetail.setOrderPackageId(i.getAssociationId());//包件ID
// DistributionParcelListEntity parcelList = new DistributionParcelListEntity();
// parcelList.setId(i.getAssociationId());
// parcelList.setOrderPackageCode(i.getAssociationValue());
// List<DistributionParcelListEntity> parcelList1 = distributionParcelListClient.getParcelList(parcelList);
// if (!parcelList1.isEmpty()) {
// questDetail.setOrderId(parcelList1.get(0).getStockArticleId());
// } else {
// continue;
// }
// DistributionStockArticleEntity distributionStockArticleEntity = getStockArticleInfo(parcelList1.get(0).getStockArticleId());
//// if (!list.stream().anyMatch(d -> d.getRefName().equals(distributionStockArticleEntity.getMallName()))) {
//// continue;
//// }
// questDetail.setOrderCode(distributionStockArticleEntity.getOrderCode());//
// WarehouseUpdownGoodsEntity warehouseUpdownGoodsEntity = getUpdownGoodsPack(i.getAssociationId(), "3", i.getAssociationValue(), warehouseId);
//
// if (Optional.ofNullable(warehouseUpdownGoodsEntity).isPresent()) {
// questDetail.setPositionCode(warehouseUpdownGoodsEntity.getPositionCode());//完整货位
// questDetail.setAllocationId(String.valueOf(warehouseUpdownGoodsEntity.getAllocationId()));
// }
// questDetail.setIsNew(0);//是否新增
DistributionParcelListEntity byPacketBarCodeAndWarehouseId = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(i.getAssociationValue(), warehouseId);
questDetail =buildQuestDetailEntity(taskSearchDTO.getQuestId(),byPacketBarCodeAndWarehouseId,user,null);
break;
case "4": //4库存品
questDetail.setCreateUser(user.getUserId());
questDetail.setCreateDept(Long.parseLong(user.getDeptId().split(",")[0]));
questDetail.setStatus(1);
questDetail.setIsDeleted(0);
Date date = new Date();
questDetail.setCreateTime(date);
questDetail.setUpdateTime(date);
questDetail.setQuestTarget(3);//
DistributionStockListEntity stockListEntity = new DistributionStockListEntity();
stockListEntity.setIncomingBatch(i.getIncomingBatch());
@ -2089,9 +2127,9 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
stockListEntity.setMaterialId(i.getAssociationId());
//查询订单信息
DistributionStockListEntity stockListInfo = getStockListInfo(stockListEntity);
if (!list.stream().anyMatch(d -> d.getRefName().equals(stockListInfo.getMarketName()))) {
continue;
}
// if (!list.stream().anyMatch(d -> d.getRefName().equals(stockListInfo.getMarketName()))) {
// continue;
// }
stockListEntity.setOrderCode(stockListInfo.getOrderCode());
DistributionStockListVO queryData = distributionStockListClient.getQueryData(stockListEntity);
WarehouseUpdownGoodsEntity warehouseUpdownGoods = getUpdownGoodsStockList(i.getMarketId(), "4", i.getIncomingBatch(), warehouseId, i.getAssociationId(), i.getAssociationValue());
@ -2107,6 +2145,9 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
}
break;
}
questDetail.setQuestType(4);//托盘
questDetail.setQuestStatus(0); //包件盘点状态
questDetail.setStockNum(i.getNum()); //数量
@ -2115,6 +2156,10 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
questDetail.setTrayId(String.valueOf(trayByTrayCode.getId()));
questDetail.setAllocationId(String.valueOf(trayByTrayCode.getId()));
questDetail.setIsNew(0);//是否新增
// 增加商场信息
questDetailList.add(questDetail);
}
//添加

Write Preview
Loading…
Cancel
Save