licq/heli-mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

项目成本归集如果报工是价格总工时不显示

Browse Source
This commit is contained in:
z 2025-05-17 08:15:00 +08:00
parent d3c825bb13
commit d41e4e2c61
5 changed files with 34 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/taskdispatch/TaskDispatchController.java
View File

@ -155,7 +155,7 @@ public class TaskDispatchController {
@Parameter(name = "id", description = "编号", required = true)
@Parameter(name = "dispatchType", description = "派工单类型",required = false)
@PreAuthorize("@ss.hasPermission('heli:task-dispatch:delete')")
public CommonResult<Boolean> deleteTaskDispatchDetail(@RequestParam("id") Long id,@RequestParam("dispatchType") String dispatchType) {
public CommonResult<Boolean> deleteTaskDispatchDetail(@RequestParam("id") Long id,@RequestParam(value ="dispatchType", required = false) String dispatchType) {
if (dispatchType != null){
taskDispatchService.deleteTaskDispatchDetailOwner(id);
}else {

2
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/taskdispatch/TaskDispatchDO.java
View File

@ -130,7 +130,7 @@ public class TaskDispatchDO extends BaseDO {
private String blueprintNo;
@TableField(exist = false)
private Integer amount;
private BigDecimal amount;
@TableField(exist = false)
private String unit;

2
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchMapper.java
View File

@ -161,7 +161,7 @@ public interface TaskDispatchMapper extends BaseMapperX<TaskDispatchDO> {
default List<TaskDispatchDO> getListJg(Long id, Long projectSubId){
MPJLambdaWrapper<TaskDispatchDO> query = new MPJLambdaWrapper<>();
query.selectAll(TaskDispatchDO.class)
.select("z.name as materialName", "z.procedure_type as materialType", "CASE WHEN d.work_type = 1 THEN SUM(COALESCE(d.work_time, 0)) ELSE '' as amount")
.select("z.name as materialName", "z.procedure_type as materialType", "CASE WHEN d.work_type = 1 THEN SUM(COALESCE(d.work_time, 0)) ELSE NULL END as amount")
.select("p.grade_cost as shiJiMoney","u1.nickname as ownerName","p.name as name")
.select(" ROUND(SUM(CASE WHEN d.work_type = 1 THEN COALESCE(d.work_time, 0) * p.grade_cost ELSE COALESCE(d.work_time, 0) END), 2) as zanGuMoney")
.leftJoin(TaskDispatchDetailDO.class, "x", TaskDispatchDetailDO::getDispatchId,TaskDispatchDO::getId)

4
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java
View File

@ -242,7 +242,7 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
TaskDispatchDO taskDispatchDO = taskDispatchMapper.selectById(id);
Integer num = projectOrderSubMapper.selectById(taskDispatchDO.getProjectSubId()).getAmount();
taskDispatchDO.setProjectSubAmount(num);
taskDispatchDO.setAmount(num*taskDispatchDO.getAmount());
taskDispatchDO.setAmount(taskDispatchDO.getAmount().multiply(BigDecimal.valueOf(num)));
convertAssembleProcedure(taskDispatchDO);
return taskDispatchDO;
}
@ -311,7 +311,7 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
}else {
num= numMap.get(taskDispatchDO.getProjectSubId());
}
taskDispatchDO.setAmount(taskDispatchDO.getAmount()*num);
taskDispatchDO.setAmount(taskDispatchDO.getAmount().multiply(BigDecimal.valueOf(num)));
}
return taskDispatchDOPageResult;

45
mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detailDialog.vue
View File

@ -1278,28 +1278,41 @@ const submitForm = async (operate) => {
message.error('派工明细不能为空')
return
}
for(var i = 0 ; i < formData.value.taskDispatchDetails.length ; i++){
if( formData.value.taskDispatchDetails[i].endTime != undefined &&formData.value.taskDispatchDetails[i].endTime != null &&formData.value.taskDispatchDetails[i].endTime != ''){
let hasChecked = false; // 标记是否已经检查过超期日期
for (var i = 0; i < formData.value.taskDispatchDetails.length; i++) {
if (hasChecked) break; // 如果已经检查过超期日期并处理，直接跳出循环
const d1 = new Date(formData.value.taskDispatchDetails[i].endTime);
const d2 = new Date(formData.value.requiredCompletedDate);
if (
formData.value.taskDispatchDetails[i].endTime != undefined &&
formData.value.taskDispatchDetails[i].endTime != null &&
formData.value.taskDispatchDetails[i].endTime != ''
) {
const d1 = new Date(formData.value.taskDispatchDetails[i].endTime);
const d2 = new Date(formData.value.requiredCompletedDate);
d1.setHours(0, 0, 0, 0);
d2.setHours(0, 0, 0, 0);
d1.setHours(0, 0, 0, 0);
d2.setHours(0, 0, 0, 0);
if (d1 > d2) {
let name;
procedureList.value.forEach((items) => {
if (items.id == formData.value.taskDispatchDetails[i].procedureId) {
name = items.name;
}
});
if( d1>=d2){
let name;
procedureList.value.forEach(items =>{
if (items.id==formData.value.taskDispatchDetails[i].procedureId){
name=items.name
const result = await message.confirm(
"工序(" + name + ")预计结束日期超过生产计划日期" + formatDate1(d2) + "，是否继续？"
);
if (!result) {
return; // 用户点击取消，停止执行
} else {
hasChecked = true; // 用户点击确认，标记为已处理，跳出循环
break;
}
})
await message.confirm('工序('+name+")预计结束日期超过生产计划日期"+formatDate1(d2)+"是否继续 '")
return
}
}
}
}
var ownerIsNull = false;