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
1bcf5646
Commit
1bcf5646
authored
Oct 09, 2024
by
332784038@qq.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
海运订单更新了空运到仓动态的bug修复
parent
f8a5c2fa
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
88 additions
and
82 deletions
+88
-82
BoxServiceImpl.java
...der/yudao/module/shipment/service/box/BoxServiceImpl.java
+2
-1
BoxApprovalServiceImpl.java
.../shipment/service/boxApproval/BoxApprovalServiceImpl.java
+84
-79
BoxTrailerServiceImpl.java
...le/shipment/service/boxTrailer/BoxTrailerServiceImpl.java
+2
-2
No files found.
yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/box/BoxServiceImpl.java
View file @
1bcf5646
...
...
@@ -3090,7 +3090,8 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
if
(
boxDO
.
getTransportType
().
equals
(
TransportTypeEnum
.
AIR
.
getType
()))
{
checkOrderTagNum
(
shipmentId
,
0
);
//空运,修改订单状态
updateOrderStatusByShipmentId
(
shipmentId
,
OrderStatusEnum
.
SHIPMENT
.
getValue
(),
null
,
BoxAirStatusEnum
.
TALLY_COMPLETE
.
getStatus
(),
null
,
null
);
updateOrderStatusByShipmentIdAndTransportType
(
shipmentId
,
OrderStatusEnum
.
SHIPMENT
.
getValue
(),
null
,
BoxAirStatusEnum
.
TALLY_COMPLETE
.
getStatus
(),
null
,
null
,
Integer
.
parseInt
(
boxDO
.
getTransportType
()));
}
}
...
...
yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/boxApproval/BoxApprovalServiceImpl.java
View file @
1bcf5646
This diff is collapsed.
Click to expand it.
yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/boxTrailer/BoxTrailerServiceImpl.java
View file @
1bcf5646
...
...
@@ -85,8 +85,8 @@ public class BoxTrailerServiceImpl extends AbstractService<BoxTrailerMapper, Box
//如果是已经派车,则不用再次更新订单状态
if
(
tlStatus
!=
TlStatueEnum
.
HAS_SEND_CAR
.
getTlStatus
())
{
boxService
.
updateOrderStatusByShipmentId
(
shipmentId
,
null
,
null
,
boxDO
.
getShipmentStatus
(),
null
,
null
);
boxService
.
updateOrderStatusByShipmentId
AndTransportType
(
shipmentId
,
null
,
null
,
boxDO
.
getShipmentStatus
(),
null
,
null
,
Integer
.
parseInt
(
boxDO
.
getTransportType
())
);
}
}
boxService
.
updateById
(
boxDO
);
...
...
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