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
aa361efc
Commit
aa361efc
authored
May 13, 2024
by
liuzeheng
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into dev
parents
8dcfef09
4a10d8c0
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
188 additions
and
20 deletions
+188
-20
BoxOrderCheckInfoService.java
...t/service/boxOrderCheckInfo/BoxOrderCheckInfoService.java
+3
-0
BoxOrderCheckInfoServiceImpl.java
...rvice/boxOrderCheckInfo/BoxOrderCheckInfoServiceImpl.java
+2
-2
BoxPkgOrderServiceImpl.java
.../shipment/service/boxPkgOrder/BoxPkgOrderServiceImpl.java
+177
-18
BoxPkgOrderScanCodeVO.java
...module/shipment/vo/boxPkgOrder/BoxPkgOrderScanCodeVO.java
+6
-0
No files found.
yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/boxOrderCheckInfo/BoxOrderCheckInfoService.java
View file @
aa361efc
...
...
@@ -4,6 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import
cn.iocoder.yudao.framework.common.pojo.PageResult
;
import
cn.iocoder.yudao.framework.mybatis.core.service.IService
;
import
cn.iocoder.yudao.framework.mybatis.core.vo.PageVO
;
import
cn.iocoder.yudao.module.order.dal.dataobject.order.OrderDO
;
import
cn.iocoder.yudao.module.shipment.dal.dataobject.boxOrderCheckInfo.BoxOrderCheckInfoDO
;
import
cn.iocoder.yudao.module.shipment.dto.OrderCheckInfoDto
;
import
cn.iocoder.yudao.module.shipment.vo.box.BoxOrderSearchVO
;
...
...
@@ -83,4 +84,6 @@ public interface BoxOrderCheckInfoService extends IService<BoxOrderCheckInfoDO>
void
batchRemove
(
BoxOrderCheckInfoRemoveReqVO
removeReqVO
);
void
orderTally
(
Collection
<
Long
>
orderIdList
,
Long
shipmentId
);
List
<
String
>
getOrderTagList
(
OrderDO
orderDO
)
;
}
yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/boxOrderCheckInfo/BoxOrderCheckInfoServiceImpl.java
View file @
aa361efc
...
...
@@ -182,7 +182,7 @@ public class BoxOrderCheckInfoServiceImpl extends AbstractService<BoxOrderCheckI
List
<
BoxPkgOrderDO
>
boxPkgOrderDOS
=
boxPkgOrderService
.
selectList
(
BoxPkgOrderDO:
:
getPkgId
,
createReqVO
.
getPkgId
());
orderIdList
=
boxPkgOrderDOS
.
stream
().
map
(
BoxPkgOrderDO:
:
getOrderId
).
collect
(
Collectors
.
toSet
());
if
(
orderIdList
.
isEmpty
()
||
CollectionUtil
.
isEmpty
(
orderIdList
)){
throw
exception
(
ErrorCodeConstants
.
ORDER_IS_NOT_PRE_INSTALLED
);
throw
exception
(
ORDER_CASE_NUM_NOT_EXIST
);
}
orderDOList
=
orderQueryService
.
getOrderList
(
orderIdList
);
boolean
isParentOrder
=
false
;
...
...
@@ -686,7 +686,7 @@ public class BoxOrderCheckInfoServiceImpl extends AbstractService<BoxOrderCheckI
return
orderList
.
get
(
0
);
}
p
rivate
List
<
String
>
getOrderTagList
(
OrderDO
orderDO
)
{
p
ublic
List
<
String
>
getOrderTagList
(
OrderDO
orderDO
)
{
//从OrderLabel里面查找订单的箱号
Long
orderId
=
orderDO
.
getOrderId
();
OrderLabelQueryVO
queryVO
=
new
OrderLabelQueryVO
();
...
...
yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/boxPkgOrder/BoxPkgOrderServiceImpl.java
View file @
aa361efc
This diff is collapsed.
Click to expand it.
yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/vo/boxPkgOrder/BoxPkgOrderScanCodeVO.java
View file @
aa361efc
...
...
@@ -19,4 +19,10 @@ public class BoxPkgOrderScanCodeVO {
@ApiModelProperty
(
"合宝箱编号"
)
private
String
pkgNum
;
/**
* 出货id
*/
@ApiModelProperty
(
"出货id"
)
private
Long
shipmentId
;
}
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