提交merge1.3

openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocInventoryItemStaticService.java

@@ -3,6 +3,11 @@
  */
 package com.openhis.document.service;
 
+<<<<<<< HEAD
+=======
+import java.util.List;
+
+>>>>>>> v1.3
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.openhis.document.domain.DocInventoryItemStatic;
 
@@ -12,4 +17,19 @@ import com.openhis.document.domain.DocInventoryItemStatic;
  * @author zwh
  * @date 2025-11-04
  */
+<<<<<<< HEAD
 public interface IDocInventoryItemStaticService extends IService<DocInventoryItemStatic> {}
+=======
+public interface IDocInventoryItemStaticService extends IService<DocInventoryItemStatic> {
+
+    /**
+     * 获取物品的库存备份信息
+     *
+     * @param itemIdList 物品id
+     * @param busNo 备份单据号
+     * @param locationId 库房id
+     * @return 库存备份信息
+     */
+    List<DocInventoryItemStatic> getInventoryItemStaticByItemId(List<Long> itemIdList, String busNo, Long locationId);
+}
+>>>>>>> v1.3

openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocInventoryItemStaticServiceImpl.java

@@ -3,9 +3,19 @@
  */
 package com.openhis.document.service.impl;
 
+<<<<<<< HEAD
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+=======
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.core.common.enums.DelFlag;
+>>>>>>> v1.3
 import com.openhis.document.domain.DocInventoryItemStatic;
 import com.openhis.document.mapper.DocInventoryItemStaticMapper;
 import com.openhis.document.service.IDocInventoryItemStaticService;
@@ -18,4 +28,28 @@ import com.openhis.document.service.IDocInventoryItemStaticService;
  */
 @Service
 public class DocInventoryItemStaticServiceImpl extends ServiceImpl<DocInventoryItemStaticMapper, DocInventoryItemStatic>
+<<<<<<< HEAD
     implements IDocInventoryItemStaticService {}
+=======
+    implements IDocInventoryItemStaticService {
+
+    /**
+     * 根据物品id获取物品的库存备份信息
+     *
+     * @param itemIdList 物品id
+     * @return 库存备份信息
+     */
+    @Override
+    public List<DocInventoryItemStatic> getInventoryItemStaticByItemId(List<Long> itemIdList, String busNo,
+        Long locationId) {
+        LambdaQueryWrapper<DocInventoryItemStatic> queryWrapper = new LambdaQueryWrapper<>();
+        if (itemIdList != null && !itemIdList.isEmpty()) {
+            queryWrapper.in(DocInventoryItemStatic::getItemId, itemIdList);
+        }
+        queryWrapper.eq(DocInventoryItemStatic::getBusNo, busNo)
+            .eq(DocInventoryItemStatic::getDeleteFlag, DelFlag.NO.getCode())
+            .eq(DocInventoryItemStatic::getLocationId, locationId).orderByDesc(DocInventoryItemStatic::getCreateTime);
+        return baseMapper.selectList(queryWrapper);
+    }
+}
+>>>>>>> v1.3