库存调整记录添加重量体积等调整信息;
This commit is contained in:
+40
@@ -171,4 +171,44 @@ public class InventoryAdjustmentRecordDO extends BaseVOEntity {
|
||||
@ApiModelProperty("关联单号")
|
||||
@Excel(name = "关联单号")
|
||||
private String relateNo;
|
||||
|
||||
@ApiModelProperty("调整前净重(KG)")
|
||||
@Excel(name = "调整前净重(KG)")
|
||||
private BigDecimal netWeight;
|
||||
|
||||
@ApiModelProperty("调整前毛重(KG)")
|
||||
@Excel(name = "调整前毛重(KG)")
|
||||
private BigDecimal grossWeight;
|
||||
|
||||
@ApiModelProperty("调整前体积")
|
||||
@Excel(name = "调整前体积")
|
||||
private BigDecimal volume;
|
||||
|
||||
@ApiModelProperty("调整前面积")
|
||||
@Excel(name = "调整前面积")
|
||||
private BigDecimal area;
|
||||
|
||||
@ApiModelProperty("调整后净重(KG)")
|
||||
@Excel(name = "调整后净重(KG)")
|
||||
private BigDecimal adjustedNetWeight;
|
||||
|
||||
@ApiModelProperty("调整后毛重(KG)")
|
||||
@Excel(name = "调整后毛重(KG)")
|
||||
private BigDecimal adjustedGrossWeight;
|
||||
|
||||
@ApiModelProperty("调整后体积")
|
||||
@Excel(name = "调整后体积")
|
||||
private BigDecimal adjustedVolume;
|
||||
|
||||
@ApiModelProperty("调整后面积")
|
||||
@Excel(name = "调整后面积")
|
||||
private BigDecimal adjustedArea;
|
||||
|
||||
@ApiModelProperty("入库单号")
|
||||
@Excel(name = "入库单号")
|
||||
private String inOrderNumber;
|
||||
|
||||
@ApiModelProperty("LOT编号")
|
||||
@Excel(name = "LOT编号")
|
||||
private String lotNumber;
|
||||
}
|
||||
+21
@@ -155,6 +155,17 @@ public class InventoryAdjustmentRecordDomainService {
|
||||
inventoryAdjustmentRecord.setInventoryAfterQuantity(materialInventory.getInventoryQuantity());
|
||||
inventoryAdjustmentRecord.setAllocationAfterQuantity(materialInventory.getAllocationQuantity());
|
||||
inventoryAdjustmentRecord.setFreezeAfterQuantity(materialInventory.getFreezeQuantity());
|
||||
// 调整前:库存数量(净重、毛重、体积、面积)
|
||||
inventoryAdjustmentRecord.setNetWeight(materialInventory.getNetWeight());
|
||||
inventoryAdjustmentRecord.setGrossWeight(materialInventory.getGrossWeight());
|
||||
inventoryAdjustmentRecord.setVolume(materialInventory.getVolume());
|
||||
inventoryAdjustmentRecord.setArea(materialInventory.getArea());
|
||||
// 调整后:库存数量 - 复核时填写的数量
|
||||
inventoryAdjustmentRecord.setAdjustedNetWeight(materialInventory.getNetWeight());
|
||||
inventoryAdjustmentRecord.setAdjustedGrossWeight(materialInventory.getGrossWeight());
|
||||
inventoryAdjustmentRecord.setAdjustedVolume(materialInventory.getVolume());
|
||||
inventoryAdjustmentRecord.setAdjustedArea(materialInventory.getArea());
|
||||
|
||||
} else {
|
||||
throw new ServiceException("根据物料库存id查询不到物料库存信息!");
|
||||
}
|
||||
@@ -199,6 +210,16 @@ public class InventoryAdjustmentRecordDomainService {
|
||||
inventoryAdjustmentRecord.setInventoryAfterQuantity(materialInventory.getInventoryQuantity());
|
||||
inventoryAdjustmentRecord.setAllocationAfterQuantity(materialInventory.getAllocationQuantity());
|
||||
inventoryAdjustmentRecord.setFreezeAfterQuantity(materialInventory.getFreezeQuantity());
|
||||
// 调整前:库存数量(净重、毛重、体积、面积)
|
||||
inventoryAdjustmentRecord.setNetWeight(materialInventory.getNetWeight());
|
||||
inventoryAdjustmentRecord.setGrossWeight(materialInventory.getGrossWeight());
|
||||
inventoryAdjustmentRecord.setVolume(materialInventory.getVolume());
|
||||
inventoryAdjustmentRecord.setArea(materialInventory.getArea());
|
||||
// 调整后:库存数量 - 复核时填写的数量
|
||||
inventoryAdjustmentRecord.setAdjustedNetWeight(materialInventory.getNetWeight());
|
||||
inventoryAdjustmentRecord.setAdjustedGrossWeight(materialInventory.getGrossWeight());
|
||||
inventoryAdjustmentRecord.setAdjustedVolume(materialInventory.getVolume());
|
||||
inventoryAdjustmentRecord.setAdjustedArea(materialInventory.getArea());
|
||||
} else {
|
||||
throw new ServiceException("根据原物料状态查询不到物料库存信息!");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user