接口文档修改

skyouc

2025-08-16 e918d4fa4f5065b51be706f21da6793c378c9aaf

接口文档修改

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/WcsController.java

@@ -3,7 +3,7 @@
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.api.entity.dto.InTaskMsgDto;
import com.vincent.rsf.server.api.controller.params.TaskInParam;
import com.vincent.rsf.server.api.controller.erp.params.TaskInParam;
import com.vincent.rsf.server.manager.enums.TaskType;
import com.vincent.rsf.server.api.service.WcsService;
import com.vincent.rsf.server.system.controller.BaseController;

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/ReceiveMsgController.java

File was renamed from rsf-server/src/main/java/com/vincent/rsf/server/api/controller/ReceiveMsgController.java
@@ -1,17 +1,18 @@
package com.vincent.rsf.server.api.controller;
package com.vincent.rsf.server.api.controller.erp;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.controller.params.BaseMatParms;
import com.vincent.rsf.server.api.controller.params.OrderParams;
import com.vincent.rsf.server.api.controller.params.QueryOrderParam;
import com.vincent.rsf.server.api.controller.erp.params.BaseMatParms;
import com.vincent.rsf.server.api.controller.erp.params.OrderParams;
import com.vincent.rsf.server.api.controller.erp.params.QueryOrderParam;
import com.vincent.rsf.server.api.service.ReceiveMsgService;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.manager.entity.Loc;
import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
import com.vincent.rsf.server.manager.service.MatnrGroupService;
import com.vincent.rsf.server.manager.service.MatnrService;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
@@ -38,13 +39,14 @@
 */
@RestController
@RequestMapping("/erp")
@Api(tags = "ERP接口对接")
public class ReceiveMsgController extends BaseController {

    @Autowired
    private ReceiveMsgService receiveMsgService;
    @Autowired
    private MatnrService matnrService;
    @Autowired
    private MatnrGroupService matnrGroupService;


    /**
@@ -54,7 +56,7 @@
     * @return
     * @time 2025/3/4 13:57
     */
    @ApiOperation(value = "接收同步ERP采购单")
    @ApiOperation(value = "接收同步ERP采购单", tags = "单据同步")
    @PostMapping("/sync/purchase")
    public R syncPurchases(@RequestBody List<OrderParams> orders) {
        if (orders.isEmpty()) {
@@ -74,7 +76,7 @@
     * @description: DO单同步
     * @version 1.0
     */
    @ApiOperation("出库通知单(DO单同步)")
    @ApiOperation(value = "出库通知单(DO单同步)", tags = "单据同步")
    @PostMapping("/sync/delivery")
    public R syncDelivery(@RequestBody List<OrderParams> orders) {
        if (!receiveMsgService.syncPurchasee(orders)) {
@@ -91,7 +93,7 @@
     * @return
     * @time 2025/3/12 16:56
     */
    @ApiOperation("质检结果同步")
    @ApiOperation(value = "质检结果同步", tags = "单据同步")
    @PostMapping("/sync/inspect")
    public void syncQlyInspect(HttpServletRequest request, HttpServletResponse response) {
        AsnOrderTemplate template = ExcelUtil.mockData(AsnOrderTemplate.class);
@@ -103,17 +105,24 @@
    }


    @ApiOperation("基础物料信息同步")
    @ApiOperation(value = "基础物料信息同步", tags = "基础信息同步")
    @PostMapping("/sync/base/matnrs")
    public R syncMatnrs(@RequestBody List<BaseMatParms> matnrs) {
        if (Objects.isNull(matnrs)) {
            return R.error("参数不能为空！1");
            return R.error("参数不能为空！");
        }
        receiveMsgService.syncMatnrs(matnrs);
        return R.ok();
    }

    @ApiOperation("查询单据状态")
    @ApiOperation(value = "查询分类信息", tags = "查询")
    @PostMapping("/query/matnr/group")
    public R syncMatGroup() {
        return R.ok().add(matnrGroupService.list());
    }


    @ApiOperation(value = "查询单据状态及明细", tags = "查询")
    @PostMapping("/query/order")
    public R queryOrderStatus(@RequestBody QueryOrderParam queryParams) {
        if (Objects.isNull(queryParams)) {
@@ -130,12 +139,11 @@
     * @version 1.0
     */
    @PostMapping("/sync/locs/detls")
    @ApiOperation("库位信息明细同步")
    @ApiOperation(value = "库位信息明细同步", tags = "基础信息同步")
    public R syncLocDetls(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<Loc, BaseParam> pageParam = new PageParam<>(baseParam, Loc.class);
        QueryWrapper<Loc> wrapper = pageParam.buildWrapper(true);

        return receiveMsgService.syncLocsDetl(pageParam, wrapper);
    }
}

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/ReportMsgController.java

File was renamed from rsf-server/src/main/java/com/vincent/rsf/server/api/controller/ReportMsgController.java
@@ -1,4 +1,4 @@
package com.vincent.rsf.server.api.controller;
package com.vincent.rsf.server.api.controller.erp;

import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/BaseMatParms.java

File was renamed from rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/BaseMatParms.java
@@ -1,4 +1,4 @@
package com.vincent.rsf.server.api.controller.params;
package com.vincent.rsf.server.api.controller.erp.params;


import io.swagger.annotations.ApiModelProperty;

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/BaseSyncParams.java

File was renamed from rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/BaseSyncParams.java
@@ -1,4 +1,4 @@
package com.vincent.rsf.server.api.controller.params;
package com.vincent.rsf.server.api.controller.erp.params;

import io.swagger.annotations.ApiModel;
import lombok.Data;

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/CheckObjParams.java

File was renamed from rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/CheckObjParams.java
@@ -1,4 +1,4 @@
package com.vincent.rsf.server.api.controller.params;
package com.vincent.rsf.server.api.controller.erp.params;


import io.swagger.annotations.ApiModel;

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/ManualShelvingParams.java

File was renamed from rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/ManualShelvingParams.java
@@ -1,4 +1,4 @@
package com.vincent.rsf.server.api.controller.params;
package com.vincent.rsf.server.api.controller.erp.params;

import com.vincent.rsf.server.manager.entity.WaitPakin;
import com.vincent.rsf.server.manager.entity.WaitPakinItem;

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/OpStockParams.java

File was renamed from rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/OpStockParams.java
@@ -1,4 +1,4 @@
package com.vincent.rsf.server.api.controller.params;
package com.vincent.rsf.server.api.controller.erp.params;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/OrderItem.java

File was renamed from rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/OrderItem.java
@@ -1,4 +1,4 @@
package com.vincent.rsf.server.api.controller.params;
package com.vincent.rsf.server.api.controller.erp.params;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/OrderParams.java

File was renamed from rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/OrderParams.java
@@ -1,4 +1,4 @@
package com.vincent.rsf.server.api.controller.params;
package com.vincent.rsf.server.api.controller.erp.params;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/OtherReceiptParams.java

File was renamed from rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/OtherReceiptParams.java
@@ -1,4 +1,4 @@
package com.vincent.rsf.server.api.controller.params;
package com.vincent.rsf.server.api.controller.erp.params;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/PublicToStockParams.java

File was renamed from rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/PublicToStockParams.java
@@ -1,4 +1,4 @@
package com.vincent.rsf.server.api.controller.params;
package com.vincent.rsf.server.api.controller.erp.params;

import com.vincent.rsf.server.manager.entity.WkOrderItem;
import io.swagger.annotations.ApiModel;

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/QueryOrderParam.java

File was renamed from rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/QueryOrderParam.java
@@ -1,4 +1,4 @@
package com.vincent.rsf.server.api.controller.params;
package com.vincent.rsf.server.api.controller.erp.params;


import io.swagger.annotations.ApiModel;

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/ReceiptParams.java

File was renamed from rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/ReceiptParams.java
@@ -1,4 +1,4 @@
package com.vincent.rsf.server.api.controller.params;
package com.vincent.rsf.server.api.controller.erp.params;

import com.vincent.rsf.server.api.entity.dto.ReceiptDetlsDto;
import io.swagger.annotations.ApiModel;

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/SaveCheckDiffParams.java

File was renamed from rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/SaveCheckDiffParams.java
@@ -1,4 +1,4 @@
package com.vincent.rsf.server.api.controller.params;
package com.vincent.rsf.server.api.controller.erp.params;

import com.vincent.rsf.server.manager.entity.CheckDiffItem;
import com.vincent.rsf.server.manager.entity.TaskItem;

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/TaskInParam.java

File was renamed from rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/TaskInParam.java
@@ -1,4 +1,4 @@
package com.vincent.rsf.server.api.controller.params;
package com.vincent.rsf.server.api.controller.erp.params;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/WkOrderDto.java

File was renamed from rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/WkOrderDto.java
@@ -1,4 +1,4 @@
package com.vincent.rsf.server.api.controller.params;
package com.vincent.rsf.server.api.controller.erp.params;

import com.vincent.rsf.server.manager.entity.WkOrder;
import com.vincent.rsf.server.manager.entity.WkOrderItem;

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/AgvController.java

@@ -1,7 +1,6 @@
package com.vincent.rsf.server.api.controller.pda;

import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.api.controller.params.OpStockParams;
import com.vincent.rsf.server.api.service.AgvService;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java

@@ -4,7 +4,10 @@
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.controller.params.*;
import com.vincent.rsf.server.api.controller.erp.params.CheckObjParams;
import com.vincent.rsf.server.api.controller.erp.params.ManualShelvingParams;
import com.vincent.rsf.server.api.controller.erp.params.OpStockParams;
import com.vincent.rsf.server.api.controller.erp.params.OtherReceiptParams;
import com.vincent.rsf.server.api.service.MobileService;
import com.vincent.rsf.server.manager.controller.params.WaitPakinParam;
import com.vincent.rsf.server.manager.entity.QlyIsptItem;

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaCheckOrderController.java

@@ -1,7 +1,7 @@
package com.vincent.rsf.server.api.controller.pda;

import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.api.controller.params.SaveCheckDiffParams;
import com.vincent.rsf.server.api.controller.erp.params.SaveCheckDiffParams;
import com.vincent.rsf.server.api.service.PdaCheckOrderService;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;

 rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/LocTypeDto.java

@@ -1,6 +1,6 @@
package com.vincent.rsf.server.api.entity.dto;

import com.vincent.rsf.server.api.controller.params.TaskInParam;
import com.vincent.rsf.server.api.controller.erp.params.TaskInParam;
import lombok.Data;

@Data

 rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ReceiptDetlsDto.java

@@ -1,20 +1,11 @@
package com.vincent.rsf.server.api.entity.dto;

import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.vincent.rsf.server.api.controller.params.ReceiptParams;
import com.vincent.rsf.server.common.utils.CommonUtil;
import com.vincent.rsf.server.common.utils.FieldsUtils;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.util.Date;
import java.util.List;
import java.util.Map;

/**

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java

@@ -1,7 +1,10 @@
package com.vincent.rsf.server.api.service;

import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.api.controller.params.*;
import com.vincent.rsf.server.api.controller.erp.params.CheckObjParams;
import com.vincent.rsf.server.api.controller.erp.params.OpStockParams;
import com.vincent.rsf.server.api.controller.erp.params.OtherReceiptParams;
import com.vincent.rsf.server.api.controller.erp.params.PublicToStockParams;
import com.vincent.rsf.server.manager.controller.params.WaitPakinParam;
import com.vincent.rsf.server.manager.entity.WkOrder;
import com.vincent.rsf.server.manager.entity.QlyIsptItem;

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/PdaCheckOrderService.java

@@ -1,7 +1,7 @@
package com.vincent.rsf.server.api.service;

import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.api.controller.params.SaveCheckDiffParams;
import com.vincent.rsf.server.api.controller.erp.params.SaveCheckDiffParams;

import java.util.Map;


 rsf-server/src/main/java/com/vincent/rsf/server/api/service/ReceiveMsgService.java

@@ -3,9 +3,9 @@

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.api.controller.params.BaseMatParms;
import com.vincent.rsf.server.api.controller.params.OrderParams;
import com.vincent.rsf.server.api.controller.params.QueryOrderParam;
import com.vincent.rsf.server.api.controller.erp.params.BaseMatParms;
import com.vincent.rsf.server.api.controller.erp.params.OrderParams;
import com.vincent.rsf.server.api.controller.erp.params.QueryOrderParam;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.entity.Loc;

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/WcsService.java

@@ -1,7 +1,7 @@
package com.vincent.rsf.server.api.service;

import com.vincent.rsf.server.api.entity.dto.InTaskMsgDto;
import com.vincent.rsf.server.api.controller.params.TaskInParam;
import com.vincent.rsf.server.api.controller.erp.params.TaskInParam;

public interface WcsService {
    InTaskMsgDto createInTask(TaskInParam param);

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java

@@ -5,7 +5,7 @@
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.controller.params.*;
import com.vincent.rsf.server.api.controller.erp.params.*;
import com.vincent.rsf.server.api.entity.dto.*;
import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.api.service.MobileService;

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java

@@ -5,7 +5,7 @@
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.controller.params.SaveCheckDiffParams;
import com.vincent.rsf.server.api.controller.erp.params.SaveCheckDiffParams;
import com.vincent.rsf.server.api.service.PdaCheckOrderService;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.CheckDiffExceStatus;

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java

@@ -7,9 +7,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.controller.params.BaseMatParms;
import com.vincent.rsf.server.api.controller.params.QueryOrderParam;
import com.vincent.rsf.server.api.controller.params.WkOrderDto;
import com.vincent.rsf.server.api.controller.erp.params.BaseMatParms;
import com.vincent.rsf.server.api.controller.erp.params.QueryOrderParam;
import com.vincent.rsf.server.api.controller.erp.params.WkOrderDto;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.controller.dto.LocStockDto;
@@ -18,7 +18,7 @@
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.manager.service.impl.MatnrServiceImpl;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.api.controller.params.OrderParams;
import com.vincent.rsf.server.api.controller.erp.params.OrderParams;
import com.vincent.rsf.server.system.entity.Fields;
import com.vincent.rsf.server.system.service.FieldsItemService;
import com.vincent.rsf.server.system.service.FieldsService;
@@ -215,7 +215,7 @@
        Page<Object> page = new Page<>();
        page.setCurrent(pageParam.getCurrent()).setSize(pageParam.getSize());
        IPage<LocStockDto> locStocks =  locService.getLocDetls(page);
        return null;
        return R.ok().add(locStocks);
    }



 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java

@@ -6,7 +6,7 @@
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.entity.dto.InTaskMsgDto;
import com.vincent.rsf.server.api.entity.dto.LocTypeDto;
import com.vincent.rsf.server.api.controller.params.TaskInParam;
import com.vincent.rsf.server.api.controller.erp.params.TaskInParam;
import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.api.service.WcsService;
import com.vincent.rsf.server.api.utils.LocUtils;

 rsf-server/src/main/java/com/vincent/rsf/server/api/utils/LocUtils.java

@@ -1,17 +1,14 @@
package com.vincent.rsf.server.api.utils;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.vincent.rsf.framework.common.Arith;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.SpringUtils;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.controller.params.TaskInParam;
import com.vincent.rsf.server.api.entity.dto.InTaskMsgDto;
import com.vincent.rsf.server.api.entity.dto.LocTypeDto;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.LocStsType;
import com.vincent.rsf.server.manager.enums.TaskStsType;
import com.vincent.rsf.server.manager.enums.TaskType;
import com.vincent.rsf.server.manager.service.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -20,8 +17,6 @@


import javax.annotation.PostConstruct;
import javax.annotation.RegEx;
import javax.annotation.Resource;
import java.util.List;

@Component

 rsf-server/src/main/java/com/vincent/rsf/server/common/config/SwaggerConfig.java

@@ -2,6 +2,8 @@

import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.beans.factory.config.BeanPostProcessor;
@@ -40,13 +42,30 @@
                .select()
                //apis： 添加swagger接口提取范围
                .apis(RequestHandlerSelectors.withClassAnnotation(Api.class))
//                .apis(RequestHandlerSelectors.basePackage("com.vincent.rsf.server.manager.controller"))
                .paths(PathSelectors.any())
                .build()
                ;
                .build();

        return docket;
    }

    @Bean
    public Docket erpDocket() {
        Docket docket = new Docket(DocumentationType.OAS_30)
                .apiInfo(apiInfo())
                .enable("dev".equals(active))
                .groupName("ERP接口对接")
                .select()
                //apis： 添加swagger接口提取范围
                .apis(RequestHandlerSelectors.basePackage("com.vincent.rsf.server.api.controller.erp"))
                .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
                .paths(PathSelectors.any())
                .build();

        return docket;
    }


    private ApiInfo apiInfo() {
        return new ApiInfoBuilder()
                .title("WMS标版1.0版本接口文档")

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/LocStockDto.java

@@ -30,7 +30,7 @@
    private String matnr;

    @ApiModelProperty("规格属性")
    private String specs;
    private String spec;

    @ApiModelProperty("批次")
    private String batch;
@@ -39,7 +39,7 @@
    private Double anfme;

    @ApiModelProperty("供应商")
    private String supplier;
    private String splrId;

    @ApiModelProperty("单位")
    private String unit;

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/MatGroupParams.java

New file
@@ -0,0 +1,26 @@
package com.vincent.rsf.server.manager.controller.params;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;

import java.io.Serializable;

@Data
@Accessors(chain = true)
@ApiModel(value = "MatGroupParams", description = "物料分类")
public class MatGroupParams implements Serializable {

    @ApiModelProperty("分类名称")
    private String name;

    @ApiModelProperty("分类编码")
    private String code;

    @ApiModelProperty("上级编码")
    private String parCode;

    @ApiModelProperty("序列号")
    private Integer sort;
}

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java

@@ -2,7 +2,7 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.controller.params.TaskInParam;
import com.vincent.rsf.server.api.controller.erp.params.TaskInParam;
import com.vincent.rsf.server.api.entity.dto.InTaskMsgDto;
import com.vincent.rsf.server.api.service.WcsService;
import com.vincent.rsf.server.api.utils.LocUtils;

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java

@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.server.api.controller.params.TaskInParam;
import com.vincent.rsf.server.api.controller.erp.params.TaskInParam;
import com.vincent.rsf.server.api.entity.dto.InTaskMsgDto;
import com.vincent.rsf.server.api.service.WcsService;
import com.vincent.rsf.server.common.constant.Constants;
@@ -33,7 +33,6 @@

import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;

@Service("taskService")
public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements TaskService {

 rsf-server/src/main/resources/mapper/manager/LocMapper.xml

@@ -14,6 +14,27 @@
                use_status
    </select>
    <select id="getLocDetls" resultType="com.vincent.rsf.server.manager.controller.dto.LocStockDto">

        SELECT
            li.loc_code,
            li.loc_id,
            l.barcode,
            li.matnr_code AS matnr,
            li.matnr_id,
            li.maktx,
            li.spec,
            li.batch,
            SUM( li.anfme ) anfme,
            splr_id,
            li.unit,
            l.update_time
        FROM
            man_loc l
                LEFT JOIN man_loc_item li ON l.id = li.loc_id
        GROUP BY
            loc_id,
            matnr_id,
            batch
        ORDER BY
            update_time DESC
    </select>
</mapper>