mirror of
http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git
synced 2026-08-12 21:02:08 +08:00
1、cad拆单移除es新增造型数据;2、未排单列表暂时移除es造型数据;
This commit is contained in:
+2
@@ -12,6 +12,7 @@ import com.cf.imes.module.executor.dal.dataobject.order.OrderDO;
|
||||
import com.cf.imes.module.executor.dal.dataobject.ordermodel.OrderModelDO;
|
||||
import com.cf.imes.module.executor.dal.dataobject.plan.PlanDO;
|
||||
import com.cf.imes.module.system.api.machine.dto.MachineDTO;
|
||||
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
@@ -28,6 +29,7 @@ import java.util.List;
|
||||
@Builder
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@JsonInclude(JsonInclude.Include.NON_NULL)
|
||||
public class OrderSource {
|
||||
|
||||
@Schema(description = "优化后的大板数据")
|
||||
|
||||
+2
-2
@@ -791,7 +791,7 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
|
||||
AssertUtils.notEmpty(plateDetailRespVOS, ORDER_PLATE_EMPTY);
|
||||
|
||||
// todo 数据结构改后,可以增加排单ID作为筛选,只查为 0 的
|
||||
List<OrderModelDO> orderModelDOS = getOrderModels(orderIds, orderGoodsIds);
|
||||
// List<OrderModelDO> orderModelDOS = getOrderModels(orderIds, orderGoodsIds);
|
||||
|
||||
AssertUtils.notEmpty(plateDetailRespVOS,ORDER_PLATE_MODEL_DATE_ERROR);
|
||||
|
||||
@@ -799,7 +799,7 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
|
||||
.orderList(orderDOS)
|
||||
.goodsList(goodsReqVOS)
|
||||
.plateList(plateDetailRespVOS)
|
||||
.plateModels(orderModelDOS)
|
||||
// .plateModels(orderModelDOS)
|
||||
.build();
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user