Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/warehouse/goods/service/GoodsService.java

@@ -208,4 +208,13 @@ public class GoodsService extends CrudService<GoodsMapper, Goods> {
 		goods.setGoodsInfoList(goodsInfoList);
 		return goods;
 	}
+
+	public QrCode getGIAndQCByTwoId(String goodsInfoId, String qrCodeId) {
+		GoodsInfo goodsInfo = goodsInfoMapper.get(new GoodsInfo(goodsInfoId));
+		QrCode qrCode = qrCodeMapper.get(new QrCode(qrCodeId));
+		if (null != qrCode) {
+            qrCode.setGoodsInfo(goodsInfo);
+        }
+		return qrCode;
+	}
 }
\ No newline at end of file

src/main/java/com/jeeplus/modules/warehouse/goods/web/GoodsController.java

@@ -296,4 +296,22 @@ public class GoodsController extends BaseController {
         return j;
     }
 
+	/**
+	 * 根据货品明细id和二维码id查询货品信息和二维码信息
+	 * @param goodsInfoId
+	 * @param qrCodeId
+	 * @return
+	 */
+	@ResponseBody
+	@RequestMapping(value = "getGIAndQCByTwoId")
+	public AjaxJson getGIAndQCByTwoId(String goodsInfoId, String qrCodeId) {
+		AjaxJson j = new AjaxJson();
+		//新增或编辑表单保存
+		QrCode qrCode = goodsService.getGIAndQCByTwoId(goodsInfoId, qrCodeId);
+		j.put("qrCode", qrCode);
+		j.setSuccess(true);
+		j.setMsg("查询成功成功");
+		return j;
+	}
+
 }
\ No newline at end of file

src/main/java/com/jeeplus/modules/warehouse/qrcode/mapper/xml/QrCodeMapper.xml

@@ -184,8 +184,14 @@
 			<if test="goodsInfo.type.id != null and goodsInfo.type.id != ''">
 				AND gi.type_id = #{goodsInfo.type.id}
 			</if>
-			<if test="goodsInfo.model != null and goodsInfo.model != ''">
+			<!--<if test="goodsInfo.model != null and goodsInfo.model != ''">
 				AND gi.model = #{goodsInfo.model}
+			</if>-->
+			<if test="goodsInfo.modelList != null and goodsInfo.modelList.size() != 0">
+				AND
+				<foreach collection="goodsInfo.modelList" item="model" index="index" separator=" AND" open="(" close=")">
+					gi.model like concat('%',#{model},'%')
+				</foreach>
 			</if>
 		</where>
 		<choose>