Merge remote-tracking branch 'origin/master'

src/main/java/cn/ezhizao/project/business/product/controller/BizCarrierController.java

@@ -84,7 +84,7 @@ public class BizCarrierController extends BaseController {
     public AjaxResult getInfo(@PathVariable Long id) {
         BizCarrier curCarrier = bizCarrierService.getOne(new QueryWrapper<BizCarrier>().eq("id", id));
         BizCarrierCategory carrierCategory = bizCarrierService.getCarrierCategory(curCarrier.getCategoryId());
-        List<BizDayworkCarrier> dayworkCarrierList = bizDayworkCarrierService.query().eq("is_changed", 0).eq("carrier_id", id).list();
+        List<BizDayworkCarrier> dayworkCarrierList = bizDayworkCarrierService.query().eq("process_inspection_id", 0L).eq("is_changed", 0).eq("carrier_id", id).list();
 //        if (dayworkCarrierList.size() > 0 && curCarrier.getIsAllowMore() == 0) { // 单独通过箱子的字段判断
 //            return error("该载具已被使用，未解绑无法使用");
 //        }
@@ -143,7 +143,7 @@ public class BizCarrierController extends BaseController {
         }
 
         // 获取该报工对应箱。
-        List<BizDayworkCarrier> dayworkCarriers = bizDayworkCarrierService.query().eq("is_changed", 0).eq("daywork_id", bizDaywork.getId()).list();
+        List<BizDayworkCarrier> dayworkCarriers = bizDayworkCarrierService.query().eq("is_changed", 0).eq("process_inspection_id", 0L).eq("daywork_id", bizDaywork.getId()).list();
         List<BizDayworkItem> currentItem = bizDayworkItemService.query().eq("daywork_id", bizDaywork.getId()).orderByDesc("create_time").list();
         List<BizCarrier> carriers = bizCarrierService.query().in("id", dayworkCarriers.isEmpty() ? Collections.singletonList(0L) : dayworkCarriers.stream().map(BizDayworkCarrier::getCarrierId).collect(Collectors.toList())).list();
         List<BizCarrierReject> carrierRejects = bizCarrierRejectService.query().in("carrier_id", carriers.isEmpty() ? Collections.singletonList(0L) : carriers.stream().map(BizCarrier::getId).collect(Collectors.toList())).list();
@@ -174,7 +174,7 @@ public class BizCarrierController extends BaseController {
             return AjaxResult.error("该批次关联多个铁箱，请选择正确的载具。");
         }
         // 获取这些箱对应的所有批次
-        List<BizDayworkCarrier> carrierDaywork = bizDayworkCarrierService.query().eq("is_changed", 0).in("carrier_id",carriers.isEmpty() ? Collections.singletonList(0L) : carriers.stream().map(BizCarrier::getId).collect(Collectors.toList())).list();
+        List<BizDayworkCarrier> carrierDaywork = bizDayworkCarrierService.query().eq("is_changed", 0).eq("process_inspection_id", 0L).in("carrier_id",carriers.isEmpty() ? Collections.singletonList(0L) : carriers.stream().map(BizCarrier::getId).collect(Collectors.toList())).list();
         // 获取所有批次的报工状态
         List<BizDaywork> bizDayworks = bizDayworkService.query().in("id",carrierDaywork.isEmpty() ? Collections.singletonList(0L) : carrierDaywork.stream().map(BizDayworkCarrier::getDayworkId).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();
@@ -272,7 +272,7 @@ public class BizCarrierController extends BaseController {
         curCarrier.setCarrierCode(curCarrier.getCode());
         bizDaywork.setNewCarrierId(curCarrier.getId());
         BizCarrierCategory carrierCategory = bizCarrierService.getCarrierCategory(curCarrier.getCategoryId());
-        List<BizDayworkCarrier> dayworkCarrierList = bizDayworkCarrierService.query().eq("is_changed", 0).eq("carrier_code", bizDaywork.getNewCarrierCode()).list();
+        List<BizDayworkCarrier> dayworkCarrierList = bizDayworkCarrierService.query().eq("process_inspection_id", 0L).eq("is_changed", 0).eq("carrier_code", bizDaywork.getNewCarrierCode()).list();
 
         if (!dayworkCarrierList.isEmpty() && carrierCategory.getIsAllowMore() == 0) { // 通过类别判断
             return error("该载具已被使用，未解绑无法使用");

src/main/java/cn/ezhizao/project/business/product/controller/BizDayworkController.java

@@ -137,7 +137,7 @@ public class BizDayworkController extends BaseController {
             List<BizLot> lotList1 = bizLotService.query()
                     .like("lot_code", keywords)
                     .list();
-            List<Long> dayworkCarrierIds = bizDayworkCarrierService.query().like("carrier_code", keywords).list().stream().map(BizDayworkCarrier::getDayworkId).collect(Collectors.toList());
+            List<Long> dayworkCarrierIds = bizDayworkCarrierService.query().like("carrier_code", keywords).eq("process_inspection_id", 0L).list().stream().map(BizDayworkCarrier::getDayworkId).collect(Collectors.toList());
             List<BizDaywork> dayworkByCarriers = bizDayworkService.query().in("id", dayworkCarrierIds.isEmpty() ? Collections.singletonList(0L) : dayworkCarrierIds).list();
             List<BizLot> lotList2 = bizLotService.query().in("id", dayworkByCarriers.isEmpty() ? Collections.singletonList(0L) :dayworkByCarriers.stream().map(BizDaywork::getLotId).collect(Collectors.toList())).list();
             Set<BizLot> uniqueSet = Stream.of(lotList1, lotList2)
@@ -271,6 +271,7 @@ public class BizDayworkController extends BaseController {
             /* ****************************** 获取daywork 与 箱子 carrier 相关 ****************************** */
             // 根据daywork_id的集合，获取到所有daywork与箱子关联的中间表 biz_daywork_carrier，用于在循环中精确查询匹配的箱子
             List<BizDayworkCarrier> dayworkCarriers = bizDayworkCarrierService.query()
+                    .eq("process_inspection_id", 0L)
                     .in("daywork_id", dayworkIdList)
                     .eq("is_changed", 0)
                     .list();
@@ -898,6 +899,7 @@ public class BizDayworkController extends BaseController {
                     List<BizDayworkCarrier> carrierList =
                             bizDayworkCarrierService.query().eq("carrier_id", item.getCarrierId())
                                     .eq("is_changed", 0)
+                                    .eq("process_inspection_id", 0L)
 //                                    .last("and exists (select 1 from biz_daywork where biz_daywork.id = biz_daywork_carrier.daywork_id and biz_daywork.deleted = 0)")
                                     .list();
                     bizDayworkCarrierService.list(new QueryWrapper<BizDayworkCarrier>());
@@ -919,7 +921,7 @@ public class BizDayworkController extends BaseController {
             for (BizDayworkCarrier item : bizDaywork.getDayworkCarriers()) {
                 item.setDayworkId(bizDaywork.getId());
             }
-            List<BizDayworkCarrier> oldList = bizDayworkCarrierService.query().eq("daywork_id", bizDaywork.getId()).eq("is_changed", 0).list();
+            List<BizDayworkCarrier> oldList = bizDayworkCarrierService.query().eq("daywork_id", bizDaywork.getId()).eq("process_inspection_id",0L).eq("is_changed", 0).list();
             return toAjax(saveOrUpdateCarrierBatch(bizDayworkCarrierService, bizDaywork.getDayworkCarriers(), oldList));
         }
     }
@@ -1086,7 +1088,7 @@ public class BizDayworkController extends BaseController {
             }
             // 判断该批次是否已被领取
             // 获取该批次最后一条的状态
-            List<BizDayworkCarrier> bizDayworkCarriers = bizDayworkCarrierService.query().eq("carrier_id", bizCarrier.getId()).eq("is_changed", 0).list();
+            List<BizDayworkCarrier> bizDayworkCarriers = bizDayworkCarrierService.query().eq("process_inspection_id", 0L).eq("carrier_id", bizCarrier.getId()).eq("is_changed", 0).list();
             if (bizDayworkCarriers.isEmpty()) {
                 throw new RuntimeException("该载具未绑定任何批次！");
             }
@@ -1282,8 +1284,8 @@ public class BizDayworkController extends BaseController {
         bizDayworkService.updateById(daywork);
 
         // 删除周转信息，删除所有周转箱关联的Item
-        List<BizDayworkCarrier> dayworkCarriers = bizDayworkCarrierService.query().eq("is_changed", 0).eq("daywork_id", bizDaywork.getId()).list();
-        List<BizDayworkCarrier> allCarries = bizDayworkCarrierService.query().eq("is_changed", 0).in("carrier_id", dayworkCarriers.isEmpty() ? Collections.singletonList(0L) : dayworkCarriers.stream().map(BizDayworkCarrier::getCarrierId).collect(Collectors.toList())).list();
+        List<BizDayworkCarrier> dayworkCarriers = bizDayworkCarrierService.query().eq("process_inspection_id", 0L).eq("is_changed", 0).eq("daywork_id", bizDaywork.getId()).list();
+        List<BizDayworkCarrier> allCarries = bizDayworkCarrierService.query().eq("process_inspection_id", 0L).eq("is_changed", 0).in("carrier_id", dayworkCarriers.isEmpty() ? Collections.singletonList(0L) : dayworkCarriers.stream().map(BizDayworkCarrier::getCarrierId).collect(Collectors.toList())).list();
         List<BizDayworkItem> list = bizDayworkItemService.query().in("daywork_id", allCarries.isEmpty() ? Collections.singletonList(0L) : allCarries.stream().map(BizDayworkCarrier::getDayworkId).collect(Collectors.toList())).eq("status", 4).list();
         return toAjax(bizDayworkItemService.removeBatchByIds(list.stream().map(BizDayworkItem::getId).collect(Collectors.toList())));
     }
@@ -1321,7 +1323,7 @@ public class BizDayworkController extends BaseController {
         //批次绑定的载具
         List<BizDayworkCarrier> bizDayworkCarrier = new ArrayList<>();
         if (!dayworkIds.isEmpty()) {
-            bizDayworkCarrier = bizDayworkCarrierService.query().eq("is_changed", 0).in("daywork_id", dayworkIds).list();
+            bizDayworkCarrier = bizDayworkCarrierService.query().eq("process_inspection_id", 0L).eq("is_changed", 0).in("daywork_id", dayworkIds).list();
             //查找所有批次
             List<BizDaywork> dayworkList = bizDayworkService.query().in("id", dayworkIds).list();
             //正常批次

src/main/java/cn/ezhizao/project/business/product/controller/BizDayworkItemController.java

@@ -834,7 +834,7 @@ public class BizDayworkItemController extends BaseController {
         // 判断开始报工的批次在不在滚筒,如果在开始报工后制动鼓解绑载具
         SysDept dept = sysDeptMapper.selectDeptById(bizDayworkItem.getDeptId());
         if (dept.getAutoUnbind() == 1) {
-            List<BizDayworkCarrier> oldList = bizDayworkCarrierService.query().eq("daywork_id", bizDayworkItem.getDayworkId()).eq("is_changed", 0).list();
+            List<BizDayworkCarrier> oldList = bizDayworkCarrierService.query().eq("daywork_id", bizDayworkItem.getDayworkId()).eq("process_inspection_id", 0L).eq("is_changed", 0).list();
             List<BizDayworkCarrier> newList = oldList.stream().collect(Collectors.toList());
             newList.forEach(item -> item.setIsChanged(1));
             saveOrUpdateCarrierBatch(bizDayworkCarrierService, newList, oldList);
@@ -1096,8 +1096,8 @@ public class BizDayworkItemController extends BaseController {
         SysDept sysDept = sysDeptMapper.selectDeptByCode(bizDayworkItem.getDeptCode());
         bizDayworkItem.setDeptId(sysDept.getDeptId());
         bizDayworkItem.setDeptName(sysDept.getDeptName());
-        List<BizDayworkCarrier> dayworkCarriers = bizDayworkCarrierService.query().eq("is_changed", 0).eq("daywork_id", bizDayworkItem.getDayworkId()).list();
-        List<BizDayworkCarrier> allCarries = bizDayworkCarrierService.query().eq("is_changed", 0).in("carrier_id", dayworkCarriers.isEmpty() ? Collections.singletonList(0L) : dayworkCarriers.stream().map(BizDayworkCarrier::getCarrierId).collect(Collectors.toList())).list();
+        List<BizDayworkCarrier> dayworkCarriers = bizDayworkCarrierService.query().eq("process_inspection_id", 0L).eq("is_changed", 0).eq("daywork_id", bizDayworkItem.getDayworkId()).list();
+        List<BizDayworkCarrier> allCarries = bizDayworkCarrierService.query().eq("is_changed", 0).eq("process_inspection_id", 0L).in("carrier_id", dayworkCarriers.isEmpty() ? Collections.singletonList(0L) : dayworkCarriers.stream().map(BizDayworkCarrier::getCarrierId).collect(Collectors.toList())).list();
         // 关联批次的所有最后一条报工
         List<BizDayworkItem> bizDayworkItems = bizDayworkItemService.query().in("daywork_id", allCarries.isEmpty() ? Collections.singletonList(0L) : allCarries.stream().map(BizDayworkCarrier::getDayworkId).collect(Collectors.toList())).in("status", Arrays.asList("0", "1", "2", "3")).orderByDesc("status").orderByDesc("create_time").list();
         List<BizDayworkItem> bizDayworkItemList = bizDayworkItemService.query().in("daywork_id", allCarries.isEmpty() ? Collections.singletonList(0L) : allCarries.stream().map(BizDayworkCarrier::getDayworkId).collect(Collectors.toList())).list();
@@ -1170,9 +1170,9 @@ public class BizDayworkItemController extends BaseController {
         boolean batch = true;
 //        bizDayworkItem.getCarrierId();
         // 根据 daywork_item 中的 daywork_id，获取到所有未解绑的【daywork 与 箱子】的集合，通过这个集合，可以知道该批次下绑定了多少个箱子
-        List<BizDayworkCarrier> dayworkCarriers = bizDayworkCarrierService.query().eq("is_changed", 0).eq("daywork_id", bizDayworkItem.getDayworkId()).list();
+        List<BizDayworkCarrier> dayworkCarriers = bizDayworkCarrierService.query().eq("is_changed", 0).eq("process_inspection_id", 0L).eq("daywork_id", bizDayworkItem.getDayworkId()).list();
         // 再根据上面获得到的数据，通过箱子的id（carrier_id），再进行查找，有多少个批次与该箱子绑定，这是因为存在一箱多批的情况。这样就获得到了所有的批次
-        List<BizDayworkCarrier> allCarries = bizDayworkCarrierService.query().eq("is_changed", 0).in("carrier_id", dayworkCarriers.isEmpty() ? Collections.singletonList(0L) : dayworkCarriers.stream().map(BizDayworkCarrier::getCarrierId).collect(Collectors.toList())).list();
+        List<BizDayworkCarrier> allCarries = bizDayworkCarrierService.query().eq("process_inspection_id", 0L).eq("is_changed", 0).in("carrier_id", dayworkCarriers.isEmpty() ? Collections.singletonList(0L) : dayworkCarriers.stream().map(BizDayworkCarrier::getCarrierId).collect(Collectors.toList())).list();
 
         // 根据获取到的所有批次的id，查询出所有批次的报工信息，并且状态是【"0", "1", "2", "3"】，按状态值倒序、创建日期的倒序，对数据进行排序，得到的数据是还未周转的数据。
         // 后续会通过该集合，获取某批次的最后一条报工信息

src/main/java/cn/ezhizao/project/business/product/controller/BizQuickDayworkController.java

@@ -94,7 +94,7 @@ public class BizQuickDayworkController extends BaseController {
         List<BizLotTechnologicalProcessDetail> tProcessDetails = bizLotTechnologicalProcessDetailService.query().in("lot_technological_process_id", lotTechnologicalProcessIds.isEmpty() ? Collections.singletonList(0L) : list.stream().map(BizDayworkItem::getTechnologicalProcessId).distinct().collect(Collectors.toList())).list();
         List<BizProductionPlanDetail> details = productionPlanDetailService.query().in("id", list.isEmpty() ? Collections.singletonList("0") : list.stream().map(BizDayworkItem::getProductionPlanDetailId).collect(Collectors.toList())).list();
         // 获取箱号
-        List<BizDayworkCarrier> dayworkCarriers = bizDayworkCarrierService.query().eq("is_changed", 0).in("daywork_id", list.isEmpty() ? Collections.singletonList("0") : list.stream().map(BizDayworkItem::getDayworkId).collect(Collectors.toList())).list();
+        List<BizDayworkCarrier> dayworkCarriers = bizDayworkCarrierService.query().eq("process_inspection_id", 0L).eq("is_changed", 0).in("daywork_id", list.isEmpty() ? Collections.singletonList("0") : list.stream().map(BizDayworkItem::getDayworkId).collect(Collectors.toList())).list();
         List<BizDaywork> dayworks = bizDayworkService.query().in("id", list.isEmpty() ? Collections.singletonList(0L) : list.stream().map(BizDayworkItem::getDayworkId).collect(Collectors.toList())).list();
         // 获取临时周转信息
         List<BizQuickDayworkNextInfo> dayworkNextInfos = quickDayworkNextInfoService.query().in("daywork_item_id", list.isEmpty() ? Collections.singletonList("0") : list.stream().map(BizDayworkItem::getId).collect(Collectors.toList())).list();
@@ -138,10 +138,10 @@ public class BizQuickDayworkController extends BaseController {
         List<BizDayworkItem> updateItems = new ArrayList<>();
         List<BizDaywork> updateDaywork = new ArrayList<>();
         // 判断下都有哪些周转箱
-        List<BizDayworkCarrier> dayworkCarriers = bizDayworkCarrierService.query().in("daywork_id", items.stream().map(BizDayworkItem::getDayworkId).collect(Collectors.toList())).eq("is_changed", 0).list();
+        List<BizDayworkCarrier> dayworkCarriers = bizDayworkCarrierService.query().eq("process_inspection_id", 0L).in("daywork_id", items.stream().map(BizDayworkItem::getDayworkId).collect(Collectors.toList())).eq("is_changed", 0).list();
         // 判断下周转箱有哪些批次
         List<BizDaywork> dayworks = bizDayworkService.query().in("id", dayworkCarriers.stream().map(BizDayworkCarrier::getDayworkId).collect(Collectors.toList())).list();
-        List<BizDayworkCarrier> allCarrier = bizDayworkCarrierService.query().in("daywork_id", items.stream().map(BizDayworkItem::getDayworkId).collect(Collectors.toList())).list();
+        List<BizDayworkCarrier> allCarrier = bizDayworkCarrierService.query().eq("process_inspection_id", 0L).in("daywork_id", items.stream().map(BizDayworkItem::getDayworkId).collect(Collectors.toList())).list();
         List<BizDayworkItem> dayworkItemList = bizDayworkItemService.query().in("daywork_id", dayworks.stream().map(BizDaywork::getId).collect(Collectors.toList())).list();
         AtomicBoolean checkFinishBatch = new AtomicBoolean(true);
         dayworks.forEach(l -> {
@@ -245,7 +245,7 @@ public class BizQuickDayworkController extends BaseController {
         List<BizProductionPlanDetail> list = productionPlanDetailService.getInfo(bizProductionPlanDetail);
         // 判断该批次是否已被领取
         // 获取该批次最后一条的状态
-        List<BizDayworkCarrier> bizDayworkCarriers = bizDayworkCarrierService.query().eq("carrier_id", bizDayworkItem.getCarrierId()).eq("is_changed", 0).list();
+        List<BizDayworkCarrier> bizDayworkCarriers = bizDayworkCarrierService.query().eq("process_inspection_id", 0L).eq("carrier_id", bizDayworkItem.getCarrierId()).eq("is_changed", 0).list();
         List<BizDaywork> bizDayworks = bizDayworkService.query().eq("dept_id", dept.getDeptId()).in("id", bizDayworkCarriers.isEmpty() ? Collections.singletonList("0") : bizDayworkCarriers.stream().map(BizDayworkCarrier::getDayworkId).collect(Collectors.toList())).list();
         List<BizDayworkItem> allBizDayworkItem = bizDayworkItemService.query().in("production_plan_detail_id", list.isEmpty() ? Collections.singletonList("0") : list.stream().map(BizProductionPlanDetail::getId).collect(Collectors.toList())).in("daywork_id", bizDayworks.isEmpty() ? Collections.singletonList("0") : bizDayworks.stream().map(BizDaywork::getId).collect(Collectors.toList())).orderByDesc("create_time").list();
 //        bizDayworks.forEach(l -> l.setDayworkItemList(allBizDayworkItem.stream().filter(v -> v.getDeptId().equals(bizDayworkItem.getDeptId()) && v.getDayworkId().equals(l.getId())).collect(Collectors.toList())));
@@ -370,7 +370,7 @@ public class BizQuickDayworkController extends BaseController {
         List<BizProductionPlanDetail> list = productionPlanDetailService.getInfo(bizProductionPlanDetail);
         // 判断该批次是否已被领取
         // 获取该批次最后一条的状态
-        List<BizDayworkCarrier> bizDayworkCarriers = bizDayworkCarrierService.query().eq("carrier_code", bizDayworkItem.getCarrierCode()).eq("is_changed", 0).list();
+        List<BizDayworkCarrier> bizDayworkCarriers = bizDayworkCarrierService.query().eq("process_inspection_id", 0L).eq("carrier_code", bizDayworkItem.getCarrierCode()).eq("is_changed", 0).list();
         List<BizDaywork> bizDayworks = bizDayworkService.query()
                 .eq("dept_id", dept.getDeptId())
                 .in("id", bizDayworkCarriers.isEmpty() ? Collections.singletonList("0") : bizDayworkCarriers.stream().map(BizDayworkCarrier::getDayworkId).collect(Collectors.toList())).list();

src/main/java/cn/ezhizao/project/business/product/controller/SortDayworkController.java

@@ -73,7 +73,7 @@ public class SortDayworkController extends BaseController {
         conditions.setId(item.getId());
         List<BizDayworkItem> firstList = bizDayworkItemService.getList(conditions);
         item = firstList.isEmpty() ? item : firstList.get(0);
-        List<BizDayworkItemReject> rejectList = bizDayworkItemRejectService.query().eq("daywork_item_id", item.getId()).list();
+        List<BizDayworkItemReject> rejectList = bizDayworkItemRejectService.query().eq("daywork_item_id", item.getId()).eq("process_inspection_id", 0L).list();
         item.setRejectList(rejectList);
         List<BizDayworkItemConsult> consults = bizDayworkItemConsultService.query().eq("daywork_item_id", item.getId()).list();
         item.setConsults(consults);
@@ -207,7 +207,7 @@ public class SortDayworkController extends BaseController {
             returnCarrier = item.getProcessStepNumber().equals(bizTechnologicalProcessDetails.stream().filter(v -> !v.getTenantId().equals(9L)).max(Comparator.comparing(BizTechnologicalProcessDetail::getProcessStepNumber)).orElse(new BizTechnologicalProcessDetail()).getProcessStepNumber());
         }
         if (returnCarrier) {
-            List<BizDayworkCarrier> bizDayworkCarriers = bizDayworkCarrierService.query().eq("daywork_id", item.getDayworkId()).eq("is_changed", 0).list();
+            List<BizDayworkCarrier> bizDayworkCarriers = bizDayworkCarrierService.query().eq("daywork_id", item.getDayworkId()).eq("process_inspection_id", 0L).eq("is_changed", 0).list();
             bizDayworkCarriers.forEach(l -> {
                 l.setIsChanged(1);
             });

src/main/resources/mybatis/business/product/BizDayworkCarrierMapper.xml

@@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <update id="removeByDayworkId">
-        update biz_daywork_carrier set is_changed = 1 where daywork_id = #{dayworkId}
+        update biz_daywork_carrier set is_changed = 1 where daywork_id = #{dayworkId} and process_inspection_id = 0
     </update>
 
     <delete id="physicalDelete">

src/main/resources/mybatis/business/product/BizDayworkMapper.xml

@@ -77,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="getCarrier" resultType="java.lang.String">
-        select  GROUP_CONCAT( code SEPARATOR ', ' ) as carrierName from biz_carrier where id in (select carrier_id from biz_daywork_carrier where deleted = 0 and is_changed=0 and daywork_id = #{id})
+        select  GROUP_CONCAT( code SEPARATOR ', ' ) as carrierName from biz_carrier where id in (select carrier_id from biz_daywork_carrier where deleted = 0 and is_changed=0 and daywork_id = #{id} and process_inspection_id = 0)
     </select>
     <select id="getLotCode" parameterType="Long" resultType="java.lang.String">
         SELECT lot_code FROM biz_lot WHERE deleted = 0 AND id = #{lotId}