diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java index 9d620129d..1e26ccd21 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java @@ -936,7 +936,6 @@ public class OrderServiceImpl implements OrderService { if (orderMapper.selectCount(new LambdaQueryWrapper() .ne(OrderDO::getId, orderId) .eq(OrderDO::getCustomOrderNo, customOrderNo) - .eq(OrderDO::getDeleted, false) .eq(OrderDO::getOrganId, OrganContextHolder.getOrganId())) > 0) { throw new ServiceException(CUSTOM_ORDER_EXISTS); } @@ -950,7 +949,6 @@ public class OrderServiceImpl implements OrderService { if (!customOrderNo.isEmpty()) { if (orderMapper.selectCount(new LambdaQueryWrapper() .eq(OrderDO::getCustomOrderNo, customOrderNo) - .eq(OrderDO::getDeleted, false) .eq(OrderDO::getOrganId, OrganContextHolder.getOrganId())) > 0) { throw new ServiceException(CUSTOM_ORDER_EXISTS); } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_errorcode_cht.properties b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_errorcode_cht.properties index 3f096c808..e2522f3b7 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_errorcode_cht.properties +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_errorcode_cht.properties @@ -18,7 +18,7 @@ order.not.exists=訂單不存在 parent.order.not.exists=上級訂單{0}不存在 order.can.not.cancel=訂單已進入生產狀態,無法作廢 order.plate.is.plan=目標訂單中存在已排單板件,請從排單中移除後再選擇刪除 -order.check.customno.exists=自定義訂單號已存在 +order.check.customno.exists=自定義訂單號已存在,請刪除原訂單或修改自定義訂單號後再次操作 order.body.not.exists=當前櫃體不存在 order.body.del.no.target=請選擇要刪除的櫃體 order.sub.type.not.support=不支援的子單類型,請重新選擇 diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_errorcode_en.properties b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_errorcode_en.properties index 52350e940..58aafccb0 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_errorcode_en.properties +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_errorcode_en.properties @@ -18,7 +18,7 @@ order.not.exists=Order does not exist parent.order.not.exists=Parent order {0} does not exist order.can.not.cancel=Order has entered production and cannot be canceled order.plate.is.plan=Some plates in the target order have been scheduled. Please remove them before deletion -order.check.customno.exists=Custom order number already exists +order.check.customno.exists=The custom order number already exists. Please delete the original order or modify the custom order number and then operate again order.body.not.exists=Cabinet does not exist order.body.del.no.target=Please select a cabinet to delete order.sub.type.not.support=Unsupported sub-order type, please select again diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_errorcode_zh.properties b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_errorcode_zh.properties index ab7668894..1620feaa2 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_errorcode_zh.properties +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_errorcode_zh.properties @@ -18,7 +18,7 @@ order.not.exists=订单不存在 parent.order.not.exists=上级订单{0}不存在 order.can.not.cancel=订单已进入生产状态,无法作废 order.plate.is.plan=目标订单中存在已排单板件,请从排单中移除后再选择删除 -order.check.customno.exists=自定义订单号已存在 +order.check.customno.exists=自定义订单号已存在,请删除原订单或修改自定义订单号后再次操作 order.body.not.exists=当前柜体不存在 order.body.del.no.target=请选择要删除的柜体 order.sub.type.not.support=不支持的子单类型,请重新选择