2024.9.18 一、物料成本信息维护（第二版）

二、加工中心功能改造
三、标准工序（第二版）
四、商品组 - 标准工序（第二版）
五、商品组 - Process Time Matrix（第一版）

src/main/java/com/xujie/sys/modules/part/data/PtmConditionItemData.java

@@ -68,5 +68,21 @@ public class PtmConditionItemData implements Serializable {
     @TableField(exist = false)
     private List<PtmConditionItemData> ptmItemAddList;
 
+    //value_choose_flag
+    @TableField(exist = false)
+    private String valueChooseFlag;
+
+    @TableField(exist = false)
+    private Integer itemId;
+
+    @TableField(exist = false)
+    private String valueNo;
+
+    @TableField(exist = false)
+    private String availableValue;
+
+    @TableField(exist = false)
+    private List<PtmConditionItemData> availableValueList;
+
     private static final long serialVersionUID = 1L;
 }

src/main/java/com/xujie/sys/modules/part/mapper/PtmConditionItemMapper.java

@@ -24,6 +24,8 @@ public interface PtmConditionItemMapper extends BaseMapper<PtmConditionItemData>
         "SELECT item_no FROM plm_properties_item WHERE item_type = #{recordType} and site = #{site} and bu_no = #{buNo}"
     )
     List<String> searchItemNoByType(PtmConditionItemData data);
+
+    List<PtmConditionItemData> searchProductGroupPtmConditionItemAvailable(PtmConditionItemData data);
 }
 
 

src/main/java/com/xujie/sys/modules/part/service/impl/PtmConditionItemServiceImpl.java

@@ -4,12 +4,14 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xujie.sys.modules.part.data.PgPtmConditionData;
 import com.xujie.sys.modules.part.data.PtmConditionItemData;
 import com.xujie.sys.modules.part.data.PtmConditionProcessData;
+import com.xujie.sys.modules.part.entity.PlmPropertiesItemAvailableData;
 import com.xujie.sys.modules.part.service.PtmConditionItemService;
 import com.xujie.sys.modules.part.mapper.PtmConditionItemMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
 * @author Jia
@@ -26,8 +28,14 @@ public class PtmConditionItemServiceImpl extends ServiceImpl<PtmConditionItemMap
 
     @Override
     public List<PtmConditionItemData> searchProductGroupPtmConditionItem(PtmConditionProcessData data) {
-        List<PtmConditionItemData> list = ptmConditionItemMapper.searchProductGroupPtmConditionItem(data);
-        return list;
+        List<PtmConditionItemData> result = ptmConditionItemMapper.searchProductGroupPtmConditionItem(data);
+        for (int i = 0; i < result.size(); i++) {
+            if ("Y".equals(result.get(i).getValueChooseFlag())) {
+                List<PtmConditionItemData> availableList = ptmConditionItemMapper.searchProductGroupPtmConditionItemAvailable(result.get(i));
+                result.get(i).setAvailableValueList(availableList);
+            }
+        }
+        return result;
     }
 
     @Override

src/main/resources/mapper/part/PtmConditionItemMapper.xml

@@ -45,4 +45,15 @@
         and a.site = #{site}
         and a.record_type = #{recordType}
     </select>
+    <select id="searchProductGroupPtmConditionItemAvailable"
+            resultType="com.xujie.sys.modules.part.data.PtmConditionItemData">
+        SELECT
+            a.item_no,
+            b.valueNo,
+            b.availableValue
+        FROM
+            plm_properties_item as a
+        left join plm_properties_item_available as b on a.id = b.item_id
+        where b.itemNo = #{itemNo} and b.site = #{site} and b.itemType = #{recordType} and b.bu_no = #{buNo}
+    </select>
 </mapper>