全部请求参数调整

zhuo

2025-02-17 6b7aa9452a163412d2654c2e743fb664685a118b

全部请求参数调整

 basic-server/src/main/java/com/ruoyi/basic/controller/CapacityScopeController.java

@@ -60,7 +60,7 @@
    private StandardTemplateService standardTemplateService;

    @ApiOperation(value = "获取项目检验参数列表")
    @PostMapping("/selectItemParameterList")
    @GetMapping("/selectItemParameterList")
    public Result selectItemParameterList(Page page,StructureItemParameter itemParameter) throws Exception {
        return Result.success(capacityScopeService.selectItemParameterList(page, itemParameter));
    }
@@ -72,7 +72,7 @@
    }

    @ApiOperation(value = "删除项目检验参数")
    @PostMapping("/delItemParameter")
    @DeleteMapping("/delItemParameter")
    public Result<?> delItemParameter(Integer id) {
        return Result.success(capacityScopeService.delItemParameter(id));
    }
@@ -84,7 +84,7 @@
    }

    @ApiOperation(value = "获取检验对象")
    @PostMapping("/selectTestObjectList")
    @GetMapping("/selectTestObjectList")
    public Result selectTestObjectList(Page page,PageTestObjectDto pageTestObjectDto) throws Exception {
        return Result.success(capacityScopeService.selectTestObjectList(page, pageTestObjectDto));
    }
@@ -96,7 +96,7 @@
    }

    @ApiOperation(value = "删除检验对象")
    @PostMapping("/delTestObject")
    @DeleteMapping("/delTestObject")
    public Result<?> delTestObject(Integer id) {
        return Result.success(capacityScopeService.delTestObject(id));
    }
@@ -114,13 +114,13 @@
    }

    @ApiOperation(value = "设备里面选择检验项目(树形结构)")
    @PostMapping("/getInsProduction")
    @GetMapping("/getInsProduction")
    public Result getInsProduction() {
        return Result.success(capacityScopeService.getInsProduction());
    }

    @ApiOperation(value = "维护检验对象的产品")
    @PostMapping("/selectProductListByObjectId")
    @GetMapping("/selectProductListByObjectId")
    public Result selectProductListByObjectId(Page page,ProductDTO1 productDTO) throws Exception {
        return Result.success(productService.selectProductListByObjectId(page, productDTO));
    }
@@ -138,7 +138,7 @@
    }

    @ApiOperation(value = "删除产品")
    @PostMapping("/delProduct")
    @DeleteMapping("/delProduct")
    public Result delProduct(Integer id) {
        return Result.success(productService.delProduct(id));
    }

 basic-server/src/main/java/com/ruoyi/basic/controller/CertificationController.java

@@ -7,10 +7,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

@Api(tags = "资质说明")
@AllArgsConstructor
@@ -23,7 +20,7 @@


    @ApiOperation(value = "查询资质明细列表")
    @PostMapping("/getCertificationDetail")
    @GetMapping("/getCertificationDetail")
    public Result getCertificationDetail(Page page,Certification certification) {
        return Result.success(certificationService.getCertificationDetail(page, certification));
    }
@@ -34,8 +31,8 @@
        return Result.success(certificationService.addCertificationDetail(certification));
    }
    @ApiOperation(value = "删除资质明细列表")
    @PostMapping("/delCertificationDetail")
    public Result<?> delCertificationDetail( String ids) {
    @DeleteMapping("/delCertificationDetail")
    public Result<?> delCertificationDetail(String ids) {
        return Result.success(certificationService.delCertificationDetail(ids));
    }
}

 basic-server/src/main/java/com/ruoyi/basic/controller/LaboratoryController.java

@@ -24,7 +24,7 @@
    private LaboratoryService laboratoryService;

    @ApiOperation(value = "查询实验室管理列表")
    @PostMapping("/selectItemParameter")
    @GetMapping("/selectItemParameter")
    public Result selectItemParameter(Page page ,Laboratory itemParameter) {
        return Result.success(laboratoryService.selectItemParameter(page, itemParameter));
    }
@@ -36,7 +36,7 @@
    }

    @ApiOperation(value = "删除实验室参数")
    @PostMapping("/delParameter")
    @DeleteMapping("/delParameter")
    public Result<?> delParameter(Integer id) {
        return Result.success(laboratoryService.delParameter(id));
    }

 basic-server/src/main/java/com/ruoyi/basic/controller/ProductPartController.java

@@ -7,10 +7,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

@RestController
@AllArgsConstructor
@@ -21,7 +18,7 @@
    private ProductPartService productPartService;

    @ApiOperation(value = "根据产品id查询零件")
    @PostMapping("/selectByProductId")
    @GetMapping("/selectByProductId")
    public Result selectByProductId(Page page,ProductPart productPart){
        return Result.success(productPartService.selectByProductId(page,productPart));
    }
@@ -41,7 +38,7 @@
    }

    @ApiOperation(value = "删除产品零件")
    @PostMapping("/deleteProductPart")
    @DeleteMapping("/deleteProductPart")
    public Result deleteProductPart(Integer id) {
        productPartService.removeById(id);
        return Result.success();

 basic-server/src/main/java/com/ruoyi/basic/controller/ProductSupplierDensityController.java

@@ -8,10 +8,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;


/**
@@ -29,7 +26,7 @@
    private ProductSupplierDensityService productSupplierDensityService;

    @ApiOperation(value = "根据产品id查询厂家密度绑定")
    @PostMapping("/selectSupplierDensityByProductId")
    @GetMapping("/selectSupplierDensityByProductId")
    public Result selectSupplierDensityByProductId(Page page,ProductSupplierDensity supplierDensity) {
        return Result.success(productSupplierDensityService.selectByProductId(page, supplierDensity));
    }
@@ -49,7 +46,7 @@
    }

    @ApiOperation(value = "删除厂家密度绑定")
    @PostMapping("/deleteProductSupplierDensity")
    @DeleteMapping("/deleteProductSupplierDensity")
    public Result deleteProductSupplierDensity(Integer id) {
        productSupplierDensityService.removeById(id);
        return Result.success();

 basic-server/src/main/java/com/ruoyi/basic/controller/SealController.java

@@ -8,10 +8,7 @@
import com.ruoyi.common.utils.JackSonUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.List;
@@ -43,7 +40,7 @@

    }
    @ApiOperation(value="查询印章列表")
    @PostMapping("/selectSeal")
    @GetMapping("/selectSeal")
    public  Result selectSeal(Page page,Seal seal) {
        return Result.success(sealService.selectSeal(page,seal));
    }

 basic-server/src/main/java/com/ruoyi/basic/controller/StandardMethodController.java

@@ -21,7 +21,7 @@
    private StandardMethodService standardMethodService;

    @ApiOperation(value = "获取标准方法列表")
    @PostMapping("/selectStandardMethodList")
    @GetMapping("/selectStandardMethodList")
    public Result selectStandardMethodList(Page page,StandardMethod standardMethod) throws Exception {
        return Result.success(standardMethodService.selectStandardMethodList(page, standardMethod));
    }
@@ -39,7 +39,7 @@
    }

    @ApiOperation(value = "删除标准方法")
    @PostMapping("/delStandardMethod")
    @DeleteMapping("/delStandardMethod")
    public Result<?> delStandardMethod(Integer id) {
        return Result.success(standardMethodService.delStandardMethod(id));
    }

 basic-server/src/main/java/com/ruoyi/basic/controller/StandardTemplateController.java

@@ -18,7 +18,7 @@
    private StandardTemplateService standardTemplateService;

    @ApiOperation(value = "获取原始记录模板列表")
    @PostMapping("/selectStandardTemplatePageList")
    @GetMapping("/selectStandardTemplatePageList")
    public Result selectStandardTemplatePageList(Page page,StandardTemplate standardTemplate) throws Exception {
        return Result.success(standardTemplateService.selectStandardTemplatePageList(page, standardTemplate));
    }
@@ -36,7 +36,7 @@
    }

    @ApiOperation(value = "删除原始记录模板")
    @PostMapping("/delStandardTemplate")
    @DeleteMapping("/delStandardTemplate")
    public Result<?> delStandardTemplate(Integer id) {
        return Result.success(standardTemplateService.delStandardTemplate(id));
    }
@@ -48,7 +48,7 @@
    }

    @ApiOperation(value = "通过模板id获取检验项模板内容")
    @PostMapping("/getStandTempThingById")
    @GetMapping("/getStandTempThingById")
    public Result<?> getStandTempThingById(Integer id) {
        return Result.success(standardTemplateService.getStandTempThingById(id));
    }

 basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java

@@ -59,38 +59,42 @@

    @ApiOperation(value = "给标准树添加检验标准")
    @PostMapping("/addStandardMethodList")
    public Result addStandardMethodList(String tree, Integer standardId) {
    public Result addStandardMethodList(@RequestBody Map<String, Object> map) {
        Integer standardId = (Integer) map.get("standardId");
        String tree = (String) map.get("tree");
        return Result.success(standardMethodListService.addStandardMethodList(standardId, tree));
    }

    @ApiOperation(value = "根据标准树进行标准查询")
    @PostMapping("/selectsStandardMethodByFLSSM")
    @GetMapping("/selectsStandardMethodByFLSSM")
    public Result selectsStandardMethodByFLSSM(String tree) {
        return Result.success(standardMethodListService.selectsStandardMethodByFLSSM(tree));
    }

    @ApiOperation(value = "修改标准库中的内容")
    @PostMapping("/upStandardProductList")
    public Result upStandardProductList(String str) {
    public Result upStandardProductList(@RequestBody Map<String, String> map) {
        String str = map.get("str");
        StandardProductList list = JSON.parseObject(str, StandardProductList.class);
        return Result.success(standardProductListService.upStandardProductList(list));
    }

    @ApiOperation(value = "修改标准库区间")
    @PostMapping("/updateSection")
    public Result updateSection(String str) {
    public Result updateSection(@RequestBody Map<String, String> map) {
        String str = map.get("str");
        StandardProductList list = JSON.parseObject(str, StandardProductList.class);
        return Result.success(standardProductListService.updateSection(list));
    }

    @ApiOperation(value = "删除标准树下的检验标准")
    @PostMapping("/delStandardMethodByFLSSM")
    @DeleteMapping("/delStandardMethodByFLSSM")
    public Result delStandardMethodByFLSSM(Integer id) {
        return Result.success(standardMethodListService.delStandardMethodByFLSSM(id));
    }

    @ApiOperation(value = "删除标准树下的检验项目")
    @PostMapping("/delStandardProductByIds")
    @DeleteMapping("/delStandardProductByIds")
    public Result delStandardProductByIds(String ids) {
        JSONArray lists = JSON.parseArray(ids);
        return Result.success(standardProductListService.delStandardProduct(lists));
@@ -98,12 +102,14 @@

    @ApiOperation(value = "新增标准树下的检验项目")
    @PostMapping("/addStandardProduct")
    public Result addStandardProduct(String ids, String tree) {
    public Result addStandardProduct(@RequestBody Map<String, String> map) {
        String ids = map.get("ids");
        String tree = map.get("tree");
        return Result.success(standardTreeService.addStandardProduct(ids, tree));
    }

    @ApiOperation(value = "删除标准树的层级")
    @PostMapping("/delStandardTree")
    @DeleteMapping("/delStandardTree")
    public Result delStandardTree(String tree) {
        return Result.success(standardTreeService.delStandardTree(tree));
    }
@@ -115,19 +121,19 @@
    }

    @ApiOperation(value = "通过检验标准查询检验项目")
    @PostMapping("/selectStandardProductListByMethodId")
    @GetMapping("/selectStandardProductListByMethodId")
    public Result selectStandardProductListByMethodId(Integer id, String tree, Integer page) {
        return Result.success(standardProductListService.selectStandardProductListByMethodId(id, tree, page));
    }

    @ApiOperation(value = "批量编辑查询检验项目")
    @PostMapping("/selectStandardProductByMethodId")
    @ApiOperation(value = "批量查询检验项目")
    @GetMapping("/selectStandardProductByMethodId")
    public Result selectStandardProductByMethodId(Integer id, String tree, Integer page, String laboratory, String item, String items) {
        return Result.success(standardProductListService.selectStandardProductByMethodId(id, tree, page, laboratory, item, items));
    }

    @ApiOperation(value = "批量编辑查询所有检验项目和检验子项枚举")
    @PostMapping("/selectStandardProductEnumByMethodId")
    @ApiOperation(value = "批量查询所有检验项目和检验子项枚举")
    @GetMapping("/selectStandardProductEnumByMethodId")
    public Result selectStandardProductEnumByMethodId(Integer id, String tree, String item) {
        return Result.success(standardProductListService.selectStandardProductEnumByMethodId(id, tree, item));
    }
@@ -154,8 +160,8 @@
        return Result.success(standardTreeService.upStandardProducts(product));
    }

    @PostMapping("/getStandTreeBySampleType")
    @ApiOperation("仅获取光纤的型号")
    @GetMapping("/getStandTreeBySampleType")
    public Result<?> getStandTreeBySampleType(String laboratory, String sampleType) {
        return Result.success(standardTreeService.getStandTreeBySampleType(laboratory, sampleType));
    }
@@ -173,21 +179,27 @@

    @ApiOperation("重置标准库单价")
    @PostMapping("/resetTreeOfPrice")
    public Result resetTreeOfPrice(String tree, Integer standardId) {
    public Result resetTreeOfPrice(@RequestBody Map<String, Object> map) {
        String tree = (String) map.get("tree");
        Integer standardId = (Integer) map.get("standardId");
        standardTreeService.resetTreeOfPrice(tree, standardId);
        return Result.success();
    }

    @ApiOperation("重置标准库工时系数")
    @PostMapping("/resetTreeOfHour")
    public Result resetTreeOfHour(String tree, Integer standardId) {
    public Result resetTreeOfHour(@RequestBody Map<String, Object> map) {
        String tree = (String) map.get("tree");
        Integer standardId = (Integer) map.get("standardId");
        standardTreeService.resetTreeOfHour(tree, standardId);
        return Result.success();
    }

    @ApiOperation("重置标准库要求描述和要求值")
    @PostMapping("/resetTreeOfAsk")
    public Result resetTreeOfAsk(String tree, Integer standardId) {
    public Result resetTreeOfAsk(@RequestBody Map<String, Object> map) {
        String tree = (String) map.get("tree");
        Integer standardId = (Integer) map.get("standardId");
        standardTreeService.resetTreeOfAsk(tree, standardId);
        return Result.success();
    }
@@ -217,27 +229,29 @@

    @ApiOperation(value = "根据产品id查询厂家要求值绑定")
    @PostMapping("/selectSupplierAsk")
    public Result selectSupplierAsk(StandardProductListSupplierAsk supplierAsk) throws Exception {
    public Result selectSupplierAsk(@RequestBody StandardProductListSupplierAsk supplierAsk) throws Exception {
        return Result.success(standardProductListSupplierAskService.selectByProductId(supplierAsk));
    }

    @ApiOperation(value = "新增厂家要求值绑定")
    @PostMapping("/addProductSupplierAsk")
    public Result addProductSupplierAsk(String str) {
    public Result addProductSupplierAsk(@RequestBody Map<String, String> map) {
        String str = map.get("str");
        StandardProductListSupplierAsk supplierAsk = JSON.parseObject(str, StandardProductListSupplierAsk.class);
        return Result.success(standardProductListSupplierAskService.addProductSupplierAsk(supplierAsk));
    }

    @ApiOperation(value = "更新厂家要求值绑定")
    @PostMapping("/updateProductSupplierAsk")
    public Result updateProductSupplierAsk(String str) {
    public Result updateProductSupplierAsk(@RequestBody Map<String, String> map) {
        String str = map.get("str");
        StandardProductListSupplierAsk supplierAsk = JSON.parseObject(str, StandardProductListSupplierAsk.class);
        standardProductListSupplierAskService.updateProductSupplierAsk(supplierAsk);
        return Result.success();
    }

    @ApiOperation(value = "删除厂家要求值绑定")
    @PostMapping("/deleteProductSupplierAsk")
    @DeleteMapping("/deleteProductSupplierAsk")
    public Result deleteProductSupplierAsk(Integer supplierAskId) {
        standardProductListSupplierAskService.removeById(supplierAskId);
        return Result.success();

 basic-server/src/main/java/com/ruoyi/basic/controller/StructureTestObjectPartController.java

@@ -8,10 +8,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;


/**
@@ -29,7 +26,7 @@
    private StructureTestObjectPartService structureTestObjectPartService;

    @ApiOperation(value = "根据检验对象id查询零件")
    @PostMapping("/selectByTestObjectId")
    @GetMapping("/selectByTestObjectId")
    public Result selectByTestObjectId(Page page,StructureTestObjectPart structureTestObjectPart){
        return Result.success(structureTestObjectPartService.selectByTestObjectId(page,structureTestObjectPart));
    }
@@ -49,7 +46,7 @@
    }

    @ApiOperation(value = "删除检验对象零件")
    @PostMapping("/deleteTestObjectPart")
    @DeleteMapping("/deleteTestObjectPart")
    public Result deleteTestObjectPart(Integer id) {
        structureTestObjectPartService.removeById(id);
        return Result.success();

 basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductSupplierDensityServiceImpl.java

@@ -32,15 +32,6 @@
        if (supplierDensity.getProductId() == null) {
            throw new BaseException("缺少产品对象id");
        }
        // æŸ¥è¯¢æ”¹åŽ‚家是否绑定过
//        Long count = baseMapper.selectCount(Wrappers.<ProductSupplierDensity>lambdaQuery()
//                .eq(ProductSupplierDensity::getProductId, supplierDensity.getProductId())
//                .eq(ProductSupplierDensity::getModel, supplierDensity)
//                .eq(ProductSupplierDensity::getSupplierName, supplierDensity.getSupplierName()));
//        if (count > 0){
//            throw new BaseException("该产品已绑定过该厂家");
//        }

        baseMapper.insert(supplierDensity);
    }

@@ -49,15 +40,6 @@
        if (supplierDensity.getProductId() == null) {
            throw new BaseException("缺少产品对象id");
        }
        // æŸ¥è¯¢æ”¹åŽ‚家是否绑定过
//        Long count = baseMapper.selectCount(Wrappers.<ProductSupplierDensity>lambdaQuery()
//                .ne(ProductSupplierDensity::getId, supplierDensity.getId())
//                .eq(ProductSupplierDensity::getProductId, supplierDensity.getProductId())
//                .eq(ProductSupplierDensity::getModel, supplierDensity)
//                .eq(ProductSupplierDensity::getSupplierName, supplierDensity.getSupplierName()));
//        if (count > 0){
//            throw new BaseException("该产品已绑定过该厂家");
//        }
        baseMapper.updateById(supplierDensity);
    }
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,302 @@
//package com.ruoyi.basic.controller;
//
//import com.alibaba.fastjson.JSON;
//import com.alibaba.fastjson.JSONArray;
//import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
//import com.baomidou.mybatisplus.core.toolkit.Wrappers;
//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
//import io.swagger.annotations.Api;
//import io.swagger.annotations.ApiImplicitParam;
//import io.swagger.annotations.ApiImplicitParams;
//import io.swagger.annotations.ApiOperation;
//import lombok.AllArgsConstructor;
//import org.springframework.scheduling.annotation.Scheduled;
//import org.springframework.web.bind.annotation.*;
//
//import javax.servlet.http.HttpServletResponse;
//import java.time.LocalDateTime;
//import java.time.format.DateTimeFormatter;
//import java.util.List;
//import java.util.Map;
//import java.util.Objects;
//
//@RestController
//@AllArgsConstructor
//@RequestMapping("/insOrder")
//@Api(tags="检验单模块")
//public class InsOrderController {
//
//    private InsOrderService insOrderService;
//
//    private InsSampleService insSampleService;
//
//    private InsProductService insProductService;
//
//    private IfsInventoryQuantityMapper ifsInventoryQuantityMapper;
//
//    private InsOrderTemplateService insOrderTemplateService;
//
//    //获取检验下单数据
//    @ApiOperation(value = "查询单位检验单")
//    @PostMapping("/selectInsOrderParameter")
//    public Result selectInsOrderParameter(@RequestBody Map<String, Object> data) throws Exception {
//        Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
//        SampleOrderDto sampleOrderDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), SampleOrderDto.class);
//        return Result.success(insOrderService.selectInsOrderParameter(page, sampleOrderDto));
//    }
//
//    //用于检验下单区别查看所有订单和只查看同一个委托单位的订单
//    @ApiOperation(value = "查询所有检验单")
//    @PostMapping("/selectAllInsOrderParameter")
//    public Result selectAllInsOrderParameter() {
//        return Result.success();
//    }
//
//
//    @ApiOperation(value = "检验分配")
//    @PostMapping("/upInsOrder")
//    public Result<?> upInsOrder(Integer orderId, Integer sampleId, String appointed, Integer userId,String sonLaboratory) {
//        return Result.success(insOrderService.upInsOrder(orderId, sampleId, appointed, userId,sonLaboratory));
//    }
//
//    @ApiOperation(value = "添加检验下单数据")
//    @PostMapping("/addInsOrder")
//    public Result<?> addInsOrder(String str) {
//        Map<String, Object> map = JSON.parseObject(str, Map.class);
//        JSONArray jsonArray = JSON.parseArray(map.get("list")+"");
//        List<SampleProductDto> list = jsonArray.toJavaList(SampleProductDto.class);
//        InsOrder insOrder = JSON.parseObject(JSON.toJSONString(map.get("insOrder")), InsOrder.class);
//        List<List<Integer>> pairing = JSON.parseArray(map.get("pairing")+"");
//        return Result.success(insOrderService.addInsOrder(list, insOrder, pairing));
//    }
//
//    @ApiOperation(value = "查询订单最长预计时间")
//    @PostMapping("/selectOrderManDay")
//    public Result<?> selectOrderManDay(Integer id) {
//        int day = insProductService.selectOrderManDay(id);
//        return Result.success("成功", LocalDateTime.now().plusHours(day).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
//    }
//
//    @ApiOperation(value = "查询检验下单内容详情")
//    @PostMapping("/getInsOrder")
//    public Result<?> getInsOrder(Integer orderId) {
//        return Result.success(insOrderService.getInsOrder(orderId));
//    }
//    @ValueClassify("检验下单")
//    @ApiOperation(value = "审核检验单进行状态修改")
//    @ApiImplicitParams({
//            @ApiImplicitParam(name = "id", value = "检验单id", dataTypeClass = Integer.class),
//            @ApiImplicitParam(name = "state", value = "审核结果 1:通过 2：不通过", dataTypeClass = Integer.class)
//    })
//
//    @PostMapping("/upInsOrderOfState")
//    public Result<?> upInsOrderOfState(@RequestBody InsOrder insOrder) {
//        return Result.success(insOrderService.upInsOrderOfState(insOrder));
//    }
//
//    @ApiOperation(value = "添加检验单模板")
//    @PostMapping("/addInsOrderTemplate")
//    public Result<?> addInsOrderTemplate(@RequestBody InsOrderTemplate insOrderTemplate) {
//        return Result.success(insOrderTemplateService.addInsOrderTemplate(insOrderTemplate));
//    }
//
//    @ApiOperation(value = "查询检验单模板")
//    @GetMapping("/selectInsOrderTemplate")
//    public Result<?> selectInsOrderTemplate(String company) {
//        return Result.success(insOrderTemplateService.selectInsOrderTemplate(company));
//    }
//
//    @ApiOperation(value = "通过检验单模板id获取检验单模板内容")
//    @PostMapping("/selectInsOrderTemplateById")
//    public Result<?> selectInsOrderTemplateById(Integer id) {
//        return Result.success("成功", insOrderTemplateService.selectInsOrderTemplateById(id));
//    }
//
//    @ApiOperation(value = "删除检验单模板")
//    @PostMapping("/delInsOrderTemplate")
//    public Result<?> delInsOrderTemplate(Integer id) {
//        return Result.success(insOrderTemplateService.delInsOrderTemplate(id));
//    }
//
//    @ApiOperation(value = "通过检验单查询检验数据（数据查看）")
//    @PostMapping("/selectSampleAndProductByOrderId")
//    public Result<?> selectSampleAndProductByOrderId(@RequestBody Map<String, Object> data) throws Exception {
//        Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
//        SampleProductDto2 sampleProductDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), SampleProductDto2.class);
//        return Result.success(insOrderService.selectSampleAndProductByOrderId(page, sampleProductDto));
//    }
//
//    @ApiOperation(value = "费用统计")
//    @PostMapping("/costStatistics")
//    public Result<?> costStatistics(@RequestBody Map<String, Object> data) throws Exception {
//        Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
//        CostStatisticsDto costStatisticsDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), CostStatisticsDto.class);
//        return Result.success(insOrderService.costStatistics(page, costStatisticsDto));
//    }
//
//    @ApiOperation(value = "费用统计获取总价")
//    @PostMapping("/costStatistics2")
//    public Result<?> costStatistics2(@RequestBody Map<String, Object> data) throws Exception {
//        CostStatisticsDto costStatisticsDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), CostStatisticsDto.class);
//        return Result.success(insOrderService.costStatistics2(costStatisticsDto));
//    }
//
//
//    @ApiOperation(value = "样品缺陷指数")
//    @PostMapping("/selectSampleDefects")
//    public Result selectSampleDefects(Integer size, Integer current, String inspectionItems, String orderNumber) {
//        return Result.success(insOrderService.selectSampleDefects(new Page<>(current, size),inspectionItems, orderNumber));
//    }
//
//
//    @ApiOperation(value = "撤销")
//    @PutMapping("/updateStatus")
//    public Result<?> updateStatus(Integer id) {
//        insOrderService.updateStatus(id);
//        return Result.success();
//    }
//
//    //待检的撤销的查询待检项目
//    @PostMapping("/selectNoProducts")
//    public Result<?> selectNoProducts(@RequestBody Map<String, Object> data,Integer orderId ,String ids) throws Exception {
//        Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
//        InsProduct insProduct = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), InsProduct.class);
//        return Result.success(insProductService.selectNoProducts(page, insProduct,orderId,ids));
//    }
//
//
//    @ApiOperation(value = "待检的撤销")
//    @PutMapping("/updateInspected")
//    public Result<?> updateInspected(Integer orderId, String ids,
//                                     @RequestParam(value = "typeSource",required = false) Integer typeSource,
//                                     @RequestParam(value = "ifsInventoryId",required = false) Integer ifsInventoryId){
//        if(Objects.nonNull(typeSource) && typeSource == 1){
//            ifsInventoryQuantityMapper.update(null,new LambdaUpdateWrapper<IfsInventoryQuantity>()
//                    .set(IfsInventoryQuantity::getState,0)
//                    .eq(IfsInventoryQuantity::getId,ifsInventoryId));
//            insOrderService.update(null,new LambdaUpdateWrapper<InsOrder>().set(InsOrder::getState,-1).eq(InsOrder::getId,orderId)); // æ’¤é”€
//        }
//        insProductService.updateInspected(orderId,ids);
//        return Result.success();
//    }
//
//    @ApiOperation(value = "审核待检撤销")
//    @PostMapping("/checkUpdate")
//    public Result<?> checkUpdate(Integer orderId,Integer state){
//        insProductService.checkUpdate(orderId,state);
//        return Result.success();
//    }
//
//    @ApiOperation(value = "标签打印")
//    @PostMapping("/labelPrinting")
//    public Result<?> labelPrinting(String ids) {
//        return Result.success(insOrderService.labelPrinting(ids));
//    }
//
//
//    @ApiOperation(value = "费用统计导出")
//    @PostMapping("/export")
//    public void export(@RequestBody Map<String, Object> data,HttpServletResponse response) throws Exception {
//        CostStatisticsDto costStatisticsDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), CostStatisticsDto.class);
//       insOrderService.export(costStatisticsDto,response);
//    }
//
//
//    @ApiOperation(value = "获取ifs订单")
//    @PostMapping("/getIfsOrder")
//    public Result<?> getIfsOrder() {
//        insOrderService.getIfsOrder();
//        return Result.success();
//    }
//
//    @Scheduled(fixedDelay = 1200000)
//    public void getIfsOrderTiming() {
//        insOrderService.getIfsOrder();
//    }
//
//
//    @ApiOperation(value = "修改订单单号")
//    @PostMapping("/updateEntrustCode")
//    public Result<?> updateEntrustCode(@RequestBody InsOrder insOrder) {
//        insOrderService.updateEntrustCode(insOrder);
//        return Result.success();
//    }
//
//    @ApiOperation("查询不合格复测信息")
//    @GetMapping("/getRetestResult")
//    public Result<?> getRetestResult(Integer insProductId) {
//        return Result.success(insOrderService.getRetestResult(insProductId));
//    }
//
//
//
//    @ApiOperation(value = "铜单丝下单")
//    @PostMapping("/addRawCopperOrder")
//    public Result<?> addRawCopperOrder(String str) {
//        Map<String, Object> map = JSON.parseObject(str, Map.class);
//        JSONArray jsonArray = JSON.parseArray(map.get("list")+"");
//        List<SampleProductDto> list = jsonArray.toJavaList(SampleProductDto.class);
//        CopperInsOrderDto CopperInsOrder = JSON.parseObject(JSON.toJSONString(map.get("insOrder")), CopperInsOrderDto.class);
//        return Result.success(insOrderService.addRawCopperOrder(list, CopperInsOrder));
//    }
//
//
//    @ApiOperation(value = "修改委托编号")
//    @PostMapping("/updateOrderEntrustCode")
//    public Result<?> updateOrderEntrustCode(@RequestBody InsOrder insOrder) {
//        insOrderService.updateOrderEntrustCode(insOrder);
//        return Result.success();
//    }
//
//    @ApiOperation(value = "修改检验下单内容")
//    @PostMapping("/updateInsOrder")
//    public Result<?> updateInsOrder(@RequestBody InsOrderUpdateDto insOrderUpdateDto) {
//        return Result.success(insOrderService.updateInsOrder(insOrderUpdateDto));
//    }
//
//    @ApiOperation(value = "删除退回订单")
//    @GetMapping("/delInsOrder")
//    public Result<?> delInsOrder(Integer insOrderId) {
//        // æŸ¥è¯¢è®¢å•
//        InsOrder order = insOrderService.getById(insOrderId);
//        if (!order.getState().equals(2)) {
//            throw new ErrorException("只有退回订单才能删除");
//        }
//
//        return Result.success(insOrderService.removeById(insOrderId));
//    }
//
//    @ApiOperation(value = "成品标签打印")
//    @PostMapping("/labelOrderPrinting")
//    public Result<List<InsOrderPrintingVo>> labelOrderPrinting(@RequestBody Map<String, Object> param) {
//        List<Integer> ids = (List<Integer>) param.get("ids");
//        return Result.success(insOrderService.labelOrderPrinting(ids));
//    }
//
//    @ApiOperation(value = "根据订单id查询样品")
//    @GetMapping("/getSampleByOrderId")
//    public Result<List<InsSample>> getSampleByOrderId(Integer insOrderId) {
//        return Result.success(insSampleService.list(Wrappers.<InsSample>lambdaQuery()
//                .eq(InsSample::getInsOrderId, insOrderId)));
//    }
//
//    @ApiOperation(value = "根据样品id查询检验项树")
//    @GetMapping("/getProductTreeBySampleId")
//    public Result<List<StandardProductList>> getProductTreeBySampleId(Integer insSampleId) {
//        return Result.success(insOrderService.getProductTreeBySampleId(insSampleId));
//    }
//
//
//    @ApiOperation(value = "添加遗漏的检验项")
//    @PostMapping("/addOmitOrderProduct")
//    public Result addOmitOrderProduct(@RequestBody OmitOrderProductDto omitOrderProductDto) {
//        return Result.success(insOrderService.addOmitOrderProduct(omitOrderProductDto));
//    }
//
//    @ApiOperation(value = "成品检验单全部信息导出")
//    @PostMapping("/rawAllInsOrderExport")
//    public void rawAllInsOrderExport(@RequestBody SampleOrderDto sampleOrderDto, HttpServletResponse response){
//        insOrderService.rawAllInsOrderExport(sampleOrderDto,response);
//    }
//
//}

 inspect-server/src/main/java/com/ruoyi/basic/controller/RawMaterialOrderController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,318 @@
//package com.ruoyi.basic.controller;
//
//import com.alibaba.fastjson.JSON;
//import com.alibaba.fastjson.JSONArray;
//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
//import com.ruoyi.basic.dto.IfsInventoryQuantityCheckDto;
//import com.ruoyi.basic.dto.IfsInventoryQuantityDto;
//import com.ruoyi.basic.dto.IfsInventoryQuantitySupplierDto;
//import com.ruoyi.basic.service.RawMaterialOrderService;
//import com.ruoyi.basic.service.RawMaterialOrderTemplateService;
//import com.ruoyi.common.core.domain.Result;
//import io.swagger.annotations.Api;
//import io.swagger.annotations.ApiOperation;
//import lombok.AllArgsConstructor;
//import org.springframework.web.bind.annotation.*;
//
//import javax.servlet.http.HttpServletResponse;
//import java.io.File;
//import java.util.List;
//import java.util.Map;
//
///**
// * @Author zhuo
// * @Date 2024/7/31
// */
//@RequestMapping("/rawMaterialOrder")
//@RestController
//@AllArgsConstructor
//@Api(tags = "原材料下单")
//public class RawMaterialOrderController {
//
//    private RawMaterialOrderService rawMaterialOrderService;
//    private RawMaterialOrderTemplateService rawMaterialOrderTemplateService;
//
//    @ApiOperation(value = "更具零件号获取标准树")
//    @GetMapping("/selectStandardTreeListByPartNo")
//    public Result selectStandardTreeListByPartNo(String partNo) {
//        return Result.success(rawMaterialOrderService.selectStandardTreeListByPartNo(partNo));
//    }
//
//    @ApiOperation(value = "原材料检验查询代下单")
//    @GetMapping("/getPurchaseOrder")
//    public Result getPurchaseOrder(Page page, IfsInventoryQuantityCheckDto ifsInventoryQuantity){
//        return Result.success(rawMaterialOrderService.selectIfsInventoryQuantity(page, ifsInventoryQuantity));
//    }
//
//    @ApiOperation(value = "原材料检验查询检验中")
//    @GetMapping("/getIfsByStateOne")
//    public Result getIfsByStateOne(Page page, IfsInventoryQuantityDto ifsInventoryQuantityDto) throws Exception {
//        return Result.success(rawMaterialOrderService.getIfsByStateOne(page, ifsInventoryQuantityDto));
//    }
//
//    @ApiOperation(value = "原材料检验查询已检验")
//    @GetMapping("/getIfsByOver")
//    public Result getIfsByOver(Page page, IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto) throws Exception {
//        return Result.success(rawMaterialOrderService.getIfsByOver(page, ifsInventoryQuantityDto));
//    }
//
//    @ApiOperation(value = "添加原材料检验单模板")
//    @PostMapping("/addRawMaterOrderTemplate")
//    public Result<?> addRawMaterOrderTemplate(@RequestBody RawMaterialOrderTemplate rawMaterialOrderTemplate) {
//        return Result.success(rawMaterialOrderTemplateService.addRawMaterOrderTemplate(rawMaterialOrderTemplate));
//    }
//    @ApiOperation(value = "查询原材料检验单模板列表")
//    @GetMapping("/selectRawMaterOrderTemplate")
//    public Result<?> selectRawMaterOrderTemplate(String partNo) {
//        return Result.success(rawMaterialOrderTemplateService.selectRawMaterOrderTemplate(partNo));
//    }
//
//    @ApiOperation(value = "通过原材料检验单模板id获取检验单模板内容")
//    @GetMapping("/selectRawMaterOrderTemplateById")
//    public Result<?> selectRawMaterOrderTemplateById(Integer id) {
//        return Result.success("成功", rawMaterialOrderTemplateService.selectRawMaterOrderTemplateById(id));
//    }
//
//    @ApiOperation(value = "删除原材料检验单模板")
//    @PostMapping("/delRawMaterOrderTemplate")
//    public Result<?> delRawMaterOrderTemplate(Integer id) {
//        return Result.success(rawMaterialOrderTemplateService.delRawMaterOrderTemplate(id));
//    }
//
//
//    /**
//     * æŠ¥æ£€æ‰¹é‡
//     * @param param åŽŸææ–™id
//     * @return
//     */
//    @ApiOperation(value = "报检批量")
//    @PostMapping("/inspectionReport")
//    public Result<?> inspectionReport(@RequestBody Map<String, Object> param) {
//        List<Integer> ids = (List<Integer>) param.get("ids");
//        return Result.success(rawMaterialOrderService.inspectionReport(ids));
//    }
//
//    /**
//     * å–消报检
//     * @param id åŽŸææ–™ä¸‹å•
//     * @return
//     */
//    @ApiOperation(value = "撤销报检")
//    @PostMapping("/revokeInspectionReport")
//    public Result<?> revokeInspectionReport(Integer id) {
//        return Result.success(rawMaterialOrderService.revokeInspectionReport(id));
//    }
//
//    /**
//     * æ‰“印标签查询
//     * @param param åŽŸææ–™id
//     * @return
//     */
//    @ApiOperation(value = "打印标签查询")
//    @PostMapping("/printLabel")
//    public Result<?> printLabel(@RequestBody Map<String, Object> param) {
//        List<Integer> ids = (List<Integer>) param.get("ids");
//        return Result.success(rawMaterialOrderService.printLabel(ids));
//    }
//
//    /**
//     * æŠ¥æ£€
//     * @param ifsInventoryQuantity åŽŸææ–™
//     * @return
//     */
//    @ApiOperation(value = "报检")
//    @PostMapping("/inspectionReportOne")
//    public Result<?> inspectionReportOne(@RequestBody IfsInventoryQuantity ifsInventoryQuantity) {
//
//        return Result.success(rawMaterialOrderService.inspectionReportOne(ifsInventoryQuantity));
//    }
//
//    /**
//     * èŽ·å–铜产业链检测数据
//     * @param id åŽŸææ–™id
//     * @return
//     */
//    @ApiOperation(value = "获取铜产业链检测数据")
//    @GetMapping("/getIndustryChain")
//    public Result<?> getIndustryChain(Integer id) {
//        return Result.success("成功", rawMaterialOrderService.getIndustryChain(id));
//    }
//
//    /**
//     * åŽŸææ–™æ’¤é”€
//     * @param ifsInventoryId
//     * @return
//     */
//    @ApiOperation(value = "原材料撤销下单")
//    @PutMapping("/repealRawOrder")
//    public Result<?> repealRawOrder(Integer ifsInventoryId){
//        return Result.success(rawMaterialOrderService.repealRawOrder(ifsInventoryId));
//    }
//
//
//    @ApiOperation(value = "原材料下单免检")
//    @PostMapping("/addExemptionOrder")
//    public Result<?> addExemptionOrder(String str) {
//        Map<String, Object> map = JSON.parseObject(str, Map.class);
//        JSONArray jsonArray = JSON.parseArray(map.get("list")+"");
//        List<SampleProductDto> list = jsonArray.toJavaList(SampleProductDto.class);
//        InsOrder insOrder = JSON.parseObject(JSON.toJSONString(map.get("insOrder")), InsOrder.class);
//        return Result.success(rawMaterialOrderService.addExemptionOrder(list, insOrder));
//    }
//
//
//    @ApiOperation(value = "仓库报检查询")
//    @PostMapping("/getWarehouseSubmit")
//    public Result getWarehouseSubmit(@RequestBody Map<String, Object> data) throws Exception {
//        Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
//        IfsInventoryQuantity ifsInventoryQuantity = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), IfsInventoryQuantity.class);
//        return Result.success(rawMaterialOrderService.getWarehouseSubmit(page, ifsInventoryQuantity));
//    }
//
//    /**
//     * å–消报检
//     * @param id åŽŸææ–™ä¸‹å•
//     * @return
//     */
//    @ApiOperation(value = "删除原材料报检信息")
//    @PostMapping("/delIfsInventory")
//    public Result<?> delIfsInventory(Integer id) {
//        return Result.success(rawMaterialOrderService.delIfsInventory(id));
//    }
//
//    /**
//     * åŽŸææ–™ä¸‹å•æ”¾è¡Œ
//     * @param param
//     * @return
//     */
//    @ApiOperation(value = "原材料下单放行免检")
//    @PostMapping("/rawOrderRelease")
//    public Result<?> rawOrderRelease(@RequestBody Map<String, Object> param){
//        Integer ifsInventoryId = (Integer) param.get("ifsInventoryId");
//        String partDetail = (String) param.get("partDetail");
//        return Result.success(rawMaterialOrderService.rawOrderRelease(ifsInventoryId, partDetail));
//    }
//
//    /**
//     * åŽŸææ–™ä¸‹å•é€šçŸ¥å…æ£€æˆ–者多次检验
//     * @param ifsInventoryId
//     * @return
//     */
//    @ApiOperation(value = "原材料下单通知免检或者多次检验")
//    @GetMapping("/notificationRawOrder")
//    public Result<?> notificationRawOrder(Integer ifsInventoryId){
//        return Result.success(rawMaterialOrderService.notificationRawOrder(ifsInventoryId));
//    }
//
//    @ValueClassify("原材料下单")
//    @ApiOperation(value = "原材料报检查询全部")
//    @PostMapping("/getIfsByAll")
//    public Result getIfsByAll(@RequestBody Map<String, Object> data) throws Exception {
//        Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
//        IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), IfsInventoryQuantitySupplierDto.class);
//        return Result.success(rawMaterialOrderService.getIfsByOver(page, ifsInventoryQuantityDto));
//    }
//
//
//    @ApiOperation(value = "新增原材料报检信息")
//    @PostMapping("/addIfsInventoryQuantity")
//    public Result addIfsInventoryQuantity(@RequestBody IfsInventoryQuantity ifsInventoryQuantity) {
//        rawMaterialOrderService.addIfsInventoryQuantity(ifsInventoryQuantity);
//        return Result.success();
//    }
//
//    @ApiOperation(value = "原材料下单查看已完成信息")
//    @PostMapping("/getIfsByFinish")
//    public Result getIfsByFinish(@RequestBody Map<String, Object> data) throws Exception {
//        Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
//        IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), IfsInventoryQuantitySupplierDto.class);
//        ifsInventoryQuantityDto.setIsFinish(1);
//        return Result.success(rawMaterialOrderService.getIfsByOver(page, ifsInventoryQuantityDto));
//    }
//
//    @ApiOperation(value = "测试移库")
//    @PostMapping("/shiftingParking")
//    public Result shiftingParking(@RequestBody List<Integer> ids){
//        rawMaterialOrderService.shiftingParking(ids);
//        return Result.success();
//    }
//
//    @ApiOperation(value = "微信发送文件")
//    @GetMapping("/wxSend")
//    public Result wxSend(String user, String content, String filePath) throws Exception {
//        WxCpUtils.inform(user, content, new File(filePath));
//        return Result.success();
//    }
//
//    @ValueClassify("原材料下单")
//    @ApiOperation(value = "铜单丝下单免检")
//    @PostMapping("/addRawCopperOrderExemptionOrder")
//    public Result<?> addRawCopperOrderExemptionOrder(String str) {
//        Map<String, Object> map = JSON.parseObject(str, Map.class);
//        JSONArray jsonArray = JSON.parseArray(map.get("list")+"");
//        List<SampleProductDto> list = jsonArray.toJavaList(SampleProductDto.class);
//        CopperInsOrderDto CopperInsOrder = JSON.parseObject(JSON.toJSONString(map.get("insOrder")), CopperInsOrderDto.class);
//        return Result.success(rawMaterialOrderService.addRawCopperOrderExemptionOrder(list, CopperInsOrder));
//    }
//
//    /**
//     * è®©æ­¥æ”¾è¡Œ
//     * @param ifsInventoryId
//     * @return
//     */
//    @ValueClassify("原材料下单")
//    @ApiOperation(value = "让步放行")
//    @PostMapping("/concessionRelease")
//    public Result<?> concessionRelease(Integer ifsInventoryId){
//        return Result.success(rawMaterialOrderService.concessionRelease(ifsInventoryId));
//    }
//
//    /**
//     * åŽŸææ–™è¿›åŽ‚撤销下单
//     * @param enterOrderId
//     * @return
//     */
//    @ApiOperation(value = "原材料进厂撤销下单")
//    @PostMapping("/repealEnterRawOrder")
//    public Result<?> repealEnterRawOrder(Integer enterOrderId){
//        return Result.success(rawMaterialOrderService.repealEnterRawOrder(enterOrderId));
//    }
//
//    /**
//     * åŽŸææ–™å­£åº¦æ’¤é”€ä¸‹å•
//     * @param quarterOrderId
//     * @return
//     */
//    @ApiOperation(value = "原材料季度撤销下单")
//    @PostMapping("/repealQuarterRawOrder")
//    public Result<?> repealQuarterRawOrder(Integer quarterOrderId){
//        return Result.success(rawMaterialOrderService.repealQuarterRawOrder(quarterOrderId));
//    }
//
//    @ApiOperation(value = "全部信息导出")
//    @PostMapping("/rawAllExport")
//    public void rawAllExport(@RequestBody Map<String, Object> data, HttpServletResponse response) throws Exception {
//        IfsInventoryQuantitySupplierDto dto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), IfsInventoryQuantitySupplierDto.class);
//        rawMaterialOrderService.rawAllExport(dto,response);
//    }
//
//    @ApiOperation(value = "原材料检验查询季度检验")
//    @PostMapping("/getIfsByQuarter")
//    public Result getIfsByQuarter(@RequestBody Map<String, Object> data) throws Exception {
//        Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
//        IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), IfsInventoryQuantitySupplierDto.class);
//        return Result.success(rawMaterialOrderService.getIfsByQuarter(page, ifsInventoryQuantityDto));
//    }
//
//    /**
//     * æå‰å…¥åº“
//     * @param ifsInventoryId
//     * @return
//     */
//    @ApiOperation(value = "提前入库")
//    @PostMapping("/advancedGodown")
//    public Result<?> advancedGodown(Integer ifsInventoryId){
//        return Result.success(rawMaterialOrderService.advancedGodown(ifsInventoryId));
//    }
//
//}

 inspect-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantityCheckDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,183 @@
//package com.ruoyi.basic.dto;
//
//import com.fasterxml.jackson.annotation.JsonFormat;
//import io.swagger.annotations.ApiModelProperty;
//import lombok.Data;
//
//import java.io.Serializable;
//import java.math.BigDecimal;
//import java.time.LocalDateTime;
//
///**
// * åŽŸææ–™æŸ¥è¯¢, æŽ’除了供应商
// * @Author zhuo
// * @Date 2024/8/28
// */
//@Data
//public class IfsInventoryQuantityCheckDto implements Serializable {
//
//    private Integer id;
//
//    @ApiModelProperty("域")
//    private String contract;
//
//    @ApiModelProperty("订单号")
//    private String orderNo;
//
//
//    @ApiModelProperty("行号")
//    private String lineNo;
//
//    @ApiModelProperty("下达号")
//    private String releaseNo;
//
//    @ApiModelProperty("接收号")
//    private Integer receiptNo;
//
//    @ApiModelProperty("零件号")
//    private String partNo;
//
//    @ApiModelProperty("零件描述")
//    private String partDesc;
//
//    @ApiModelProperty("状态描述")
//    private String status;
//
//    @ApiModelProperty("状态")
//    private String statusDb;
//
//    @ApiModelProperty("抵达的采购数量")
//    private BigDecimal qtyArrived;
//
//    @ApiModelProperty("已检验的购买数量")
//    private BigDecimal qtyInspected;
//
//    @ApiModelProperty("要检验的采购数量")
//    private BigDecimal qtyToInspect;
//
//    @ApiModelProperty("抵达的库存数量")
//    private BigDecimal invQtyInStore;
//
//    @ApiModelProperty("抵达的采购数量")
//    private BigDecimal purQtyInStore;
//
//    @ApiModelProperty("配置标识")
//    private String configurationId;
//
//    @ApiModelProperty("批号")
//    private String lotBatchNo;
//
//    @ApiModelProperty("wdr号")
//    private String waivDevRejNo;
//
//    @ApiModelProperty("活动序列")
//    private Integer activitySeq;
//
//
//    @ApiModelProperty("序列号")
//    private String serialNo;
//
//    @ApiModelProperty("库位号")
//    private String locationNo;
//
//    @ApiModelProperty("版本号")
//    private String engChgLevel;
//
//    @ApiModelProperty("接收人")
//    private String receiver;
//
//    @ApiModelProperty("接收人姓名")
//    private String receiverName;
//
//    @ApiModelProperty("采购员")
//    private String buyerCode;
//
//    @ApiModelProperty("采购员姓名")
//    private String buyerName;
//
//    @ApiModelProperty("实际到货日期")
//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
//    private LocalDateTime arriveDate;
//
//    @ApiModelProperty("实际交货日期")
//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
//    private LocalDateTime deliveryDate;
//
//    @ApiModelProperty("生产日期")
//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
//    private LocalDateTime productDate;
//
//    @ApiModelProperty("失效日期")
//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
//    private LocalDateTime invalidDate;
//
//
//    @ApiModelProperty("审批日期")
//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
//    private LocalDateTime approvedDate;
//
//    @ApiModelProperty("采购申请创建人")
//    private String reqCeater;
//
//    @ApiModelProperty("采购申请创建人姓名")
//    private String reqCeaterName;
//
//    @ApiModelProperty("采购订单行备注")
//    private String lineRemarks;
//
//    @ApiModelProperty("单位")
//    private String buyUnitMeas;
//
//
//    private Integer isSource;
//
//    private Integer number;
//
//
//    private Integer state;
//
//    @ApiModelProperty("接收时间")
//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
//    private LocalDateTime receiverDate;
//
//    @ApiModelProperty("是否为首次出现 0 å¦ 1 æ˜¯")
//    private Integer isFirst;
//
//    @ApiModelProperty("目标库位号")
//    private String toLocation;
//
//    @ApiModelProperty("是否是报检 0 å¦ 1 æ˜¯")
//    private Integer isInspect;
//
//    @ApiModelProperty("报检人")
//    private String declareUser;
//
//
//    @ApiModelProperty("报检人id")
//    private Integer declareUserId;
//
//    @ApiModelProperty("单位")
//    private String partUnit;
//
//    @ApiModelProperty("产业链检测数据")
//    private String industryChain;
//
//    @ApiModelProperty("报检时间")
//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
//    private LocalDateTime declareDate;
//
//    @ApiModelProperty("是否卡可以季度检验 0 å¦ 1 æ˜¯")
//    private Integer isQuarter;
//
//    // ä¿®æ”¹åŽçš„
//    @ApiModelProperty("批号")
//    private String updateBatchNo;
//
//    @ApiModelProperty("是否是铜单丝, 0否, 1是")
//    private Integer isCopper;
//
//    @ValueTableShow(8)
//    @ApiModelProperty("物料类型")
//    private Integer isExpire;
//
//}

 inspect-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantityDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,82 @@
//package com.ruoyi.basic.dto;
//
//import com.fasterxml.jackson.annotation.JsonFormat;
//import io.swagger.annotations.ApiModelProperty;
//import lombok.Data;
//
//import java.time.LocalDateTime;
//
//@Data
//public class IfsInventoryQuantityDto extends IfsInventoryQuantityCheckDto {
//
//    /**
//     * å§”托编号
//     */
//    @ApiModelProperty("委托编号")
//    private String entrustCode;
//
//    @ApiModelProperty("检验对象")
//    private String sampleType;
//
//    @ApiModelProperty("样品名称")
//    private String sampleName;
//
//    @ApiModelProperty("样品型号")
//    private String sampleModel;
//
//    @ApiModelProperty("样品编号")
//    private String sampleCode;
//
//    // è¿›åŽ‚
//    @ApiModelProperty("订单id")
//    private Integer enterOrderId;
//
//    @ApiModelProperty("报告id")
//    private String enterReportId;
//
//    @ApiModelProperty("系统生成报告地址")
//    private String enterUrl;
//
//    @ApiModelProperty("手动上传报告地址")
//    private String enterUrlS;
//
//    // å­£åº¦
//    @ApiModelProperty("订单id")
//    private Integer quarterOrderId;
//
//    @ApiModelProperty("报告id")
//    private String quarterReportId;
//
//    @ApiModelProperty("系统生成报告地址")
//    private String quarterUrl;
//
//    @ApiModelProperty("手动上传报告地址")
//    private String quarterUrlS;
//
//    private Integer orderState;
//
//    @ApiModelProperty("下发时间")
//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
//    private LocalDateTime sendTime;
//
//    @ApiModelProperty("材料厂家")
//    private String supplierName;
//
//    @ApiModelProperty("委托人")
//    private String prepareUser;
//
//    @ApiModelProperty("颜色")
//    private String color;
//
//    @ApiModelProperty("标签状态")
//    private String labelStatus;
//
//    @ApiModelProperty("标签条形码")
//    private String labelBarCode;
//
//    @ApiModelProperty("创建人")
//    private Integer createUser;
//
//    @ApiModelProperty("检验人")
//    private String userName;
//}

 inspect-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantitySupplierDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,125 @@
//package com.ruoyi.basic.dto;
//
//import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
//import com.alibaba.excel.annotation.ExcelProperty;
//import com.fasterxml.jackson.annotation.JsonFormat;
//import com.yuanchu.mom.annotation.ValueTableShow;
//import com.yuanchu.mom.pojo.IfsInventoryQuantity;
//import io.swagger.annotations.ApiModelProperty;
//import lombok.Data;
//
//import java.time.LocalDateTime;
//
///**
// * èƒ½æŸ¥è¯¢åˆ°ä¾›åº”商
// */
//@Data
//@ExcelIgnoreUnannotated
//public class IfsInventoryQuantitySupplierDto extends IfsInventoryQuantity {
//
//    /**
//     * å§”托编号
//     */
//    @ExcelProperty(index = 2, value = "委托编号")
//    @ApiModelProperty("委托编号")
//    private String entrustCode;
//
//    @ApiModelProperty("样品id")
//    private Integer sampleId;
//
//    @ApiModelProperty("检验对象")
//    private String sampleType;
//
//    @ExcelProperty(index = 7, value = "样品名称")
//    @ApiModelProperty("样品名称")
//    private String sampleName;
//
//    @ExcelProperty(index = 8, value = "样品型号")
//    @ApiModelProperty("样品型号")
//    private String sampleModel;
//
//    @ApiModelProperty("样品编号")
//    private String sampleCode;
//
//    // è¿›åŽ‚
//    @ApiModelProperty("进厂订单id")
//    private Integer enterOrderId;
//
//    @ApiModelProperty("报告id")
//    private String enterReportId;
//
//    @ApiModelProperty("系统生成报告地址")
//    private String enterUrl;
//
//    @ApiModelProperty("手动上传报告地址")
//    private String enterUrlS;
//
//    // å­£åº¦
//    @ApiModelProperty("季度订单id")
//    private Integer quarterOrderId;
//
//    @ApiModelProperty("报告id")
//    private String quarterReportId;
//
//    @ApiModelProperty("系统生成报告地址")
//    private String quarterUrl;
//
//    @ApiModelProperty("手动上传报告地址")
//    private String quarterUrlS;
//
//    private Integer orderState;
//
//    @ApiModelProperty("下发时间")
//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
//    private LocalDateTime sendTime;
//
//    @ApiModelProperty("委托人")
//    private String prepareUser;
//
//    @ApiModelProperty("颜色")
//    private String color;
//
//    @ApiModelProperty("标签状态")
//    private String labelStatus;
//
//    @ApiModelProperty("标签条形码")
//    private String labelBarCode;
//
//    @ApiModelProperty("创建人")
//    private Integer createUser;
//
//    @ExcelProperty(index = 9, value = "检验人")
//    @ApiModelProperty("检验人")
//    private String userName;
//
//    @ExcelProperty(index = 10, value = "下发时间")
//    private String sendTimeString;
//
//    @ExcelProperty(index = 14, value = "接收时间")
//    private String receiverDateString;
//
//    @ExcelProperty(index = 15, value = "报检时间")
//    private String declareDateString;
//
//    // åˆæ ¼çŠ¶æ€,: 0 æ£€éªŒä¸­, 1合格, 2不合格, 3未下单,4让步放行
//    @ExcelProperty(index = 6, value = "检验状态")
//    private String inspectStatusString;
//
//    @ApiModelProperty("报检开始时间")
//    private String beginDeclareDate;
//
//    @ApiModelProperty("报检结束时间")
//    private String endDeclareDate;
//
//    @ApiModelProperty("不合格描述")
//    @ExcelProperty(index = 16, value = "不合格描述")
//    private String unqualifiedDesc;
//
//
//    @ApiModelProperty("不合格项")
//    @ExcelProperty(index = 17, value = "不合格项")
//    private String unqualifiedItem;
//
//    @ApiModelProperty("免检")
//    private Integer isExemption;
//}

 inspect-server/src/main/java/com/ruoyi/basic/dto/IfsStockQueryDTO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,65 @@
//package com.ruoyi.basic.dto;
//
//import lombok.Data;
//
//@Data
//public class IfsStockQueryDTO {
//    private String partNo;
//    private String partDescription; // é›¶ä»¶æè¿°
//    private String partDesc;
//    private String locNo; // åº“位号
//    private String locDesc; // åº“位描述
//    private String lotBatchNo; // æ‰¹å·
//    private String wdrNo; // WDR编号
//    private String warehouse; // ä»“库
//    private String quantityFlag; // æ•°é‡æ ‡è¯†(现有数量)
//    private String locationGroup; // åº“位组
//    private String locationGroupDesc; // åº“位组描述
//    private String reelNumber; // è½½å…·ç¼–号
//    private String startMeter; // èµ·å§‹ç±³æ ‡
//    private String endMeter; // æˆªæ­¢ç±³æ ‡
//    private String outerColor; // å¤–护颜色
//    private String insulationColor; // ç»ç¼˜é¢œè‰²
//    private String otcOrderNo; // ç‰©æ–™å±žæ€§é‡Œé¢çš„OTC订单号
//    private String mpsNo; // ç”Ÿäº§è®¡åˆ’号
//    private String letteringInfo; // å°å­—信息
//    private String sStockQuantity; // åº“存数量2
//    private String availableStockQuantity; // å¯ç”¨åº“存数量
//    private String sAvailableStockQuantity; // åº“用库存数量2
//    private String sunit; // å•ä½2
//    private String stockSource; // æ¥æº
//    private String inspInstorageTime; // æ£€æµ‹å…¥åº“日期
//    private String testRemark; // æ£€æµ‹å¤‡æ³¨
//    private String grossWeight; // æ¯›é‡
//    private String netWeight; // å‡€é‡
//    private String packingManner; // åŒ…装方式
//    private String cylinderNumber; //打圈个数
//    private String systemNo; //系统号
//    private String remark; //备注
//    private String customerName; //客户名称
//    private String reserveQuantity; //预留数量
//    private String lengthRequirement; // åˆ¤æ–­è¦æ±‚
//    private String inSource;//入库来源
//    private String splitQuality;//分割预留数量
//
//    //接口 getIfsStockReport ç”¨åˆ°çš„字段
//    private String attr23;//入库来源
//    private String attr6;//otc订单号
//    private String attr21;//客户名称
//    private String attr4;//外护颜色
//    private String attr5;//绝缘颜色
//    private String attr8;//印字信息
//    private String lot_batch_no;//批次号
//    private String location_no;//库位号
//    private String attr17;//包装方式
//    private String attr1;//载具编号
//
//    //接口queryColReservedInfoStd ç”¨åˆ°çš„两个字段
//    private String cotcOrderNo; // è¡¨é‡Œé¢çš„OTC订单号
//    private String cotcLineNo; // è¡¨é‡Œé¢çš„OTC行号
//
//    private Boolean isAll;//是否查询全部库存
//
//    private Long page;
//    private Long limit;
//}

 inspect-server/src/main/java/com/ruoyi/basic/pojo/InsSample.java

@@ -1,123 +1,123 @@
package com.ruoyi.basic.pojo;

import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;
import java.time.LocalDateTime;

/**
 * æ£€éªŒæ ·å“
 * @TableName ins_sample
 */
@TableName(value ="ins_sample")
@Data
public class InsSample implements Serializable {
    /**
     *
     */
    @TableId(type = IdType.AUTO)
    private Integer id;

    /**
     * 1：合格 0：不合格
     */
    private Integer insResult;

    /**
     * å¤–键：ins_order表id
     */
    private Integer insOrderId;

    /**
     * é…å¥—样品型号
     */
    private String joinModel;

    /**
     * é…å¥—样品名称
     */
    private String joinName;

    /**
     * é…å¥—样品数量
     */
    private Integer joinNum;

    /**
     * æ ·å“ç¼–码
     */
    private String sampleCode;

    /**
     * æ£€éªŒå·¥åŽ‚
     */
    private String factory;

    /**
     * å®žéªŒå®¤åç§°
     */
    private String laboratory;

    /**
     * æ ·å“ç±»åž‹
     */
    private String sampleType;

    /**
     * æ ·å“åç§°
     */
    private String sample;

    /**
     * è§„格型号
     */
    private String model;

    /**
     * æ£€éªŒçŠ¶æ€(0：待检验1:检验中 2:已检验3：待复核4：复核未通过5：复核通过)
     */
    private Integer insState;

    /**
     * å¤‡æ³¨
     */
    private String remark;

    private Integer standardMethodListId;

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

    private Integer cellId;

    @TableField(fill = FieldFill.INSERT)
    private Integer createUser;

    @ApiModelProperty("创建时间")
    @TableField(fill = FieldFill.INSERT)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime createTime;

    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Integer updateUser;

    @ApiModelProperty("修改时间")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime updateTime;

    private Integer parentId;

    @ApiModelProperty("数量")
    private Integer quantity;

    @ApiModelProperty("特殊标准方法")
    private String specialStandardMethod;

    @TableField(select = false,exist = false)
    private Integer num=1;

}
//package com.ruoyi.basic.pojo;
//
//import com.baomidou.mybatisplus.annotation.*;
//import com.fasterxml.jackson.annotation.JsonFormat;
//import io.swagger.annotations.ApiModelProperty;
//import lombok.Data;
//
//import java.io.Serializable;
//import java.time.LocalDateTime;
//
///**
// * æ£€éªŒæ ·å“
// * @TableName ins_sample
// */
//@TableName(value ="ins_sample")
//@Data
//public class InsSample implements Serializable {
//    /**
//     *
//     */
//    @TableId(type = IdType.AUTO)
//    private Integer id;
//
//    /**
//     * 1：合格 0：不合格
//     */
//    private Integer insResult;
//
//    /**
//     * å¤–键：ins_order表id
//     */
//    private Integer insOrderId;
//
//    /**
//     * é…å¥—样品型号
//     */
//    private String joinModel;
//
//    /**
//     * é…å¥—样品名称
//     */
//    private String joinName;
//
//    /**
//     * é…å¥—样品数量
//     */
//    private Integer joinNum;
//
//    /**
//     * æ ·å“ç¼–码
//     */
//    private String sampleCode;
//
//    /**
//     * æ£€éªŒå·¥åŽ‚
//     */
//    private String factory;
//
//    /**
//     * å®žéªŒå®¤åç§°
//     */
//    private String laboratory;
//
//    /**
//     * æ ·å“ç±»åž‹
//     */
//    private String sampleType;
//
//    /**
//     * æ ·å“åç§°
//     */
//    private String sample;
//
//    /**
//     * è§„格型号
//     */
//    private String model;
//
//    /**
//     * æ£€éªŒçŠ¶æ€(0：待检验1:检验中 2:已检验3：待复核4：复核未通过5：复核通过)
//     */
//    private Integer insState;
//
//    /**
//     * å¤‡æ³¨
//     */
//    private String remark;
//
//    private Integer standardMethodListId;
//
//    @ApiModelProperty("样品单位")
//    private String unit;
//
//    private Integer cellId;
//
//    @TableField(fill = FieldFill.INSERT)
//    private Integer createUser;
//
//    @ApiModelProperty("创建时间")
//    @TableField(fill = FieldFill.INSERT)
//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
//    private LocalDateTime createTime;
//
//    @TableField(fill = FieldFill.INSERT_UPDATE)
//    private Integer updateUser;
//
//    @ApiModelProperty("修改时间")
//    @TableField(fill = FieldFill.INSERT_UPDATE)
//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
//    private LocalDateTime updateTime;
//
//    private Integer parentId;
//
//    @ApiModelProperty("数量")
//    private Integer quantity;
//
//    @ApiModelProperty("特殊标准方法")
//    private String specialStandardMethod;
//
//    @TableField(select = false,exist = false)
//    private Integer num=1;
//
//}

 inspect-server/src/main/java/com/ruoyi/basic/service/RawMaterialOrderService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,143 @@
//package com.ruoyi.basic.service;
//
//import com.baomidou.mybatisplus.core.metadata.IPage;
//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
//
//import javax.servlet.http.HttpServletResponse;
//import java.io.UnsupportedEncodingException;
//import java.util.List;
//import java.util.Map;
//
///**
// * @Author zhuo
// * @Date 2024/7/31
// */
//public interface RawMaterialOrderService {
//
//    RawMaterialStandardTreeDto selectStandardTreeListByPartNo(String partNo);
//
//    /**
//     * æŠ¥æ£€æŸ¥è¯¢
//     * @param page
//     * @param ifsInventoryQuantity
//     * @return
//     */
//    Map<String,Object> getWarehouseSubmit(IPage<IfsInventoryQuantity> page, IfsInventoryQuantity ifsInventoryQuantity);
//
//    /**
//     * æŸ¥è¯¢æ£€éªŒå€¼
//     * @param page
//     * @param ifsInventoryQuantityDto
//     * @return
//     */
//    Map<String,Object> getIfsByStateOne(IPage<IfsInventoryQuantityDto> page, IfsInventoryQuantityDto ifsInventoryQuantityDto);
//
//    int inspectionReport(List<Integer> ids);
//
//    int revokeInspectionReport(Integer id);
//
//    List<IfsInventoryQuantityDto> printLabel(List<Integer> ids);
//
//    int inspectionReportOne(IfsInventoryQuantity ifsInventoryQuantity);
//
//    String getIndustryChain(Integer id);
//
//    /**
//     * åŽŸææ–™æ’¤é”€ä¸‹å•
//     * @param ifsInventoryId
//     * @return
//     */
//    boolean repealRawOrder(Integer ifsInventoryId);
//
//    /**
//     * æ·»åŠ å…æ£€è®¢å•
//     * @param list
//     * @param insOrder
//     * @return
//     */
//    int addExemptionOrder(List<SampleProductDto> list, InsOrder insOrder);
//
//    Map<String,Object> selectIfsInventoryQuantity(Page<IfsInventoryQuantityCheckDto> page, IfsInventoryQuantityCheckDto ifsInventoryQuantity);
//
//    /**
//     * æŸ¥è¯¢å·²æ£€éªŒ
//     * @param page
//     * @param ifsInventoryQuantityDto
//     * @return
//     */
//    Map<String,Object>  getIfsByOver(Page<IfsInventoryQuantitySupplierDto> page, IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto);
//
//    int delIfsInventory(Integer id);
//
//    /**
//     * åŽŸææ–™æ”¾è¡Œå…æ£€
//     * @param ifsInventoryId
//     * @return
//     */
//    boolean rawOrderRelease(Integer ifsInventoryId, String partDetail);
//
//    /**
//     * åŽŸææ–™ä¸‹å•é€šçŸ¥å…æ£€æˆ–者多次检验
//     * @param ifsInventoryId
//     * @return
//     */
//    int notificationRawOrder(Integer ifsInventoryId);
//
//    /**
//     * æ‰‹åŠ¨æ·»åŠ åŽŸæä¿¡æ¯
//     * @param ifsInventoryQuantity
//     */
//    void addIfsInventoryQuantity(IfsInventoryQuantity ifsInventoryQuantity);
//
//    void shiftingParking(List<Integer> ids);
//
//    /**
//     * é“œå•ä¸ä¸‹å•å…æ£€
//     * @param list
//     * @param copperInsOrder
//     */
//    int addRawCopperOrderExemptionOrder(List<SampleProductDto> list, CopperInsOrderDto copperInsOrder);
//
//    /**
//     * è®©æ­¥u放行
//     * @param ifsInventoryId
//     * @return
//     */
//    boolean concessionRelease(Integer ifsInventoryId);
//
//    /**
//     * åŽŸææ–™è¿›åŽ‚撤销下单
//     * @param enterOrderId
//     * @return
//     */
//    boolean repealEnterRawOrder(Integer enterOrderId);
//
//    /**
//     * åŽŸææ–™å­£åº¦æ’¤é”€ä¸‹å•
//     * @param quarterOrderId
//     * @return
//     */
//    boolean repealQuarterRawOrder(Integer quarterOrderId);
//
//    /**
//     * åŽŸææ–™æŠ¥æ£€å…¨éƒ¨ä¿¡æ¯å¯¼å‡º
//     * @param dto
//     * @param response
//     */
//    void rawAllExport(IfsInventoryQuantitySupplierDto dto, HttpServletResponse response) throws UnsupportedEncodingException;
//
//    /**
//     * åŽŸææ–™æŸ¥è¯¢å¯ä»¥å­£åº¦æ£€éªŒçš„内容
//     * @param page
//     * @param ifsInventoryQuantityDto
//     * @return
//     */
//    Map<String,Object> getIfsByQuarter(Page page, IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto);
//
//    /**
//     * advancedGodown
//     * @param ifsInventoryId
//     * @return
//     */
//    boolean advancedGodown(Integer ifsInventoryId);
//}

 inspect-server/src/main/java/com/ruoyi/basic/service/RawMaterialOrderTemplateService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,25 @@
//package com.ruoyi.basic.service;
//
//import com.baomidou.mybatisplus.extension.service.IService;
//import com.yuanchu.mom.pojo.RawMaterialOrderTemplate;
//
//import java.util.List;
//
///**
// * åŽŸææ–™ä¸‹å•æ¨¡æ¿
// *
// * @author zhuo
// * @since 2024-08-05
// */
//public interface RawMaterialOrderTemplateService extends IService<RawMaterialOrderTemplate> {
//
//    int addRawMaterOrderTemplate(RawMaterialOrderTemplate rawMaterialOrderTemplate);
//
//    List<RawMaterialOrderTemplate> selectRawMaterOrderTemplate(String partNo);
//
//    String selectRawMaterOrderTemplateById(Integer id);
//
//    int delRawMaterOrderTemplate(Integer id);
//
//}
//

 inspect-server/src/main/java/com/ruoyi/basic/service/impl/RawMaterialOrderServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,850 @@
//package com.ruoyi.basic.service.impl;
//
//import cn.hutool.core.collection.CollUtil;
//import cn.hutool.core.collection.CollectionUtil;
//import cn.hutool.core.date.DateTime;
//import cn.hutool.core.date.DateUtil;
//import cn.hutool.core.util.StrUtil;
//import com.alibaba.excel.EasyExcel;
//import com.alibaba.excel.ExcelWriter;
//import com.alibaba.excel.write.metadata.WriteSheet;
//import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
//import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
//import com.baomidou.mybatisplus.core.metadata.IPage;
//import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
//import com.baomidou.mybatisplus.core.toolkit.StringUtils;
//import com.baomidou.mybatisplus.core.toolkit.Wrappers;
//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
//import com.ruoyi.basic.service.RawMaterialOrderService;
//import lombok.AllArgsConstructor;
//import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
//import org.springframework.stereotype.Service;
//import org.springframework.transaction.annotation.Transactional;
//
//import javax.servlet.http.HttpServletResponse;
//import java.io.IOException;
//import java.io.UnsupportedEncodingException;
//import java.math.BigDecimal;
//import java.net.URLEncoder;
//import java.text.SimpleDateFormat;
//import java.time.LocalDateTime;
//import java.time.format.DateTimeFormatter;
//import java.util.*;
//import java.util.concurrent.atomic.AtomicInteger;
//
///**
// * @Author zhuo
// * @Date 2024/7/31
// */
//@Service
//@AllArgsConstructor
//public class RawMaterialOrderServiceImpl implements RawMaterialOrderService {
//
//    private StandardTreeMapper standardTreeMapper;
//    private IfsInventoryQuantityMapper ifsInventoryQuantityMapper;
//    private GetLook getLook;
//    private UserMapper userMapper;
//    private InsOrderService insOrderService;
//    private InsOrderMapper insOrderMapper;
//    private InsSampleMapper insSampleMapper;
//    private final NumberGenerator<InsOrder> numberGenerator;
//    private InsReportService insReportService;
//    private WechatProperty wechatProperty;
//    private ThreadPoolTaskExecutor threadPoolTaskExecutor;
//    private InsProductMapper insProductMapper;
//    private AuxiliaryOutputWorkingHoursMapper auxiliaryOutputWorkingHoursMapper;
//
//
//    @Override
//    public RawMaterialStandardTreeDto selectStandardTreeListByPartNo(String partNo) {
//        if (StringUtils.isBlank(partNo)) {
//            throw new ErrorException("零件号丢失");
//        }
//        List<FactoryDto> factoryDtos = standardTreeMapper.selectStandardTreeListByPartNo(partNo);
//        if (CollectionUtil.isEmpty(factoryDtos)) {
//            throw new ErrorException("零件号为" + partNo + "的原材料没有对应的标准库配置");
//        }
//        RawMaterialStandardTreeDto rawMaterialStandardTreeDto = new RawMaterialStandardTreeDto();
//        for (FactoryDto factoryDto : factoryDtos) {
//            for (LaboratoryDto laboratoryDto : factoryDto.getChildren()) {
//                for (SampleTypeDto sampleTypeDto : laboratoryDto.getChildren()) {
//                    if (sampleTypeDto.getChildren().size() == 0) {
//                        sampleTypeDto.setChildren(standardTreeMapper.getStandardTree3(sampleTypeDto.getValue()));
//                    }
//                    // åˆ¤æ–­ç»‘定的是否是当前零件号
//                    if (sampleTypeDto.getPartNo() != null && sampleTypeDto.getPartNo().equals(partNo)) {
//                        // æ·»åŠ å¯¹è±¡
//                        rawMaterialStandardTreeDto.setTreeName(factoryDto.getValue() + "-"
//                                + laboratoryDto.getValue() + "-"
//                                + sampleTypeDto.getValue());
//                        rawMaterialStandardTreeDto.setCode(sampleTypeDto.getCode());
//                        rawMaterialStandardTreeDto.setLabel(sampleTypeDto.getLabel());
//                        rawMaterialStandardTreeDto.setValue(sampleTypeDto.getValue());
//                        rawMaterialStandardTreeDto.setChildren1(sampleTypeDto.getChildren());
//                    } else {
//                        for (SampleDto sampleDto : sampleTypeDto.getChildren()) {
//                            if (sampleDto.getPartNo() != null && sampleDto.getPartNo().equals(partNo)) {
//                                // æ·»åŠ å¯¹è±¡
//                                rawMaterialStandardTreeDto.setTreeName(factoryDto.getValue() + "-"
//                                        + laboratoryDto.getValue() + "-"
//                                        + sampleTypeDto.getValue() + "-"
//                                        + sampleDto.getValue());
//                                rawMaterialStandardTreeDto.setCode(sampleDto.getCode());
//                                rawMaterialStandardTreeDto.setLabel(sampleDto.getLabel());
//                                rawMaterialStandardTreeDto.setValue(sampleDto.getValue());
//                                rawMaterialStandardTreeDto.setChildren2(sampleDto.getChildren());
//                            }
//                        }
//                    }
//                }
//            }
//        }
//        return rawMaterialStandardTreeDto;
//    }
//
//    @Override
//    public Map<String, Object> getWarehouseSubmit(IPage<IfsInventoryQuantity> page, IfsInventoryQuantity ifsInventoryQuantity) {
//        Map<String, Object> map = new HashMap<>();
//        map.put("head", PrintChina.printChina(IfsInventoryQuantity.class));
//        map.put("body", standardTreeMapper.selectIfsPage(page, QueryWrappers.queryWrappers(ifsInventoryQuantity)));
//        return map;
//    }
//
//    @Override
//    public Map<String, Object> getIfsByStateOne(IPage<IfsInventoryQuantityDto> page, IfsInventoryQuantityDto ifsInventoryQuantityDto) {
//        Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("getIfsByStateOne");
//        if (map1.get("look") == 1) {
//            //个人
//            ifsInventoryQuantityDto.setCreateUser(map1.get("userId"));
//        }
//        Map<String, Object> map = new HashMap<>();
////        ifsInventoryQuantityDto.setOrderState(null);
//        map.put("head", PrintChina.printChina(IfsInventoryQuantityDto.class));
//        map.put("body", standardTreeMapper.getIfsByStateOne(page, QueryWrappers.queryWrappers(ifsInventoryQuantityDto)));
//        return map;
//    }
//
//
//    /**
//     * æŠ¥æ£€
//     * @param ids
//     * @return
//     */
//    @Override
//    public int inspectionReport(List<Integer> ids) {
//        Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
//        ifsInventoryQuantityMapper.update(null, Wrappers.<IfsInventoryQuantity>lambdaUpdate()
//                .in(IfsInventoryQuantity::getId, ids)
//                .set(IfsInventoryQuantity::getDeclareUser, userMapper.selectById(userId).getName())
//                .set(IfsInventoryQuantity::getDeclareUserId, userId)
//                .set(IfsInventoryQuantity::getIsInspect, 1)
//                .set(IfsInventoryQuantity::getDeclareDate, LocalDateTime.now())
//        );
//        threadPoolTaskExecutor.execute(() -> {
//            List<IfsInventoryQuantity> quantityList = ifsInventoryQuantityMapper.selectList(Wrappers.<IfsInventoryQuantity>lambdaQuery()
//                    .in(IfsInventoryQuantity::getId, ids));
//            // ä¼ä¸šå¾®ä¿¡é€šçŸ¥
//            String message = "";
//            message += "新增报检通知";
//            for (IfsInventoryQuantity inventoryQuantity : quantityList) {
//                message += "\n批次号: " + inventoryQuantity.getUpdateBatchNo();
//                message += "\n零件描述: " + inventoryQuantity.getPartDesc();
//                message += "\n抵达数量: " + inventoryQuantity.getQtyArrived().stripTrailingZeros().toPlainString() + inventoryQuantity.getBuyUnitMeas();
//
//                // åˆ¤æ–­æœ‰æ²¡æœ‰åˆ°20吨. æˆ–者能否免检
//                int result = notificationRawOrder(inventoryQuantity.getId());
//                switch (result) {
//                    case 1:
//                        message += "\n当前样品已检验过, å¯ä»¥å…æ£€";
//                        break;
//                    case 2:
//                        message += "\n当前样品已超过20吨";
//                        break;
//                }
//                message += "\n";
//            }
//            WxCpUtils.informWebHook(wechatProperty.getExaminingUrl(), message);
//        });
//        return 1;
//    }
//
//    /**
//     * æ’¤é”€æŠ¥æ£€
//     * @param id
//     * @return
//     */
//    @Override
//    public int revokeInspectionReport(Integer id) {
//        return ifsInventoryQuantityMapper.update(null, Wrappers.<IfsInventoryQuantity>lambdaUpdate()
//                .eq(IfsInventoryQuantity::getId, id)
//                .set(IfsInventoryQuantity::getIsInspect, 0)
//        );
//    }
//
//    /**
//     * æ‰“印标签查询
//     * @param ids
//     * @return
//     */
//    @Override
//    public List<IfsInventoryQuantityDto> printLabel(List<Integer> ids) {
//        return ifsInventoryQuantityMapper.printLabel(ids);
//    }
//
//    /**
//     * æŠ¥æ£€
//     * @param ifsInventoryQuantity
//     * @return
//     */
//    @Override
//    public int inspectionReportOne(IfsInventoryQuantity ifsInventoryQuantity) {
//        Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
//        ifsInventoryQuantityMapper.update(null, Wrappers.<IfsInventoryQuantity>lambdaUpdate()
//                .eq(IfsInventoryQuantity::getId, ifsInventoryQuantity.getId())
//                .set(IfsInventoryQuantity::getDeclareUser, userMapper.selectById(userId).getName())
//                .set(IfsInventoryQuantity::getDeclareUserId, userId)
//                .set(IfsInventoryQuantity::getIsInspect, 1)
//                .set(IfsInventoryQuantity::getDeclareDate, LocalDateTime.now())
//                .set(IfsInventoryQuantity::getUpdateBatchNo, ifsInventoryQuantity.getUpdateBatchNo())
//        );
//
//        threadPoolTaskExecutor.execute(() -> {
//            IfsInventoryQuantity inventoryQuantity = ifsInventoryQuantityMapper.selectById(ifsInventoryQuantity.getId());
//            // ä¼ä¸šå¾®ä¿¡é€šçŸ¥
//            String message = "";
//            message += "新增报检通知";
//            message += "\n批次号: " + inventoryQuantity.getUpdateBatchNo();
//            message += "\n零件描述: " + inventoryQuantity.getPartDesc();
//            message += "\n抵达数量: " + inventoryQuantity.getQtyArrived().stripTrailingZeros().toPlainString() + inventoryQuantity.getBuyUnitMeas();
//            WxCpUtils.informWebHook(wechatProperty.getExaminingUrl(), message);
//        });
//        return 1;
//    }
//
//    /**
//     * èŽ·å–铜产业链检测数据
//     * @param id
//     * @return
//     */
//    @Override
//    public String getIndustryChain(Integer id) {
//        return ifsInventoryQuantityMapper.selectById(id).getIndustryChain();
//    }
//
//    /**
//     * åŽŸææ–™æ’¤é”€æŽ¥å£
//     * @param ifsInventoryId
//     * @return
//     */
//    @Override
//    public boolean repealRawOrder(Integer ifsInventoryId) {
//        // æŸ¥è¯¢åˆ¤æ–­æ˜¯å¦æ˜¯é“œå•ä¸
//        IfsInventoryQuantity ifsInventoryQuantity = ifsInventoryQuantityMapper.selectById(ifsInventoryId);
//        if (ifsInventoryQuantity.getIsCopper() != null && ifsInventoryQuantity.getIsCopper().equals(1)) {
//            // é“œå•ä¸ç›´æŽ¥åˆ é™¤å°±è¡Œ
//            ifsInventoryQuantityMapper.deleteById(ifsInventoryId);
//        } else {
//            ifsInventoryQuantityMapper.update(null, new LambdaUpdateWrapper<IfsInventoryQuantity>()
//                    .set(IfsInventoryQuantity::getState, 0)
//                    .set(IfsInventoryQuantity::getIsQuarter, 1)
//                    .eq(IfsInventoryQuantity::getId, ifsInventoryId));
//        }
//
//        insOrderService.update(Wrappers.<InsOrder>lambdaUpdate()
//                .eq(InsOrder::getIfsInventoryId, ifsInventoryId)
//                .set(InsOrder::getState, -1)
//                .set(InsOrder::getEntrustCode, ""));// æ’¤é”€
//        return true;
//    }
//
//    /**
//     * åŽŸææ–™å…æ£€ä¸‹å•
//     * @param list
//     * @param insOrder
//     * @return
//     */
//    @Override
//    @Transactional(rollbackFor = Exception.class)
//    public int addExemptionOrder(List<SampleProductDto> list, InsOrder insOrder) {
//        if (!insOrder.getOrderType().equals(InsOrderTypeConstants.ENTER_THE_FACTORY)) {
//            throw new ErrorException("只有进厂检验才能免检");
//        }
//        insOrder.setSendTime(LocalDateTime.now());
//        // ä¿®æ”¹è®¢å•è¡¨ç›´æŽ¥ä¸ºå·²æ£€éªŒ
//        insOrder.setState(4);
//        insOrder.setTypeSource(1);
//
//        String code = "Y";
//        // ç”Ÿæˆç¼–号
//        String no = numberGenerator.generateNumberWithPrefix(3,
//                "JCZX/ZB-" + code + LimsDateUtil.resetDate(LocalDateTime.now()),
//                InsOrder::getEntrustCode);
//
//        insOrderMapper.insert(insOrder); // ä¸»è¡¨
//
//        AtomicInteger count = new AtomicInteger();
//        list.forEach(a -> {
//            count.getAndIncrement();
//            a.setId(null);
//            a.setInsOrderId(insOrder.getId());
//            if (StrUtil.isEmpty(a.getSampleCode())) {
//                // å¦‚果只有一个样品就不需要拼接数字
//                if (list.size() != 1) {
//                    a.setSampleCode(no + "-" + count.get());
//                } else {
//                    a.setSampleCode(no);
//                }
//            }
//            insSampleMapper.insert(a);
//
//            if (!CollectionUtil.isEmpty(a.getInsProduct())) {
//                throw new ErrorException("免检不需要填写检验项");
//            }
//        });
//
//        // åŽŸææ–™ä¸‹å•: å§”托人就是报检人, ç”Ÿäº§å•ä½å°±æ˜¯ä¾›åº”商单位
//        IfsInventoryQuantity ifsInventoryQuantity = ifsInventoryQuantityMapper.selectById(insOrder.getIfsInventoryId());
//        Integer declareUserId = ifsInventoryQuantity.getDeclareUserId();
//        User user = userMapper.selectById(declareUserId);
//        // ä¾›åº”商名称
//        insOrder.setProduction(ifsInventoryQuantity.getSupplierName());
//        // å§”托人名称
//        insOrder.setPrepareUser(user.getName());
//        insOrder.setPhone(user.getPhone());
//
//        // ä¿®æ”¹åŽŸææ–™æ•°æ®ç›´æŽ¥ä¸ºå·²æ£€éªŒ
//        ifsInventoryQuantityMapper.update(null, new LambdaUpdateWrapper<IfsInventoryQuantity>().set(IfsInventoryQuantity::getState, 2)
//                .eq(IfsInventoryQuantity::getId, insOrder.getIfsInventoryId()));
//
//        insOrder.setExamineTime(LocalDateTime.now());
//
//        insOrder.setEntrustCode(no);
//        insOrder.setIsExemption(1);
//
//        insOrderMapper.updateById(insOrder);
//
//        // æ·»åŠ å·¥æ—¶
//        addAuxiliary(insOrder, ifsInventoryQuantity);
//
//        // todo: ifs直接移库
//        insReportService.isRawMaterial(insOrder);
//
//        return insOrder.getId();
//    }
//
//
//    /**
//     * æŸ¥è¯¢å¾…下单
//     * @param page
//     * @param ifsInventoryQuantity
//     * @return
//     */
//    @Override
//    public Map<String, Object> selectIfsInventoryQuantity(Page<IfsInventoryQuantityCheckDto> page, IfsInventoryQuantityCheckDto ifsInventoryQuantity) {
//        Map<String, Object> map = new HashMap<>();
//        map.put("head", PrintChina.printChina(IfsInventoryQuantityCheckDto.class));
//        map.put("body", standardTreeMapper.selectIfsInventoryQuantity(page, QueryWrappers.queryWrappers(ifsInventoryQuantity)));
//        return map;
//    }
//
//    /**
//     * æŸ¥è¯¢å·²æ£€éªŒ
//     * @param page
//     * @param ifsInventoryQuantityDto
//     * @return
//     */
//    @Override
//    public Map<String, Object> getIfsByOver(Page<IfsInventoryQuantitySupplierDto> page, IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto) {
//        Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("getIfsByStateOne");
//        if (map1.get("look") == 1) {
//            //个人
//            ifsInventoryQuantityDto.setCreateUser(map1.get("userId"));
//        }
//        String beginDeclareDate = ifsInventoryQuantityDto.getBeginDeclareDate();
//        String endDeclareDate = ifsInventoryQuantityDto.getEndDeclareDate();
//        ifsInventoryQuantityDto.setBeginDeclareDate(null);
//        ifsInventoryQuantityDto.setEndDeclareDate(null);
//
//        Map<String, Object> map = new HashMap<>();
//        map.put("head", PrintChina.printChina(IfsInventoryQuantitySupplierDto.class));
//        map.put("body", standardTreeMapper.getIfsByOver(page, QueryWrappers.queryWrappers(ifsInventoryQuantityDto), beginDeclareDate, endDeclareDate));
//        return map;
//    }
//
//    /**
//     * åˆ é™¤åŽŸææ–™æŠ¥æ£€ä¿¡æ¯
//     * @param id
//     * @return
//     */
//    @Override
//    public int delIfsInventory(Integer id) {
//        return ifsInventoryQuantityMapper.deleteById(id);
//    }
//
//    /**
//     * åŽŸææ–™æ”¾è¡Œå…æ£€
//     * @param ifsInventoryId
//     * @return
//     */
//    @Override
//    @Transactional(rollbackFor = Exception.class)
//    public boolean rawOrderRelease(Integer ifsInventoryId, String partDetail) {
//        // ä¿®æ”¹åŽŸææ–™æ•°æ®ç›´æŽ¥ä¸ºå·²æ£€éªŒ
//        ifsInventoryQuantityMapper.update(null, new LambdaUpdateWrapper<IfsInventoryQuantity>()
//                .set(IfsInventoryQuantity::getState, 2)
//                .set(IfsInventoryQuantity::getIsQuarter, 0)
//                .eq(IfsInventoryQuantity::getId, ifsInventoryId));
//
//        // æŸ¥è¯¢åŽŸææ–™ä¿¡æ¯
//        IfsInventoryQuantity ifsInventoryQuantity = ifsInventoryQuantityMapper.selectById(ifsInventoryId);
//        // å§”托人就是报检人, ç”Ÿäº§å•ä½å°±æ˜¯ä¾›åº”商单位
//        Integer declareUserId = ifsInventoryQuantity.getDeclareUserId();
//        User user = userMapper.selectById(declareUserId);
//
//        InsOrder insOrder = new InsOrder();
//        insOrder.setState(4);
//        insOrder.setTypeSource(1);
//        String code = "Y";
//        // ç”Ÿæˆç¼–号
//        String no = numberGenerator.generateNumberWithPrefix(3,
//                "JCZX/ZB-" + code + LimsDateUtil.resetDate(LocalDateTime.now()),
//                InsOrder::getEntrustCode);
//        insOrder.setExamineTime(LocalDateTime.now());
//        insOrder.setEntrustCode(no);
//        insOrder.setIsExemption(1);
//        // ä¾›åº”商名称
//        insOrder.setProduction(ifsInventoryQuantity.getSupplierName());
//        // å§”托人名称
//        insOrder.setPrepareUser(user.getName());
//        insOrder.setPhone(user.getPhone());
//        insOrder.setIfsInventoryId(ifsInventoryId);
//        insOrder.setPartDetail(partDetail);
//        insOrder.setSendTime(LocalDateTime.now());
//        insOrder.setSample(ifsInventoryQuantity.getPartDesc());
//        // è¿›åŽ‚检验
//        insOrder.setOrderType(InsOrderTypeConstants.ENTER_THE_FACTORY);
//
//        insOrderMapper.insert(insOrder);
//
//        // æ·»åŠ å·¥æ—¶
//        addAuxiliary(insOrder, ifsInventoryQuantity);
//
//        // todo: ifs直接移库
//        insReportService.isRawMaterial(insOrder);
//        return true;
//    }
//
//    /**
//     * 0, æ— æç¤º, 1提示  å½“前批次的样品已检验过, å¯ä»¥å…æ£€, 2 æç¤º å½“前批次的样品已超20吨, éœ€è¦å¤šçº§å¤šæ¬¡æ£€éªŒ
//     *
//     * åŽŸææ–™ä¸‹å•é€šçŸ¥å…æ£€æˆ–者多次检验
//     * @param ifsInventoryId
//     * @return
//     */
//    @Override
//    public int notificationRawOrder(Integer ifsInventoryId) {
//        IfsInventoryQuantity ifsInventory = ifsInventoryQuantityMapper.selectById(ifsInventoryId);
//        // æŸ¥è¯¢å½“前批次, ä¾›åº”商, é›¶ä»¶å·çš„原材料是否超过了20吨, è¶…过了20吨需要进行多次检验提醒
//        List<IfsInventoryQuantity> quantityList = ifsInventoryQuantityMapper.selectList(Wrappers.<IfsInventoryQuantity>lambdaQuery()
//                .eq(IfsInventoryQuantity::getPartNo, ifsInventory.getPartNo())
//                .eq(IfsInventoryQuantity::getUpdateBatchNo, ifsInventory.getUpdateBatchNo())
//                .eq(IfsInventoryQuantity::getSupplierId, ifsInventory.getSupplierId())
//                .eq(IfsInventoryQuantity::getSupplierName, ifsInventory.getSupplierName()));
//
//        // åˆ¤æ–­æ˜¯å¦å¤§äºŽ20吨
//        BigDecimal bigDecimal = new BigDecimal("20000");
//        BigDecimal count = BigDecimal.ZERO;
//        for (IfsInventoryQuantity inventoryQuantity : quantityList) {
//            // åˆ¤æ–­å•ä½æ˜¯kg或者t
//            if (inventoryQuantity.getBuyUnitMeas().equalsIgnoreCase("t")) {
//                count = count.add(inventoryQuantity.getQtyArrived().multiply(new BigDecimal("1000")));
//            } else if (inventoryQuantity.getBuyUnitMeas().equalsIgnoreCase("kg")) {
//                count = count.add(inventoryQuantity.getQtyArrived());
//            }
//        }
//
//        if (count.compareTo(bigDecimal) >= 0) {
//            return 2;
//        } else {
//            // åˆ¤æ–­ä¹‹å‰æ˜¯å¦å‡ºè¿‡æŠ¥å‘Š, å‡ºè¿‡æŠ¥å‘Šå¯ä»¥å…æ£€
//            int reportCount = ifsInventoryQuantityMapper.selectReportCountById(ifsInventoryId);
//            if (reportCount > 0) {
//                return 1;
//            }
//        }
//        return 0;
//    }
//
//    /**
//     * æŠ¥æ£€å¯ä»¥æ–°å¢žæŠ¥æ£€ä¿¡æ¯
//     * @param ifsInventoryQuantity
//     */
//    @Override
//    public void addIfsInventoryQuantity(IfsInventoryQuantity ifsInventoryQuantity) {
//        ifsInventoryQuantity.setIsSource(0);
//        ifsInventoryQuantity.setState(0);
//        ifsInventoryQuantity.setIsFinish(0);
//        ifsInventoryQuantityMapper.insert(ifsInventoryQuantity);
//    }
//
//    @Override
//    public void shiftingParking(List<Integer> ids) {
//        for (Integer id : ids) {
//            InsOrder order = insOrderService.getById(id);
//            // todo: ifs直接移库
//            insReportService.isRawMaterial(order);
//        }
//    }
//
//    /**
//     * é“œå•ä¸ä¸‹å•å…æ£€
//     * @param list
//     * @param insOrder
//     */
//    @Override
//    @Transactional(rollbackFor = Exception.class)
//    public int addRawCopperOrderExemptionOrder(List<SampleProductDto> list, CopperInsOrderDto insOrder) {
//        if (!insOrder.getOrderType().equals(InsOrderTypeConstants.ENTER_THE_FACTORY)) {
//            throw new ErrorException("只有进厂检验才能免检");
//        }
//        insOrder.setSendTime(LocalDateTime.now());
//        // ä¿®æ”¹è®¢å•è¡¨ç›´æŽ¥ä¸ºå·²æ£€éªŒ
//        insOrder.setState(4);
//        insOrder.setTypeSource(1);
//
//        String code = "Y";
//        // ç”Ÿæˆç¼–号
//        String no = numberGenerator.generateNumberWithPrefix(3,
//                "JCZX/ZB-" + code + LimsDateUtil.resetDate(LocalDateTime.now()),
//                InsOrder::getEntrustCode);
//
//        insOrderMapper.insert(insOrder); // ä¸»è¡¨
//
//        AtomicInteger count = new AtomicInteger();
//        list.forEach(a -> {
//            count.getAndIncrement();
//            a.setId(null);
//            a.setInsOrderId(insOrder.getId());
//            if (StrUtil.isEmpty(a.getSampleCode())) {
//                // å¦‚果只有一个样品就不需要拼接数字
//                if (list.size() != 1) {
//                    a.setSampleCode(no + "-" + count.get());
//                } else {
//                    a.setSampleCode(no);
//                }
//            }
//            insSampleMapper.insert(a);
//
//            if (!CollectionUtil.isEmpty(a.getInsProduct())) {
//                throw new ErrorException("免检不需要填写检验项");
//            }
//        });
//        // æ·»åŠ åŽŸææ–™ä¿¡æ¯
//        IfsInventoryQuantity ifsInventoryQuantity = new IfsInventoryQuantity();
//        // åŸºæœ¬ä¿¡æ¯
//        ifsInventoryQuantity.setIsSource(0);
//        ifsInventoryQuantity.setState(2);
//        ifsInventoryQuantity.setIsInspect(1);
//        ifsInventoryQuantity.setIsFinish(1);
//        ifsInventoryQuantity.setIsCopper(1);
//        ifsInventoryQuantity.setInspectStatus(1);
//        ifsInventoryQuantity.setIsQuarter(0);
//
//        ifsInventoryQuantity.setQtyArrived(insOrder.getQtyArrived());
//        ifsInventoryQuantity.setBuyUnitMeas(insOrder.getBuyUnitMeas());
//        ifsInventoryQuantity.setSupplierName(insOrder.getSupplierName());
//        ifsInventoryQuantity.setUpdateBatchNo(insOrder.getUpdateBatchNo());
//        ifsInventoryQuantity.setDeclareDate(insOrder.getDeclareDate());
//
//        ifsInventoryQuantityMapper.insert(ifsInventoryQuantity);
//
//        insOrder.setIfsInventoryId(ifsInventoryQuantity.getId());
//        insOrder.setExamineTime(LocalDateTime.now());
//
//        insOrder.setEntrustCode(no);
//        insOrder.setIsExemption(1);
//
//        insOrderMapper.updateById(insOrder);
//
//        // æ·»åŠ å·¥æ—¶
//        addAuxiliary(insOrder, ifsInventoryQuantity);
//
//        return insOrder.getId();
//    }
//
//    @Override
//    @Transactional(rollbackFor = Exception.class)
//    public boolean concessionRelease(Integer ifsInventoryId) {
//        // æŸ¥è¯¢åŽŸææ–™ä¿¡æ¯
//        IfsInventoryQuantity ifsInventoryQuantity = ifsInventoryQuantityMapper.selectById(ifsInventoryId);
//        if (!ifsInventoryQuantity.getInspectStatus().equals(2)) {
//            throw new ErrorException("不合格的原材料才能让步放行");
//        }
//
//        // todo:需要判断oa流程是否是让步放行
//        String toLocation = insReportService.moveRawMaterial(ifsInventoryQuantity);
//
//        ifsInventoryQuantityMapper.update(null, new LambdaUpdateWrapper<IfsInventoryQuantity>()
//                .set(IfsInventoryQuantity::getInspectStatus, 4)
//                .set(IfsInventoryQuantity::getToLocation, toLocation)
//                .eq(IfsInventoryQuantity::getId, ifsInventoryId));
//
//        return true;
//    }
//
//    /**
//     * åŽŸææ–™è¿›åŽ‚撤销下单
//     * @param enterOrderId
//     * @return
//     */
//    @Override
//    @Transactional(rollbackFor = Exception.class)
//    public boolean repealEnterRawOrder(Integer enterOrderId) {
//        // æŸ¥è¯¢è®¢å•
//        InsOrder order = insOrderMapper.selectById(enterOrderId);
//
//        // æŸ¥è¯¢åˆ¤æ–­æ˜¯å¦æ˜¯é“œå•ä¸
//        IfsInventoryQuantity ifsInventoryQuantity = ifsInventoryQuantityMapper.selectById(order.getIfsInventoryId());
//        if (ifsInventoryQuantity.getIsCopper() != null && ifsInventoryQuantity.getIsCopper().equals(1)) {
//            // é“œå•ä¸ç›´æŽ¥åˆ é™¤å°±è¡Œ
//            ifsInventoryQuantityMapper.deleteById(order.getIfsInventoryId());
//        } else {
//            ifsInventoryQuantityMapper.update(null, new LambdaUpdateWrapper<IfsInventoryQuantity>()
//                    .set(IfsInventoryQuantity::getState, 0)
//                    .set(IfsInventoryQuantity::getIsQuarter, 1)
//                    .eq(IfsInventoryQuantity::getId, order.getIfsInventoryId()));
//        }
//        insOrderService.update(Wrappers.<InsOrder>lambdaUpdate()
//                .eq(InsOrder::getId, enterOrderId)
//                .set(InsOrder::getState, -1)
//                .set(InsOrder::getEntrustCode, ""));// æ’¤é”€
//
//        // æ¸…除之前的工时
//        auxiliaryOutputWorkingHoursMapper.delete(Wrappers.<AuxiliaryOutputWorkingHours>lambdaQuery()
//                .eq(AuxiliaryOutputWorkingHours::getOrderId, enterOrderId));
//
//        // æ¸…除之前报告
//        insReportService.remove(Wrappers.<InsReport>lambdaQuery()
//                .eq(InsReport::getInsOrderId, enterOrderId));
//
//        return true;
//    }
//
//    /**
//     * åŽŸææ–™å­£åº¦æ’¤é”€ä¸‹å•
//     * @param quarterOrderId
//     * @return
//     */
//    @Override
//    @Transactional(rollbackFor = Exception.class)
//    public boolean repealQuarterRawOrder(Integer quarterOrderId) {
//        // æŸ¥è¯¢è®¢å•
//        InsOrder order = insOrderMapper.selectById(quarterOrderId);
//
//        Long count = insOrderMapper.selectCount(Wrappers.<InsOrder>lambdaQuery()
//                .eq(InsOrder::getIfsInventoryId, order.getIfsInventoryId())
//                .ne(InsOrder::getState, -1)
//                .eq(InsOrder::getOrderType, InsOrderTypeConstants.ENTER_THE_FACTORY)
//                .ne(InsOrder::getId, order.getId()));
//        // åˆ¤æ–­ä¹‹å‰æ˜¯å¦æœ‰è¿›åŽ‚检验, æ²¡æœ‰éœ€è¦ä¿®æ”¹åŽŸææ–™ä¿¡æ¯
//        if (count == 0) {
//            ifsInventoryQuantityMapper.update(null, new LambdaUpdateWrapper<IfsInventoryQuantity>()
//                    .set(IfsInventoryQuantity::getState, 0)
//                    .set(IfsInventoryQuantity::getIsQuarter, 1)
//                    .eq(IfsInventoryQuantity::getId, order.getIfsInventoryId()));
//        } else {
//            ifsInventoryQuantityMapper.update(null, new LambdaUpdateWrapper<IfsInventoryQuantity>()
//                    .set(IfsInventoryQuantity::getIsQuarter, 1)
//                    .eq(IfsInventoryQuantity::getId, order.getIfsInventoryId()));
//        }
//
//        insOrderService.update(Wrappers.<InsOrder>lambdaUpdate()
//                .eq(InsOrder::getId, quarterOrderId)
//                .set(InsOrder::getState, -1)
//                .set(InsOrder::getEntrustCode, ""));// æ’¤é”€
//        auxiliaryOutputWorkingHoursMapper.delete(Wrappers.<AuxiliaryOutputWorkingHours>lambdaQuery()
//                .eq(AuxiliaryOutputWorkingHours::getOrderId, quarterOrderId));
//        // æ¸…除之前报告
//        insReportService.remove(Wrappers.<InsReport>lambdaQuery()
//                .eq(InsReport::getInsOrderId, quarterOrderId));
//        return true;
//    }
//
//    /**
//     * åŽŸææ–™æŠ¥æ£€å…¨éƒ¨ä¿¡æ¯å¯¼å‡º
//     * @param ifsInventoryQuantityDto
//     * @param response
//     */
//    @Override
//    public void rawAllExport(IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto, HttpServletResponse response) throws UnsupportedEncodingException {
//        //查询导出的费用统计数据
//        String beginDeclareDate = ifsInventoryQuantityDto.getBeginDeclareDate();
//        String endDeclareDate = ifsInventoryQuantityDto.getEndDeclareDate();
//        ifsInventoryQuantityDto.setBeginDeclareDate(null);
//        ifsInventoryQuantityDto.setEndDeclareDate(null);
//        List<IfsInventoryQuantitySupplierDto> ifsByOverList = standardTreeMapper.getIfsByOverList(QueryWrappers.queryWrappers(ifsInventoryQuantityDto), beginDeclareDate, endDeclareDate);
//
//        for (IfsInventoryQuantitySupplierDto dto : ifsByOverList) {
//            dto.setSendTimeString(dto.getSendTime() == null ? "" : dto.getSendTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
//            dto.setReceiverDateString(dto.getReceiverDate() == null ? "" : dto.getReceiverDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
//            dto.setDeclareDateString(dto.getDeclareDate() == null ? "" : dto.getDeclareDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
//            switch (dto.getInspectStatus()) {
//                case 1:
//                    dto.setInspectStatusString("合格");
//                    break;
//                case 2:
//                    dto.setInspectStatusString("不合格");
//                    // æŸ¥è¯¢ä¸åˆæ ¼é¡¹
//                    List<String> unqualifiedList = insProductMapper.selectUnqualifiedList(dto.getEnterOrderId() == null ? dto.getQuarterOrderId() : dto.getEnterOrderId());
//                    dto.setUnqualifiedItem(CollUtil.join(unqualifiedList, ","));
//                    break;
//                case 3:
//                    dto.setInspectStatusString("未下单");
//                    break;
//                case 4:
//                    dto.setInspectStatusString("让步放行");
//                    break;
//                case 0:
//                    dto.setInspectStatusString("检验中");
//                    break;
//
//            }
//        }
//
//
//        response.setContentType("application/vnd.ms-excel");
//        response.setCharacterEncoding("UTF-8");
//        // è¿™é‡ŒURLEncoder.encode可以防止中文乱码 å½“然和easyexcel没有关系
//        String fileName = URLEncoder.encode("原材料检测信息导出", "UTF-8");
//        response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
//        try {
//            //新建ExcelWriter
//            ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()).registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()).build();
//            //获取sheet0对象
//            WriteSheet mainSheet = EasyExcel.writerSheet(0, "原材料检测信息导出").head(IfsInventoryQuantitySupplierDto.class).build();
//
//            //向sheet0写入数据 ä¼ å…¥ç©ºlist这样只导出表头
//            excelWriter.write(ifsByOverList, mainSheet);
//            //关闭流
//            excelWriter.finish();
//        } catch (IOException e) {
//            throw new RuntimeException("导出失败");
//        }
//    }
//
//    /**
//     * åŽŸææ–™æŸ¥è¯¢å¯ä»¥å­£åº¦æ£€éªŒçš„内容
//     * @param page
//     * @param ifsInventoryQuantityDto
//     * @return
//     */
//    @Override
//    public Map<String, Object> getIfsByQuarter(Page page, IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto) {
//        Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("getIfsByStateOne");
//        if (map1.get("look") == 1) {
//            //个人
//            ifsInventoryQuantityDto.setCreateUser(map1.get("userId"));
//        }
//        String beginDeclareDate = ifsInventoryQuantityDto.getBeginDeclareDate();
//        String endDeclareDate = ifsInventoryQuantityDto.getEndDeclareDate();
//        ifsInventoryQuantityDto.setBeginDeclareDate(null);
//        ifsInventoryQuantityDto.setEndDeclareDate(null);
//
//        Map<String, Object> map = new HashMap<>();
//        map.put("head", PrintChina.printChina(IfsInventoryQuantitySupplierDto.class));
//        map.put("body", standardTreeMapper.getIfsByQuarter(page, QueryWrappers.queryWrappers(ifsInventoryQuantityDto), beginDeclareDate, endDeclareDate));
//        return map;
//    }
//
//    /**
//     * æå‰å…¥åº“
//     * @param ifsInventoryId
//     * @return
//     */
//    @Override
//    public boolean advancedGodown(Integer ifsInventoryId) {
//        // æŸ¥è¯¢åŽŸææ–™ä¿¡æ¯
//        IfsInventoryQuantity ifsInventoryQuantity = ifsInventoryQuantityMapper.selectById(ifsInventoryId);
//        if (!ifsInventoryQuantity.getInspectStatus().equals(0)
//                && !ifsInventoryQuantity.getInspectStatus().equals(3)) {
//            throw new ErrorException("未检测完成数据才能提前入库");
//        }
//
//        // todo:需要判断oa流程是否是让步放行
//        String toLocation = insReportService.moveRawMaterial(ifsInventoryQuantity);
//
//        ifsInventoryQuantityMapper.update(null, new LambdaUpdateWrapper<IfsInventoryQuantity>()
//                .set(IfsInventoryQuantity::getInspectStatus, 1)
//                .set(IfsInventoryQuantity::getIsFinish, 1)
//                .set(IfsInventoryQuantity::getToLocation, toLocation)
//                .eq(IfsInventoryQuantity::getId, ifsInventoryId));
//
//        return true;
//    }
//
//
//    /**
//     * æ·»åŠ å·¥æ—¶
//     * @param insOrder
//     * @param ifsInventoryQuantity
//     */
//    private void addAuxiliary(InsOrder insOrder, IfsInventoryQuantity ifsInventoryQuantity) {
//        AuxiliaryOutputWorkingHours auxiliaryOutputWorkingHours = new AuxiliaryOutputWorkingHours();
//        auxiliaryOutputWorkingHours.setInspectionItemClass(ifsInventoryQuantity.getUpdateBatchNo() + "免检");//检测项分类
//        auxiliaryOutputWorkingHours.setSample(insOrder.getEntrustCode());//样品编号
//        auxiliaryOutputWorkingHours.setOrderId(insOrder.getId());//订单id
//        auxiliaryOutputWorkingHours.setOrderNo(insOrder.getEntrustCode());//非加班委托单号
//
//        // å…æ£€é»˜è®¤2
//        auxiliaryOutputWorkingHours.setWorkTime(new BigDecimal("2"));//非加班工时
//        auxiliaryOutputWorkingHours.setAmount(1);//非加班数量
//        auxiliaryOutputWorkingHours.setOutputWorkTime((ObjectUtils.isNotEmpty(auxiliaryOutputWorkingHours.getOvertimeWorkTime()) ? auxiliaryOutputWorkingHours.getOvertimeWorkTime() : BigDecimal.ZERO).add(ObjectUtils.isNotEmpty(auxiliaryOutputWorkingHours.getWorkTime()) ? auxiliaryOutputWorkingHours.getWorkTime() : BigDecimal.ZERO));//产量工时
//        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
//        DateTimeFormatter formatters = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
//        auxiliaryOutputWorkingHours.setDateTime(LocalDateTime.now().toLocalDate().atStartOfDay().format(formatters));//日期
//        LocalDateTime localDateTime = LocalDateTime.now();
//        DateTime parse = DateUtil.parse(localDateTime.format(formatter));
//        auxiliaryOutputWorkingHours.setWeekDay(getWeek(localDateTime.format(formatters)));//星期
//        auxiliaryOutputWorkingHours.setWeek(String.valueOf(DateUtil.weekOfYear(DateUtil.offsetDay(parse, 1))));//周次
//        auxiliaryOutputWorkingHours.setCheck(getLook.selectPowerByMethodAndUserId(null).get("userId"));//检测人
//        auxiliaryOutputWorkingHours.setPrice(new BigDecimal("1"));//单价
//
//        auxiliaryOutputWorkingHoursMapper.insert(auxiliaryOutputWorkingHours);
//    }
//
//    public static String getWeek(String dayStr) {
//        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
//        try {
//            Date date = sdf.parse(dayStr);
//            Calendar calendar = Calendar.getInstance();
//            calendar.setTime(date);
//            int dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK);
//            int day = calendar.get(Calendar.DAY_OF_MONTH);
//            return getWeekDay(dayOfWeek);
//        } catch (Exception e) {
//            e.printStackTrace();
//        }
//        return null;
//    }
//
//    public static String getWeekDay(int dayOfWeek) {
//        switch (dayOfWeek) {
//            case Calendar.MONDAY:
//                return "周一";
//            case Calendar.TUESDAY:
//                return "周二";
//            case Calendar.WEDNESDAY:
//                return "周三";
//            case Calendar.THURSDAY:
//                return "周四";
//            case Calendar.FRIDAY:
//                return "周五";
//            case Calendar.SATURDAY:
//                return "周六";
//            case Calendar.SUNDAY:
//                return "周日";
//            default:
//                return "未知";
//        }
//    }
//}

 inspect-server/src/main/java/com/ruoyi/basic/service/impl/RawMaterialOrderTemplateServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,68 @@
//package com.ruoyi.basic.service.impl;
//
//import com.baomidou.mybatisplus.core.toolkit.StringUtils;
//import com.baomidou.mybatisplus.core.toolkit.Wrappers;
//import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
//import com.ruoyi.basic.service.RawMaterialOrderTemplateService;
//import lombok.AllArgsConstructor;
//import org.springframework.stereotype.Service;
//
//import java.util.List;
//
///**
// * åŽŸææ–™ä¸‹å•æ¨¡æ¿
// *
// * @author zhuo
// * @since 2024-08-05
// */
//@Service
//@AllArgsConstructor
//public class RawMaterialOrderTemplateServiceImpl extends ServiceImpl<RawMaterialOrderTemplateMapper, RawMaterialOrderTemplate> implements RawMaterialOrderTemplateService {
//
//
//    /**
//     * æ·»åŠ åŽŸææ–™æ£€éªŒå•æ¨¡æ¿
//     * @param rawMaterialOrderTemplate
//     * @return
//     */
//    @Override
//    public int addRawMaterOrderTemplate(RawMaterialOrderTemplate rawMaterialOrderTemplate) {
//        if (StringUtils.isBlank(rawMaterialOrderTemplate.getPartNo())) {
//            throw new RuntimeException("缺少零件号");
//        }
//        return baseMapper.insert(rawMaterialOrderTemplate);
//    }
//
//    /**
//     * æŸ¥è¯¢åŽŸææ–™æ£€éªŒå•æ¨¡æ¿åˆ—表
//     * @param partNo
//     * @return
//     */
//    @Override
//    public List<RawMaterialOrderTemplate> selectRawMaterOrderTemplate(String partNo) {
//        return baseMapper.selectList(Wrappers.<RawMaterialOrderTemplate>lambdaQuery()
//                .eq(RawMaterialOrderTemplate::getPartNo, partNo));
//    }
//
//    /**
//     * é€šè¿‡åŽŸææ–™æ£€éªŒå•æ¨¡æ¿id获取检验单模板内容
//     * @param id
//     * @return
//     */
//    @Override
//    public String selectRawMaterOrderTemplateById(Integer id) {
//        return baseMapper.selectById(id).getThing();
//    }
//
//    /**
//     * åˆ é™¤åŽŸææ–™æ£€éªŒå•æ¨¡æ¿
//     * @param id
//     * @return
//     */
//    @Override
//    public int delRawMaterOrderTemplate(Integer id) {
//        return baseMapper.deleteById(id);
//    }
//
//}
//

 inspect-server/src/main/resources/lib/aspose-words-15.12.0-jdk16.jar

Binary files differ

 inspect-server/src/main/resources/lib/license.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
<License>
    <Data>
        <Products>
            <Product>Aspose.Total for Java</Product>
            <Product>Aspose.Words for Java</Product>
        </Products>
        <EditionType>Enterprise</EditionType>
        <SubscriptionExpiry>20991231</SubscriptionExpiry>
        <LicenseExpiry>20991231</LicenseExpiry>
        <SerialNumber>8bfe198c-7f0c-4ef8-8ff0-acc3237bf0d7</SerialNumber>
    </Data>
    <Signature>sNLLKGMUdF0r8O1kKilWAGdgfs2BvJb/2Xp8p5iuDVfZXmhppo+d0Ran1P9TKdjV4ABwAgKXxJ3jcQTqE/2IRfqwnPf8itN8aFZlV3TJPYeD3yWE7IT55Gz6EijUpC7aKeoohTb4w2fpox58wWoF3SNp6sK6jDfiAUGEHYJ9pjU=</Signature>
</License>

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/CustomController.java

@@ -34,7 +34,7 @@
        return Result.success(customService.selectCustomPageList(page, custom));
    }
    @ApiOperation(value = "删除客户信息")
    @PostMapping("/delCustomById")
    @DeleteMapping("/delCustomById")
    public Result delCustomById(Long id) {
        return Result.success(customService.delCustomById(id));
    }