属性 属性模板

src/main/java/com/xujie/modules/base/controller/PropertiesController.java

@@ -9,18 +9,15 @@ import com.xujie.modules.base.entity.*;
 
 import com.xujie.modules.base.service.PlmPropertiesItemAvailableService;
 import com.xujie.modules.base.service.PlmPropertiesItemService;
-import com.xujie.modules.base.service.PropertiesGroupService;
 import com.xujie.modules.base.service.PropertiesService;
 import com.xujie.modules.sys.controller.AbstractController;
 import com.xujie.modules.sys.entity.DictData;
-import com.xujie.modules.sys.entity.SysMenuEntity;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 @Controller
 @RequestMapping(value = "/properties")
@@ -31,8 +28,6 @@ public class PropertiesController extends AbstractController {
     private PlmPropertiesItemService propertiesItemService;
     @Autowired
     private PlmPropertiesItemAvailableService availableService;
-    @Autowired
-    private PropertiesGroupService propertiesGroupService;
 
 
 
@@ -345,26 +340,6 @@ public class PropertiesController extends AbstractController {
         return R.ok();
     }
 
-    @PostMapping("/menu/list")
-    @ResponseBody
-    public R searchMenuAllListId(@RequestBody PlmPropertiesModelHeader properties){
-        List<SysMenuEntity> list = propertiesService.searchMenuAllListId(properties);
-        return R.ok().put("rows",list);
-    }
-    @PostMapping("/bu/list")
-    @ResponseBody
-    public R searchBUList(@RequestBody PlmPropertiesModelHeader properties){
-        List<Bu> list = propertiesService.searchBUList(properties);
-        return R.ok().put("rows",list);
-    }
-
-    @PostMapping("/group/list")
-    @ResponseBody
-    public R searchPropertiesGroup(@RequestBody PlmPropertiesModelHeader properties){
-        List<PropertiesGroup> list = propertiesGroupService.searchPropertiesGroup(properties);
-        return R.ok().put("rows",list.stream().map(PropertiesGroup::getMenuId).collect(Collectors.toList()));
-    }
-
     @PostMapping("/item/type/list")
     @ResponseBody
     public R searchAllItemTypeList(@RequestBody PlmPropertiesItem propertiesItem){
@@ -379,12 +354,4 @@ public class PropertiesController extends AbstractController {
         return R.ok().put("rows",list);
     }
 
-    @PostMapping("/type/relationship/list")
-    @ResponseBody
-    public R searchAllTypeRelationshipList(@RequestBody PlmPropertiesModelHeader header){
-        List<Map<String, Object>> list = propertiesService.searchAllTypeRelationshipList(header.getFunctionType());
-        return R.ok().put("rows",list);
-    }
-
-
 }

src/main/java/com/xujie/modules/base/dao/PropertiesMapper.java

@@ -7,7 +7,6 @@ import com.xujie.modules.base.data.*;
 import com.xujie.modules.base.entity.*;
 
 import com.xujie.modules.sys.entity.DictData;
-import com.xujie.modules.sys.entity.SysMenuEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -244,20 +243,10 @@ public interface PropertiesMapper extends BaseMapper<PlmPropertiesItemData> {
 
     void updatePlmPropertiesModelDetailOrder(PlmPropertiesModelDetail data);
 
-
-
-    List<SysMenuEntity> searchMenuAllListId(@Param("site") String site);
-
-    List<Bu> searchBUList(@Param("site") String site);
-
-
     List<DictData> searchAllItemTypeList(PlmPropertiesItem propertiesItem);
 
     List<Map<String, Object>> searchAllTypeList();
 
-    List<Map<String, Object>> searchAllTypeRelationshipList(@Param("type") String typeCode);
-
-    List<PlmPropertiesItemData> getItemListsForPartAndCode(PlmPropertiesModelHeaderData inData);
     /**
      * @Description TODO
      * @Title getItemLists
@@ -279,21 +268,12 @@ public interface PropertiesMapper extends BaseMapper<PlmPropertiesItemData> {
      * @throw
      */
     List<PlmPropertiesItemData> getModelItemLists(PlmPropertiesModelHeaderData inData);
-    /**
-     * @Description TODO
-     * @Title  单独插入属性
-      * @param
-     * @author rq
-     * @date 2024/9/30 10:45
-     * @return null
-     * @throw
-     */
+
+    List<PlmPropertiesItemData> getItemListsForPartAndCode(PlmPropertiesModelHeaderData inData);
+
     void saveSubPropertiesValueForAlone(PartSubPropertiesValueData inData);
 
     void deleteSubPropertiesValueForAlone(PartSubPropertiesValueData inData);
 
-
     Double getNewSeqNoForAlone(PartSubPropertiesValueData inData);
-
-
 }

src/main/java/com/xujie/modules/base/entity/PartSubPropertiesValue.java

@@ -150,4 +150,3 @@ public class PartSubPropertiesValue {
         this.valueTypeDb = valueTypeDb;
     }
 }
-

src/main/java/com/xujie/modules/base/entity/PartSubPropertiesValueHeader.java

@@ -82,4 +82,3 @@ public class PartSubPropertiesValueHeader {
         this.recordType = recordType;
     }
 }
-

src/main/java/com/xujie/modules/base/service/Impl/PropertiesServiceImpl.java

@@ -12,13 +12,12 @@ import com.xujie.modules.base.dao.PropertiesMapper;
 import com.xujie.modules.base.data.*;
 import com.xujie.modules.base.entity.*;
 
-import com.xujie.modules.base.service.PropertiesGroupService;
+
 import com.xujie.modules.base.service.PropertiesService;
 
 
 import com.xujie.modules.sys.dao.SysUserDao;
 import com.xujie.modules.sys.entity.DictData;
-import com.xujie.modules.sys.entity.SysMenuEntity;
 import com.xujie.modules.sys.entity.SysUserEntity;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,8 +36,7 @@ public class PropertiesServiceImpl implements PropertiesService {
     @Autowired
     private PropertiesMapper propertiesMapper;
 
-    @Autowired
-    private PropertiesGroupService propertiesGroupService;
+
 
 
 
@@ -175,39 +173,21 @@ public class PropertiesServiceImpl implements PropertiesService {
             throw new RuntimeException("该模板编码已存在!");
         }
         propertiesMapper.plmPropertiesModelSave(inData);
-        PropertiesGroup group = new PropertiesGroup();
-        group.setSite(inData.getSite());
-        group.setMenuId(inData.getGroup());
-        group.setFunctionType(inData.getFunctionType());
-        group.setCodeNo(inData.getCodeNo());;
-        group.setFunctionGroup(inData.getFunctionGroup());
-        propertiesGroupService.save(group);
+
     }
     @Override
     @Transactional
     public void propertiesModelEdit(PlmPropertiesModelHeaderData inData){
-        propertiesGroupService.lambdaUpdate()
-                .eq(PropertiesGroup::getSite,inData.getSite())
-                .eq(PropertiesGroup::getFunctionType,inData.getFunctionType())
-                .eq(PropertiesGroup::getCodeNo,inData.getCodeNo()).remove();
+
         propertiesMapper.plmPropertiesModelEdit(inData);
-        PropertiesGroup group = new PropertiesGroup();
-        group.setSite(inData.getSite());
-        group.setMenuId(inData.getGroup());
-        group.setFunctionType(inData.getFunctionType());
-        group.setCodeNo(inData.getCodeNo());
-        group.setFunctionGroup(inData.getFunctionGroup());
-        propertiesGroupService.save(group);
+
     }
 
     @Override
     @Transactional
     public void propertiesModelDelete(PlmPropertiesModelHeaderData inData){
         propertiesMapper.plmPropertiesModelDelete(inData);
-        propertiesGroupService.lambdaUpdate()
-                .eq(PropertiesGroup::getSite,inData.getSite())
-                .eq(PropertiesGroup::getFunctionType,inData.getFunctionType())
-                .eq(PropertiesGroup::getCodeNo,inData.getCodeNo()).remove();
+
 
     }
 
@@ -266,14 +246,6 @@ public class PropertiesServiceImpl implements PropertiesService {
         return propertiesMapper.getModelItemLists(inData);
     }
 
-    @Override
-    public List<PlmPropertiesItemData> getItemListsForPartAndCode(PlmPropertiesModelHeaderData inData){
-        return propertiesMapper.getItemListsForPartAndCode(inData);
-    }
-
-
-
-
     @Override
     @Transactional
     public void goUpItem(PlmPropertiesModelDetail inData){
@@ -303,16 +275,6 @@ public class PropertiesServiceImpl implements PropertiesService {
     }
 
 
-    @Override
-    public List<SysMenuEntity> searchMenuAllListId(PlmPropertiesModelHeader properties) {
-        return propertiesMapper.searchMenuAllListId(properties.getSite());
-    }
-
-    @Override
-    public List<Bu> searchBUList(PlmPropertiesModelHeader properties) {
-        return propertiesMapper.searchBUList(properties.getSite());
-    }
-
     @Override
     public List<DictData> searchAllItemTypeList(PlmPropertiesItem propertiesItem) {
         return propertiesMapper.searchAllItemTypeList(propertiesItem);
@@ -324,11 +286,10 @@ public class PropertiesServiceImpl implements PropertiesService {
     }
 
     @Override
-    public List<Map<String, Object>> searchAllTypeRelationshipList(String functionType) {
-        return propertiesMapper.searchAllTypeRelationshipList(functionType);
+    public List<PlmPropertiesItemData> getItemListsForPartAndCode(PlmPropertiesModelHeaderData inData){
+        return propertiesMapper.getItemListsForPartAndCode(inData);
     }
 
-
     @Override
     @Transactional
     public void refreshPropertiesModal(PartSubPropertiesValueData inData){
@@ -340,8 +301,8 @@ public class PropertiesServiceImpl implements PropertiesService {
         params.add(inData.getCodeNo());
         List<Map<String, Object>> resultList = null;
 
-            //执行方法
-            resultList = procedureDao.getProcedureData("plm_refreshPartSubPropertiesValue", params);
+        //执行方法
+        resultList = procedureDao.getProcedureData("plm_refreshPartSubPropertiesValue", params);
 
         //判断是否成功
         String code = String.valueOf(resultList.get(0).get("resultCode"));
@@ -353,7 +314,7 @@ public class PropertiesServiceImpl implements PropertiesService {
 
     @Override
     @Transactional
-        public void saveSubPropertiesValueForAlone(List<PartSubPropertiesValueData> inData){
+    public void saveSubPropertiesValueForAlone(List<PartSubPropertiesValueData> inData){
         for (int i = 0; i <inData.size() ; i++) {
             Double seqNo=propertiesMapper.getNewSeqNoForAlone(inData.get(i));
             inData.get(i).setItemNo(seqNo);

src/main/java/com/xujie/modules/base/service/PropertiesService.java

@@ -6,8 +6,6 @@ import com.xujie.modules.base.data.*;
 import com.xujie.modules.base.entity.*;
 
 import com.xujie.modules.sys.entity.DictData;
-import com.xujie.modules.sys.entity.SysMenuEntity;
-import com.xujie.modules.base.entity.Bu;
 
 import java.util.List;
 import java.util.Map;
@@ -198,7 +196,6 @@ public interface PropertiesService {
 
     List<PlmPropertiesItemData> getItemListsForPartAndCode(PlmPropertiesModelHeaderData inData);
 
-
     /**
      * @Description BM属性上移
      * @Title goUpItemForBM
@@ -222,17 +219,12 @@ public interface PropertiesService {
 
 
 
-    List<SysMenuEntity> searchMenuAllListId(PlmPropertiesModelHeader properties);
-
-    List<Bu> searchBUList(PlmPropertiesModelHeader properties);
-
     List<DictData> searchAllItemTypeList(PlmPropertiesItem propertiesItem);
 
     List<Map<String, Object>> searchAllTypeList();
 
-    List<Map<String, Object>> searchAllTypeRelationshipList(String functionType);
-
     void refreshPropertiesModal(PartSubPropertiesValueData inData);
+
     void saveSubPropertiesValueForAlone(List<PartSubPropertiesValueData> inData);
 
     void deleteSubPropertiesValueForAlone(List<PartSubPropertiesValueData> inData);

src/main/resources/mapper/base/PropertiesMapper.xml

@@ -141,18 +141,13 @@
         pmh.delflag,
         pmh.version,
         pmh.is_system,
-        pr.function_group_desc,
-        pg.menu_id as [group],
+
         pmh.function_group,
         pt.function_type_desc
         FROM plm_properties_model_header pmh
-        left join properties_group pg
-        on pg.site = pmh.site and pg.function_type = pmh.function_type and pg.code_no = pmh.code_no
-        left join properties_bu bu
-        on bu.site = pmh.site and bu.function_type = pmh.function_type and bu.code_no = pmh.code_no
+
         left join properties_type pt on pt.function_type = pmh.function_type
-        left join properties_relationship pr
-        on pr.function_group = pmh.function_group and pr.function_type = pmh.function_type
+
         <where>
             pmh.site = #{query.site}
             <if test="query.codeNo != null and query.codeNo != ''">
@@ -167,19 +162,8 @@
             <if test="query.functionType != null and query.functionType != ''">
                 and pmh.function_type = #{query.functionType}
             </if>
-            <if test="query.group != null and query.group != ''">
-                and pg.menu_id = #{query.group}
-            </if>
-            <if test="query.functionGroup != null and query.functionGroup != ''">
-                and pmh.function_group = #{query.functionGroup}
-            </if>
-            <if test="query.buNo != null and query.buNo != ''">
-                and bu.bu_no = #{query.buNo}
-            </if>
-            <if test="query.buNo == null or query.buNo == ''">
-                and bu.bu_no is null
-            </if>
         </where>
+        ORDER BY pmh.created_date
     </select>
 
     <insert id="plmPropertiesModelSave">
@@ -357,20 +341,6 @@
     </select>
 
 
-    <select id="getItemListsForPartAndCode" resultType="PlmPropertiesItemData">
-        select a.PropertiesItemNo itemNo,
-               b.ItemDesc
-        from PartSubPropertiesValue a
-                 left join plm_properties_item b
-                           on a.PropertiesItemNo = b.ItemNo and a.RecordType = b.ItemType and a.site = b.site
-        where a.CodeNo = #{codeNo}
-          and a.RecordType = #{functionType}
-          and a.site = #{site}
-          and a.partNo = #{partNo}
-    </select>
-
-
-
     <select id="getModalDetailOrderId" resultType="Integer">
         SELECT isnull(max(order_id), 0) + 1
         from plm_properties_model_detail
@@ -432,25 +402,6 @@
           and seq_no = #{seqNo}
     </update>
 
-
-
-    <select id="searchMenuAllListId" resultType="com.xujie.modules.sys.entity.SysMenuEntity">
-        select menu_id, name
-        from sys_menu
-        where parent_id = 0
-          and menu_id not in (999)
-          and menu_type = 'pc'
-    </select>
-
-    <select id="searchBUList" resultType="com.xujie.modules.base.entity.Bu">
-        select bu_no, bu_desc
-        from BU
-        where site = #{site}
-          and active = 'Y'
-    </select>
-
-
-
     <select id="searchAllItemTypeList" resultType="com.xujie.modules.sys.entity.DictData">
         select dict_label, dict_value
         from sys_dict_data
@@ -464,14 +415,18 @@
         from properties_type
     </select>
 
-    <select id="searchAllTypeRelationshipList" resultType="java.util.Map">
-        select function_group as functionGroup, function_group_desc as functionGroupDesc
-        from properties_relationship
-        where function_type = #{type}
+    <select id="getItemListsForPartAndCode" resultType="PlmPropertiesItemData">
+        select a.PropertiesItemNo itemNo,
+               b.ItemDesc
+        from PartSubPropertiesValue a
+                 left join plm_properties_item b
+                           on a.PropertiesItemNo = b.ItemNo and a.RecordType = b.ItemType and a.site = b.site
+        where a.CodeNo = #{codeNo}
+          and a.RecordType = #{functionType}
+          and a.site = #{site}
+          and a.partNo = #{partNo}
     </select>
 
-
-
     <insert id="saveSubPropertiesValueForAlone">
         insert into PartSubPropertiesValue ( PartNo, Site, CodeNo, SubCodeSeqNo, SubCodeDesc
                                            , ItemNo, PropertiesItemNo, TextValue, NumValue, RecordType, order_id)
@@ -516,5 +471,4 @@
           and RecordType = #{recordType}
     </select>
 
-
 </mapper>