From 6e23b446cf6c0815b54860cca6584be5a6b7e5cb Mon Sep 17 00:00:00 2001 From: gaowdong Date: Fri, 18 Jul 2025 09:16:40 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../canteen/core/ims/domain/ImsOutInventoryDetail.java | 10 ++++++++++ .../ims/service/impl/ImsOutInventoryServiceImpl.java | 6 ++++++ 2 files changed, 16 insertions(+) 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); }