Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-api-boot-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lanbaoming
jiedao-api-boot-master
Commits
332e26bd
Commit
332e26bd
authored
Jan 22, 2025
by
knight
Committed by
wux
Jan 23, 2025
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug228 (生产)A2500234GA订单调仓到仓动态出现:状态错误
parent
b9207235
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
2 deletions
+11
-2
ErrorCodeConstants.java
.../iocoder/yudao/module/order/enums/ErrorCodeConstants.java
+2
-0
OrderWarehouseAdjustServiceImpl.java
...orderWarehouseAdjust/OrderWarehouseAdjustServiceImpl.java
+4
-0
messages_en.properties
yudao-server/src/main/resources/i18n/messages_en.properties
+1
-0
messages_fr.properties
yudao-server/src/main/resources/i18n/messages_fr.properties
+2
-1
messages_zh.properties
yudao-server/src/main/resources/i18n/messages_zh.properties
+2
-1
No files found.
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/enums/ErrorCodeConstants.java
View file @
332e26bd
...
...
@@ -321,6 +321,8 @@ public interface ErrorCodeConstants {
ErrorCode
ORDER_IS_WAITING_SHIPMENT
=
new
ErrorCode
(
1006010079
,
"order.is.waiting.shipment"
);
ErrorCode
WAREHOUSE_IN_RECORD_DATA_NOT_IS_ZERO
=
new
ErrorCode
(
1006010080
,
"warehouse.in.record.data.not.is.zero"
);
ErrorCode
WAREHOUSE_ADJUST_ILLEGAL_OPERATION
=
new
ErrorCode
(
1006010081
,
"warehouse.adjust.illegal.operation"
);
ErrorCode
USER_NOT_EXISTS
=
new
ErrorCode
(
1004001000
,
"member.user.not.exist"
);
ErrorCode
ORDER_NEED_PERSONAL_KYC
=
new
ErrorCode
(
1004001112
,
"order.need.personal.kyc"
);
...
...
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderWarehouseAdjust/OrderWarehouseAdjustServiceImpl.java
View file @
332e26bd
...
...
@@ -475,6 +475,10 @@ public class OrderWarehouseAdjustServiceImpl extends AbstractService<OrderWareho
if
(
orderWarehouseAdjustDO
==
null
)
{
throw
exception
(
WAREHOUSE_ADJUST_NOT_EXISTS
);
}
// 不是出仓状态不可操作到仓
if
(!
Objects
.
equals
(
OrderWarehouseAdjustStatusEnum
.
deliveries
.
getValue
()
,
orderWarehouseAdjustDO
.
getStatus
())){
throw
exception
(
WAREHOUSE_ADJUST_ILLEGAL_OPERATION
);
}
String
note
=
""
;
// 转异
...
...
yudao-server/src/main/resources/i18n/messages_en.properties
View file @
332e26bd
...
...
@@ -130,6 +130,7 @@ order.warehouse.check.not.exists=order warehouse check not exists
order.warehouse.check.bad.volume
=
order warehouse check bad volume
order.warehouse.check.bad.weight
=
order warehouse check bad weight
warehouse.adjust.not.exists
=
warehouse adjust not exists
warehouse.adjust.illegal.operation
=
warehouse adjust illegal operation
shipment.not.exists
=
Shipment does not exist
shipment.order.exit.not.exists
=
Order exit information does not exist
line.not.open
=
line not open
...
...
yudao-server/src/main/resources/i18n/messages_fr.properties
View file @
332e26bd
...
...
@@ -130,6 +130,7 @@ order.warehouse.check.not.exists=D\u00E9tails des marchandises non trouv\u00E9s
order.warehouse.check.bad.volume
=
Volume de marchandise d
\u
00E9pass
\u
00E9
\u
00E0 l'entrep
\u
00F4t
order.warehouse.check.bad.weight
=
Poids de marchandise d
\u
00E9pass
\u
00E9
\u
00E0 l'entrep
\u
00F4t
warehouse.adjust.not.exists
=
Aucune trace de transfert de stock n'existe
warehouse.adjust.illegal.operation
=
l'entrep
\u
00F4t ajuste l'op
\u
00E9ration ill
\u
00E9gale
shipment.not.exists
=
Bon de sortie introuvable
shipment.order.exit.not.exists
=
Information de sortie de la commande introuvable
line.not.open
=
La ligne n'est pas activ
\u
00E9e
...
...
@@ -661,7 +662,7 @@ prod.brand.not.null=La marque ne peut \u00EAtre vide ou z\u00E9ro
preload.not.exist
=
Bon de sortie sans marchandise pr
\u
00E9charg
\u
00E9e
warehouse.in.property.not.null.and.zero
=
La valeur de {} pour le produit [{}] ne peut
\u
00EAtre vide ou
\u
00E9gale
\u
00E0 0
warehouse.in.box.exception
=
Les commandes d
\u
00E9j
\u
00E0 planifi
\u
00E9es ne peuvent pas
\u
00EAtre modifi
\u
00E9es dans le syst
\u
00E8me de stockage
order.update.box.exception
=
Les commandes sont d
éjà listé
es
order.update.box.exception
=
Les commandes sont d
\u
00E9j
\u
00E0 list
\u
00E9
es
split.order.can.not.change.carton.num
=
Le nombre de colis dans une sous-commande ne peut
\u
00EAtre modifi
\u
00E9
split.order.can.not.change.order.label
=
Le num
\u
00E9ro d'
\u
00E9tiquette des colis d'une sous-commande ne peut
\u
00EAtre modifi
\u
00E9
split.order.can.not.warehouse.in
=
Sous-commande ne peut pas ajouter de nouveaux articles ou cr
\u
00E9er de nouvelles entr
\u
00E9es de stock
...
...
yudao-server/src/main/resources/i18n/messages_zh.properties
View file @
332e26bd
...
...
@@ -130,6 +130,7 @@ order.warehouse.check.not.exists=\u5230\u4ED3\u8D27\u7269\u8BE6\u60C5\u4E0D\u5B5
order.warehouse.check.bad.volume
=
\u5230\u
4ED3
\u
8D27
\u7269\u
4F53
\u
79EF
\u
8D85
\u
51FA
order.warehouse.check.bad.weight
=
\u5230\u
4ED3
\u
8D27
\u7269\u
91CD
\u
91CF
\u
8D85
\u
51FA
warehouse.adjust.not.exists
=
\u
8C03
\u
4ED3
\u
8BB0
\u
5F55
\u
4E0D
\u
5B58
\u5728
warehouse.adjust.illegal.operation
=
\u
8C03
\u
4ED3
\u
8BB0
\u
5F55
\u
975E
\u
6CD5
\u
64CD
\u
4F5C
shipment.not.exists
=
\u
51FA
\u
8D27
\u
4E0D
\u
5B58
\u5728
shipment.order.exit.not.exists
=
\u
8BA2
\u5355\u9000\u
573A
\u
4FE1
\u
606F
\u
4E0D
\u
5B58
\u5728
line.not.open
=
\u
7EBF
\u
8DEF
\u
672A
\u
5F00
\u
901A
...
...
@@ -666,7 +667,7 @@ prod.brand.not.null=\u54C1\u724C\u4E0D\u80FD\u4E3A\u7A7A\u62160
preload.not.exist
=
\u
51FA
\u
8D27
\u5355\u
672A
\u9884\u
88C5
\u
8D27
\u7269
warehouse.in.property.not.null.and.zero
=
\u5546\u
54C1[{}]
\u7684
{}
\u
4E0D
\u
80FD
\u
4E3A
\u
7A7A
\u6216
0
warehouse.in.box.exception
=
\u
8BA2
\u5355\u
5DF2
\u
7ECF
\u6392\u5355\u
4E0D
\u
80FD
\u
64CD
\u
4F5C
\u
4ED3
\u
5E93
\u6570\u
636E
order.update.box.exception
=
\u
8
ba2
\u5355\u
5df2
\u
7ecf
\u6392\u5355
order.update.box.exception
=
\u
8
BA2
\u5355\u
5DF2
\u
7ECF
\u6392\u5355
split.order.can.not.change.carton.num
=
\u
62C6
\u5355\u
8BA2
\u5355\u
4E0D
\u
53EF
\u6539\u
7BB1
\u6570
split.order.can.not.change.order.label
=
\u
62C6
\u5355\u
8BA2
\u5355\u
4E0D
\u
53EF
\u6539\u6807\u
7B7E
\u
7BB1
\u
53F7
split.order.can.not.warehouse.in
=
\u
62C6
\u5355\u
8BA2
\u5355\u
4E0D
\u
53EF
\u
8FFD
\u
52A0
\u5546\u
54C1
\u
548C
\u
6DFB
\u
52A0
\u
65B0
\u5165\u
4ED3
\u
7EAA
\u
5F55
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment