通知列表报错

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingNotificationController.java

@@ -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());
+                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("4")){
@@ -206,8 +208,8 @@ public class WarehousingNotificationController {
 
                 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")){
                     //销售出库
                     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 (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 (StringUtil.isNotEmpty(businessOrderEntity.getBusinessLineId())) {
-                if (businessLineEntity != null){
+                    BusinessLineEntity businessLineEntity = businessLineService.getInfo(businessOrderEntity.getBusinessLineId());
-                    businessOrderEntity.setBusinessLineName(businessLineEntity.getName());
+                    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 (businessOrderEntity.getBusinessType().equals("1")) {
-                if (StringUtil.isNotEmpty(businessOrderEntity.getThirdSubjectBasicId())) {
+                    //二级供应商名称
-                    SubjectbasicEntity subjectbasicEntity = subjectbasicService.getInfo(businessOrderEntity.getThirdSubjectBasicId());
+                    if (StringUtil.isNotEmpty(businessOrderEntity.getSecondSubjectBasicId())) {
-                    if (subjectbasicEntity != null) {
+                        SubjectbasicEntity subjectbasicEntity = subjectbasicService.getInfo(businessOrderEntity.getSecondSubjectBasicId());
-                        businessOrderEntity.setThirdSupplyName(subjectbasicEntity.getName());
+                        if (subjectbasicEntity != null) {
+                            businessOrderEntity.setSecondSupplyName(subjectbasicEntity.getName());
+                        }
                     }
-                }
+                    //三级供应商名称
-                businessOrderEntityList.add(businessOrderEntity);
+                    if (StringUtil.isNotEmpty(businessOrderEntity.getThirdSubjectBasicId())) {
-                entity.setPurchaseOrderInfo(businessOrderEntityList);
+                        SubjectbasicEntity subjectbasicEntity = subjectbasicService.getInfo(businessOrderEntity.getThirdSubjectBasicId());
-            }else if (businessOrderEntity.getBusinessType().equals("2")) {
+                        if (subjectbasicEntity != null) {
-                //二级客户名称
+                            businessOrderEntity.setThirdSupplyName(subjectbasicEntity.getName());
-                if (StringUtil.isNotEmpty(businessOrderEntity.getSecondSubjectBasicId())) {
+                        }
-                    SubjectbasicEntity subjectbasicEntity = subjectbasicService.getInfo(businessOrderEntity.getSecondSubjectBasicId());
+                    }
-                    if (subjectbasicEntity != null) {
+                    businessOrderEntityList.add(businessOrderEntity);
-                        businessOrderEntity.setSecondCustomName(subjectbasicEntity.getName());
+                    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);
+            }else if (entity.getWarehousingType().equals("2") || entity.getWarehousingType().equals("7")){
-                entity.setSaleOrderInfo(businessOrderEntityList);
+                ReturnCargoOrderEntity returnCargoOrderEntity = returnCargoOrderService.getInfo(entity.getBusinessId());
             }
         }
         Map<String, Object> warehousingNotificationMap=JsonUtil.entityToMap(entity);