From 91ab1a15515c4c213b2ac4f777a7f20c3d0d59ad Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期五, 28 三月 2025 13:49:53 +0800 Subject: [PATCH] 一个订单在每个站点检验都需要扫码入库报检,在中间站点复核继续试验之后默认自动将样品出库,且在列表中也不需要再展示出来,到最后一步复核结束反而是需要手动去出库不能自动出库,且出库之后也不需要在页面展示 --- inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardTreeMapper.java | 28 +++++++++++++++------------- 1 files changed, 15 insertions(+), 13 deletions(-) diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardTreeMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardTreeMapper.java index 0666f69..4e104ad 100644 --- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardTreeMapper.java +++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardTreeMapper.java @@ -1,10 +1,7 @@ package com.yuanchu.mom.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.yuanchu.mom.dto.FactoryDto; -import com.yuanchu.mom.dto.ProductDto; -import com.yuanchu.mom.dto.SampleDto; -import com.yuanchu.mom.dto.SampleTypeDto; +import com.yuanchu.mom.dto.*; import com.yuanchu.mom.pojo.StandardMethodList; import com.yuanchu.mom.pojo.StandardProductList; import com.yuanchu.mom.pojo.StandardTree; @@ -12,11 +9,11 @@ import java.util.List; /** -* @author Administrator -* @description 閽堝琛ㄣ�恠tandard_tree(鏍囧噯鏍�)銆戠殑鏁版嵁搴撴搷浣淢apper -* @createDate 2024-03-01 15:06:44 -* @Entity com.yuanchu.mom.pojo.StandardTree -*/ + * @author Administrator + * @description 閽堝琛ㄣ�恠tandard_tree(鏍囧噯鏍�)銆戠殑鏁版嵁搴撴搷浣淢apper + * @createDate 2024-03-01 15:06:44 + * @Entity com.yuanchu.mom.pojo.StandardTree + */ public interface StandardTreeMapper extends BaseMapper<StandardTree> { List<FactoryDto> selectStandardTreeList(); @@ -29,11 +26,11 @@ List<StandardMethodList> getStandardMethodListBySample(String sampleType); - List<StandardProductList> selectStandardProductListByTree(String tree, String sample, String model, String trees); + List<StandardProductList> selectStandardProductListByTree(String tree, String sample, String model, String trees, String laboratory); - List<StandardProductList> selectStandardProductListByTree2(String tree, String sample, String model, String trees); + List<StandardProductList> selectStandardProductListByTree2(String tree, String sample, String model, String trees, String laboratory); - List<StandardProductList> selectStandardProductListByTree3(String tree, String sample, String model, String trees); + List<StandardProductList> selectStandardProductListByTree3(String tree, String sample, String model, String trees, String laboratory); List<SampleTypeDto> getStandardTree2(); @@ -41,9 +38,14 @@ String getLaboratory(String str); - Integer getStructureItemParameterId(String sampleType, String item, String itemChild); + Integer getStructureItemParameterId(String sampleType, String item, String itemChild, String inspectionItemClass); List<ProductDto> selectPList(String name); + + String selSample(String sample); + + List<standardTreeDto> exportStandTree(); + } -- Gitblit v1.9.3