2025-10-10

领料申请管理的材料明细新增

src/main/java/com/gaotao/modules/orderIssure/controller/IssureNotifyController.java

@@ -362,4 +362,16 @@ public class IssureNotifyController {
         return R.ok("保存成功");
     }
 
+    /**
+     * 查询BOM替代料列表
+     * @param data 查询条件
+     * @return R
+     */
+    @PostMapping(value="/getBomAlternativeParts")
+    @ResponseBody
+    public R getBomAlternativeParts(@RequestBody BomAlternativePartsData data) {
+        List<BomAlternativePartsData> list = issureNotifyService.getBomAlternativeParts(data);
+        return R.ok().put("rows", list);
+    }
+
 }

src/main/java/com/gaotao/modules/orderIssure/entity/BomAlternativePartsData.java

@@ -0,0 +1,70 @@
+package com.gaotao.modules.orderIssure.entity;
+
+import lombok.Data;
+
+/**
+ * BOM替代料数据实体
+ */
+@Data
+public class BomAlternativePartsData {
+    /**
+     * 站点
+     */
+    private String site;
+    
+    /**
+     * 申请单号
+     */
+    private String notifyNo;
+    
+    /**
+     * 工单号
+     */
+    private String orderNo;
+    
+    /**
+     * 子件编码（用于查询条件）
+     */
+    private String componentPart;
+    
+    /**
+     * 母件编码
+     */
+    private String partNo;
+    
+    /**
+     * 母件名称
+     */
+    private String partDesc;
+    
+    /**
+     * 子件编码
+     */
+    private String componentPartNo;
+    
+    /**
+     * 子件名称
+     */
+    private String componentPartDesc;
+    
+    /**
+     * 替代料编码
+     */
+    private String alternativePartNo;
+    
+    /**
+     * 替代料名称
+     */
+    private String alternativePartDesc;
+    
+    /**
+     * 替代比例
+     */
+    private String replacementRatio;
+    
+    /**
+     * 优先级
+     */
+    private Integer priority;
+}
+

src/main/java/com/gaotao/modules/orderIssure/mapper/IssureNotifyMapper.java

@@ -175,4 +175,11 @@ public interface IssureNotifyMapper extends BaseMapper<SOIssueNotifyHeader> {
      * @return 物料信息
      */
     PartEntity getPartBySiteAndPartNo(@Param("site") String site, @Param("partNo") String partNo);
+
+    /**
+     * 查询BOM替代料列表
+     * @param data 查询条件
+     * @return 替代料列表
+     */
+    List<BomAlternativePartsData> getBomAlternativeParts(BomAlternativePartsData data);
 }

src/main/java/com/gaotao/modules/orderIssure/service/IssureNotifyService.java

@@ -150,4 +150,11 @@ public interface IssureNotifyService {
      * @param data 材料明细数据
      */
     void saveSOIssueNotifyOrderMateria(SOIssueNotifyOrderMaterialListData data);
+
+    /**
+     * 查询BOM替代料列表
+     * @param data 查询条件
+     * @return 替代料列表
+     */
+    List<BomAlternativePartsData> getBomAlternativeParts(BomAlternativePartsData data);
 }

src/main/java/com/gaotao/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java

@@ -528,5 +528,9 @@ public class IssureNotifyServiceImpl implements IssureNotifyService {
         issureNotifyMapper.saveSOIssueNotifyOrderMateria(data);
     }
 
+    @Override
+    public List<BomAlternativePartsData> getBomAlternativeParts(BomAlternativePartsData data) {
+        return issureNotifyMapper.getBomAlternativeParts(data);
+    }
 
 }

src/main/java/com/gaotao/modules/orderIssure/vo/SOIssueNotifyOrderList.java

@@ -51,8 +51,8 @@ public class SOIssueNotifyOrderList {
      *
      */
     private String outWorkOrderFlag;
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date needDate;
     private String locationNo;
     private String resourceId;

src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml

@@ -585,4 +585,26 @@ RecordVersion,OutWorkOrderFlag,ProjectID,OrderType,AuthRuleID,bu)
         FROM part
         WHERE Site = #{site} AND PartNo = #{partNo}
     </select>
+
+    <!-- 查询BOM替代料列表 -->
+    <select id="getBomAlternativeParts" resultType="com.gaotao.modules.orderIssure.entity.BomAlternativePartsData">
+        SELECT DISTINCT
+<!--            A.FGPartNo as partNo, &#45;&#45; 母件编码-->
+<!--            DBO.Get_PartDesc(A.SITE, A.FGPartNo) AS partDesc, &#45;&#45; 母件名称-->
+<!--            C.component_part AS componentPartNo, &#45;&#45; 子件编码-->
+<!--            DBO.Get_PartDesc(A.SITE, C.component_part) AS componentPartDesc, &#45;&#45; 子件名称-->
+            C.alternative_part_no AS alternativePartNo, -- 替代料编码
+            DBO.Get_PartDesc(A.SITE, C.alternative_part_no) AS alternativePartDesc, -- 替代料名称
+            C.replacement_ratio AS replacementRatio, -- 替代比例
+            C.priority AS priority -- 优先级
+        FROM SOIssueNotifyOrderList A
+        INNER JOIN ShopOrder B ON A.SITE = B.SITE AND A.SOOrderNo = B.OrderNo
+        INNER JOIN BomAlternativeParts C ON B.SITE = C.SITE AND B.PartNo = C.part_no AND B.BOMRevNo = C.bom_version
+        WHERE A.site = #{site}
+        AND A.NotifyNo = #{notifyNo}
+        AND A.SOOrderNo = #{orderNo}
+        AND C.component_part = #{componentPart}
+        AND C.active = 'Y'
+        ORDER BY C.priority
+    </select>
 </mapper>