diff --git a/src/main/java/com/spring/modules/part/entity/OperationEntity.java b/src/main/java/com/spring/modules/part/entity/OperationEntity.java
index 72947a8f..6dab6519 100644
--- a/src/main/java/com/spring/modules/part/entity/OperationEntity.java
+++ b/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;
/**
* 工序编码
*/
diff --git a/src/main/java/com/spring/modules/part/entity/RoutingAllFieldEntity.java b/src/main/java/com/spring/modules/part/entity/RoutingAllFieldEntity.java
index a5f43c5d..ad39961b 100644
--- a/src/main/java/com/spring/modules/part/entity/RoutingAllFieldEntity.java
+++ b/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;
}
diff --git a/src/main/resources/mapper/part/BomManagementMapper.xml b/src/main/resources/mapper/part/BomManagementMapper.xml
index 7a6bb863..5cb0a3cd 100644
--- a/src/main/resources/mapper/part/BomManagementMapper.xml
+++ b/src/main/resources/mapper/part/BomManagementMapper.xml
@@ -295,17 +295,37 @@
diff --git a/src/main/resources/mapper/part/RoutingManagementMapper.xml b/src/main/resources/mapper/part/RoutingManagementMapper.xml
index 6fde0877..bcb3d189 100644
--- a/src/main/resources/mapper/part/RoutingManagementMapper.xml
+++ b/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
site = #{site} and active = 'Y'
- AND part_no like #{partNo}
+ AND part_no = #{partNo}
AND part_desc like #{partDesc}
+
+ AND status = #{status}
+