通知列表报错

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,6 +624,7 @@ public class WarehousingNotificationController {
         }
         List<BusinessOrderEntity> businessOrderEntityList = new ArrayList<>();
         if (StringUtils.isNotEmpty(entity.getBusinessId())){
+            if (entity.getWarehousingType().equals("1") || entity.getWarehousingType().equals("8")) {
                 BusinessOrderEntity businessOrderEntity = businessOrderService.getInfo(entity.getBusinessId());
                 //业务线名称
                 if (StringUtil.isNotEmpty(businessOrderEntity.getBusinessLineId())) {
@@ -658,6 +661,9 @@ public class WarehousingNotificationController {
                     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);
         warehousingNotificationMap.put("id", warehousingNotificationMap.get("id"));