Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
clx-performance
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
姜武杰
clx-performance
Commits
29bbf26c
提交
29bbf26c
authored
7月 04, 2024
作者:
杨启发
1
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
磅单OCR识别需求
上级
54483e4b
隐藏空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
10 行增加
和
6 行删除
+10
-6
OrderChildLoadParam.java
...va/com/clx/performance/param/app/OrderChildLoadParam.java
+1
-1
OrderChildUnloadParam.java
.../com/clx/performance/param/app/OrderChildUnloadParam.java
+1
-1
OrderChildServiceImpl.java
...m/clx/performance/service/impl/OrderChildServiceImpl.java
+8
-4
没有找到文件。
performance-api/src/main/java/com/clx/performance/param/app/OrderChildLoadParam.java
浏览文件 @
29bbf26c
...
@@ -34,6 +34,6 @@ public class OrderChildLoadParam extends PositionParam {
...
@@ -34,6 +34,6 @@ public class OrderChildLoadParam extends PositionParam {
private
List
<
String
>
loadImageList
;
private
List
<
String
>
loadImageList
;
@ApiModelProperty
(
value
=
"装货时间"
)
@ApiModelProperty
(
value
=
"装货时间"
)
@NotBlank
(
message
=
"装货时间不能为空"
)
//
@NotBlank(message = "装货时间不能为空")
private
String
loadTime
;
private
String
loadTime
;
}
}
performance-api/src/main/java/com/clx/performance/param/app/OrderChildUnloadParam.java
浏览文件 @
29bbf26c
...
@@ -32,7 +32,7 @@ public class OrderChildUnloadParam extends PositionParam {
...
@@ -32,7 +32,7 @@ public class OrderChildUnloadParam extends PositionParam {
private
List
<
String
>
unloadImageList
;
private
List
<
String
>
unloadImageList
;
@ApiModelProperty
(
value
=
"交货时间"
)
@ApiModelProperty
(
value
=
"交货时间"
)
@
NotBlank
(
message
=
"交货时间不能为空"
)
//
NotBlank(message = "交货时间不能为空")
private
String
unloadTime
;
private
String
unloadTime
;
}
}
performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java
浏览文件 @
29bbf26c
...
@@ -955,7 +955,8 @@ public class OrderChildServiceImpl implements OrderChildService {
...
@@ -955,7 +955,8 @@ public class OrderChildServiceImpl implements OrderChildService {
orderChild
.
setLoadRough
(
param
.
getLoadRough
());
orderChild
.
setLoadRough
(
param
.
getLoadRough
());
orderChild
.
setLoadTare
(
param
.
getLoadTare
());
orderChild
.
setLoadTare
(
param
.
getLoadTare
());
orderChild
.
setLoadNet
(
loadNet
);
orderChild
.
setLoadNet
(
loadNet
);
orderChild
.
setLoadTime
(
covertStringToDefaultLocalDateTime
(
param
.
getLoadTime
()));
//orderChild.setLoadTime(covertStringToDefaultLocalDateTime(param.getLoadTime()));
orderChild
.
setLoadTime
(
LocalDateTime
.
now
());
orderChild
.
setWeight
(
orderChildWeightCalc
(
orderChild
));
orderChild
.
setWeight
(
orderChildWeightCalc
(
orderChild
));
orderChild
.
setFreight
(
orderChildFreightCalc
(
orderChild
));
orderChild
.
setFreight
(
orderChildFreightCalc
(
orderChild
));
orderChild
.
setStatus
(
OrderChildEnum
.
Status
.
LOAD
.
getCode
());
orderChild
.
setStatus
(
OrderChildEnum
.
Status
.
LOAD
.
getCode
());
...
@@ -993,7 +994,8 @@ public class OrderChildServiceImpl implements OrderChildService {
...
@@ -993,7 +994,8 @@ public class OrderChildServiceImpl implements OrderChildService {
orderChild
.
setLoadRough
(
param
.
getLoadRough
());
orderChild
.
setLoadRough
(
param
.
getLoadRough
());
orderChild
.
setLoadTare
(
param
.
getLoadTare
());
orderChild
.
setLoadTare
(
param
.
getLoadTare
());
orderChild
.
setLoadNet
(
loadNet
);
orderChild
.
setLoadNet
(
loadNet
);
orderChild
.
setLoadTime
(
covertStringToDefaultLocalDateTime
(
param
.
getLoadTime
()));
//orderChild.setLoadTime(covertStringToDefaultLocalDateTime(param.getLoadTime()));
orderChild
.
setLoadTime
(
LocalDateTime
.
now
());
orderChild
.
setWeight
(
orderChildWeightCalc
(
orderChild
));
orderChild
.
setWeight
(
orderChildWeightCalc
(
orderChild
));
orderChild
.
setFreight
(
orderChildFreightCalc
(
orderChild
));
orderChild
.
setFreight
(
orderChildFreightCalc
(
orderChild
));
//更新货单吨数
//更新货单吨数
...
@@ -1126,7 +1128,8 @@ public class OrderChildServiceImpl implements OrderChildService {
...
@@ -1126,7 +1128,8 @@ public class OrderChildServiceImpl implements OrderChildService {
orderChild
.
setUnloadRough
(
param
.
getUnloadRough
());
orderChild
.
setUnloadRough
(
param
.
getUnloadRough
());
orderChild
.
setUnloadTare
(
param
.
getUnloadTare
());
orderChild
.
setUnloadTare
(
param
.
getUnloadTare
());
orderChild
.
setUnloadNet
(
loadNet
);
orderChild
.
setUnloadNet
(
loadNet
);
orderChild
.
setUnloadTime
(
covertStringToDefaultLocalDateTime
(
param
.
getUnloadTime
()));
//orderChild.setUnloadTime(covertStringToDefaultLocalDateTime(param.getUnloadTime()));
orderChild
.
setUnloadTime
(
LocalDateTime
.
now
());
orderChild
.
setWeight
(
orderChildWeightCalc
(
orderChild
));
orderChild
.
setWeight
(
orderChildWeightCalc
(
orderChild
));
orderChild
.
setStatus
(
OrderChildEnum
.
Status
.
UNLOAD
.
getCode
());
orderChild
.
setStatus
(
OrderChildEnum
.
Status
.
UNLOAD
.
getCode
());
orderChild
.
setPoundStatus
(
OrderChildPoundAuditEnum
.
Status
.
AUDIT
.
getCode
());
orderChild
.
setPoundStatus
(
OrderChildPoundAuditEnum
.
Status
.
AUDIT
.
getCode
());
...
@@ -1188,7 +1191,8 @@ public class OrderChildServiceImpl implements OrderChildService {
...
@@ -1188,7 +1191,8 @@ public class OrderChildServiceImpl implements OrderChildService {
orderChild
.
setUnloadRough
(
param
.
getUnloadRough
());
orderChild
.
setUnloadRough
(
param
.
getUnloadRough
());
orderChild
.
setUnloadTare
(
param
.
getUnloadTare
());
orderChild
.
setUnloadTare
(
param
.
getUnloadTare
());
orderChild
.
setUnloadNet
(
loadNet
);
orderChild
.
setUnloadNet
(
loadNet
);
orderChild
.
setUnloadTime
(
covertStringToDefaultLocalDateTime
(
param
.
getUnloadTime
()));
//orderChild.setUnloadTime(covertStringToDefaultLocalDateTime(param.getUnloadTime()));
orderChild
.
setUnloadTime
(
LocalDateTime
.
now
());
orderChild
.
setWeight
(
orderChildWeightCalc
(
orderChild
));
orderChild
.
setWeight
(
orderChildWeightCalc
(
orderChild
));
orderChild
.
setPoundStatus
(
OrderChildPoundAuditEnum
.
Status
.
AUDIT
.
getCode
());
orderChild
.
setPoundStatus
(
OrderChildPoundAuditEnum
.
Status
.
AUDIT
.
getCode
());
orderChild
.
setFreight
(
orderChildFreightCalc
(
orderChild
));
orderChild
.
setFreight
(
orderChildFreightCalc
(
orderChild
));
...
...
杨启发
@yangqifa
被提及 commit
6b5adb24
·
11月 12, 2024
被提及 commit
6b5adb24
被提及 commit 6b5adb24ca38b54aed8be580395c95fc01ced9f9
切换提交列表
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论