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-11-18 14:13:25 +08:00
parent ee0d5f202e
commit 58683c389c
11 changed files with 103 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderys/vo/OrderYsPageReqVO.java
View File

@ -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;
}

2
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/pgmaster/PgMasterController.java
View File

@ -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?"合格":"不合格");
}
}
}

12
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/deliverorder/DeliverOrderMapper.java
View File

@ -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<DeliverOrderDO> {
.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);
}

9
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/orderys/OrderYsMapper.java
View File

@ -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<OrderYsDO> {
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);

23
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processbom/ProcessBomMapper.java
View File

@ -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<ProcessBomDO> {
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<ProcessBomDO> {
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) {

33
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processdesign/ProcessDesignMapper.java
View File

@ -60,11 +60,10 @@ public interface ProcessDesignMapper extends BaseMapperX<ProcessDesignDO> {
// 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<ProcessDesignDO> {
.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<ProcessDesignDO> {
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<ProcessDesignDO> {
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<ProcessDesignDO> {
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<ProcessDesignDO> {
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())

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

@ -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()));

23
mes-ui/mes-ui-admin-vue3/src/views/heli/orderys/index.vue
View File

@ -58,7 +58,28 @@
/>
</el-select>
</el-form-item>
<el-form-item>
<label style="display: inline-flex; align-items: center; margin-left: 20px;">
<el-checkbox class="large-checkbox" v-model="queryParams.flag" style="order: 2; margin-left: 10px;"/>
<span style="order: 1;">已发货</span>
</label>
</el-form-item>
<!-- <el-form-item label="发货状态" prop="deliveryStatus">-->
<!-- <el-select-->
<!-- v-model="queryParams.deliveryStatus"-->
<!-- placeholder="请选择"-->
<!-- clearable-->
<!-- class="!w-200px"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="dict in getIntDictOptions(DICT_TYPE.HELI_DELIVERY_STATUS)"-->
<!-- :key="dict.value"-->
<!-- :label="dict.label"-->
<!-- :value="dict.value"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
@ -206,6 +227,8 @@ const queryParams = reactive({
cgYishou: undefined,
cgTypee: undefined,
rem: undefined,
deliveryStatus:undefined,
flag:false,
})
const queryFormRef = ref() // 搜索的表单
const exportLoading = ref(false) // 导出的加载中

12
mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorderno/partReceived.vue
View File

@ -104,22 +104,24 @@ v-model="queryParams.supplierName" placeholder="供应商" clearable @keyup.ente
<el-table
v-loading="loading" :data="list" :show-overflow-tooltip="true" class="hl-table" ref="multipleTableRef" show-summary :summary-method="getSummaries" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
<el-table-column type="selection" width="80" fixed="left" />
<el-table-column fixed label="序号" type="index" width="70" align="center" />
<!-- <el-table-column label="收货状态" align="center" prop="receivingStatus" min-width="120">-->
<!-- <template #default="scope">-->
<!-- <dict-tag :type="DICT_TYPE.HELI_PURCHASE_RECEIVING_STATUS" :value="scope.row.receivingStatus" />-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column prop="projectSubCode" min-width="240" label="子项目编码" align="center"/>
<el-table-column prop="projectSubCode" min-width="300" label="子项目编码" align="center"/>
<el-table-column prop="blueprintNo" min-width="80" label="图号" align="center"/>
<el-table-column prop="boomName" min-width="180" label="零件名称" align="center"/>
<el-table-column prop="boomSpec" min-width="110" label="规格/型号" align="center"/>
<el-table-column prop="boomSpec" min-width="150" label="规格/型号" align="center"/>
<el-table-column prop="supplierName" min-width="100" label="供应商" align="center"/>
<el-table-column prop="procedureName" min-width="100" label="工序" align="center"/>
<el-table-column prop="compositionName" min-width="100" label="材质" align="center"/>
<el-table-column prop="purchaseAmount" min-width="100" label="采购数量" align="center" />
<!-- <el-table-column prop="purchaseRemAmount" min-width="100" label="剩余数量" align="center"/>-->
<el-table-column prop="purchaseRemAmounts" min-width="170" align="center" label="入库数量"/>
<el-table-column prop="estimatedPrice" min-width="170" label="单价" align="center">
<el-table-column prop="purchaseRemAmounts" min-width="100" align="center" label="入库数量"/>
<el-table-column prop="unitPrice" min-width="170" label="单价" align="center">
<template #header>单价</template>
<template #default="scope">
<el-form-item :prop="`${scope.$index}.unitPrice`" class="mb-0px!">
@ -288,7 +290,7 @@ const handleEnterUnitPrice = (e: KeyboardEvent, row: PurchaseOrderNoDetailApi.Pu
}
}
const getSummaries = (param: SummaryMethodProps) => {
const summaryField = ["purchaseRemAmounts"];
const summaryField = ["purchaseRemAmounts","estimatedPrice"];
const { columns, data } = param;
const sums = [];
columns.forEach((column, index) => {

2
mes-ui/mini-app/src/pages/pgMaster/components/dataItem.vue
View File

@ -61,7 +61,7 @@ const saveSearchValue = (value: string) => {
console.error('保存搜索条件失败:', error);
}
};
const delay = ref(2);//等待三秒再次打开扫码窗口 后续改为从接口获取 改为2秒
const delay = ref(1);//等待三秒再次打开扫码窗口 后续改为从接口获取 改为2秒
const getListData = async () => {
queryParams.pgType = props.orderState;

2
mes-ui/mini-app/src/pages/productionReport/productionReport-detail.vue
View File

@ -365,7 +365,7 @@
</view>
<view class="item">
<view class="label"><span class="star">*</span>本次报工工时：</view>
<uni-easyinput class="val" type="digit" v-model="workTime"
<uni-easyinput class="val" type="digit" v-model="workTime" disabled
placeholder="请输入本次报工工时"></uni-easyinput>
<view class="unit" >{{ detailInfo.isOutsourcing=='Y'?"元":"小时" }}</view>
</view>