yunxi
/
jigangSCM2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

通知列表报错

Browse Source
jg-waiwang-pro
vayne 6 months ago
parent 2b65d1d2f5
commit 620d3528bb
1 changed files with 40 additions and 34 deletions
Show Stats Download Patch File Download Diff File

74
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingNotificationController.java
Unescape View File

@ -84,6 +84,8 @@ public class WarehousingNotificationController {
private VoucherService voucherService;
@Autowired
private BusinessCargoService businessCargoService;
@Autowired
private ReturnCargoOrderService returnCargoOrderService;
@Autowired
@ -114,8 +116,8 @@ public class WarehousingNotificationController {
entity.setBusinessCode(businessOrderEntity.getCode());
}else if (entity.getWarehousingType().equals("2")){
//销售入库
BusinessOrderEntity businessOrderEntity = businessOrderService.getInfo(entity.getBusinessId());
entity.setBusinessCode(businessOrderEntity.getCode());
ReturnCargoOrderEntity returnCargoOrderEntity = returnCargoOrderService.getInfo(entity.getBusinessId());
entity.setBusinessCode(returnCargoOrderEntity.getReturnCargoCode());
}else if (entity.getWarehousingType().equals("3")){
//调拨入库
}else if (entity.getWarehousingType().equals("4")){
@ -206,8 +208,8 @@ public class WarehousingNotificationController {
if (entity.getWarehousingType().equals("7")){
//采购出库
BusinessOrderEntity businessOrderEntity = businessOrderService.getInfo(entity.getBusinessId());
entity.setBusinessCode(businessOrderEntity.getCode());
ReturnCargoOrderEntity returnCargoOrderEntity = returnCargoOrderService.getInfo(entity.getBusinessId());
entity.setBusinessCode(returnCargoOrderEntity.getReturnCargoCode());
}else if (entity.getWarehousingType().equals("8")){
//销售出库
BusinessOrderEntity businessOrderEntity = businessOrderService.getInfo(entity.getBusinessId());
@ -622,41 +624,45 @@ public class WarehousingNotificationController {
}
List<BusinessOrderEntity> businessOrderEntityList = new ArrayList<>();
if (StringUtils.isNotEmpty(entity.getBusinessId())){
BusinessOrderEntity businessOrderEntity = businessOrderService.getInfo(entity.getBusinessId());
//业务线名称
if (StringUtil.isNotEmpty(businessOrderEntity.getBusinessLineId())){
BusinessLineEntity businessLineEntity = businessLineService.getInfo(businessOrderEntity.getBusinessLineId());
if (businessLineEntity != null){
businessOrderEntity.setBusinessLineName(businessLineEntity.getName());
}
}
if (businessOrderEntity.getBusinessType().equals("1")) {
//二级供应商名称
if (StringUtil.isNotEmpty(businessOrderEntity.getSecondSubjectBasicId())) {
SubjectbasicEntity subjectbasicEntity = subjectbasicService.getInfo(businessOrderEntity.getSecondSubjectBasicId());
if (subjectbasicEntity != null) {
businessOrderEntity.setSecondSupplyName(subjectbasicEntity.getName());
if (entity.getWarehousingType().equals("1") || entity.getWarehousingType().equals("8")) {
BusinessOrderEntity businessOrderEntity = businessOrderService.getInfo(entity.getBusinessId());
//业务线名称
if (StringUtil.isNotEmpty(businessOrderEntity.getBusinessLineId())) {
BusinessLineEntity businessLineEntity = businessLineService.getInfo(businessOrderEntity.getBusinessLineId());
if (businessLineEntity != null) {
businessOrderEntity.setBusinessLineName(businessLineEntity.getName());
}
}
//三级供应商名称
if (StringUtil.isNotEmpty(businessOrderEntity.getThirdSubjectBasicId())) {
SubjectbasicEntity subjectbasicEntity = subjectbasicService.getInfo(businessOrderEntity.getThirdSubjectBasicId());
if (subjectbasicEntity != null) {
businessOrderEntity.setThirdSupplyName(subjectbasicEntity.getName());
if (businessOrderEntity.getBusinessType().equals("1")) {
//二级供应商名称
if (StringUtil.isNotEmpty(businessOrderEntity.getSecondSubjectBasicId())) {
SubjectbasicEntity subjectbasicEntity = subjectbasicService.getInfo(businessOrderEntity.getSecondSubjectBasicId());
if (subjectbasicEntity != null) {
businessOrderEntity.setSecondSupplyName(subjectbasicEntity.getName());
}
}
}
businessOrderEntityList.add(businessOrderEntity);
entity.setPurchaseOrderInfo(businessOrderEntityList);
}else if (businessOrderEntity.getBusinessType().equals("2")) {
//二级客户名称
if (StringUtil.isNotEmpty(businessOrderEntity.getSecondSubjectBasicId())) {
SubjectbasicEntity subjectbasicEntity = subjectbasicService.getInfo(businessOrderEntity.getSecondSubjectBasicId());
if (subjectbasicEntity != null) {
businessOrderEntity.setSecondCustomName(subjectbasicEntity.getName());
//三级供应商名称
if (StringUtil.isNotEmpty(businessOrderEntity.getThirdSubjectBasicId())) {
SubjectbasicEntity subjectbasicEntity = subjectbasicService.getInfo(businessOrderEntity.getThirdSubjectBasicId());
if (subjectbasicEntity != null) {
businessOrderEntity.setThirdSupplyName(subjectbasicEntity.getName());
}
}
businessOrderEntityList.add(businessOrderEntity);
entity.setPurchaseOrderInfo(businessOrderEntityList);
} else if (businessOrderEntity.getBusinessType().equals("2")) {
//二级客户名称
if (StringUtil.isNotEmpty(businessOrderEntity.getSecondSubjectBasicId())) {
SubjectbasicEntity subjectbasicEntity = subjectbasicService.getInfo(businessOrderEntity.getSecondSubjectBasicId());
if (subjectbasicEntity != null) {
businessOrderEntity.setSecondCustomName(subjectbasicEntity.getName());
}
}
businessOrderEntityList.add(businessOrderEntity);
entity.setSaleOrderInfo(businessOrderEntityList);
}
businessOrderEntityList.add(businessOrderEntity);
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);

Write Preview
Loading…
Cancel
Save