diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/ImsOutInventoryDetail.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/ImsOutInventoryDetail.java index 58e280f..40a7fcc 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/ImsOutInventoryDetail.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/ImsOutInventoryDetail.java @@ -144,4 +144,14 @@ public class ImsOutInventoryDetail extends BaseEntity @Excel(name = "原料id") private Long materialId; + /** 生产日期 */ + @ApiModelProperty(value = "生产日期") + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd") + private LocalDate productDate; + + @ApiModelProperty(value = "供应商id") + @Excel(name = "供应商id") + private Long supplierId; + } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/ImsOutInventoryServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/ImsOutInventoryServiceImpl.java index 68775a1..f1eab80 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/ImsOutInventoryServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/ImsOutInventoryServiceImpl.java @@ -243,6 +243,9 @@ public class ImsOutInventoryServiceImpl implements IImsOutInventoryService imsOutInventoryDetailForInsert.setMaterialId(materialId); } imsOutInventoryDetailForInsert.setOutUnitPrice(imsIntoInventoryDetail.getUnitPrice()); + imsOutInventoryDetailForInsert.setSupplierId(imsIntoInventoryDetail.getSupplierId()); + imsOutInventoryDetailForInsert.setProductDate(imsIntoInventoryDetail.getProductDate()); + imsOutInventoryDetailForInsert.setExpireTime(imsIntoInventoryDetail.getExpireTime()); list.add(imsOutInventoryDetailForInsert); tempFetchLeftNum = tempFetchLeftNum.subtract(imsIntoInventoryDetail.getInventoryNum()); } @@ -263,6 +266,9 @@ public class ImsOutInventoryServiceImpl implements IImsOutInventoryService imsOutInventoryDetailForInsert.setMaterialId(materialId); } imsOutInventoryDetailForInsert.setOutUnitPrice(imsIntoInventoryDetail.getUnitPrice()); + imsOutInventoryDetailForInsert.setSupplierId(imsIntoInventoryDetail.getSupplierId()); + imsOutInventoryDetailForInsert.setProductDate(imsIntoInventoryDetail.getProductDate()); + imsOutInventoryDetailForInsert.setExpireTime(imsIntoInventoryDetail.getExpireTime()); list.add(imsOutInventoryDetailForInsert); tempFetchLeftNum = tempFetchLeftNum.subtract(tempFetchLeftNum); }