diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderys/vo/OrderYsPageReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderys/vo/OrderYsPageReqVO.java index 32d8a5c7..67ebddd3 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderys/vo/OrderYsPageReqVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderys/vo/OrderYsPageReqVO.java @@ -50,4 +50,8 @@ public class OrderYsPageReqVO extends PageParam { private String customerName; @Schema(description = "类型") private Integer type; + @Schema(description = "发货状态") + private String deliveryStatus; + @Schema(description = "已发货") + private String flag; } \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/pgmaster/PgMasterController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/pgmaster/PgMasterController.java index 6bee487d..3c4f534e 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/pgmaster/PgMasterController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/pgmaster/PgMasterController.java @@ -203,7 +203,7 @@ public class PgMasterController { queryWrapper.last("limit 1"); BgMasterLineDO bgMasterLineDO = bgMasterLineMapper.selectOne(queryWrapper); if (ObjectUtil.isNotEmpty(bgMasterLineDO)){ - pgMasterLineDO.setIsQua(bgMasterLineDO.getIsQua()==0?"不合格":"合格"); + pgMasterLineDO.setIsQua(bgMasterLineDO.getIsQua()==0?"合格":"不合格"); } } } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/deliverorder/DeliverOrderMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/deliverorder/DeliverOrderMapper.java index bbc0e5f1..44df14d1 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/deliverorder/DeliverOrderMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/deliverorder/DeliverOrderMapper.java @@ -1,5 +1,6 @@ package com.chanko.yunxi.mes.module.heli.dal.mysql.deliverorder; +import cn.hutool.core.util.ObjectUtil; import com.chanko.yunxi.mes.framework.common.pojo.PageResult; import com.chanko.yunxi.mes.framework.common.util.collection.ArrayUtils; import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX; @@ -9,6 +10,7 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverorder.DeliverOrder import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO; import com.github.yulichang.wrapper.MPJLambdaWrapper; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.One; import org.springframework.util.StringUtils; import java.util.List; @@ -35,11 +37,17 @@ public interface DeliverOrderMapper extends BaseMapperX { .disableSubLogicDel(); query.like(!StringUtils.isEmpty(reqVO.getCode()), DeliverOrderDO::getCode, reqVO.getCode()) .like(!StringUtils.isEmpty(reqVO.getSaleOrderCode()), "p.code", reqVO.getSaleOrderCode()) - .like(!StringUtils.isEmpty(reqVO.getCustomerName()), "e.name", reqVO.getCustomerName()) - .like(!StringUtils.isEmpty(reqVO.getProjectName()), "p.project_name", reqVO.getProjectName()) +// .like(!StringUtils.isEmpty(reqVO.getCustomerName()), "e.name", reqVO.getCustomerName()) +// .like(!StringUtils.isEmpty(reqVO.getProjectName()), "p.project_name", reqVO.getProjectName()) .between(reqVO.getDeliverDate() != null && reqVO.getDeliverDate().length == 2, DeliverOrderDO::getDeliverDate, ArrayUtils.get(reqVO.getDeliverDate(), 0), ArrayUtils.get(reqVO.getDeliverDate(), 1)) .eq(reqVO.getDeliverStatus() != null, DeliverOrderDO::getDeliverStatus, reqVO.getDeliverStatus()); + if (ObjectUtil.isNotEmpty(reqVO.getProjectName())){ + query.and(e -> e.like("p.project_name", reqVO.getProjectName()).or().like("p.project_name_sim", reqVO.getProjectName())); + } + if (ObjectUtil.isNotEmpty(reqVO.getCustomerName())){ + query.and(e -> e.like(CustomerDO::getName, reqVO.getCustomerName()).or().like(CustomerDO::getBrief, reqVO.getCustomerName())); + } 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/orderys/OrderYsMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/orderys/OrderYsMapper.java index dfddddce..c9abe84e 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/orderys/OrderYsMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/orderys/OrderYsMapper.java @@ -3,6 +3,7 @@ package com.chanko.yunxi.mes.module.heli.dal.mysql.orderys; import java.util.*; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chanko.yunxi.mes.framework.common.pojo.PageResult; import com.chanko.yunxi.mes.framework.mybatis.core.query.LambdaQueryWrapperX; @@ -46,7 +47,15 @@ public interface OrderYsMapper extends BaseMapperX { query.like(!StringUtils.isEmpty(reqVO.getProjectName()), OrderYsDO::getProjectName, reqVO.getProjectName()) .like(!StringUtils.isEmpty(reqVO.getCgKhname()), OrderYsDO::getCgKhname, reqVO.getCgKhname()) + + .gt(OrderYsDO::getCgYs,0) .eq(!StringUtils.isEmpty(reqVO.getCgTypee()), OrderYsDO::getCgTypee, reqVO.getCgTypee()); + if (ObjectUtil.isNotEmpty(reqVO.getFlag())&&"false".equals(reqVO.getFlag())){ + query.eq(ProjectOrderDO::getDeliveryStatus,1); + }else if (ObjectUtil.isNotEmpty(reqVO.getFlag())&&"true".equals(reqVO.getFlag())){ + query.in(ProjectOrderDO::getDeliveryStatus,2,3); + + } // .eq(InvoiceDO::getType, "FINANCE_MAKE_INVOICE"); 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/processbom/ProcessBomMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processbom/ProcessBomMapper.java index 5aa2e78a..62050577 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processbom/ProcessBomMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processbom/ProcessBomMapper.java @@ -1,5 +1,6 @@ package com.chanko.yunxi.mes.module.heli.dal.mysql.processbom; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.chanko.yunxi.mes.framework.common.pojo.PageResult; import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX; @@ -88,13 +89,18 @@ public interface ProcessBomMapper extends BaseMapperX { query.and(!StringUtils.isEmpty(reqVO.getCode()), QueryWrapper -> QueryWrapper.apply("locate({0}, e.project_sub_code ) > 0", reqVO.getCode())) .like(!StringUtils.isEmpty(reqVO.getPlanCode()), PlanDO::getPlanNo, reqVO.getPlanCode()) .like(!StringUtils.isEmpty(reqVO.getProjectCode()), ProjectOrderDO::getCode, reqVO.getProjectCode()) - .like(!StringUtils.isEmpty(reqVO.getCustomerName()), CustomerDO::getName, reqVO.getCustomerName()) - .like(!StringUtils.isEmpty(reqVO.getProjectName()), ProjectOrderDO::getProjectName, reqVO.getProjectName()) +// .like(!StringUtils.isEmpty(reqVO.getCustomerName()), CustomerDO::getName, reqVO.getCustomerName()) +// .like(!StringUtils.isEmpty(reqVO.getProjectName()), ProjectOrderDO::getProjectName, reqVO.getProjectName()) .like(!StringUtils.isEmpty(reqVO.getProjectSubName()), ProjectOrderSubDO::getName, reqVO.getProjectSubName()) .eq(reqVO.getBomStatus() != null, ProcessBomDO::getBomStatus, reqVO.getBomStatus()) .eq(ProcessBomDO::getShenheUser, reqVO.getUserId())//reqVO.getUserId() ; - + if (ObjectUtil.isNotEmpty(reqVO.getProjectName())){ + query.and(e -> e.like(ProjectOrderDO::getProjectName, reqVO.getProjectName()).or().like(ProjectOrderDO::getProjectNameSim, reqVO.getProjectName())); + } + if (ObjectUtil.isNotEmpty(reqVO.getCustomerName())){ + query.and(e -> e.like(CustomerDO::getName, reqVO.getCustomerName()).or().like(CustomerDO::getBrief, reqVO.getCustomerName())); + } return selectPage(reqVO, query); } @@ -117,12 +123,17 @@ public interface ProcessBomMapper extends BaseMapperX { query.and(!StringUtils.isEmpty(reqVO.getCode()), QueryWrapper -> QueryWrapper.apply("locate({0}, e.project_sub_code ) > 0", reqVO.getCode())) .like(!StringUtils.isEmpty(reqVO.getPlanCode()), PlanDO::getPlanNo, reqVO.getPlanCode()) .like(!StringUtils.isEmpty(reqVO.getProjectCode()), ProjectOrderDO::getCode, reqVO.getProjectCode()) - .like(!StringUtils.isEmpty(reqVO.getCustomerName()), CustomerDO::getName, reqVO.getCustomerName()) - .like(!StringUtils.isEmpty(reqVO.getProjectName()), ProjectOrderDO::getProjectName, reqVO.getProjectName()) +// .like(!StringUtils.isEmpty(reqVO.getCustomerName()), CustomerDO::getName, reqVO.getCustomerName()) +// .like(!StringUtils.isEmpty(reqVO.getProjectName()), ProjectOrderDO::getProjectName, reqVO.getProjectName()) .like(!StringUtils.isEmpty(reqVO.getProjectSubName()), ProjectOrderSubDO::getName, reqVO.getProjectSubName()) .eq(reqVO.getBomStatus() != null, ProcessBomDO::getBomStatus, reqVO.getBomStatus()) ; - + if (ObjectUtil.isNotEmpty(reqVO.getProjectName())){ + query.and(e -> e.like(ProjectOrderDO::getProjectName, reqVO.getProjectName()).or().like(ProjectOrderDO::getProjectNameSim, reqVO.getProjectName())); + } + if (ObjectUtil.isNotEmpty(reqVO.getCustomerName())){ + query.and(e -> e.like(CustomerDO::getName, reqVO.getCustomerName()).or().like(CustomerDO::getBrief, reqVO.getCustomerName())); + } return selectPage(reqVO, query); } default ProcessBomDO selectById(Long id) { diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processdesign/ProcessDesignMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processdesign/ProcessDesignMapper.java index cfb25ad5..5462f948 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processdesign/ProcessDesignMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processdesign/ProcessDesignMapper.java @@ -60,11 +60,10 @@ public interface ProcessDesignMapper extends BaseMapperX { // query.orderByDesc(PlanDO::getPlanNo); // } - query.like(!StringUtils.isEmpty(reqVO.getPlanCode()), PlanDO::getPlanNo, reqVO.getPlanCode()) .like(!StringUtils.isEmpty(reqVO.getProjectCode()), ProjectOrderDO::getCode, reqVO.getProjectCode()) - .like(!StringUtils.isEmpty(reqVO.getCustomerName()), CustomerDO::getName, reqVO.getCustomerName()) - .like(!StringUtils.isEmpty(reqVO.getProjectName()), ProjectOrderDO::getProjectName, reqVO.getProjectName()) +// .like(!StringUtils.isEmpty(reqVO.getCustomerName()), CustomerDO::getName, reqVO.getCustomerName()) +// .like(!StringUtils.isEmpty(reqVO.getProjectName()), ProjectOrderDO::getProjectName, reqVO.getProjectName()) .eq(reqVO.getBusinessLine() != null, ProjectOrderDO::getBusinessLine, reqVO.getBusinessLine()) .eq(reqVO.getProperty() != null, ProjectOrderDO::getProperty, reqVO.getProperty()) .like(!StringUtils.isEmpty(reqVO.getCraftOwnerName()), "u2.nickname", reqVO.getCraftOwnerName()) @@ -80,6 +79,13 @@ public interface ProcessDesignMapper extends BaseMapperX { .eq(reqVO.getProjectSubId() != null, ProcessDesignDO::getProjectSubId, reqVO.getProjectSubId()) .in(reqVO.getProjectSubIdList() != null && !reqVO.getProjectSubIdList().isEmpty(), ProcessDesignDO::getProjectSubId, reqVO.getProjectSubIdList()) ; + if (ObjectUtil.isNotEmpty(reqVO.getProjectName())){ + query.and(e -> e.like(ProjectOrderDO::getProjectName, reqVO.getProjectName()).or().like(ProjectOrderDO::getProjectNameSim, reqVO.getProjectName())); + } + if (ObjectUtil.isNotEmpty(reqVO.getCustomerName())){ + query.and(e -> e.like(CustomerDO::getName, reqVO.getCustomerName()).or().like(CustomerDO::getBrief, reqVO.getCustomerName())); + } + if (ObjectUtil.isNotEmpty(reqVO.getProcessDesignType())){ if ("CASTING_DRAWING".equals(reqVO.getProcessDesignType())){ query.orderByDesc(PlanDO::getCastEndDate); @@ -243,8 +249,8 @@ public interface ProcessDesignMapper extends BaseMapperX { query.orderByDesc(ProcessDesignDO::getCreateTime); query .like(!StringUtils.isEmpty(reqVO.getProjectCode()), ProjectOrderDO::getCode, reqVO.getProjectCode()) - .like(!StringUtils.isEmpty(reqVO.getCustomerName()), CustomerDO::getName, reqVO.getCustomerName()) - .like(!StringUtils.isEmpty(reqVO.getProjectName()), ProjectOrderDO::getProjectName, reqVO.getProjectName()) +// .like(!StringUtils.isEmpty(reqVO.getCustomerName()), CustomerDO::getName, reqVO.getCustomerName()) +// .like(!StringUtils.isEmpty(reqVO.getProjectName()), ProjectOrderDO::getProjectName, reqVO.getProjectName()) .like(!StringUtils.isEmpty(reqVO.getProjectSubName()), ProjectOrderSubDO::getName, reqVO.getProjectSubName()) // .in(reqVO.getProcessDesignTypeList() != null && !reqVO.getProcessDesignTypeList().isEmpty(), ProcessDesignDO::getProcessDesignType, reqVO.getProcessDesignTypeList()) .like(!StringUtils.isEmpty(reqVO.getProcessDesignType()), ProcessDesignDO::getProcessDesignType, reqVO.getProcessDesignType()); @@ -255,7 +261,12 @@ public interface ProcessDesignMapper extends BaseMapperX { query.ne(ProcessDesignDO::getIsOverProcess, 1); } } - + if (ObjectUtil.isNotEmpty(reqVO.getProjectName())){ + query.and(e -> e.like(ProjectOrderDO::getProjectName, reqVO.getProjectName()).or().like(ProjectOrderDO::getProjectNameSim, reqVO.getProjectName())); + } + if (ObjectUtil.isNotEmpty(reqVO.getCustomerName())){ + query.and(e -> e.like(CustomerDO::getName, reqVO.getCustomerName()).or().like(CustomerDO::getBrief, reqVO.getCustomerName())); + } query.and(q -> q .and(innerQ -> innerQ .apply("a.craft_start_date is not null and a.craft_end_date is not null and t.process_design_type = {0}", ProcessDesignTypeEnum.BLUEPRINT_FOUNDRY_TECHNOLOGY.name()) @@ -335,8 +346,8 @@ public interface ProcessDesignMapper extends BaseMapperX { query.orderByDesc(ProcessDesignDO::getCreateTime); query .like(!StringUtils.isEmpty(reqVO.getProjectCode()), ProjectOrderDO::getCode, reqVO.getProjectCode()) - .like(!StringUtils.isEmpty(reqVO.getCustomerName()), CustomerDO::getName, reqVO.getCustomerName()) - .like(!StringUtils.isEmpty(reqVO.getProjectName()), ProjectOrderDO::getProjectName, reqVO.getProjectName()) +// .like(!StringUtils.isEmpty(reqVO.getCustomerName()), CustomerDO::getName, reqVO.getCustomerName()) +// .like(!StringUtils.isEmpty(reqVO.getProjectName()), ProjectOrderDO::getProjectName, reqVO.getProjectName()) .like(!StringUtils.isEmpty(reqVO.getProjectSubName()), ProjectOrderSubDO::getName, reqVO.getProjectSubName()) // .in(reqVO.getProcessDesignTypeList() != null && !reqVO.getProcessDesignTypeList().isEmpty(), ProcessDesignDO::getProcessDesignType, reqVO.getProcessDesignTypeList()) .like(!StringUtils.isEmpty(reqVO.getProcessDesignType()), ProcessDesignDO::getProcessDesignType, reqVO.getProcessDesignType()); @@ -347,6 +358,12 @@ public interface ProcessDesignMapper extends BaseMapperX { query.ne(ProcessDesignDO::getIsOverProcess, 1); } } + if (ObjectUtil.isNotEmpty(reqVO.getProjectName())){ + query.and(e -> e.like(ProjectOrderDO::getProjectName, reqVO.getProjectName()).or().like(ProjectOrderDO::getProjectNameSim, reqVO.getProjectName())); + } + if (ObjectUtil.isNotEmpty(reqVO.getCustomerName())){ + query.and(e -> e.like(CustomerDO::getName, reqVO.getCustomerName()).or().like(CustomerDO::getBrief, reqVO.getCustomerName())); + } query.and(q -> q .and(innerQ -> innerQ .apply("a.craft_start_date is not null and a.craft_end_date is not null and t.process_design_type = {0}", ProcessDesignTypeEnum.BLUEPRINT_FOUNDRY_TECHNOLOGY.name()) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pgmaster/PgMasterServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pgmaster/PgMasterServiceImpl.java index 69fe144c..95ff46bf 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pgmaster/PgMasterServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pgmaster/PgMasterServiceImpl.java @@ -184,7 +184,7 @@ public class PgMasterServiceImpl implements PgMasterService { bgMasterLineDO.setAmount(pgMasterLineDO.getAmount()); bgMasterLineDO.setBgTime(LocalDateTime.now()); bgMasterLineDO.setEntTime(LocalDateTime.now()); - bgMasterLineDO.setIsQua(1); + bgMasterLineDO.setIsQua(0); bgMasterLineMapper.insert(bgMasterLineDO); pgMasterLineDO.setPgType(1); pgMasterLineDO.setDetilUser(Long.parseLong(getLoginUser().getId().toString())); diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/orderys/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/orderys/index.vue index ed8b7757..b7efe219 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/orderys/index.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/orderys/index.vue @@ -58,7 +58,28 @@ /> + + + + + + + + + + + + + + + + + + 搜索 重置 @@ -206,6 +227,8 @@ const queryParams = reactive({ cgYishou: undefined, cgTypee: undefined, rem: undefined, + deliveryStatus:undefined, + flag:false, }) const queryFormRef = ref() // 搜索的表单 const exportLoading = ref(false) // 导出的加载中 diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorderno/partReceived.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorderno/partReceived.vue index 20b1e8b3..a06b59b4 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorderno/partReceived.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorderno/partReceived.vue @@ -104,22 +104,24 @@ v-model="queryParams.supplierName" placeholder="供应商" clearable @keyup.ente - + + + - + - + - - + +