订单下单调整

zhuo

2025-02-19 48ba72a6a0492254a5c4ef1c5ec96a38440a765b

订单下单调整

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

@@ -19,7 +19,7 @@

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


 basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java

@@ -12,6 +12,7 @@
import org.apache.ibatis.annotations.Param;

import java.util.List;
import java.util.Set;

/**
 * @author Administrator
@@ -85,6 +86,12 @@
     */
    IPage<IfsInventoryQuantitySupplierDto> getIfsByQuarter(Page<IfsInventoryQuantitySupplierDto> page, @Param("ew") QueryWrapper<IfsInventoryQuantitySupplierDto> ew, @Param("beginDeclareDate") String beginDeclareDate, @Param("endDeclareDate")String endDeclareDate);

    /**
     * æ‰¹é‡æŸ¥è¯¢æ ‘
     * @param sampleTypeValues
     * @return
     */
    List<SampleDto> getStandardTree3Batch(@Param("sampleTypeValues") Set<String> sampleTypeValues);
}



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

@@ -432,30 +432,21 @@
                        .like(StandardProductList::getTree, tree));
            }

            boolean success = false;
            int retryCount = 0;
            while (!success && retryCount < 100) {
                try {
                    standardProductListService2.saveBatch(list.stream().map(a -> {
                        a.setFactory(trees[0]);
                        a.setLaboratory(trees[1]);
                        a.setSampleType(trees[2]);
                        a.setCreateUser(userId);
                        a.setUpdateUser(userId);
                        a.setStandardMethodListId(id);
                        return a;
                    }).collect(Collectors.toList()));
                    ;
                    success = true;
                } catch (Exception e) {
                    // å¤„理重复 ID çš„记录，重新生成 ID å¹¶ç»§ç»­å°è¯•æ’å…¥
                    for (StandardProductList productList : list) {
                        productList.setId(IdWorker.getId());
                    }
            try {
                standardProductListService2.saveBatch(list.stream().map(a -> {
                    a.setFactory(trees[0]);
                    a.setLaboratory(trees[1]);
                    a.setSampleType(trees[2]);
                    a.setCreateUser(userId);
                    a.setUpdateUser(userId);
                    a.setStandardMethodListId(id);
                    return a;
                }).collect(Collectors.toList()));
            } catch (Exception e) {
                // å¤„理重复 ID çš„记录，重新生成 ID å¹¶ç»§ç»­å°è¯•æ’å…¥
                for (StandardProductList productList : list) {
                    productList.setId(IdWorker.getId());
                }
            }
            if (!success) {
                throw new RuntimeException("插入失败");
            }

        }

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

@@ -10,6 +10,7 @@
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.dto.SampleDto;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.basic.dto.FactoryDto;
import com.ruoyi.basic.dto.LaboratoryDto;
@@ -29,10 +30,9 @@

import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;

/**
 * @author Administrator
@@ -61,20 +61,33 @@
    @Override
    public List<FactoryDto> selectStandardTreeList() {
        List<FactoryDto> factoryDtos = standardTreeMapper.selectStandardTreeList();
        // æ”¶é›†æ‰€æœ‰ sampleTypeDto çš„ value
        Set<String> sampleTypeValues = new HashSet<>();
        for (FactoryDto factoryDto : factoryDtos) {
            for (LaboratoryDto laboratoryDto : factoryDto.getChildren()) {
                laboratoryDto.getChildren().sort((o1, o2) -> (o1.getSort() == null ? 0 : o1.getSort())
                        - (o2.getSort() == null ? 0 : o2.getSort()));
                for (SampleTypeDto sampleTypeDto : laboratoryDto.getChildren()) {
//                    if (sampleTypeDto.getChildren().size() == 0) {
                        sampleTypeDto.getChildren().addAll(standardTreeMapper.getStandardTree3(sampleTypeDto.getValue()));
//                    }
                    sampleTypeValues.add(sampleTypeDto.getValue());
                }
            }
        }
        // æ‰¹é‡æŸ¥è¯¢æ‰€æœ‰ sampleTypeDto çš„数据
        List<SampleDto> standardList = standardTreeMapper.getStandardTree3Batch(sampleTypeValues);
        Map<String, List<SampleDto>> standardTreeMap = standardList.stream().collect(Collectors.groupingBy(SampleDto::getValue));
        // å°†æŸ¥è¯¢ç»“果分配到对应的 sampleTypeDto
        for (FactoryDto factoryDto : factoryDtos) {
            for (LaboratoryDto laboratoryDto : factoryDto.getChildren()) {
                for (SampleTypeDto sampleTypeDto : laboratoryDto.getChildren()) {
                    List<SampleDto> standardTreeList = standardTreeMap.get(sampleTypeDto.getValue());
                    if (standardTreeList != null) {
                        sampleTypeDto.getChildren().addAll(standardTreeList);
                    }
                }
            }
        }
        return factoryDtos;
    }



    @Override
@@ -109,18 +122,6 @@
                    standardTreeMapper.delete(Wrappers.<StandardTree>lambdaUpdate().eq(StandardTree::getFactory, trees[0]).eq(StandardTree::getLaboratory, trees[1]).eq(StandardTree::getSampleType, trees[2]).eq(StandardTree::getSample, trees[3]).eq(StandardTree::getModel, trees[4]));
                }
                break;
            /*case 4:
                standardTreeMapper.delete(Wrappers.<StandardTree>lambdaUpdate().eq(StandardTree::getFactory, trees[0]).eq(StandardTree::getLaboratory, trees[1]).eq(StandardTree::getSampleType, trees[2]).eq(StandardTree::getSample, trees[3]));
                break;
            case 3:
                standardTreeMapper.delete(Wrappers.<StandardTree>lambdaUpdate().eq(StandardTree::getFactory, trees[0]).eq(StandardTree::getLaboratory, trees[1]).eq(StandardTree::getSampleType, trees[2]));
                break;
            case 2:
                standardTreeMapper.delete(Wrappers.<StandardTree>lambdaUpdate().eq(StandardTree::getFactory, trees[0]).eq(StandardTree::getLaboratory, trees[1]));
                break;
            case 1:
                standardTreeMapper.delete(Wrappers.<StandardTree>lambdaUpdate().eq(StandardTree::getFactory, trees[0]));
                break;*/
        }
        return 1;
    }

 basic-server/src/main/resources/mapper/StandardTreeMapper.xml

@@ -212,14 +212,6 @@
            and st.sample = p.name
    </select>

    <select id="getStandardTree3" resultType="com.ruoyi.basic.dto.SampleDto">
        select model label,
               model value
        from standard_tree
        where sample_type = #{sampleType}
          and sample is null
    </select>

    <select id="getLaboratory" resultType="java.lang.String">
        select l.laboratory_name
        from structure_test_object sto
@@ -381,4 +373,15 @@
            ${ew.customSqlSegment}
        </if>
    </select>

    <select id="getStandardTree3Batch" resultType="com.ruoyi.basic.dto.SampleDto">
        select model label,
               model value
        from standard_tree
        where sample_type in
        <foreach item="item" collection="sampleTypeValues" open="(" separator="," close=")">
            #{item}
        </foreach>
          and sample is null
    </select>
</mapper>

 inspect-server/pom.xml

@@ -49,7 +49,6 @@
        </dependency>

        <!--word转pdf-->
        <!--D:\JavaWork\center-lims-after\inspect-server\src\main\resources\lib-->
        <!--mvn install:install-file -Dfile=aspose-words-15.12.0-jdk16.jar -DgroupId=com.aspose -DartifactId=aspose-words -Dversion=15.12.0 -Dpackaging=jar-->
        <dependency>
            <groupId>com.aspose</groupId>
@@ -62,7 +61,7 @@
            <version>5.0.6</version>
        </dependency>

        

    </dependencies>

    <properties>

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

@@ -75,16 +75,10 @@
        return Result.success(insOrderService.upInsOrder(orderId, sampleId, appointed, userId,sonLaboratory));
    }

    //todo: ä¸‹å•éœ€è¦ä¿®æ”¹
    @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));
    public Result<?> addInsOrder(@RequestBody InsPlaceOrderDto insPlaceOrderDto) {
        return Result.success(insOrderService.addInsOrder(insPlaceOrderDto.getSampleList(), insPlaceOrderDto.getInsOrder()));
    }

    @ApiOperation(value = "查询订单最长预计时间")
@@ -236,19 +230,6 @@
        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) {
@@ -263,7 +244,7 @@
    }

    @ApiOperation(value = "删除退回订单")
    @GetMapping("/delInsOrder")
    @DeleteMapping("/delInsOrder")
    public Result<?> delInsOrder(Integer insOrderId) {
        // æŸ¥è¯¢è®¢å•
        InsOrder order = insOrderService.getById(insOrderId);

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

@@ -5,9 +5,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.dto.*;
import com.ruoyi.basic.pojo.IfsInventoryQuantity;
import com.ruoyi.inspect.dto.InsPlaceOrderDto;
import com.ruoyi.inspect.dto.SampleProductDto;
import com.ruoyi.inspect.pojo.InsOrder;
import com.ruoyi.inspect.pojo.RawMaterialOrderTemplate;
import com.ruoyi.inspect.service.InsOrderService;
import com.ruoyi.inspect.service.RawMaterialOrderService;
import com.ruoyi.inspect.service.RawMaterialOrderTemplateService;
import com.ruoyi.common.core.domain.Result;
@@ -34,6 +36,7 @@
@Api(tags = "原材料下单")
public class RawMaterialOrderController {

    private InsOrderService insOrderService;
    private RawMaterialOrderService rawMaterialOrderService;
    private RawMaterialOrderTemplateService rawMaterialOrderTemplateService;

@@ -99,7 +102,7 @@

    /**
     * å–消报检
     * @param param åŽŸææ–™ä¸‹å•
     * @param param
     * @return
     */
    @ApiOperation(value = "撤销报检")
@@ -159,12 +162,8 @@

    @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));
    public Result<?> addExemptionOrder(@RequestBody InsPlaceOrderDto insPlaceOrderDto) {
        return Result.success(rawMaterialOrderService.addExemptionOrder(insPlaceOrderDto.getSampleList(), insPlaceOrderDto.getInsOrder()));
    }


@@ -176,7 +175,7 @@

    /**
     * å–消报检
     * @param id åŽŸææ–™ä¸‹å•
     * @param id
     * @return
     */
    @ApiOperation(value = "删除原材料报检信息")
@@ -238,14 +237,18 @@
        return Result.success();
    }



    @ApiOperation(value = "铜单丝下单")
    @PostMapping("/addRawCopperOrder")
    public Result<?> addRawCopperOrder(@RequestBody InsPlaceOrderDto insPlaceOrderDto) {
        return Result.success(insOrderService.addRawCopperOrder(insPlaceOrderDto.getSampleList(), insPlaceOrderDto.getCopperInsOrder()));
    }

    @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));
    public Result<?> addRawCopperOrderExemptionOrder(@RequestBody InsPlaceOrderDto insPlaceOrderDto) {
        return Result.success(rawMaterialOrderService.addRawCopperOrderExemptionOrder(insPlaceOrderDto.getSampleList(), insPlaceOrderDto.getCopperInsOrder()));
    }

    /**

 inspect-server/src/main/java/com/ruoyi/inspect/dto/InsPlaceOrderDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,27 @@
package com.ruoyi.inspect.dto;

import com.ruoyi.inspect.pojo.InsOrder;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * ä¸‹å•å¯¹è±¡
 *
 * @Author zhuo
 * @Date 2025/2/19
 */
@Data
public class InsPlaceOrderDto{

    @ApiModelProperty("样品")
    private List<SampleProductDto> sampleList;

    @ApiModelProperty("订单信息")
    private InsOrder insOrder;

    @ApiModelProperty("铜单丝订单")
    private CopperInsOrderDto copperInsOrder;

}

 inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsSampleUser.java

@@ -24,7 +24,7 @@
    private Integer id;

    /**
     * å¤–键：检验样品ins_sample表id
     * å¤–键：是订单insOrder表id (????)
     */
    private Integer insSampleId;


 inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java

@@ -29,7 +29,7 @@
    //修改检验下单数据
    int upInsOrder(Integer orderId,Integer sampleId, String appointed, Integer userId,String sonLaboratory);

    int addInsOrder(List<SampleProductDto> list, InsOrder insOrder, List<List<Integer>> pairing);
    int addInsOrder(List<SampleProductDto> list, InsOrder insOrder);

    Map<String, Object> getInsOrder(Integer id);


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

@@ -149,7 +149,7 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public int addInsOrder(List<SampleProductDto> list, InsOrder insOrder, List<List<Integer>> pairing) {
    public int addInsOrder(List<SampleProductDto> list, InsOrder insOrder) {
        // todo: ä¸‹å•åˆ¤æ–­æŠ½æ ·è®¡åˆ’的唯一性
        if (insOrder.getQuarterItemId() != null) {
            Long quarterItemCount = insOrderMapper.selectCount(Wrappers.<InsOrder>lambdaQuery()
@@ -159,7 +159,6 @@
                throw new ErrorException("该抽样计划已被绑定过");
            }
        }

        insOrder.setState(0);

        LocalDate appointed = insOrder.getAppointed();

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

@@ -57,6 +57,7 @@
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;

/**
 * @Author zhuo
@@ -90,11 +91,26 @@
            throw new ErrorException("零件号为" + partNo + "的原材料没有对应的标准库配置");
        }
        RawMaterialStandardTreeDto rawMaterialStandardTreeDto = new RawMaterialStandardTreeDto();
        Set<String> sampleTypeValues = new HashSet<>();
        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()));
                        sampleTypeValues.add(sampleTypeDto.getValue());
                    }
                }
            }
        }
        // æ‰¹é‡æŸ¥è¯¢æ‰€æœ‰ sampleTypeDto çš„数据
        List<SampleDto> standardList = standardTreeMapper.getStandardTree3Batch(sampleTypeValues);
        Map<String, List<SampleDto>> standardTreeMap = standardList.stream().collect(Collectors.groupingBy(SampleDto::getValue));

        for (FactoryDto factoryDto : factoryDtos) {
            for (LaboratoryDto laboratoryDto : factoryDto.getChildren()) {
                for (SampleTypeDto sampleTypeDto : laboratoryDto.getChildren()) {
                    List<SampleDto> standardTreeList = standardTreeMap.get(sampleTypeDto.getValue());
                    if (sampleTypeDto.getChildren().size() == 0) {
                        sampleTypeDto.getChildren().addAll(standardTreeList);
                    }
                    // åˆ¤æ–­ç»‘定的是否是当前零件号
                    if (sampleTypeDto.getPartNo() != null && sampleTypeDto.getPartNo().equals(partNo)) {
@@ -491,6 +507,8 @@
    }




    /**
     * é“œå•ä¸ä¸‹å•å…æ£€
     * @param list

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

@@ -37,5 +37,15 @@
        return Result.success(userService.selectUserCondition(user, type));
    }

    /**
     * èŽ·å–当前登录的客户信息
     * @return
     */
    @GetMapping("/getUserNow")
    @ApiOperation(value = "获取当前登录的客户信息")
    public Result<?> getUserNow(){
        return Result.success(userService.getUserNow());
    }

}


 ruoyi-common/src/main/java/com/ruoyi/common/handler/MybatisHandler.java

@@ -18,7 +18,6 @@
            userId = SecurityUtils.getUserId().intValue();
        } catch (Exception ignored) {
        }
        System.out.println("执行插入填充...");
        this.strictInsertFill(metaObject, "createTime", LocalDateTime.class, LocalDateTime.now());
        this.strictInsertFill(metaObject, "updateTime",  LocalDateTime.class, LocalDateTime.now());
        this.strictInsertFill(metaObject, "createUser", Integer.class, userId);

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserMapper.java

@@ -22,5 +22,12 @@
     * @return
     */
    List<User> selectUserCondition(@Param("ew") QueryWrapper<User> ew, @Param("type") String type);

    /**
     * èŽ·å–当前登录的客户信息
     * @param userId
     * @return
     */
    User getUserNow(@Param("userId") int userId);
}


 ruoyi-system/src/main/java/com/ruoyi/system/service/UserService.java

@@ -21,5 +21,11 @@
     * @return
     */
    List<User> selectUserCondition(User user, String type);

    /**
     * èŽ·å–当前登录的客户信息
     * @return
     */
    User getUserNow();
}


 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserServiceImpl.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.entity.User;
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.system.mapper.UserMapper;
import com.ruoyi.system.service.UserService;
import org.springframework.stereotype.Service;
@@ -28,5 +29,14 @@
    public List<User> selectUserCondition(User user, String type) {
        return baseMapper.selectUserCondition(QueryWrappers.queryWrappers(user), type);
    }

    /**
     * èŽ·å–当前登录的客户信息
     * @return
     */
    @Override
    public User getUserNow() {
        return baseMapper.getUserNow(SecurityUtils.getUserId().intValue());
    }
}


 ruoyi-system/src/main/resources/mapper/system/UserMapper.xml

@@ -29,4 +29,17 @@
            ${ew.customSqlSegment}
        </if>
    </select>

    <!-- èŽ·å–当前登录用户信息 -->
    <select id="getUserNow" resultType="com.ruoyi.common.core.domain.entity.User">
        select u.id,
               c.company,
               u.name,
               c.code,
               u.phone,
               c.id departId
        from user u
                 left join custom c on u.company = c.id
        where u.id = #{userId}
    </select>
</mapper>