From 46f53855f9d9092cf46476ee1fb3a9a3fdedeaf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Thu, 5 Feb 2026 15:21:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=A4=9A=E4=BD=99=E6=96=B9?= =?UTF-8?q?=E6=B3=95;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StockShelfOrderApplicationService.java | 91 ------------------- 1 file changed, 91 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java index 016245d63..a9cfafa41 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java @@ -250,97 +250,6 @@ public class StockShelfOrderApplicationService { return stockShelfOrderDomainService.upShelf(assembleStockShelfOrderDO); } - /** - * @description 上架装配参数 - * @author - * @date 2024/5/22 9:27 - * @param shelfMaterialDetailDOList - * @return Boolean - */ - private synchronized void stockIn(List shelfMaterialDetailDOList, StockShelfOrderDO stockReceiptOrderDO) { - for (ShelfMaterialDetailDO shelfMaterialDetailDO : shelfMaterialDetailDOList) { - Long materialBaseInfoId = shelfMaterialDetailDO.getMaterialBaseInfoId(); - MaterialGoodsRulePO materialGoodsRulePO = materialGoodsRuleService.getInfoByMaterialBaseInfoIds(materialBaseInfoId); - Long batchId = materialGoodsRulePO.getBatchId(); - List fieldNames = new ArrayList<>(); - AjaxResult batchInfo = systemServiceFeign.getBatchInfoByBatchId(batchId); - if("200".equals(String.valueOf(batchInfo.get("code")))){ - BatchPO batch = com.alibaba.fastjson2.JSONObject.parseObject(JSONObject.toJSONString(batchInfo.get("data")), BatchPO.class); - List batchDetailList = batch.getBatchDetailList(); - fieldNames = batchDetailList.stream() - .filter(detail -> "1".equals(String.valueOf(detail.getIsDisplay()))) - .map(BatchDetailPO::getFieldName) - .collect(Collectors.toList()); - } - if (fieldNames.size() == 0) { - throw new ServiceException("批次信息不存在"); - } - Long shipperId = stockReceiptOrderDO.getShipperId(); - MaterialInventory param = getParam(shelfMaterialDetailDO, fieldNames, shipperId); - List materialInventoryPOS = materialInventoryMapper.selectListByWhere(param); - MaterialBaseInfo materialBaseInfo = materialBaseInfoMapper.selectById(materialBaseInfoId); - if (materialInventoryPOS.size() == 0) { - MaterialInventory materialInventory = new MaterialInventory(); - //仓库信息 - materialInventory.setWarehouseId(stockReceiptOrderDO.getWarehouseId()); - materialInventory.setWarehouseCode(stockReceiptOrderDO.getWarehouseCode()); - materialInventory.setWarehouseName(stockReceiptOrderDO.getWarehouseName()); - - //组织信息 - materialInventory.setOrganizationId(stockReceiptOrderDO.getOrganizationId()); - materialInventory.setTopOrganizationId(stockReceiptOrderDO.getTopOrganizationId()); - materialInventory.setOrganizationName(stockReceiptOrderDO.getOrganizationName()); - - //货主信息 - materialInventory.setShipperId(stockReceiptOrderDO.getShipperId()); - materialInventory.setShipperName(stockReceiptOrderDO.getShipperName()); - materialInventory.setShipperCode(stockReceiptOrderDO.getShipperCode()); - - //物料信息/库位库区 - materialInventory.setMaterialBaseInfoId(shelfMaterialDetailDO.getMaterialBaseInfoId()); - materialInventory.setStorageSectionId(shelfMaterialDetailDO.getStorageSectionId()); - materialInventory.setStorageCode(shelfMaterialDetailDO.getStorageCode()); - materialInventory.setStorageName(shelfMaterialDetailDO.getStorageName()); - materialInventory.setStorageLocationId(shelfMaterialDetailDO.getStorageLocationId()); - materialInventory.setStorageLocationCode(shelfMaterialDetailDO.getStorageLocationCode()); - materialInventory.setStorageLocationName(shelfMaterialDetailDO.getStorageLocationName()); - - //批次属性信息 - materialInventory.setExtAttr1(shelfMaterialDetailDO.getExtAttr1()); - materialInventory.setExtAttr2(shelfMaterialDetailDO.getExtAttr2()); - materialInventory.setExtAttr3(shelfMaterialDetailDO.getExtAttr3()); - materialInventory.setExtAttr4(shelfMaterialDetailDO.getExtAttr4()); - materialInventory.setInventoryDate(shelfMaterialDetailDO.getInventoryDate()); - materialInventory.setExpiryDate(shelfMaterialDetailDO.getExpiryDate()); - materialInventory.setProductionDate(shelfMaterialDetailDO.getProductionDate()); - materialInventory.setBoxPalletNo(shelfMaterialDetailDO.getBoxPalletNo()); - materialInventory.setSheetRefNo(shelfMaterialDetailDO.getSheetRefNo()); - materialInventory.setBatchRefNo(shelfMaterialDetailDO.getBatchRefNo()); - materialInventory.setBatchNumber(shelfMaterialDetailDO.getBatchNumber()); - - //库存数量信息 - materialInventory.setInventoryQuantity(shelfMaterialDetailDO.getShelvesQuantity()); - materialInventory.setAllocationQuantity(shelfMaterialDetailDO.getShelvesQuantity()); - materialInventory.setFreezeQuantity(BigDecimal.ZERO); - - //体积 重量等 - materialInventory.setVolume(shelfMaterialDetailDO.getTotalVolume()); - materialInventory.setArea(shelfMaterialDetailDO.getTotalArea()); - materialInventory.setGrossWeight(shelfMaterialDetailDO.getTotalGrossWeight()); - materialInventory.setNetWeight(shelfMaterialDetailDO.getTotalNetWeight()); - materialInventory.setUnit(materialBaseInfo.getUnitCode()); - - materialInventoryMapper.insert(materialInventory); - } else if (materialInventoryPOS.size() == 1) { - MaterialInventory materialInventory = new MaterialInventory(); - MaterialInventoryPO materialInventoryPO = materialInventoryPOS.get(0); - materialInventoryPO.setInventoryQuantity(materialInventoryPO.getInventoryQuantity().add(shelfMaterialDetailDO.getShelvesQuantity())); - materialInventoryPO.setAllocationQuantity(materialInventoryPO.getAllocationQuantity().add(shelfMaterialDetailDO.getShelvesQuantity())); - BeanUtils.copyBeanProp(materialInventoryPO, materialInventory); - materialInventoryMapper.updateById(materialInventory); - } - } - } private MaterialInventory getParam(ShelfMaterialDetailDO shelfMaterialDetailDO, List fieldNames,Long shipperId){ MaterialInventory param = new MaterialInventory();