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
1c6ad7c3
Commit
1c6ad7c3
authored
Nov 04, 2024
by
yanghao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
task: #240 空运/海运-PDA/后台, 添加理货相关页面的属性
parent
8d3153c7
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
2 deletions
+14
-2
BoxServiceImpl.java
...der/yudao/module/shipment/service/box/BoxServiceImpl.java
+8
-2
BoxGuanlianOrderBackVO.java
...o/module/shipment/vo/boxTally/BoxGuanlianOrderBackVO.java
+3
-0
BoxTallyBackVO.java
...der/yudao/module/shipment/vo/boxTally/BoxTallyBackVO.java
+3
-0
No files found.
yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/box/BoxServiceImpl.java
View file @
1c6ad7c3
...
@@ -226,9 +226,7 @@ import java.util.*;
...
@@ -226,9 +226,7 @@ import java.util.*;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
import
static
cn
.
iocoder
.
yudao
.
framework
.
common
.
exception
.
util
.
ServiceExceptionUtil
.
exception
;
import
static
cn
.
iocoder
.
yudao
.
framework
.
common
.
exception
.
util
.
ServiceExceptionUtil
.
exception
;
import
static
cn
.
iocoder
.
yudao
.
module
.
order
.
enums
.
ErrorCodeConstants
.
ORDER_IS_APPROVAL_IN_PROCESS
;
import
static
cn
.
iocoder
.
yudao
.
module
.
order
.
enums
.
ErrorCodeConstants
.
ORDER_LINE_CHANNEL_NOT_NULL
;
import
static
cn
.
iocoder
.
yudao
.
module
.
order
.
enums
.
ErrorCodeConstants
.
ORDER_LINE_CHANNEL_NOT_NULL
;
import
static
cn
.
iocoder
.
yudao
.
module
.
order
.
enums
.
OrderApprovalTypeEnum
.
WAREHOUSE_ADJUST
;
import
static
cn
.
iocoder
.
yudao
.
module
.
shipment
.
enums
.
BoxAirStatusEnum
.
TO_WAREHOUSED
;
import
static
cn
.
iocoder
.
yudao
.
module
.
shipment
.
enums
.
BoxAirStatusEnum
.
TO_WAREHOUSED
;
import
static
cn
.
iocoder
.
yudao
.
module
.
shipment
.
enums
.
BoxStatusEnum
.
UNLOADED
;
import
static
cn
.
iocoder
.
yudao
.
module
.
shipment
.
enums
.
BoxStatusEnum
.
UNLOADED
;
import
static
cn
.
iocoder
.
yudao
.
module
.
shipment
.
enums
.
ErrorCodeConstants
.*;
import
static
cn
.
iocoder
.
yudao
.
module
.
shipment
.
enums
.
ErrorCodeConstants
.*;
...
@@ -2198,6 +2196,10 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
...
@@ -2198,6 +2196,10 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
// 设置报关方式
// 设置报关方式
boxTallyBackVO
.
setCustomsType
(
boxPreloadGoodsDO
.
getCustomsType
());
boxTallyBackVO
.
setCustomsType
(
boxPreloadGoodsDO
.
getCustomsType
());
// 是否有关联单
boolean
hasRelationOrder
=
orderGoodsItemList
.
stream
().
anyMatch
(
t
->
t
.
getGuanLianOrderCount
()
>
1
);
boxTallyBackVO
.
setHasRelationOrder
(
hasRelationOrder
);
Long
installNum
=
boxOrderCheckInfoService
.
selectCount
(
new
LambdaQueryWrapperX
<
BoxOrderCheckInfoDO
>()
Long
installNum
=
boxOrderCheckInfoService
.
selectCount
(
new
LambdaQueryWrapperX
<
BoxOrderCheckInfoDO
>()
.
eq
(
BoxOrderCheckInfoDO:
:
getShipmentId
,
shipmentId
)
.
eq
(
BoxOrderCheckInfoDO:
:
getShipmentId
,
shipmentId
)
.
eq
(
BoxOrderCheckInfoDO:
:
getOrderId
,
orderId
)
.
eq
(
BoxOrderCheckInfoDO:
:
getOrderId
,
orderId
)
...
@@ -2281,6 +2283,10 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
...
@@ -2281,6 +2283,10 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
// 设置报关方式
// 设置报关方式
boxGuanlianOrderBackVO
.
setCustomsType
(
boxPreloadGoodsDO
.
getCustomsType
());
boxGuanlianOrderBackVO
.
setCustomsType
(
boxPreloadGoodsDO
.
getCustomsType
());
// 是否有关联单
boolean
hasRelationOrder
=
orderGoodsItemList
.
stream
().
anyMatch
(
t
->
t
.
getGuanLianOrderCount
()
>
1
);
boxGuanlianOrderBackVO
.
setHasRelationOrder
(
hasRelationOrder
);
// Long installNum = boxOrderCheckInfoService.selectCount(new LambdaQueryWrapperX<BoxOrderCheckInfoDO>()
// Long installNum = boxOrderCheckInfoService.selectCount(new LambdaQueryWrapperX<BoxOrderCheckInfoDO>()
// .eq(BoxOrderCheckInfoDO::getShipmentId, shipmentId)
// .eq(BoxOrderCheckInfoDO::getShipmentId, shipmentId)
// .eq(BoxOrderCheckInfoDO::getOrderId, orderIdTmp)
// .eq(BoxOrderCheckInfoDO::getOrderId, orderIdTmp)
...
...
yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/vo/boxTally/BoxGuanlianOrderBackVO.java
View file @
1c6ad7c3
...
@@ -65,4 +65,7 @@ public class BoxGuanlianOrderBackVO {
...
@@ -65,4 +65,7 @@ public class BoxGuanlianOrderBackVO {
@ApiModelProperty
(
value
=
"混箱状态, 1-混箱"
)
@ApiModelProperty
(
value
=
"混箱状态, 1-混箱"
)
private
Integer
mixStatus
=
0
;
private
Integer
mixStatus
=
0
;
@ApiModelProperty
(
value
=
"是否有关联单"
)
private
Boolean
hasRelationOrder
=
false
;
}
}
yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/vo/boxTally/BoxTallyBackVO.java
View file @
1c6ad7c3
...
@@ -77,5 +77,8 @@ public class BoxTallyBackVO {
...
@@ -77,5 +77,8 @@ public class BoxTallyBackVO {
@ApiModelProperty
(
value
=
"混箱状态, 1-混箱"
)
@ApiModelProperty
(
value
=
"混箱状态, 1-混箱"
)
private
Integer
mixStatus
=
0
;
private
Integer
mixStatus
=
0
;
@ApiModelProperty
(
value
=
"是否有关联单"
)
private
Boolean
hasRelationOrder
=
false
;
}
}
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