Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
W
warehouse
概览
Overview
详情
活动
周期分析
版本库
存储库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
问题
0
Issues
0
列表
Board
标记
里程碑
合并请求
0
Merge Requests
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
Snippets
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
Issue Boards
Open sidebar
苗卫卫
warehouse
Commits
2fede987
提交
2fede987
authored
1 年前
作者:
luyincheng
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev' of code.sz-chaohui.cn:miaoweiw/warehouse into dev
父级
67ba7eff
51977b17
隐藏空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
8 行增加
和
5 行删除
+8
-5
src/main/java/com/boco/nbd/wios/export/Contants.java
+2
-2
src/main/java/com/boco/nbd/wios/manage/controller/WallboxApplyController.java
+1
-0
src/main/java/com/boco/nbd/wios/manage/service/impl/WallboxApplyService.java
+2
-2
src/main/resources/mybatis/mapper/def/common/WallboxApplyMapper.xml
+3
-1
没有找到文件。
src/main/java/com/boco/nbd/wios/export/Contants.java
查看文件 @
2fede987
...
...
@@ -63,9 +63,9 @@ public class Contants {
public
static
final
String
export_warrantyOrder_field
=
"no,orderId,userName,userPhone,wallboxNo,startTimeStr,endTimeStr"
;
public
static
final
String
export_wareHouse_title
=
"序号,仓库名称,仓库等级,
所属区域,仓库归属,所属服务商,启用状态,描述
"
;
public
static
final
String
export_wareHouse_title
=
"序号,仓库名称,仓库等级,
仓库区域,仓库归属,收件人,联系电话,仓库地址,启用状态,备注
"
;
public
static
final
String
export_wareHouse_field
=
"no,name,warehouseLevenName,areaName,warehouseAttributionName,
serviceProviderName
,isEnabledName,msg"
;
public
static
final
String
export_wareHouse_field
=
"no,name,warehouseLevenName,areaName,warehouseAttributionName,
receivePeople,receivePhone,receiveAddress
,isEnabledName,msg"
;
public
static
final
String
export_single_title
=
"调拨单号,创建时间,创建人,说明,调拨类型,调入仓库,调出仓库"
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/boco/nbd/wios/manage/controller/WallboxApplyController.java
查看文件 @
2fede987
...
...
@@ -269,6 +269,7 @@ public class WallboxApplyController {
* 修改墙盒申请
*/
@PutMapping
@ApiOperation
(
value
=
"修改"
)
public
BaseResponse
<
Object
>
edit
(
@RequestBody
WallboxApply
tWallboxApply
)
{
return
new
BaseResponse
<>(
wallboxApplyService
.
updateWallboxApply
(
tWallboxApply
));
}
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/boco/nbd/wios/manage/service/impl/WallboxApplyService.java
查看文件 @
2fede987
...
...
@@ -149,11 +149,11 @@ public class WallboxApplyService {
*/
public
int
updateWallboxApply
(
WallboxApply
wallboxApply
)
{
WallboxApply
record
=
wallboxApplyMapper
.
selectWallboxApplyByOrderId
(
wallboxApply
.
getOutOrderId
());
validateApplyExists
(
wallboxApply
.
getOrderId
());
WallboxApply
record
=
wallboxApplyMapper
.
selectWallboxApplyByOrderId
(
wallboxApply
.
getOrderId
());
if
(!
CHECK_STATUS_REJECT
.
equals
(
record
.
getCheckStatus
()))
{
throw
new
ServiceException
(
"非驳回状态订单无法修改信息!"
);
}
validateApplyExists
(
wallboxApply
.
getOrderId
());
wallboxApply
.
setModifyTime
(
new
Date
());
wallboxApply
.
setCheckStatus
(
1L
);
return
wallboxApplyMapper
.
updateWallboxApply
(
wallboxApply
);
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/mybatis/mapper/def/common/WallboxApplyMapper.xml
查看文件 @
2fede987
...
...
@@ -194,6 +194,7 @@
t_wallbox_apply.created_time,
t_wallbox_apply.modify_account,
t_wallbox_apply.modify_time,
wb_account.name as checkName,
t_order.user_name,
t_order.user_phone,
t_order.wallbox_model,
...
...
@@ -206,10 +207,11 @@
t_order.address,
t_order.out_order_id,
t_order.install_finish_time,
t_order.shipno as tracking_number
t_order.shipno
as tracking_number
FROM t_order
LEFT JOIN t_wallbox_apply ON t_wallbox_apply.order_id = t_order.id
left join wb_account on t_wallbox_apply.check_account = wb_account.id
where t_wallbox_apply.order_id = #{orderId}
</select>
...
...
This diff is collapsed.
Click to expand it.
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论