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-10-16 16:56:20 +08:00
parent 41c8882d94
commit 52db713a31
6 changed files with 13 additions and 5 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/dal/dataobject/plansubdetail/PlanSubDetailDO.java
View File

@ -100,4 +100,6 @@ public class PlanSubDetailDO extends BaseDO {
private String projectName;
@TableField(exist = false)
private String planNo;
@TableField(exist = false)
private String projectNameSim;
}

3
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plansubdetail/PlanSubDetailMapper.java
View File

@ -47,7 +47,7 @@ public interface PlanSubDetailMapper extends BaseMapperX<PlanSubDetailDO> {
MPJLambdaWrapper<PlanSubDetailDO> query = new MPJLambdaWrapper<>();
query.selectAll(PlanSubDetailDO.class)
.select("p.project_name as projectName","c.brief as customerBrief")
.select("p.project_name as projectName","c.brief as customerBrief","p.project_name_sim as projectNameSim")
.leftJoin(ProjectOrderDO.class,"p",ProjectOrderDO::getId,PlanSubDetailDO::getProjectId)
.leftJoin(CustomerDO.class,"c",CustomerDO::getId,ProjectOrderDO::getCustomerId)
.orderByAsc(PlanSubDetailDO::getStartTwoDimDate);
@ -59,7 +59,6 @@ public interface PlanSubDetailMapper extends BaseMapperX<PlanSubDetailDO> {
.or()
.ge( PlanSubDetailDO::getTwoDimDate, reqVO.getStartTime()))
.in(PlanSubDetailDO::getIsOverProcess,0,2);
return selectPage(reqVO, query);
}

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

@ -273,7 +273,7 @@ public interface PurchaseOrderNoDetailMapper extends BaseMapperX<PurchaseOrderNo
.eq(pageReqVO.getGoodsType() != null, PurchaseOrderNoDO::getGoodsType, pageReqVO.getGoodsType())
.like(!StringUtils.isEmpty(pageReqVO.getProjectName()), PurchaseOrderNoDetailDO::getProjectName, pageReqVO.getProjectName())
.like(!StringUtils.isEmpty(pageReqVO.getProjectCode()), ProjectOrderDO::getCode, pageReqVO.getProjectCode())
.like(!StringUtils.isEmpty(pageReqVO.getCustomerName()), CustomerDO::getName, pageReqVO.getCustomerName())
.like(!StringUtils.isEmpty(pageReqVO.getCustomerName()), CustomerDO::getBrief, pageReqVO.getCustomerName())
.like(!StringUtils.isEmpty(pageReqVO.getProjectSubName()), PurchaseOrderNoDetailDO::getName, pageReqVO.getProjectSubName())
.like(!StringUtils.isEmpty(pageReqVO.getUsername()), AdminUserDO::getNickname, pageReqVO.getUsername())
.like(!ObjectUtil.isEmpty(pageReqVO.getBoomName()), PurchaseOrderNoDetailDO::getBoomName, pageReqVO.getBoomName())

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

@ -91,10 +91,12 @@ public class PlanSubServiceImpl implements PlanSubService {
userIds.add(planSubSaveReqVO.getBlankOwner());
}
}
if (ObjectUtil.isNotEmpty(userIds)){
List<PlanSubDetailDO> planSubDetailDOS = planSubDetailMapper.selectExistList(userIds);
checkForConflicts(list,planSubDetailDOS);
}
List<PlanSubDetailDO> insertList = new ArrayList<>();
//检查冲突
checkForConflicts(list,planSubDetailDOS);
List<PlanSubDO> bean = BeanUtils.toBean(list, PlanSubDO.class);
planSubMapper.updateBatch(bean);
if (CollUtil.isNotEmpty(inserList)){

1
mes-ui/mes-ui-admin-vue3/src/views/heli/interrupt/index.vue
View File

@ -85,6 +85,7 @@
>
<el-table-column fixed label="序号" type="index" width="70" align="center" />
<el-table-column fixed label="项目编码" align="center" prop="code" min-width="130" />
<el-table-column fixed label="项目简码" align="center" prop="projectNameSim" min-width="130" />
<el-table-column fixed label="子项目名称" align="center" prop="name" min-width="180" />
<el-table-column min-width="110px" align="center">
<template #header>设计类型</template>

4
mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchaseorder/index.vue
View File

@ -227,6 +227,10 @@ const submitForm = async () => {
// 2. 检查供应商一致性
const firstSupplierId = list[0].supplierId;
console.log(firstSupplierId)
list.forEach((item, index) => {
console.log(`第${index}个:`, item.supplierId, '类型:', typeof item.supplierId, '相等:', item.supplierId === firstSupplierId);
});
if (list.some(item => item.supplierId !== firstSupplierId)) {
message.error("零件采购订单不属于同一个供应商，请确认");
return;