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-07-02 09:47:57 +08:00
parent 9672f1323b
commit aed6cebbf7
8 changed files with 37 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/purchaseordermakedetail/PurchaseOrderMakeDetailDO.java
View File

@ -154,17 +154,18 @@ public class PurchaseOrderMakeDetailDO extends BaseDO {
/**
* 物料id
*/
@TableField(exist = false)
private Long materialId;
/**
* 工序名称
*/
@TableField(exist = false)
private Long procedureName;
private String procedureName;
/**
* 泡沫
*/
private String isFoam;
@TableField(exist = false)
private String projectName;
}

4
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplanboom/MaterialPlanBoomMapper.java
View File

@ -77,6 +77,7 @@ public interface MaterialPlanBoomMapper extends BaseMapperX<MaterialPlanBoomDO>
// .select("mat.id as matId","mat.name as matName","mat.code as matCode","mat.spec as matSpec","mat.unit as matUnit","mat.material_type as matType")
// .select("b.material_name as matName","m.code as matCode","b.spec as matSpec","b.unit as matUnit","b.blueprint_no as blueprintNo")
.select("b.spec as matSpec","b.unit as matUnit","b.blueprint_no as blueprintNo")
.select("m.code as matCode")
.select("bc.`name` as compositionName","b.`composition_id` as compositionId")
.select("ma.brief as customerBriefName,ma.project_name as projectName,ma.name as projectSubName,ma.project_id as projectId")
@ -86,7 +87,8 @@ public interface MaterialPlanBoomMapper extends BaseMapperX<MaterialPlanBoomDO>
.leftJoin(CompositionDO.class, "bc", CompositionDO::getId, ProcessBomDetailDO::getCompositionId)
.leftJoin(ProjectOrderDO.class,"po",ProjectOrderDO::getId,MaterialPlanDO::getProjectId)
.leftJoin(AdminUserDO.class,"u",AdminUserDO::getId, MaterialPlanBoomDO::getDuEmpId)
// .leftJoin(MaterialDO.class,"m",MaterialDO::getId,MaterialPlanBoomDO::getMaterialId)
.leftJoin(PurchaseOrderMakeDetailDO.class,"p",PurchaseOrderMakeDetailDO::getId, MaterialPlanBoomDO::getProjectPurchaseOrderMakeDetailId)
.leftJoin(MaterialDO.class,"m",MaterialDO::getId,PurchaseOrderMakeDetailDO::getMaterialId)
.eq(MaterialPlanDO::getMatType,0)
.in(MaterialPlanBoomDO::getIsPurYard,Arrays.asList(0,5))
.disableSubLogicDel()

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

@ -148,6 +148,8 @@ public interface PurchaseOrderMakeDetailMapper extends BaseMapperX<PurchaseOrder
MPJLambdaWrapper<PurchaseOrderMakeDetailDO> query = new MPJLambdaWrapper<>();
query.selectAll(PurchaseOrderMakeDetailDO.class)
.select("p.name as procedureName,s.name as supplierName")
.select("m.project_name as projectName")
.leftJoin(PurchaseOrderMakeDO.class,"m",PurchaseOrderMakeDO::getId,PurchaseOrderMakeDetailDO::getPurchaseOrderId)
.leftJoin(ProcedureDO.class,"p", ProcedureDO::getId, PurchaseOrderMakeDetailDO::getProcedureId)
.leftJoin(SupplierDO.class,"s", SupplierDO::getId, PurchaseOrderMakeDetailDO::getSupplierId)
.disableSubLogicDel();

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

@ -94,10 +94,10 @@ public class MaterialPlanBoomServiceImpl implements MaterialPlanBoomService {
public void updateMaterialPlanBoom(MaterialPlanBoomSaveReqVO updateReqVO) {
Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
// 校验存在
validateMaterialPlanBoomExists(updateReqVO.getId());
// 更新
if (CollUtil.isEmpty(updateReqVO.getMaterialPlanBoomDOList())){
MaterialPlanBoomDO updateObj = BeanUtils.toBean(updateReqVO, MaterialPlanBoomDO.class);
validateMaterialPlanBoomExists(updateObj.getId());
materialPlanBoomMapper.updateById(updateObj);
if (updateObj.getSupplierId() == null || updateObj.getArriveTime() == null
) {
@ -122,6 +122,7 @@ public class MaterialPlanBoomServiceImpl implements MaterialPlanBoomService {
}
makeDetailDO.setBoomDetailId(dp.getBoomDetailId());
makeDetailDO.setBoomName(dp.getMatName());
makeDetailDO.setMaterialId(dp.getMaterialId());
makeDetailDO.setBoomSpec(dp.getMatSpec());
makeDetailDO.setBoomUnit(dp.getMatUnit());
makeDetailDO.setComposition(dp.getCompositionName());

7
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/partpurchaseorder/PartPurchaseOrderServiceImpl.java
View File

@ -232,7 +232,12 @@ public class PartPurchaseOrderServiceImpl implements PartPurchaseOrderService{
.set("mplan_status", 3)
.set("project_purchase_order_make_id", null)
.set("purchase_no", null)
.set("project_purchase_order_make_detail_id", null);
.set("project_purchase_order_make_detail_id", null)
.set("purchase_amount", BigDecimal.ZERO)
.set("estimated_price", BigDecimal.ZERO)
.set("arrive_time",null)
.set("supplier_id", null)
.set("mat_rest",null);
materialPlanBoomMapper.update(updateWrapper);
});
return true;

16
mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/standardbuy.vue
View File

@ -110,7 +110,7 @@
size="large"
clearable
filterable
@change="e => changeSupp(e,scope.row)"
style="width: 165 px"
>
<el-option
@ -126,20 +126,20 @@
<el-table-column align="center" prop="purchaseAmount" min-width="180" >
<template #header><span class="hl-table_header">*</span>采购数量</template>
<template #default="scope">
<el-input-number :disabled="scope.row.stat" @blur="updateRow(1,scope.row)" v-model="scope.row.purchaseAmount" :precision="2" :step="0.01" />
<el-input-number :disabled="scope.row.stat" v-model="scope.row.purchaseAmount" :precision="2" :step="0.01" />
</template>
</el-table-column>
<el-table-column align="center" prop="estimatedPrice" min-width="180" >
<template #header><span class="hl-table_header">*</span>预估总价</template>
<template #default="scope">
<el-input-number @blur="updateRow(3,scope.row)" v-model="scope.row.estimatedPrice" :precision="2" :step="0.01" />
<el-input-number v-model="scope.row.estimatedPrice" :precision="2" :step="0.01" />
</template>
</el-table-column>
<el-table-column min-width="200px" align="center" >
<template #header><span class="hl-table_header">*</span>预计到货日期</template>
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.arriveTime`" class="mb-0px!" >
<el-date-picker @change="e => changeDate(e,row)" class="!w-265px" v-model="row.arriveTime" type="date" value-format="x" placeholder="预计到货日期" />
<el-date-picker class="!w-265px" v-model="row.arriveTime" type="date" value-format="x" placeholder="预计到货日期" />
</el-form-item>
</template>
</el-table-column>
@ -338,6 +338,7 @@ const opearteForm = async(type) =>{
buyType:0
}
try{
console.log(111006)
await materialPlanBoomApi.updateMaterialPlanBoom(form);
message.success("送审成功")
await getList()
@ -390,7 +391,6 @@ const updateRow = async(type,row) =>{
if(row.purchaseAmount != null){
await materialPlanBoomApi.updateMaterialPlanBoom(row)
}
}else if(type == 2){
if(row.matRest != null){
await materialPlanBoomApi.updateMaterialPlanBoom(row)
@ -436,15 +436,15 @@ const submitForm = async () => {
}
for (let i = 0; i < filteredList.length; i++) {
if (filteredList[i].projectMaterialPlanNo!=null){
if (filteredList[i].projectMaterialPlanNo!=null&&filteredList[i].projectMaterialPlanNo!=''){
message.error("零件"+filteredList[i].materialName+"已生成物料需求计划,请确认")
return
}
if (filteredList[i].boomArriveDate==null){
if (filteredList[i].boomArriveDate==null&&filteredList[i].boomArriveDate!=''){
message.error("零件"+filteredList[i].materialName+"要求完成日期为空,请确认")
return
}
if (filteredList[i].duEmpId==null){
if (filteredList[i].duEmpId==null&&filteredList[i].duEmpId!=''){
message.error("零件"+filteredList[i].materialName+"责任人为空,请确认")
return
}

2
mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorderno/received.vue
View File

@ -111,7 +111,7 @@ v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" cl
<span style="margin-right: 30%">操作</span>
</template>
<template #default="scope">
<el-button link type="primary" @click="warehousing(scope.row.id)" v-if="scope.row.purchaseAmount>scope.row.boomAmount">
<el-button link type="primary" @click="warehousing(scope.row.id)" v-if="scope.row.purchaseAmount>scope.row.boomAmount&&scope.row.purchaseRemAmount>0">
采购入库
</el-button>
</template>

24
mes-ui/mini-app/src/pages/cgdsp/cgdsp-detail.vue
View File

@ -7,8 +7,8 @@ import {
getReviewDetailAPI,
reject,
approval
} from '@/services/approveOrder'
import {Base64} from '@/uni_modules/base64/base64.js';
@ -57,14 +57,14 @@ const getData = async () => {
}
onLoad(async () => {
await getData()
})
const handleCancle = () => {
uni.navigateBack()
isShowPop.value = false
}
// 批准
const handleAgree = async () => {
await approval(props.id)
@ -140,7 +140,7 @@ const openReport = (url: any) => {
})
}
// 下载
const showFile = ref(false)
@ -155,7 +155,7 @@ const handleDownload = (pdfUrl: any) => {
url: './components/showFileWx?fileUrl=' + encodeURIComponent(Base64.encode(pdfUrl))
});
//#endif
// showFile.value = true;
// if (pdfUrl) {
// switch (uni.getSystemInfoSync().platform) {
@ -197,7 +197,7 @@ const handleDownload = (pdfUrl: any) => {
<view class="product-item">客户简码：{{ detailInfo. brief}}</view>
<view class="product-item">送审人：{{ detailInfo.submitUserName }}</view>
<view class="product-item">送审时间：{{ formatDate( detailInfo.submitTime, 'YYYY-MM-DD')}}</view>
</view>
<!-- <view class="md foot">
<view class="foot-item price" v-if="detailInfo.hasPrice">价格（人民币）：{{ detailInfo.price }}</view>
@ -220,12 +220,12 @@ const handleDownload = (pdfUrl: any) => {
<uni-th width="150">预估总价</uni-th>
<uni-th width="150">技术要求</uni-th>
<uni-th width="150">理论重量(吨)</uni-th>
</uni-tr>
<uni-tr v-for="(item, index) in detailInfo.purchaseOrderMakeDetailDOList" :key="index">
<uni-td>{{ index + 1 }}</uni-td>
<uni-td>{{ item.name }}</uni-td>
<uni-td>{{ item.projectName }}</uni-td>
<uni-td>{{ item.boomName }}</uni-td>
<uni-td>{{ item.procedureName }}</uni-td>
<uni-td>{{ item.purchaseAmount }}</uni-td>
@ -235,7 +235,7 @@ const handleDownload = (pdfUrl: any) => {
<uni-td>{{ item.estimatedPrice }}</uni-td>
<uni-td>{{ item.description }}</uni-td>
<uni-td>{{ item.theWeight }}</uni-td>
</uni-tr>
</uni-table>
</view>
@ -281,7 +281,7 @@ const handleDownload = (pdfUrl: any) => {
<view class="action-item agree" @click="handleAgree">批准</view>
<view class="action-item back" @click="handleReject">打回</view>
</template>
</view>
</template>
<view class="loading-text" v-else>加载中..</view>