zhousq_java
/
sfms_mes3.0
forked from sfms3.0/sfms3.0
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

采购退货任务查询数量

master
songguoqiang 2 years ago
parent
db82092fdf
commit
f4e67264e9
4 changed files with 35 additions and 65 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. 30
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/PurchasereturnJobMainController.java
  2. 50
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnJob/PurchasereturnJobMainMapper.java
  3. 8
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainService.java
  4. 10
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java

30
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/PurchasereturnJobMainController.java
View File

@ -7,6 +7,7 @@ import com.win.module.wms.controller.purchasereturnJob.vo.*;
import com.win.module.wms.convert.purchasereturnJob.PurchasereturnJobDetailConvert;
import com.win.module.wms.dal.dataobject.purchasereturnJob.PurchasereturnJobDetailDO;
import com.win.module.wms.service.purchasereturnJob.PurchasereturnJobDetailService;
import jodd.util.StringUtil;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -138,26 +139,19 @@ public class PurchasereturnJobMainController {
return success(result);
}
@PostMapping("/getReturnJobPageByStatusAndTime")
@Operation(summary = "APP获得采购退货任务主任务分页列表暂无用")
@Parameter(name = "createTime", description = "今日开始结束时间", required = false, example = "[\"1699200000000\",\"1701878400000\"]")
@Parameter(name = "types", description = "字典类型数组", required = false, example = "\"types\":[\"JOB_PENDING\",\"JOB_COMPLETED\"]")
@PostMapping("/getCountByStatus")
@Operation(summary = "APP获得采购收货任务数量根据任务状态")
@Parameter(name = "types", description = "类型数组", required = false, example = "\"types\":[\"1\",\"2\"]")
@PreAuthorize("@ss.hasPermission('wms:purchasereturn-job-main:query')")
public CommonResult<PageResult<PurchasereturnJobMainRespVO>> getReturnJobPageByStatusAndTime(@RequestBody PurchasereturnJobMainPageReqVO purchasereturnJobMainPageReqVO) {
PageResult<PurchasereturnJobMainDO> purchasereturnJobMainByStatusPage = purchasereturnJobMainService.getPurchasereturnJobMainPage(purchasereturnJobMainPageReqVO);
PageResult<PurchasereturnJobMainRespVO> result = PurchasereturnJobMainConvert.INSTANCE.convertPage(purchasereturnJobMainByStatusPage);
return success(result);
public CommonResult<Map<String,Integer>> getCountByStatus(@RequestBody Map<String, List<String>> map) {
List<String> list = new ArrayList<>();
if(map==null||map.get("types")==null|| StringUtil.isEmpty(map.get("types").toString())){
list.add("1");//默认不传为执行中的
}else{
list = map.get("types");
}
@PostMapping("/getReturnJobMainSenior")
@Operation(summary = "APP根据发货单号和单据号查询采购退货任务主任务列表暂无用")
@Parameter(name = "asnNumber", description = "发货单号", required = false, example = "100")
@Parameter(name = "number", description = "单据号", required = false, example = "100")
@PreAuthorize("@ss.hasPermission('wms:purchasereturn-job-main:query')")
public CommonResult<List<PurchasereturnJobMainRespVO>> getReturnJobMainSenior(@RequestBody PurchasereturnJobMainRespVO respVO) {
List<PurchasereturnJobMainDO> returnJobMainSenior = purchasereturnJobMainService.getReturnJobMainSenior(respVO);
List<PurchasereturnJobMainRespVO> result = PurchasereturnJobMainConvert.INSTANCE.convertList(returnJobMainSenior);
return success(result);
Map<String, Integer> countByStatus = purchasereturnJobMainService.getCountByStatus(list);
return success(countByStatus);
}
}

50
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnJob/PurchasereturnJobMainMapper.java
View File

@ -9,7 +9,6 @@ import com.win.framework.mybatis.core.mapper.BaseMapperX;
import com.win.framework.mybatis.core.util.QueryWrapperUtils;
import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainExportReqVO;
import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainPageReqVO;
import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainRespVO;
import com.win.module.wms.dal.dataobject.purchasereturnJob.PurchasereturnJobMainDO;
import org.apache.ibatis.annotations.Mapper;
@ -123,48 +122,15 @@ public interface PurchasereturnJobMainMapper extends BaseMapperX<PurchasereturnJ
.eqIfPresent(PurchasereturnJobMainDO::getAllowModifyPackingNumber, reqVO.getAllowModifyPackingNumber())
.orderByDesc(PurchasereturnJobMainDO::getId));
}
/**
*根据类型数组查询任务数量
* @param types
* @return
*/
default Long selectListCount(Collection<String> types) {
return selectCount(new LambdaQueryWrapperX<PurchasereturnJobMainDO>()
.inIfPresent(PurchasereturnJobMainDO::getStatus, types));
default List<PurchasereturnJobMainDO> getReturnJobMainSenior(PurchasereturnJobMainRespVO reqVO) {
return selectList(new LambdaQueryWrapperX<PurchasereturnJobMainDO>()
.eqIfPresent(PurchasereturnJobMainDO::getRequestNumber, reqVO.getRequestNumber())
.eqIfPresent(PurchasereturnJobMainDO::getPurchaseReceiptRecordNumber, reqVO.getPurchaseReceiptRecordNumber())
.eqIfPresent(PurchasereturnJobMainDO::getAsnNumber, reqVO.getAsnNumber())
.eqIfPresent(PurchasereturnJobMainDO::getPpNumber, reqVO.getPpNumber())
.eqIfPresent(PurchasereturnJobMainDO::getSupplierCode, reqVO.getSupplierCode())
.eqIfPresent(PurchasereturnJobMainDO::getDeliverDock, reqVO.getDeliverDock())
.eqIfPresent(PurchasereturnJobMainDO::getCarrierCode, reqVO.getCarrierCode())
.eqIfPresent(PurchasereturnJobMainDO::getTransferMode, reqVO.getTransferMode())
.eqIfPresent(PurchasereturnJobMainDO::getVehiclePlateNumber, reqVO.getVehiclePlateNumber())
.eqIfPresent(PurchasereturnJobMainDO::getFromWarehouseCode, reqVO.getFromWarehouseCode())
.eqIfPresent(PurchasereturnJobMainDO::getToWarehouseCode, reqVO.getToWarehouseCode())
.eqIfPresent(PurchasereturnJobMainDO::getStatus, reqVO.getStatus())
.eqIfPresent(PurchasereturnJobMainDO::getUpdater, reqVO.getUpdater())
.eqIfPresent(PurchasereturnJobMainDO::getJobStageStatus, reqVO.getJobStageStatus())
.eqIfPresent(PurchasereturnJobMainDO::getPriority, reqVO.getPriority())
.eqIfPresent(PurchasereturnJobMainDO::getPriorityIncrement, reqVO.getPriorityIncrement())
.eqIfPresent(PurchasereturnJobMainDO::getDepartmentCode, reqVO.getDepartmentCode())
.eqIfPresent(PurchasereturnJobMainDO::getAcceptUserId, reqVO.getAcceptUserId())
.eqIfPresent(PurchasereturnJobMainDO::getCompleteUserId, reqVO.getCompleteUserId())
.eqIfPresent(PurchasereturnJobMainDO::getFromLocationTypes, reqVO.getFromLocationTypes())
.eqIfPresent(PurchasereturnJobMainDO::getToLocationTypes, reqVO.getToLocationTypes())
.eqIfPresent(PurchasereturnJobMainDO::getNumber, reqVO.getNumber())
.eqIfPresent(PurchasereturnJobMainDO::getBusinessType, reqVO.getBusinessType())
.eqIfPresent(PurchasereturnJobMainDO::getRemark, reqVO.getRemark())
.eqIfPresent(PurchasereturnJobMainDO::getCreator, reqVO.getCreator())
.eqIfPresent(PurchasereturnJobMainDO::getFromAreaCodes, reqVO.getFromAreaCodes())
.eqIfPresent(PurchasereturnJobMainDO::getToAreaCodes, reqVO.getToAreaCodes())
.eqIfPresent(PurchasereturnJobMainDO::getFromDockCode, reqVO.getFromDockCode())
.eqIfPresent(PurchasereturnJobMainDO::getAutoComplete, reqVO.getAutoComplete())
.eqIfPresent(PurchasereturnJobMainDO::getAllowModifyLocation, reqVO.getAllowModifyLocation())
.eqIfPresent(PurchasereturnJobMainDO::getAllowModifyQty, reqVO.getAllowModifyQty())
.eqIfPresent(PurchasereturnJobMainDO::getAllowBiggerQty, reqVO.getAllowBiggerQty())
.eqIfPresent(PurchasereturnJobMainDO::getAllowSmallerQty, reqVO.getAllowSmallerQty())
.eqIfPresent(PurchasereturnJobMainDO::getAllowModifyInventoryStatus, reqVO.getAllowModifyInventoryStatus())
.eqIfPresent(PurchasereturnJobMainDO::getAllowContinuousScanning, reqVO.getAllowContinuousScanning())
.eqIfPresent(PurchasereturnJobMainDO::getAllowPartialComplete, reqVO.getAllowPartialComplete())
.eqIfPresent(PurchasereturnJobMainDO::getAllowModifyBatch, reqVO.getAllowModifyBatch())
.eqIfPresent(PurchasereturnJobMainDO::getAllowModifyPackingNumber, reqVO.getAllowModifyPackingNumber())
.orderByDesc(PurchasereturnJobMainDO::getId));
}
}

8
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainService.java
View File

@ -7,6 +7,7 @@ import com.win.framework.common.pojo.CustomConditions;
import com.win.module.wms.controller.purchasereturnJob.vo.*;
import com.win.module.wms.dal.dataobject.purchasereturnJob.PurchasereturnJobMainDO;
import com.win.framework.common.pojo.PageResult;
import org.springframework.lang.Nullable;
/**
* 采购退货任务主 Service 接口
@ -92,5 +93,10 @@ public interface PurchasereturnJobMainService {
*/
PurchasereturnJobMainDO getPurchasereturnJobMain(Long id);
List<PurchasereturnJobMainDO> getReturnJobMainSenior(PurchasereturnJobMainRespVO respVO);
/**
*根据任务状态获取任务数量
* @param types 任务状态数组
* @return
*/
Map<String,Integer> getCountByStatus(@Nullable Collection<String> types);
}

10
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java
View File

@ -3,7 +3,6 @@ package com.win.module.wms.service.purchasereturnJob;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.win.framework.common.pojo.CustomConditions;
import com.win.module.wms.controller.purchasereturnJob.vo.*;
import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobMainDO;
import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordDetailDO;
import com.win.module.wms.service.supplierdeliverRecord.SupplierdeliverRecordMainService;
import org.springframework.stereotype.Service;
@ -124,7 +123,12 @@ public class PurchasereturnJobMainServiceImpl implements PurchasereturnJobMainSe
}
@Override
public List<PurchasereturnJobMainDO> getReturnJobMainSenior(PurchasereturnJobMainRespVO respVO) {
return purchasereturnJobMainMapper.getReturnJobMainSenior(respVO);
public Map<String, Integer> getCountByStatus(Collection<String> types) {
Long l = purchasereturnJobMainMapper.selectListCount(types);
Map<String, Integer> map = new HashMap<>();
map.put("jobType", 2);
map.put("count", l.intValue());
return map;
}
}

Write Preview
Loading…
Cancel
Save