Merge remote-tracking branch 'origin/master'

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobMainController.java

@@ -6,6 +6,7 @@ import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.convert.issueJob.IssueJobDetailConvert;
 import com.win.module.wms.dal.dataobject.issueJob.IssueJobDetailDO;
 import com.win.module.wms.service.issueJob.IssueJobDetailService;
+import jodd.util.StringUtil;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -145,4 +146,19 @@ public class IssueJobMainController {
         return success(result);
     }
 
+    @PostMapping("/getCountByStatus")
+    @Operation(summary = "APP获得拣料任务数量根据任务状态")
+    @Parameter(name = "types", description = "类型数组", required = false, example = "\"types\":[\"1\",\"2\"]")
+    @PreAuthorize("@ss.hasPermission('wms:issue-job-main:query')")
+    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");
+        }
+        Map<String, Integer> countByStatus = issueJobMainService.getCountByStatus(list);
+        return success(countByStatus);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/PickJobMainController.java

@@ -17,6 +17,7 @@ import com.win.module.wms.service.pickJob.PickJobMainService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jodd.util.StringUtil;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -25,8 +26,10 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
 import static com.win.framework.common.pojo.CommonResult.success;
 import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
@@ -144,5 +147,19 @@ public class PickJobMainController {
         return success(result);
     }
 
+    @PostMapping("/getCountByStatus")
+    @Operation(summary = "APP获得拣料任务数量根据任务状态")
+    @Parameter(name = "types", description = "类型数组", required = false, example = "\"types\":[\"1\",\"2\"]")
+    @PreAuthorize("@ss.hasPermission('wms:pick-job-main:query')")
+    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");
+        }
+        Map<String, Integer> countByStatus = pickJobMainService.getCountByStatus(list);
+        return success(countByStatus);
+    }
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/ProductionreceiptJobMainController.java

@@ -17,6 +17,7 @@ import com.win.module.wms.service.productionreceiptJob.ProductionreceiptJobMainS
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jodd.util.StringUtil;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -25,8 +26,10 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
 import static com.win.framework.common.pojo.CommonResult.success;
 import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
@@ -127,7 +130,7 @@ public class ProductionreceiptJobMainController {
     }
 
     @GetMapping("/getProductionreceiptJobById")
-    @Operation(summary = "APP获得生产发料主子表明细列表")
+    @Operation(summary = "APP获得生产收料主子表明细列表")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('wms:productionreceipt-job-main:query')")
     public CommonResult<ProductionreceiptJobMainRespVO> getProductionreceiptJobById(@RequestParam("id") Long id) {
@@ -144,4 +147,19 @@ public class ProductionreceiptJobMainController {
         return success(result);
     }
 
+    @PostMapping("/getCountByStatus")
+    @Operation(summary = "APP获得生产收料任务数量根据任务状态")
+    @Parameter(name = "types", description = "类型数组", required = false, example = "\"types\":[\"1\",\"2\"]")
+    @PreAuthorize("@ss.hasPermission('wms:productionreceipt-job-main:query')")
+    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");
+        }
+        Map<String, Integer> countByStatus = productionreceiptJobMainService.getCountByStatus(list);
+        return success(countByStatus);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/ProductionreturnJobMainController.java

@@ -17,6 +17,7 @@ import com.win.module.wms.service.productionreturnJob.ProductionreturnJobMainSer
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jodd.util.StringUtil;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -25,8 +26,10 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
 import static com.win.framework.common.pojo.CommonResult.success;
 import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
@@ -145,4 +148,20 @@ public class ProductionreturnJobMainController {
         return success(result);
     }
 
+    @PostMapping("/getCountByStatus")
+    @Operation(summary = "APP获得生产退料任务数量根据任务状态")
+    @Parameter(name = "types", description = "类型数组", required = false, example = "\"types\":[\"1\",\"2\"]")
+    @PreAuthorize("@ss.hasPermission('wms:productionreturn-job-main:query')")
+    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");
+        }
+        Map<String, Integer> countByStatus = productionreturnJobMainService.getCountByStatus(list);
+        return success(countByStatus);
+    }
+
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/RepleinshJobMainController.java

@@ -159,7 +159,7 @@ public class RepleinshJobMainController {
     @PostMapping("/getCountByStatus")
     @Operation(summary = "APP获得补料任务数量根据任务状态")
     @Parameter(name = "types", description = "类型数组", required = false, example = "\"types\":[\"1\",\"2\"]")
-    @PreAuthorize("@ss.hasPermission('wms:repleinsh-job-mainn:query')")
+    @PreAuthorize("@ss.hasPermission('wms:repleinsh-job-main:query')")
     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())){

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueJob/IssueJobMainMapper.java

@@ -10,6 +10,7 @@ import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.issueJob.vo.IssueJobMainExportReqVO;
 import com.win.module.wms.controller.issueJob.vo.IssueJobMainPageReqVO;
 import com.win.module.wms.dal.dataobject.issueJob.IssueJobMainDO;
+import com.win.module.wms.dal.dataobject.repleinshJob.RepleinshJobMainDO;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -108,4 +109,14 @@ public interface IssueJobMainMapper extends BaseMapperX<IssueJobMainDO> {
                 .orderByDesc(IssueJobMainDO::getId));
     }
 
+    /**
+     *根据类型数组查询任务数量
+     * @param types 类型组合
+     */
+    default Long selectListCount(Collection<String> types) {
+        return selectCount(new LambdaQueryWrapperX<IssueJobMainDO>()
+                .inIfPresent(IssueJobMainDO::getStatus, types));
+
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickJob/PickJobMainMapper.java

@@ -8,8 +8,10 @@ import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.pickJob.vo.PickJobMainExportReqVO;
 import com.win.module.wms.controller.pickJob.vo.PickJobMainPageReqVO;
 import com.win.module.wms.dal.dataobject.pickJob.PickJobMainDO;
+import com.win.module.wms.dal.dataobject.repleinshJob.RepleinshJobMainDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -106,4 +108,14 @@ public interface PickJobMainMapper extends BaseMapperX<PickJobMainDO> {
                 .orderByDesc(PickJobMainDO::getId));
     }
 
+    /**
+     *根据类型数组查询任务数量
+     * @param types 类型组合
+     */
+    default Long selectListCount(Collection<String> types) {
+        return selectCount(new LambdaQueryWrapperX<PickJobMainDO>()
+                .inIfPresent(PickJobMainDO::getStatus, types));
+
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptJob/ProductionreceiptJobMainMapper.java

@@ -8,8 +8,10 @@ import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobMainExportReqVO;
 import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobMainPageReqVO;
 import com.win.module.wms.dal.dataobject.productionreceiptJob.ProductionreceiptJobMainDO;
+import com.win.module.wms.dal.dataobject.repleinshJob.RepleinshJobMainDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -110,4 +112,14 @@ public interface ProductionreceiptJobMainMapper extends BaseMapperX<Productionre
                 .orderByDesc(ProductionreceiptJobMainDO::getId));
     }
 
+    /**
+     *根据类型数组查询任务数量
+     * @param types 类型组合
+     */
+    default Long selectListCount(Collection<String> types) {
+        return selectCount(new LambdaQueryWrapperX<ProductionreceiptJobMainDO>()
+                .inIfPresent(ProductionreceiptJobMainDO::getStatus, types));
+
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnJob/ProductionreturnJobMainMapper.java

@@ -7,9 +7,11 @@ import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobMainExportReqVO;
 import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobMainPageReqVO;
+import com.win.module.wms.dal.dataobject.productionreceiptJob.ProductionreceiptJobMainDO;
 import com.win.module.wms.dal.dataobject.productionreturnJob.ProductionreturnJobMainDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -110,4 +112,14 @@ public interface ProductionreturnJobMainMapper extends BaseMapperX<Productionret
                 .orderByDesc(ProductionreturnJobMainDO::getId));
     }
 
+    /**
+     *根据类型数组查询任务数量
+     * @param types 类型组合
+     */
+    default Long selectListCount(Collection<String> types) {
+        return selectCount(new LambdaQueryWrapperX<ProductionreturnJobMainDO>()
+                .inIfPresent(ProductionreturnJobMainDO::getStatus, types));
+
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainService.java

@@ -10,6 +10,7 @@ import com.win.module.wms.controller.issueJob.vo.IssueJobMainPageReqVO;
 import com.win.module.wms.controller.issueJob.vo.IssueJobMainUpdateReqVO;
 import com.win.module.wms.dal.dataobject.issueJob.IssueJobMainDO;
 import com.win.framework.common.pojo.PageResult;
+import org.springframework.lang.Nullable;
 
 /**
  * 发料任务主 Service 接口
@@ -87,4 +88,11 @@ public interface IssueJobMainService {
      * @return 采购订单主列表
      */
     public IssueJobMainDO issueJobMainDoStatusRight(String pnumber, String pstatus);
+
+    /**
+     *根据任务状态获取任务数量
+     * @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/issueJob/IssueJobMainServiceImpl.java

@@ -100,4 +100,13 @@ public class IssueJobMainServiceImpl implements IssueJobMainService {
             throw exception(ISSUE_JOB_MAIN_STATUS_ERROR);
         }
     }
+
+    @Override
+    public Map<String, Integer> getCountByStatus(Collection<String> types) {
+        Long l = issueJobMainMapper.selectListCount(types);
+        Map<String, Integer> map = new HashMap<>();
+        map.put("jobType", 7);
+        map.put("count", l.intValue());
+        return map;
+    }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainService.java

@@ -7,10 +7,12 @@ import com.win.module.wms.controller.pickJob.vo.PickJobMainExportReqVO;
 import com.win.module.wms.controller.pickJob.vo.PickJobMainPageReqVO;
 import com.win.module.wms.controller.pickJob.vo.PickJobMainUpdateReqVO;
 import com.win.module.wms.dal.dataobject.pickJob.PickJobMainDO;
+import org.springframework.lang.Nullable;
 
 import javax.validation.Valid;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 拣料任务主 Service 接口
@@ -88,4 +90,11 @@ public interface PickJobMainService {
      * @return 分页列表
      */
     PageResult<PickJobMainDO> getPickJobMainSenior(CustomConditions conditions);
+
+    /**
+     *根据任务状态获取任务数量
+     * @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/pickJob/PickJobMainServiceImpl.java

@@ -15,7 +15,9 @@ import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.win.module.wms.enums.ErrorCodeConstants.PICK_JOB_MAIN_NOT_EXISTS;
@@ -101,4 +103,13 @@ public class PickJobMainServiceImpl implements PickJobMainService {
     public PageResult<PickJobMainDO> getPickJobMainSenior(CustomConditions conditions) {
         return pickJobMainMapper.selectSenior(conditions);
     }
+
+    @Override
+    public Map<String, Integer> getCountByStatus(Collection<String> types) {
+        Long l = pickJobMainMapper.selectListCount(types);
+        Map<String, Integer> map = new HashMap<>();
+        map.put("jobType", 6);
+        map.put("count", l.intValue());
+        return map;
+    }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainService.java

@@ -7,10 +7,12 @@ import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJo
 import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobMainPageReqVO;
 import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobMainUpdateReqVO;
 import com.win.module.wms.dal.dataobject.productionreceiptJob.ProductionreceiptJobMainDO;
+import org.springframework.lang.Nullable;
 
 import javax.validation.Valid;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 生产收料任务主 Service 接口
@@ -88,4 +90,11 @@ public interface ProductionreceiptJobMainService {
      * @return 分页列表
      */
     PageResult<ProductionreceiptJobMainDO> getProductionreceiptJobMainSenior(CustomConditions conditions);
+
+    /**
+     *根据任务状态获取任务数量
+     * @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/productionreceiptJob/ProductionreceiptJobMainServiceImpl.java

@@ -18,7 +18,9 @@ import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.win.module.wms.enums.ErrorCodeConstants.*;
@@ -116,4 +118,13 @@ public class ProductionreceiptJobMainServiceImpl implements ProductionreceiptJob
     public PageResult<ProductionreceiptJobMainDO> getProductionreceiptJobMainSenior(CustomConditions conditions) {
         return productionreceiptJobMainMapper.selectSenior(conditions);
     }
+
+    @Override
+    public Map<String, Integer> getCountByStatus(Collection<String> types) {
+        Long l = productionreceiptJobMainMapper.selectListCount(types);
+        Map<String, Integer> map = new HashMap<>();
+        map.put("jobType", 8);
+        map.put("count", l.intValue());
+        return map;
+    }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainService.java

@@ -7,10 +7,12 @@ import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobM
 import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobMainPageReqVO;
 import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobMainUpdateReqVO;
 import com.win.module.wms.dal.dataobject.productionreturnJob.ProductionreturnJobMainDO;
+import org.springframework.lang.Nullable;
 
 import javax.validation.Valid;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 生产退料任务主 Service 接口
@@ -88,4 +90,11 @@ public interface ProductionreturnJobMainService {
      * @return 分页列表
      */
     PageResult<ProductionreturnJobMainDO> getProductionreturnJobMainSenior(CustomConditions conditions);
+
+    /**
+     *根据任务状态获取任务数量
+     * @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/productionreturnJob/ProductionreturnJobMainServiceImpl.java

@@ -16,7 +16,9 @@ import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTIONRETURN_JOB_MAIN_NOT_EXISTS;
@@ -102,4 +104,13 @@ public class ProductionreturnJobMainServiceImpl implements ProductionreturnJobMa
     public PageResult<ProductionreturnJobMainDO> getProductionreturnJobMainSenior(CustomConditions conditions) {
         return productionreturnJobMainMapper.selectSenior(conditions);
     }
+
+    @Override
+    public Map<String, Integer> getCountByStatus(Collection<String> types) {
+        Long l = productionreturnJobMainMapper.selectListCount(types);
+        Map<String, Integer> map = new HashMap<>();
+        map.put("jobType", 9);
+        map.put("count", l.intValue());
+        return map;
+    }
 }