完善样品编号重复引发的问题

zss

2024-12-05 05304315b53a2c8ef1d4384607d854364493570e

完善样品编号重复引发的问题

 inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java

@@ -242,15 +242,15 @@
    @ValueClassify("检验任务")
    @ApiOperation(value = "扫码报检(入库)")
    @PostMapping("/scanInsOrderState")
    public Result scanInsOrderState(String sonLaboratory, String sampleCode, String trees) {
        return Result.success(insOrderPlanService.scanInsOrderState(sonLaboratory, sampleCode, trees));
    public Result scanInsOrderState(String sonLaboratory, String sampleCode, String trees,String entrustCode) {
        return Result.success(insOrderPlanService.scanInsOrderState(sonLaboratory, sampleCode, trees,entrustCode));
    }

    @ValueClassify("检验任务")
    @ApiOperation(value = "扫码出库")
    @PostMapping("/outInsOrderState")
    public Result outInsOrderState(String sonLaboratory, String sampleCode) {
        return Result.success(insOrderPlanService.outInsOrderState(sonLaboratory, sampleCode));
    public Result outInsOrderState(String sonLaboratory, String sampleCode,String entrustCode) {
        return Result.success(insOrderPlanService.outInsOrderState(sonLaboratory, sampleCode,entrustCode));
    }

    @ValueAuth

 inspect-server/src/main/java/com/yuanchu/mom/controller/WarehouseController.java

@@ -73,20 +73,20 @@
    @GetMapping("/getWarehouse")
    @ApiOperation("查询货架下的存放信息")
    @ValueAuth
    public Result getWarehouse(Integer shelfId) {
        return Result.success(warehouseService.getWarehouse(shelfId));
    public Result getWarehouse(Integer shelfId,String sampleCode) {
        return Result.success(warehouseService.getWarehouse(shelfId,sampleCode));
    }
    @ValueClassify("样品管理")
    @PostMapping("/inWarehouse")
    @ApiOperation("样品入库")
    public Result inWarehouse(String trees, String sampleCode) {
        return Result.success(warehouseService.inWarehouse(trees, sampleCode));
    public Result inWarehouse(String trees, String sampleCode,String entrustCode) {
        return Result.success(warehouseService.inWarehouse(trees, sampleCode,entrustCode));
    }
    @ValueClassify("样品管理")
    @PostMapping("/outWarehouse")
    @ApiOperation("样品出库")
    public Result outWarehouse(String sampleCode, boolean a) {
        return Result.success(warehouseService.outWarehouse(sampleCode,a));
    public Result outWarehouse(String sampleCode, boolean a,String entrustCode) {
        return Result.success(warehouseService.outWarehouse(sampleCode,a,entrustCode));
    }

    @ValueAuth
@@ -94,11 +94,5 @@
    @ApiOperation("查询样品详细记录")
    public Result getSampleRecord(Integer id) {
        return Result.success(warehouseService.getSampleRecord(id));
    }
    @ValueAuth
    @PostMapping("/searchSampleId")
    @ApiOperation("通过样品编号进行检索")
    public Result searchSampleId(String sampleCode) {
        return Result.success(warehouseService.searchSampleId(sampleCode));
    }
}

 inspect-server/src/main/java/com/yuanchu/mom/mapper/WarehouseCellMapper.java

@@ -3,6 +3,7 @@
import com.yuanchu.mom.dto.WarehouseCellAndSampleDto;
import com.yuanchu.mom.pojo.WarehouseCell;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

@@ -14,7 +15,7 @@
*/
public interface WarehouseCellMapper extends BaseMapper<WarehouseCell> {

    List<WarehouseCellAndSampleDto> getWarehouse(Integer shelfId);
    List<WarehouseCellAndSampleDto> getWarehouse(@Param("shelfId") Integer shelfId, @Param("sampleCode") String sampleCode);

}


 inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java

@@ -54,10 +54,10 @@
    int deleteInsContext(InsProductResultVo insProductResultVo);

    //扫码报检(入库)
    int scanInsOrderState(String sonLaboratory, String sampleCode,String trees);
    int scanInsOrderState(String sonLaboratory, String sampleCode,String trees,String entrustCode);

    //扫码出库
    int outInsOrderState(String sonLaboratory, String sampleCode);
    int outInsOrderState(String sonLaboratory, String sampleCode,String entrustCode);

    List<InsOrderUser> getInsOrderUserList(Integer insOrderStateId);


 inspect-server/src/main/java/com/yuanchu/mom/service/WarehouseService.java

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

import com.yuanchu.mom.dto.WarehouseCellAndSampleDto;
import com.yuanchu.mom.dto.WarehouseDto;
import com.yuanchu.mom.pojo.InsSample;
import com.yuanchu.mom.pojo.Warehouse;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.mom.pojo.WarehouseShelf;
@@ -30,13 +31,12 @@

    int upShelf(WarehouseShelf warehouseShelf);

    List<WarehouseCellAndSampleDto> getWarehouse(Integer shelfId);
    List<WarehouseCellAndSampleDto> getWarehouse(Integer shelfId,String sampleCode);

    int inWarehouse(String trees, String sampleCode);
    int inWarehouse(String trees, String sampleCode,String entrustCode);

    int outWarehouse(String sampleCode, boolean a);
    int outWarehouse(String sampleCode, boolean a,String entrustCode);

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

    int searchSampleId(String sampleCode);
}

 inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java

@@ -190,7 +190,7 @@
                .eq(InsOrderState::getInsOrderId, insSample.getInsOrderId())
                .eq(InsOrderState::getInsSampleId, sampleId)
                .eq(InsOrderState::getLaboratory, laboratory));
        if (ObjectUtils.isEmpty(orderState.getInsTime())){
        if (ObjectUtils.isEmpty(orderState.getInsTime())) {
            //更新检验任务表的检验时间
            insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate()
                    .eq(InsOrderState::getInsOrderId, insSample.getInsOrderId())
@@ -380,12 +380,15 @@

    //扫码报检
    @Override
    public int scanInsOrderState(String sonLaboratory, String sampleCode, String trees) {
    public int scanInsOrderState(String sonLaboratory, String sampleCode, String trees, String entrustCode) {
        /*样品入库*/
        warehouseService.inWarehouse(trees, sampleCode);
        warehouseService.inWarehouse(trees, sampleCode, entrustCode);
        /*新增检验任务*/
        //先判断该样品是否有这个站点的项目
        InsSample insSample = insSampleMapper.selectOne(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getSampleCode, sampleCode));
        List<InsOrder> insOrders = insOrderMapper.selectList(Wrappers.<InsOrder>lambdaQuery().eq(InsOrder::getEntrustCode, entrustCode));
        InsSample insSample = insSampleMapper.selectOne(Wrappers.<InsSample>lambdaQuery()
                .eq(InsSample::getSampleCode, sampleCode)
                .eq(InsSample::getInsOrderId, insOrders.get(0).getId()));
        List<String> collect = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
                .eq(InsProduct::getState, 1)
                .eq(InsProduct::getInsSampleId, insSample.getId())).stream().map(InsProduct::getSonLaboratory).collect(Collectors.toList());
@@ -424,10 +427,13 @@

    //扫码出库
    @Override
    public int outInsOrderState(String sonLaboratory, String sampleCode) {
    public int outInsOrderState(String sonLaboratory, String sampleCode, String entrustCode) {
        //判断该样品的检验任务是否已经结束(继续试验或者是结束试验)
        //先判断该样品是否有这个站点的项目
        InsSample insSample = insSampleMapper.selectOne(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getSampleCode, sampleCode));
        List<InsOrder> insOrders = insOrderMapper.selectList(Wrappers.<InsOrder>lambdaQuery().eq(InsOrder::getEntrustCode, entrustCode));
        InsSample insSample = insSampleMapper.selectOne(Wrappers.<InsSample>lambdaQuery()
                .eq(InsSample::getSampleCode, sampleCode)
                .eq(InsSample::getInsOrderId, insOrders.get(0).getId()));
        List<String> collect = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
                .eq(InsProduct::getState, 1)
                .eq(InsProduct::getInsSampleId, insSample.getId())).stream().map(InsProduct::getSonLaboratory).collect(Collectors.toList());
@@ -449,7 +455,7 @@
            }
        }
        boolean a = true;
        warehouseService.outWarehouse(sampleCode, a);
        warehouseService.outWarehouse(sampleCode, a, entrustCode);
        return 0;
    }

@@ -1040,7 +1046,7 @@
                    if (insOrder.getFormType().equals("原理样机")) {
                        //出库
                        try {
                            outInsOrderState(laboratory, insSample.getSampleCode());
                            outInsOrderState(laboratory, insSample.getSampleCode(), insOrder.getEntrustCode());
                        } catch (Exception e) {

                        }

 inspect-server/src/main/java/com/yuanchu/mom/service/impl/WarehouseServiceImpl.java

@@ -50,6 +50,8 @@

    private InsProductMapper insProductMapper;

    private InsOrderMapper insOrderMapper;

    @Override
    public int addWarehouse(String name) {
        Warehouse warehouse = new Warehouse();
@@ -139,17 +141,24 @@
    }

    @Override
    public List<WarehouseCellAndSampleDto> getWarehouse(Integer shelfId) {
        return warehouseCellMapper.getWarehouse(shelfId);
    public List<WarehouseCellAndSampleDto> getWarehouse(Integer shelfId,String sampleCode) {
        return warehouseCellMapper.getWarehouse(shelfId,sampleCode);
    }

    @Override
    public int inWarehouse(String trees, String sampleCode) {
    public int inWarehouse(String trees, String sampleCode,String entrustCode) {
        String[] tree = trees.split("-");
        if(tree.length < 4){
            throw new ErrorException("库位选择错误");
        }
        List<InsSample> samples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getSampleCode, sampleCode).select(InsSample::getId,InsSample::getCellId));
        List<InsOrder> insOrders = insOrderMapper.selectList(Wrappers.<InsOrder>lambdaQuery().eq(InsOrder::getEntrustCode, entrustCode));
        if(insOrders.size()!=1){
            throw new ErrorException("订单编号输入有误");
        }
        List<InsSample> samples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery()
                .eq(InsSample::getSampleCode, sampleCode)
                .eq(InsSample::getInsOrderId,insOrders.get(0).getId())
                .select(InsSample::getId,InsSample::getCellId));
        if(samples.size()!=1){
            throw new ErrorException("样品编号输入有误");
        }
@@ -170,8 +179,15 @@
    }

    @Override
    public int outWarehouse(String sampleCode, boolean a) {
        List<InsSample> samples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getSampleCode, sampleCode).select(InsSample::getId,InsSample::getCellId));
    public int outWarehouse(String sampleCode, boolean a,String entrustCode) {
        List<InsOrder> insOrders = insOrderMapper.selectList(Wrappers.<InsOrder>lambdaQuery().eq(InsOrder::getEntrustCode, entrustCode));
        if(insOrders.size()!=1){
            throw new ErrorException("订单编号输入有误");
        }
        List<InsSample> samples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery()
                .eq(InsSample::getSampleCode, sampleCode)
                .eq(InsSample::getInsOrderId,insOrders.get(0).getId())
                .select(InsSample::getId,InsSample::getCellId));
        if(samples.size()!=1){
            throw new ErrorException("样品编号输入有误");
        }
@@ -221,14 +237,6 @@
        return map;
    }

    @Override
    public int searchSampleId(String sampleCode) {
        List<InsSample> samples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getSampleCode, sampleCode).select(InsSample::getId));
        if(samples.size()!=1){
            throw new ErrorException("样品编号输入有误");
        }
        return samples.get(0).getId();
    }
}



 inspect-server/src/main/resources/mapper/WarehouseCellMapper.xml

@@ -22,6 +22,9 @@
        left join ins_sample i on i.cell_id = wc.id
        where wc.state = 1
        and wc.shelf_id = #{shelfId}
            <if test="sampleCode!=null and sampleCode!=''">
                and i.sample_code=#{sampleCode}
            </if>
        order by wc.row ,wc.col, wc.id
    </select>