demand: 新增获取一级网点TMS组批次详细信息接口（一个接口实现）
committer: heyu
This commit is contained in:
parent
7e1fa091bd
commit
e2e6b78e5c
@ -169,6 +169,16 @@ public class EmisTmsSiteBatchController extends EmisBaseController
|
||||
return AjaxResult.success(emisTmsSiteBatchService.selectEmisTmsSiteBatchById(id));
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取一级网点TMS组批次详细信息（一个接口实现）
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('emis:emisTmsSiteBatch:detail')")
|
||||
@GetMapping(value = "/detail/{id}")
|
||||
public AjaxResult geDetail(@PathVariable("id") Long id)
|
||||
{
|
||||
return AjaxResult.success(emisTmsSiteBatchService.geDetail(id));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增一级网点TMS组批次
|
||||
*/
|
||||
|
||||
@ -34,7 +34,16 @@ public interface EmisTmsSiteBatchLoadingMapper extends BaseMapper<EmisTmsSiteBat
|
||||
* @param emisTmsSiteBatchLoading
|
||||
* @return 集合
|
||||
*/
|
||||
public List<EmisTmsSiteBatchLoading> selectEmisTmsSiteBatchLoadingList(EmisTmsSiteBatchLoading emisTmsSiteBatchLoading);
|
||||
public List<EmisTmsSiteBatchLoading> selectEmisTmsSiteBatchLoadingList(
|
||||
EmisTmsSiteBatchLoading emisTmsSiteBatchLoading);
|
||||
|
||||
/**
|
||||
* 根据批次号查询装载信息列表
|
||||
*
|
||||
* @param batchNo 批次号
|
||||
* @return 集合
|
||||
*/
|
||||
public List<EmisTmsSiteBatchLoading> selectEmisTmsSiteBatchLoadingByBatchNo(String batchNo);
|
||||
|
||||
/**
|
||||
* 新增
|
||||
|
||||
@ -31,6 +31,13 @@ public interface EmisTmsSiteBatchMapper extends BaseMapper<EmisTmsSiteBatch>
|
||||
*/
|
||||
public EmisTmsSiteBatch selectEmisTmsSiteBatchById(Long id);
|
||||
|
||||
/**
|
||||
* 主键查询（包含明细和装载信息）
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
public EmisTmsSiteBatch selectEmisTmsSiteBatchWithDetailsById(Long id);
|
||||
|
||||
public EmisTmsSiteBatch selectTmsSiteBatchByBatchNo(String batchNo);
|
||||
|
||||
|
||||
@ -105,4 +105,11 @@ public interface IEmisTmsSiteBatchService
|
||||
* @return
|
||||
*/
|
||||
int addAll(EmisTmsSiteBatch emisTmsSiteBatch) throws EmisBizError;
|
||||
|
||||
/**
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
public EmisTmsSiteBatch geDetail(Long id);
|
||||
}
|
||||
|
||||
@ -243,4 +243,9 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi
|
||||
return 1;
|
||||
}
|
||||
|
||||
@Override
|
||||
public EmisTmsSiteBatch geDetail(Long id) {
|
||||
return emisTmsSiteBatchMapper.selectEmisTmsSiteBatchWithDetailsById(id);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -42,6 +42,12 @@
|
||||
order by create_time desc
|
||||
</select>
|
||||
|
||||
<select id="selectEmisTmsSiteBatchLoadingByBatchNo" parameterType="String" resultMap="EmisTmsSiteBatchLoadingResult">
|
||||
<include refid="selectEmisTmsSiteBatchLoadingVo"/>
|
||||
where del_flag='0' and batch_no = #{batchNo}
|
||||
order by create_time desc
|
||||
</select>
|
||||
|
||||
<select id="checkUnique" parameterType="EmisTmsSiteBatchLoading" resultType="int">
|
||||
select count(1) from emis_tms_site_batch_loading
|
||||
where del_flag='0'
|
||||
|
||||
@ -103,6 +103,31 @@
|
||||
</collection>
|
||||
</resultMap>
|
||||
|
||||
<resultMap type="EmisTmsSiteBatch" id="EmisTmsSiteBatchWithDetailsResult" extends="EmisTmsSiteBatchResult">
|
||||
<!-- 批次明细列表 -->
|
||||
<collection property="batchDtlList" ofType="EmisTmsSiteBatchDtl" select="com.xdadan.erp.emis.mapper.EmisTmsSiteBatchDtlMapper.selectEmisTmsSiteBatchDtlByBatchNo" column="batch_no">
|
||||
<result property="id" column="id"/>
|
||||
<result property="billCode" column="bill_code"/>
|
||||
<result property="batchNo" column="batch_no"/>
|
||||
<result property="scanDate" column="scan_date"/>
|
||||
<result property="scanStatus" column="scan_status"/>
|
||||
<result property="groupStatus" column="group_status"/>
|
||||
<result property="scanMan" column="scan_man"/>
|
||||
<result property="scanSite" column="scan_site"/>
|
||||
<association property="waybillDetail" column="bill_code" select="com.xdadan.erp.emis.mapper.EmisWaybillMapper.selectWaybillBaseInfoByBillCode"/>
|
||||
</collection>
|
||||
<!-- 装载信息列表 -->
|
||||
<collection property="loadingList" ofType="EmisTmsSiteBatchLoading" select="com.xdadan.erp.emis.mapper.EmisTmsSiteBatchLoadingMapper.selectEmisTmsSiteBatchLoadingByBatchNo" column="batch_no">
|
||||
<result property="id" column="id"/>
|
||||
<result property="batchNo" column="batch_no"/>
|
||||
<result property="posNo" column="pos_no"/>
|
||||
<result property="row" column="row"/>
|
||||
<result property="col" column="col"/>
|
||||
<result property="layer" column="layer"/>
|
||||
<result property="posDesc" column="pos_desc"/>
|
||||
</collection>
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectEmisTmsSiteBatchVo">
|
||||
select id, batch_no, batch_name, batch_date, supplier_code, supplier_name, trans_line_type, product_type, batch_type, trans_type, start_site_code, send_country, next_site_code, air_billl_no, etd, eta, car_no, ship_no, clearance_res_status, declare_res_status, dest_country, dest_country_name, trans_weight, pack_num, total_parcel_qty, total_waybill_qty, total_volume, total_weight, op_man, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site, bl_entering from emis_tms_site_batch
|
||||
</sql>
|
||||
@ -323,6 +348,12 @@
|
||||
where a.id = #{id}
|
||||
</select>
|
||||
|
||||
<select id="selectEmisTmsSiteBatchWithDetailsById" parameterType="Long" resultMap="EmisTmsSiteBatchWithDetailsResult">
|
||||
select id, batch_no, batch_name, batch_date, supplier_code, supplier_name, trans_line_type, product_type, batch_type, trans_type, start_site_code, send_country, next_site_code, air_billl_no, etd, eta, car_no, ship_no, clearance_res_status, declare_res_status, dest_country, dest_country_name, trans_weight, pack_num, total_parcel_qty, total_waybill_qty, total_volume, total_weight, op_man, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site, bl_entering
|
||||
from emis_tms_site_batch a
|
||||
where a.id = #{id}
|
||||
</select>
|
||||
|
||||
<select id="selectTmsSiteBatchBySupplerAndCarNo" parameterType="EmisTmsSiteBatch" resultMap="EmisTmsSiteBatchResult">
|
||||
select id, batch_no, batch_name, batch_date, supplier_code, supplier_name, trans_line_type, product_type, batch_type, trans_type, start_site_code, send_country, next_site_code, air_billl_no, etd, eta, car_no, ship_no, clearance_res_status, declare_res_status, dest_country, dest_country_name, trans_weight, pack_num, total_parcel_qty, total_waybill_qty, total_volume, total_weight, op_man, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
|
||||
from emis_tms_site_batch a
|
||||
|
||||
Loading…
Reference in New Issue
Block a user