pda生产退库

src/main/java/com/heai/modules/production/entity/ToolInstanceQueryParam.java

@@ -11,7 +11,7 @@ public class ToolInstanceQueryParam {
     private String locationId;
     private Integer lastSeqNo;
     private String lastOrderNo;
-
+    private String  toolSpec;
     private Integer page = 1;
     private Integer limit = 20;
 
@@ -78,4 +78,12 @@ public class ToolInstanceQueryParam {
     public void setLimit(Integer limit) {
         this.limit = limit;
     }
+
+    public String getToolSpec() {
+        return toolSpec;
+    }
+
+    public void setToolSpec(String toolSpec) {
+        this.toolSpec = toolSpec;
+    }
 }

src/main/resources/mapper/production/ToolDetailMapper.xml

@@ -9,7 +9,7 @@
             td.Site AS site,
             td.ToolID AS toolId,
             td.ToolInstanceID AS toolInstanceId,
-            ISNULL(th.Spec,'') AS toolSpec,
+        ISNULL(th.ToolDescription,'')+'/'+ISNULL(th.Spec,'') AS toolSpec,
             ISNULL(th.DefaultWarehouseID,'') AS warehouseId,
             ISNULL(td.LocationID,'') AS locationId,
             ISNULL(td.SupplierID,'') AS supplierId,
@@ -49,6 +49,9 @@
             <if test="query.site != null and query.site != ''">
                 AND td.Site = #{query.site}
             </if>
+            <if test="query.toolSpec != null and query.toolSpec != ''">
+                AND ISNULL(th.ToolDescription,'')+'/'+ISNULL(th.Spec,'') LIKE '%' + #{query.toolId} + '%'
+            </if>
             <if test="query.toolId != null and query.toolId != ''">
                 AND td.ToolID LIKE '%' + #{query.toolId} + '%'
             </if>