修复领用模块物资查询

src/main/java/com/jeeplus/modules/warehouse/ledger/mapper/LedgerInfoMapper.java

@@ -21,4 +21,5 @@ public interface LedgerInfoMapper extends BaseMapper<LedgerInfo> {
 
     public List<CountLedgerInfo> findCliList(LedgerInfo ledgerInfo);
     void deleteByLedgerInfo(@Param("id") String id);
+    public List<LedgerInfo> findListByQrIdAndCode(LedgerInfo ledgerInfo);
 }
\ No newline at end of file

src/main/java/com/jeeplus/modules/warehouse/ledger/mapper/xml/LedgerInfoMapper.xml

@@ -247,4 +247,29 @@
 		</where>
 		GROUP BY a.ledger_id,a.batch_num,a.shelves_id
 	</select>
+
+	<select id="findListByQrIdAndCode" resultType="LedgerInfo" >
+		SELECT
+		<include refid="ledgerInfoColumns"/>
+		FROM t_wh_ledger_info a
+		<include refid="ledgerInfoJoins"/>
+		<where>
+			a.del_flag = #{DEL_FLAG_NORMAL}
+			${dataScope}
+			<if test="code != null and code != ''">
+				AND a.code = #{code}
+			</if>
+			<if test="qr != null and qr.id != null and qr.id != ''">
+				AND a.qr_id = #{qr.id}
+			</if>
+		</where>
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+				ORDER BY a.create_date ASC
+			</otherwise>
+		</choose>
+	</select>
 </mapper>
\ No newline at end of file

src/main/java/com/jeeplus/modules/warehouse/ledger/service/LedgerService.java

@@ -205,7 +205,7 @@ public class LedgerService extends CrudService<LedgerMapper, Ledger> {
 	}
 	@Transactional(readOnly = false)
 	public LedgerInfo findByQrOrCode(LedgerInfo ledgerInfo) {
-		List<LedgerInfo> ledgerInfoList = ledgerInfoMapper.findList(ledgerInfo);
+		List<LedgerInfo> ledgerInfoList = ledgerInfoMapper.findListByQrIdAndCode(ledgerInfo);
 		if (null != ledgerInfoList && ledgerInfoList.size() > 0) {
 			return ledgerInfoList.get(0);
 		} else {