From 34cacc6d51297a672ce4b40c04c6045daac69972 Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Fri, 7 Mar 2025 14:20:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=BF=E6=9D=90=E9=80=A0=E5=9E=8B=E5=8E=8B?= =?UTF-8?q?=E7=BC=A9=20=E7=B4=A2=E5=BC=95=E5=8E=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/order/OrderController.java | 6 ++-- .../service/order/OrderInputProcessor.java | 33 +++++++++---------- .../service/order/OrderInputProcessor.java | 3 -- 3 files changed, 19 insertions(+), 23 deletions(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java index a995d02a1..057282b69 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java @@ -110,7 +110,7 @@ public class OrderController { private String errKey = "生产数据导入异常,{}"; public static final String ORDER_PLATE_MODEL = "imes_order_plate_model"; - public static final String ORDER_PLATE_MODEL_COMPRESS = "imes_order_plate_model_compress"; +// public static final String ORDER_PLATE_MODEL_COMPRESS = "imes_order_plate_model_compress"; public static final String ORDER_PARTS_REMARK_MODEL = "imes_order_parts_remark_model"; @PutMapping("/update") @Operation(summary = "更新生产单") @@ -232,7 +232,7 @@ public class OrderController { OrderDO orderDO = orderMapper.selectById(orderId); if (orderDO == null) { orderInputProcessor.deleteByOrderId(orderId, ORDER_PLATE_MODEL); - orderInputProcessor.deleteByOrderId(orderId, ORDER_PLATE_MODEL_COMPRESS); +// orderInputProcessor.deleteByOrderId(orderId, ORDER_PLATE_MODEL_COMPRESS); orderInputProcessor.deleteByOrderId(orderId, ORDER_PARTS_REMARK_MODEL); } @@ -382,7 +382,7 @@ public class OrderController { if (ObjectUtil.isNotNull(orderDO) && ObjectUtil.isNotNull(orderMapper.selectById(orderDO.getId()))) { Long deleteOrderId = orderDO.getId(); orderInputProcessor.deleteByOrderId(deleteOrderId, ORDER_PLATE_MODEL); - orderInputProcessor.deleteByOrderId(deleteOrderId, ORDER_PLATE_MODEL_COMPRESS); +// orderInputProcessor.deleteByOrderId(deleteOrderId, ORDER_PLATE_MODEL_COMPRESS); orderInputProcessor.deleteByOrderId(deleteOrderId, ORDER_PARTS_REMARK_MODEL); } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderInputProcessor.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderInputProcessor.java index d29a18854..e91ce5067 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderInputProcessor.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderInputProcessor.java @@ -16,7 +16,6 @@ import com.cf.imes.module.executor.dal.dataobject.orderGroup.OrderGroupDO; import com.cf.imes.module.executor.dal.dataobject.orderItem.OrderItemDO; import com.cf.imes.module.executor.dal.dataobject.orderParts.OrderPartsDO; import com.cf.imes.module.executor.dal.dataobject.orderParts.PartsDO; -import com.cf.imes.module.executor.dal.dataobject.ordermodel.OrderModelCompressDO; import com.cf.imes.module.executor.dal.dataobject.ordermodel.OrderModelDO; import com.cf.imes.module.executor.dal.dataobject.plate.PlateDO; import com.cf.imes.module.executor.dal.dataobject.plate.PlateGoodDO; @@ -99,7 +98,7 @@ public class OrderInputProcessor { public static final String ORDER_PARTS_REMARK_MODEL = "imes_order_parts_remark_model"; - public static final String ORDER_PLATE_MODEL_COMPRESS = "imes_order_plate_model_compress"; +// public static final String ORDER_PLATE_MODEL_COMPRESS = "imes_order_plate_model_compress"; /** * 批量保存生产单小板五金数据 @@ -210,21 +209,21 @@ public class OrderInputProcessor { * * @param orderModelDOs */ - public void batchSaveCompressModel(List orderModelDOs) { - try { - BulkResponse bulkResponse = esDocumentService.bulkCreate(ORDER_PLATE_MODEL_COMPRESS, orderModelDOs); - boolean errors = bulkResponse.errors(); - if (errors) { - log.error(bulkResponse.items().toString()); - throw new ServiceException(500, "未知异常"); - } - } catch (IOException | ElasticsearchException e) { - e.printStackTrace(); - log.error(e.getMessage()); - throw new RuntimeException(e); - } - - } +// public void batchSaveCompressModel(List orderModelDOs) { +// try { +// BulkResponse bulkResponse = esDocumentService.bulkCreate(ORDER_PLATE_MODEL_COMPRESS, orderModelDOs); +// boolean errors = bulkResponse.errors(); +// if (errors) { +// log.error(bulkResponse.items().toString()); +// throw new ServiceException(500, "未知异常"); +// } +// } catch (IOException | ElasticsearchException e) { +// e.printStackTrace(); +// log.error(e.getMessage()); +// throw new RuntimeException(e); +// } +// +// } diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/order/OrderInputProcessor.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/order/OrderInputProcessor.java index e66cc31d7..9e36b19c6 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/order/OrderInputProcessor.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/order/OrderInputProcessor.java @@ -41,9 +41,6 @@ public class OrderInputProcessor { public static final String ORDER_PLATE_MODEL = "imes_order_plate_model"; - - public static final String ORDER_PLATE_MODEL_COMPRESS = "imes_order_plate_model_compress"; - public static final String ORDER_PARTS_REMARK_MODEL = "imes_order_parts_remark_model"; private static final String FIELD_ORDER_ID = "orderId";