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

Compare commits

base: licq:69a8bab035cc73062a146af0b720aeeec8b63a1b
Branches Tags
licq:main
..
compare: licq:0cab4952e6afcc72369a6da2a425cde1c6c5a577
Branches Tags
licq:main

No commits in common. "69a8bab035cc73062a146af0b720aeeec8b63a1b" and "0cab4952e6afcc72369a6da2a425cde1c6c5a577" have entirely different histories.
69a8bab035 ... 0cab4952e6

6 changed files with 50 additions and 94 deletions
Show Stats Expand all files Collapse all files

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

@ -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();
// selectSafeStorageAndDeliverOneYear();
selectHasPrice();
selectSafeStorageAndDeliverOneYear();
// bdgzsomthingService.selectds();
}
@Scheduled(cron = "0 0 2 * * ?")

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

@ -104,8 +104,6 @@ public class TaskDispatchDetailDO extends BaseDO {
* 工序状态 默认 已提交 已完成 0 1 2
*/
private Integer procedureStatus;
private Integer reportProcess;
private String matPlanProcess;
@TableField(exist = false)
private String projectName;

2
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplan/MaterialPlanServiceImpl.java
View File

@ -251,7 +251,6 @@ public class MaterialPlanServiceImpl implements MaterialPlanService {
lambdaUpdateWrapper.set(TaskDispatchDetailDO::getProjectMaterialPlanNo, null);
lambdaUpdateWrapper.set(TaskDispatchDetailDO::getPlanStatus,0);
lambdaUpdateWrapper.set(TaskDispatchDetailDO::getProjectMaterialPlanDetailId,null);
lambdaUpdateWrapper.set(TaskDispatchDetailDO::getMatPlanProcess,"N");
taskDispatchDetailMapper.update(lambdaUpdateWrapper);
}
materialPlanBoomMapper.delete(queryWrapper1);
@ -307,7 +306,6 @@ public class MaterialPlanServiceImpl implements MaterialPlanService {
materialPlanBoomDOList.add(boomDO);
taskDispatchDetailDO.setProjectMaterialPlanDetailId(boomDO.getId());
taskDispatchDetailDO.setPlanStatus(1);
taskDispatchDetailDO.setMatPlanProcess("Y");
taskDispatchDetailDO.setProjectMaterialPlanNo(planDO.getProjectMaterialPlanNo());
}
// materialPlanBoomMapper.insertBatch(materialPlanBoomDOList);

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

@ -195,14 +195,6 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
for (TaskDispatchDetailDO dispatchDetailDO : list) {
TaskDispatchDetailDO taskDispatchDetailDO = taskDispatchDetailMapper.selectById(dispatchDetailDO.getId());
if (ObjectUtil.isNotEmpty(taskDispatchDetailDO)){
if ("false".equals(dispatchDetailDO.getIsOutsourcing())){
if ("Y".equals(taskDispatchDetailDO.getMatPlanProcess())){
ProcedureDO procedureDO = procedureMapper.selectById(dispatchDetailDO.getProcedureId());
if (ObjectUtil.isNotEmpty(procedureDO)){
throw exception(new ErrorCode(400,"该工序"+procedureDO.getName()+"已做物料需求计划,不允许去掉外协,请确认！"));
}
}
}
if (isDetailChanged(taskDispatchDetailDO, dispatchDetailDO)) {
if (taskDispatchDetailDO.getPlanStatus()==1){
ProcessBomDetailDO bomDetailDO = processBomDetailMapper.selectById(taskDispatchDO.getBomDetailId());
@ -529,10 +521,12 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
@Override
public void deleteTaskDispatchDetail(Long id) {
TaskDispatchDetailDO taskDispatchDetailDO = taskDispatchDetailMapper.selectById(id);
if (ObjectUtil.isNotEmpty(taskDispatchDetailDO)&&("Y".equals(taskDispatchDetailDO.getMatPlanProcess())||taskDispatchDetailDO.getReportProcess()!=0)){
if (ObjectUtil.isNotEmpty(taskDispatchDetailDO)&&taskDispatchDetailDO.getPlanStatus()==1){
TaskDispatchDO taskDispatchDO = taskDispatchMapper.selectById(taskDispatchDetailDO.getDispatchId());
ProcessBomDetailDO bomDetailDO = processBomDetailMapper.selectById(taskDispatchDO.getBomDetailId());
ProcedureDO procedureDO = procedureMapper.selectById(taskDispatchDetailDO.getProcedureId());
if (ObjectUtil.isNotEmpty(procedureDO)){
throw exception(new ErrorCode(400,"该工序"+procedureDO.getName()+"已做报工或者已做需求计划,不允许删除"));
if (ObjectUtil.isNotEmpty(bomDetailDO)&&ObjectUtil.isNotEmpty(procedureDO)){
throw exception(new ErrorCode(400,bomDetailDO.getMaterialName()+" "+procedureDO.getName()+"已做物料需求计划,不能更改,请确认"));
}
}
taskDispatchDetailMapper.deleteByDispatchId(id);
@ -743,6 +737,7 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
if(operateReqVO.getOwnerId()!=null){
lastReportDO.setOwner(operateReqVO.getOwnerId());
taskDispatchDetailDO.setOwner(operateReqVO.getOwnerId());
taskDispatchDetailMapper.updateById(taskDispatchDetailDO);
}else{
lastReportDO.setOwner(taskDispatchDetailDO.getOwner());
}
@ -751,8 +746,6 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
}else {
lastReportDO.setWorkType("1");
}
taskDispatchDetailDO.setReportProcess(1);
taskDispatchDetailMapper.updateById(taskDispatchDetailDO);
//更新生产计划单
if (planDO.getStatus() != 2 && planDO.getStatus()!=3){
planDO.setStatus(2);
@ -782,7 +775,6 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
case FINISH:
taskDispatchDetailDO.setProcedureStatus(TaskDispatchProcedureStatusEnum.COMPLETED.getCode());
taskDispatchDetailDO.setReportProcess(2);
//装配看看是不是多人，如果是多人，判断一下
boolean allReport = true;
HashMap<Long,TaskDispatchDetailDO> dispatchDetailDOHashMap = new HashMap<>();

6
mes-ui/mes-ui-admin-vue3/.env.pro
View File

@ -4,14 +4,14 @@ NODE_ENV=production
VITE_DEV=false
# 请求路径https://nxhs.cjyx.cc/admin-api http://192.168.1.87:8080 https://star.hz-hl.com
VITE_BASE_URL='https://nxhs.cjyx.cc'
VITE_BASE_URL='https://star.hz-hl.com'
# 上传路径 http://218.75.46.166:8080
VITE_UPLOAD_URL='https://nxhs.cjyx.cc/admin-api/infra/file/upload'
VITE_UPLOAD_URL='https://star.hz-hl.com/admin-api/infra/file/upload'
# 上传路径
VITE_UPLOAD_BATCH_URL='https://nxhs.cjyx.cc/admin-api/infra/file/uploadBatch'
VITE_UPLOAD_BATCH_URL='https://star.hz-hl.com/admin-api/infra/file/uploadBatch'
# 接口前缀
VITE_API_BASEPATH=

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

@ -179,22 +179,22 @@ class="!w-260px" v-model="formData.requiredCompletedDate" type="date" value-form
<el-row>
<el-col>
<el-checkbox-group v-if="active != 'detail' && (formData.dispatchStatus == 1||formData.dispatchStatus == 0) " v-model="checkList" @change="onAddItem()">
<el-checkbox label="下料" size="large" border :disabled="disabledLabels.includes('下料')"/>
<el-checkbox label="电焊" size="large" border :disabled="disabledLabels.includes('电焊')"/>
<el-checkbox label="编程" size="large" border :disabled="disabledLabels.includes('编程')"/>
<el-checkbox label="开粗" size="large" border :disabled="disabledLabels.includes('开粗')"/>
<el-checkbox label="铣床" size="large" border :disabled="disabledLabels.includes('铣床')"/>
<el-checkbox label="车床" size="large" border :disabled="disabledLabels.includes('车床')"/>
<el-checkbox label="热处理" size="large" border :disabled="disabledLabels.includes('热处理')" />
<el-checkbox label="磨床" size="large" border :disabled="disabledLabels.includes('磨床')" />
<el-checkbox label="数控1" size="large" border :disabled="disabledLabels.includes('数控1')"/>
<el-checkbox label="数控2" size="large" border :disabled="disabledLabels.includes('数控2')"/>
<el-checkbox label="线切割" size="large" border :disabled="disabledLabels.includes('线切割')"/>
<el-checkbox label="火花" size="large" border :disabled="disabledLabels.includes('火花')"/>
<el-checkbox label="刻字" size="large" border :disabled="disabledLabels.includes('刻字')"/>
<el-checkbox label="网格" size="large" border :disabled="disabledLabels.includes('网格')"/>
<el-checkbox label="深孔钻" size="large" border :disabled="disabledLabels.includes('深孔钻')" />
<el-checkbox label="钻孔" size="large" border :disabled="disabledLabels.includes('钻孔')"/>
<el-checkbox label="下料" size="large" border />
<el-checkbox label="电焊" size="large" border />
<el-checkbox label="编程" size="large" border />
<el-checkbox label="开粗" size="large" border />
<el-checkbox label="铣床" size="large" border />
<el-checkbox label="车床" size="large" border />
<el-checkbox label="热处理" size="large" border />
<el-checkbox label="磨床" size="large" border />
<el-checkbox label="数控1" size="large" border />
<el-checkbox label="数控2" size="large" border />
<el-checkbox label="线切割" size="large" border />
<el-checkbox label="火花" size="large" border />
<el-checkbox label="刻字" size="large" border />
<el-checkbox label="网格" size="large" border />
<el-checkbox label="深孔钻" size="large" border />
<el-checkbox label="钻孔" size="large" border />
<!-- 2025 06 01 以下工序关闭 更新为上面的-->
<!-- <el-checkbox label="铣床" size="large" border />
@ -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 v-model="row.isOutsourcing" @change="handleOutsourcingChange(row)" :disabled="detailDisabled||row.beginProduce != 0 || row.procedureStatus != 0"/>
</template>
</el-table-column>
<el-table-column fixed label="顺序号" align="center" prop="sort" width="120px" >
@ -236,7 +236,7 @@ class="!w-260px" v-model="formData.requiredCompletedDate" type="date" value-form
</el-table-column>
<el-table-column fixed label="泡沫" align="center" width="60">
<template #default="{ row }">
<el-checkbox class="large-checkbox" v-model="row.isFoam" @change="handleChange(row)" :disabled="getDisabledState(row)" v-if="procedureList.find(p => p.id == row.procedureId)?.name == '下料'"/>
<el-checkbox v-model="row.isFoam" @change="handleChange(row)" :disabled="row.beginProduce != 0 || row.procedureStatus != 0" v-if="procedureList.find(p => p.id == row.procedureId)?.name == '下料'"/>
</template>
</el-table-column>
<el-table-column fixed label="工序名称" align="center" prop="procedureId" width="130">
@ -276,7 +276,7 @@ style=" display: flex;
justify-content: center;
align-items: center;
width: 100%;">
<el-checkbox v-model="row.checkYns" class="large-checkbox" @change="changeChange(row)" :disabled="getDisabledState(row)" />
<el-checkbox v-model="row.checkYns" @change="changeChange(row)" :disabled="detailDisabled||row.beginProduce != 0 || row.procedureStatus != 0" />
</div>
</el-form-item>
@ -285,7 +285,7 @@ style=" display: flex;
<el-table-column fixed label="派工类型" align="center" prop="dispatchType" width="145px">
<template #header>派工类型</template>
<template #default="{ row }">
<el-radio-group size="small" :disabled="getDisabledState(row)" v-model="row.dispatchType" @change="()=>dispatchTypeHasChange(row)">
<el-radio-group size="small" :disabled="detailDisabled||row.beginProduce != 0 || row.procedureStatus != 0" v-model="row.dispatchType" @change="()=>dispatchTypeHasChange(row)">
<el-radio-button :label="1">人员</el-radio-button>
<el-radio-button :label="2">岗位</el-radio-button>
</el-radio-group>
@ -301,7 +301,7 @@ style=" display: flex;
<template #header>负责人</template>
<template #default="{ row , $index}">
<el-form-item :prop="`${$index}.owner`" class="mb-0px!">
<el-select :disabled="getDisabledState(row)" clearable filterable v-if="row.dispatchType==1 " v-model="row.owner" placeholder="请选择负责人" style="max-width: 110px">
<el-select :disabled="detailDisabled||row.beginProduce != 0 || row.procedureStatus != 0" clearable filterable v-if="row.dispatchType==1 " v-model="row.owner" placeholder="请选择负责人" style="max-width: 110px">
<el-option
v-for="item in ownerList1"
:key="item.index"
@ -309,7 +309,7 @@ style=" display: flex;
:value="item.id"
/>
</el-select>
<el-select :disabled="getDisabledState(row)" clearable filterable v-if="row.dispatchType==2 && (row.owner != '' && row.owner != null )" v-model="row.owner" placeholder="请选择岗位" style="max-width: 110px">
<el-select :disabled="detailDisabled ||row.beginProduce != 0|| row.procedureStatus != 0" clearable filterable v-if="row.dispatchType==2 && (row.owner != '' && row.owner != null )" v-model="row.owner" placeholder="请选择岗位" style="max-width: 110px">
<el-option
v-for="item in ownerList1"
:key="item.index"
@ -317,7 +317,7 @@ style=" display: flex;
:value="item.id"
/>
</el-select>
<el-select :disabled="getDisabledState(row)" clearable filterable v-if="row.dispatchType==2 && (row.owner == '' || row.owner == null)" v-model="row.postId" placeholder="请选择岗位" style="width: 110px">
<el-select :disabled="detailDisabled||row.beginProduce != 0 || row.procedureStatus != 0" clearable filterable v-if="row.dispatchType==2 && (row.owner == '' || row.owner == null)" v-model="row.postId" placeholder="请选择岗位" style="width: 110px">
<el-option
v-for="item in ownerList2"
:key="item.index"
@ -338,7 +338,7 @@ v-model="row.owner" :disabled="detailDisabled || row.procedureStatus != 0"
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.startTime`" class="mb-0px!">
<el-date-picker
:disabled="getDisabledState1(row) " v-model="row.startTime"
:disabled="detailDisabled " v-model="row.startTime"
type="date" value-format="x" placeholder="选择预计开始日期" @change="changePrepTime('START',$index,row)" />
</el-form-item>
</template>
@ -348,7 +348,7 @@ v-model="row.owner" :disabled="detailDisabled || row.procedureStatus != 0"
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.endTime`" class="mb-0px!">
<el-date-picker
:disabled=" getDisabledState1(row)" v-model="row.endTime"
:disabled=" detailDisabled" v-model="row.endTime"
type="date" value-format="x" placeholder="选择预计结束日期" @change="changePrepTime('END',$index,row)"/>
</el-form-item>
</template>
@ -359,7 +359,7 @@ v-model="row.owner" :disabled="detailDisabled || row.procedureStatus != 0"
<el-form-item :prop="`${$index}.workTime`" class="mb-0px!">
<el-input-number
min="0" :precision="2" class="!w-240px"
:disabled="getDisabledState1(row) " v-model="row.workTime"
:disabled="detailDisabled " v-model="row.workTime"
placeholder="请输入预计工时" />
</el-form-item>
</template>
@ -370,7 +370,7 @@ min="0" :precision="2" class="!w-240px"
<el-form-item :prop="`${$index}.amount`" class="mb-0px!">
<el-input-number
min="0" :max="formData.amount" :precision="0" class="!w-240px"
:disabled="getDisabledState1(row)" v-model="row.amount"
:disabled="detailDisabled" v-model="row.amount"
placeholder="请输入派工数量" />
</el-form-item>
</template>
@ -381,7 +381,7 @@ min="0" :max="formData.amount" :precision="0" class="!w-240px"
<EquipmentSelect
v-model="row.deviceModel"
@update:new-value="handleSelectedequip($index, $event)"
:disabled="getDisabledState(row)" />
:disabled="detailDisabled ||row.beginProduce != 0 || row.procedureStatus != 0" />
</el-form-item>
</template>
</el-table-column>
@ -389,7 +389,7 @@ v-model="row.deviceModel"
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.summary`" class="mb-0px!">
<el-input
:disabled="getDisabledState(row)" v-model="row.summary"
:disabled="detailDisabled ||row.beginProduce != 0 || row.procedureStatus != 0" v-model="row.summary"
placeholder="请输入备注" />
</el-form-item>
</template>
@ -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.beginProduce == 0 && scope.row.procedureStatus == 0)" link type="danger"
size="small" @click.prevent="onDeleteItem(scope.row,scope.$index)">
删除
</el-button>
@ -624,18 +624,8 @@ const changeChange = ( row) =>{
row.checkYns = true
}
}
const getDisabledState1 = (row) => {
const isDisabled = detailDisabled.value || row.reportProcess == 2
return isDisabled
}
// 获取禁用状态的方法
const getDisabledState = (row) => {
const isDisabled = detailDisabled.value || row.reportProcess !== 0
return isDisabled
}
const changePrepTime = (type,index,row)=>{
if(index == 0){
@ -1280,7 +1270,6 @@ const queryData = async (id?: number) => {
craftInfos.value = eval( planData.craftContent)
formData.value.taskDispatchDetails = await TaskDispatchApi.getTaskDispatchDetailListByDispatchId(id)
checkList.value = [];
disabledLabels.value=[];
if(formData.value.taskDispatchDetails!=null){
formData.value.taskDispatchDetails.forEach(item=> {
if(item.checkYn == 1){
@ -1305,7 +1294,6 @@ const queryData = async (id?: number) => {
procedureList.value.forEach(items =>{
if(items.id == item.procedureId){
checkList.value.push(items.name)
disabledLabels.value.push(items.name)
}
})
dispatchListTemp.value.push(JSON.parse(JSON.stringify(item)));
@ -1325,11 +1313,11 @@ const queryData = async (id?: number) => {
}
formData.value.bomCode = formData.value.projectSubCode
// if (formData.value.dispatchStatus == 2 ) {
// detailDisabled.value = true
// }else{
// detailDisabled.value = false
// }
if (formData.value.dispatchStatus == 2 ) {
detailDisabled.value = true
}else{
detailDisabled.value = false
}
// 操作日志
let logParams = {
@ -1482,7 +1470,6 @@ const submitForm = async (operate) => {
}
}
const checkList = ref([])
const disabledLabels = ref([])
const checkListTemp = ref([])
/** 新增按钮操作 */
const procedureArrary = ['下料','电焊','编程','开粗','铣床','车床','磨床','数控1','数控2','刻字','网格','深钻孔','钻孔','热处理','火花']
@ -1532,11 +1519,9 @@ const onAddItem = () => {
dispatchId: undefined,
procedureCode:'' ,
isReport:0 ,
checkYn : 1,
checkYns: false,
postId: ownerList2.value[0].id,
reportProcess:0,
matPlanProcess:"N",
checkYn : 0,
checkYns: true,
postId: ownerList2.value[0].id
}
// 遍历对象的键
// Object.keys(procedureList.value).forEach((key) => {
@ -1848,21 +1833,4 @@ const printHandle = (id) => {
padding: 10px;
/* 调整为合适的值 */
}
.large-checkbox {
transform: scale(1.5); /* 方法1：使用scale放大 */
/* 或者 */
/* 方法2：通过调整字体大小 */
/* font-size: 18px; */
}
/* 或者更精确地控制内部图标 */
/* .large-checkbox .el-checkbox__inner {
width: 20px;
height: 20px;
}
.large-checkbox .el-checkbox__inner::after {
height: 10px;
left: 7px;
top: 3px;
width: 5px;
} */
</style>