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-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

禅道bug#1716修复

Browse Source
This commit is contained in:
gaoqr
2026-06-24 15:51:33 +08:00
parent ce24ef2db0
commit 8800681fa0
4 changed files with 3 additions and 5 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/service/order/OrderServiceImpl.java
-2
View File
@@ -936,7 +936,6 @@ public class OrderServiceImpl implements OrderService {
if (orderMapper.selectCount(new LambdaQueryWrapper<OrderDO>() if (orderMapper.selectCount(new LambdaQueryWrapper<OrderDO>()
.ne(OrderDO::getId, orderId) .ne(OrderDO::getId, orderId)
.eq(OrderDO::getCustomOrderNo, customOrderNo) .eq(OrderDO::getCustomOrderNo, customOrderNo)
.eq(OrderDO::getDeleted, false)
.eq(OrderDO::getOrganId, OrganContextHolder.getOrganId())) > 0) { .eq(OrderDO::getOrganId, OrganContextHolder.getOrganId())) > 0) {
throw new ServiceException(CUSTOM_ORDER_EXISTS); throw new ServiceException(CUSTOM_ORDER_EXISTS);
} }
@@ -950,7 +949,6 @@ public class OrderServiceImpl implements OrderService {
if (!customOrderNo.isEmpty()) { if (!customOrderNo.isEmpty()) {
if (orderMapper.selectCount(new LambdaQueryWrapper<OrderDO>() if (orderMapper.selectCount(new LambdaQueryWrapper<OrderDO>()
.eq(OrderDO::getCustomOrderNo, customOrderNo) .eq(OrderDO::getCustomOrderNo, customOrderNo)
.eq(OrderDO::getDeleted, false)
.eq(OrderDO::getOrganId, OrganContextHolder.getOrganId())) > 0) { .eq(OrderDO::getOrganId, OrganContextHolder.getOrganId())) > 0) {
throw new ServiceException(CUSTOM_ORDER_EXISTS); throw new ServiceException(CUSTOM_ORDER_EXISTS);
} }
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_errorcode_cht.properties
+1 -1
View File
@@ -18,7 +18,7 @@ order.not.exists=訂單不存在
parent.order.not.exists=上級訂單{0}不存在 parent.order.not.exists=上級訂單{0}不存在
order.can.not.cancel=訂單已進入生產狀態，無法作廢 order.can.not.cancel=訂單已進入生產狀態，無法作廢
order.plate.is.plan=目標訂單中存在已排單板件，請從排單中移除後再選擇刪除 order.plate.is.plan=目標訂單中存在已排單板件，請從排單中移除後再選擇刪除
order.check.customno.exists=自定義訂單號已存在 order.check.customno.exists=自定義訂單號已存在，請刪除原訂單或修改自定義訂單號後再次操作
order.body.not.exists=當前櫃體不存在 order.body.not.exists=當前櫃體不存在
order.body.del.no.target=請選擇要刪除的櫃體 order.body.del.no.target=請選擇要刪除的櫃體
order.sub.type.not.support=不支援的子單類型，請重新選擇 order.sub.type.not.support=不支援的子單類型，請重新選擇
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_errorcode_en.properties
+1 -1
View File
@@ -18,7 +18,7 @@ order.not.exists=Order does not exist
parent.order.not.exists=Parent order {0} 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.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.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.not.exists=Cabinet does not exist
order.body.del.no.target=Please select a cabinet to delete order.body.del.no.target=Please select a cabinet to delete
order.sub.type.not.support=Unsupported sub-order type, please select again order.sub.type.not.support=Unsupported sub-order type, please select again
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_errorcode_zh.properties
+1 -1
View File
@@ -18,7 +18,7 @@ order.not.exists=订单不存在
parent.order.not.exists=上级订单{0}不存在 parent.order.not.exists=上级订单{0}不存在
order.can.not.cancel=订单已进入生产状态，无法作废 order.can.not.cancel=订单已进入生产状态，无法作废
order.plate.is.plan=目标订单中存在已排单板件，请从排单中移除后再选择删除 order.plate.is.plan=目标订单中存在已排单板件，请从排单中移除后再选择删除
order.check.customno.exists=自定义订单号已存在 order.check.customno.exists=自定义订单号已存在，请删除原订单或修改自定义订单号后再次操作
order.body.not.exists=当前柜体不存在 order.body.not.exists=当前柜体不存在
order.body.del.no.target=请选择要删除的柜体 order.body.del.no.target=请选择要删除的柜体
order.sub.type.not.support=不支持的子单类型，请重新选择 order.sub.type.not.support=不支持的子单类型，请重新选择