Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

2025-03-29 85b8e7ba6c4d0d780a7f90360150f2bd955eb874

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

@@ -4,12 +4,10 @@
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.controller.params.OtherReceiptParams;
import com.vincent.rsf.server.api.controller.params.ReceiptParams;
import com.vincent.rsf.server.api.entity.dto.ReceiptDetlsDto;
import com.vincent.rsf.server.api.service.MobileService;
import com.vincent.rsf.server.system.controller.BaseController;
import com.vincent.rsf.server.system.controller.param.LoginParam;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiOperation;
import org.apache.tika.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -17,7 +15,6 @@
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Objects;

/**
@@ -34,8 +31,6 @@

    @Autowired
    private MobileService mobileService;


    /**
     * PDA用户登录
     * @param param
@@ -61,17 +56,17 @@

    /**
     * 标准扫码收货信息
     * @param barcode
     * @param trackCode
     * @return
     */
    @PreAuthorize("hasAuthority('manager:asnOrder:list')")
    @GetMapping("/orders/{barcode}")
    @GetMapping("/orders/{trackCode}")
    @ApiOperation("标准扫码收货")
    public R  getOrderBybarcode(@PathVariable String barcode) {
        if (StringUtils.isEmpty(barcode)) {
    public R  getOrderBybarcode(@PathVariable String trackCode) {
        if (StringUtils.isEmpty(trackCode)) {
            throw new CoolException("条码不能为空！！");
        }
        return mobileService.getOrderByCode(barcode);
        return mobileService.getOrderByCode(trackCode);
    }

    /**
@@ -79,7 +74,7 @@
     * @param params
     * @return
     */
    @PreAuthorize("hasAuthority('manager:warehouseAreasItem:save')")
    @PreAuthorize("hasAuthority('manager:warehouseAreas:save')")
    @PostMapping("/orders/confirm")
    @ApiOperation("确认收货")
    public R confirmReceipt(@RequestBody ReceiptParams params) {
@@ -97,8 +92,14 @@
        if (Objects.isNull(params)) {
            throw new CoolException("参数不能为空！！");
        }

        return mobileService.otherReceipt(params);
    }

    @PreAuthorize("hasAuthority('manager:warehouseAreas:list')")
    @ApiOperation("获取收货区")
    @GetMapping("/areas/receipt")
    public R getReceiptAreas() {
        return mobileService.getReceiptAreas();
    }


@@ -110,4 +111,12 @@
    }


    @PreAuthorize("hasAuthority('manager:asnOrder:list')")
    @GetMapping("/dynamic/fields")
    @ApiOperation("获取动态字段")
    public R getDynamicFields() {
        return R.ok(mobileService.getDynamicFields());
    }


}