From 4094db89342a84f59d90ee6317c7499c84b3d69a Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Thu, 22 May 2025 23:22:04 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A3=9F=E5=A0=82erp=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canteen/dto/erp/CanteenErpMaterialSaveDTO.java   |  4 ++++
 .../pjcloud/canteen/vo/erp/CanteenErpMaterialVO.java |  4 ++++
 .../pjcloud/canteen/vo/erp/ErpMaterialPageVo.java    |  4 ++++
 .../canteen/vo/erp/InventoryRecordItemVo.java        |  9 +++++++++
 .../service/impl/CanteenErpMaterialServiceImpl.java  |  3 ++-
 .../impl/CanteenInventoryRecordsServiceImpl.java     | 12 ++++++++----
 .../service/impl/CanteenStockServiceImpl.java        |  2 +-
 .../mapper/CanteenInventoryRecordsMapper.xml         |  3 ++-
 8 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/dto/erp/CanteenErpMaterialSaveDTO.java b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/dto/erp/CanteenErpMaterialSaveDTO.java
index 78908eef7..8c2f58b17 100644
--- a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/dto/erp/CanteenErpMaterialSaveDTO.java
+++ b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/dto/erp/CanteenErpMaterialSaveDTO.java
@@ -37,4 +37,8 @@ public class CanteenErpMaterialSaveDTO {
      */
     @Schema(description="库存下限")
     private Integer inventoryLowerLimit;
+
+
+    @Schema(description="采购价格")
+    private Integer purchasePrice;
 }
diff --git a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/erp/CanteenErpMaterialVO.java b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/erp/CanteenErpMaterialVO.java
index 57b79cb6e..62e60afec 100644
--- a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/erp/CanteenErpMaterialVO.java
+++ b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/erp/CanteenErpMaterialVO.java
@@ -43,4 +43,8 @@ public class CanteenErpMaterialVO {
 
     @Schema(description="当前总库存")
     private Double currentStock;
+
+
+    @Schema(description="采购价格")
+    private Integer purchasePrice;
 }
diff --git a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/erp/ErpMaterialPageVo.java b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/erp/ErpMaterialPageVo.java
index fc34a2492..c65626eab 100644
--- a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/erp/ErpMaterialPageVo.java
+++ b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/erp/ErpMaterialPageVo.java
@@ -33,4 +33,8 @@ public class ErpMaterialPageVo {
      */
     @Schema(description="当前库存数量")
     private Double stock;
+
+
+    @Schema(description="采购价格")
+    private Integer purchasePrice;
 }
diff --git a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/erp/InventoryRecordItemVo.java b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/erp/InventoryRecordItemVo.java
index ea57c65c0..bc9d7ec0e 100644
--- a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/erp/InventoryRecordItemVo.java
+++ b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/erp/InventoryRecordItemVo.java
@@ -22,6 +22,9 @@ public class InventoryRecordItemVo {
     @Schema(description="食材id")
     private Long erpMaterialId;
 
+	@Schema(description="食材名称")
+	private String name;
+
 	/**
 	 * 主表id
 	 */
@@ -45,6 +48,12 @@ public class InventoryRecordItemVo {
     @Schema(description="累计总金额")
     private Integer totalAmount;
 
+	/**
+	* 累计数量
+	*/
+	@Schema(description="累计数量")
+	private Integer totalNumber;
+
 	/**
 	* 备注
 	*/
diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenErpMaterialServiceImpl.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenErpMaterialServiceImpl.java
index 561929812..9fb2f097c 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenErpMaterialServiceImpl.java
+++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenErpMaterialServiceImpl.java
@@ -64,6 +64,7 @@ public class CanteenErpMaterialServiceImpl extends ServiceImpl<CanteenErpMateria
         canteenErpMaterialEntity.setId(id);
         canteenErpMaterialEntity.setName(canteenErpMaterialEditorDTO.getName());
         canteenErpMaterialEntity.setUnit(canteenErpMaterialEditorDTO.getUnit());
+        canteenErpMaterialEntity.setPurchasePrice(canteenErpMaterialEditorDTO.getPurchasePrice());
 
         LambdaQueryWrapper<CanteenStockEntity> canteenStockEntityLambdaQueryWrapper = new LambdaQueryWrapper<>();
         canteenStockEntityLambdaQueryWrapper.eq(CanteenStockEntity::getItemId, id);
@@ -75,7 +76,6 @@ public class CanteenErpMaterialServiceImpl extends ServiceImpl<CanteenErpMateria
         canteenStockEntity.setCurrentStock(canteenErpMaterialEditorDTO.getBaseStock()+(sourceCanteenStockEntity.getCurrentStock()-sourceCanteenStockEntity.getBaseStock()));
         canteenStockEntity.setInventoryUpperLimit(canteenErpMaterialEditorDTO.getInventoryUpperLimit());
         canteenStockEntity.setInventoryLowerLimit(canteenErpMaterialEditorDTO.getInventoryLowerLimit());
-
         int i = baseMapper.updateById(canteenErpMaterialEntity);
         canteenStockMapper.update(canteenStockEntity,
                 new LambdaQueryWrapper<CanteenStockEntity>().eq(CanteenStockEntity::getItemId, id));
@@ -103,6 +103,7 @@ public class CanteenErpMaterialServiceImpl extends ServiceImpl<CanteenErpMateria
         canteenErpMaterialVO.setInventoryUpperLimit(sourceCanteenStockEntity.getInventoryUpperLimit());
         canteenErpMaterialVO.setInventoryLowerLimit(sourceCanteenStockEntity.getInventoryLowerLimit());
         canteenErpMaterialVO.setCurrentStock(sourceCanteenStockEntity.getCurrentStock());
+        canteenErpMaterialVO.setPurchasePrice(canteenErpMaterialEntity.getPurchasePrice());
         return canteenErpMaterialVO;
     }
 
diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenInventoryRecordsServiceImpl.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenInventoryRecordsServiceImpl.java
index 92215ff89..a344b22d9 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenInventoryRecordsServiceImpl.java
+++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenInventoryRecordsServiceImpl.java
@@ -5,13 +5,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.bsd.pjcloud.canteen.constant.OrderTypeEnum;
 import com.bsd.pjcloud.canteen.dto.erp.*;
+import com.bsd.pjcloud.canteen.entity.CanteenErpMaterialEntity;
 import com.bsd.pjcloud.canteen.entity.CanteenInventoryRecordsEntity;
 import com.bsd.pjcloud.canteen.entity.CanteenInventoryRecordsItemEntity;
 import com.bsd.pjcloud.canteen.entity.CanteenProductionRecordEntity;
-import com.bsd.pjcloud.canteen.mapper.CanteenInventoryRecordsItemMapper;
-import com.bsd.pjcloud.canteen.mapper.CanteenInventoryRecordsMapper;
-import com.bsd.pjcloud.canteen.mapper.CanteenProductionRecordItemMapper;
-import com.bsd.pjcloud.canteen.mapper.CanteenStockMapper;
+import com.bsd.pjcloud.canteen.mapper.*;
 import com.bsd.pjcloud.canteen.service.CanteenInventoryRecordsService;
 import com.bsd.pjcloud.canteen.service.CanteenStockService;
 import com.bsd.pjcloud.canteen.vo.erp.CanteenProductionRecordPageVO;
@@ -47,6 +45,8 @@ public class CanteenInventoryRecordsServiceImpl extends ServiceImpl<CanteenInven
     private final CanteenStockMapper canteenStockMapper;
 
     private final CanteenStockService canteenStockService;
+
+    private final CanteenErpMaterialMapper canteenErpMaterialMapper;
     @Override
     @Transactional
     public Object saveCanteenInventoryRecordsdDTO(CanteenInventoryRecordsdDTO canteenInventoryRecordsdDTO) {
@@ -185,6 +185,10 @@ public class CanteenInventoryRecordsServiceImpl extends ServiceImpl<CanteenInven
 
         InventoryRecordVo bean = BeanUtils.toBean(smErpInventoryRecordsEntity, InventoryRecordVo.class, (source) -> {
             List<InventoryRecordItemVo> smeErpCgPlanItemVos = BeanUtils.toBean(list, InventoryRecordItemVo.class);
+            smeErpCgPlanItemVos.stream().forEach(item -> {
+                CanteenErpMaterialEntity canteenErpMaterialEntity = canteenErpMaterialMapper.selectById(item.getErpMaterialId());
+                item.setName(canteenErpMaterialEntity.getName());
+            });
             source.setItems(smeErpCgPlanItemVos);
         });
 
diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenStockServiceImpl.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenStockServiceImpl.java
index 7a3124e5e..f109d0a5d 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenStockServiceImpl.java
+++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenStockServiceImpl.java
@@ -47,7 +47,7 @@ public class CanteenStockServiceImpl extends ServiceImpl<CanteenStockMapper, Can
             updateStockWithLockWrapper.eq(CanteenStockEntity::getVersion,smErpStockEntity.getVersion());
             CanteenStockEntity updateSmErpStockEntity = new CanteenStockEntity();
             Double currentStock = smErpStockEntity.getCurrentStock();
-            if (currentStock<Math.abs(item.getIncrCount())){
+            if (item.getIncrCount()<0 &&currentStock<Math.abs(item.getIncrCount())){
                 LambdaQueryWrapper<CanteenErpMaterialEntity> canteenErpMaterialEntityLambdaQueryWrapper = new LambdaQueryWrapper<>();
                 canteenErpMaterialEntityLambdaQueryWrapper.eq(CanteenErpMaterialEntity::getId,item.getId());
                 CanteenErpMaterialEntity canteenErpMaterialEntity = canteenErpMaterialMapper.selectOne(canteenErpMaterialEntityLambdaQueryWrapper);
diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenInventoryRecordsMapper.xml b/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenInventoryRecordsMapper.xml
index ddff9e2f5..8b19a1ef5 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenInventoryRecordsMapper.xml
+++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenInventoryRecordsMapper.xml
@@ -48,6 +48,7 @@
                 and cpr.production_time = #{inventoryDate}
             </if>
         </where>
-        GROUP BY r.id;
+        GROUP BY r.id
+        order by r.create_time desc
     </select>
 </mapper>
\ No newline at end of file