nflg-wms-admin/src/main/resources/template/qrcode/dp-2.html

@@ -65,9 +65,6 @@
                 <tr>
                     <td><span>数量: <span style="display: inline;" th:text="${item.printNum}"></span></span></td>
                 </tr>
-                <tr>
-                    <td><span>批次号: <span style="display: inline;" th:text="${item.batchNo}"></span></span></td>
-                </tr>
             </table>
         </div>
     </div>

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 String workbenchCode;
+    private Long workbenchId;
 }

nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderMapper.xml

@@ -23,8 +23,8 @@
             <if test="request.externalOrderNo!=null and request.externalOrderNo!=''">
                 and o.external_order_no=#{request.externalOrderNo}
             </if>
-            <if test="request.workbenchCode!=null and request.workbenchCode!=''">
+            <if test="request.workbenchId!=null">
-                and wb."no" ilike concat('%', #{request.workbenchCode}, '%')
+                and o.workbench_id=#{request.workbenchId}
             </if>
             <if test="request.startDate!=null">
                 and o.create_time>= #{request.startDate}