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
e8ad1442
Commit
e8ad1442
authored
Mar 20, 2025
by
Smile
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
需求 后台-集运-包裹申请验货
parent
ec3947a1
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
38 additions
and
0 deletions
+38
-0
20250320lh.sql
sql/cons_sql/20250320lh.sql
+3
-0
ConsDO.java
...ocoder/yudao/module/order/dal/dataobject/cons/ConsDO.java
+4
-0
ConsService.java
.../iocoder/yudao/module/order/service/cons/ConsService.java
+5
-0
ConsServiceImpl.java
...oder/yudao/module/order/service/cons/ConsServiceImpl.java
+12
-0
ConsBackVO.java
...ava/cn/iocoder/yudao/module/order/vo/cons/ConsBackVO.java
+3
-0
ConsBaseVO.java
...ava/cn/iocoder/yudao/module/order/vo/cons/ConsBaseVO.java
+3
-0
ConsController.java
...ao/module/order/controller/admin/cons/ConsController.java
+8
-0
No files found.
sql/cons_sql/20250320lh.sql
0 → 100644
View file @
e8ad1442
ALTER
TABLE
ecw_cons
ADD
COLUMN
inspect_remark
VARCHAR
(
255
)
COLLATE
utf8mb4_general_ci
DEFAULT
NULL
COMMENT
'申请验货备注'
;
\ No newline at end of file
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/dataobject/cons/ConsDO.java
View file @
e8ad1442
...
@@ -56,6 +56,10 @@ public class ConsDO extends BaseDO {
...
@@ -56,6 +56,10 @@ public class ConsDO extends BaseDO {
* 是否需要验货,0否,1是
* 是否需要验货,0否,1是
*/
*/
private
Integer
needInspect
;
private
Integer
needInspect
;
/**
* 验货备注
*/
private
String
inspectRemark
;
/**
/**
* 包裹状态,来自字典表,cons_status
* 包裹状态,来自字典表,cons_status
*/
*/
...
...
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/cons/ConsService.java
View file @
e8ad1442
...
@@ -33,6 +33,11 @@ public interface ConsService extends IService<ConsDO> {
...
@@ -33,6 +33,11 @@ public interface ConsService extends IService<ConsDO> {
* @param updateReqVO 更新信息
* @param updateReqVO 更新信息
*/
*/
void
updateCons
(
@Valid
ConsUpdateReqVO
updateReqVO
);
void
updateCons
(
@Valid
ConsUpdateReqVO
updateReqVO
);
/**
* 更新集运包裹验货申请备注
* @param updateReqVO 更新信息
*/
void
updateConsInspect
(
@Valid
ConsUpdateReqVO
updateReqVO
);
/**
/**
* 删除集运包裹主
* 删除集运包裹主
...
...
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/cons/ConsServiceImpl.java
View file @
e8ad1442
...
@@ -263,6 +263,18 @@ public class ConsServiceImpl extends AbstractService<ConsMapper, ConsDO> impleme
...
@@ -263,6 +263,18 @@ public class ConsServiceImpl extends AbstractService<ConsMapper, ConsDO> impleme
consMapper
.
updateById
(
updateObj
);
consMapper
.
updateById
(
updateObj
);
}
}
@Override
public
void
updateConsInspect
(
ConsUpdateReqVO
updateReqVO
)
{
ConsDO
consDO
=
this
.
getById
(
updateReqVO
.
getId
());
if
(
consDO
.
getStatus
()
==
1
)
{
throw
exception
(
30004
,
"包裹不存在"
);
}
consDO
.
setNeedInspect
(
updateReqVO
.
getNeedInspect
());
consDO
.
setInspectRemark
(
updateReqVO
.
getInspectRemark
());
consDO
.
setInspectStatus
(
updateReqVO
.
getInspectStatus
());
this
.
updateById
(
consDO
);
}
@Override
@Override
public
void
deleteCons
(
Long
id
)
{
public
void
deleteCons
(
Long
id
)
{
// 校验存在
// 校验存在
...
...
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/cons/ConsBackVO.java
View file @
e8ad1442
...
@@ -94,6 +94,9 @@ public class ConsBackVO {
...
@@ -94,6 +94,9 @@ public class ConsBackVO {
@ApiModelProperty
(
value
=
"验货状态,来自字典表cons_inspect_status ,0 未开始,1验货中、2完成验货"
)
@ApiModelProperty
(
value
=
"验货状态,来自字典表cons_inspect_status ,0 未开始,1验货中、2完成验货"
)
private
Integer
inspectStatus
;
private
Integer
inspectStatus
;
@ApiModelProperty
(
value
=
"验货备注"
)
private
String
inspectRemark
;
@ExcelProperty
(
"仓库ID"
)
@ExcelProperty
(
"仓库ID"
)
@ApiModelProperty
(
value
=
"仓库ID"
)
@ApiModelProperty
(
value
=
"仓库ID"
)
private
Long
wareId
;
private
Long
wareId
;
...
...
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/cons/ConsBaseVO.java
View file @
e8ad1442
...
@@ -43,6 +43,9 @@ public class ConsBaseVO {
...
@@ -43,6 +43,9 @@ public class ConsBaseVO {
@ApiModelProperty
(
value
=
"是否需要验货,0否,1是"
)
@ApiModelProperty
(
value
=
"是否需要验货,0否,1是"
)
private
Integer
needInspect
;
private
Integer
needInspect
;
@ApiModelProperty
(
value
=
"验货备注"
)
private
String
inspectRemark
;
@ApiModelProperty
(
value
=
"包裹状态,来自字典表,cons_status"
)
@ApiModelProperty
(
value
=
"包裹状态,来自字典表,cons_status"
)
private
Integer
status
;
private
Integer
status
;
...
...
yudao-module-order/yudao-module-order-rest/src/main/java/cn/iocoder/yudao/module/order/controller/admin/cons/ConsController.java
View file @
e8ad1442
...
@@ -89,6 +89,14 @@ public class ConsController {
...
@@ -89,6 +89,14 @@ public class ConsController {
return
success
(
true
);
return
success
(
true
);
}
}
@PutMapping
(
"/updateInspect"
)
@ApiOperation
(
"更新集运包裹主"
)
@PreAuthorize
(
"@ss.hasPermission('ecw:cons:update')"
)
public
CommonResult
<
Boolean
>
updateInspect
(
@Valid
@RequestBody
ConsUpdateReqVO
updateReqVO
)
{
consService
.
updateConsInspect
(
updateReqVO
);
return
success
(
true
);
}
@PutMapping
(
"/updateConsBatchSignOff"
)
@PutMapping
(
"/updateConsBatchSignOff"
)
@ApiOperation
(
"批量签收集运包裹"
)
@ApiOperation
(
"批量签收集运包裹"
)
@PreAuthorize
(
"@ss.hasPermission('ecw:cons:update')"
)
@PreAuthorize
(
"@ss.hasPermission('ecw:cons:update')"
)
...
...
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