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-16 08:25:32 +08:00
parent 7602e69d01
commit fdcbed23b4
2 changed files with 5 additions and 1 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

@ -141,7 +141,7 @@ public class TaskDispatchController {
@Parameter(name = "dispatchId", description = "派工单id",required = true) @Parameter(name = "dispatchId", description = "派工单id",required = true)
@Parameter(name = "dispatchType", description = "派工单类型",required = false) @Parameter(name = "dispatchType", description = "派工单类型",required = false)
@PreAuthorize("@ss.hasPermission('heli:task-dispatch:query')") @PreAuthorize("@ss.hasPermission('heli:task-dispatch:query')")
public CommonResult<List<TaskDispatchDetailDO>> getTaskDispatchDetailListByDispatchId(@RequestParam("dispatchId") Long dispatchId,@RequestParam("dispatchType") String dispatchType) { public CommonResult<List<TaskDispatchDetailDO>> getTaskDispatchDetailListByDispatchId(@RequestParam("dispatchId") Long dispatchId,@RequestParam(value ="dispatchType", required = false) String dispatchType) {
if (dispatchType != null){ if (dispatchType != null){
return success(taskDispatchService.getTaskDispatchDetailListByDispatchNew(dispatchId)); return success(taskDispatchService.getTaskDispatchDetailListByDispatchNew(dispatchId));
}else { }else {

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

@ -1279,6 +1279,9 @@ const submitForm = async (operate) => {
return return
} }
for(var i = 0 ; i < formData.value.taskDispatchDetails.length ; i++){ 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 != ''){
const d1 = new Date(formData.value.taskDispatchDetails[i].endTime); const d1 = new Date(formData.value.taskDispatchDetails[i].endTime);
const d2 = new Date(formData.value.requiredCompletedDate); const d2 = new Date(formData.value.requiredCompletedDate);
@ -1296,6 +1299,7 @@ const submitForm = async (operate) => {
await message.confirm('工序('+name+")预计结束日期超过生产计划日期"+formatDate1(d2)+"是否继续 '") await message.confirm('工序('+name+")预计结束日期超过生产计划日期"+formatDate1(d2)+"是否继续 '")
} }
}
} }
var ownerIsNull = false; var ownerIsNull = false;
if(operate == 'SUBMIT'){ if(operate == 'SUBMIT'){