外购成品报检相关问题调整

zouyu

7 天以前 3793ba4a9b6be8faa6df0d4a76c06763ac03f873

 inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java

@@ -27,6 +27,7 @@
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.ServletException;
@@ -34,6 +35,7 @@
import java.io.IOException;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -76,6 +78,7 @@
    }

    @ApiOperation(value = "添加检验下单数据")
    @PreAuthorize("@ss.hasPermi('add:insOrder')")
    @PostMapping("/addInsOrder")
    public Result<?> addInsOrder(@RequestBody InsPlaceOrderDto insPlaceOrderDto) {
        return Result.success(insOrderService.addInsOrder(insPlaceOrderDto.getSampleList(), insPlaceOrderDto.getInsOrder()));
@@ -156,7 +159,7 @@
        Integer orderId = (Integer) param.get("orderId");
        String ids = (String) param.get("ids");
        Integer typeSource = (Integer) param.get("typeSource");
        Integer ifsInventoryId = (Integer) param.get("ifsInventoryId");
        Long ifsInventoryId = Long.parseLong(param.get("ifsInventoryId").toString());
        if(Objects.nonNull(typeSource) && typeSource == 1){
            ifsInventoryQuantityMapper.update(null,new LambdaUpdateWrapper<IfsInventoryQuantity>()
                    .set(IfsInventoryQuantity::getState,0)
@@ -180,7 +183,10 @@
    @ApiOperation(value = "获取ifs订单")
    @GetMapping("/getIfsOrder")
    public Result<?> getIfsOrder() {
        insOrderService.getIfsOrder();
        HashMap<String, Object> map = new HashMap<>();
        map.put("LOCATION_NO","1302;WG-04-001");
        map.put("STATE_DB","To be Inspected");
        insOrderService.getIfsOrder(map,false);
        return Result.success();
    }

@@ -216,7 +222,7 @@
    public Result<?> delInsOrder(Integer insOrderId) {
        // 查询订单
        InsOrder order = insOrderService.getById(insOrderId);
        if (!order.getState().equals(2)) {
        if (!(order.getState().equals(2) || order.getState().equals(3))) {
            throw new ErrorException("只有退回订单才能删除");
        }

@@ -233,8 +239,7 @@
    @ApiOperation(value = "根据订单id查询样品")
    @GetMapping("/getSampleByOrderId")
    public Result<List<InsSample>> getSampleByOrderId(Integer insOrderId) {
        return Result.success(insSampleService.list(Wrappers.<InsSample>lambdaQuery()
                .eq(InsSample::getInsOrderId, insOrderId)));
        return Result.success(insSampleService.getSampleByOrderId(insOrderId));
    }

    @ApiOperation(value = "根据样品id查询检验项树")
@@ -256,4 +261,20 @@
        insOrderService.rawAllInsOrderExport(sampleOrderDto,response);
    }


    @ApiOperation(value = "修改样品型号")
    @PostMapping("/updateSampleModel")
    public Result<?> updateSampleModel(@RequestBody List<InsSample> insSampleList) {
        for (InsSample insSample : insSampleList) {
            insOrderService.updateSampleModel(insSample);
        }
        return Result.success();
    }

    @ApiOperation(value = "查询当前时间是否没有该检测项的抽样计划")
    @PostMapping("/judgeNotSpotCheckOrder")
    public Result<?> judgeNotSpotCheckOrder(@RequestBody InsPlaceOrderDto insPlaceOrderDto) {
        return insOrderService.judgeNotSpotCheckOrder(insPlaceOrderDto.getSampleList(), insPlaceOrderDto.getInsOrder());
    }

}