aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-09-01 17:11:13 +08:00
parent f649526110
commit 1dc8e9fd0f
6 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseIn.java
View File

@ -65,7 +65,6 @@ public class EmisWarehouseIn extends BaseEntity
// 扩展参数
private EmisWaybill waybillDetail;
// 入仓批次信息
private List<EmisWarehouseInBatch> stockInBatchList;

2
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseInBatch.java
View File

@ -88,8 +88,6 @@ public class EmisWarehouseInBatch extends BaseEntity
/* 进仓图片链接 */
private String picUrl;
List<EmisWarehouseInDtl> cargoList;
}

4
emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInBatchMapper.java
View File

@ -36,6 +36,10 @@ public interface EmisWarehouseInBatchMapper extends BaseMapper<EmisWarehouseInBa
*/
public List<EmisWarehouseInBatch> selectEmisWarehouseInBatchList(EmisWarehouseInBatch emisWarehouseInBatch);
public List<EmisWarehouseInBatch> selectInBatchListByInNo(String inNo);
/**
* 新增
*

12
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInServiceImpl.java
View File

@ -11,6 +11,8 @@
package com.xdadan.erp.emis.service.impl;
import java.util.List;
import com.xdadan.erp.emis.mapper.EmisWarehouseInBatchMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.xdadan.erp.emis.domain.EmisWarehouseIn;
@ -29,6 +31,9 @@ public class EmisWarehouseInServiceImpl implements IEmisWarehouseInService
@Autowired
private EmisWarehouseInMapper emisWarehouseInMapper;
@Autowired
private EmisWarehouseInBatchMapper emisWarehouseInBatchMapper;
/**
* 查询进仓单
*
@ -44,7 +49,12 @@ public class EmisWarehouseInServiceImpl implements IEmisWarehouseInService
@Override
public EmisWarehouseIn selectEmisWarehouseInByInNo(String inNo)
{
return emisWarehouseInMapper.selectEmisWarehouseInByInNo(inNo);
EmisWarehouseIn emisWarehouseIn=emisWarehouseInMapper.selectEmisWarehouseInByInNo(inNo);
if(emisWarehouseIn!=null){
emisWarehouseIn.setStockInBatchList(emisWarehouseInBatchMapper.selectInBatchListByInNo(inNo));
}
return emisWarehouseIn;
}

2
emis-biz/src/main/resources/mapper/EmisWarehouseInBatchMapper.xml
View File

@ -91,7 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where a.id = #{id}
</select>
<select id="selectStockInBatchListByInNo" parameterType="String" resultMap="EmisWarehouseInBatchResult">
<select id="selectInBatchListByInNo" parameterType="String" resultMap="EmisWarehouseInBatchResult">
select id, serial_no, in_no, in_batch_no, customer_code, customer_name, order_sn, bill_code, trans_car_no, entry_date, confirm_status, confirm_date, status, bl_prepare_in_freight, prepare_in_est_fee, prepare_in_real_fee, prepare_in_express, prepare_in_bill_code, prepare_in_remark, prepare_in_supplier, pack_type, total_parcel_qty, total_volume, total_weight, pic_url, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
from emis_warehouse_in_batch a
where del_flag='0' and a.in_no = #{inNo}

2
emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml
View File

@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<!-- <association property="stockInBatchList"-->
<!-- column="in_no"-->
<!-- select="com.xdadan.erp.emis.mapper.EmisWarehouseInBatchMapper.selectStockInBatchListByInNo"-->
<!-- select="com.xdadan.erp.emis.mapper.EmisWarehouseInBatchMapper.selectInBatchListByInNo"-->
<!-- fetchType="lazy"-->
<!-- />-->