weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

去除多余方法;

Browse Source
This commit is contained in:
王奎兴
2026-02-05 15:21:22 +08:00
parent 5e16ca2436
commit 46f53855f9
1 changed files with 0 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java
-91
View File
@@ -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<ShelfMaterialDetailDO> shelfMaterialDetailDOList, StockShelfOrderDO stockReceiptOrderDO) {
for (ShelfMaterialDetailDO shelfMaterialDetailDO : shelfMaterialDetailDOList) {
Long materialBaseInfoId = shelfMaterialDetailDO.getMaterialBaseInfoId();
MaterialGoodsRulePO materialGoodsRulePO = materialGoodsRuleService.getInfoByMaterialBaseInfoIds(materialBaseInfoId);
Long batchId = materialGoodsRulePO.getBatchId();
List<String> 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<BatchDetailPO> 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<MaterialInventoryPO> 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<String> fieldNames,Long shipperId){
MaterialInventory param = new MaterialInventory();