11.15

src/main/java/cn/ezhizao/project/business/auxiliaryDaywork/controller/BizDayworkAuxiliaryItemController.java

@@ -145,9 +145,15 @@ public class BizDayworkAuxiliaryItemController extends BaseController {
     @PostMapping("/getInfoByCarrierCode")
     public AjaxResult getInfoByCarrierCode(@RequestBody BizDayworkAuxiliaryItem bizDayworkAuxiliaryItem) {
         BizCarrier bizCarrier = bizCarrierService.query().eq("code", bizDayworkAuxiliaryItem.getCarrierCode()).one();
+        if (bizCarrier == null) {
+            return error("未找到该箱号");
+        }
+        if(bizCarrier.getIsInspection() == 1){
+            return error("请扫正常箱码");
+        }
         List<BizDayworkCarrier> bizDayworkCarriers = bizDayworkCarrierService.query().eq("carrier_id", bizCarrier.getId()).eq("is_changed", 0).list();
         List<BizDaywork> bizDayworks = bizDayworkService.query().in("id", bizDayworkCarriers.isEmpty() ? Collections.singletonList(0L) : bizDayworkCarriers.stream().map(BizDayworkCarrier::getDayworkId).collect(Collectors.toList())).list();
-        List<BizDayworkCarrier> carriers = bizDayworkCarrierService.query().eq("is_changed", 0).in("daywork_id", bizDayworks.isEmpty() ? Collections.singletonList(0L) : bizDayworks.stream().map(BizDaywork::getId).collect(Collectors.toList())).list();
+        List<BizDayworkCarrier> carriers = bizDayworkCarrierService.query().eq("is_changed", 0).eq("process_inspection_id",0).in("daywork_id", bizDayworks.isEmpty() ? Collections.singletonList(0L) : bizDayworks.stream().map(BizDaywork::getId).collect(Collectors.toList())).list();
         List<BizDayworkItem> bizDayworkItems = bizDayworkItemService.query().in("daywork_id", bizDayworks.isEmpty() ? Collections.singletonList(0L) : bizDayworks.stream().map(BizDaywork::getId).collect(Collectors.toList())).list();
         List<BizProduct> bizProducts = bizProductService.query().in("id", bizDayworks.isEmpty() ?Collections.singletonList(0L) : bizDayworks.stream().map(BizDaywork::getProductId).collect(Collectors.toList())).list();
         bizDayworks.forEach(l -> {