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

插活新增添加2D3D筛选条件

Browse Source
This commit is contained in:
z 2026-01-23 15:44:12 +08:00
parent e4083e8ac9
commit edbc8a4b2a
12 changed files with 84 additions and 49 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/plansub/vo/PlanSubPageReqVO.java
View File

@ -88,4 +88,6 @@ public class PlanSubPageReqVO extends PageParam {
private String projectCode;
private String projectSubName;
private String customerBrief;
private String flag1;
private String flag2;
}

3
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/plansubdetail/vo/PlanSubDetailPageReqVO.java
View File

@ -78,4 +78,7 @@ public class PlanSubDetailPageReqVO extends PageParam {
private String planNo;
private Boolean statusflag;
private String flag1;
private String flag2;
}

10
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plansub/PlanSubMapper.java
View File

@ -69,6 +69,16 @@ public interface PlanSubMapper extends BaseMapperX<PlanSubDO> {
query.like(ObjectUtil.isNotEmpty(reqVO.getProjectCode()), PlanDO::getCode, reqVO.getProjectCode())
.like(ObjectUtil.isNotEmpty(reqVO.getProjectSubName()), PlanSubDetailDO::getName, reqVO.getProjectSubName())
.like(ObjectUtil.isNotEmpty(reqVO.getCustomerBrief()), CustomerDO::getBrief, reqVO.getCustomerBrief());
if (ObjectUtil.isNotEmpty(reqVO.getFlag1())&&"true".equals(reqVO.getFlag1())){
query.and(e->e.and(w -> w.isNull(PlanSubDO::getStartTwoDimDate).or().eq(PlanSubDO::getStartTwoDimDate, ""))
.and(w -> w.isNull(PlanSubDO::getTwoDimDate).or().eq(PlanSubDO::getTwoDimDate, ""))
.and(w -> w.isNull(PlanSubDO::getTwoDimOwner).or().eq(PlanSubDO::getTwoDimOwner, "")));
}
if (ObjectUtil.isNotEmpty(reqVO.getFlag2())&&"true".equals(reqVO.getFlag2())){
query.and(e->e.and(w -> w.isNull(PlanSubDO::getStartThreeDimDate).or().eq(PlanSubDO::getStartThreeDimDate, ""))
.and(w -> w.isNull(PlanSubDO::getThreeDimDate).or().eq(PlanSubDO::getThreeDimDate, ""))
.and(w -> w.isNull(PlanSubDO::getThreeDimOwner).or().eq(PlanSubDO::getThreeDimOwner, "")));
}
return selectPage(reqVO, query);
}

34
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/plan/PlanServiceImpl.java
View File

@ -429,23 +429,23 @@ public class PlanServiceImpl implements PlanService {
if (ObjectUtil.isNotEmpty(processDesignDO)) {
if (1 == processDesignDO.getIsOverProcess()) {
planDO.setProcessProgress("已完成");
LambdaQueryWrapper<ProcessDesignProgressDO> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(ProcessDesignProgressDO::getProcessDesignId, processDesignDO.getId());
wrapper.orderByDesc(ProcessDesignProgressDO::getEndTime);
wrapper.last("limit 1");
ProcessDesignProgressDO processDesignProgressDO = processDesignProgressMapper.selectOne(wrapper);
if (ObjectUtil.isNotEmpty(processDesignProgressDO)) {
LocalDateTime dateAsLocalDateTime = processDesignProgressDO.getEndTime().toInstant()
.atZone(ZoneId.systemDefault())
.toLocalDateTime();
if (ObjectUtil.isNotEmpty(planSubDO.getCraftEndDate())) {
if (dateAsLocalDateTime.toLocalDate().isAfter(planSubDO.getCraftEndDate().toLocalDate())) {
planDO.setProcessFlag("1");
} else {
planDO.setProcessFlag("0");
}
}
}
// LambdaQueryWrapper<ProcessDesignProgressDO> wrapper = new LambdaQueryWrapper<>();
// wrapper.eq(ProcessDesignProgressDO::getProcessDesignId, processDesignDO.getId());
// wrapper.orderByDesc(ProcessDesignProgressDO::getEndTime);
// wrapper.last("limit 1");
// ProcessDesignProgressDO processDesignProgressDO = processDesignProgressMapper.selectOne(wrapper);
// if (ObjectUtil.isNotEmpty(processDesignProgressDO)) {
// LocalDateTime dateAsLocalDateTime = processDesignProgressDO.getEndTime().toInstant()
// .atZone(ZoneId.systemDefault())
// .toLocalDateTime();
// if (ObjectUtil.isNotEmpty(planSubDO.getCraftEndDate())) {
// if (dateAsLocalDateTime.toLocalDate().isAfter(planSubDO.getCraftEndDate().toLocalDate())) {
// planDO.setProcessFlag("1");
// } else {
// planDO.setProcessFlag("0");
// }
// }
// }
} else {
if (ObjectUtil.isNotEmpty(planSubDO.getCraftEndDate())) {
if (now.toLocalDate().isAfter(planSubDO.getCraftEndDate().toLocalDate())) {

3
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/plansubdetail/PlanSubDetailServiceImpl.java
View File

@ -259,6 +259,9 @@ public class PlanSubDetailServiceImpl implements PlanSubDetailService {
subPageReqVO.setProjectCode(pageReqVO.getProjectCode() == null ? "" : pageReqVO.getProjectCode());
subPageReqVO.setProjectSubName(pageReqVO.getProjectSubName() == null ?null:pageReqVO.getProjectSubName());
subPageReqVO.setCustomerBrief(pageReqVO.getCustomerBrief() == null ? "" : pageReqVO.getCustomerBrief());
subPageReqVO.setFlag1(ObjectUtil.isEmpty(pageReqVO.getFlag1())? "" : pageReqVO.getFlag1());
subPageReqVO.setFlag2(ObjectUtil.isEmpty(pageReqVO.getFlag2()) ? "" : pageReqVO.getFlag2());
PageResult<PlanSubDO> planPage = planSubMapper.getPlanList(subPageReqVO);
for (PlanSubDO planSubDO : planPage.getList()) {
PlanSubDetailDO planSubDetailDO = new PlanSubDetailDO();

16
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseordernodetail/PurchaseOrderNoDetailServiceImpl.java
View File

@ -243,7 +243,7 @@ public class PurchaseOrderNoDetailServiceImpl implements PurchaseOrderNoDetailSe
// //出库库物料集合
// ArrayList<StorageMatDO> outList = new ArrayList<>();
ArrayList<StorageLogDO> logList = new ArrayList<>();
// ArrayList<StorageLogDO> outLogList = new ArrayList<>();
ArrayList<StorageLogDO> outLogList = new ArrayList<>();
//生成入库单
StorageInDO storageInDO = new StorageInDO();
@ -298,7 +298,7 @@ public class PurchaseOrderNoDetailServiceImpl implements PurchaseOrderNoDetailSe
// outMat.setProjectSubName(byId.getName());
ProcessBomDetailDO bomDetailDO = processBomDetailMapper.selectById(detailDO.getBoomDetailId());
StorageLogDO logDO = new StorageLogDO();
// StorageLogDO outLogDO = new StorageLogDO();
StorageLogDO outLogDO = new StorageLogDO();
if (ObjectUtil.isNotEmpty(bomDetailDO)){
String bomCode="";
String blueprintNo="";
@ -337,12 +337,12 @@ public class PurchaseOrderNoDetailServiceImpl implements PurchaseOrderNoDetailSe
// storageMatDO.setMatId(materialDO.getId());
// outMat.setMatId(materialDO.getId());
logDO.setMatId(materialDO.getId());
// outLogDO.setMatId(materialDO.getId());
outLogDO.setMatId(materialDO.getId());
}else {
// storageMatDO.setMatId(material.getId());
// outMat.setMatId(material.getId());
logDO.setMatId(material.getId());
// outLogDO.setMatId(material.getId());
outLogDO.setMatId(material.getId());
}
}
// storageMatDOS.add(storageMatDO);
@ -405,10 +405,10 @@ public class PurchaseOrderNoDetailServiceImpl implements PurchaseOrderNoDetailSe
logDO.setGoodsType(2);
logDO.setCodeNo(storageInDO.getStorageNo());
logList.add(logDO);
// outLogDO.setStockMode(25);
// outLogDO.setStockType(2);
// outLogDO.setGoodsType(2);
// outLogList.add(outLogDO);
outLogDO.setStockMode(25);
outLogDO.setStockType(2);
outLogDO.setGoodsType(2);
outLogList.add(outLogDO);
}
}
storageLogMapper.insertBatch(logList);

2
mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storage/StorageMapper.xml
View File

@ -71,6 +71,6 @@
WHERE
sto.stock_in_type = 5
AND sto.STATUS = 4
AND sto.project_no = #{projectSubId}
AND mat.project_no = #{projectSubId}
</select>
</mapper>

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

@ -337,6 +337,18 @@
<el-form-item label="客户简称">
<el-input v-model="addQueryParams.customerBrief" placeholder="请输入客户简称" />
</el-form-item>
<el-form-item>
<label style="display: inline-flex; align-items: center; margin-left: 20px;">
<el-checkbox class="large-checkbox" v-model="addQueryParams.flag1" style="order: 2; margin-left: 10px;"/>
<span style="order: 1;">2D</span>
</label>
</el-form-item>
<el-form-item>
<label style="display: inline-flex; align-items: center; margin-left: 20px;">
<el-checkbox class="large-checkbox" v-model="addQueryParams.flag2" style="order: 2; margin-left: 10px;"/>
<span style="order: 1;">3D</span>
</label>
</el-form-item>
<el-button type="primary" @click="handleAddQuery">查询</el-button>
</el-form>
@ -443,7 +455,9 @@ const addQueryParams = reactive({
pageSize: 10,
projectCode: '',
projectSubName: '',
customerBrief:''
customerBrief:'',
flag1:false,
flag2:false
})
const selectedAddRow = ref([])
const rowClickHandle = (row) => {
@ -506,7 +520,9 @@ const getAddList = async () => {
projectSubName: addQueryParams.projectSubName,
customerBrief:addQueryParams.customerBrief,
pageNo:addQueryParams.pageNo,
pageSize:addQueryParams.pageSize
pageSize:addQueryParams.pageSize,
flag1:addQueryParams.flag1,
flag2:addQueryParams.flag2
}
const res = await PlansubdetailApi.pageAddList(params)
console.log(res)
@ -1118,4 +1134,8 @@ window.addEventListener('beforeunload', () => {
margin: 0 10px;
min-width: 100px;
}
.large-checkbox {
transform: scale(1.5);
}
</style>

16
mes-ui/mes-ui-admin-vue3/src/views/heli/partprocess/detail.vue
View File

@ -211,7 +211,6 @@ const change1 =async (val) => {
}
}else if (type.value=='zhuangpei'){
list5.value= await PlansubdetailApi.getList5(queryParams)
console.log(list5.value.length)
if (list5.value.length<=0){
type1.value=type.value
type.value=''
@ -220,7 +219,6 @@ const change1 =async (val) => {
}
/** 处理某一行的点击 */
const rowClick = async (row) => {
console.log(type1.value);
const queryParams = reactive({
projectSubId:formData.projectSubId,
statusflag:formData.statusflag
@ -261,33 +259,33 @@ const rowClick = async (row) => {
}
const cellClassName = ({ row,column }) => {
if (column.label === '任务状态' && row.statusFlag) {
return row.statusFlag === '1' ? 'warning-row1' :"";
return row.statusFlag === '1'&&row.percentage!='100%' ? 'warning-row1' :"";
}
}
const cellClassName1 = ({ row,column }) => {
if (column.label === '派工单状态' && row.receivingFlag) {
return row.receivingFlag === '1' ? 'warning-row1' :"";
return row.receivingFlag === '1'&&row.receiving!='已收货' ? 'warning-row1' :"";
}
}
const cellClassName2 = ({ row,column }) => {
if (column.label === '派工单状态' && row.reportFlag) {
return row.reportFlag === '1' ? 'warning-row1' :"";
return row.reportFlag === '1'&&row.report!='已完成' ? 'warning-row1' :"";
}
}
const cellClassName3 = ({ row,column }) => {
if (column.label === '过程检状态' && row.reportFlag) {
return row.reportFlag === '1' ? 'warning-row1' :"";
return row.reportFlag === '1'&& row.report!='已完成'? 'warning-row1' :"";
}
}
const cellClassName4 = ({ row,column }) => {
if (column.label === '派工单状态' && row.reportFlag) {
return row.reportFlag === '1' ? 'warning-row1' :"";
return row.reportFlag === '1' &&row.report!='已完成'? 'warning-row1' :"";
}
}
const cellClassName5 = ({ row,column }) => {
if (column.label === '工单状态' && row.statusFlag) {
return row.statusFlag === '1' ? 'warning-row1' :"";
return row.statusFlag === '1'&&row.status!='已完成' ? 'warning-row1' :"";
}
}
@ -311,7 +309,7 @@ const getList = async () => {
<style scoped>
:deep(.warning-row1) {
background-color:#d9001b !important;
background-color:#F08080 !important;
}
.large-checkbox {

14
mes-ui/mes-ui-admin-vue3/src/views/heli/partprocess/index.vue
View File

@ -179,19 +179,19 @@ const getList = async () => {
const cellClassName = ({ row,column }) => {
if (column.label === '设计任务' && row.designTaskFlag) {
return row.designTaskFlag === '1' ? 'warning-row1' :"";
return row.designTaskFlag === '1'&&row.designTask!='已完成' ? 'warning-row1' :"";
}
if (column.label === '外协任务' && row.outsourcingTasksFlag) {
return row.outsourcingTasksFlag === '1' ? 'warning-row1' :"";
return row.outsourcingTasksFlag === '1'&&row.outsourcingTasks!='已完成'? 'warning-row1' :"";
}
if (column.label === '加工任务' && row.processingTaskFlag) {
return row.processingTaskFlag === '1' ? 'warning-row1' :"";
return row.processingTaskFlag === '1'&&row.processingTask!='已完成' ? 'warning-row1' :"";
}
if (column.label === '过程检任务' && row.processInspectionFlag) {
return row.processInspectionFlag === '1' ? 'warning-row1' :"";
return row.processInspectionFlag === '1'&& row.processInspection!='已完成'? 'warning-row1' :"";
}
if (column.label === '装配任务' && row.assemblyTaskFlag) {
return row.assemblyTaskFlag === '1' ? 'warning-row1' :"";
return row.assemblyTaskFlag === '1'&& row.assemblyTask!='已完成'? 'warning-row1' :"";
}
// return '';
}
@ -242,13 +242,13 @@ window.addEventListener('beforeunload', () => {
<style scoped>
:deep(.warning-row1) {
background-color:#d9001b !important;
background-color:#F08080 !important;
}
:deep(.warning-row2) {
background-color: #1E90FF !important; /* 道奇蓝 */
}
.red-background :deep(.el-input__wrapper) {
background-color: #d9001b !important;
background-color: #F08080 !important;
}
</style>

5
mes-ui/mes-ui-admin-vue3/src/views/heli/taskreport/index.vue
View File

@ -107,9 +107,8 @@
<el-table-column label="报工人" align="center" prop="ownerName" />
<el-table-column label="报工进度" align="center" prop="reportProcess" width="160">
<template #default="scope">
<el-tag v-if="scope.row.procedureStatus === '1'" type="warning">已报工</el-tag>
<el-tag v-else-if="scope.row.procedureStatus === '2'" type="success">报工完成</el-tag>
<el-tag v-else>未报工</el-tag>
<el-tag v-if="scope.row.procedureStatus === '2'" type="success">报工完成</el-tag>
<el-tag v-else>已报工</el-tag>
</template>
</el-table-column>
<el-table-column label="报工工序" align="center" prop="procedureName" width="160" />

4
mes-ui/mini-app/src/services/constants.ts
View File

@ -9,5 +9,5 @@
// export const serviceDomain = 'https://nxhs.cjyx.cc'
// export const serviceDomain = 'https://star.hz-hl.com'
// export const serviceDomain = 'http://222.71.165.187:9010'
export const serviceDomain = 'http://localhost:8080'
// export const serviceDomain = 'https://nxhs.cjyx.cc'
// export const serviceDomain = 'http://localhost:8080'
export const serviceDomain = 'https://nxhs.cjyx.cc'