Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
mes
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
ximai
mes
Commits
6c023a48
Commit
6c023a48
authored
Nov 06, 2024
by
李驰骋
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
派工表记录实际开始、结束时间
parent
969a5fe0
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
22 additions
and
0 deletions
+22
-0
ProTaskWorkunit.java
...n/java/com/ximai/mes/pro/domain/task/ProTaskWorkunit.java
+8
-0
ProTaskServiceImpl.java
...m/ximai/mes/pro/service/impl/task/ProTaskServiceImpl.java
+2
-0
ProTaskWorkunitServiceImpl.java
...mes/pro/service/impl/task/ProTaskWorkunitServiceImpl.java
+4
-0
ProTaskWorkunitMapper.xml
.../main/resources/mapper/pro/task/ProTaskWorkunitMapper.xml
+8
-0
No files found.
mes/src/main/java/com/ximai/mes/pro/domain/task/ProTaskWorkunit.java
View file @
6c023a48
...
...
@@ -117,6 +117,14 @@ public class ProTaskWorkunit extends BaseEntity {
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
private
Date
scheduleEndDate
;
@ApiModelProperty
(
"实际开始时间"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
private
Date
actualStartDate
;
@ApiModelProperty
(
"实际结束时间"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
private
Date
actualEndDate
;
@ApiModelProperty
(
"备注"
)
private
String
remark
;
...
...
mes/src/main/java/com/ximai/mes/pro/service/impl/task/ProTaskServiceImpl.java
View file @
6c023a48
...
...
@@ -841,6 +841,8 @@ public class ProTaskServiceImpl implements IProTaskService {
//本次合格数和不合格数总和大于可报工数目 与 已报工数目已经超过了排产数量
if
((
feedbackQualityDouConst
+
fuantityUnqualify
.
doubleValue
())>=
task
.
getQuantityWait
().
doubleValue
()
&&
task
.
getQuantity
().
doubleValue
()
<=
(
execQuantityQualifySumConst
+
feedbackQualityDouConst
+
fuantityUnqualify
.
doubleValue
()))
{
//记录实际完工时间
taskWorkunit
.
setActualEndDate
(
Calendar
.
getInstance
().
getTime
());
taskWorkunit
.
setStatus
(
FINISHED
.
getStatus
());
}
quantityWaitVal
=
taskQuantityWaitConst
.
subtract
(
feedbackQualityVal
.
add
(
fuantityUnqualify
));
...
...
mes/src/main/java/com/ximai/mes/pro/service/impl/task/ProTaskWorkunitServiceImpl.java
View file @
6c023a48
...
...
@@ -205,6 +205,10 @@ public class ProTaskWorkunitServiceImpl implements IProTaskWorkunitService {
proWorkorderService
.
updateWorkorderState
(
proWorkorder
,
WorkorderStatusEnum
.
PRODUCING
);
}
}
//记录实际开始时间
if
(
proTaskWorkunit
.
getActualStartDate
()==
null
){
proTaskWorkunit
.
setActualStartDate
(
Calendar
.
getInstance
().
getTime
());
}
}
proTaskWorkunit
.
setStatus
(
taskStatusEnum
.
getStatus
());
this
.
updateProTaskWorkunit
(
proTaskWorkunit
);
...
...
mes/src/main/resources/mapper/pro/task/ProTaskWorkunitMapper.xml
View file @
6c023a48
...
...
@@ -23,6 +23,10 @@
<result
property=
"createTime"
column=
"create_time"
/>
<result
property=
"remark"
column=
"remark"
/>
<result
property=
"outsourceUnitPrice"
column=
"outsource_unit_price"
/>
<result
property=
"scheduleStartDate"
column=
"schedule_start_date"
/>
<result
property=
"scheduleEndDate"
column=
"schedule_end_date"
/>
<result
property=
"actualStartDate"
column=
"actual_start_date"
/>
<result
property=
"actualEndDate"
column=
"actual_end_date"
/>
<result
property=
"vendorId"
column=
"vendor_id"
/>
<result
property=
"vendorName"
column=
"vendor_name"
/>
<result
property=
"outsourced"
column=
"outsourced"
/>
...
...
@@ -49,6 +53,8 @@
ptw.quantity_changed,
ptw.schedule_start_date,
ptw.schedule_end_date,
ptw.actual_start_date,
ptw.actual_end_date,
ptw.status,
ptw.create_by,
ptw.create_time,
...
...
@@ -165,6 +171,8 @@
<if
test=
"status != null"
>
status = #{status},
</if>
<if
test=
"scheduleStartDate != null"
>
schedule_start_date = #{scheduleStartDate},
</if>
<if
test=
"scheduleEndDate != null"
>
schedule_end_date = #{scheduleEndDate},
</if>
<if
test=
"actualStartDate != null"
>
actual_start_date = #{actualStartDate},
</if>
<if
test=
"actualEndDate != null"
>
actual_end_date = #{actualEndDate},
</if>
<if
test=
"remark != null"
>
remark = #{remark},
</if>
<if
test=
"createBy != null"
>
create_by = #{createBy},
</if>
<if
test=
"createTime != null"
>
create_time = #{createTime},
</if>
...
...
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