Commit 4a5f85bf by 赵剑炜

盘点规则调整

parent 590bb009
...@@ -11,6 +11,7 @@ import java.util.List; ...@@ -11,6 +11,7 @@ import java.util.List;
public class BussinessInventoryDto implements Serializable { public class BussinessInventoryDto implements Serializable {
private String id; private String id;
private String rules; private String rules;
private String rulesText;
private String totalNum; private String totalNum;
private String actualNum; private String actualNum;
private String addNum; private String addNum;
......
...@@ -466,6 +466,26 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor ...@@ -466,6 +466,26 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
@Override @Override
public BussinessInventoryDto GetDetailById(BussinessInventoryReq req) { public BussinessInventoryDto GetDetailById(BussinessInventoryReq req) {
BussinessInventory inventory= this.getById(req.getOrderId()); BussinessInventory inventory= this.getById(req.getOrderId());
String rules="盘点规则-";
if (inventory.getInventoryType().equals(1))//按装备类型盘点
{
QueryEquipmentTypeReq typeReq=new QueryEquipmentTypeReq();
typeReq.setTypeIds(inventory.getRules());
String types= equipmentTypeService.GetEquipmentByIds(typeReq);
rules=rules+"类别盘点:"+types;
} else if (inventory.getInventoryType().equals(2))//按装备号型盘点
{
QueryEquipmentTypeReq typeReq=new QueryEquipmentTypeReq();
typeReq.setSizeIds(inventory.getRules());
String sizes= equipmentTypeService.GetEquipmentBySizeIds(typeReq);
rules=rules+"类别及号型盘点:"+sizes;
}
else
{
rules=rules+"整库盘点";
}
List<InventoryDetailDto> detailsMain= bussinessInventoryMapper.GetBussinessInventoryMap(req.getOrderId()); List<InventoryDetailDto> detailsMain= bussinessInventoryMapper.GetBussinessInventoryMap(req.getOrderId());
List<BussinessDetail> detailsChildren = bussinessInventoryDetailService.list( List<BussinessDetail> detailsChildren = bussinessInventoryDetailService.list(
new LambdaQueryWrapper<BussinessDetail>().eq(BussinessDetail::getInventoryId, req.getOrderId()) new LambdaQueryWrapper<BussinessDetail>().eq(BussinessDetail::getInventoryId, req.getOrderId())
...@@ -473,6 +493,7 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor ...@@ -473,6 +493,7 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
List<EquipmentListDto> eqDtoList=new ArrayList<>(); List<EquipmentListDto> eqDtoList=new ArrayList<>();
BussinessInventoryDto BIDTO=new BussinessInventoryDto(); BussinessInventoryDto BIDTO=new BussinessInventoryDto();
BIDTO.setRulesText(rules);
BeanPlusUtil.copyProperties(inventory,BIDTO); BeanPlusUtil.copyProperties(inventory,BIDTO);
for (InventoryDetailDto detail : detailsMain) { for (InventoryDetailDto detail : detailsMain) {
EquipmentListDto eqDto = new EquipmentListDto(); EquipmentListDto eqDto = new EquipmentListDto();
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论