diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StructuralPackageOrderSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StructuralPackageOrderSearchQO.java
index f4a61a20..b8bdb18e 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StructuralPackageOrderSearchQO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StructuralPackageOrderSearchQO.java
@@ -26,7 +26,7 @@ public class StructuralPackageOrderSearchQO extends SearchBaseQO {
private String externalOrderNo;
/**
- * 机台id
+ * 机台编号
*/
- private Long workbenchId;
+ private String workbenchCode;
}
diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderMapper.xml
index 96313b68..7a376b6c 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderMapper.xml
@@ -23,8 +23,8 @@
and o.external_order_no=#{request.externalOrderNo}
-
- and o.workbench_id=#{request.workbenchId}
+
+ and wb."no" ilike concat('%', #{request.workbenchCode}, '%')
and o.create_time>= #{request.startDate}