通知列表报错

jg-waiwang-pro
vayne 6 months ago
parent 2b65d1d2f5
commit 620d3528bb

@ -84,6 +84,8 @@ public class WarehousingNotificationController {
private VoucherService voucherService; private VoucherService voucherService;
@Autowired @Autowired
private BusinessCargoService businessCargoService; private BusinessCargoService businessCargoService;
@Autowired
private ReturnCargoOrderService returnCargoOrderService;
@Autowired @Autowired
@ -114,8 +116,8 @@ public class WarehousingNotificationController {
entity.setBusinessCode(businessOrderEntity.getCode()); entity.setBusinessCode(businessOrderEntity.getCode());
}else if (entity.getWarehousingType().equals("2")){ }else if (entity.getWarehousingType().equals("2")){
//销售入库 //销售入库
BusinessOrderEntity businessOrderEntity = businessOrderService.getInfo(entity.getBusinessId()); ReturnCargoOrderEntity returnCargoOrderEntity = returnCargoOrderService.getInfo(entity.getBusinessId());
entity.setBusinessCode(businessOrderEntity.getCode()); entity.setBusinessCode(returnCargoOrderEntity.getReturnCargoCode());
}else if (entity.getWarehousingType().equals("3")){ }else if (entity.getWarehousingType().equals("3")){
//调拨入库 //调拨入库
}else if (entity.getWarehousingType().equals("4")){ }else if (entity.getWarehousingType().equals("4")){
@ -206,8 +208,8 @@ public class WarehousingNotificationController {
if (entity.getWarehousingType().equals("7")){ if (entity.getWarehousingType().equals("7")){
//采购出库 //采购出库
BusinessOrderEntity businessOrderEntity = businessOrderService.getInfo(entity.getBusinessId()); ReturnCargoOrderEntity returnCargoOrderEntity = returnCargoOrderService.getInfo(entity.getBusinessId());
entity.setBusinessCode(businessOrderEntity.getCode()); entity.setBusinessCode(returnCargoOrderEntity.getReturnCargoCode());
}else if (entity.getWarehousingType().equals("8")){ }else if (entity.getWarehousingType().equals("8")){
//销售出库 //销售出库
BusinessOrderEntity businessOrderEntity = businessOrderService.getInfo(entity.getBusinessId()); BusinessOrderEntity businessOrderEntity = businessOrderService.getInfo(entity.getBusinessId());
@ -622,11 +624,12 @@ public class WarehousingNotificationController {
} }
List<BusinessOrderEntity> businessOrderEntityList = new ArrayList<>(); List<BusinessOrderEntity> businessOrderEntityList = new ArrayList<>();
if (StringUtils.isNotEmpty(entity.getBusinessId())){ if (StringUtils.isNotEmpty(entity.getBusinessId())){
if (entity.getWarehousingType().equals("1") || entity.getWarehousingType().equals("8")) {
BusinessOrderEntity businessOrderEntity = businessOrderService.getInfo(entity.getBusinessId()); BusinessOrderEntity businessOrderEntity = businessOrderService.getInfo(entity.getBusinessId());
//业务线名称 //业务线名称
if (StringUtil.isNotEmpty(businessOrderEntity.getBusinessLineId())){ if (StringUtil.isNotEmpty(businessOrderEntity.getBusinessLineId())) {
BusinessLineEntity businessLineEntity = businessLineService.getInfo(businessOrderEntity.getBusinessLineId()); BusinessLineEntity businessLineEntity = businessLineService.getInfo(businessOrderEntity.getBusinessLineId());
if (businessLineEntity != null){ if (businessLineEntity != null) {
businessOrderEntity.setBusinessLineName(businessLineEntity.getName()); businessOrderEntity.setBusinessLineName(businessLineEntity.getName());
} }
} }
@ -647,7 +650,7 @@ public class WarehousingNotificationController {
} }
businessOrderEntityList.add(businessOrderEntity); businessOrderEntityList.add(businessOrderEntity);
entity.setPurchaseOrderInfo(businessOrderEntityList); entity.setPurchaseOrderInfo(businessOrderEntityList);
}else if (businessOrderEntity.getBusinessType().equals("2")) { } else if (businessOrderEntity.getBusinessType().equals("2")) {
//二级客户名称 //二级客户名称
if (StringUtil.isNotEmpty(businessOrderEntity.getSecondSubjectBasicId())) { if (StringUtil.isNotEmpty(businessOrderEntity.getSecondSubjectBasicId())) {
SubjectbasicEntity subjectbasicEntity = subjectbasicService.getInfo(businessOrderEntity.getSecondSubjectBasicId()); SubjectbasicEntity subjectbasicEntity = subjectbasicService.getInfo(businessOrderEntity.getSecondSubjectBasicId());
@ -658,6 +661,9 @@ public class WarehousingNotificationController {
businessOrderEntityList.add(businessOrderEntity); businessOrderEntityList.add(businessOrderEntity);
entity.setSaleOrderInfo(businessOrderEntityList); entity.setSaleOrderInfo(businessOrderEntityList);
} }
}else if (entity.getWarehousingType().equals("2") || entity.getWarehousingType().equals("7")){
ReturnCargoOrderEntity returnCargoOrderEntity = returnCargoOrderService.getInfo(entity.getBusinessId());
}
} }
Map<String, Object> warehousingNotificationMap=JsonUtil.entityToMap(entity); Map<String, Object> warehousingNotificationMap=JsonUtil.entityToMap(entity);
warehousingNotificationMap.put("id", warehousingNotificationMap.get("id")); warehousingNotificationMap.put("id", warehousingNotificationMap.get("id"));

Loading…
Cancel
Save