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

1.修复仓库盘点任务明细导出

dist.1.3.0
zhenghaoyu 8 months ago
parent
c74ba318ff
commit
6f45f63321
11 changed files with 281 additions and 57 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. 13
      blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/ZeroNumVO.java
  2. 2
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java
  3. 10
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml
  4. 2
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadScanService.java
  5. 1
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineWaybillOrderService.java
  6. 6
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadScanServiceImpl.java
  7. 260
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
  8. 9
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillOrderServiceImpl.java
  9. 22
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/TaskQuestController.java
  10. 6
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/excel/QuestContrastPackageExcelVO.java
  11. 7
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java

13
blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/ZeroNumVO.java
Unescape View File

@ -0,0 +1,13 @@
package com.logpm.trunkline.vo;
import lombok.Data;
import java.io.Serializable;
@Data
public class ZeroNumVO implements Serializable {
private String waybillNo;
private Integer num;
}

2
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java
Unescape View File

@ -169,4 +169,6 @@ public interface TrunklineCarsLoadScanMapper extends BaseMapper<TrunklineCarsLoa
void updateFinalNodeIdByLoadIdAndWarehouseIdAndOrderCodeAndWaybillNo(@Param("loadId") Long loadId, @Param("warehouseId") Long warehouseId, @Param("orderCode") String orderCode, @Param("waybillNo") String waybillNo, @Param("finalNodeId") Long finalNodeId, @Param("finalNodeName") String finalNodeName);
List<TrunklineCarsLoadScanEntity> findAbnormalZeroScanList(@Param("loadId") Long loadId, @Param("warehouseId") Long warehouseId);
List<ZeroNumVO> findZeroStartNum(@Param("loadId") Long loadId, @Param("warehouseId") Long warehouseId);
}

10
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml
Unescape View File

@ -903,4 +903,14 @@
and scan_status = '1'
</update>
<select id="findZeroStartNum" resultType="com.logpm.trunkline.vo.ZeroNumVO">
select waybill_no waybillNo,
sum(num) num
from logpm_trunkline_cars_load_scan
where load_id = #{loadId}
and warehouse_id = #{warehouseId}
group by waybill_no
</select>
</mapper>

2
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadScanService.java
Unescape View File

@ -164,4 +164,6 @@ public interface ITrunklineCarsLoadScanService extends BaseService<TrunklineCars
void updateFinalNodeIdByLoadIdAndWarehouseIdAndOrderCodeAndWaybillNo(Long loadId, Long warehouseId, String orderCode, String waybillNo, Long finalNodeId,String finalNodeName);
List<TrunklineCarsLoadScanEntity> findAbnormalZeroScanList(Long loadId, Long warehouseId);
List<ZeroNumVO> findZeroStartNum(Long loadId, Long warehouseId);
}

1
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineWaybillOrderService.java
Unescape View File

@ -25,4 +25,5 @@ public interface ITrunklineWaybillOrderService extends BaseService<TrunklineWayb
void deleteByWaybillNo(String waybillNo);
TrunklineWaybillOrderEntity findEntityByWaybillNoAndOrderCode(String waybillNo, String orderCode);
}

6
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadScanServiceImpl.java
Unescape View File

@ -16,6 +16,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springframework.stereotype.Service;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Map;
@ -398,4 +399,9 @@ public class TrunklineCarsLoadScanServiceImpl extends BaseServiceImpl<TrunklineC
return baseMapper.findAbnormalZeroScanList(loadId,warehouseId);
}
@Override
public List<ZeroNumVO> findZeroStartNum(Long loadId, Long warehouseId) {
return baseMapper.findZeroStartNum(loadId,warehouseId);
}
}

260
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
Unescape View File

@ -369,6 +369,51 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
}
try {
//查询零担发车件数
List<ZeroNumVO> zeroNumVOList = trunklineCarsLoadScanService.findZeroStartNum(loadId,warehouseId);
if(CollUtil.isNotEmpty(zeroNumVOList)){
zeroNumVOList.forEach(zeroNumVO -> {
String waybillNo = zeroNumVO.getWaybillNo();
Integer num = zeroNumVO.getNum();
WarehouseWaybillEntity waybill = warehouseWaybillClient.findByWaybillNo(waybillNo);
Integer totalCount = waybill.getTotalCount();
Integer waybillStatusInt = Integer.parseInt(waybill.getWaybillStatus());
TrunklineWaybillOrderEntity waybillOrderEntity = trunklineWaybillOrderService.findEntityByWaybillNoAndOrderCode(waybillNo,waybillNo);
if(!Objects.isNull(waybillOrderEntity)){
Integer handleNumber = waybillOrderEntity.getHandleNumber();
if(Objects.isNull(handleNumber)){
handleNumber = 0;
}
int i = handleNumber + num;
if(waybillStatusInt < 30){
if(totalCount == i){
waybill.setWaybillStatus("40");
waybillOrderEntity.setHandleNumber(i);
warehouseWaybillClient.updateEntity(waybill);
trunklineWaybillOrderService.updateById(waybillOrderEntity);
}else{
waybill.setWaybillStatus("30");
waybillOrderEntity.setHandleNumber(i);
warehouseWaybillClient.updateEntity(waybill);
trunklineWaybillOrderService.updateById(waybillOrderEntity);
}
}else if(waybillStatusInt == 30){
if(totalCount == i){
waybill.setWaybillStatus("40");
waybillOrderEntity.setHandleNumber(i);
warehouseWaybillClient.updateEntity(waybill);
trunklineWaybillOrderService.updateById(waybillOrderEntity);
}else{
waybillOrderEntity.setHandleNumber(i);
trunklineWaybillOrderService.updateById(waybillOrderEntity);
}
}
}
});
}
//更新关联订单数据的发车数量
trunklineCarsOrderService.updateStartNumByLoadIdAndWarehouseId(loadId, warehouseId);
//删除没有装车的计划数据
@ -756,6 +801,41 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
}
try {
//查询零担发车件数
List<ZeroNumVO> zeroNumVOList = trunklineCarsLoadScanService.findZeroStartNum(loadId,warehouseId);
if(CollUtil.isNotEmpty(zeroNumVOList)){
zeroNumVOList.forEach(zeroNumVO -> {
String waybillNo = zeroNumVO.getWaybillNo();
Integer num = zeroNumVO.getNum();
WarehouseWaybillEntity waybill = warehouseWaybillClient.findByWaybillNo(waybillNo);
Integer totalCount = waybill.getTotalCount();
Integer waybillStatusInt = Integer.parseInt(waybill.getWaybillStatus());
TrunklineWaybillOrderEntity waybillOrderEntity = trunklineWaybillOrderService.findEntityByWaybillNoAndOrderCode(waybillNo,waybillNo);
if(!Objects.isNull(waybillOrderEntity)){
Integer handleNumber = waybillOrderEntity.getHandleNumber();
if(waybillStatusInt == 40 || waybillStatusInt == 30){
if(Objects.isNull(handleNumber)){
handleNumber = 0;
}
int i = handleNumber - num;
if(i==0){
waybill.setWaybillStatus("20");
waybillOrderEntity.setHandleNumber(totalCount);
}else{
waybill.setWaybillStatus("30");
waybillOrderEntity.setHandleNumber(i);
}
warehouseWaybillClient.updateEntity(waybill);
trunklineWaybillOrderService.updateById(waybillOrderEntity);
}
}
});
}
//更新关联订单数据的发车数量
trunklineCarsOrderService.updateStartNumToPlanNumByLoadIdAndWarehouseId(loadId, warehouseId);
@ -1004,6 +1084,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
}
Long nowWarehouseId = carsLoadEntity.getNowWarehouseId();//当前节点id
String carsNo = carsLoadEntity.getCarsNo();
if (!warehouseId.equals(nowWarehouseId)) {
log.warn("#############cancelArriveCarByLoadId: 配载未到达当前仓 loadId={} nowWarehouseId={}", loadId, nowWarehouseId);
@ -1183,30 +1264,41 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
}
distributionParcelNumberClient.addBatch(ls);
if(isTransfer == 0){
QueryWrapper<TrunklineWaybillOrderEntity> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.eq("waybill_no",stockArticleEntity.getWaybillNumber())
.eq("order_code",stockArticleEntity.getWaybillNumber());
TrunklineWaybillOrderEntity one = trunklineWaybillOrderService.getOne(queryWrapper1);
if(!Objects.isNull(one)){
WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillNo(stockArticleEntity.getWaybillNumber());
Integer totalCount = waybillEntity.getTotalCount();
Integer waybillStatusInt = Integer.parseInt(waybillEntity.getWaybillStatus());
if(waybillStatusInt <= 30){
Integer handleNumber = one.getHandleNumber();
int total = handleNumber + unloadNum;
if(total < totalCount){
waybillEntity.setWaybillStatus("50");
one.setHandleNumber(total);
}else{
waybillEntity.setWaybillStatus("60");
one.setHandleNumber(totalCount);
}
warehouseWaybillClient.updateEntity(waybillEntity);
trunklineWaybillOrderService.updateById(one);
}
}
}
// if(isTransfer == 0){
// //查询零担发车件数
// List<ZeroNumVO> zeroNumVOList = trunklineCarsLoadScanService.findZeroStartNum(loadId,warehouseId);
// if(CollUtil.isNotEmpty(zeroNumVOList)){
// zeroNumVOList.forEach(zeroNumVO -> {
// String waybillNo = zeroNumVO.getWaybillNo();
// Integer num = zeroNumVO.getNum();
// WarehouseWaybillEntity waybill = warehouseWaybillClient.findByWaybillNo(waybillNo);
// Integer totalCount = waybill.getTotalCount();
// Integer waybillStatusInt = Integer.parseInt(waybill.getWaybillStatus());
// TrunklineWaybillOrderEntity waybillOrderEntity = trunklineWaybillOrderService.findEntityByWaybillNoAndOrderCode(waybillNo,waybillNo);
// if(!Objects.isNull(waybillOrderEntity)){
// Integer handleNumber = waybillOrderEntity.getHandleNumber();
// if(waybillStatusInt <= 40){
// if(Objects.isNull(handleNumber)){
// handleNumber = 0;
// }
// int i = handleNumber - num;
// if(i==0){
// waybill.setWaybillStatus("20");
// waybillOrderEntity.setHandleNumber(totalCount);
// }else{
// waybill.setWaybillStatus("30");
// waybillOrderEntity.setHandleNumber(i);
// }
//
// warehouseWaybillClient.updateEntity(waybill);
// trunklineWaybillOrderService.updateById(waybillOrderEntity);
// }
//
// }
//
// });
// }
// }
}
} else {
Integer hQuantity = newStockArticleEntity.getHandQuantity() + unloadNum;
@ -1232,38 +1324,77 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
newStockArticleEntity.setIncomingNum(incomingNum);
distributionStockArticleClient.saveOrUpdate(newStockArticleEntity);
String waybillNumber = newStockArticleEntity.getWaybillNumber();
WarehouseWaybillEntity warehouseWaybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNumber);
Long destinationWarehouseId = warehouseWaybillEntity.getDestinationWarehouseId();
if(warehouseId.equals(destinationWarehouseId)){
QueryWrapper<TrunklineWaybillOrderEntity> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.eq("waybill_no",stockArticleEntity.getWaybillNumber())
.eq("order_code",stockArticleEntity.getWaybillNumber());
TrunklineWaybillOrderEntity one = trunklineWaybillOrderService.getOne(queryWrapper1);
if(!Objects.isNull(one)){
Integer totalCount = warehouseWaybillEntity.getTotalCount();
Integer waybillStatusInt = Integer.parseInt(warehouseWaybillEntity.getWaybillStatus());
if(waybillStatusInt <= 30){
Integer handleNumber = one.getHandleNumber();
int total = handleNumber + unloadNum;
if(total < totalCount){
warehouseWaybillEntity.setWaybillStatus("50");
one.setHandleNumber(total);
}else{
warehouseWaybillEntity.setWaybillStatus("60");
one.setHandleNumber(totalCount);
}
warehouseWaybillClient.updateEntity(warehouseWaybillEntity);
trunklineWaybillOrderService.updateById(one);
}
}
}
// String waybillNumber = newStockArticleEntity.getWaybillNumber();
// WarehouseWaybillEntity warehouseWaybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNumber);
// Long destinationWarehouseId = warehouseWaybillEntity.getDestinationWarehouseId();
// if(warehouseId.equals(destinationWarehouseId)){
// QueryWrapper<TrunklineWaybillOrderEntity> queryWrapper1 = new QueryWrapper<>();
// queryWrapper1.eq("waybill_no",stockArticleEntity.getWaybillNumber())
// .eq("order_code",stockArticleEntity.getWaybillNumber());
// TrunklineWaybillOrderEntity one = trunklineWaybillOrderService.getOne(queryWrapper1);
// if(!Objects.isNull(one)){
// Integer totalCount = warehouseWaybillEntity.getTotalCount();
// Integer waybillStatusInt = Integer.parseInt(warehouseWaybillEntity.getWaybillStatus());
// if(waybillStatusInt <= 30){
// Integer handleNumber = one.getHandleNumber();
// int total = handleNumber + unloadNum;
// if(total < totalCount){
// warehouseWaybillEntity.setWaybillStatus("50");
// one.setHandleNumber(total);
// }else{
// warehouseWaybillEntity.setWaybillStatus("60");
// one.setHandleNumber(totalCount);
// }
// warehouseWaybillClient.updateEntity(warehouseWaybillEntity);
// trunklineWaybillOrderService.updateById(one);
// }
// }
// }
}
}
}
}
});
WarehouseWaybillEntity warehouseWaybillEntity = warehouseWaybillClient.findByWaybillNo(orderCode);
String waybillNo = warehouseWaybillEntity.getWaybillNo();
Long waybillId = warehouseWaybillEntity.getId();
int unloadNum = orderCodeList.stream().mapToInt(TrunklineCarsLoadScanEntity::getUnloadNum).sum();
Long destinationWarehouseId = warehouseWaybillEntity.getDestinationWarehouseId();
if(warehouseId.equals(destinationWarehouseId)){
QueryWrapper<TrunklineWaybillOrderEntity> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.eq("waybill_no",orderCode)
.eq("order_code",orderCode);
TrunklineWaybillOrderEntity one = trunklineWaybillOrderService.getOne(queryWrapper1);
if(!Objects.isNull(one)){
Integer handleNumber = one.getHandleNumber();
Integer totalCount = warehouseWaybillEntity.getTotalCount();
Integer waybillStatusInt = Integer.parseInt(warehouseWaybillEntity.getWaybillStatus());
int total = handleNumber + unloadNum;
if(waybillStatusInt < 50){
if(total != totalCount){
warehouseWaybillEntity.setWaybillStatus("50");
one.setHandleNumber(total);
warehouseWaybillClient.updateEntity(warehouseWaybillEntity);
trunklineWaybillOrderService.updateById(one);
}else{
warehouseWaybillEntity.setWaybillStatus("60");
one.setHandleNumber(total);
warehouseWaybillClient.updateEntity(warehouseWaybillEntity);
trunklineWaybillOrderService.updateById(one);
}
}else if(waybillStatusInt == 50){
if(total == totalCount){
warehouseWaybillEntity.setWaybillStatus("60");
one.setHandleNumber(total);
warehouseWaybillClient.updateEntity(warehouseWaybillEntity);
trunklineWaybillOrderService.updateById(one);
}
}
}
}
});
}
@ -6667,7 +6798,6 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
});
DistributionStockArticleEntity updateStockArticle = new DistributionStockArticleEntity();
updateStockArticle.setId(distributionStockArticle.getId());
updateStockArticle.setHandQuantity(distributionStockArticle.getHandQuantity()+num);
@ -6691,6 +6821,34 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
updateStockArticle.setId(distributionStockArticle.getId());
updateStockArticle.setHandQuantity(distributionStockArticle.getHandQuantity()+num);
updateStockArticleList.add(updateStockArticle);
if(warehouseId.equals(fromWarehouseId)){
Long waybillId = distributionStockArticle.getWaybillId();
String waybillNo = distributionStockArticle.getWaybillNumber();
WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNo);
QueryWrapper<TrunklineWaybillOrderEntity> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.eq("waybill_id",waybillId)
.eq("order_code",waybillNo);
TrunklineWaybillOrderEntity one = trunklineWaybillOrderService.getOne(queryWrapper1);
if(!Objects.isNull(one)){
Integer totalCount = waybillEntity.getTotalCount();
Integer waybillStatusInt = Integer.parseInt(waybillEntity.getWaybillStatus());
if(waybillStatusInt <= 40){
Integer handleNumber = one.getHandleNumber();
int total = handleNumber - num;
if(total == 0){
waybillEntity.setWaybillStatus("20");
one.setHandleNumber(total);
}else{
waybillEntity.setWaybillStatus("30");
one.setHandleNumber(totalCount);
}
warehouseWaybillClient.updateEntity(waybillEntity);
trunklineWaybillOrderService.updateById(one);
}
}
}
}
});
}

9
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillOrderServiceImpl.java
Unescape View File

@ -1,5 +1,6 @@
package com.logpm.trunkline.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.logpm.trunkline.entity.TrunklineAdvanceEntity;
import com.logpm.trunkline.entity.TrunklineWaybillOrderEntity;
import com.logpm.trunkline.mapper.TrunklineWaybillOrderMapper;
@ -54,4 +55,12 @@ public class TrunklineWaybillOrderServiceImpl extends BaseServiceImpl<TrunklineW
public void deleteByWaybillNo(String waybillNo) {
baseMapper.deleteByWaybillNo(waybillNo);
}
@Override
public TrunklineWaybillOrderEntity findEntityByWaybillNoAndOrderCode(String waybillNo, String orderCode) {
QueryWrapper<TrunklineWaybillOrderEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("waybill_no",waybillNo)
.eq("order_code",orderCode);
return baseMapper.selectOne(queryWrapper);
}
}

22
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/TaskQuestController.java
Unescape View File

@ -50,13 +50,18 @@ import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringUtil;
import org.springblade.system.cache.UserCache;
import org.springblade.system.entity.User;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
/**
* 盘点任务 控制器
@ -228,8 +233,23 @@ public class TaskQuestController extends BladeController {
@ApiOperation(value = "导出已盘数据明细维度", notes = "传入questDetailDTO")
public void exportPanDataWithPackage(QuestDetailDTO questDetailDTO, HttpServletResponse response){
String questNum = questDetailDTO.getQuestNum();
List<QuestContrastPackageExcelVO> ls = new ArrayList();
List<QuestContrastPackageExcelVO> list = taskQuestService.exportPanDataWithPackage(questDetailDTO);
ExcelUtil.export(response, "盘点任务【"+questNum+"】数据" + DateUtil.time(), "盘点明细数据表", list, QuestContrastPackageExcelVO.class);
//把list中所有元素通过inventoryUser进行分组
Map<Long, List<QuestContrastPackageExcelVO>> groupedByInventoryUser = list.stream()
.collect(Collectors.groupingBy(QuestContrastPackageExcelVO::getInventoryUser));
groupedByInventoryUser.keySet().forEach(inventoryUser -> {
List<QuestContrastPackageExcelVO> questContrastPackageExcelVOS = groupedByInventoryUser.get(inventoryUser);
User user = UserCache.getUser(inventoryUser);
if(!Objects.isNull(user)){
questContrastPackageExcelVOS.forEach(questContrastPackageExcelVO -> {
questContrastPackageExcelVO.setInventoryUserStr(user.getName());
});
}
ls.addAll(questContrastPackageExcelVOS);
});
ExcelUtil.export(response, "盘点任务【"+questNum+"】数据" + DateUtil.time(), "盘点明细数据表", ls, QuestContrastPackageExcelVO.class);
}

6
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/excel/QuestContrastPackageExcelVO.java
Unescape View File

@ -1,5 +1,6 @@
package com.logpm.warehouse.excel;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import lombok.Data;
@ -98,8 +99,11 @@ public class QuestContrastPackageExcelVO implements Serializable {
@ExcelProperty(value = "盘点时间")
private Date inventoryTime;
@ExcelIgnore
private Long inventoryUser;
@ColumnWidth(20)
@ExcelProperty(value = "盘点人")
private String inventoryUser;
private String inventoryUserStr;
}

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

@ -1009,9 +1009,9 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
BeanUtil.copyProperties(i, questDetailVO);
if (StringUtil.isNotBlank(questDetailVO.getGroundingPositionCode())) {
questDetailVO.setPositionCode(questDetailVO.getGroundingPositionCode());
}
// if (StringUtil.isNotBlank(questDetailVO.getGroundingPositionCode())) {
// questDetailVO.setPositionCode(questDetailVO.getGroundingPositionCode());
// }
if (!i.getQuestStatus().equals(0)) {
R<List<User>> listR = userSearchClient.listByUser(String.valueOf(i.getUpdateUser()));
if (ObjectUtils.isNotNull(listR.getData())) {
@ -1021,7 +1021,6 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
if (user != null) {
questDetailVO.setInventoryPerson(user.getName());
}
}
}
questDetailVO.setInventoryDate(i.getUpdateTime());

Write Preview
Loading…
Cancel
Save