diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/plansubdetail/PlanSubDetailDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/plansubdetail/PlanSubDetailDO.java index 66cfc128..73701b52 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/plansubdetail/PlanSubDetailDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/plansubdetail/PlanSubDetailDO.java @@ -100,4 +100,6 @@ public class PlanSubDetailDO extends BaseDO { private String projectName; @TableField(exist = false) private String planNo; + @TableField(exist = false) + private String projectNameSim; } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plansubdetail/PlanSubDetailMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plansubdetail/PlanSubDetailMapper.java index 2b411c60..399b3785 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plansubdetail/PlanSubDetailMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plansubdetail/PlanSubDetailMapper.java @@ -47,7 +47,7 @@ public interface PlanSubDetailMapper extends BaseMapperX { MPJLambdaWrapper 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 { .or() .ge( PlanSubDetailDO::getTwoDimDate, reqVO.getStartTime())) .in(PlanSubDetailDO::getIsOverProcess,0,2); - return selectPage(reqVO, query); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordernodetail/PurchaseOrderNoDetailMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordernodetail/PurchaseOrderNoDetailMapper.java index 98e7463f..1cec9124 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordernodetail/PurchaseOrderNoDetailMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordernodetail/PurchaseOrderNoDetailMapper.java @@ -273,7 +273,7 @@ public interface PurchaseOrderNoDetailMapper extends BaseMapperX planSubDetailDOS = planSubDetailMapper.selectExistList(userIds); + if (ObjectUtil.isNotEmpty(userIds)){ + List planSubDetailDOS = planSubDetailMapper.selectExistList(userIds); + checkForConflicts(list,planSubDetailDOS); + } List insertList = new ArrayList<>(); //检查冲突 - checkForConflicts(list,planSubDetailDOS); List bean = BeanUtils.toBean(list, PlanSubDO.class); planSubMapper.updateBatch(bean); if (CollUtil.isNotEmpty(inserList)){ diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/interrupt/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/interrupt/index.vue index 7f6f9a6e..822407e9 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/interrupt/index.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/interrupt/index.vue @@ -85,6 +85,7 @@ > + diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchaseorder/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchaseorder/index.vue index 7184bc21..3b1432a9 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchaseorder/index.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchaseorder/index.vue @@ -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;