@@ -445,7 +445,7 @@
<result column="pw_amount" property="rc_amount" jdbcType="DOUBLE" />
</resultMap>
<select id="selectReserveCost" resultMap="ProdReserveCostResultMap">
- select * from productWH tab left join Product on pw_prodcode=pr_code left join warehouse on pw_whcode=wh_code
+ select * from productWH tab left join Product on pw_prodcode=pr_code left join warehouse on pw_whid=wh_id
<where>
<if test="con!=null">
${con}
@@ -115,7 +115,7 @@
<select id="selectProdInOutListByCondition" resultMap="BaseResultMap">
select * from prodinout left join prodiodetail on pi_id = pd_piid left join vendor on pi_vendid=ve_id
- left join product on pd_prodcode=pr_code
+ left join product on pd_prodid=pr_id
<if test="con != null">
@@ -74,6 +74,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
List<ProdInOutList> list = null;
Long companyId = BaseContextHolder.getCompanyId();
String con = req.getFinalCondition();
+ System.out.println(con);
if (null == con) {
con = "1=1";
}
@@ -103,7 +103,7 @@
select * from prodinout left join prodiodetail on pi_id = pd_piid