采购收货任务查询数量

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java

@@ -6,6 +6,7 @@ import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.convert.purchasereceiptJob.PurchasereceiptJobDetailConvert;
 import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobDetailDO;
 import com.win.module.wms.service.purchasereceiptJob.PurchasereceiptJobDetailService;
+import jodd.util.StringUtil;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -140,27 +141,21 @@ public class PurchasereceiptJobMainController {
         return success(result);
     }
 
-    @PostMapping("/getPageByStatusAndTime")
+    @PostMapping("/getCountByStatus")
-    @Operation(summary = "APP获得采购收货任务主子表明细列表")
+    @Operation(summary = "APP获得采购收货任务数量根据任务状态")
-    @Parameter(name = "createTime", description = "今日开始结束时间", required = false, example = "[\"1699200000000\",\"1701878400000\"]")
+    @Parameter(name = "types", description = "类型数组", required = false, example = "\"types\":[\"1\",\"2\"]")
-    @Parameter(name = "types", description = "字典类型数组", required = false, example = "\"types\":[\"JOB_PENDING\",\"JOB_COMPLETED\"]")
     @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:query')")
-    public CommonResult<PageResult<PurchasereceiptJobMainRespVO>> getPageByStatusAndTime(@RequestBody PurchasereceiptJobMainPageReqVO purchasereceiptJobMainPageReqVO) {
+    public CommonResult<Map<String,Integer>> getCountByStatus(@RequestBody Map<String, List<String>> map) {
-        PageResult<PurchasereceiptJobMainDO> purchasereceiptJobMainByStatusPage = purchasereceiptJobMainService.getPurchasereceiptJobMainPage(purchasereceiptJobMainPageReqVO);
+        List<String> list = new ArrayList<>();
-        PageResult<PurchasereceiptJobMainRespVO> result = PurchasereceiptJobMainConvert.INSTANCE.convertPage(purchasereceiptJobMainByStatusPage);
+        if(map==null||map.get("types")==null|| StringUtil.isEmpty(map.get("types").toString())){
-        return success(result);
+            list.add("1");//默认不传为执行中的
+        }else{
+            list = map.get("types");
+        }
+        Map<String, Integer> countByStatus = purchasereceiptJobMainService.getCountByStatus(list);
+        return success(countByStatus);
     }
 
-    @PostMapping("/getPurchasereceiptJobMainSenior")
-    @Operation(summary = "APP根据发货单号和单据号查询采购收货任务主任务列表")
-    @Parameter(name = "asnNumber", description = "发货单号", required = false, example = "100")
-    @Parameter(name = "number", description = "单据号", required = false, example = "100")
-    @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:query')")
-    public CommonResult<List<PurchasereceiptJobMainRespVO>> getPurchasereceiptJobMainSenior(@RequestBody PurchasereceiptJobMainRespVO respVO) {
-        List<PurchasereceiptJobMainDO> purchasereceiptJobMainSenior = purchasereceiptJobMainService.getPurchasereceiptJobMainSenior(respVO);
-        List<PurchasereceiptJobMainRespVO> result = PurchasereceiptJobMainConvert.INSTANCE.convertList(purchasereceiptJobMainSenior);
-        return success(result);
-    }
 
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptJob/PurchasereceiptJobMainMapper.java

@@ -12,6 +12,7 @@ import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobMa
 import com.win.module.wms.enums.order.OrderStatusEnum;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -130,46 +131,15 @@ public interface PurchasereceiptJobMainMapper extends BaseMapperX<Purchasereceip
                 .orderByDesc(PurchasereceiptJobMainDO::getId));
     }
 
-    default List<PurchasereceiptJobMainDO> getPurchasereceiptJobMainSenior(PurchasereceiptJobMainRespVO reqVO) {
+    /**
-        return selectList(new LambdaQueryWrapperX<PurchasereceiptJobMainDO>()
+     *根据类型数组查询任务数量
-                .eqIfPresent(PurchasereceiptJobMainDO::getRequestNumber, reqVO.getRequestNumber())
+     * @param types
-                .eqIfPresent(PurchasereceiptJobMainDO::getAsnNumber, reqVO.getAsnNumber())
+     * @return
-                .eqIfPresent(PurchasereceiptJobMainDO::getPpNumber, reqVO.getPpNumber())
+     */
-                .eqIfPresent(PurchasereceiptJobMainDO::getSupplierCode, reqVO.getSupplierCode())
+    default Long selectListCount(Collection<String> types) {
-                .eqIfPresent(PurchasereceiptJobMainDO::getToDockCode, reqVO.getToDockCode())
+        return selectCount(new LambdaQueryWrapperX<PurchasereceiptJobMainDO>()
-                .eqIfPresent(PurchasereceiptJobMainDO::getCarrierCode, reqVO.getCarrierCode())
+                .inIfPresent(PurchasereceiptJobMainDO::getStatus, types));
-                .eqIfPresent(PurchasereceiptJobMainDO::getTransferMode, reqVO.getTransferMode())
+
-                .eqIfPresent(PurchasereceiptJobMainDO::getVehiclePlateNumber, reqVO.getVehiclePlateNumber())
-                .eqIfPresent(PurchasereceiptJobMainDO::getFromWarehouseCode, reqVO.getFromWarehouseCode())
-                .eqIfPresent(PurchasereceiptJobMainDO::getToWarehouseCode, reqVO.getToWarehouseCode())
-                .eqIfPresent(PurchasereceiptJobMainDO::getStatus, reqVO.getStatus())
-                .eqIfPresent(PurchasereceiptJobMainDO::getUpdater, reqVO.getUpdater())
-                .eqIfPresent(PurchasereceiptJobMainDO::getJobStageStatus, reqVO.getJobStageStatus())
-                .eqIfPresent(PurchasereceiptJobMainDO::getPriority, reqVO.getPriority())
-                .eqIfPresent(PurchasereceiptJobMainDO::getPriorityIncrement, reqVO.getPriorityIncrement())
-                .eqIfPresent(PurchasereceiptJobMainDO::getDepartmentCode, reqVO.getDepartmentCode())
-                .eqIfPresent(PurchasereceiptJobMainDO::getUserPositionCode, reqVO.getUserPositionCode())
-                .eqIfPresent(PurchasereceiptJobMainDO::getAcceptUserId, reqVO.getAcceptUserId())
-                .eqIfPresent(PurchasereceiptJobMainDO::getCompleteUserId, reqVO.getCompleteUserId())
-                .eqIfPresent(PurchasereceiptJobMainDO::getFromLocationTypes, reqVO.getFromLocationTypes())
-                .eqIfPresent(PurchasereceiptJobMainDO::getToLocationTypes, reqVO.getToLocationTypes())
-                .eqIfPresent(PurchasereceiptJobMainDO::getNumber, reqVO.getNumber())
-                .eqIfPresent(PurchasereceiptJobMainDO::getBusinessType, reqVO.getBusinessType())
-                .eqIfPresent(PurchasereceiptJobMainDO::getRemark, reqVO.getRemark())
-                .eqIfPresent(PurchasereceiptJobMainDO::getCreator, reqVO.getCreator())
-                .eqIfPresent(PurchasereceiptJobMainDO::getAllowModifyBatch, reqVO.getAllowModifyBatch())
-                .eqIfPresent(PurchasereceiptJobMainDO::getFromAreaCodes, reqVO.getFromAreaCodes())
-                .eqIfPresent(PurchasereceiptJobMainDO::getToAreaCodes, reqVO.getToAreaCodes())
-                .eqIfPresent(PurchasereceiptJobMainDO::getAutoComplete, reqVO.getAutoComplete())
-                .eqIfPresent(PurchasereceiptJobMainDO::getAllowModifyLocation, reqVO.getAllowModifyLocation())
-                .eqIfPresent(PurchasereceiptJobMainDO::getAllowModifyQty, reqVO.getAllowModifyQty())
-                .eqIfPresent(PurchasereceiptJobMainDO::getAllowBiggerQty, reqVO.getAllowBiggerQty())
-                .eqIfPresent(PurchasereceiptJobMainDO::getAllowSmallerQty, reqVO.getAllowSmallerQty())
-                .eqIfPresent(PurchasereceiptJobMainDO::getAllowModifyInventoryStatus, reqVO.getAllowModifyInventoryStatus())
-                .eqIfPresent(PurchasereceiptJobMainDO::getAllowContinuousScanning, reqVO.getAllowContinuousScanning())
-                .eqIfPresent(PurchasereceiptJobMainDO::getAllowPartialComplete, reqVO.getAllowPartialComplete())
-                .eqIfPresent(PurchasereceiptJobMainDO::getAllowModifyPackingNumber, reqVO.getAllowModifyPackingNumber())
-                .orderByDesc(PurchasereceiptJobMainDO::getId));
     }
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java

@@ -7,6 +7,7 @@ import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.wms.controller.purchasereceiptJob.vo.*;
 import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobMainDO;
 import com.win.framework.common.pojo.PageResult;
+import org.springframework.lang.Nullable;
 
 /**
  * 采购收货任务主 Service 接口
@@ -83,5 +84,10 @@ public interface PurchasereceiptJobMainService {
      */
     public PurchasereceiptJobMainDO purchasereceiptJobMainDoStatusRight(String pnumber, String pstatus);
 
-    List<PurchasereceiptJobMainDO> getPurchasereceiptJobMainSenior(PurchasereceiptJobMainRespVO respVO);
+    /**
+     *根据任务状态获取任务数量
+     * @param types 任务状态数组
+     * @return
+     */
+    Map<String,Integer> getCountByStatus(@Nullable Collection<String> types);
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java

@@ -118,7 +118,11 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
     }
 
     @Override
-    public List<PurchasereceiptJobMainDO> getPurchasereceiptJobMainSenior(PurchasereceiptJobMainRespVO respVO) {
+    public Map<String, Integer> getCountByStatus(Collection<String> types) {
-        return purchasereceiptJobMainMapper.getPurchasereceiptJobMainSenior(respVO);
+        Long l = purchasereceiptJobMainMapper.selectListCount(types);
+        Map<String, Integer> map = new HashMap<>();
+        map.put("jobType", 1);
+        map.put("count", l.intValue());
+        return map;
     }
 }