From cf9a5039e6db9d1d5963e3fe1a37d00169ec2ef7 Mon Sep 17 00:00:00 2001 From: whyclxw <810412026@qq.com> Date: 星期三, 25 六月 2025 11:18:22 +0800 Subject: [PATCH] 验收报告修改 --- src/main/java/com/whyc/mapper/MaterialMapper.java | 33 ++++++++++++++++++++++++++++----- 1 files changed, 28 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/whyc/mapper/MaterialMapper.java b/src/main/java/com/whyc/mapper/MaterialMapper.java index b8bb21e..cbe51af 100644 --- a/src/main/java/com/whyc/mapper/MaterialMapper.java +++ b/src/main/java/com/whyc/mapper/MaterialMapper.java @@ -2,17 +2,40 @@ import com.whyc.pojo.Material; import com.whyc.pojo.ProductBom; -import com.whyc.pojo.ProductBomHistory; +import org.apache.ibatis.annotations.Param; import java.util.List; public interface MaterialMapper extends CustomMapper<Material>{ //鏌ヨ鎵�鏈夌殑鏁h浠朵俊鎭笉鍒嗛〉 - List<Material> getMaterialWithoutSub(String parentModel, String subName,int version); + /* List<Material> getMaterialWithoutSub(String parentModel, String subName,int version);*/ //鏌ヨ鎵�鏈夌殑鏁h浠朵俊鎭姞璁剧疆浜嗘浛鎹㈠叧绯荤殑瀛愪欢淇℃伅 - List<Material> getAllMaterial(String category,String subCode,String subName,String subModel); + /*List<Material> getAllMaterial(String category,String subCode,String subName,String subModel);*/ /*//鏌ヨ鍑哄瓨鍦ㄦ浛鎹㈠叧绯诲緱鏁h浠� List<ProductBom> getReplaceMaterial(String parentModel);*/ - //鍘嗗彶鐗堟湰涓嬭浇鏌ヨ鍑哄瓨鍦ㄦ浛鎹㈠叧绯诲緱鏁h浠� - List<ProductBomHistory> getReplaceHisMaterial(String parentModel,int version); + /*//鍘嗗彶鐗堟湰涓嬭浇鏌ヨ鍑哄瓨鍦ㄦ浛鎹㈠叧绯诲緱鏁h浠� + List<ProductBomHistory> getReplaceHisMaterial(String parentModel,int version);*/ + //鏌ヨ鎵�鏈夌墿鏂�(鍒嗛〉锛屾ā绯婃煡璇�) + List<Material> getMaterialLimit(String subCode, String subName, String subModel); + + List<String> getListByCodeList(List<String> codeList); + + void updateDwgUrl(List<Material> materialDwgUrlNameList); + + List<Material> getListByCodeAndModelList(List<Material> materialList); + + void disableStatus(List<Material> materialList); + + List<Material> getListByCodeAndModelList2(List<ProductBom> bomList); + List<Material> getListByCodeAndModelList3(List<ProductBom> bomList); + //鏍规嵁鐗╂枡id鏌ヨ杩斿洖闄勪欢鏂囦欢澶逛笅鎵�鏈夌殑鏂囦欢鍒楄〃 + Material getAttachByMaterialId(int materialId); + ////鏍规嵁鐗╂枡鍨嬪彿锛�'-','_'涔嬪墠鐨勯儴鍒嗭級鏌ヨ鐗╂枡鐨勫巻鍙茬増鏈� + List<Material> getMaterialVersion(@Param("subModel") String subModel); + //鏍规嵁鐗╂枡id鏌ヨ鐗╂枡淇℃伅 + Material getMaterialById(int materialId); + + void updateDwgUrlAndPicUrl(List<Material> materialUpdateList); + + List<Material> getSameSubCodeAndModel(List<ProductBom> bomList); } -- Gitblit v1.9.1