Merge branch 'develop' into feature/NoScanning

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QrCodeItemSearchQO.java

@@ -21,4 +21,10 @@ public class QrCodeItemSearchQO extends SearchBaseQO {
      * 库存地点
      */
     private String storageLocation;
+
+
+    /**
+     * 供应商编号
+     */
+    private String supplierNo;
 }

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

@@ -49,6 +49,9 @@
         <if test="request.endDate !=null">
             and a.create_time &lt;= #{request.endDate}
         </if>
+        <if test="request.supplierNo!=null and request.supplierNo!=''">
+            and d.supplier_code=#{request.supplierNo}
+        </if>
 <!--        group by a.id, a.barcode_code, a.barcode_type, a.process_stage, a.material_code, a.material_description,-->
 <!--                 a.packaging_type, a.unit, a.batch_no, a.serial_no, a.supplier_code, d.supplier_name, a.po_number,-->
 <!--                 a.po_line_number,-->