合并工单

sd-business/src/main/java/com/sd/business/entity/production/dto/ProductionWorkOrderSelectDto.java

@@ -4,6 +4,8 @@ import com.ruoyi.common.core.domain.BaseSelectDto;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 /**
  * 生产工单列表查询入参实体
  *
@@ -54,4 +56,9 @@ public class ProductionWorkOrderSelectDto extends BaseSelectDto {
      */
     private String productionWorkOrderCode;
 
+    /**
+     * 工单状态
+     */
+    private List<Integer> status;
+
 }

sd-business/src/main/java/com/sd/business/service/production/impl/ProductionWorkOrderServiceImpl.java

@@ -65,19 +65,6 @@ public class ProductionWorkOrderServiceImpl extends ServiceImpl<ProductionWorkOr
     @Autowired
     private InventoryFinishedService inventoryFinishedService;
 
-    private static ProductionWorkOrder getProductionWorkOrder(ProductionWorkOrder temp) {
-        String code = CodeEnum.BATH_PRODUCTION_WORK_ORDER_CODE.getCode();
-        ProductionWorkOrder productionWorkOrder = new ProductionWorkOrder();
-        productionWorkOrder.setCode(code);
-        productionWorkOrder.setSkuSpecId(temp.getSkuSpecId());
-        productionWorkOrder.setBomSpecId(temp.getBomSpecId());
-        productionWorkOrder.setPrintType(temp.getPrintType());
-        productionWorkOrder.setMachinedPanel(temp.getMachinedPanel());
-        productionWorkOrder.setStatus(0);
-        productionWorkOrder.setType(2);
-        return productionWorkOrder;
-    }
-
     @Override
     public Map<Long, List<ProductionOrderScheduleVo>> getProductionOrderScheduleMap(List<Long> orderIdList) {
         if (orderIdList.isEmpty()) {
@@ -211,7 +198,9 @@ public class ProductionWorkOrderServiceImpl extends ServiceImpl<ProductionWorkOr
     public Page<ProductionWorkOrderVo> getPage(ProductionWorkOrderSelectDto dto) {
         IWrapper<ProductionWorkOrder> wrapper = getWrapper();
         wrapper.orderByDesc("pwo", ProductionWorkOrder::getId);
-        wrapper.eq("oi", OrderInfo::getStatus, OrderStatusEnum.IN_PRODUCTION.getKey());
+        wrapper.isNull("pwo.master_id");
+
+        wrapper.in("pwo", ProductionWorkOrder::getStatus, dto.getStatus());
 
         wrapper.like("oi", OrderInfo::getCode, dto.getOrderCode());
         wrapper.like("oi", OrderInfo::getWlnCode, dto.getOrderWlnCode());
@@ -224,11 +213,6 @@ public class ProductionWorkOrderServiceImpl extends ServiceImpl<ProductionWorkOr
         wrapper.like("bs", BomSpec::getCode, dto.getBomSpecCode());
         wrapper.like("bs", BomSpec::getName, dto.getBomSpecName());
 
-        wrapper.ge("oi", OrderInfo::getDeliveryTime, dto.getBeginTime());
-        wrapper.le("oi", OrderInfo::getDeliveryTime, dto.getEndTime());
-
-        wrapper.isNull("pwo.master_id");
-
         return this.baseMapper.getPage(dto.getPage(), wrapper);
     }
 
@@ -336,6 +320,7 @@ public class ProductionWorkOrderServiceImpl extends ServiceImpl<ProductionWorkOr
 
         // 单片工单关联批量工单
         productionWorkOrderList.forEach(item -> item.setMasterId(productionWorkOrder.getId()));
+        updateBatchById(productionWorkOrderList);
 
         // 发送mq
         RabbitMqUtil.send(WorkOrderConfig.DIRECT_EXCHANGE_NAME, WorkOrderConfig.COMBINED_WORK_ORDER_QUEUE_NAME,
@@ -343,4 +328,17 @@ public class ProductionWorkOrderServiceImpl extends ServiceImpl<ProductionWorkOr
 
     }
 
+    private ProductionWorkOrder getProductionWorkOrder(ProductionWorkOrder temp) {
+        String code = CodeEnum.BATH_PRODUCTION_WORK_ORDER_CODE.getCode();
+        ProductionWorkOrder productionWorkOrder = new ProductionWorkOrder();
+        productionWorkOrder.setCode(code);
+        productionWorkOrder.setSkuSpecId(temp.getSkuSpecId());
+        productionWorkOrder.setBomSpecId(temp.getBomSpecId());
+        productionWorkOrder.setPrintType(temp.getPrintType());
+        productionWorkOrder.setMachinedPanel(temp.getMachinedPanel());
+        productionWorkOrder.setStatus(0);
+        productionWorkOrder.setType(2);
+        return productionWorkOrder;
+    }
+
 }