提交

src/main/java/cn/ezhizao/project/business/controller/BizInboundOrderController.java

@@ -284,7 +284,7 @@ public class BizInboundOrderController extends BaseController {
         List<BizPackageResourceGroupDetail> bizPackageResourceGroupDetails = bizPackageResourceGroupDetailService.query().in("package_resource_group_id", bizPackageResourceGroups.isEmpty() ? Collections.singletonList(0L) : bizPackageResourceGroups.stream().map(BizPackageResourceGroup::getId).collect(Collectors.toList())).list();
         List<BizProduct> products = bizProductService.query().in("product_code", bizCertificates.isEmpty() ? Collections.singletonList("") : bizCertificates.stream().map(BizCertificate::getProductCode).collect(Collectors.toList())).list();
         List<BizProductionPlanDetail> bizProductionPlanDetails = bizCertificates.isEmpty() ? new ArrayList<>() : bizProductionPlanDetailService.query().in("id", bizCertificates.stream().map(BizCertificate::getProductionPlanDetailId).collect(Collectors.toList())).list();
-        List<BizInboundOrderDetail> checkDetails = bizInboundOrderDetailService.query().in("certificate_code", codes).ne("inbound_order_id", inputDetails.get(0).getInboundOrderId()).list();
+        List<BizInboundOrderDetail> checkDetails = bizInboundOrderDetailService.query().in("certificate_code", codes).ne("inbound_order_id", inputDetails.get(0).getInboundOrderId() == null ? 0L : inputDetails.get(0).getInboundOrderId()).list();
         List<BizCompanyProductPackage> packages = bizCertificates.isEmpty() ? new ArrayList<>() : bizCompanyProductPackageService.query().in("concat(product_code, package_code)", bizCertificates.stream().map(t -> t.getProductCode() + t.getPackageCode()).collect(Collectors.toList())).list();
         List<BizInboundOrderDetail> details = new ArrayList<>();
         codes.forEach(l -> {
@@ -350,6 +350,9 @@ public class BizInboundOrderController extends BaseController {
         if (first == null) {
             first = details.stream().filter(v -> v.getCertificateId() != null).findFirst().orElse(null);
         }
+        if (first == null) {
+            return error("没有可用的合格证号");
+        }
         if (first != null) {
             // 判断和第一个合格证是否是同一产品同一部门，同一包装线，同一包装形式，假设不同 设置 checked false 否则设置 true
             BizInboundOrderDetail finalFirst = first;
@@ -357,7 +360,6 @@ public class BizInboundOrderController extends BaseController {
                 l.setChecked(finalFirst.getProductCode().equals(l.getProductCode()) && finalFirst.getDeptId().equals(l.getDeptId()) && finalFirst.getPackageResourceGroupId().equals(l.getPackageResourceGroupId()) && finalFirst.getPackageTypeCode().equals(l.getPackageTypeCode()) && details.stream().filter(t -> t.getCertificateCode().equals(l.getCertificateCode())).count() <= 1);
             });
         }
-
         AjaxResult result = success(details);
         result.put("checked", details.stream().allMatch(BizInboundOrderDetail::getChecked));
         return result;