2024-03-19 更新

src/main/java/com/spring/modules/part/entity/OperationEntity.java

@@ -21,6 +21,10 @@ public class OperationEntity {
      * 物料编码
      */
     private String partNo;
+    /**
+     * 物料名称
+     */
+    private String partDesc;
     /**
      * 工艺版本号
      */
@@ -33,6 +37,14 @@ public class OperationEntity {
      * 替代编码
      */
     private String alternativeNo;
+    /**
+     * 替代描述
+     */
+    private String alternativeDescription;
+    /**
+     * 替代状态
+     */
+    private String status;
     /**
      * 工序编码
      */

src/main/java/com/spring/modules/part/entity/RoutingAllFieldEntity.java

@@ -213,6 +213,9 @@ public class RoutingAllFieldEntity extends QueryPage {
      * 规格型号
      */
     private String spec;
-
+    /**
+     * 物料类型
+     */
+    private String partType;
 
 }

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

@@ -295,17 +295,37 @@
     <!-- 查bom明细对象 -->
     <select id="queryOperationList" parameterType="OperationEntity" resultType="OperationEntity">
         select
-            operation_id,
-            operation_no,
-            operation_name
-        from plm_routing_component
+            a.site,
+            a.part_no,
+            a.routing_revision,
+            a.routing_type,
+            a.alternative_no,
+            b.alternative_description,
+            b.status,
+            a.operation_id,
+            a.operation_no,
+            a.operation_name
+        from plm_routing_component as a
+        left join plm_routing_detail as b on a.site = b.site and a.part_no = b.part_no and a.routing_revision = b.routing_revision and a.routing_type = b.routing_type and a.alternative_no = b.alternative_no
         <where>
-            site = #{site} and part_no = #{partNo}
+            a.site = #{site} and a.part_no = #{partNo}
+            <if test = "routingRevision != null and routingRevision != ''">
+                AND a.routing_revision = #{routingRevision}
+            </if>
+            <if test = "routingType != null and routingType != ''">
+                AND a.routing_type = #{routingType}
+            </if>
+            <if test = "alternativeNo != null and alternativeNo != ''">
+                AND a.alternative_no = #{alternativeNo}
+            </if>
+            <if test = "operationNo != null and operationNo != ''">
+                AND a.operation_no = #{operationNo}
+            </if>
             <if test = "operationName != null and operationName != ''">
-                AND operation_name like #{operationName}
+                AND a.operation_name like #{operationName}
             </if>
             <if test = "operationId != null and operationId != ''">
-                AND operation_id = #{operationId}
+                AND a.operation_id = #{operationId}
             </if>
         </where>
     </select>

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

@@ -40,16 +40,20 @@
         part_desc,
         spec,
         um_id as printUnit,
-        dbo.get_um_name(um_id) as printUnitName
+        dbo.get_um_name(um_id) as printUnitName,
+        part_type
         FROM part
         <where>
             site = #{site} and active = 'Y'
             <if test = "partNo != null and partNo != ''">
-                AND part_no like #{partNo}
+                AND part_no = #{partNo}
             </if>
             <if test = "partDesc != null and partDesc != ''">
                 AND part_desc like #{partDesc}
             </if>
+            <if test = "status != null and status != ''">
+                AND status = #{status}
+            </if>
         </where>
     </select>