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

Merge remote-tracking branch 'origin/pre-production'

master
zhenghaoyu 8 months ago
parent
f454dfcb74 ca23ef361d
commit
53ef97a24d
10 changed files with 235 additions and 45 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/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/WarehouseLeasingController.java
  2. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
  3. 28
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
  4. 76
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
  5. 13
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/TaskQuestController.java
  6. 105
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/excel/QuestContrastPackageExcelVO.java
  7. 3
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.java
  8. 40
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml
  9. 4
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/ITaskQuestService.java
  10. 7
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java

2
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/WarehouseLeasingController.java
Unescape View File

@ -65,7 +65,7 @@ import java.util.Map;
*/
@RestController
@AllArgsConstructor
@RequestMapping("logpm-basicdata/warehouseLeasing")
@RequestMapping("/warehouseLeasing")
@Api(value = "仓库租用管理", tags = "仓库租用管理接口")
public class WarehouseLeasingController extends BladeController {

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

@ -161,7 +161,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
public Boolean getSelfPickup(Long id) {
DistributionParcelListEntity entity = new DistributionParcelListEntity();
entity.setId(id);
entity.setOrderPackageStatus(OrderStatusConstant.bufenqianshou.getValue());
entity.setOrderPackageStatus(OrderPackageStatusConstant.yiqianshou.getValue());
return distributionParcelListService.updateById(entity);
}

28
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
Unescape View File

@ -1089,7 +1089,15 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
String driverPhone = "";
String vehicleNub = "";
Long loadingId = null;
List<DistributionDeliverySelfVO> deliverySelfInfo = distributionDeliverySelfMapper.getDeliverySelfInfo(deliveryListEntity.getId());
List<DistributionDeliverySelfVO> deliverySelfInfo = null;
if (deliveryListEntity.getKind().equals(ServiceConstant.DELIVERLIST_KIND_SELF)) {
deliverySelfInfo = distributionDeliverySelfMapper.getDeliverySelfInfo(deliveryListEntity.getId());
} else {
DistributionDeliveryTripartiteVO deliveryTripartiteInfo = distributionDeliveryTripartiteMapper.getDeliveryTripartiteInfo(deliveryListEntity.getId());
BeanUtils.copyProperties(deliverySelfInfo, deliveryTripartiteInfo);
}
//查询该车次负责司机
for (DistributionReservationZeroPackageEntity reservationZeroPackageEntity : reservationZeroPackageEntities) {
//查询订单
@ -6511,6 +6519,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
//还需要配送的出库人、配送人、操作人信息
R<User> userR = userClient.userInfoById(delivery.getAdministratorsId());
if (Func.isNotEmpty(delivery)) {
if ("1".equals(delivery.getKind())) {
//自主配送
@ -6529,13 +6538,14 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
if (Func.isNotEmpty(distributionDeliveryTripartiteEntity)) {
delivery.setOutName(distributionDeliveryTripartiteEntity.getDriverName());
delivery.setOutPhone(distributionDeliveryTripartiteEntity.getDriverPhone());
}
}
R<User> userR = userClient.userInfoById(delivery.getAdministratorsId());
if (Func.isNotEmpty(userR)) {
User user = userR.getData();
delivery.setAdministratorsName(user.getName());
delivery.setAdministratorsPhone(user.getPhone());
}
DistributionStockupEntity distributionStockupEntity = distributionReservationMapper.selectStockup(distributionSignforEntity.getReservationId());
if (Func.isNotEmpty(distributionStockupEntity)) {
@ -6548,6 +6558,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
//查询客户信息
List<SignPushDataContactDTO> customer = distributionReservationMapper.selectPushOldCustomer(distributionSignforEntity.getReservationId());
if (customer.size()>1){
resultMap.put("result", false);
resultMap.put("msg", "存在多个signfor信息 >>>ReservationId():"+distributionSignforEntity.getReservationId());
}
if (Func.isNotEmpty(customer)) {
//查询客户订单
List<SignPushDataUnitDTO> signPushDataUnitDTOS = new ArrayList<>();
@ -6599,6 +6613,16 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
buildReservationNameAndPhone(customer);
//完成客户信息添加
delivery.setSignPushDataContactDTOs(customer);
if (Objects.isNull(delivery.getOutPhone())){
Long signUserId = customer.get(0).getSignUserId();
R<User> signforUser = userClient.userInfoById(signUserId);
if (Objects.equals(signforUser.getCode() , 200)){
delivery.setOutPhone(signforUser.getData().getPhone());
}else {
resultMap.put("result", false);
resultMap.put("msg", "外协查询签收人电话失败:"+customer.get(0).getSignUserId());
}
}
}
}

76
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
Unescape View File

@ -305,7 +305,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
distributionStockupVO.setStockupStatusName(DictBizCache.getValue(DictBizConstant.ORDER_STOCKUP_STATUS, distributionStockupVO.getStockupStatus()));
if (ObjectUtils.isNotNull(distributionStockupVO.getCreateUser())) {
R<User> userR = userClient.userInfoById(distributionStockupVO.getCreateUser());
if(userR.isSuccess()&& userR.getData()!=null){
if (userR.isSuccess() && userR.getData() != null) {
distributionStockupVO.setCreateUserName(userR.getData().getName());
}
}
@ -708,9 +708,9 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
warehouseIds.addAll(warehouseListIds);
}
} else {
warehouseIds.add( myCurrentWarehouse.getId());
warehouseIds.add(myCurrentWarehouse.getId());
}
List<DistributionStockArticleEntity> result = baseMapper.selectClientListPage(page, distributionStockArticle,warehouseIds);
List<DistributionStockArticleEntity> result = baseMapper.selectClientListPage(page, distributionStockArticle, warehouseIds);
return page.setRecords(result);
}
@ -874,7 +874,6 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
}
@Override
public IPage<DistributionStockArticleVO> handlePackage(IPage<DistributionStockArticleVO> pageVO) {
@ -1012,15 +1011,15 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
// }
List<Long> warehouseIdList = new ArrayList<>();
BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
if(Func.isEmpty(myCurrentWarehouse)){
if (Func.isEmpty(myCurrentWarehouse)) {
List<BasicdataWarehouseEntity> myWarehouseList = warehouseClient.getMyWarehouseList();
List<Long> collect = myWarehouseList.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList());
warehouseIdList.addAll(collect);
}else{
} else {
warehouseIdList.add(myCurrentWarehouse.getId());
}
IPage<DistributionStockArticleEntity> distributionStockArticleEntityIPage = baseMapper.pageListOwe(page, stockArticleEntity,warehouseIdList);
IPage<DistributionStockArticleEntity> distributionStockArticleEntityIPage = baseMapper.pageListOwe(page, stockArticleEntity, warehouseIdList);
return distributionStockArticleEntityIPage;
}
@ -1133,7 +1132,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
queryOrderVO = this.queryOrderVOCont(queryrderDTO.getCondition(), 2);
break;
}
return queryOrderVO;
return queryOrderVO;
}
@Override
@ -1186,7 +1185,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
break;
}
return arrayList;
return arrayList;
}
@Override
@ -2027,7 +2026,8 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
}
// 这里在和原始对象进行比较
check2ObjSome(t, stockArticleEntity);
t = check2ObjSome(t, stockArticleEntity);
log.info("维护订单信息,t:{}",t);
if (!cn.hutool.core.util.ObjectUtil.isAllEmpty(t.getGenre(), t.getReservationStatus(),
t.getHandQuantity(), t.getDeliveryQuantity(), t.getOrderStatus(), t.getSigninQuantity())) {
baseMapper.updateDistributionStockArticleEntityById(t);
@ -2109,7 +2109,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
}
}
private void check2ObjSome(DistributionStockArticleEntity t, DistributionStockArticleEntity stockArticleEntity) {
private DistributionStockArticleEntity check2ObjSome(DistributionStockArticleEntity t, DistributionStockArticleEntity stockArticleEntity) {
t.setId(stockArticleEntity.getId());
if (t.getOrderStatus() != null && t.getOrderStatus().equals(stockArticleEntity.getOrderStatus())) {
@ -2131,7 +2131,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
t.setSigninQuantity(null);
}
return t;
}
@Override
@ -2280,7 +2280,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
}
}
if (deliveryQuantity == 0){
if (deliveryQuantity == 0) {
stockArticleEntity.setReservationStatus(OrderReservationStatusConstant.daiyuyue.getValue());
}
if (signingQuantity == 0) {
@ -2586,35 +2586,35 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
String orderCode = orderCodeDTO.getOrderCode();
Long fromWarehouseId = orderCodeDTO.getFromWarehouseId();
DistributionStockArticleEntity stockArticleEntity = findStockArticleByOrderCodeAndWarehouseId(orderCode, fromWarehouseId);
if(!Objects.isNull(stockArticleEntity)){
if (!Objects.isNull(stockArticleEntity)) {
Long orderId = stockArticleEntity.getId();
String waybillNo = stockArticleEntity.getWaybillNumber();
WarehouseWaybillEntity warehouseWaybill = warehouseWaybillClient.findByWaybillNo(waybillNo);
Map<String, Object> map = new HashMap<>();
map.put("id", orderId);
map.put("orderCode",orderCode);
map.put("orderCode", orderCode);
String filename = QRCodeUtil.createCodeToFile(orderCode);
map.put("orderCodeImage", QRCodeUtil.getEmpAutograph(filename));
if(!Objects.isNull(warehouseWaybill)){
if (!Objects.isNull(warehouseWaybill)) {
String consignee = warehouseWaybill.getConsignee();
String consigneeName = warehouseWaybill.getConsigneeName();
String consigneeMobile = warehouseWaybill.getConsigneeMobile();
String remark = warehouseWaybill.getRemark();
map.put("consigneeUnit", StringUtil.isBlank(consignee)?"":consignee);
map.put("consigneePerson",StringUtil.isBlank(consigneeName)?"":consigneeName);
map.put("consigneeMobile",StringUtil.isBlank(consigneeMobile)?"":consigneeMobile);
map.put("consigneeUnit", StringUtil.isBlank(consignee) ? "" : consignee);
map.put("consigneePerson", StringUtil.isBlank(consigneeName) ? "" : consigneeName);
map.put("consigneeMobile", StringUtil.isBlank(consigneeMobile) ? "" : consigneeMobile);
map.put("product", warehouseWaybill.getGoodsName() + "（" + warehouseWaybill.getTotalCount() + "）");
map.put("remark",StringUtil.isBlank(remark)?"":remark);
map.put("remark", StringUtil.isBlank(remark) ? "" : remark);
}
String customerName = stockArticleEntity.getCustomerName();
String customerTelephone = stockArticleEntity.getCustomerTelephone();
String customerAddress = stockArticleEntity.getCustomerAddress();
map.put("customerName",StringUtil.isBlank(customerName)?"":customerName);
map.put("customerTelephone",StringUtil.isBlank(customerTelephone)?"":customerTelephone);
map.put("customerAddress",StringUtil.isBlank(customerAddress)?"":customerAddress);
map.put("customerName", StringUtil.isBlank(customerName) ? "" : customerName);
map.put("customerTelephone", StringUtil.isBlank(customerTelephone) ? "" : customerTelephone);
map.put("customerAddress", StringUtil.isBlank(customerAddress) ? "" : customerAddress);
// 订单号 生成二维码
String fileTypeName = QRCodeUtil.createCodeToFile(orderCode);
map.put("imgType", QRCodeUtil.getEmpAutograph(fileTypeName));
@ -2641,7 +2641,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
@Override
public void addHandQuantityAndIncomingNum(Long stockId, Integer enterNum) {
baseMapper.addHandQuantityAndIncomingNum(stockId,enterNum);
baseMapper.addHandQuantityAndIncomingNum(stockId, enterNum);
}
/**
@ -2687,14 +2687,14 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
BasicdataWarehouseEntity currentWarehouse = warehouseClient.getMyCurrentWarehouse();
List<Long> collect = null;
if(ObjectUtils.isNotNull(currentWarehouse)){
if (ObjectUtils.isNotNull(currentWarehouse)) {
collect = new ArrayList<>();
collect.add(currentWarehouse.getId());
}else{
} else {
collect = myWarehouseList.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList());
}
log.info(">>>>>>>>>>>>>当前仓库:{}",collect);
IPage<DistributionSignforStockArticleVO> distributionStockArticleEntityIPage = baseMapper.pageSignforListOwe(page, stockArticleEntity,collect);
log.info(">>>>>>>>>>>>>当前仓库:{}", collect);
IPage<DistributionSignforStockArticleVO> distributionStockArticleEntityIPage = baseMapper.pageSignforListOwe(page, stockArticleEntity, collect);
//处理创建人
distributionStockArticleEntityIPage.getRecords().forEach(a -> {
if (Func.isNotEmpty(a.getCreateUser())) {
@ -2759,11 +2759,11 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
BasicdataWarehouseEntity currentWarehouse = warehouseClient.getMyCurrentWarehouse();
List<Long> warehouseIdList = null;
if (ObjectUtils.isNotNull(currentWarehouse)){
if (ObjectUtils.isNotNull(currentWarehouse)) {
warehouseIdList = new ArrayList<>();
warehouseIdList.add(currentWarehouse.getId());
}else{
warehouseIdList=myWarehouseList.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList());
} else {
warehouseIdList = myWarehouseList.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList());
}
// if (collect.size() > 1) {
@ -2775,7 +2775,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
// stockArticleEntity.setWarehouseIdList(null);
// stockArticleEntity.setWarehouseId(currentWarehouse.getId());
// }
List<DistributionSignforStockArticleVO> list = baseMapper.listSignforListOwe(stockArticleEntity,warehouseIdList);
List<DistributionSignforStockArticleVO> list = baseMapper.listSignforListOwe(stockArticleEntity, warehouseIdList);
//处理创建人
List<DistributionSignForStockArticleExcel> signForStockArticleExcels = new ArrayList<>();
list.forEach(a -> {
@ -2793,10 +2793,6 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
}
/**
* @param orderIds
* @return
@ -2848,15 +2844,15 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
}
@Override
public Integer findOrderTotalNumByOrderCodes(List<String> orderCodes,Long warehouseId) {
return baseMapper.findOrderTotalNumByOrderCodes(orderCodes,warehouseId);
public Integer findOrderTotalNumByOrderCodes(List<String> orderCodes, Long warehouseId) {
return baseMapper.findOrderTotalNumByOrderCodes(orderCodes, warehouseId);
}
@Override
public Integer findOrderTotalNumByOrderPackageCodes(List<String> orderPackageCodes, Long warehouseId) {
List<String> orderCodes = distributionParcelListService.findOrderCodesByOrderPackageCodes(orderPackageCodes,warehouseId);
List<String> orderCodes = distributionParcelListService.findOrderCodesByOrderPackageCodes(orderPackageCodes, warehouseId);
return baseMapper.findOrderTotalNumByOrderCodes(orderCodes,warehouseId);
return baseMapper.findOrderTotalNumByOrderCodes(orderCodes, warehouseId);
}
@Override

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

@ -25,6 +25,7 @@ import com.logpm.warehouse.dto.TaskQuestDTO;
import com.logpm.warehouse.dto.TaskSearchDTO;
import com.logpm.warehouse.entity.TaskQuestEntity;
import com.logpm.warehouse.excel.QuestContrastExcel;
import com.logpm.warehouse.excel.QuestContrastPackageExcelVO;
import com.logpm.warehouse.excel.TaskQueryDataExcel;
import com.logpm.warehouse.excel.TaskQuestExcel;
import com.logpm.warehouse.service.ITaskQuestService;
@ -210,6 +211,18 @@ public class TaskQuestController extends BladeController {
}
@GetMapping("/export-allDataWithPackage")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "导出全部数据明细维度", notes = "传入questDetailDTO")
public void exportAllDataWithPackage(QuestDetailDTO questDetailDTO, HttpServletResponse response){
String questNum = questDetailDTO.getQuestNum();
List<QuestContrastPackageExcelVO> list = taskQuestService.exportAllDataWithPackage(questDetailDTO);
ExcelUtil.export(response, "盘点任务【"+questNum+"】数据" + DateUtil.time(), "盘点明细数据表", list, QuestContrastPackageExcelVO.class);
}
/**
* 导出数据
*/

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

@ -0,0 +1,105 @@
package com.logpm.warehouse.excel;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@Data
public class QuestContrastPackageExcelVO implements Serializable {
@ColumnWidth(20)
@ExcelProperty(value = "订单号")
private String orderCode;
@ColumnWidth(20)
@ExcelProperty(value = "运单号")
private String waybillNumber;
@ColumnWidth(20)
@ExcelProperty(value = "盘点方式")
private String questType;
@ColumnWidth(20)
@ExcelProperty(value = "盘点对象")
private String questTarget;
@ColumnWidth(20)
@ExcelProperty(value = "盘点状态")
private String questStatus;
@ColumnWidth(20)
@ExcelProperty(value = "包件码")
private String orderPackageCode;
@ColumnWidth(20)
@ExcelProperty(value = "品类名称")
private String categoryName;
@ColumnWidth(20)
@ExcelProperty(value = "在库数量")
private Integer stockNum;
@ColumnWidth(20)
@ExcelProperty(value = "物料编码")
private String materialCode;
@ColumnWidth(20)
@ExcelProperty(value = "物料名称")
private String materialName;
@ColumnWidth(20)
@ExcelProperty(value = "一级品类")
private String firsts;
@ColumnWidth(20)
@ExcelProperty(value = "二级品类")
private String seconds;
@ColumnWidth(20)
@ExcelProperty(value = "三级品类")
private String thirdProduct;
@ColumnWidth(20)
@ExcelProperty(value = "商场名称")
private String marketName;
@ColumnWidth(20)
@ExcelProperty(value = "批次号")
private String incomingBatch;
@ColumnWidth(20)
@ExcelProperty(value = "发站仓名称")
private String sendWarehouseName;
@ColumnWidth(20)
@ExcelProperty(value = "品牌")
private String brandName;
@ColumnWidth(20)
@ExcelProperty(value = "原有托盘")
private String trayName;
@ColumnWidth(20)
@ExcelProperty(value = "原有库位")
private String positionCode;
@ColumnWidth(20)
@ExcelProperty(value = "新托盘")
private String newTrayName;
@ColumnWidth(20)
@ExcelProperty(value = "新库位")
private String groundingPositionCode;
@ColumnWidth(20)
@ExcelProperty(value = "盘点时间")
private Date inventoryTime;
@ColumnWidth(20)
@ExcelProperty(value = "盘点人")
private String inventoryUser;
}

3
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.java
Unescape View File

@ -23,6 +23,7 @@ import com.logpm.warehouse.entity.QuestDetailChildEntity;
import com.logpm.warehouse.entity.QuestDetailEntity;
import com.logpm.warehouse.entity.TaskQuestEntity;
import com.logpm.warehouse.entity.WarehouseTrayEntity;
import com.logpm.warehouse.excel.QuestContrastPackageExcelVO;
import com.logpm.warehouse.excel.TaskQueryDataExcel;
import com.logpm.warehouse.vo.*;
import com.logpm.warehouse.excel.TaskQuestExcel;
@ -198,4 +199,6 @@ public interface TaskQuestMapper extends BaseMapper<TaskQuestEntity> {
List<QuestDetailEntity> findIsChangeData(@Param("questNum") String questNum);
Integer findStockNum(@Param("questDetailId") Long questDetailId, @Param("tableName") String tableName);
List<QuestContrastPackageExcelVO> exportAllDataWithPackage(@Param("param") QuestDetailDTO questDetailDTO);
}

40
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml
Unescape View File

@ -707,4 +707,44 @@
</select>
<select id="exportAllDataWithPackage" resultType="com.logpm.warehouse.excel.QuestContrastPackageExcelVO">
select order_code orderCode,
waybill_number waybillNumber,
order_package_code orderPackageCode,
material_code materialCode,
material_name materialName,
firsts firsts,
`second` seconds,
third_product thirdProduct,
case when quest_type = 1 then '随机'
when quest_type = 2 then '库位'
when quest_type = 3 then '订单'
when quest_type = 4 then '托盘'
else '未知'
end questType,
case when quest_target = 1 then '订制品'
when quest_target = 2 then '零担'
when quest_target = 3 then '库存品'
else '未知'
end questTarget,
case when quest_status = 1 then '已盘点'
when quest_status = 3 then '已排除'
else '未盘点'
end questStatus,
category_name categoryName,
brand_name brandName,
market_name marketName,
stock_num stockNum,
incoming_batch incomingBatch,
send_warehouse_name sendWarehouseName,
tray_name trayName,
position_code positionCode,
new_tray_name newTrayName,
grounding_position_code groundingPositionCode,
inventory_time inventoryTime,
inventory_user inventoryUser
from ${param.questNum}
where is_deleted = 0
</select>
</mapper>

4
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/ITaskQuestService.java
Unescape View File

@ -26,6 +26,7 @@ import com.logpm.warehouse.entity.QuestDetailChildEntity;
import com.logpm.warehouse.entity.QuestDetailEntity;
import com.logpm.warehouse.entity.TaskQuestEntity;
import com.logpm.warehouse.excel.QuestContrastExcel;
import com.logpm.warehouse.excel.QuestContrastPackageExcelVO;
import com.logpm.warehouse.excel.TaskQueryDataExcel;
import com.logpm.warehouse.excel.TaskQuestExcel;
import com.logpm.warehouse.vo.*;
@ -305,4 +306,7 @@ public interface ITaskQuestService extends BaseService<TaskQuestEntity> {
List<QuestDetailEntity> findIsChangeData(String questNum);
Integer findStockNum(Long questDetailId, String tableName);
List<QuestContrastPackageExcelVO> exportAllDataWithPackage(QuestDetailDTO questDetailDTO);
}

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

@ -39,6 +39,7 @@ import com.logpm.warehouse.dto.TaskQuestDTO;
import com.logpm.warehouse.dto.TaskSearchDTO;
import com.logpm.warehouse.entity.*;
import com.logpm.warehouse.excel.QuestContrastExcel;
import com.logpm.warehouse.excel.QuestContrastPackageExcelVO;
import com.logpm.warehouse.excel.TaskQueryDataExcel;
import com.logpm.warehouse.excel.TaskQuestExcel;
import com.logpm.warehouse.mapper.TaskQuestMapper;
@ -49,7 +50,6 @@ 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.cache.CacheNames;
import org.springblade.common.constant.RedisKeyConstant;
import org.springblade.common.constant.common.IsOrNoConstant;
@ -3492,6 +3492,11 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
return baseMapper.findStockNum(questDetailId, tableName);
}
@Override
public List<QuestContrastPackageExcelVO> exportAllDataWithPackage(QuestDetailDTO questDetailDTO) {
return baseMapper.exportAllDataWithPackage(questDetailDTO);
}
private String getQuestNum(String warehouseCode) {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
// return "PDRW_" + warehouseCode + "_" + simpleDateFormat.format(new Date()) + String.format("%03d", new Random().nextInt(900) + 100);

Write Preview
Loading…
Cancel
Save