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-02 23:28:15 +08:00
parent 122aae545d
commit 6db97c7fff
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,6 +72,10 @@ public class EmisWarehouseIn extends BaseEntity
/* 总重量 */
private BigDecimal totalWeight;
/* 进仓标记 0-未进仓 1-已进仓 */
private String stockInFlag;
// 入仓批次信息
private List<EmisWarehouseInBatch> stockInBatchList;

3
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
View File

@ -3350,7 +3350,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
// 生成模版
XWPFTemplate template = XWPFTemplate.compile(fis, config).render(fillMap);
response.setContentType("application/octet-stream");
// response.setContentType("application/octet-stream");
response.setContentType("application/pdf");
response.setHeader("Content-Disposition", "attachment;fileName=" + fileName + ".pdf");
ByteArrayOutputStream bos = new ByteArrayOutputStream();

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

@ -29,16 +29,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<resultMap id="EmisWarehouseInDetailResult" type="EmisWarehouseIn" extends="BaseEmisWarehouseInResult" >
<association property="waybillDetail"
column="bill_code"
select="com.xdadan.erp.emis.mapper.EmisWaybillMapper.selectWaybillBaseInfoByBillCode"
fetchType="lazy"
/>
</resultMap>
<!-- <resultMap id="EmisWarehouseInDetailWithBatchListResult" type="EmisWarehouseIn" extends="BaseEmisWarehouseInResult" >-->
<!-- <association property="stockInBatchList"-->
<!-- column="in_no"-->