UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

切换分支备份

Browse Source
lh_dev_fifo
yewj 7 months ago
parent dcc5122621
commit 98f36fdc9d
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File

33
src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java
Unescape Escape View File

@ -138,6 +138,7 @@ public class IoOrderDetailResultController extends BaseController {
PageInfo<IoOrderDetailDeptResultResponse> pageInfo = new PageInfo<>(getOrderDeptResult(orderDetailResultRequest)); PageInfo<IoOrderDetailDeptResultResponse> pageInfo = new PageInfo<>(getOrderDeptResult(orderDetailResultRequest));
return ResultVOUtils.page(pageInfo); return ResultVOUtils.page(pageInfo);
} }
/** /**
* 查询单据仓库带票出入库明细 * 查询单据仓库带票出入库明细
* *
@ -163,6 +164,7 @@ public class IoOrderDetailResultController extends BaseController {
PageInfo<IoOrderDetailDeptProductResultResponse> pageInfo = new PageInfo<>(getOrderDeptProductResult(orderDetailResultRequest)); PageInfo<IoOrderDetailDeptProductResultResponse> pageInfo = new PageInfo<>(getOrderDeptProductResult(orderDetailResultRequest));
return ResultVOUtils.page(pageInfo); return ResultVOUtils.page(pageInfo);
} }
/** /**
* 查询单据仓库产品出库科室明细 * 查询单据仓库产品出库科室明细
* *
@ -244,7 +246,6 @@ public class IoOrderDetailResultController extends BaseController {
} }
public List<IoOrderDetailResultResponse> getOrderResult(FilterOrderDetailResultRequest orderDetailResultRequest) { public List<IoOrderDetailResultResponse> getOrderResult(FilterOrderDetailResultRequest orderDetailResultRequest) {
if (CollUtil.isNotEmpty(orderDetailResultRequest.getList())) { if (CollUtil.isNotEmpty(orderDetailResultRequest.getList())) {
return orderDetailResultRequest.getList(); return orderDetailResultRequest.getList();
@ -562,7 +563,7 @@ public class IoOrderDetailResultController extends BaseController {
List<IoOrderDetailDeptResultResponse> ioOrderDetailResultResponseList = new ArrayList<>(); List<IoOrderDetailDeptResultResponse> ioOrderDetailResultResponseList = new ArrayList<>();
SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(filterOrderDetailDeptResultRequest.getTemplateId()); SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(filterOrderDetailDeptResultRequest.getTemplateId());
LambdaQueryWrapper<SysPdfTemplateRelevanceBizEntity> qw = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysPdfTemplateRelevanceBizEntity> qw = new LambdaQueryWrapper<>();
qw.eq(SysPdfTemplateRelevanceBizEntity::getTemplateId,systemPDFTemplateEntity.getId()); qw.eq(SysPdfTemplateRelevanceBizEntity::getTemplateId, systemPDFTemplateEntity.getId());
qw.last("limit 1"); qw.last("limit 1");
SysPdfTemplateRelevanceBizEntity sysPdfTemplateRelevanceBizEntity = systemPDFTemplateRelevanceBizService.getOne(qw); SysPdfTemplateRelevanceBizEntity sysPdfTemplateRelevanceBizEntity = systemPDFTemplateRelevanceBizService.getOne(qw);
@ -633,7 +634,7 @@ public class IoOrderDetailResultController extends BaseController {
List<InvCountOrderSumResultResponse> ioOrderDetailResultResponseList = new ArrayList<>(); List<InvCountOrderSumResultResponse> ioOrderDetailResultResponseList = new ArrayList<>();
SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(filterInvCountOrderSumResultRequest.getTemplateId()); SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(filterInvCountOrderSumResultRequest.getTemplateId());
LambdaQueryWrapper<SysPdfTemplateRelevanceBizEntity> qw = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysPdfTemplateRelevanceBizEntity> qw = new LambdaQueryWrapper<>();
qw.eq(SysPdfTemplateRelevanceBizEntity::getTemplateId,systemPDFTemplateEntity.getId()); qw.eq(SysPdfTemplateRelevanceBizEntity::getTemplateId, systemPDFTemplateEntity.getId());
qw.last("limit 1"); qw.last("limit 1");
SysPdfTemplateRelevanceBizEntity sysPdfTemplateRelevanceBizEntity = systemPDFTemplateRelevanceBizService.getOne(qw); SysPdfTemplateRelevanceBizEntity sysPdfTemplateRelevanceBizEntity = systemPDFTemplateRelevanceBizService.getOne(qw);
@ -674,7 +675,7 @@ public class IoOrderDetailResultController extends BaseController {
ioOrderDetailResultData.put("employeeName", filterInvCountOrderSumResultRequest.getEmployeeName() == null ? ' ' : filterInvCountOrderSumResultRequest.getEmployeeName()); ioOrderDetailResultData.put("employeeName", filterInvCountOrderSumResultRequest.getEmployeeName() == null ? ' ' : filterInvCountOrderSumResultRequest.getEmployeeName());
ioOrderDetailResultData.put("exportTime", dateStr); ioOrderDetailResultData.put("exportTime", dateStr);
if (sysPdfTemplateRelevanceBizEntity != null){ if (sysPdfTemplateRelevanceBizEntity != null) {
ioOrderDetailResultData.put("remark1", sysPdfTemplateRelevanceBizEntity.getRemark1() == null ? ' ' : sysPdfTemplateRelevanceBizEntity.getRemark1()); ioOrderDetailResultData.put("remark1", sysPdfTemplateRelevanceBizEntity.getRemark1() == null ? ' ' : sysPdfTemplateRelevanceBizEntity.getRemark1());
ioOrderDetailResultData.put("remark2", sysPdfTemplateRelevanceBizEntity.getRemark2() == null ? ' ' : sysPdfTemplateRelevanceBizEntity.getRemark2()); ioOrderDetailResultData.put("remark2", sysPdfTemplateRelevanceBizEntity.getRemark2() == null ? ' ' : sysPdfTemplateRelevanceBizEntity.getRemark2());
ioOrderDetailResultData.put("remark3", sysPdfTemplateRelevanceBizEntity.getRemark3() == null ? ' ' : sysPdfTemplateRelevanceBizEntity.getRemark3()); ioOrderDetailResultData.put("remark3", sysPdfTemplateRelevanceBizEntity.getRemark3() == null ? ' ' : sysPdfTemplateRelevanceBizEntity.getRemark3());
@ -692,7 +693,6 @@ public class IoOrderDetailResultController extends BaseController {
} }
/** /**
* 仓库出入库明细打印 * 仓库出入库明细打印
* *
@ -705,7 +705,7 @@ public class IoOrderDetailResultController extends BaseController {
List<IoOrderDetailDeptResultResponse> ioOrderDetailResultResponseList = new ArrayList<>(); List<IoOrderDetailDeptResultResponse> ioOrderDetailResultResponseList = new ArrayList<>();
SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(filterOrderDetailDeptResultRequest.getTemplateId()); SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(filterOrderDetailDeptResultRequest.getTemplateId());
LambdaQueryWrapper<SysPdfTemplateRelevanceBizEntity> qw = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysPdfTemplateRelevanceBizEntity> qw = new LambdaQueryWrapper<>();
qw.eq(SysPdfTemplateRelevanceBizEntity::getTemplateId,systemPDFTemplateEntity.getId()); qw.eq(SysPdfTemplateRelevanceBizEntity::getTemplateId, systemPDFTemplateEntity.getId());
qw.last("limit 1"); qw.last("limit 1");
SysPdfTemplateRelevanceBizEntity sysPdfTemplateRelevanceBizEntity = systemPDFTemplateRelevanceBizService.getOne(qw); SysPdfTemplateRelevanceBizEntity sysPdfTemplateRelevanceBizEntity = systemPDFTemplateRelevanceBizService.getOne(qw);
@ -776,7 +776,7 @@ public class IoOrderDetailResultController extends BaseController {
List<IoOrderDetailDeptProductResultResponse> ioOrderDetailResultResponseList = new ArrayList<>(); List<IoOrderDetailDeptProductResultResponse> ioOrderDetailResultResponseList = new ArrayList<>();
SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(filterOrderDetailDeptResultRequest.getTemplateId()); SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(filterOrderDetailDeptResultRequest.getTemplateId());
LambdaQueryWrapper<SysPdfTemplateRelevanceBizEntity> qw = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysPdfTemplateRelevanceBizEntity> qw = new LambdaQueryWrapper<>();
qw.eq(SysPdfTemplateRelevanceBizEntity::getTemplateId,systemPDFTemplateEntity.getId()); qw.eq(SysPdfTemplateRelevanceBizEntity::getTemplateId, systemPDFTemplateEntity.getId());
qw.last("limit 1"); qw.last("limit 1");
SysPdfTemplateRelevanceBizEntity sysPdfTemplateRelevanceBizEntity = systemPDFTemplateRelevanceBizService.getOne(qw); SysPdfTemplateRelevanceBizEntity sysPdfTemplateRelevanceBizEntity = systemPDFTemplateRelevanceBizService.getOne(qw);
@ -837,7 +837,6 @@ public class IoOrderDetailResultController extends BaseController {
} }
/** /**
* 入账库明细打印 * 入账库明细打印
* *
@ -883,15 +882,15 @@ public class IoOrderDetailResultController extends BaseController {
Map<String, Object> ioOrderDetailResultData = new HashMap<>(); Map<String, Object> ioOrderDetailResultData = new HashMap<>();
ioOrderDetailResultData.put("index", String.valueOf(i)); ioOrderDetailResultData.put("index", String.valueOf(i));
ioOrderDetailResultData.put("cpmctymc", item.getCpmctymc() == null ? "" : item.getCpmctymc()); ioOrderDetailResultData.put("cpmctymc", item.getCpmctymc() == null ? "" : item.getCpmctymc());
ioOrderDetailResultData.put("ggxh",item.getGgxh() == null ? "" : item.getGgxh()); ioOrderDetailResultData.put("ggxh", item.getGgxh() == null ? "" : item.getGgxh());
ioOrderDetailResultData.put("inCount",item.getInCount()); ioOrderDetailResultData.put("inCount", item.getInCount());
ioOrderDetailResultData.put("outCount",item.getOutCount()); ioOrderDetailResultData.put("outCount", item.getOutCount());
ioOrderDetailResultData.put("reCount",item.getReCount()); ioOrderDetailResultData.put("reCount", item.getReCount());
ioOrderDetailResultData.put("measname",item.getMeasname() == null ? "" : item.getMeasname()); ioOrderDetailResultData.put("measname", item.getMeasname() == null ? "" : item.getMeasname());
ioOrderDetailResultData.put("batchNo",item.getBatchNo() == null ? "" : item.getBatchNo()); ioOrderDetailResultData.put("batchNo", item.getBatchNo() == null ? "" : item.getBatchNo());
ioOrderDetailResultData.put("price",item.getPrice() == null ? "" : item.getPrice()); ioOrderDetailResultData.put("price", item.getPrice() == null ? "" : item.getPrice());
ioOrderDetailResultData.put("supName",item.getSupName() == null ? "" : item.getSupName()); ioOrderDetailResultData.put("supName", item.getSupName() == null ? "" : item.getSupName());
ioOrderDetailResultData.put("ylqxzcrbarmc",item.getYlqxzcrbarmc() == null ? "" : item.getYlqxzcrbarmc()); ioOrderDetailResultData.put("ylqxzcrbarmc", item.getYlqxzcrbarmc() == null ? "" : item.getYlqxzcrbarmc());
ioOrderDetailResultData.put("locInvName", filterInvProductRequest.getLocInvName() == null ? ' ' : filterInvProductRequest.getLocInvName()); ioOrderDetailResultData.put("locInvName", filterInvProductRequest.getLocInvName() == null ? ' ' : filterInvProductRequest.getLocInvName());
list.add(ioOrderDetailResultData); list.add(ioOrderDetailResultData);

Write Preview
Loading…
Cancel
Save