From b076998bb0dabd2a669629ceea7870d9cb541666 Mon Sep 17 00:00:00 2001 From: z Date: Mon, 7 Jul 2025 11:07:46 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=91=E6=9C=9F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bdgzsomthing/bdgzsomthingController.java | 10 +-- .../admin/material/MaterialController.java | 9 ++ .../admin/storage/StorageController.java | 8 +- .../dal/mysql/material/MaterialMapper.java | 53 ++++++++++++ .../MaterialPlanBoomMapper.java | 4 +- .../service/material/MaterialService.java | 3 + .../service/material/MaterialServiceImpl.java | 6 ++ .../PurchaseOrderNoDetailServiceImpl.java | 3 +- .../service/storage/StorageServiceImpl.java | 15 ++++ .../storagein/StorageInServiceImpl.java | 3 +- .../UnqualifiedNotificationServiceImpl.java | 7 +- .../mapper/storagemat/StorageMatMapper.xml | 2 +- .../src/api/heli/material/index.ts | 5 ++ .../src/views/heli/purchaseorder/audit.vue | 35 ++++---- .../src/views/heli/purchaseorder/detail.vue | 2 +- .../src/views/heli/purchaseorder/edit.vue | 6 -- .../src/views/heli/purchaseorder/index.vue | 83 ++++++++++--------- .../src/views/heli/storagelog/supplement.vue | 5 +- 18 files changed, 180 insertions(+), 79 deletions(-) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/bdgzsomthing/bdgzsomthingController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/bdgzsomthing/bdgzsomthingController.java index 2cb0628..4a8e296 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/bdgzsomthing/bdgzsomthingController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/bdgzsomthing/bdgzsomthingController.java @@ -151,7 +151,7 @@ public class bdgzsomthingController { BeanUtils.toBean(list, bdgzsomthingRespVO.class)); } -// @Scheduled(fixedRate = 10800000) + @Scheduled(fixedRate = 10800000) public void scheduledTask() { bdgzsomthingService.selectds(); } @@ -159,15 +159,15 @@ public class bdgzsomthingController { //@Scheduled(cron = "0 2 0 * * ?") //每天十天执行一次 @PostConstruct public void init() { -// selectHasPrice(); -// selectSafeStorageAndDeliverOneYear(); + selectHasPrice(); + selectSafeStorageAndDeliverOneYear(); } -// @Scheduled(cron = "0 0 2 * * ?") + @Scheduled(cron = "0 0 2 * * ?") public void selectHasPrice(){ bdgzsomthingService.selectHasPrice(); } -// @Scheduled(cron = "0 0 0 * * ?") + @Scheduled(cron = "0 0 0 * * ?") public void selectSafeStorageAndDeliverOneYear(){bdgzsomthingService.selectSafeStorageAndDeliverOneYear();} @PostMapping("/getMessage") @Operation(summary = "小程序消息") diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/material/MaterialController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/material/MaterialController.java index ca07d1f..75c76a8 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/material/MaterialController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/material/MaterialController.java @@ -10,6 +10,7 @@ import com.chanko.yunxi.mes.module.heli.controller.admin.material.vo.MaterialExc import com.chanko.yunxi.mes.module.heli.controller.admin.material.vo.MaterialPageReqVO; import com.chanko.yunxi.mes.module.heli.controller.admin.material.vo.MaterialRespVO; import com.chanko.yunxi.mes.module.heli.controller.admin.material.vo.MaterialSaveReqVO; +import com.chanko.yunxi.mes.module.heli.controller.admin.storageinventory.vo.StorageInventoryPageReqVO; import com.chanko.yunxi.mes.module.heli.controller.admin.storagelog.vo.StorageLogPageReqVO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.material.MaterialDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.storageinventory.StorageInventoryDO; @@ -148,4 +149,12 @@ public class MaterialController { PageResult pageResult = materialService.getStorageNowPageAll(pageReqVO); return success(pageResult); } + + @GetMapping("/getSupplementPage") + @Operation(summary = "获得库存补充分页") + @PreAuthorize("@ss.hasPermission('heli:storage-inventory:query')") + public CommonResult> getSupplementPage(@Valid StorageInventoryPageReqVO pageReqVO) { + PageResult pageResult = materialService.getSupplementPage(pageReqVO); + return success(pageResult); + } } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/StorageController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/StorageController.java index 764d978..209a3ca 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/StorageController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/StorageController.java @@ -171,8 +171,14 @@ public class StorageController { storageInventoryDO.setShortName(materialDO.getShortName()); storageInventoryDO.setBoomCode(materialDO.getCode()); } + storageInventoryDO.setPrice(storageMatDO.getPrice()); }else { - storageInventoryDO.setYardAmount(storageInventoryDO.getYardAmount().add(storageMatDO.getStorageOkQty())); + BigDecimal totalNumber = storageInventoryDO.getYardAmount().add(storageMatDO.getStorageOkQty()); + BigDecimal inventoryPrice = storageInventoryDO.getYardAmount().multiply(storageInventoryDO.getPrice()); + BigDecimal inPrice = storageMatDO.getStorageOkQty().multiply(storageMatDO.getPrice()); + BigDecimal sumPrice = inventoryPrice.add(inPrice); + storageInventoryDO.setPrice(sumPrice.divide(totalNumber,2, RoundingMode.HALF_UP)); + storageInventoryDO.setYardAmount(totalNumber); } storageInventoryMapper.insertOrUpdate(storageInventoryDO); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/material/MaterialMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/material/MaterialMapper.java index 8f4a36a..feb8a22 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/material/MaterialMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/material/MaterialMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.chanko.yunxi.mes.framework.common.pojo.PageResult; import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX; import com.chanko.yunxi.mes.module.heli.controller.admin.material.vo.MaterialPageReqVO; +import com.chanko.yunxi.mes.module.heli.controller.admin.storageinventory.vo.StorageInventoryPageReqVO; import com.chanko.yunxi.mes.module.heli.controller.admin.storagelog.vo.StorageLogPageReqVO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.composition.CompositionDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.material.MaterialDO; @@ -14,6 +15,7 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelogNow.StorageLogN import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelogNow.StorageMaterialDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.supplier.SupplierDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.warehouse.WarehouseDO; +import com.chanko.yunxi.mes.module.heli.enums.MaterialTypeEnum; import com.chanko.yunxi.mes.module.heli.enums.YesOrNoEnum; import com.chanko.yunxi.mes.module.system.dal.dataobject.dict.DictDataDO; import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO; @@ -23,6 +25,7 @@ import org.springframework.util.StringUtils; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * 物料 Mapper @@ -163,4 +166,54 @@ public interface MaterialMapper extends BaseMapperX { } + default PageResult getSupplementPage(StorageInventoryPageReqVO pageReqVO){ + MPJLambdaWrapper subQuery = new MPJLambdaWrapper<>(); + subQuery.select(MaterialDO::getId) + .leftJoin(StorageInventoryDO.class, "s", StorageInventoryDO::getMaterialId, MaterialDO::getId) + .disableSubLogicDel() + .groupBy(MaterialDO::getId) + .having("COALESCE(SUM(s.yard_amount), 0) < COALESCE(MAX(t.inv_safe), 0)"); + //执行子查询获取符合条件的matCode + List qualifiedMatCodes = this.selectList(subQuery) + .stream() + .map(MaterialDO::getId) + .distinct() + .collect(Collectors.toList()); + MPJLambdaWrapper query = new MPJLambdaWrapper<>(); + query.selectAll(MaterialDO.class) + .select("ifnull(sum(s.yard_amount),0) matRest") + .select("t.name as matName,t.code as matCode,d.label as matType,t.spec as matSpec,t.brand as matBrand") + .select("d1.label as matUnit") + .select("w.wh_name as whName","r.rg_name as rgName","p.pn_name as pnName") + .select("t.material_type as materialTypeId","t.unit as matUnitId") + .leftJoin(StorageInventoryDO.class, "s", StorageInventoryDO::getMaterialId, MaterialDO::getId) + .leftJoin(DictDataDO.class,"d",DictDataDO::getValue, MaterialDO::getMaterialType) + .leftJoin(DictDataDO.class,"d1",DictDataDO::getValue, MaterialDO::getUnit) + .leftJoin(WarehouseDO.class,"w",WarehouseDO::getId, StorageInventoryDO::getWhId) + .leftJoin(RgDO.class,"r",RgDO::getId, StorageInventoryDO::getRgId) + .leftJoin(PnDO.class,"p",PnDO::getId, StorageInventoryDO::getPnId) + .disableSubLogicDel() + .groupBy(StorageInventoryDO::getId) + .groupBy(MaterialDO::getId) + .orderByDesc(StorageInventoryDO::getId); + + query.like(!com.alibaba.druid.util.StringUtils.isEmpty(pageReqVO.getMatSpec()),MaterialDO::getSpec, pageReqVO.getMatSpec()) + .like(!com.alibaba.druid.util.StringUtils.isEmpty(pageReqVO.getMatName()), MaterialDO::getName, pageReqVO.getMatName()) + .like(!com.alibaba.druid.util.StringUtils.isEmpty(pageReqVO.getMatCode()), MaterialDO::getCode, pageReqVO.getMatCode()) + .eq(true,MaterialDO::getVirtualPart, YesOrNoEnum.N.name()) + .eq(MaterialDO::getStatus,1) + .eq(MaterialDO::getTenantId, 2) + .eq(pageReqVO.getWhId()!= null,StorageInventoryDO::getWhId, pageReqVO.getWhId()) + .eq(pageReqVO.getRgId()!= null,StorageInventoryDO::getRgId, pageReqVO.getRgId()) + .eq(pageReqVO.getPnId()!= null,StorageInventoryDO::getPnId, pageReqVO.getPnId()) + .eq("d.dict_type","heli_material_type") + .eq("d1.dict_type","heli_material_unit"); + if (!qualifiedMatCodes.isEmpty()) { + query.in(MaterialDO::getId, qualifiedMatCodes); + } else { + // 如果没有符合条件的matCode，返回空结果 + query.apply("1 = 0"); + } + return selectPage(pageReqVO, query); + } } 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 b6b3618..014827a 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 @@ -170,9 +170,9 @@ public interface MaterialPlanBoomMapper extends BaseMapperX query.selectAll(MaterialPlanBoomDO.class) .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("sum(ifnull(sm.storage_ok_qty,0)) as matRest") + .select("sum(ifnull(sm.yard_amount,0)) as matRest") .leftJoin(MaterialDO.class, "mat", MaterialDO::getId, MaterialPlanDetailDO::getMaterialId) - .leftJoin(StorageMaterialDO.class,"sm",StorageMaterialDO::getId, MaterialPlanDetailDO::getMaterialId) + .leftJoin(StorageInventoryDO.class,"sm",StorageInventoryDO::getMaterialId, MaterialPlanDetailDO::getMaterialId) .disableSubLogicDel() .groupBy(MaterialPlanBoomDO::getId) .orderByDesc(MaterialPlanBoomDO::getCreateTime); diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/material/MaterialService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/material/MaterialService.java index 74f6715..f1360e3 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/material/MaterialService.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/material/MaterialService.java @@ -3,6 +3,7 @@ package com.chanko.yunxi.mes.module.heli.service.material; import java.util.*; import javax.validation.*; import com.chanko.yunxi.mes.module.heli.controller.admin.material.vo.*; +import com.chanko.yunxi.mes.module.heli.controller.admin.storageinventory.vo.StorageInventoryPageReqVO; import com.chanko.yunxi.mes.module.heli.controller.admin.storagelog.vo.StorageLogPageReqVO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.material.MaterialDO; import com.chanko.yunxi.mes.framework.common.pojo.PageResult; @@ -67,4 +68,6 @@ public interface MaterialService { PageResult getStorageNowPageGroupMaterial(StorageLogPageReqVO pageReqVO); PageResult getStorageNowPageAll(StorageLogPageReqVO pageReqVO); + + PageResult getSupplementPage(StorageInventoryPageReqVO pageReqVO); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/material/MaterialServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/material/MaterialServiceImpl.java index f393b42..000709c 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/material/MaterialServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/material/MaterialServiceImpl.java @@ -12,6 +12,7 @@ import com.chanko.yunxi.mes.framework.tenant.core.util.TenantUtils; import com.chanko.yunxi.mes.module.heli.controller.admin.material.vo.MaterialExcelVO; import com.chanko.yunxi.mes.module.heli.controller.admin.material.vo.MaterialPageReqVO; import com.chanko.yunxi.mes.module.heli.controller.admin.material.vo.MaterialSaveReqVO; +import com.chanko.yunxi.mes.module.heli.controller.admin.storageinventory.vo.StorageInventoryPageReqVO; import com.chanko.yunxi.mes.module.heli.controller.admin.storagelog.vo.StorageLogPageReqVO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.material.MaterialDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.serialnumber.SerialNumberDO; @@ -284,6 +285,11 @@ public class MaterialServiceImpl implements MaterialService { return pageResult; } + @Override + public PageResult getSupplementPage(StorageInventoryPageReqVO pageReqVO) { + return materialMapper.getSupplementPage(pageReqVO); + } + private void checkData(List materialExcelVOList) { // 基础校验 Set>> validate = validator.validate(materialExcelVOList, MaterialExcelVO.class); diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseordernodetail/PurchaseOrderNoDetailServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseordernodetail/PurchaseOrderNoDetailServiceImpl.java index d20c796..cf17aa5 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseordernodetail/PurchaseOrderNoDetailServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseordernodetail/PurchaseOrderNoDetailServiceImpl.java @@ -248,7 +248,8 @@ public class PurchaseOrderNoDetailServiceImpl implements PurchaseOrderNoDetailSe storageMatMapper.insertBatch(outList); storageService.updateMatLogList(storageDO.getId(),2); storageService.updateMatLogList(out.getId(),2); - + storageMapper.deleteById(storageDO); + storageMapper.deleteById(out); // materialMapper.insertBatch(materialDOList); return success(true); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storage/StorageServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storage/StorageServiceImpl.java index ae0f428..145c83a 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storage/StorageServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storage/StorageServiceImpl.java @@ -43,6 +43,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; +import java.math.RoundingMode; import java.text.SimpleDateFormat; import java.time.LocalDateTime; import java.util.*; @@ -426,6 +427,7 @@ private StorageLogService storageLogService; storageDO.setStockNo(STOCK_IN.getCode(serialNumberDO1.getSerialNumber().toString())); serialNumberService.updateSerialNumber(serialNumberDO1); storageDO.setStatus(2); + storageDO.setStockInType(1); storageDO.setKeeper(getLoginUser().getId()); storageDO.setKeeperTime(LocalDateTime.now()); storageMapper.insert(storageDO); @@ -445,6 +447,8 @@ private StorageLogService storageLogService; //入库日志 updateMatLogList(storageDO.getId(),2); + storageMapper.deleteById(storageDO); + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper.eq(PurchaseOrderNoDetailDO::getId,createReqVO.getId()); updateWrapper.set(PurchaseOrderNoDetailDO::getReceivingStatus,3); @@ -459,6 +463,11 @@ private StorageLogService storageLogService; wrapper.eq(StorageInventoryDO::getPnId,createReqVO.getPnId()); wrapper.eq(StorageInventoryDO::getDeleted,0); StorageInventoryDO storageInventoryDO = storageInventoryMapper.selectOne(wrapper); + PurchaseOrderNoDetailDO purchaseOrderNoDetailDO = purchaseOrderNoDetailMapper.selectById(createReqVO.getId()); + BigDecimal purchasePrice=BigDecimal.ZERO; + if (ObjectUtil.isNotEmpty(purchaseOrderNoDetailDO)){ + purchasePrice= purchaseOrderNoDetailDO.getEstimatedPrice().divide(purchaseOrderNoDetailDO.getPurchaseAmount(), 2, RoundingMode.HALF_UP); + } if (ObjectUtil.isEmpty(storageInventoryDO)){ storageInventoryDO = new StorageInventoryDO(); storageInventoryDO.setMaterialId(createReqVO.getMaterialId()); @@ -474,7 +483,13 @@ private StorageLogService storageLogService; storageInventoryDO.setShortName(materialDO.getShortName()); storageInventoryDO.setBoomCode(materialDO.getCode()); } + storageInventoryDO.setPrice(purchasePrice); }else { + BigDecimal totalNumber = storageInventoryDO.getYardAmount().add(createReqVO.getStorageAmount()); + BigDecimal inventoryPrice = storageInventoryDO.getYardAmount().multiply(storageInventoryDO.getPrice()); + BigDecimal inPrice = createReqVO.getStorageAmount().multiply(purchasePrice); + BigDecimal sumPrice = inventoryPrice.add(inPrice); + storageInventoryDO.setPrice(sumPrice.divide(totalNumber,2, RoundingMode.HALF_UP)); storageInventoryDO.setYardAmount(storageInventoryDO.getYardAmount().add(createReqVO.getStorageAmount())); } storageInventoryMapper.insertOrUpdate(storageInventoryDO); diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagein/StorageInServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagein/StorageInServiceImpl.java index 32b4e22..bb50d1a 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagein/StorageInServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagein/StorageInServiceImpl.java @@ -323,7 +323,8 @@ public class StorageInServiceImpl implements StorageInService { storageMatMapper.insertBatch(outList); storageService.updateMatLogList(storageDO.getId(),2); storageService.updateMatLogList(out.getId(),2); - + storageMapper.deleteById(storageDO); + storageMapper.deleteById(out); return CommonResult.success(true); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/unqualifiednotification/UnqualifiedNotificationServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/unqualifiednotification/UnqualifiedNotificationServiceImpl.java index cbd8e2a..d4270e0 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/unqualifiednotification/UnqualifiedNotificationServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/unqualifiednotification/UnqualifiedNotificationServiceImpl.java @@ -71,8 +71,13 @@ public class UnqualifiedNotificationServiceImpl implements UnqualifiedNotificati serialNumberDO.setSerialNumber(serialNumberDO.getSerialNumber()+1); unqualifiedNotification.setCode(CodeEnum.UNQUALIFIED_NOTIFICATION.getCode(serialNumberDO.getSerialNumber().toString())); unqualifiedNotification.setNotificationStatus(UnqualifiedNotificationStatusEnum.valueOf(createReqVO.getActive()).getCode()); +try { + unqualifiedNotificationMapper.insert(unqualifiedNotification); +} catch (Exception e){ + e.printStackTrace(); +} + - unqualifiedNotificationMapper.insert(unqualifiedNotification); //质检通知单预警 { diff --git a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storagemat/StorageMatMapper.xml b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storagemat/StorageMatMapper.xml index 36859b8..41a138c 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storagemat/StorageMatMapper.xml +++ b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storagemat/StorageMatMapper.xml @@ -27,7 +27,7 @@ - select mat_id,mat_name,mat_code,mat_rest,material_type,wh_id,rg_id,pn_id,spec as mat_spec,unit as mat_unit,'' as lot_no,storage_ok_qty from v_storage_material_amount where > 0 + select mat_id,mat_name,mat_code,mat_rest,material_type,wh_id,rg_id,pn_id,spec as mat_spec,unit as mat_unit,'' as lot_no,storage_ok_qty from v_storage_material_amount where mat_rest > 0 AND wh_id = #{wh_id} diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/material/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/material/index.ts index 8248153..63863f4 100644 --- a/mes-ui/mes-ui-admin-vue3/src/api/heli/material/index.ts +++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/material/index.ts @@ -79,3 +79,8 @@ export const getStorageNowAllPage = async (params) => { export const getStorageNowMaterialGroupPage = async (params) => { return await request.get({ url: `/heli/material/page-material-group`, params }) } + +// 查询库存补充 +export const getSupplementPage = async (params) => { + return await request.get({ url: `/heli/material/getSupplementPage`, params }) +} diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/audit.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/audit.vue index fa9be6f..c211e8e 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/audit.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/audit.vue @@ -13,7 +13,7 @@ v-model="queryParams.purchaseNo" placeholder="采购单号" clearable @keyup.ent @@ -21,27 +21,27 @@ v-model="queryParams.purchaseNo" placeholder="采购单号" clearable @keyup.ent v-model="queryParams.supplierName" placeholder="供应商" clearable @keyup.enter="handleQuery" class="!w-240px" /> - - - - - + + + + + + + - - - - - + + + + + + + - + @@ -151,7 +151,7 @@ const queryParams = reactive({ purchaseNo: undefined, supplierId: undefined, contractNo: undefined, - purchaseType: undefined, + purchaseType: 2, projectMaterialPlanId: undefined, goodsType: undefined, currencyType: undefined, @@ -201,6 +201,7 @@ const handleQuery = () => { /** 重置按钮操作 */ const resetQuery = () => { queryFormRef.value.resetFields() + setDefaultDate() handleQuery() } diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/detail.vue index b8eb309..70f1dce 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/detail.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/detail.vue @@ -318,7 +318,7 @@ diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/edit.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/edit.vue index d2d52a8..710e484 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/edit.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/edit.vue @@ -671,17 +671,11 @@ import { dateFormatter, formatDate } from '@/utils/formatTime' import { useUserStore } from '@/store/modules/user' import { useTagsViewStore } from '@/store/modules/tagsView' import MaterialSelect from '@/views/heli/hlvuestyle/materialSelect.vue' -import CompositionSelect from '@/views/heli/hlvuestyle/compositionSelect.vue' import materials from '@/views/heli/storage/materials.vue' import MaterialDialog from '@/views/heli/purchaseorder/materialDialog.vue' import BoomDialog from '@/views/heli/purchaseorder/boomDialog.vue' import SupplierSelect from '@/views/heli/hlvuestyle/supplierSelect.vue' -import {setFlagsFromString} from "node:v8"; -import { - createPurchaseOrderNoDetail, deletePurchaseOrderNoDetail, - PurchaseOrderNoDetailVO, updatePurchaseOrderNoDetail -} from "@/api/heli/purchaseordernodetail"; const reload: any = inject('reload') const { t } = useI18n() // 国际化 diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/index.vue index 3735b4d..a78efd4 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/index.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/index.vue @@ -13,7 +13,7 @@ v-model="queryParams.purchaseNo" placeholder="采购单号" clearable @keyup.ent @@ -21,27 +21,27 @@ class="!w-240px" v-model="queryParams.createTime" type="date" value-format="x" v-model="queryParams.supplierName" placeholder="供应商" clearable @keyup.enter="handleQuery" class="!w-240px" /> - - - - - + + + + + + + - - - - - + + + + + + + - + @@ -86,7 +86,7 @@ label="单据日期" align="center" prop="createTime" :formatter="dateFormatter" fixed> @@ -170,7 +170,7 @@ link type="primary" @click="editReceivingStatus(scope.row.id)" 联系人：{{ printData.contactName }} 电话：{{ printData.contactMobile }} - + @@ -184,7 +184,7 @@ link type="primary" @click="editReceivingStatus(scope.row.id)" - + @@ -198,7 +198,7 @@ link type="primary" @click="editReceivingStatus(scope.row.id)" - + @@ -216,8 +216,8 @@ link type="primary" @click="editReceivingStatus(scope.row.id)" --> - - + + @@ -245,7 +245,7 @@ link type="primary" @click="editReceivingStatus(scope.row.id)" - +
采购数量 单价(元) 总价格(元)
{{ printData.purchaseOrderNoDetailList[index]?.purchaseAmountSum || '' }} {{ printData.purchaseOrderNoDetailList[index]?.estimatedPriceSum || '' }}