|
|
|
|
@ -17,6 +17,7 @@
|
|
|
|
|
package com.logpm.warehouse.service.impl; |
|
|
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.Wrapper; |
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.Query; |
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
|
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; |
|
|
|
|
@ -46,6 +47,7 @@ import com.logpm.warehouse.vo.*;
|
|
|
|
|
import lombok.AllArgsConstructor; |
|
|
|
|
import lombok.extern.log4j.Log4j2; |
|
|
|
|
import org.springblade.common.constant.common.IsOrNoConstant; |
|
|
|
|
import org.springblade.common.constant.orderpackage.OrderPackageStatusConstant; |
|
|
|
|
import org.springblade.common.exception.CustomerException; |
|
|
|
|
import org.springblade.common.utils.CommonUtil; |
|
|
|
|
import org.springblade.core.log.exception.ServiceException; |
|
|
|
|
@ -205,6 +207,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
|
|
|
|
|
detailEntityList.add(detailEntity); |
|
|
|
|
|
|
|
|
|
}); |
|
|
|
|
log.debug("包件数据=={}",detailEntityList.size()); |
|
|
|
|
//查询零担数据
|
|
|
|
|
DistributionStockArticleEntity stockArticle = new DistributionStockArticleEntity(); |
|
|
|
|
stockArticle.setWarehouseId(stockArticleEntity.getWarehouseId()); |
|
|
|
|
@ -214,7 +217,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
|
|
|
|
|
if(!stockArticleInfo.isEmpty()){ |
|
|
|
|
detailEntityList.addAll(handleIsZeroList(stockArticleInfo,taskQuest)); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
log.debug("零担 和 包件数据=={}",detailEntityList.size()); |
|
|
|
|
//查询库存平数据
|
|
|
|
|
DistributionStockListEntity stockListEntity = new DistributionStockListEntity(); |
|
|
|
|
stockListEntity.setWarehouseId(stockArticleEntity.getWarehouseId()); |
|
|
|
|
@ -252,18 +255,39 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
|
|
|
|
|
// detailEntityList.add(detailListEntity);
|
|
|
|
|
// });
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
log.debug("全部包件数据=={}",detailEntityList.size()); |
|
|
|
|
if(!detailEntityList.isEmpty()){ |
|
|
|
|
|
|
|
|
|
int batchSize = 1000; // 设置批处理的大小
|
|
|
|
|
int totalSize = detailEntityList.size(); // 获取总数据量
|
|
|
|
|
int batchSize = 1000; // 设置批处理的大小
|
|
|
|
|
int xh = (int) Math.ceil((double) totalSize / batchSize); |
|
|
|
|
|
|
|
|
|
for (int i = 0; i < totalSize; i += batchSize) { |
|
|
|
|
int endIndex = Math.min(i + batchSize, totalSize); |
|
|
|
|
List<QuestDetailEntity> subList = detailEntityList.subList(i, endIndex); |
|
|
|
|
for (int i = 0; i < xh; i++) { |
|
|
|
|
int startIndex = i * batchSize; |
|
|
|
|
int endIndex = Math.min(startIndex + batchSize, totalSize); |
|
|
|
|
List<QuestDetailEntity> subList = detailEntityList.subList(startIndex, endIndex); |
|
|
|
|
baseMapper.insertQuestDetail(questNum, subList); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// int totalSize = detailEntityList.size(); // 获取总数据量
|
|
|
|
|
// int batchSize = 1000; // 设置批处理的大小
|
|
|
|
|
// int xh = (int) Math.ceil( totalSize / batchSize);
|
|
|
|
|
// for (int i = 0; i < xh; i ++) {
|
|
|
|
|
// List<QuestDetailEntity> subList = new ArrayList<>();
|
|
|
|
|
// if(i == 0){
|
|
|
|
|
// subList = detailEntityList.subList(i, batchSize);
|
|
|
|
|
// baseMapper.insertQuestDetail(questNum, subList);
|
|
|
|
|
//
|
|
|
|
|
// }else{
|
|
|
|
|
// subList = detailEntityList.subList(batchSize, batchSize+1000);
|
|
|
|
|
// baseMapper.insertQuestDetail(questNum, subList);
|
|
|
|
|
// batchSize = batchSize+1000;
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
// int q = totalSize - (xh * batchSize);
|
|
|
|
|
// if(q > 0){
|
|
|
|
|
// baseMapper.insertQuestDetail(questNum,detailEntityList.subList(xh * batchSize, q));
|
|
|
|
|
// }
|
|
|
|
|
log.info("数量七千万===》》》"+xh); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
@ -844,7 +868,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
|
|
|
|
|
questDetailChildEntity.setWarehouseId(warehouseId); |
|
|
|
|
List<QuestDetailChildEntity> list = getQuestDetailInfo(taskQuestEntity.getQuestNum()+"_child",questDetailChildEntity); |
|
|
|
|
if(!list.isEmpty()){ |
|
|
|
|
int sum = list.stream().mapToInt(QuestDetailChildEntity::getQuestNum).sum(); |
|
|
|
|
int sum = list.stream().filter(i ->i.getCargoName().equals("10")).mapToInt(QuestDetailChildEntity::getQuestNum).sum(); |
|
|
|
|
unTotal.set(unTotal.get() + sum); |
|
|
|
|
}else{ |
|
|
|
|
throw new ServiceException("未找到对应的处理数据！！"); |
|
|
|
|
@ -910,7 +934,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
|
|
|
|
|
QuestDetailEntity questDetail = new QuestDetailEntity(); |
|
|
|
|
questDetail.setWarehouseId(warehouseId); |
|
|
|
|
questDetail.setQuestId(taskSearchDTO.getTaskId()); |
|
|
|
|
questDetail.setQuestType(4); |
|
|
|
|
// questDetail.setQuestType(4);
|
|
|
|
|
if(ObjectUtils.isNotNull(trayId)){ |
|
|
|
|
questDetail.setTrayId(String.valueOf(trayId)); |
|
|
|
|
} |
|
|
|
|
@ -1355,14 +1379,15 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
|
|
|
|
|
childList.add(addQuestDetailChild(noRepairNum,"40",questDetaiId,warehouseId,taskQuestEntity.getQuestNum())); |
|
|
|
|
childList.add(addQuestDetailChild(deliveNum,"50",questDetaiId,warehouseId,taskQuestEntity.getQuestNum())); |
|
|
|
|
childList.add(addQuestDetailChild(noReceivedNum,"60",questDetaiId,warehouseId,taskQuestEntity.getQuestNum())); |
|
|
|
|
if(!childList.isEmpty()){ |
|
|
|
|
if(!childList.isEmpty()){ |
|
|
|
|
boolean b = childList.stream().anyMatch(i -> ObjectUtils.isNull(i.getId())); |
|
|
|
|
if(b){ |
|
|
|
|
//添加
|
|
|
|
|
baseMapper.insertQuestDetailChildList(taskSearchDTO.getQuestNum()+"_child",childList); |
|
|
|
|
}else{ |
|
|
|
|
//修改
|
|
|
|
|
baseMapper.updetaQuestDetailChildList(taskQuestEntity.getQuestNum()+"_child",childList); |
|
|
|
|
List<QuestDetailChildEntity> collect = childList.stream().filter(i -> ObjectUtils.isNotNull(i.getQuestNum()) && i.getQuestNum() > 0).collect(Collectors.toList()); |
|
|
|
|
baseMapper.updetaQuestDetailChildList(taskQuestEntity.getQuestNum()+"_child",collect); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
// questDetailChildService.saveOrUpdateBatch(childList);
|
|
|
|
|
@ -1640,12 +1665,12 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
|
|
|
|
|
QuestDetailEntity detailEntity = new QuestDetailEntity(); |
|
|
|
|
detailEntity.setQuestId(taskSearchDTO.getTaskId()); |
|
|
|
|
detailEntity.setWarehouseId(taskSearchDTO.getWarehouseId()); |
|
|
|
|
detailEntity.setQuestType(3); |
|
|
|
|
|
|
|
|
|
// LambdaQueryWrapper<QuestDetailEntity> queryWrapper = Wrappers.<QuestDetailEntity>query().lambda()
|
|
|
|
|
// .eq(QuestDetailEntity::getQuestId, taskSearchDTO.getTaskId())
|
|
|
|
|
// .eq(QuestDetailEntity::getWarehouseId, taskSearchDTO.getWarehouseId())
|
|
|
|
|
// .eq(QuestDetailEntity::getQuestType, 3);
|
|
|
|
|
//是否库存品 0 否 1是
|
|
|
|
|
if (Func.equals(isInventory,1)){ |
|
|
|
|
detailEntity.setIncomingBatch(taskSearchDTO.getOrderCode()); |
|
|
|
|
}else { |
|
|
|
|
@ -1654,14 +1679,14 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
|
|
|
|
|
IPage<QuestDetailEntity> questDetailEntities = baseMapper.selectTaskInfo(page,taskSearchDTO.getQuestNum(),detailEntity); |
|
|
|
|
List<Integer> type = questDetailEntities.getRecords().stream().filter(f -> Func.isNotEmpty(f.getQuestTarget())).map(QuestDetailEntity::getQuestTarget).distinct().collect(Collectors.toList()); |
|
|
|
|
if (Func.isEmpty(type)){ |
|
|
|
|
return null; |
|
|
|
|
return Resp.scanFail("无数据信息！","无数据信息！"); |
|
|
|
|
} |
|
|
|
|
if (type.size() != 1){ |
|
|
|
|
log.error("###################orderId查询类型异常:{}",taskSearchDTO.getOrderId()); |
|
|
|
|
return null; |
|
|
|
|
} |
|
|
|
|
TaskContractVO contractVO = new TaskContractVO(); |
|
|
|
|
AtomicInteger total = new AtomicInteger(); |
|
|
|
|
AtomicInteger total = new AtomicInteger(); //总数
|
|
|
|
|
AtomicInteger operationNum = new AtomicInteger(); |
|
|
|
|
ArrayList<TaskPackagelistVO> taskPackagelistVOS = new ArrayList<>(); |
|
|
|
|
List<String> orderCode = questDetailEntities.getRecords().stream().map(QuestDetailEntity::getOrderCode).distinct().collect(Collectors.toList()); |
|
|
|
|
@ -1903,17 +1928,22 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
|
|
|
|
|
questDetailChildEntity = new QuestDetailChildEntity(); |
|
|
|
|
questDetailChildEntity.setTenantId(user.getTenantId()); |
|
|
|
|
questDetailChildEntity.setCreateUser(user.getUserId()); |
|
|
|
|
// questDetailChildEntity.setCreateDept(user.getDeptId());
|
|
|
|
|
questDetailChildEntity.setCreateDept(Long.valueOf(user.getDeptId())); |
|
|
|
|
questDetailChildEntity.setCreateTime(new Date()); |
|
|
|
|
|
|
|
|
|
questDetailChildEntity.setIsDeleted(0); |
|
|
|
|
questDetailChildEntity.setStatus(1); |
|
|
|
|
questDetailChildEntity.setQuestDetailId(questDetaiId); |
|
|
|
|
questDetailChildEntity.setCargoName(cargoName); |
|
|
|
|
questDetailChildEntity.setQuestNum(num); |
|
|
|
|
questDetailChildEntity.setWarehouseId(warehouseId); |
|
|
|
|
return questDetailChildEntity; |
|
|
|
|
}else{ |
|
|
|
|
questDetailChildEntity.setQuestNum(num); |
|
|
|
|
QuestDetailChildEntity detailChildEntity = new QuestDetailChildEntity(); |
|
|
|
|
detailChildEntity.setQuestNum(num); |
|
|
|
|
detailChildEntity.setId(questDetailChildEntity.getId()); |
|
|
|
|
return detailChildEntity; |
|
|
|
|
} |
|
|
|
|
return questDetailChildEntity; |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -2229,6 +2259,87 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
|
|
|
|
|
return R.data(taskContractVOS); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 合同扫描 改 |
|
|
|
|
* @param page |
|
|
|
|
* @param taskSearchDTO |
|
|
|
|
* @return |
|
|
|
|
*/ |
|
|
|
|
@Override |
|
|
|
|
@Transactional |
|
|
|
|
public R queryContractGai(IPage<Object> page, TaskSearchDTO taskSearchDTO) { |
|
|
|
|
// String goodsType = taskSearchDTO.getGoodsType();
|
|
|
|
|
Integer type = taskSearchDTO.getType(); |
|
|
|
|
String questNum = taskSearchDTO.getQuestNum(); |
|
|
|
|
Long taskQuestId = taskSearchDTO.getTaskId(); |
|
|
|
|
if (Func.isEmpty(type)){ |
|
|
|
|
log.error("####################前端参数type传递有误:{}",type); |
|
|
|
|
return Resp.scanFail("操作失败", "服务器正忙..."); |
|
|
|
|
} |
|
|
|
|
if (Func.isEmpty(questNum)){ |
|
|
|
|
log.error("####################前端参数questNum传递有误:{}",questNum); |
|
|
|
|
return Resp.scanFail("操作失败", "服务器正忙..."); |
|
|
|
|
} |
|
|
|
|
String incomingBatch = taskSearchDTO.getIncomingBatch(); //输入的码
|
|
|
|
|
String code = taskSearchDTO.getCode(); //扫描的码
|
|
|
|
|
QuestDetailEntity questDetail = new QuestDetailEntity(); |
|
|
|
|
if(type == 1){ |
|
|
|
|
if(ObjectUtils.isNull(code)){ |
|
|
|
|
log.error("####################订单合同号为空"); |
|
|
|
|
return Resp.scanFail("操作失败", "请填写正确合同号"); |
|
|
|
|
} |
|
|
|
|
questDetail.setOrdePackageCode(code); |
|
|
|
|
}else{ |
|
|
|
|
if(ObjectUtils.isNull(incomingBatch)){ |
|
|
|
|
log.error("####################订单合同号为空"); |
|
|
|
|
return Resp.scanFail("操作失败", "请输入正确合同号"); |
|
|
|
|
} |
|
|
|
|
questDetail.setOrderCode(incomingBatch); |
|
|
|
|
} |
|
|
|
|
//检验是否完结
|
|
|
|
|
verifyTask(taskQuestId, taskSearchDTO.getWarehouseId()); |
|
|
|
|
|
|
|
|
|
TaskQuestEntity taskQuestEntity = baseMapper.selectById(taskQuestId); |
|
|
|
|
taskSearchDTO.setQuestNum(taskQuestEntity.getQuestNum()); |
|
|
|
|
|
|
|
|
|
List<TaskContractVO> taskContractVOS = new ArrayList<>(); |
|
|
|
|
//查询盘点数据
|
|
|
|
|
questDetail.setQuestId(taskQuestId); |
|
|
|
|
questDetail.setWarehouseId(taskSearchDTO.getWarehouseId()); |
|
|
|
|
IPage<QuestDetailEntity> questDetailEntityList; |
|
|
|
|
questDetailEntityList = baseMapper.selectTaskInfo(page,taskSearchDTO.getQuestNum(),questDetail); |
|
|
|
|
|
|
|
|
|
if(ObjectUtils.isNull(questDetailEntityList.getRecords())){ |
|
|
|
|
if(type == 2){ |
|
|
|
|
questDetail.setOrderCode(null); |
|
|
|
|
questDetail.setOrdePackageCode(incomingBatch); |
|
|
|
|
questDetailEntityList = baseMapper.selectTaskInfo(page,taskSearchDTO.getQuestNum(),questDetail); |
|
|
|
|
if(ObjectUtils.isNull(questDetailEntityList.getRecords())){ |
|
|
|
|
return Resp.scanSuccess("无盘点数据！","无盘点数据!"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
}else{ |
|
|
|
|
return Resp.scanSuccess("无盘点数据！","无盘点数据!"); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
questDetailEntityList.getRecords().stream().collect(Collectors.groupingBy(QuestDetailEntity::getOrderId)) |
|
|
|
|
.forEach((k,v)->{ |
|
|
|
|
TaskContractVO taskContractVO = new TaskContractVO(); |
|
|
|
|
taskContractVO.setOrderId(k); |
|
|
|
|
taskContractVO.setOrderCode(v.get(0).getOrderCode()); |
|
|
|
|
DistributionStockArticleEntity entityByStockArticle = distributionStockArticleClient.findEntityByStockArticleId(k); |
|
|
|
|
taskContractVO.setTotal(entityByStockArticle.getTotalNumber()); |
|
|
|
|
taskContractVO.setZktotal(entityByStockArticle.getHandQuantity()); |
|
|
|
|
int size = v.stream().map(i -> i.getQuestStatus().equals("1")).collect(Collectors.toList()).size(); |
|
|
|
|
taskContractVO.setUnTotal(size); |
|
|
|
|
boolean b = v.stream().anyMatch(ii -> ii.getQuestTarget().equals(1)); |
|
|
|
|
taskContractVO.setIsZero(b ? 0 : 1); |
|
|
|
|
taskContractVO.setIsInventory(b ? 0 : 1); |
|
|
|
|
taskContractVOS.add(taskContractVO); |
|
|
|
|
}); |
|
|
|
|
return R.data(taskContractVOS); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private String getQuestNum(String warehouseCode) { |
|
|
|
|
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss"); |
|
|
|
|
|
