pad接口-请领单-请领车提交：返回成功失败提示语

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java

@@ -311,6 +311,7 @@ public class QingLingServiceImpl implements IQinglingApi {
             //请购车未添加物料
             if (CollectionUtils.isEmpty(gwcList)) {
                 result.put("status", "empty");
+                result.put("message", "请选择请领物料");
                 return result;
             }
 
@@ -326,11 +327,19 @@ public class QingLingServiceImpl implements IQinglingApi {
 
                     // 过滤disabledWlList，只保留在gwcList中也存在的wlId
                     disabledWlList = disabledWlList.stream()
+                            .filter(item -> item != null && item.getWlId() != null)
                             .filter(item -> gwcWlIds.contains(item.getWlId()))
                             .collect(Collectors.toList());
+
                     if (!CollectionUtils.isEmpty(disabledWlList)) {
                         result.put("status", "exist");
                         result.put("existList", disabledWlList);
+
+                        // 将materialName用顿号拼接
+                        String materialNames = disabledWlList.stream()
+                                .map(InvoicingQldInfoEntity::getMaterialName)
+                                .collect(Collectors.joining("、"));
+                        result.put("message", "以下物料请领中，请勿重复请领：" + materialNames);
                         return result;
                     }
                 }
@@ -419,6 +428,7 @@ public class QingLingServiceImpl implements IQinglingApi {
             invoicingQldLogMapper.insert(logData);
 
             result.put("status", "success");
+            result.put("message", "提交成功");
             return result;
         }