修改

adm/src/main/resources/com/minpay/db/table/own/mapper/WarehouseStockMapper.xml

@@ -149,9 +149,9 @@
 		 			IFNULL(ad.AWD_RECEIPT,'')	"historyReceipt",
 		 			IFNULL(ad.AWD_EXCEL_RECEIPT_ID,'')	"excelReceipt",
 		 			IFNULL(
-				    	IF(ad.AWD_LICENSE_NUMBER IS NULL OR ad.AWD_LICENSE_NUMBER = '',
-							IF(ad.AWD_BOX_NO IS NULL OR ad.AWD_BOX_NO = '',ad.AWD_EXCEL_RECEIPT_ID, ad.AWD_BOX_NO),
-							ad.AWD_LICENSE_NUMBER
+				    	IF(ad.AWD_BOX_NO IS NULL OR ad.AWD_BOX_NO = '',
+							IF(ad.AWD_LICENSE_NUMBER IS NULL OR ad.AWD_LICENSE_NUMBER = '',ad.AWD_EXCEL_RECEIPT_ID, ad.AWD_BOX_NO),
+							ad.AWD_BOX_NO
 						),
 					    ''
 					) "cardOrBox",