Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-14 21:52:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

板材造型压缩 索引去除

Browse Source
This commit is contained in:
liuzhaotian
2025-03-07 14:20:54 +08:00
parent c6fec72adf
commit 34cacc6d51
3 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java
+3 -3
View File
@@ -110,7 +110,7 @@ public class OrderController {
private String errKey = "生产数据导入异常,{}"; private String errKey = "生产数据导入异常,{}";
public static final String ORDER_PLATE_MODEL = "imes_order_plate_model"; 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"; public static final String ORDER_PARTS_REMARK_MODEL = "imes_order_parts_remark_model";
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新生产单") @Operation(summary = "更新生产单")
@@ -232,7 +232,7 @@ public class OrderController {
OrderDO orderDO = orderMapper.selectById(orderId); OrderDO orderDO = orderMapper.selectById(orderId);
if (orderDO == null) { if (orderDO == null) {
orderInputProcessor.deleteByOrderId(orderId, ORDER_PLATE_MODEL); 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); orderInputProcessor.deleteByOrderId(orderId, ORDER_PARTS_REMARK_MODEL);
} }
@@ -382,7 +382,7 @@ public class OrderController {
if (ObjectUtil.isNotNull(orderDO) && ObjectUtil.isNotNull(orderMapper.selectById(orderDO.getId()))) { if (ObjectUtil.isNotNull(orderDO) && ObjectUtil.isNotNull(orderMapper.selectById(orderDO.getId()))) {
Long deleteOrderId = orderDO.getId(); Long deleteOrderId = orderDO.getId();
orderInputProcessor.deleteByOrderId(deleteOrderId, ORDER_PLATE_MODEL); 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); orderInputProcessor.deleteByOrderId(deleteOrderId, ORDER_PARTS_REMARK_MODEL);
} }
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderInputProcessor.java
+16 -17
View File
@@ -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.orderItem.OrderItemDO;
import com.cf.imes.module.executor.dal.dataobject.orderParts.OrderPartsDO; 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.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.ordermodel.OrderModelDO;
import com.cf.imes.module.executor.dal.dataobject.plate.PlateDO; import com.cf.imes.module.executor.dal.dataobject.plate.PlateDO;
import com.cf.imes.module.executor.dal.dataobject.plate.PlateGoodDO; 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_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 * @param orderModelDOs
*/ */
public void batchSaveCompressModel(List<OrderModelCompressDO> orderModelDOs) { // public void batchSaveCompressModel(List<OrderModelCompressDO> orderModelDOs) {
try { // try {
BulkResponse bulkResponse = esDocumentService.bulkCreate(ORDER_PLATE_MODEL_COMPRESS, orderModelDOs); // BulkResponse bulkResponse = esDocumentService.bulkCreate(ORDER_PLATE_MODEL_COMPRESS, orderModelDOs);
boolean errors = bulkResponse.errors(); // boolean errors = bulkResponse.errors();
if (errors) { // if (errors) {
log.error(bulkResponse.items().toString()); // log.error(bulkResponse.items().toString());
throw new ServiceException(500, "未知异常"); // throw new ServiceException(500, "未知异常");
} // }
} catch (IOException | ElasticsearchException e) { // } catch (IOException | ElasticsearchException e) {
e.printStackTrace(); // e.printStackTrace();
log.error(e.getMessage()); // log.error(e.getMessage());
throw new RuntimeException(e); // throw new RuntimeException(e);
} // }
//
} // }
cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/order/OrderInputProcessor.java
-3
View File
@@ -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 = "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"; public static final String ORDER_PARTS_REMARK_MODEL = "imes_order_parts_remark_model";
private static final String FIELD_ORDER_ID = "orderId"; private static final String FIELD_ORDER_ID = "orderId";