解bug

zss

2023-08-15 ae4a996ce351c55fa466187c74d790efe484dd32

 inventory-server/src/main/java/com/yuanchu/mom/controller/ConsignmentController.java

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


import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.pojo.Sale;
import com.yuanchu.mom.pojo.dto.ConsignmentDto;
import com.yuanchu.mom.service.SaleService;
import com.yuanchu.mom.utils.JackSonUtil;
@@ -13,10 +16,12 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import com.yuanchu.mom.service.ConsignmentService;

import javax.annotation.Resource;
import java.sql.Wrapper;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -47,12 +52,17 @@
    })
    @GetMapping("/selSale")
    public Result selSale(String orderNumber) {
        //只有销售单审核通过之后才能发货
        Sale sale = saleService.getOne(Wrappers.<Sale>query().eq("order_number", orderNumber));
        if (ObjectUtils.isEmpty(sale.getType()) || sale.getType() != 1  ) {
            return Result.fail("只有销售单审核通过之后才能发货!");
        }
        return Result.success(saleService.selSale(orderNumber));
    }

    @ApiOperation(value = "新增成品发货")
    @PostMapping("/addCon")
    public Result addCon(@RequestHeader("token") String token, @RequestBody ConsignmentDto consignmentDto) throws Exception {
    public Result addCon(@RequestHeader("token") String token, @Validated @RequestBody ConsignmentDto consignmentDto) throws Exception {
        Map<String, String> data = JackSonUtil.unmarshal(jwt.readJWT(token).get("data"), Map.class);
        return Result.success(consignmentService.addCon(data.get("name").replaceAll("\"", ""), consignmentDto));
    }
@@ -74,6 +84,7 @@
        map.put("row", consignmentPage.getRecords());
        return Result.success(map);
    }

    @ApiOperation(value = "根据发货id删除")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "id", value = "发货id", dataTypeClass = Integer.class, required = true)