This commit is contained in:
linfso 2024-07-30 10:26:20 +08:00
parent 99051d9a2a
commit 7d0b842c3d
4 changed files with 28 additions and 1 deletions

View File

@ -28,6 +28,9 @@ public interface EmisWarehouseInMapper extends BaseMapper<EmisWarehouseIn>
*/
public EmisWarehouseIn selectEmisWarehouseInById(Long id);
public EmisWarehouseIn selectEmisWarehouseInByInNo(String inNo);
/**
* 查询列表
*

View File

@ -27,6 +27,8 @@ public interface IEmisWarehouseInService
*/
public EmisWarehouseIn selectEmisWarehouseInById(Long id);
public EmisWarehouseIn selectEmisWarehouseInByInNo(String inNo);
/**
* 查询进仓单列表
*

View File

@ -41,6 +41,13 @@ public class EmisWarehouseInServiceImpl implements IEmisWarehouseInService
return emisWarehouseInMapper.selectEmisWarehouseInById(id);
}
@Override
public EmisWarehouseIn selectEmisWarehouseInByInNo(String inNo)
{
return emisWarehouseInMapper.selectEmisWarehouseInByInNo(inNo);
}
/**
* 查询进仓单列表
*

View File

@ -27,6 +27,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
fetchType="lazy"
/>
</resultMap>
<resultMap id="EmisWarehouseInDetailResult" type="EmisWarehouseIn" extends="BaseEmisWarehouseInResult" >
<association property="waybillDetail"
column="bill_code"
select="com.xdadan.erp.emis.mapper.EmisWaybillMapper.selectWaybillBaseInfoByBillCode"
fetchType="lazy"
/>
<association property="stockInBatchList"
column="in_no"
select="com.xdadan.erp.emis.mapper.EmisWarehouseInBatchMapper.selectStockInBatchListByInNo"
@ -80,11 +89,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
order by create_time desc
</select>
<select id="selectEmisWarehouseInById" parameterType="Long" resultMap="EmisWarehouseInResult">
<select id="selectEmisWarehouseInById" parameterType="Long" resultMap="EmisWarehouseInDetailResult">
select id, serial_no, in_no, order_sn, bill_code, customer_code, customer_name, entry_date, confirm_status, confirm_date, used_status, status, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
from emis_warehouse_in a
where a.id = #{id}
</select>
<select id="selectEmisWarehouseInByInNo" parameterType="String" resultMap="EmisWarehouseInDetailResult">
select id, serial_no, in_no, order_sn, bill_code, customer_code, customer_name, entry_date, confirm_status, confirm_date, used_status, status, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
from emis_warehouse_in a
where a.in_no = #{inNo}
</select>
<insert id="insertEmisWarehouseIn" parameterType="EmisWarehouseIn" useGeneratedKeys="true" keyProperty="id">
insert into emis_warehouse_in