增加根据二维码id，物资编码查询台账明细信息接口

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

@@ -90,6 +90,9 @@
 					<if test="dbName == 'mssql'">'%'+#{code}+'%'</if>
 					<if test="dbName == 'mysql'">concat('%',#{code},'%')</if>
 			</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 != ''">

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

@@ -180,5 +180,15 @@ public class LedgerService extends CrudService<LedgerMapper, Ledger> {
 		super.delete(ledger);
 		ledgerInfoMapper.delete(new LedgerInfo(ledger));
 	}
+
+	@Transactional(readOnly = false)
+	public LedgerInfo findByQrOrCode(LedgerInfo ledgerInfo) {
+		List<LedgerInfo> ledgerInfoList = ledgerInfoMapper.findList(ledgerInfo);
+		if (null != ledgerInfoList && ledgerInfoList.size() > 0) {
+			return ledgerInfoList.get(0);
+		} else {
+			return null;
+		}
+	}
 	
 }
\ No newline at end of file

src/main/java/com/jeeplus/modules/warehouse/ledger/web/LedgerController.java

@@ -13,6 +13,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.ConstraintViolationException;
 
 import com.jeeplus.modules.warehouse.ledger.entity.LedgerInfo;
+import com.jeeplus.modules.warehouse.qrcode.entity.QrCode;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -245,4 +246,38 @@ public class LedgerController extends BaseController {
 		return getBootstrapData(page);
 	}
 
+
+	/**
+	 * 根据二维码id或者物资编码返货台账明细信息
+	 * @param qrId
+	 * @param code
+	 * @return
+	 */
+	@ResponseBody
+	@RequestMapping(value = "findByQrOrCode")
+	public AjaxJson findByQrOrCode(String qrId, String code) {
+		AjaxJson j = new AjaxJson();
+		boolean b = false;
+		if (StringUtils.isNotBlank(qrId)) {
+			b = true;
+		}
+		if (StringUtils.isNotBlank(code)) {
+			b = true;
+		}
+		if (b) {
+			LedgerInfo temLi = new LedgerInfo();
+			QrCode qrCode = new QrCode();
+			qrCode.setId(qrId);
+			temLi.setQr(qrCode);
+			temLi.setCode(code);
+			LedgerInfo ledgerInfo = ledgerService.findByQrOrCode(temLi);
+			j.put("ledgerInfo", ledgerInfo);
+			j.setSuccess(true);
+			j.setMsg("查询成功");
+		} else {
+			j.setSuccess(false);
+			j.setMsg("查询失败");
+		}
+		return j;
+	}
 }
\ No newline at end of file