From aed6cebbf79689cbf83befdb7280f1e385ee611a Mon Sep 17 00:00:00 2001 From: z Date: Wed, 2 Jul 2025 09:47:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E4=BB=B6=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchaseOrderMakeDetailDO.java | 5 ++-- .../MaterialPlanBoomMapper.java | 4 +++- .../PurchaseOrderMakeDetailMapper.java | 2 ++ .../MaterialPlanBoomServiceImpl.java | 3 ++- .../PartPurchaseOrderServiceImpl.java | 7 +++++- .../views/heli/materialplan/standardbuy.vue | 16 ++++++------- .../views/heli/purchaseorderno/received.vue | 2 +- .../mini-app/src/pages/cgdsp/cgdsp-detail.vue | 24 +++++++++---------- 8 files changed, 37 insertions(+), 26 deletions(-) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/purchaseordermakedetail/PurchaseOrderMakeDetailDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/purchaseordermakedetail/PurchaseOrderMakeDetailDO.java index 8cac7be..89b924c 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/purchaseordermakedetail/PurchaseOrderMakeDetailDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/purchaseordermakedetail/PurchaseOrderMakeDetailDO.java @@ -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; } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplanboom/MaterialPlanBoomMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplanboom/MaterialPlanBoomMapper.java index 76336aa..9a17a64 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplanboom/MaterialPlanBoomMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplanboom/MaterialPlanBoomMapper.java @@ -77,6 +77,7 @@ public interface MaterialPlanBoomMapper extends BaseMapperX // .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 .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() diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordermakedetail/PurchaseOrderMakeDetailMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordermakedetail/PurchaseOrderMakeDetailMapper.java index ae1be5c..ff17399 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordermakedetail/PurchaseOrderMakeDetailMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordermakedetail/PurchaseOrderMakeDetailMapper.java @@ -148,6 +148,8 @@ public interface PurchaseOrderMakeDetailMapper extends BaseMapperX 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(); diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplanboom/MaterialPlanBoomServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplanboom/MaterialPlanBoomServiceImpl.java index d5dd3e4..0747811 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplanboom/MaterialPlanBoomServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplanboom/MaterialPlanBoomServiceImpl.java @@ -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()); diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/partpurchaseorder/PartPurchaseOrderServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/partpurchaseorder/PartPurchaseOrderServiceImpl.java index d689eb7..593e383 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/partpurchaseorder/PartPurchaseOrderServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/partpurchaseorder/PartPurchaseOrderServiceImpl.java @@ -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; diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/standardbuy.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/standardbuy.vue index 6e0cfe4..820a87e 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/standardbuy.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/standardbuy.vue @@ -110,7 +110,7 @@ size="large" clearable filterable - @change="e => changeSupp(e,scope.row)" + style="width: 165 px" > @@ -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 } diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorderno/received.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorderno/received.vue index 051ca27..b92e04f 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorderno/received.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorderno/received.vue @@ -111,7 +111,7 @@ v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" cl 操作 diff --git a/mes-ui/mini-app/src/pages/cgdsp/cgdsp-detail.vue b/mes-ui/mini-app/src/pages/cgdsp/cgdsp-detail.vue index 5f8a37f..170ca83 100644 --- a/mes-ui/mini-app/src/pages/cgdsp/cgdsp-detail.vue +++ b/mes-ui/mini-app/src/pages/cgdsp/cgdsp-detail.vue @@ -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) => { 客户简码：{{ detailInfo. brief}} 送审人：{{ detailInfo.submitUserName }} 送审时间：{{ formatDate( detailInfo.submitTime, 'YYYY-MM-DD')}} - +