rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/NoScanning 

# Conflicts:
#	nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QrCodeItemSearchQO.java
This commit is contained in:
曹鹏飞 2026-06-12 19:51:56 +08:00
parent f3b2f36fbd b2f789ca7f
commit be4ac6d479
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -37,6 +37,9 @@
left join user_supplier d on a.supplier_id = d."id" 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--> <!-- 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 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 !=''"> <if test="request.barcodeCode !=null and request.barcodeCode !=''">
and a.barcode_code =#{request.barcodeCode} and a.barcode_code =#{request.barcodeCode}
</if> </if>