上架过滤已逻辑删除数据;
This commit is contained in:
+2
-2
@@ -994,7 +994,7 @@ public class MaterialInventoryImpl extends ServiceImpl<MaterialInventoryMapper,
|
|||||||
MaterialInventory materialInventory = new MaterialInventory();
|
MaterialInventory materialInventory = new MaterialInventory();
|
||||||
materialInventoryPO.setUpdateTime(new Date());
|
materialInventoryPO.setUpdateTime(new Date());
|
||||||
com.mhd.common.core.utils.bean.BeanUtils.copyProperties(materialInventoryPO, materialInventory);
|
com.mhd.common.core.utils.bean.BeanUtils.copyProperties(materialInventoryPO, materialInventory);
|
||||||
materialInventoryMapper.updateById(materialInventory);
|
materialInventoryMapper.updateById(materialInventoryPO);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
private void qxff(BigDecimal netWeight, BigDecimal grossWeight, BigDecimal volume, BigDecimal area, BigDecimal quantity, Long materialInventoryId) {
|
private void qxff(BigDecimal netWeight, BigDecimal grossWeight, BigDecimal volume, BigDecimal area, BigDecimal quantity, Long materialInventoryId) {
|
||||||
@@ -1092,7 +1092,7 @@ public class MaterialInventoryImpl extends ServiceImpl<MaterialInventoryMapper,
|
|||||||
materialInventoryPO.setUpdateTime(new Date());
|
materialInventoryPO.setUpdateTime(new Date());
|
||||||
MaterialInventory materialInventory = new MaterialInventory();
|
MaterialInventory materialInventory = new MaterialInventory();
|
||||||
com.mhd.common.core.utils.bean.BeanUtils.copyProperties(materialInventoryPO, materialInventory);
|
com.mhd.common.core.utils.bean.BeanUtils.copyProperties(materialInventoryPO, materialInventory);
|
||||||
materialInventoryMapper.updateById(materialInventory);
|
materialInventoryMapper.updateById(materialInventoryPO);
|
||||||
|
|
||||||
Long warehouseId = materialInventoryPO.getWarehouseId();
|
Long warehouseId = materialInventoryPO.getWarehouseId();
|
||||||
boolean needPush = false;
|
boolean needPush = false;
|
||||||
|
|||||||
+3
-1
@@ -860,7 +860,9 @@ public class StockShelfOrderDomainService {
|
|||||||
//修改入库单状态: 1-已创建 2-已审核 3-收货中 4-上架中 5-已入库
|
//修改入库单状态: 1-已创建 2-已审核 3-收货中 4-上架中 5-已入库
|
||||||
updateStockInOrder(stockShelfOrderPO, 5);
|
updateStockInOrder(stockShelfOrderPO, 5);
|
||||||
//上架修改物料库存
|
//上架修改物料库存
|
||||||
List<ShelfMaterialDetail> shelfMaterialDetailList = shelfMaterialDetailService.list(new QueryWrapper<ShelfMaterialDetail>().lambda().eq(ShelfMaterialDetail::getShelfOrderNumber, stockShelfOrderPO.getShelfOrderNumber()));
|
List<ShelfMaterialDetail> shelfMaterialDetailList = shelfMaterialDetailService.list(new QueryWrapper<ShelfMaterialDetail>().lambda()
|
||||||
|
.eq(ShelfMaterialDetail::getShelfOrderNumber, stockShelfOrderPO.getShelfOrderNumber())
|
||||||
|
.eq(ShelfMaterialDetail::getDelFlag, 1));
|
||||||
//修改库存
|
//修改库存
|
||||||
StockShelfOrderDO stockShelfOrderDO = new StockShelfOrderDO();
|
StockShelfOrderDO stockShelfOrderDO = new StockShelfOrderDO();
|
||||||
BeanUtils.copyProperties(stockShelfOrderPO, stockShelfOrderDO);
|
BeanUtils.copyProperties(stockShelfOrderPO, stockShelfOrderDO);
|
||||||
|
|||||||
Reference in New Issue
Block a user