派工单问题修改

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/bdgzsomthing/bdgzsomthingController.java

@@ -151,7 +151,7 @@ public class bdgzsomthingController {
                         BeanUtils.toBean(list, bdgzsomthingRespVO.class));
     }
 
-//    @Scheduled(fixedRate = 10800000)
+    @Scheduled(fixedRate = 10800000)
     public void scheduledTask() {
         bdgzsomthingService.selectds();
     }
@@ -159,8 +159,8 @@ public class bdgzsomthingController {
 //@Scheduled(cron = "0 2 0 * * ?") //每天十天执行一次
     @PostConstruct
     public void init() {
-//        selectHasPrice();
+        selectHasPrice();
-//        selectSafeStorageAndDeliverOneYear();
+        selectSafeStorageAndDeliverOneYear();
 //        bdgzsomthingService.selectds();
     }
     @Scheduled(cron = "0 0 2 * * ?")

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

@@ -203,15 +203,15 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
                                 }
                             }
                         }
-                        if (isDetailChanged(taskDispatchDetailDO, dispatchDetailDO)) {
+//                        if (isDetailChanged(taskDispatchDetailDO, dispatchDetailDO)) {
-                            if (taskDispatchDetailDO.getPlanStatus()==1){
+//                            if (taskDispatchDetailDO.getPlanStatus()==1){
-                                ProcessBomDetailDO bomDetailDO = processBomDetailMapper.selectById(taskDispatchDO.getBomDetailId());
+//                                ProcessBomDetailDO bomDetailDO = processBomDetailMapper.selectById(taskDispatchDO.getBomDetailId());
-                                ProcedureDO procedureDO = procedureMapper.selectById(dispatchDetailDO.getProcedureId());
+//                                ProcedureDO procedureDO = procedureMapper.selectById(dispatchDetailDO.getProcedureId());
-                                if (ObjectUtil.isNotEmpty(bomDetailDO)&&ObjectUtil.isNotEmpty(procedureDO)){
+//                                if (ObjectUtil.isNotEmpty(bomDetailDO)&&ObjectUtil.isNotEmpty(procedureDO)){
-                                    throw exception(new ErrorCode(400,bomDetailDO.getMaterialName()+" "+procedureDO.getName()+"已做物料需求计划,不能更改,请确认"));
+//                                    throw exception(new ErrorCode(400,bomDetailDO.getMaterialName()+" "+procedureDO.getName()+"已做物料需求计划,不能更改,请确认"));
-                                }
+//                                }
-                        }
+//                        }
-                    }
+//                    }
 
                 }
             }
@@ -532,7 +532,12 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
         if (ObjectUtil.isNotEmpty(taskDispatchDetailDO)&&("Y".equals(taskDispatchDetailDO.getMatPlanProcess())||taskDispatchDetailDO.getReportProcess()!=0)){
             ProcedureDO procedureDO = procedureMapper.selectById(taskDispatchDetailDO.getProcedureId());
             if (ObjectUtil.isNotEmpty(procedureDO)){
-                throw exception(new ErrorCode(400,"该工序"+procedureDO.getName()+"已做报工或者已做需求计划,不允许删除"));
+                if ("Y".equals(taskDispatchDetailDO.getMatPlanProcess())){
+                    throw exception(new ErrorCode(400,"该工序"+procedureDO.getName()+"已做需求计划,不允许删除"));
+                }else {
+                    throw exception(new ErrorCode(400,"该工序"+procedureDO.getName()+"已做报工,不允许删除"));
+                }
+
             }
         }
         taskDispatchDetailMapper.deleteByDispatchId(id);

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

@@ -221,7 +221,7 @@ class="!w-260px" v-model="formData.requiredCompletedDate" type="date" value-form
 
                   <el-table-column fixed label="外协" align="center" width="60">
                     <template #default="{ row }">
-                    <el-checkbox class="large-checkbox"  v-model="row.isOutsourcing" @change="handleOutsourcingChange(row)" :disabled="getDisabledState(row)"/>
+                    <el-checkbox class="large-checkbox"  v-model="row.isOutsourcing" @change="handleOutsourcingChange(row)" :disabled="getDisabledState2(row)"/>
                     </template>
                   </el-table-column>
                   <el-table-column  fixed label="顺序号" align="center" prop="sort" width="120px"  >
@@ -270,7 +270,7 @@ class="!w-260px" v-model="formData.requiredCompletedDate" type="date" value-form
 									</el-table-column>
 								 <el-table-column  fixed label="过程检" align="center" prop="testYn" width="78px"  >
 										<template #default="{ row, $index }">
-											<el-form-item :prop="`${$index}.testYns`"  class="mb-0px!">
+											<el-form-item :prop="`${$index}.testYn`"  class="mb-0px!">
 												<div
 style="  display: flex;
   justify-content: center;
@@ -409,7 +409,7 @@ v-model="row.deviceModel"
 									<el-table-column fixed="right" label="操作" align="center" min-width="90">
 										<template #default="scope">
 											<el-button
-												v-if="'detail' != active && (scope.row.matPlanProcess == 'N' && scope.row.reportProcess == 0)" link type="danger"
+												v-if="'detail' != active && (scope.row.matPlanProcess == 'N' && scope.row.reportProcess == 0&&formData.dispatchStatus != 2)" link type="danger"
 												size="small" @click.prevent="onDeleteItem(scope.row,scope.$index)">
 												删除
 											</el-button>
@@ -614,15 +614,28 @@ const formLoading = ref(false)
 const dialogTitle = ref('')
 const detailDisabled = ref(false)
 const changeChange = ( row) =>{
-	if(row.testYn == 'N'){
+	// if(row.testYn == 'N'){
-		row.testYn = 'Y'
+  //   row.testYn = 'N'
-				row.checkYn = 1
+  //   row.checkYn = 0
-		row.checkYns = false
+  //   row.checkYns = true
-	}else{
+	// }else{
-		row.testYn = 'N'
+  //   row.testYn = 'Y'
-			row.checkYn = 0
+  //   row.checkYn = 1
-						row.checkYns = true
+  //   row.checkYns = false
-	}
+  //
+	// }
+  if(row.checkYns == false){
+    row.checkYn = 1
+  }else {
+    row.checkYn = 0
+
+  }
+
+  }
+const getDisabledState2 = (row) => {
+  const isDisabled = detailDisabled.value || row.reportProcess == 2||row.matPlanProcess=='Y'
+
+  return isDisabled
 }
 const getDisabledState1 = (row) => {
   const isDisabled = detailDisabled.value || row.reportProcess == 2
@@ -1613,6 +1626,9 @@ const onAddItem = () => {
             item1.checkYns=item.checkYns
             item1.testYn=item.testYn
             item1.checkYn=item.checkYn
+            item1.owner=item.owner
+            item1.isOutsourcing=item.isOutsourcing
+            item1.isFoam=item.isFoam
 					}
 				}
 			}
@@ -1724,6 +1740,7 @@ const goback = () => {
   var listdetail = ref([]);
 /** 删除子项操作 */
 const onDeleteItem = async (row,index) => {
+  console.log(row)
   let id = row.id
   if (id) await TaskDispatchApi.deleteTaskDispatchDetail(id)
   var list = [];
@@ -1744,15 +1761,24 @@ const onDeleteItem = async (row,index) => {
         list.push(checkList.value[i]);
       }
   }
+  const procedureItem = procedureList.value.find(
+    item => item.id === row.procedureId
+  );
+  console.log(procedureItem)
+  if (procedureItem){
+    const newArray = disabledLabels.value.filter(item => item !== procedureItem.name)
+    disabledLabels.value=newArray
+  }
   checkList.value = list;
 	checkListTemp.value = checkList.value;
 	message.success(t('common.delSuccess'))
 }
 const handleOutsourcingChange= async (row: any) => {
-	console.log('ss')
 	if(row.isOutsourcing == false){
 			row.dispatchType = 2
-			row.postId = ownerList2.value[0].id
+    row.owner = ''
+
+    row.postId = ownerList2.value[0].id
 	}else{
 			row.dispatchType = 2
 					row.owner = ''