Merge branch 'master' into feature/NoScanning

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

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

@@ -27,4 +27,9 @@ public class QrCodeItemSearchQO extends SearchBaseQO {
      * 供应商编号
      */
     private String supplierNo;
+
+    /**
+     * 条码流程位置
+     */
+    private Short processStage;
 }

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

@@ -37,6 +37,9 @@
                  left join user_supplier d on a.supplier_id = d."id"
 <!--                 left join wms_qr_code_master f on f.parent_barcode_id = a.id and f.process_stage = 6-->
         where a.parent_barcode_id = 0
+        <if test="request.processStage !=null">
+            and a.process_stage =#{request.processStage}
+        </if>
         <if test="request.barcodeCode !=null and request.barcodeCode !=''">
             and a.barcode_code =#{request.barcodeCode}
         </if>