1.工时管理：辅助工时编辑后录入人姓名变成编辑人问题修复 2.外购下单：标签打印功能调整 3.人员：培训计划导入导出添加【培训大类】字段 4.业务管理...

zouyu

9 小时以前 675af262e4e511c9a240d9c1fa3332d1dc8d0c42

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

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

import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.dto.InventoryDetailDTO;
import com.ruoyi.basic.mapper.IfsInventoryQuantityMapper;
import com.ruoyi.basic.pojo.IfsInventoryQuantity;
import com.ruoyi.basic.pojo.StandardProductList;
@@ -54,6 +55,13 @@
    @GetMapping("/selectInsOrderParameter")
    public Result selectInsOrderParameter(Page page, SampleOrderDto sampleOrderDto) throws Exception {
        return Result.success(insOrderService.selectInsOrderParameter(page, sampleOrderDto));
    }

    @ApiOperation(value = "外购下单成品标签打印")
    @PostMapping("/labelOutsideOrderPrinting")
    public Result<List<InventoryDetailDTO>> labelOutsideOrderPrinting(@RequestBody Map<String, Object> param) {
        List<Integer> ids = (List<Integer>) param.get("ids");
        return Result.success(insOrderService.labelOutsideOrderPrinting(ids));
    }

    //用于检验下单区别查看所有订单和只查看同一个委托单位的订单
@@ -145,6 +153,12 @@
        return Result.success(insProductService.selectNoProducts(page, insProduct,orderId,ids));
    }

    //撤销审核，查询撤销的检测项
    @GetMapping("/getRevocationInsProductList")
    public Result<?> getRevocationInsProductList(@RequestParam("orderId") Integer orderId){
        return Result.success(insProductService.getRevocationInsProductList(orderId));
    }


    @ApiOperation(value = "待检的撤销")
    @PostMapping("/updateInspected")
@@ -152,8 +166,8 @@
        Integer orderId = (Integer) param.get("orderId");
        String ids = (String) param.get("ids");
        Integer typeSource = (Integer) param.get("typeSource");
        Long ifsInventoryId = (Long) param.get("ifsInventoryId");
        if(Objects.nonNull(typeSource) && typeSource == 1){
            Long ifsInventoryId = Long.parseLong(param.get("ifsInventoryId").toString());
            ifsInventoryQuantityMapper.update(null,new LambdaUpdateWrapper<IfsInventoryQuantity>()
                    .set(IfsInventoryQuantity::getState,0)
                    .eq(IfsInventoryQuantity::getId,ifsInventoryId));