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

Merge branch 'dev' into pre-production

newStockUp
pref_mail@163.com 1 year ago
parent
01805fc6db 6ee47da9c6
commit
8fc95b5ac6
10 changed files with 123 additions and 78 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. 6
      blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/QuestDetailEntity.java
  2. 4
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml
  3. 6
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockController.java
  4. 7
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java
  5. 12
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
  6. 1
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
  7. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
  8. 20
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
  9. 51
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
  10. 92
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java

6
blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/QuestDetailEntity.java
Unescape View File

@ -132,6 +132,12 @@ public class QuestDetailEntity extends TenantEntity {
*/
@ApiModelProperty(value = "托盘码")
private String trayCode;
/**
* 上架后的库位ID
*/
@ApiModelProperty(value = "上架后的库位ID")
private String groundingAllocationId;
/**
* 托盘id
*/

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

@ -136,8 +136,8 @@
<select id="selectAllocationInfo" resultType="com.logpm.basicdata.vo.WarehouseAllocationInfoVO">
SELECT
lwga.id as allocationCode,
CONCAT(lwga1.headline,'-',lwgs.goods_shelf_name,'-',lwga.goods_allocation_name) as allocationName,
lwga.qr_code as allocationCode,
CONCAT(lwgs.goods_shelf_name,'-',lwga.goods_allocation_name) as allocationName,
lww.`name` as warehouseName,
lwga1.headline as areaName
from logpm_warehouse_goods_allocation lwga

6
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockController.java
Unescape View File

@ -18,6 +18,7 @@ package com.logpm.distribution.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.logpm.distribution.dto.DistributionStockDTO;
import com.logpm.distribution.entity.DistributionStockEntity;
@ -108,6 +109,11 @@ public class DistributionStockController extends BladeController {
@ApiOperationSupport(order = 4)
@ApiOperation(value = "系统备货新增", notes = "传入distributionStock")
public R addStockDetail(@Valid @RequestBody DistributionStockDTO distributionStock) {
if(ObjectUtils.isNull(distributionStock.getGoodsAreaId())){
return R.fail("注意，注意：备货区未选择！");
}
return R.status(distributionStockService.addStockDetail(distributionStock));
}

7
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java
Unescape View File

@ -395,4 +395,11 @@ public interface DistributionDeliveryListMapper extends BaseMapper<DistributionD
* @return
*/
List<DistributionReservationStockarticleEntity> selectReservationStockByDeliveryId(@Param("delivaryListId") Long id);
/**
*
* @param deliveryId
* @return
*/
List<DistributionReservationStockarticleEntity> getReservationStockArticleByDeliveryId(@Param("delivaryListId") Long deliveryId);
}

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

@ -1552,5 +1552,17 @@
INNER JOIN logpm_distribution_reservation_stockarticle As ldrs ON ldrs.reservation_id = ldr.id
WHERE lddl.id = #{delivaryListId}
</select>
<select id="getReservationStockArticleByDeliveryId"
resultType="com.logpm.distribution.entity.DistributionReservationStockarticleEntity">
SELECT
ldrs.*
FROM
logpm_distribution_delivery_list AS lddl
INNER JOIN logpm_distribution_signfor AS lds ON lds.delivery_id = lddl.id
INNER JOIN logpm_distribution_reservation AS ldr ON lds.reservation_id = ldr.id
INNER JOIN logpm_distribution_reservation_stockarticle AS ldrs ON ldrs.reservation_id = ldr.id
where
lddl.id = #{delivaryListId}
</select>
</mapper>

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

@ -576,6 +576,7 @@
logpm_distribution_reservation_package AS ldrp
INNER JOIN logpm_distribution_parcel_list AS ldpl ON ldrp.parce_list_id = ldpl.id
<where>
ldrp.packet_bar_status in ('1','3')
<if test="reservationId !=null and reservationId!= ''">
and ldrp.reservation_id = #{reservationId}
</if>

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

@ -565,7 +565,7 @@
ldrs.reservation_num reservationNum,
ldrs.stock_article_id stockArticleId,
(SELECT COALESCE(COUNT(*), 0) from logpm_distribution_loadscan ldl WHERE ldl.order_id =ldsa.id and ldl.scan_status !=1 and ldl.signfor_state =2) signforNub,
(SELECT COALESCE(COUNT(*), 0) from logpm_distribution_loadscan ldl WHERE ldl.order_id =ldsa.id and ldl.scan_status !=1 ) loadingNub
(SELECT COALESCE(COUNT(*), 0) from logpm_distribution_loadscan ldl WHERE ldl.order_id =ldsa.id and ldl.scan_status !=1 and ldl.reservation_id = ldr.id) loadingNub
FROM
logpm_distribution_reservation ldr
join logpm_distribution_reservation_stockarticle ldrs on ldr.id = ldrs.reservation_id

20
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
Unescape View File

@ -3245,6 +3245,12 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
log.error("配送任务订单查询异常:{}", deliveryStockArticleInfo);
return null;
}
List<DistributionReservationStockarticleEntity> reservationStockarticleEntityList = baseMapper.getReservationStockArticleByDeliveryId(distributionDeliveryInfoDTO.getDeliveryId());
if (Func.isEmpty(reservationStockarticleEntityList)) {
log.error("配送任务订单查询异常:{}", reservationStockarticleEntityList);
return null;
}
List<DistributionLoadscanEntity> loadscanEntities = distributionLoadscanMapper.selectList(Wrappers.<DistributionLoadscanEntity>query().lambda()
.eq(DistributionLoadscanEntity::getDeliveryId, distributionDeliveryInfoDTO.getDeliveryId())
.ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()));
@ -3253,9 +3259,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
loadingDataMap = loadscanEntities.stream().collect(Collectors.toMap(DistributionLoadscanEntity::getPackageId, Function.identity(), (k1, k2) -> k2));
}
ArrayList<DistributionParcelListVO> distributionParcelListVOS = new ArrayList<>();
for (DistributionStockArticleVO distributionStockArticleVO : deliveryStockArticleInfo) {
if (distributionStockArticleVO.getIsZero().equals(IsOrNoConstant.no.getValue())) {
List<DistributionParcelListEntity> parcelListEntityList = baseMapper.getPackageListByDeliveryId(distributionDeliveryInfoDTO.getDeliveryId(), distributionStockArticleVO.getId());
for (DistributionReservationStockarticleEntity reservationStockarticleEntity : reservationStockarticleEntityList) {
if (reservationStockarticleEntity.getIsZero().equals(IsOrNoConstant.no.getValue())) {
List<DistributionParcelListEntity> parcelListEntityList = distributionReservationMapper.getReservationPackage(reservationStockarticleEntity.getReservationId(), reservationStockarticleEntity.getStockArticleId());
List<DistributionParcelListVO> parcelListVOList = DistributionParcelListWrapper.build().listVO(parcelListEntityList);
for (DistributionParcelListVO distributionParcelListVO : parcelListVOList) {
if (Func.isNotEmpty(loadingDataMap)) {
@ -3277,9 +3283,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
}
distributionParcelListVOS.add(distributionParcelListVO);
}
} else if (distributionStockArticleVO.getIsZero().equals(IsOrNoConstant.yes.getValue())) {
List<DistributionParcelListEntity> parcelListEntityList = baseMapper.getPackageListByDeliveryId(distributionDeliveryInfoDTO.getDeliveryId(), distributionStockArticleVO.getId());
List<DistributionParcelListEntity> zeroParcelListEntityList = baseMapper.getZeroPackageListByDeliveryId(distributionDeliveryInfoDTO.getDeliveryId(), distributionStockArticleVO.getId());
} else if (reservationStockarticleEntity.getIsZero().equals(IsOrNoConstant.yes.getValue())) {
List<DistributionParcelListEntity> parcelListEntityList = distributionReservationMapper.getReservationPackage(reservationStockarticleEntity.getReservationId(), reservationStockarticleEntity.getStockArticleId());
List<DistributionParcelListEntity> zeroParcelListEntityList = baseMapper.getZeroPackageListByDeliveryId(distributionDeliveryInfoDTO.getDeliveryId(), reservationStockarticleEntity.getStockArticleId());
List<DistributionParcelListVO> zeroParcelListVOList = DistributionParcelListWrapper.build().listVO(zeroParcelListEntityList);
for (DistributionParcelListVO parcelListVO : zeroParcelListVOList) {
if (Func.isNotEmpty(loadingDataMap)) {
@ -3302,7 +3308,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
distributionParcelListVOS.add(parcelListVO);
}
} else {
log.error("###########订单数据isZero字段值错误,订单Id为:{}", distributionStockArticleVO.getId());
log.error("###########订单数据isZero字段值错误,订单Id为:{}", reservationStockarticleEntity.getId());
}
}

51
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
Unescape View File

@ -2666,21 +2666,24 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
.ne(DistributionParcelListEntity::getOrderPackageReservationStatus,OrderPackageReservationStatusConstant.yiyueyue.getValue())
.notIn(DistributionParcelListEntity::getOrderPackageStatus,new String[]{OrderPackageStatusConstant.yichuku.getValue(),OrderPackageStatusConstant.yiqianshou.getValue()}));
distributionParcelListEntities.forEach(p -> {
if (!Func.equals(p.getOrderPackageFreezeStatus(), OrderPackageFreezeStatusConstant.yidongjie.getValue()) && !Func.equals(p.getOrderPackageFreezeStatus(), OrderPackageReservationStatusConstant.yiyueyue.getValue())) {
DistributionReservationPackageEntity distributionReservationPackageEntity = new DistributionReservationPackageEntity();
distributionReservationPackageEntity.setReservationId(reservationId);
distributionReservationPackageEntity.setParceListId(p.getId());
distributionReservationPackageEntity.setStockArticleId(s.getId());
distributionReservationPackageEntity.setPacketBarCode(p.getOrderPackageCode());
//维护订单下包件信息
distributionReservationPackageService.save(distributionReservationPackageEntity);
//此时订单下的所有包件都处于预约状态，可用数为0
packageNum.getAndAdd(p.getQuantity());
//修改订单下的包件状态
if (p.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue())){
if (!Func.equals(p.getOrderPackageFreezeStatus(), OrderPackageFreezeStatusConstant.yidongjie.getValue()) && !Func.equals(p.getOrderPackageReservationStatus(), OrderPackageReservationStatusConstant.yiyueyue.getValue())) {
DistributionReservationPackageEntity distributionReservationPackageEntity = new DistributionReservationPackageEntity();
distributionReservationPackageEntity.setReservationId(reservationId);
distributionReservationPackageEntity.setParceListId(p.getId());
distributionReservationPackageEntity.setStockArticleId(s.getId());
distributionReservationPackageEntity.setPacketBarCode(p.getOrderPackageCode());
//维护订单下包件信息
distributionReservationPackageService.save(distributionReservationPackageEntity);
//此时订单下的所有包件都处于预约状态，可用数为0
packageNum.getAndAdd(p.getQuantity());
//修改订单下的包件状态
// p.setOrderPackageReservationStatus();
p.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.yiyueyue.getValue());
distributionParcelListService.updateById(p);
p.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.yiyueyue.getValue());
distributionParcelListService.updateById(p);
}
}
// stockArticleEntity.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue());
});
s.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue());
@ -2688,16 +2691,20 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
} else {
//维护选中的包件信息
packageList.forEach(p -> {
DistributionReservationPackageEntity distributionReservationPackageEntity = new DistributionReservationPackageEntity();
distributionReservationPackageEntity.setReservationId(reservationId);
distributionReservationPackageEntity.setParceListId(p.getId());
distributionReservationPackageEntity.setStockArticleId(s.getId());
distributionReservationPackageEntity.setPacketBarCode(p.getOrderPackageCode());
distributionReservationPackageService.save(distributionReservationPackageEntity);
packageNum.getAndAdd(p.getQuantity());
p.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.yiyueyue.getValue());
if (!p.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue())){
if (!Func.equals(p.getOrderPackageFreezeStatus(), OrderPackageFreezeStatusConstant.yidongjie.getValue()) && !Func.equals(p.getOrderPackageReservationStatus(), OrderPackageReservationStatusConstant.yiyueyue.getValue())){
DistributionReservationPackageEntity distributionReservationPackageEntity = new DistributionReservationPackageEntity();
distributionReservationPackageEntity.setReservationId(reservationId);
distributionReservationPackageEntity.setParceListId(p.getId());
distributionReservationPackageEntity.setStockArticleId(s.getId());
distributionReservationPackageEntity.setPacketBarCode(p.getOrderPackageCode());
distributionReservationPackageService.save(distributionReservationPackageEntity);
packageNum.getAndAdd(p.getQuantity());
p.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.yiyueyue.getValue());
// p.setBrandId(p.getBrandId());
distributionParcelListService.updateById(p);
distributionParcelListService.updateById(p);
}
}
});
// s.setReservationStatus(ServiceConstant.ORDER_RESERVATION_STATE_PART);
//设置订单可用数量为

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

@ -102,7 +102,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
@Override
public R saveCustom(TaskQuestDTO taskQuest) {
BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
if (null == myCurrentWarehouse){
if (null == myCurrentWarehouse) {
return R.fail("请选择仓库后操作");
}
Long id = myCurrentWarehouse.getId();
@ -112,7 +112,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
taskQuest.setQuestNum(questNum);
boolean save = this.save(taskQuest);
//存入子表
if (taskQuest.getList().size()>0){
if (taskQuest.getList().size() > 0) {
List<TaskQuestChildEntity> list = taskQuest.getList();
for (TaskQuestChildEntity taskQuestChildEntity : list) {
taskQuestChildEntity.setWarehouseId(id);
@ -120,14 +120,14 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
}
taskQuestChildService.saveBatch(list);
}
return save?R.success("添加成功"):R.fail("添加失败");
return save ? R.success("添加成功") : R.fail("添加失败");
}
@Override
public TaskQuestVO getOneCustom(Long id) {
TaskQuestVO taskQuestVO = new TaskQuestVO();
TaskQuestEntity taskQuestEntity = baseMapper.selectById(id);
Func.copy(taskQuestEntity,taskQuestVO);
Func.copy(taskQuestEntity, taskQuestVO);
//查询子表
List<TaskQuestChildVO> list = taskQuestChildService.selectlistByMasterId(id);
taskQuestVO.setList(list);
@ -138,8 +138,8 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
public Boolean deleteLogicCustom(List<Long> toLongList) {
//删除子表
boolean remove = taskQuestChildService.remove(new QueryWrapper<TaskQuestChildEntity>().lambda()
.eq(TaskQuestChildEntity::getIsDeleted,0)
.in(TaskQuestChildEntity::getQuestId,toLongList)
.eq(TaskQuestChildEntity::getIsDeleted, 0)
.in(TaskQuestChildEntity::getQuestId, toLongList)
);
return this.deleteLogic(toLongList);
}
@ -149,11 +149,11 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
Long id = taskQuest.getId();
//删除子表
boolean remove = taskQuestChildService.remove(new QueryWrapper<TaskQuestChildEntity>().lambda()
.eq(TaskQuestChildEntity::getIsDeleted,0)
.eq(TaskQuestChildEntity::getQuestId,id)
.eq(TaskQuestChildEntity::getIsDeleted, 0)
.eq(TaskQuestChildEntity::getQuestId, id)
);
//存入子表
if (taskQuest.getList().size()>0){
if (taskQuest.getList().size() > 0) {
List<TaskQuestChildEntity> list = taskQuest.getList();
for (TaskQuestChildEntity taskQuestChildEntity : list) {
taskQuestChildEntity.setWarehouseId(id);
@ -168,12 +168,12 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
@Override
public IPage<TaskQuestApiVO> selectTaskQuestApiPage(IPage<TaskQuestApiVO> page, TaskQuestApiVO taskQuest) {
List<Long> collect =this.getmyWarehouseList();
List<Long> collect = this.getmyWarehouseList();
List<TaskQuestApiVO> taskQuestVOS = baseMapper.selectTaskQuestApiPage(page, taskQuest, collect);
for (TaskQuestApiVO taskQuestVO : taskQuestVOS) {
//查询子表
List<TaskQuestChildVO> list = taskQuestChildService.selectlistByMasterId(taskQuestVO.getId());
taskQuestVO.setList(list);
//查询子表
List<TaskQuestChildVO> list = taskQuestChildService.selectlistByMasterId(taskQuestVO.getId());
taskQuestVO.setList(list);
}
return page.setRecords(taskQuestVOS);
}
@ -188,13 +188,13 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
@Override
public IPage<TaskallocationVO> selectallocationList(IPage<TaskallocationVO> page, TaskSearchDTO taskSearchDTO) {
List<Long> collect =this.getmyWarehouseList();
List<TaskallocationVO> list =baseMapper.selectallocationList(page,taskSearchDTO,collect);
if (!list.isEmpty()){
List<Long> collect = this.getmyWarehouseList();
List<TaskallocationVO> list = baseMapper.selectallocationList(page, taskSearchDTO, collect);
if (!list.isEmpty()) {
for (TaskallocationVO taskallocationVO : list) {
Long allocationId = taskallocationVO.getAllocationId();
Integer i = warehouseUpdownGoodsMapper.selectCountSumByallocation(allocationId);
taskallocationVO.setTotal(i);
Integer i = warehouseUpdownGoodsMapper.selectCountSumByallocation(allocationId);
taskallocationVO.setTotal(i);
}
}
return page.setRecords(list);
@ -202,43 +202,43 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
@Override
public IPage<TaskContractVO> selectcontractList(IPage<TaskContractVO> page, TaskSearchDTO taskSearchDTO) {
List<Long> collect =this.getmyWarehouseList();
List<Long> collect = this.getmyWarehouseList();
baseMapper.setSqlMode();
List<TaskContractVO> list = baseMapper.selectcontractList(page,taskSearchDTO,collect);
if (!list.isEmpty()){
for (TaskContractVO taskContractVO : list) {
Long orderId = taskContractVO.getOrderId();
String orderCode = taskContractVO.getOrderCode();
//查询该订单，如果是零担直接用在库数量
DistributionStockArticleEntity entityByStockArticle = distributionStockArticleClient.findEntityByStockArticleId(orderId);
if (entityByStockArticle.getIsZero().equals("1")){
if (entityByStockArticle.getGenre() == 1){
taskContractVO.setTotal(entityByStockArticle.getTotalNumber());
taskContractVO.setZktotal(entityByStockArticle.getTotalNumber());
}
}else if (entityByStockArticle.getIsZero().equals("0")){
//包条
if (entityByStockArticle.getGenre()==1){
//查询该订单下包条的所有数量
Integer integer = distributionParcelListClient.SumEntityByOrderId(orderId, null);
Integer integer1 = distributionParcelListClient.SumEntityByOrderId(orderId, collect.get(0));
taskContractVO.setTotal(integer);
taskContractVO.setZktotal(integer1);
List<TaskContractVO> list = baseMapper.selectcontractList(page, taskSearchDTO, collect);
if (!list.isEmpty()) {
for (TaskContractVO taskContractVO : list) {
Long orderId = taskContractVO.getOrderId();
String orderCode = taskContractVO.getOrderCode();
//查询该订单，如果是零担直接用在库数量
DistributionStockArticleEntity entityByStockArticle = distributionStockArticleClient.findEntityByStockArticleId(orderId);
if (entityByStockArticle.getIsZero().equals("1")) {
if (entityByStockArticle.getGenre() == 1) {
taskContractVO.setTotal(entityByStockArticle.getTotalNumber());
taskContractVO.setZktotal(entityByStockArticle.getTotalNumber());
}
} else if (entityByStockArticle.getIsZero().equals("0")) {
//包条
if (entityByStockArticle.getGenre() == 1) {
//查询该订单下包条的所有数量
Integer integer = distributionParcelListClient.SumEntityByOrderId(orderId, null);
Integer integer1 = distributionParcelListClient.SumEntityByOrderId(orderId, collect.get(0));
taskContractVO.setTotal(integer);
taskContractVO.setZktotal(integer1);
}
}
}
}
}
return page.setRecords(list);
}
@Override
public IPage<TaskTrayVO> selecttrayList(IPage<TaskTrayVO> page, TaskSearchDTO taskSearchDTO) {
List<Long> collect =this.getmyWarehouseList();
List<Long> collect = this.getmyWarehouseList();
baseMapper.setSqlMode();
List<TaskTrayVO> list = baseMapper.selecttrayList(page,taskSearchDTO,collect);
if (!list.isEmpty()){
List<TaskTrayVO> list = baseMapper.selecttrayList(page, taskSearchDTO, collect);
if (!list.isEmpty()) {
for (TaskTrayVO taskTrayVO : list) {
//查询托盘
Integer i = warehouseTrayGoodsMapper.SumByTrayId(taskTrayVO.getTrayId());
@ -251,7 +251,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
@Override
public IPage<TaskStripApiVO> selectallocationDetailByStrip(IPage<TaskStripApiVO> page, TaskSearchDTO taskSearchDTO) {
//查询货位上的所有包条
List<TaskStripApiVO> list = warehouseUpdownGoodsMapper.selectListByTaskStrip(page,taskSearchDTO);
List<TaskStripApiVO> list = warehouseUpdownGoodsMapper.selectListByTaskStrip(page, taskSearchDTO);
for (TaskStripApiVO taskStripApiVO : list) {
}
@ -260,7 +260,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
private String getQuestNum(String warehouseCode) {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
return "PDRW-"+warehouseCode+"-"+simpleDateFormat.format(new Date())+new Random().nextInt(900) + 100;
return "PDRW-" + warehouseCode + "-" + simpleDateFormat.format(new Date()) + new Random().nextInt(900) + 100;
}
}

Write Preview
Loading…
Cancel
Save