[task-2943] 【后端】试剂耗材管理接口开发

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/reagent/api/IReagentConsumablesInventoryService.java

@@ -26,7 +26,7 @@ import com.lc.ibps.components.reagent.persistence.entity.ReagentConsumablesInven
  * 构建组：ibps-provider-reagentConsumablesInventory-api
  * 开发公司：深圳市金源信通科技有限公司
  * 开发人员：codegen
- * 创建时间：2024-11-13 15:42:49
+ * 创建时间：2024-11-14 16:40:13
  *</pre>
  */
 @Validated
@@ -82,7 +82,6 @@ public interface IReagentConsumablesInventoryService {
 
 	@RequestMapping(value = "/sync", method = { RequestMethod.POST })
 	public APIResult<Void> sync(
-//			@NotEmpty(message = "{com.lc.ibps.components.provider.ReagentConsumablesInventoryProvider.ids}")
 			@RequestParam(name = "id", required = true) String id,
 			@RequestParam(name = "action", required = true) String action);
 

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/reagent/api/IReagentConsumablesItemService.java

@@ -0,0 +1,82 @@
+package com.lc.ibps.components.reagent.api;
+
+import java.util.List;
+
+import org.hibernate.validator.constraints.NotBlank;
+import org.hibernate.validator.constraints.NotEmpty;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.lc.ibps.cloud.entity.APIPageList;
+import com.lc.ibps.cloud.entity.APIRequest;
+import com.lc.ibps.cloud.entity.APIResult;
+import javax.validation.Valid;
+import com.lc.ibps.components.reagent.persistence.entity.ReagentConsumablesItemPo;
+
+
+
+/**
+ * 试剂耗材基础数据配置 接口
+ *
+ *<pre> 
+ * 构建组：ibps-provider-reagentConsumablesItem-api
+ * 开发公司：深圳市金源信通科技有限公司
+ * 开发人员：codegen
+ * 创建时间：2024-11-14 16:40:06
+ *</pre>
+ */
+@Validated
+@RequestMapping(value = "/reagent/reagentConsumablesItem")
+@RestController
+public interface IReagentConsumablesItemService {
+
+	/**
+	 * 
+	 * 【试剂耗材基础数据配置】列表(分页条件查询)数据
+	 *
+	 * @param request
+	 * @return
+	 */
+	@RequestMapping(value = "/query", method = RequestMethod.POST)
+	public APIResult<APIPageList<ReagentConsumablesItemPo>> query(
+			@RequestBody(required = true) APIRequest request);
+	
+	/**
+	 * 
+	 * 根据id查询【试剂耗材基础数据配置】
+	 *
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "/get", method = { RequestMethod.GET })
+	public APIResult<ReagentConsumablesItemPo> get(
+//			@NotBlank(message = "{com.lc.ibps.components.provider.ReagentConsumablesItemProvider.id}") 
+			@RequestParam(name = "id", required = true) String id);
+	
+	/**
+	 * 
+	 * 批量删除【试剂耗材基础数据配置】记录
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@RequestMapping(value = "/remove", method = { RequestMethod.POST })
+	public APIResult<Void> remove(
+//			@NotEmpty(message = "{com.lc.ibps.components.provider.ReagentConsumablesItemProvider.ids}")
+			@RequestParam(name = "ids", required = true) String[] ids);
+	
+	/**
+	 * 
+	 * 保存【试剂耗材基础数据配置】记录
+	 *
+	 * @param reagentConsumablesItemPo
+	 * @return
+	 */
+	@RequestMapping(value = "/save", method = { RequestMethod.POST })
+	public APIResult<Void> save(
+ 			@RequestBody(required = true) @Valid ReagentConsumablesItemPo reagentConsumablesItemPo);
+}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/reagent/api/IReagentConsumablesTransactionService.java

@@ -20,13 +20,13 @@ import com.lc.ibps.components.reagent.persistence.entity.ReagentConsumablesTrans
 
 
 /**
- * 试剂耗材交易表 接口
+ * 试剂耗材库存台账表 接口
  *
  *<pre> 
  * 构建组：ibps-provider-reagentConsumablesTransaction-api
  * 开发公司：深圳市金源信通科技有限公司
  * 开发人员：codegen
- * 创建时间：2024-11-13 15:50:18
+ * 创建时间：2024-11-14 16:40:19
  *</pre>
  */
 @Validated
@@ -36,7 +36,7 @@ public interface IReagentConsumablesTransactionService {
 
 	/**
 	 * 
-	 * 【试剂耗材交易表】列表(分页条件查询)数据
+	 * 【试剂耗材库存台账表】列表(分页条件查询)数据
 	 *
 	 * @param request
 	 * @return
@@ -47,7 +47,7 @@ public interface IReagentConsumablesTransactionService {
 	
 	/**
 	 * 
-	 * 根据id查询【试剂耗材交易表】
+	 * 根据id查询【试剂耗材库存台账表】
 	 *
 	 * @param id
 	 * @return
@@ -59,7 +59,7 @@ public interface IReagentConsumablesTransactionService {
 	
 	/**
 	 * 
-	 * 批量删除【试剂耗材交易表】记录
+	 * 批量删除【试剂耗材库存台账表】记录
 	 *
 	 * @param ids
 	 * @return
@@ -71,7 +71,7 @@ public interface IReagentConsumablesTransactionService {
 	
 	/**
 	 * 
-	 * 保存【试剂耗材交易表】记录
+	 * 保存【试剂耗材库存台账表】记录
 	 *
 	 * @param reagentConsumablesTransactionPo
 	 * @return

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/reagent/domain/ReagentConsumablesInventory.java

@@ -1,9 +1,9 @@
 package com.lc.ibps.components.reagent.domain;
 
+import java.util.List;
 
 import javax.annotation.Resource;
 
-import com.lc.ibps.components.reagent.repository.ReagentConsumablesTransactionRepository;
 import org.springframework.context.annotation.Scope;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Service;
@@ -24,7 +24,7 @@ import com.lc.ibps.components.reagent.persistence.entity.ReagentConsumablesInven
  *<pre> 
  * 开发公司：深圳市金源信通科技有限公司
  * 开发人员：codegen
- * 创建时间：2024-11-13 15:42:48
+ * 创建时间：2024-11-14 16:40:13
  *</pre>
  */
 @SuppressWarnings("serial")
@@ -39,8 +39,6 @@ public class ReagentConsumablesInventory extends AbstractDomain<String, ReagentC
 	private ReagentConsumablesInventoryQueryDao reagentConsumablesInventoryQueryDao;
 	@Resource
 	private ReagentConsumablesInventoryRepository reagentConsumablesInventoryRepository;
-	@Resource
-	private ReagentConsumablesTransactionRepository ReagentConsumablesTransactionRepository;
 
 
 	protected void init(){
@@ -63,5 +61,11 @@ public class ReagentConsumablesInventory extends AbstractDomain<String, ReagentC
 	}
 	
 	
+	public void deleteByMainId(String mainId) {
+		List<ReagentConsumablesInventoryPo> list = reagentConsumablesInventoryRepository.findByMainId(mainId);
+		for (ReagentConsumablesInventoryPo po : list) {
+			delete(po.getId());
+		}
+	}
 	
 }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/reagent/domain/ReagentConsumablesItem.java

@@ -0,0 +1,126 @@
+package com.lc.ibps.components.reagent.domain;
+
+
+import javax.annotation.Resource;
+
+import org.springframework.context.annotation.Scope;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.stereotype.Service;
+
+import com.lc.ibps.base.core.util.BeanUtils;
+import com.lc.ibps.base.core.util.string.StringUtil;
+import com.lc.ibps.base.core.util.AppUtil;
+import com.lc.ibps.base.framework.domain.AbstractDomain;
+import com.lc.ibps.base.framework.persistence.dao.IDao;
+import com.lc.ibps.base.framework.persistence.dao.IQueryDao;
+import com.lc.ibps.components.reagent.persistence.dao.ReagentConsumablesItemDao;
+import com.lc.ibps.components.reagent.persistence.dao.ReagentConsumablesItemQueryDao;
+import com.lc.ibps.components.reagent.repository.ReagentConsumablesItemRepository;
+import com.lc.ibps.components.reagent.persistence.entity.ReagentConsumablesItemPo;
+import com.lc.ibps.components.reagent.repository.ReagentConsumablesInventoryRepository;
+import com.lc.ibps.components.reagent.persistence.entity.ReagentConsumablesInventoryPo;
+import com.lc.ibps.components.reagent.repository.ReagentConsumablesTransactionRepository;
+import com.lc.ibps.components.reagent.persistence.entity.ReagentConsumablesTransactionPo;
+
+/**
+ * 试剂耗材基础数据配置 领域对象实体
+ *
+ *<pre> 
+ * 开发公司：深圳市金源信通科技有限公司
+ * 开发人员：codegen
+ * 创建时间：2024-11-14 16:40:06
+ *</pre>
+ */
+@SuppressWarnings("serial")
+@Service
+@Transactional
+@Scope("prototype")
+public class ReagentConsumablesItem extends AbstractDomain<String, ReagentConsumablesItemPo>{
+	
+	@Resource
+	private ReagentConsumablesItemDao reagentConsumablesItemDao;
+	@Resource
+	private ReagentConsumablesItemQueryDao reagentConsumablesItemQueryDao;
+	@Resource
+	private ReagentConsumablesItemRepository reagentConsumablesItemRepository;
+
+	@Resource
+	private ReagentConsumablesInventoryRepository reagentConsumablesInventoryRepository;
+	@Resource
+	private ReagentConsumablesTransactionRepository reagentConsumablesTransactionRepository;
+
+	protected void init(){
+		//
+	}
+	
+	@Override
+	protected IQueryDao<String, ReagentConsumablesItemPo> getInternalQueryDao() {
+		return reagentConsumablesItemQueryDao;
+	}
+	
+	@Override
+	protected IDao<String, ReagentConsumablesItemPo> getInternalDao() {
+		return reagentConsumablesItemDao;
+	}
+	
+	@Override
+	public String getInternalCacheName() {
+		return "reagentConsumablesItem";
+	}
+	
+	/**
+	 * 主从表一并保存 
+	 * void
+	 * @exception 
+	 * @since  1.0.0
+	 */
+	public void saveCascade(){
+		save();
+		if(getData().isDelBeforeSave()){
+			ReagentConsumablesInventory reagentConsumablesInventory = reagentConsumablesInventoryRepository.newInstance();
+			reagentConsumablesInventory.deleteByMainId(getData().getBianMa());
+			ReagentConsumablesTransaction reagentConsumablesTransaction = reagentConsumablesTransactionRepository.newInstance();
+			reagentConsumablesTransaction.deleteByMainId(getData().getBianMa());
+		}
+		
+		ReagentConsumablesInventory reagentConsumablesInventory = reagentConsumablesInventoryRepository.newInstance();
+		if(BeanUtils.isNotEmpty(getData().getReagentConsumablesInventoryPoList())){
+			for(ReagentConsumablesInventoryPo reagentConsumablesInventoryPo:getData().getReagentConsumablesInventoryPoList()){
+				//设置外键
+				reagentConsumablesInventoryPo.setReagentCode(getData().getBianMa());
+				reagentConsumablesInventory.save(reagentConsumablesInventoryPo);
+			}
+		}
+		ReagentConsumablesTransaction reagentConsumablesTransaction = reagentConsumablesTransactionRepository.newInstance();
+		if(BeanUtils.isNotEmpty(getData().getReagentConsumablesTransactionPoList())){
+			for(ReagentConsumablesTransactionPo reagentConsumablesTransactionPo:getData().getReagentConsumablesTransactionPoList()){
+				//设置外键
+				reagentConsumablesTransactionPo.setReagentCode(getData().getBianMa());
+				reagentConsumablesTransaction.save(reagentConsumablesTransactionPo);
+			}
+		}
+	}	
+	
+	/**
+	 * 主从表一并删除 
+	 * void
+	 * @exception 
+	 * @since  1.0.0
+	 */
+	public void deleteByIdsCascade(String[] ids){
+		for(String id : ids){
+			ReagentConsumablesItemPo po = reagentConsumablesItemRepository.get(id);
+			ReagentConsumablesInventory reagentConsumablesInventory = reagentConsumablesInventoryRepository.newInstance();
+			if(BeanUtils.isNotEmpty(po) && BeanUtils.isNotEmpty(po.getBianMa())){
+				reagentConsumablesInventory.deleteByMainId(po.getBianMa());
+			}	
+			ReagentConsumablesTransaction reagentConsumablesTransaction = reagentConsumablesTransactionRepository.newInstance();
+			if(BeanUtils.isNotEmpty(po) && BeanUtils.isNotEmpty(po.getBianMa())){
+				reagentConsumablesTransaction.deleteByMainId(po.getBianMa());
+			}	
+		}
+		deleteByIds(ids);
+	}
+	
+	
+}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/reagent/domain/ReagentConsumablesTransaction.java

@@ -1,5 +1,6 @@
 package com.lc.ibps.components.reagent.domain;
 
+import java.util.List;
 
 import javax.annotation.Resource;
 
@@ -18,12 +19,12 @@ import com.lc.ibps.components.reagent.repository.ReagentConsumablesTransactionRe
 import com.lc.ibps.components.reagent.persistence.entity.ReagentConsumablesTransactionPo;
 
 /**
- * 试剂耗材交易表 领域对象实体
+ * 试剂耗材库存台账表 领域对象实体
  *
  *<pre> 
  * 开发公司：深圳市金源信通科技有限公司
  * 开发人员：codegen
- * 创建时间：2024-11-13 15:50:17
+ * 创建时间：2024-11-14 16:40:19
  *</pre>
  */
 @SuppressWarnings("serial")
@@ -60,5 +61,11 @@ public class ReagentConsumablesTransaction extends AbstractDomain<String, Reagen
 	}
 	
 	
+	public void deleteByMainId(String mainId) {
+		List<ReagentConsumablesTransactionPo> list = reagentConsumablesTransactionRepository.findByMainId(mainId);
+		for (ReagentConsumablesTransactionPo po : list) {
+			delete(po.getId());
+		}
+	}
 	
 }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/reagent/dto/InventoryDTO.java

@@ -0,0 +1,90 @@
+package com.lc.ibps.components.reagent.dto;
+
+import com.lc.ibps.base.core.util.Collections;
+import com.lc.ibps.business.dto.EquipIntactDTO;
+import com.lc.ibps.components.reagent.domain.ReagentConsumablesInventory;
+import com.lc.ibps.components.reagent.domain.ReagentConsumablesTransaction;
+import com.lc.ibps.components.reagent.persistence.entity.ReagentConsumablesInventoryPo;
+import com.lc.ibps.components.reagent.persistence.entity.ReagentConsumablesTransactionPo;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+public class InventoryDTO {
+
+    private ReagentConsumablesInventoryPo inventory;
+    private ReagentConsumablesTransactionPo transaction;
+
+    public InventoryDTO() {
+        this.inventory = new ReagentConsumablesInventoryPo();
+        this.transaction = new ReagentConsumablesTransactionPo();
+    }
+
+    public ReagentConsumablesInventoryPo getInventory() {
+        return inventory;
+    }
+
+    public void setInventory(ReagentConsumablesInventoryPo inventory) {
+        this.inventory = inventory;
+    }
+
+    public ReagentConsumablesTransactionPo getTransaction() {
+        return transaction;
+    }
+
+    public void setTransaction(ReagentConsumablesTransactionPo transaction) {
+        this.transaction = transaction;
+    }
+
+    public static List<InventoryDTO> build(List<Map<String,Object>> query){
+        List<InventoryDTO> list = new ArrayList<>();
+        if(Collections.isNotEmpty(query)){
+            for(Map<String,Object> data: query){
+                InventoryDTO iv = new InventoryDTO();
+                Object expDate = data.get("expDate");
+                Object reagentCode = data.get("reagentCode");
+                Object quantity = data.get("quantity");
+                Object boId = data.get("boId");
+                Object createBy = data.get("createBy");
+                Object inventoryId = data.get("inventoryId");
+
+//                Object createTime = data.get("createTime");
+                if(expDate !=null){
+                    iv.getInventory().setExpDate(expDate.toString());
+                    iv.getTransaction().setExpDate(expDate.toString());
+                }
+                if(reagentCode !=null){
+                    iv.getInventory().setReagentCode(reagentCode.toString());
+                    iv.getTransaction().setReagentCode(reagentCode.toString());
+                }
+                if(quantity !=null){
+                    iv.getInventory().setQuantity(Long.parseLong(quantity.toString()) );
+                    iv.getTransaction().setQuantity(Long.parseLong(quantity.toString()));
+                }
+                if(boId !=null){
+                    iv.getTransaction().setBoId(boId.toString());
+                }
+                if(createBy !=null){
+                    iv.getTransaction().setCreateBy(createBy.toString());
+                    iv.getTransaction().setUpdateBy(createBy.toString());
+                    iv.getInventory().setCreateBy(createBy.toString());
+                    iv.getInventory().setUpdateBy(createBy.toString());
+                    Date date = new Date();
+                    iv.getInventory().setCreateTime(date);
+                    iv.getInventory().setUpdateTime(date);
+                    iv.getTransaction().setCreateTime(date);
+                    iv.getTransaction().setUpdateTime(date);
+                }
+                if(inventoryId !=null){
+                    iv.getInventory().setId(inventoryId.toString());
+                }
+                iv.getTransaction().setType((Long)data.get("type_"));
+                list.add(iv);
+            }
+
+        }
+        return list;
+    }
+}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/reagent/persistence/dao/ReagentConsumablesInventoryDao.java

@@ -9,8 +9,14 @@ import com.lc.ibps.components.reagent.persistence.entity.ReagentConsumablesInven
  *<pre> 
  * 开发公司：深圳市金源信通科技有限公司
  * 开发人员：codegen
- * 创建时间：2024-11-13 15:42:47
+ * 创建时间：2024-11-14 16:40:11
  *</pre>
  */
 public interface ReagentConsumablesInventoryDao extends IDao<String, ReagentConsumablesInventoryPo> {
+	/**
+	 * 根据主表id删除 试剂耗材库存表 记录
+	 * @param mainId 
+	 * void
+	 */
+	public void deleteByMainId(String mainId);
 }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/reagent/persistence/dao/ReagentConsumablesInventoryQueryDao.java

@@ -1,5 +1,6 @@
 package com.lc.ibps.components.reagent.persistence.dao;
 
+import java.util.List;
 import com.lc.ibps.base.framework.persistence.dao.IQueryDao;
 import com.lc.ibps.components.reagent.persistence.entity.ReagentConsumablesInventoryPo;
 
@@ -9,8 +10,15 @@ import com.lc.ibps.components.reagent.persistence.entity.ReagentConsumablesInven
  *<pre> 
  * 开发公司：深圳市金源信通科技有限公司
  * 开发人员：codegen
- * 创建时间：2024-11-13 15:42:46
+ * 创建时间：2024-11-14 16:40:11
  *</pre>
  */
 public interface ReagentConsumablesInventoryQueryDao extends IQueryDao<String, ReagentConsumablesInventoryPo> {
+	/**
+	 * 根据主表ID查询 试剂耗材库存表 列表
+	 * @param mainId
+	 * @return 
+	 * List<ReagentConsumablesInventoryPo>
+	 */
+	public List<ReagentConsumablesInventoryPo> findByMainId(String mainId);
 }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/reagent/persistence/dao/ReagentConsumablesItemDao.java

@@ -0,0 +1,16 @@
+package com.lc.ibps.components.reagent.persistence.dao;
+
+import com.lc.ibps.base.framework.persistence.dao.IDao;
+import com.lc.ibps.components.reagent.persistence.entity.ReagentConsumablesItemPo;
+
+/**
+ * 试剂耗材基础数据配置 Dao接口
+ *
+ *<pre> 
+ * 开发公司：深圳市金源信通科技有限公司
+ * 开发人员：codegen
+ * 创建时间：2024-11-14 16:40:04
+ *</pre>
+ */
+public interface ReagentConsumablesItemDao extends IDao<String, ReagentConsumablesItemPo> {
+}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/reagent/persistence/dao/ReagentConsumablesItemQueryDao.java

@@ -0,0 +1,16 @@
+package com.lc.ibps.components.reagent.persistence.dao;
+
+import com.lc.ibps.base.framework.persistence.dao.IQueryDao;
+import com.lc.ibps.components.reagent.persistence.entity.ReagentConsumablesItemPo;
+
+/**
+ * 试剂耗材基础数据配置 查询Dao接口
+ *
+ *<pre> 
+ * 开发公司：深圳市金源信通科技有限公司
+ * 开发人员：codegen
+ * 创建时间：2024-11-14 16:40:03
+ *</pre>
+ */
+public interface ReagentConsumablesItemQueryDao extends IQueryDao<String, ReagentConsumablesItemPo> {
+}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/reagent/persistence/dao/ReagentConsumablesTransactionDao.java

@@ -4,13 +4,19 @@ import com.lc.ibps.base.framework.persistence.dao.IDao;
 import com.lc.ibps.components.reagent.persistence.entity.ReagentConsumablesTransactionPo;
 
 /**
- * 试剂耗材交易表 Dao接口
+ * 试剂耗材库存台账表 Dao接口
  *
  *<pre> 
  * 开发公司：深圳市金源信通科技有限公司
  * 开发人员：codegen
- * 创建时间：2024-11-13 15:50:16
+ * 创建时间：2024-11-14 16:40:18
  *</pre>
  */
 public interface ReagentConsumablesTransactionDao extends IDao<String, ReagentConsumablesTransactionPo> {
+	/**
+	 * 根据主表id删除 试剂耗材库存台账表 记录
+	 * @param mainId 
+	 * void
+	 */
+	public void deleteByMainId(String mainId);
 }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/reagent/persistence/dao/ReagentConsumablesTransactionQueryDao.java

@@ -1,16 +1,24 @@
 package com.lc.ibps.components.reagent.persistence.dao;
 
+import java.util.List;
 import com.lc.ibps.base.framework.persistence.dao.IQueryDao;
 import com.lc.ibps.components.reagent.persistence.entity.ReagentConsumablesTransactionPo;
 
 /**
- * 试剂耗材交易表 查询Dao接口
+ * 试剂耗材库存台账表 查询Dao接口
  *
  *<pre> 
  * 开发公司：深圳市金源信通科技有限公司
  * 开发人员：codegen
- * 创建时间：2024-11-13 15:50:16
+ * 创建时间：2024-11-14 16:40:17
  *</pre>
  */
 public interface ReagentConsumablesTransactionQueryDao extends IQueryDao<String, ReagentConsumablesTransactionPo> {
+	/**
+	 * 根据主表ID查询 试剂耗材库存台账表 列表
+	 * @param mainId
+	 * @return 
+	 * List<ReagentConsumablesTransactionPo>
+	 */
+	public List<ReagentConsumablesTransactionPo> findByMainId(String mainId);
 }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/reagent/persistence/dao/impl/ReagentConsumablesInventoryDaoImpl.java

@@ -12,7 +12,7 @@ import com.lc.ibps.components.reagent.persistence.entity.ReagentConsumablesInven
  *<pre> 
  * 开发公司：深圳市金源信通科技有限公司
  * 开发人员：codegen
- * 创建时间：2024-11-13 15:42:46
+ * 创建时间：2024-11-14 16:40:11
  *</pre>
  */
 @SuppressWarnings("serial")
@@ -23,4 +23,7 @@ public class ReagentConsumablesInventoryDaoImpl extends MyBatisDaoImpl<String, R
     public String getNamespace() {
         return ReagentConsumablesInventoryPo.class.getName();
     }
+	public void deleteByMainId(String mainId) {
+		deleteByKey("deleteByMainId", b().a("mainId", mainId).p());		
+	}
 }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/reagent/persistence/dao/impl/ReagentConsumablesInventoryQueryDaoImpl.java

@@ -1,5 +1,6 @@
 package com.lc.ibps.components.reagent.persistence.dao.impl;
 
+import java.util.List;
 
 import org.springframework.stereotype.Repository;
 
@@ -13,7 +14,7 @@ import com.lc.ibps.components.reagent.persistence.entity.ReagentConsumablesInven
  *<pre> 
  * 开发公司：深圳市金源信通科技有限公司
  * 开发人员：codegen
- * 创建时间：2024-11-13 15:42:46
+ * 创建时间：2024-11-14 16:40:10
  *</pre>
  */
  @SuppressWarnings("serial")
@@ -24,4 +25,7 @@ public class ReagentConsumablesInventoryQueryDaoImpl extends MyBatisQueryDaoImpl
     public String getNamespace() {
         return ReagentConsumablesInventoryPo.class.getName();
     }
+	public List<ReagentConsumablesInventoryPo> findByMainId(String mainId) {
+		return findByKey("findByMainId", b().a("mainId", mainId).p());
+	}
 }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/reagent/persistence/dao/impl/ReagentConsumablesItemDaoImpl.java

@@ -0,0 +1,26 @@
+package com.lc.ibps.components.reagent.persistence.dao.impl;
+
+import org.springframework.stereotype.Repository;
+
+import com.lc.ibps.base.db.ddd.dao.MyBatisDaoImpl;
+import com.lc.ibps.components.reagent.persistence.dao.ReagentConsumablesItemDao;
+import com.lc.ibps.components.reagent.persistence.entity.ReagentConsumablesItemPo;
+
+/**
+ * 试剂耗材基础数据配置 Dao接口的实现类
+ *
+ *<pre> 
+ * 开发公司：深圳市金源信通科技有限公司
+ * 开发人员：codegen
+ * 创建时间：2024-11-14 16:40:04
+ *</pre>
+ */
+@SuppressWarnings("serial")
+@Repository
+public class ReagentConsumablesItemDaoImpl extends MyBatisDaoImpl<String, ReagentConsumablesItemPo> implements ReagentConsumablesItemDao{
+
+    @Override
+    public String getNamespace() {
+        return ReagentConsumablesItemPo.class.getName();
+    }
+}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/reagent/persistence/dao/impl/ReagentConsumablesItemQueryDaoImpl.java

@@ -0,0 +1,27 @@
+package com.lc.ibps.components.reagent.persistence.dao.impl;
+
+
+import org.springframework.stereotype.Repository;
+
+import com.lc.ibps.base.db.ddd.dao.MyBatisQueryDaoImpl;
+import com.lc.ibps.components.reagent.persistence.dao.ReagentConsumablesItemQueryDao;
+import com.lc.ibps.components.reagent.persistence.entity.ReagentConsumablesItemPo;
+
+/**
+ *试剂耗材基础数据配置 查询Dao的实现类
+ *
+ *<pre> 
+ * 开发公司：深圳市金源信通科技有限公司
+ * 开发人员：codegen
+ * 创建时间：2024-11-14 16:40:03
+ *</pre>
+ */
+ @SuppressWarnings("serial")
+@Repository
+public class ReagentConsumablesItemQueryDaoImpl extends MyBatisQueryDaoImpl<String, ReagentConsumablesItemPo> implements ReagentConsumablesItemQueryDao{
+
+    @Override
+    public String getNamespace() {
+        return ReagentConsumablesItemPo.class.getName();
+    }
+}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/reagent/persistence/dao/impl/ReagentConsumablesTransactionDaoImpl.java

@@ -7,12 +7,12 @@ import com.lc.ibps.components.reagent.persistence.dao.ReagentConsumablesTransact
 import com.lc.ibps.components.reagent.persistence.entity.ReagentConsumablesTransactionPo;
 
 /**
- * 试剂耗材交易表 Dao接口的实现类
+ * 试剂耗材库存台账表 Dao接口的实现类
  *
  *<pre> 
  * 开发公司：深圳市金源信通科技有限公司
  * 开发人员：codegen
- * 创建时间：2024-11-13 15:50:16
+ * 创建时间：2024-11-14 16:40:17
  *</pre>
  */
 @SuppressWarnings("serial")
@@ -23,4 +23,7 @@ public class ReagentConsumablesTransactionDaoImpl extends MyBatisDaoImpl<String,
     public String getNamespace() {
         return ReagentConsumablesTransactionPo.class.getName();
     }
+	public void deleteByMainId(String mainId) {
+		deleteByKey("deleteByMainId", b().a("mainId", mainId).p());		
+	}
 }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/reagent/persistence/dao/impl/ReagentConsumablesTransactionQueryDaoImpl.java

@@ -1,5 +1,6 @@
 package com.lc.ibps.components.reagent.persistence.dao.impl;
 
+import java.util.List;
 
 import org.springframework.stereotype.Repository;
 
@@ -8,12 +9,12 @@ import com.lc.ibps.components.reagent.persistence.dao.ReagentConsumablesTransact
 import com.lc.ibps.components.reagent.persistence.entity.ReagentConsumablesTransactionPo;
 
 /**
- *试剂耗材交易表 查询Dao的实现类
+ *试剂耗材库存台账表 查询Dao的实现类
  *
  *<pre> 
  * 开发公司：深圳市金源信通科技有限公司
  * 开发人员：codegen
- * 创建时间：2024-11-13 15:50:15
+ * 创建时间：2024-11-14 16:40:17
  *</pre>
  */
  @SuppressWarnings("serial")
@@ -24,4 +25,7 @@ public class ReagentConsumablesTransactionQueryDaoImpl extends MyBatisQueryDaoIm
     public String getNamespace() {
         return ReagentConsumablesTransactionPo.class.getName();
     }
+	public List<ReagentConsumablesTransactionPo> findByMainId(String mainId) {
+		return findByKey("findByMainId", b().a("mainId", mainId).p());
+	}
 }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/reagent/persistence/entity/ReagentConsumablesInventoryPo.java

@@ -12,7 +12,7 @@ import io.swagger.annotations.ApiModel;
  *<pre> 
  * 开发公司：深圳市金源信通科技有限公司
  * 开发人员：codegen
- * 创建时间：2024-11-13 15:42:45
+ * 创建时间：2024-11-14 16:40:10
  *</pre>
  */
 @SuppressWarnings("serial")

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/reagent/persistence/entity/ReagentConsumablesInventoryTbl.java

@@ -12,7 +12,7 @@ import io.swagger.annotations.ApiModelProperty;
  *<pre> 
  * 开发公司：深圳市金源信通科技有限公司
  * 开发人员：codegen
- * 创建时间：2024-11-13 15:42:45
+ * 创建时间：2024-11-14 16:40:10
  *</pre>
  */
 @SuppressWarnings("serial")
@@ -20,40 +20,24 @@ import io.swagger.annotations.ApiModelProperty;
 public class ReagentConsumablesInventoryTbl extends AbstractPo<String>{
 	@ApiModelProperty(value = "主键")
 	protected String  id; 		/*主键*/
-	@ApiModelProperty(value = "租户ID")
-	protected String  tenantId; 		/*租户ID*/
-	@ApiModelProperty(value = "IP地址")
-	protected String  ip; 		/*IP地址*/
-	@ApiModelProperty(value = "是否过审")
-	protected String  shiFouGuoShen; 		/*是否过审*/
-	@ApiModelProperty(value = "地点")
-	protected String  diDian; 		/*地点*/
-	@ApiModelProperty(value = "编制人")
-	protected String  bianZhiRen; 		/*编制人*/
-	@ApiModelProperty(value = "编制部门")
-	protected String  bianZhiBuMen; 		/*编制部门*/
-	@ApiModelProperty(value = "编制时间")
-	protected String  bianZhiShiJian; 		/*编制时间*/
-	@ApiModelProperty(value = "快照")
-	protected String  kuaiZhao; 		/*快照*/
-	@ApiModelProperty(value = "名称")
-	protected String  mingCheng; 		/*名称*/
-	@ApiModelProperty(value = "存量")
-	protected String  cunLiang; 		/*存量*/
-	@ApiModelProperty(value = "编码")
-	protected String  bianMa; 		/*编码*/
-	@ApiModelProperty(value = "单位")
-	protected String  danWei; 		/*单位*/
-	@ApiModelProperty(value = "规格")
-	protected String  guiGe; 		/*规格*/
-	@ApiModelProperty(value = "生产厂家")
-	protected String  sCChangJia; 		/*生产厂家*/
-	@ApiModelProperty(value = "编号")
-	protected String  bianHao; 		/*编号*/
-	@ApiModelProperty(value = "批号")
-	protected String  piHao; 		/*批号*/
-	@ApiModelProperty(value = "有效期")
-	protected String  youXiaoQi; 		/*有效期*/
+	@ApiModelProperty(value = "试剂编码")
+	protected String  reagentCode; 		/*试剂编码*/
+	@ApiModelProperty(value = "是否冻结")
+	protected String  freeze; 		/*是否冻结*/
+	@ApiModelProperty(value = "库存量")
+	protected Long  quantity; 		/*库存量*/
+	@ApiModelProperty(value = "有效期至")
+	protected String  expDate; 		/*有效期至*/
+	@ApiModelProperty(value = "备注")
+	protected String  comments; 		/*备注*/
+	@ApiModelProperty(value = "上次盘点人")
+	protected String  checker; 		/*上次盘点人*/
+	@ApiModelProperty(value = "上次盘点时间")
+	protected String  checkedDate; 		/*上次盘点时间*/
+	@ApiModelProperty(value = "状态")
+	protected String  status; 		/*状态*/
+	@ApiModelProperty(value = "存放位置")
+	protected String  position; 		/*存放位置*/
 
 	public void setId(String id) 
 	{
@@ -67,209 +51,113 @@ public class ReagentConsumablesInventoryTbl extends AbstractPo<String>{
 	{
 		return this.id;
 	}
-	public void setTenantId(String tenantId) 
+	public void setReagentCode(String reagentCode) 
 	{
-		this.tenantId = tenantId;
+		this.reagentCode = reagentCode;
 	}
 	/**
-	 * 返回 租户ID
+	 * 返回 试剂编码
 	 * @return
 	 */
-	public String getTenantId() 
+	public String getReagentCode() 
 	{
-		return this.tenantId;
+		return this.reagentCode;
 	}
-	public void setIp(String ip) 
+	public void setFreeze(String freeze) 
 	{
-		this.ip = ip;
+		this.freeze = freeze;
 	}
 	/**
-	 * 返回 IP地址
+	 * 返回 是否冻结
 	 * @return
 	 */
-	public String getIp() 
+	public String getFreeze() 
 	{
-		return this.ip;
+		return this.freeze;
 	}
-	public void setShiFouGuoShen(String shiFouGuoShen) 
+	public void setQuantity(Long quantity) 
 	{
-		this.shiFouGuoShen = shiFouGuoShen;
+		this.quantity = quantity;
 	}
 	/**
-	 * 返回 是否过审
+	 * 返回 库存量
 	 * @return
 	 */
-	public String getShiFouGuoShen() 
+	public Long getQuantity() 
 	{
-		return this.shiFouGuoShen;
+		return this.quantity;
 	}
-	public void setDiDian(String diDian) 
+	public void setExpDate(String expDate) 
 	{
-		this.diDian = diDian;
+		this.expDate = expDate;
 	}
 	/**
-	 * 返回 地点
+	 * 返回 有效期至
 	 * @return
 	 */
-	public String getDiDian() 
+	public String getExpDate() 
 	{
-		return this.diDian;
+		return this.expDate;
 	}
-	public void setBianZhiRen(String bianZhiRen) 
+	public void setComments(String comments) 
 	{
-		this.bianZhiRen = bianZhiRen;
+		this.comments = comments;
 	}
 	/**
-	 * 返回 编制人
+	 * 返回 备注
 	 * @return
 	 */
-	public String getBianZhiRen() 
+	public String getComments() 
 	{
-		return this.bianZhiRen;
+		return this.comments;
 	}
-	public void setBianZhiBuMen(String bianZhiBuMen) 
+	public void setChecker(String checker) 
 	{
-		this.bianZhiBuMen = bianZhiBuMen;
+		this.checker = checker;
 	}
 	/**
-	 * 返回 编制部门
+	 * 返回 上次盘点人
 	 * @return
 	 */
-	public String getBianZhiBuMen() 
+	public String getChecker() 
 	{
-		return this.bianZhiBuMen;
+		return this.checker;
 	}
-	public void setBianZhiShiJian(String bianZhiShiJian) 
+	public void setCheckedDate(String checkedDate) 
 	{
-		this.bianZhiShiJian = bianZhiShiJian;
+		this.checkedDate = checkedDate;
 	}
 	/**
-	 * 返回 编制时间
+	 * 返回 上次盘点时间
 	 * @return
 	 */
-	public String getBianZhiShiJian() 
+	public String getCheckedDate() 
 	{
-		return this.bianZhiShiJian;
+		return this.checkedDate;
 	}
-	public void setKuaiZhao(String kuaiZhao) 
+	public void setStatus(String status) 
 	{
-		this.kuaiZhao = kuaiZhao;
+		this.status = status;
 	}
 	/**
-	 * 返回 快照
+	 * 返回 状态
 	 * @return
 	 */
-	public String getKuaiZhao() 
+	public String getStatus() 
 	{
-		return this.kuaiZhao;
+		return this.status;
 	}
-	public void setMingCheng(String mingCheng) 
+	public void setPosition(String position) 
 	{
-		this.mingCheng = mingCheng;
+		this.position = position;
 	}
 	/**
-	 * 返回 名称
+	 * 返回 存放位置
 	 * @return
 	 */
-	public String getMingCheng() 
+	public String getPosition() 
 	{
-		return this.mingCheng;
-	}
-	public void setCunLiang(String cunLiang) 
-	{
-		this.cunLiang = cunLiang;
-	}
-	/**
-	 * 返回 存量
-	 * @return
-	 */
-	public String getCunLiang() 
-	{
-		return this.cunLiang;
-	}
-	public void setBianMa(String bianMa) 
-	{
-		this.bianMa = bianMa;
-	}
-	/**
-	 * 返回 编码
-	 * @return
-	 */
-	public String getBianMa() 
-	{
-		return this.bianMa;
-	}
-	public void setDanWei(String danWei) 
-	{
-		this.danWei = danWei;
-	}
-	/**
-	 * 返回 单位
-	 * @return
-	 */
-	public String getDanWei() 
-	{
-		return this.danWei;
-	}
-	public void setGuiGe(String guiGe) 
-	{
-		this.guiGe = guiGe;
-	}
-	/**
-	 * 返回 规格
-	 * @return
-	 */
-	public String getGuiGe() 
-	{
-		return this.guiGe;
-	}
-	public void setSCChangJia(String sCChangJia) 
-	{
-		this.sCChangJia = sCChangJia;
-	}
-	/**
-	 * 返回 生产厂家
-	 * @return
-	 */
-	public String getSCChangJia() 
-	{
-		return this.sCChangJia;
-	}
-	public void setBianHao(String bianHao) 
-	{
-		this.bianHao = bianHao;
-	}
-	/**
-	 * 返回 编号
-	 * @return
-	 */
-	public String getBianHao() 
-	{
-		return this.bianHao;
-	}
-	public void setPiHao(String piHao) 
-	{
-		this.piHao = piHao;
-	}
-	/**
-	 * 返回 批号
-	 * @return
-	 */
-	public String getPiHao() 
-	{
-		return this.piHao;
-	}
-	public void setYouXiaoQi(String youXiaoQi) 
-	{
-		this.youXiaoQi = youXiaoQi;
-	}
-	/**
-	 * 返回 有效期
-	 * @return
-	 */
-	public String getYouXiaoQi() 
-	{
-		return this.youXiaoQi;
+		return this.position;
 	}
 	
 }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/reagent/persistence/entity/ReagentConsumablesItemPo.java

@@ -0,0 +1,59 @@
+package com.lc.ibps.components.reagent.persistence.entity;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.ArrayList;
+import com.lc.ibps.base.core.util.JacksonUtil;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 试剂耗材基础数据配置 实体对象
+ *
+ *<pre> 
+ * 开发公司：深圳市金源信通科技有限公司
+ * 开发人员：codegen
+ * 创建时间：2024-11-14 16:40:02
+ *</pre>
+ */
+@SuppressWarnings("serial")
+@ApiModel(value = "试剂耗材基础数据配置对象")
+public class ReagentConsumablesItemPo extends ReagentConsumablesItemTbl{
+	private boolean delBeforeSave = true;
+	public boolean isDelBeforeSave() {
+		return delBeforeSave;
+	}
+	public void setDelBeforeSave(boolean delBeforeSave) {
+		this.delBeforeSave = delBeforeSave;
+	}	
+	
+	private List<ReagentConsumablesInventoryPo> reagentConsumablesInventoryPoList = new ArrayList<ReagentConsumablesInventoryPo>();
+	public List<ReagentConsumablesInventoryPo> getReagentConsumablesInventoryPoList() {
+		return reagentConsumablesInventoryPoList;
+	}
+	public void setReagentConsumablesInventoryPoList(List<ReagentConsumablesInventoryPo> reagentConsumablesInventoryPoList) {
+		this.reagentConsumablesInventoryPoList = reagentConsumablesInventoryPoList;
+	}
+	
+	private List<ReagentConsumablesTransactionPo> reagentConsumablesTransactionPoList = new ArrayList<ReagentConsumablesTransactionPo>();
+	public List<ReagentConsumablesTransactionPo> getReagentConsumablesTransactionPoList() {
+		return reagentConsumablesTransactionPoList;
+	}
+	public void setReagentConsumablesTransactionPoList(List<ReagentConsumablesTransactionPo> reagentConsumablesTransactionPoList) {
+		this.reagentConsumablesTransactionPoList = reagentConsumablesTransactionPoList;
+	}
+
+	public static ReagentConsumablesItemPo fromJsonString(String data){
+		if(JacksonUtil.isNotJsonObject(data)){
+			return null;
+		}
+		return JacksonUtil.getDTO(data, ReagentConsumablesItemPo.class);
+	}
+	
+	public static List<ReagentConsumablesItemPo> fromJsonArrayString(String listData){
+		if(JacksonUtil.isNotJsonArray(listData)){
+			return Collections.emptyList();
+		}
+		return JacksonUtil.getDTOList(listData, ReagentConsumablesItemPo.class);
+	}
+}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/reagent/persistence/entity/ReagentConsumablesItemTbl.java

@@ -0,0 +1,345 @@
+package com.lc.ibps.components.reagent.persistence.entity;
+
+import java.util.Date;
+
+import com.lc.ibps.base.framework.persistence.entity.AbstractPo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 试剂耗材基础数据配置 表对象
+ * 
+ *<pre> 
+ * 开发公司：深圳市金源信通科技有限公司
+ * 开发人员：codegen
+ * 创建时间：2024-11-14 16:40:03
+ *</pre>
+ */
+@SuppressWarnings("serial")
+@ApiModel(value = "试剂耗材基础数据配置对象")
+public class ReagentConsumablesItemTbl extends AbstractPo<String>{
+	@ApiModelProperty(value = "主键")
+	protected String  id; 		/*主键*/
+	@ApiModelProperty(value = "租户ID")
+	protected String  tenantId; 		/*租户ID*/
+	@ApiModelProperty(value = "IP地址")
+	protected String  ip; 		/*IP地址*/
+	@ApiModelProperty(value = "是否过审")
+	protected String  shiFouGuoShen; 		/*是否过审*/
+	@ApiModelProperty(value = "地点")
+	protected String  diDian; 		/*地点*/
+	@ApiModelProperty(value = "编制人")
+	protected String  bianZhiRen; 		/*编制人*/
+	@ApiModelProperty(value = "编制部门")
+	protected String  bianZhiBuMen; 		/*编制部门*/
+	@ApiModelProperty(value = "编制时间")
+	protected String  bianZhiShiJian; 		/*编制时间*/
+	@ApiModelProperty(value = "快照")
+	protected String  kuaiZhao; 		/*快照*/
+	@ApiModelProperty(value = "试剂耗材名称")
+	protected String  mingCheng; 		/*试剂耗材名称*/
+	@ApiModelProperty(value = "批次号")
+	protected String  piCiHao; 		/*批次号*/
+	@ApiModelProperty(value = "包装规格")
+	protected String  baoZhuangGuiGe; 		/*包装规格*/
+	@ApiModelProperty(value = "最小规格")
+	protected String  zuiXiaoGuiGe; 		/*最小规格*/
+	@ApiModelProperty(value = "单位")
+	protected String  danWei; 		/*单位*/
+	@ApiModelProperty(value = "厂家")
+	protected String  changJia; 		/*厂家*/
+	@ApiModelProperty(value = "有效期")
+	protected String  youXiaoQi; 		/*有效期*/
+	@ApiModelProperty(value = "存储条件")
+	protected String  cunChuTiaoJian; 		/*存储条件*/
+	@ApiModelProperty(value = "备注")
+	protected String  beiZhu; 		/*备注*/
+	@ApiModelProperty(value = "类别")
+	protected String  leiBie; 		/*类别*/
+	@ApiModelProperty(value = "开瓶效期")
+	protected String  kaiPingXiaoQi; 		/*开瓶效期*/
+	@ApiModelProperty(value = "单价")
+	protected String  danJia; 		/*单价*/
+	@ApiModelProperty(value = "编码")
+	protected String  bianMa; 		/*编码*/
+	@ApiModelProperty(value = "产品批号")
+	protected String  chanPinPiHao; 		/*产品批号*/
+
+	public void setId(String id) 
+	{
+		this.id = id;
+	}
+	/**
+	 * 返回 主键
+	 * @return
+	 */
+	public String getId() 
+	{
+		return this.id;
+	}
+	public void setTenantId(String tenantId) 
+	{
+		this.tenantId = tenantId;
+	}
+	/**
+	 * 返回 租户ID
+	 * @return
+	 */
+	public String getTenantId() 
+	{
+		return this.tenantId;
+	}
+	public void setIp(String ip) 
+	{
+		this.ip = ip;
+	}
+	/**
+	 * 返回 IP地址
+	 * @return
+	 */
+	public String getIp() 
+	{
+		return this.ip;
+	}
+	public void setShiFouGuoShen(String shiFouGuoShen) 
+	{
+		this.shiFouGuoShen = shiFouGuoShen;
+	}
+	/**
+	 * 返回 是否过审
+	 * @return
+	 */
+	public String getShiFouGuoShen() 
+	{
+		return this.shiFouGuoShen;
+	}
+	public void setDiDian(String diDian) 
+	{
+		this.diDian = diDian;
+	}
+	/**
+	 * 返回 地点
+	 * @return
+	 */
+	public String getDiDian() 
+	{
+		return this.diDian;
+	}
+	public void setBianZhiRen(String bianZhiRen) 
+	{
+		this.bianZhiRen = bianZhiRen;
+	}
+	/**
+	 * 返回 编制人
+	 * @return
+	 */
+	public String getBianZhiRen() 
+	{
+		return this.bianZhiRen;
+	}
+	public void setBianZhiBuMen(String bianZhiBuMen) 
+	{
+		this.bianZhiBuMen = bianZhiBuMen;
+	}
+	/**
+	 * 返回 编制部门
+	 * @return
+	 */
+	public String getBianZhiBuMen() 
+	{
+		return this.bianZhiBuMen;
+	}
+	public void setBianZhiShiJian(String bianZhiShiJian) 
+	{
+		this.bianZhiShiJian = bianZhiShiJian;
+	}
+	/**
+	 * 返回 编制时间
+	 * @return
+	 */
+	public String getBianZhiShiJian() 
+	{
+		return this.bianZhiShiJian;
+	}
+	public void setKuaiZhao(String kuaiZhao) 
+	{
+		this.kuaiZhao = kuaiZhao;
+	}
+	/**
+	 * 返回 快照
+	 * @return
+	 */
+	public String getKuaiZhao() 
+	{
+		return this.kuaiZhao;
+	}
+	public void setMingCheng(String mingCheng) 
+	{
+		this.mingCheng = mingCheng;
+	}
+	/**
+	 * 返回 试剂耗材名称
+	 * @return
+	 */
+	public String getMingCheng() 
+	{
+		return this.mingCheng;
+	}
+	public void setPiCiHao(String piCiHao) 
+	{
+		this.piCiHao = piCiHao;
+	}
+	/**
+	 * 返回 批次号
+	 * @return
+	 */
+	public String getPiCiHao() 
+	{
+		return this.piCiHao;
+	}
+	public void setBaoZhuangGuiGe(String baoZhuangGuiGe) 
+	{
+		this.baoZhuangGuiGe = baoZhuangGuiGe;
+	}
+	/**
+	 * 返回 包装规格
+	 * @return
+	 */
+	public String getBaoZhuangGuiGe() 
+	{
+		return this.baoZhuangGuiGe;
+	}
+	public void setZuiXiaoGuiGe(String zuiXiaoGuiGe) 
+	{
+		this.zuiXiaoGuiGe = zuiXiaoGuiGe;
+	}
+	/**
+	 * 返回 最小规格
+	 * @return
+	 */
+	public String getZuiXiaoGuiGe() 
+	{
+		return this.zuiXiaoGuiGe;
+	}
+	public void setDanWei(String danWei) 
+	{
+		this.danWei = danWei;
+	}
+	/**
+	 * 返回 单位
+	 * @return
+	 */
+	public String getDanWei() 
+	{
+		return this.danWei;
+	}
+	public void setChangJia(String changJia) 
+	{
+		this.changJia = changJia;
+	}
+	/**
+	 * 返回 厂家
+	 * @return
+	 */
+	public String getChangJia() 
+	{
+		return this.changJia;
+	}
+	public void setYouXiaoQi(String youXiaoQi) 
+	{
+		this.youXiaoQi = youXiaoQi;
+	}
+	/**
+	 * 返回 有效期
+	 * @return
+	 */
+	public String getYouXiaoQi() 
+	{
+		return this.youXiaoQi;
+	}
+	public void setCunChuTiaoJian(String cunChuTiaoJian) 
+	{
+		this.cunChuTiaoJian = cunChuTiaoJian;
+	}
+	/**
+	 * 返回 存储条件
+	 * @return
+	 */
+	public String getCunChuTiaoJian() 
+	{
+		return this.cunChuTiaoJian;
+	}
+	public void setBeiZhu(String beiZhu) 
+	{
+		this.beiZhu = beiZhu;
+	}
+	/**
+	 * 返回 备注
+	 * @return
+	 */
+	public String getBeiZhu() 
+	{
+		return this.beiZhu;
+	}
+	public void setLeiBie(String leiBie) 
+	{
+		this.leiBie = leiBie;
+	}
+	/**
+	 * 返回 类别
+	 * @return
+	 */
+	public String getLeiBie() 
+	{
+		return this.leiBie;
+	}
+	public void setKaiPingXiaoQi(String kaiPingXiaoQi) 
+	{
+		this.kaiPingXiaoQi = kaiPingXiaoQi;
+	}
+	/**
+	 * 返回 开瓶效期
+	 * @return
+	 */
+	public String getKaiPingXiaoQi() 
+	{
+		return this.kaiPingXiaoQi;
+	}
+	public void setDanJia(String danJia) 
+	{
+		this.danJia = danJia;
+	}
+	/**
+	 * 返回 单价
+	 * @return
+	 */
+	public String getDanJia() 
+	{
+		return this.danJia;
+	}
+	public void setBianMa(String bianMa) 
+	{
+		this.bianMa = bianMa;
+	}
+	/**
+	 * 返回 编码
+	 * @return
+	 */
+	public String getBianMa() 
+	{
+		return this.bianMa;
+	}
+	public void setChanPinPiHao(String chanPinPiHao) 
+	{
+		this.chanPinPiHao = chanPinPiHao;
+	}
+	/**
+	 * 返回 产品批号
+	 * @return
+	 */
+	public String getChanPinPiHao() 
+	{
+		return this.chanPinPiHao;
+	}
+	
+}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/reagent/persistence/entity/ReagentConsumablesTransactionPo.java

@@ -7,16 +7,16 @@ import com.lc.ibps.base.core.util.JacksonUtil;
 import io.swagger.annotations.ApiModel;
 
 /**
- * 试剂耗材交易表 实体对象
+ * 试剂耗材库存台账表 实体对象
  *
  *<pre> 
  * 开发公司：深圳市金源信通科技有限公司
  * 开发人员：codegen
- * 创建时间：2024-11-13 15:50:15
+ * 创建时间：2024-11-14 16:40:16
  *</pre>
  */
 @SuppressWarnings("serial")
-@ApiModel(value = "试剂耗材交易表对象")
+@ApiModel(value = "试剂耗材库存台账表对象")
 public class ReagentConsumablesTransactionPo extends ReagentConsumablesTransactionTbl{
 
 	public static ReagentConsumablesTransactionPo fromJsonString(String data){

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/reagent/persistence/entity/ReagentConsumablesTransactionTbl.java

@@ -7,51 +7,37 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 /**
- * 试剂耗材交易表 表对象
+ * 试剂耗材库存台账表 表对象
  * 
  *<pre> 
  * 开发公司：深圳市金源信通科技有限公司
  * 开发人员：codegen
- * 创建时间：2024-11-13 15:50:15
+ * 创建时间：2024-11-14 16:40:16
  *</pre>
  */
 @SuppressWarnings("serial")
-@ApiModel(value = "试剂耗材交易表对象")
+@ApiModel(value = "试剂耗材库存台账表对象")
 public class ReagentConsumablesTransactionTbl extends AbstractPo<String>{
 	@ApiModelProperty(value = "主键")
 	protected String  id; 		/*主键*/
-	@ApiModelProperty(value = "租户ID")
-	protected String  tenantId; 		/*租户ID*/
-	@ApiModelProperty(value = "IP地址")
-	protected String  ip; 		/*IP地址*/
-	@ApiModelProperty(value = "是否过审")
-	protected String  shiFouGuoShen; 		/*是否过审*/
-	@ApiModelProperty(value = "地点")
-	protected String  diDian; 		/*地点*/
-	@ApiModelProperty(value = "编制人")
-	protected String  bianZhiRen; 		/*编制人*/
-	@ApiModelProperty(value = "编制部门")
-	protected String  bianZhiBuMen; 		/*编制部门*/
-	@ApiModelProperty(value = "编制时间")
-	protected String  bianZhiShiJian; 		/*编制时间*/
-	@ApiModelProperty(value = "快照")
-	protected String  kuaiZhao; 		/*快照*/
-	@ApiModelProperty(value = "名称")
-	protected String  mingCheng; 		/*名称*/
-	@ApiModelProperty(value = "编码")
-	protected String  bianMa; 		/*编码*/
-	@ApiModelProperty(value = "交易类型")
-	protected String  jiaoYiLeiXing; 		/*交易类型*/
+	@ApiModelProperty(value = "外键")
+	protected String  parentId; 		/*外键*/
+	@ApiModelProperty(value = "试剂编码")
+	protected String  reagentCode; 		/*试剂编码*/
 	@ApiModelProperty(value = "数量")
-	protected String  shuLiang; 		/*数量*/
-	@ApiModelProperty(value = "批号")
-	protected String  piHao; 		/*批号*/
-	@ApiModelProperty(value = "单位")
-	protected String  danWei; 		/*单位*/
-	@ApiModelProperty(value = "生产厂家")
-	protected String  sCChangJia; 		/*生产厂家*/
-	@ApiModelProperty(value = "产品批号")
-	protected String  chanPinPiHao; 		/*产品批号*/
+	protected Long  quantity; 		/*数量*/
+	@ApiModelProperty(value = "有效期至")
+	protected String  expDate; 		/*有效期至*/
+	@ApiModelProperty(value = "存放位置")
+	protected String  position; 		/*存放位置*/
+	@ApiModelProperty(value = "备注")
+	protected String  comments; 		/*备注*/
+	@ApiModelProperty(value = "状态")
+	protected String  status; 		/*状态*/
+	@ApiModelProperty(value = "操作类型")
+	protected Long  type; 		/*操作类型*/
+	@ApiModelProperty(value = "流程BO主表ID")
+	protected String  boId; 		/*流程BO主表ID*/
 
 	public void setId(String id) 
 	{
@@ -65,197 +51,113 @@ public class ReagentConsumablesTransactionTbl extends AbstractPo<String>{
 	{
 		return this.id;
 	}
-	public void setTenantId(String tenantId) 
+	public void setParentId(String parentId) 
 	{
-		this.tenantId = tenantId;
+		this.parentId = parentId;
 	}
 	/**
-	 * 返回 租户ID
+	 * 返回 外键
 	 * @return
 	 */
-	public String getTenantId() 
+	public String getParentId() 
 	{
-		return this.tenantId;
+		return this.parentId;
 	}
-	public void setIp(String ip) 
+	public void setReagentCode(String reagentCode) 
 	{
-		this.ip = ip;
+		this.reagentCode = reagentCode;
 	}
 	/**
-	 * 返回 IP地址
+	 * 返回 试剂编码
 	 * @return
 	 */
-	public String getIp() 
+	public String getReagentCode() 
 	{
-		return this.ip;
+		return this.reagentCode;
 	}
-	public void setShiFouGuoShen(String shiFouGuoShen) 
+	public void setQuantity(Long quantity) 
 	{
-		this.shiFouGuoShen = shiFouGuoShen;
+		this.quantity = quantity;
 	}
 	/**
-	 * 返回 是否过审
-	 * @return
-	 */
-	public String getShiFouGuoShen() 
-	{
-		return this.shiFouGuoShen;
-	}
-	public void setDiDian(String diDian) 
-	{
-		this.diDian = diDian;
-	}
-	/**
-	 * 返回 地点
-	 * @return
-	 */
-	public String getDiDian() 
-	{
-		return this.diDian;
-	}
-	public void setBianZhiRen(String bianZhiRen) 
-	{
-		this.bianZhiRen = bianZhiRen;
-	}
-	/**
-	 * 返回 编制人
-	 * @return
-	 */
-	public String getBianZhiRen() 
-	{
-		return this.bianZhiRen;
-	}
-	public void setBianZhiBuMen(String bianZhiBuMen) 
-	{
-		this.bianZhiBuMen = bianZhiBuMen;
-	}
-	/**
-	 * 返回 编制部门
-	 * @return
-	 */
-	public String getBianZhiBuMen() 
-	{
-		return this.bianZhiBuMen;
-	}
-	public void setBianZhiShiJian(String bianZhiShiJian) 
-	{
-		this.bianZhiShiJian = bianZhiShiJian;
-	}
-	/**
-	 * 返回 编制时间
-	 * @return
-	 */
-	public String getBianZhiShiJian() 
-	{
-		return this.bianZhiShiJian;
-	}
-	public void setKuaiZhao(String kuaiZhao) 
-	{
-		this.kuaiZhao = kuaiZhao;
-	}
-	/**
-	 * 返回 快照
-	 * @return
-	 */
-	public String getKuaiZhao() 
-	{
-		return this.kuaiZhao;
-	}
-	public void setMingCheng(String mingCheng) 
-	{
-		this.mingCheng = mingCheng;
-	}
-	/**
-	 * 返回 名称
-	 * @return
-	 */
-	public String getMingCheng() 
-	{
-		return this.mingCheng;
-	}
-	public void setBianMa(String bianMa) 
-	{
-		this.bianMa = bianMa;
-	}
-	/**
-	 * 返回 编码
+	 * 返回 数量
 	 * @return
 	 */
-	public String getBianMa() 
+	public Long getQuantity() 
 	{
-		return this.bianMa;
+		return this.quantity;
 	}
-	public void setJiaoYiLeiXing(String jiaoYiLeiXing) 
+	public void setExpDate(String expDate) 
 	{
-		this.jiaoYiLeiXing = jiaoYiLeiXing;
+		this.expDate = expDate;
 	}
 	/**
-	 * 返回 交易类型
+	 * 返回 有效期至
 	 * @return
 	 */
-	public String getJiaoYiLeiXing() 
+	public String getExpDate() 
 	{
-		return this.jiaoYiLeiXing;
+		return this.expDate;
 	}
-	public void setShuLiang(String shuLiang) 
+	public void setPosition(String position) 
 	{
-		this.shuLiang = shuLiang;
+		this.position = position;
 	}
 	/**
-	 * 返回 数量
+	 * 返回 存放位置
 	 * @return
 	 */
-	public String getShuLiang() 
+	public String getPosition() 
 	{
-		return this.shuLiang;
+		return this.position;
 	}
-	public void setPiHao(String piHao) 
+	public void setComments(String comments) 
 	{
-		this.piHao = piHao;
+		this.comments = comments;
 	}
 	/**
-	 * 返回 批号
+	 * 返回 备注
 	 * @return
 	 */
-	public String getPiHao() 
+	public String getComments() 
 	{
-		return this.piHao;
+		return this.comments;
 	}
-	public void setDanWei(String danWei) 
+	public void setStatus(String status) 
 	{
-		this.danWei = danWei;
+		this.status = status;
 	}
 	/**
-	 * 返回 单位
+	 * 返回 状态
 	 * @return
 	 */
-	public String getDanWei() 
+	public String getStatus() 
 	{
-		return this.danWei;
+		return this.status;
 	}
-	public void setSCChangJia(String sCChangJia) 
+	public void setType(Long type) 
 	{
-		this.sCChangJia = sCChangJia;
+		this.type = type;
 	}
 	/**
-	 * 返回 生产厂家
+	 * 返回 操作类型
 	 * @return
 	 */
-	public String getSCChangJia() 
+	public Long getType() 
 	{
-		return this.sCChangJia;
+		return this.type;
 	}
-	public void setChanPinPiHao(String chanPinPiHao) 
+	public void setBoId(String boId) 
 	{
-		this.chanPinPiHao = chanPinPiHao;
+		this.boId = boId;
 	}
 	/**
-	 * 返回 产品批号
+	 * 返回 流程BO主表ID
 	 * @return
 	 */
-	public String getChanPinPiHao() 
+	public String getBoId() 
 	{
-		return this.chanPinPiHao;
+		return this.boId;
 	}
 	
 }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/reagent/service/ReagentConsumablesInventoryProvider.java → ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/reagent/provider/ReagentConsumablesInventoryProvider.java

@@ -1,9 +1,13 @@
-package com.lc.ibps.components.reagent.service;
+package com.lc.ibps.components.reagent.provider;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import javax.annotation.Resource;
 
+import com.lc.ibps.components.reagent.service.InventoryService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -11,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import com.lc.ibps.api.base.constants.StateEnum;
 import com.lc.ibps.api.base.query.QueryFilter;
 import com.lc.ibps.base.core.constants.StringPool;
+import com.lc.ibps.base.core.util.BeanUtils;
 import com.lc.ibps.cloud.entity.APIPageList;
 import com.lc.ibps.cloud.entity.APIRequest;
 import com.lc.ibps.cloud.entity.APIResult;
@@ -32,7 +37,7 @@ import io.swagger.annotations.ExtensionProperty;
  * 构建组：ibps-provider-reagentConsumablesInventory
  * 开发公司：深圳市金源信通科技有限公司
  * 开发人员：codegen
- * 创建时间：2024-11-13 15:42:49
+ * 创建时间：2024-11-14 16:40:14
  *</pre>
  */
 @Api(tags = "试剂耗材库存表管理", value = "试剂耗材库存表数据")
@@ -42,7 +47,8 @@ public class ReagentConsumablesInventoryProvider extends GenericProvider impleme
 	@Resource
 	private ReagentConsumablesInventoryRepository reagentConsumablesInventoryRepository;
 
-
+	@Autowired
+	private InventoryService inventoryService;
 
 	@ApiOperation(value = "试剂耗材库存表列表(分页条件查询)数据", notes = "试剂耗材库存表列表(分页条件查询)数据")
 	@Override
@@ -120,11 +126,11 @@ public class ReagentConsumablesInventoryProvider extends GenericProvider impleme
 		return result;
 	}
 
-
 	@Override
 	public APIResult<Void> sync(String id, String action) {
-		return null;
+		APIResult<Void> result = new APIResult<>();
+		 inventoryService.sync(id,action);
+		 return result;
 	}
-
-
+	
 }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/reagent/provider/ReagentConsumablesItemProvider.java

@@ -0,0 +1,123 @@
+package com.lc.ibps.components.reagent.provider;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import com.lc.ibps.api.base.constants.StateEnum;
+import com.lc.ibps.api.base.query.QueryFilter;
+import com.lc.ibps.base.core.constants.StringPool;
+import com.lc.ibps.base.core.util.BeanUtils;
+import com.lc.ibps.cloud.entity.APIPageList;
+import com.lc.ibps.cloud.entity.APIRequest;
+import com.lc.ibps.cloud.entity.APIResult;
+import com.lc.ibps.cloud.provider.GenericProvider;
+import com.lc.ibps.components.reagent.api.IReagentConsumablesItemService;
+import com.lc.ibps.components.reagent.domain.ReagentConsumablesItem;
+import com.lc.ibps.components.reagent.persistence.entity.ReagentConsumablesItemPo;
+import com.lc.ibps.components.reagent.repository.ReagentConsumablesItemRepository;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.Extension;
+import io.swagger.annotations.ExtensionProperty;
+
+/**
+ * 试剂耗材基础数据配置 服务类
+ * <pre>
+ * 构建组：ibps-provider-reagentConsumablesItem
+ * 开发公司：深圳市金源信通科技有限公司
+ * 开发人员：codegen
+ * 创建时间：2024-11-14 16:40:07
+ *</pre>
+ */
+@Api(tags = "试剂耗材基础数据配置管理", value = "试剂耗材基础数据配置数据")
+@Service
+public class ReagentConsumablesItemProvider extends GenericProvider implements IReagentConsumablesItemService{
+
+	@Resource
+	private ReagentConsumablesItemRepository reagentConsumablesItemRepository;
+
+	@ApiOperation(value = "试剂耗材基础数据配置列表(分页条件查询)数据", notes = "试剂耗材基础数据配置列表(分页条件查询)数据")
+	@Override
+	public APIResult<APIPageList<ReagentConsumablesItemPo>> query(
+			@ApiParam(name = "request", value = "传入查询请求json字符串", required = true) 
+			@RequestBody(required = true) APIRequest request) {
+		APIResult<APIPageList<ReagentConsumablesItemPo>> result = new APIResult<>();
+		try {
+			QueryFilter queryFilter = getQueryFilter(request);
+			List<ReagentConsumablesItemPo> data = reagentConsumablesItemRepository.query(queryFilter);
+			APIPageList<ReagentConsumablesItemPo> apiPageData = getAPIPageList(data);
+			result.setData(apiPageData);
+		} catch (Exception e) {
+			// TODO ERROR => other error message
+			setExceptionResult(result, StateEnum.ERROR.getCode(), StateEnum.ERROR.getText(), e);
+		}
+		return result;
+	}
+
+	@ApiOperation(value = "根据id查询试剂耗材基础数据配置", notes = "根据id查询试剂耗材基础数据配置")
+	@Override
+	public APIResult<ReagentConsumablesItemPo> get(
+			@ApiParam(name = "id", value = "查询id", required = true) 
+			@RequestParam(name = "id", required = true) String id) {
+		APIResult<ReagentConsumablesItemPo> result = new APIResult<>();
+		try {
+			ReagentConsumablesItemPo reagentConsumablesItemPo = reagentConsumablesItemRepository.loadCascade(id);
+			result.setData(reagentConsumablesItemPo);
+		} catch (Exception e) {
+			setExceptionResult(result, StateEnum.ERROR.getCode(), StateEnum.ERROR.getText(), e);
+		}
+		return result;
+	}
+	
+	@ApiOperation(value = "保存", notes = "保存试剂耗材基础数据配置信息", 
+			extensions = {
+					@Extension(properties = {
+							@ExtensionProperty(name = "submitCtrl", value = StringPool.Y)
+					})
+			})
+	@Override
+	public APIResult<Void> save(
+			@ApiParam(name = "reagentConsumablesItemPo", value = "试剂耗材基础数据配置对象", required = true)  
+			@RequestBody(required = true) ReagentConsumablesItemPo reagentConsumablesItemPo) {
+		APIResult<Void> result = new APIResult<Void>();
+		try {
+			logger.info(" com.lc.ibps.components.provider.ReagentConsumablesItemProvider.save()--->reagentConsumablesItemPo: {}", reagentConsumablesItemPo.toString());
+			ReagentConsumablesItem domain = reagentConsumablesItemRepository.newInstance(reagentConsumablesItemPo);
+			domain.saveCascade();
+			result.setMessage("保存试剂耗材基础数据配置成功");
+		} catch (Exception e) {
+			setExceptionResult(result, StateEnum.ERROR.getCode(), StateEnum.ERROR.getText(), e);
+		}
+		return result;
+	}
+
+	@ApiOperation(value = "删除", notes = "删除试剂耗材基础数据配置", 
+			extensions = {
+					@Extension(properties = {
+							@ExtensionProperty(name = "submitCtrl", value = StringPool.Y)
+					})
+			})
+	@Override
+	public APIResult<Void> remove(
+			@ApiParam(name = "ids", value = "试剂耗材基础数据配置ID数组", required = true)  
+			@RequestParam(name = "ids", required = true) String[] ids) {
+		APIResult<Void> result = new APIResult<Void>();
+		try {
+			ReagentConsumablesItem domain = reagentConsumablesItemRepository.newInstance();
+			domain.deleteByIdsCascade(ids);
+			result.setMessage("删除试剂耗材基础数据配置成功");
+		} catch (Exception e) {
+			setExceptionResult(result, StateEnum.ERROR.getCode(), StateEnum.ERROR.getText(), e);
+		}
+		return result;
+	}
+	
+}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/reagent/service/ReagentConsumablesTransactionProvider.java → ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/reagent/provider/ReagentConsumablesTransactionProvider.java

@@ -1,5 +1,6 @@
-package com.lc.ibps.components.reagent.service;
+package com.lc.ibps.components.reagent.provider;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import javax.annotation.Resource;
@@ -11,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import com.lc.ibps.api.base.constants.StateEnum;
 import com.lc.ibps.api.base.query.QueryFilter;
 import com.lc.ibps.base.core.constants.StringPool;
+import com.lc.ibps.base.core.util.BeanUtils;
 import com.lc.ibps.cloud.entity.APIPageList;
 import com.lc.ibps.cloud.entity.APIRequest;
 import com.lc.ibps.cloud.entity.APIResult;
@@ -27,22 +29,22 @@ import io.swagger.annotations.Extension;
 import io.swagger.annotations.ExtensionProperty;
 
 /**
- * 试剂耗材交易表 服务类
+ * 试剂耗材库存台账表 服务类
  * <pre>
  * 构建组：ibps-provider-reagentConsumablesTransaction
  * 开发公司：深圳市金源信通科技有限公司
  * 开发人员：codegen
- * 创建时间：2024-11-13 15:50:18
+ * 创建时间：2024-11-14 16:40:20
  *</pre>
  */
-@Api(tags = "试剂耗材交易表管理", value = "试剂耗材交易表数据")
+@Api(tags = "试剂耗材库存台账表管理", value = "试剂耗材库存台账表数据")
 @Service
 public class ReagentConsumablesTransactionProvider extends GenericProvider implements IReagentConsumablesTransactionService{
 
 	@Resource
 	private ReagentConsumablesTransactionRepository reagentConsumablesTransactionRepository;
 
-	@ApiOperation(value = "试剂耗材交易表列表(分页条件查询)数据", notes = "试剂耗材交易表列表(分页条件查询)数据")
+	@ApiOperation(value = "试剂耗材库存台账表列表(分页条件查询)数据", notes = "试剂耗材库存台账表列表(分页条件查询)数据")
 	@Override
 	public APIResult<APIPageList<ReagentConsumablesTransactionPo>> query(
 			@ApiParam(name = "request", value = "传入查询请求json字符串", required = true) 
@@ -60,7 +62,7 @@ public class ReagentConsumablesTransactionProvider extends GenericProvider imple
 		return result;
 	}
 
-	@ApiOperation(value = "根据id查询试剂耗材交易表", notes = "根据id查询试剂耗材交易表")
+	@ApiOperation(value = "根据id查询试剂耗材库存台账表", notes = "根据id查询试剂耗材库存台账表")
 	@Override
 	public APIResult<ReagentConsumablesTransactionPo> get(
 			@ApiParam(name = "id", value = "查询id", required = true) 
@@ -75,7 +77,7 @@ public class ReagentConsumablesTransactionProvider extends GenericProvider imple
 		return result;
 	}
 	
-	@ApiOperation(value = "保存", notes = "保存试剂耗材交易表信息", 
+	@ApiOperation(value = "保存", notes = "保存试剂耗材库存台账表信息", 
 			extensions = {
 					@Extension(properties = {
 							@ExtensionProperty(name = "submitCtrl", value = StringPool.Y)
@@ -83,21 +85,21 @@ public class ReagentConsumablesTransactionProvider extends GenericProvider imple
 			})
 	@Override
 	public APIResult<Void> save(
-			@ApiParam(name = "reagentConsumablesTransactionPo", value = "试剂耗材交易表对象", required = true)  
+			@ApiParam(name = "reagentConsumablesTransactionPo", value = "试剂耗材库存台账表对象", required = true)  
 			@RequestBody(required = true) ReagentConsumablesTransactionPo reagentConsumablesTransactionPo) {
 		APIResult<Void> result = new APIResult<Void>();
 		try {
 			logger.info(" com.lc.ibps.components.provider.ReagentConsumablesTransactionProvider.save()--->reagentConsumablesTransactionPo: {}", reagentConsumablesTransactionPo.toString());
 			ReagentConsumablesTransaction domain = reagentConsumablesTransactionRepository.newInstance(reagentConsumablesTransactionPo);
 			domain.save();
-			result.setMessage("保存试剂耗材交易表成功");
+			result.setMessage("保存试剂耗材库存台账表成功");
 		} catch (Exception e) {
 			setExceptionResult(result, StateEnum.ERROR.getCode(), StateEnum.ERROR.getText(), e);
 		}
 		return result;
 	}
 
-	@ApiOperation(value = "删除", notes = "删除试剂耗材交易表", 
+	@ApiOperation(value = "删除", notes = "删除试剂耗材库存台账表", 
 			extensions = {
 					@Extension(properties = {
 							@ExtensionProperty(name = "submitCtrl", value = StringPool.Y)
@@ -105,13 +107,13 @@ public class ReagentConsumablesTransactionProvider extends GenericProvider imple
 			})
 	@Override
 	public APIResult<Void> remove(
-			@ApiParam(name = "ids", value = "试剂耗材交易表ID数组", required = true)  
+			@ApiParam(name = "ids", value = "试剂耗材库存台账表ID数组", required = true)  
 			@RequestParam(name = "ids", required = true) String[] ids) {
 		APIResult<Void> result = new APIResult<Void>();
 		try {
 			ReagentConsumablesTransaction domain = reagentConsumablesTransactionRepository.newInstance();
 			domain.deleteByIds(ids);
-			result.setMessage("删除试剂耗材交易表成功");
+			result.setMessage("删除试剂耗材库存台账表成功");
 		} catch (Exception e) {
 			setExceptionResult(result, StateEnum.ERROR.getCode(), StateEnum.ERROR.getText(), e);
 		}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/reagent/repository/ReagentConsumablesInventoryRepository.java

@@ -1,5 +1,6 @@
 package com.lc.ibps.components.reagent.repository;
 
+import java.util.List;
 import com.lc.ibps.base.framework.repository.IRepository;
 import com.lc.ibps.components.reagent.domain.ReagentConsumablesInventory;
 import com.lc.ibps.components.reagent.persistence.entity.ReagentConsumablesInventoryPo;
@@ -10,9 +11,16 @@ import com.lc.ibps.components.reagent.persistence.entity.ReagentConsumablesInven
  *<pre> 
  * 开发公司：深圳市金源信通科技有限公司
  * 开发人员：codegen
- * 创建时间：2024-11-13 15:42:47
+ * 创建时间：2024-11-14 16:40:12
  *</pre>
  */
 public interface ReagentConsumablesInventoryRepository extends IRepository<String, ReagentConsumablesInventoryPo,ReagentConsumablesInventory>{
+	 /**
+	 * 根据主表ID查询 试剂耗材库存表 列表
+	 * @param mainId
+	 * @return 
+	 * List<ReagentConsumablesInventoryPo>
+	 */
+	public List<ReagentConsumablesInventoryPo> findByMainId(String mainId);
 
 }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/reagent/repository/ReagentConsumablesItemRepository.java

@@ -0,0 +1,23 @@
+package com.lc.ibps.components.reagent.repository;
+
+import com.lc.ibps.base.framework.repository.IRepository;
+import com.lc.ibps.components.reagent.domain.ReagentConsumablesItem;
+import com.lc.ibps.components.reagent.persistence.entity.ReagentConsumablesItemPo;
+
+/**
+ * 试剂耗材基础数据配置 仓库接口
+ *
+ *<pre> 
+ * 开发公司：深圳市金源信通科技有限公司
+ * 开发人员：codegen
+ * 创建时间：2024-11-14 16:40:05
+ *</pre>
+ */
+public interface ReagentConsumablesItemRepository extends IRepository<String, ReagentConsumablesItemPo,ReagentConsumablesItem>{
+
+	/**
+	 * 查询全部子表的数据，并设置到主表Po中 
+	 * void
+	 */
+	public ReagentConsumablesItemPo loadCascade(String id);
+}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/reagent/repository/ReagentConsumablesTransactionRepository.java

@@ -1,18 +1,26 @@
 package com.lc.ibps.components.reagent.repository;
 
+import java.util.List;
 import com.lc.ibps.base.framework.repository.IRepository;
 import com.lc.ibps.components.reagent.domain.ReagentConsumablesTransaction;
 import com.lc.ibps.components.reagent.persistence.entity.ReagentConsumablesTransactionPo;
 
 /**
- * 试剂耗材交易表 仓库接口
+ * 试剂耗材库存台账表 仓库接口
  *
  *<pre> 
  * 开发公司：深圳市金源信通科技有限公司
  * 开发人员：codegen
- * 创建时间：2024-11-13 15:50:17
+ * 创建时间：2024-11-14 16:40:18
  *</pre>
  */
 public interface ReagentConsumablesTransactionRepository extends IRepository<String, ReagentConsumablesTransactionPo,ReagentConsumablesTransaction>{
+	 /**
+	 * 根据主表ID查询 试剂耗材库存台账表 列表
+	 * @param mainId
+	 * @return 
+	 * List<ReagentConsumablesTransactionPo>
+	 */
+	public List<ReagentConsumablesTransactionPo> findByMainId(String mainId);
 
 }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/reagent/repository/impl/ReagentConsumablesInventoryRepositoryImpl.java

@@ -1,5 +1,6 @@
 package com.lc.ibps.components.reagent.repository.impl;
 
+import java.util.List;
 
 import javax.annotation.Resource;
 
@@ -19,7 +20,7 @@ import com.lc.ibps.components.reagent.persistence.entity.ReagentConsumablesInven
  *<pre> 
  * 开发公司：深圳市金源信通科技有限公司
  * 开发人员：codegen
- * 创建时间：2024-11-13 15:42:47
+ * 创建时间：2024-11-14 16:40:12
  *</pre>
  */
 @Repository
@@ -51,6 +52,12 @@ public class ReagentConsumablesInventoryRepositoryImpl extends AbstractRepositor
 		return "reagentConsumablesInventory";
 	}
 	
+	@Override
+	public List<ReagentConsumablesInventoryPo> findByMainId(String mainId) {
+		List<ReagentConsumablesInventoryPo> list = findByKey("findByMainId", "findIdsByMainId",
+				b().a("mainId", mainId).p());
+		return list;
+	}
 
 	
 }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/reagent/repository/impl/ReagentConsumablesItemRepositoryImpl.java

@@ -0,0 +1,87 @@
+package com.lc.ibps.components.reagent.repository.impl;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Repository;
+
+import com.lc.ibps.base.core.util.string.StringUtil;
+import com.lc.ibps.base.core.util.BeanUtils;
+import com.lc.ibps.base.core.util.AppUtil;
+import com.lc.ibps.base.framework.persistence.dao.IQueryDao;
+import com.lc.ibps.base.framework.repository.AbstractRepository;
+import com.lc.ibps.components.reagent.domain.ReagentConsumablesItem;
+import com.lc.ibps.components.reagent.repository.ReagentConsumablesItemRepository;
+import com.lc.ibps.components.reagent.persistence.dao.ReagentConsumablesItemQueryDao;
+import com.lc.ibps.components.reagent.persistence.entity.ReagentConsumablesItemPo;
+import com.lc.ibps.components.reagent.repository.ReagentConsumablesInventoryRepository;
+import com.lc.ibps.components.reagent.persistence.entity.ReagentConsumablesInventoryPo;
+import com.lc.ibps.components.reagent.repository.ReagentConsumablesTransactionRepository;
+import com.lc.ibps.components.reagent.persistence.entity.ReagentConsumablesTransactionPo;
+
+/**
+ * 试剂耗材基础数据配置 仓库的实现类
+ *
+ *<pre> 
+ * 开发公司：深圳市金源信通科技有限公司
+ * 开发人员：codegen
+ * 创建时间：2024-11-14 16:40:04
+ *</pre>
+ */
+@Repository
+public class ReagentConsumablesItemRepositoryImpl extends AbstractRepository<String, ReagentConsumablesItemPo,ReagentConsumablesItem> implements ReagentConsumablesItemRepository{
+	  
+	@Resource
+	private  ReagentConsumablesItemQueryDao reagentConsumablesItemQueryDao;
+	@Resource
+	private  ReagentConsumablesInventoryRepository reagentConsumablesInventoryRepository;
+	@Resource
+	private  ReagentConsumablesTransactionRepository reagentConsumablesTransactionRepository;
+
+	public ReagentConsumablesItem newInstance() {
+		ReagentConsumablesItemPo po = new ReagentConsumablesItemPo();
+		ReagentConsumablesItem reagentConsumablesItem = AppUtil.getBean(ReagentConsumablesItem.class);
+		reagentConsumablesItem.setData(po);
+		return reagentConsumablesItem;
+	}
+
+	public ReagentConsumablesItem newInstance(ReagentConsumablesItemPo po) {
+		ReagentConsumablesItem reagentConsumablesItem = AppUtil.getBean(ReagentConsumablesItem.class);
+		reagentConsumablesItem.setData(po);
+		return reagentConsumablesItem;
+	} 
+	
+	@Override
+	protected IQueryDao<String, ReagentConsumablesItemPo> getQueryDao() {
+		return reagentConsumablesItemQueryDao;
+	}
+	
+	@Override
+	public String getInternalCacheName() {
+		return "reagentConsumablesItem";
+	}
+	
+
+	/**
+	 * 查询全部子表的数据，并设置到主表Po中 
+	 * void
+	 */
+	@Override
+	public ReagentConsumablesItemPo loadCascade(String id){
+		ReagentConsumablesItemPo reagentConsumablesItemPo = null;
+		if(StringUtil.isNotEmpty(id)){
+			reagentConsumablesItemPo = get(id);
+			if(BeanUtils.isNotEmpty(reagentConsumablesItemPo) && BeanUtils.isNotEmpty(reagentConsumablesItemPo.getBianMa())){
+				List<ReagentConsumablesInventoryPo> reagentConsumablesInventoryPoList = reagentConsumablesInventoryRepository.findByMainId(reagentConsumablesItemPo.getBianMa());
+				reagentConsumablesItemPo.setReagentConsumablesInventoryPoList(reagentConsumablesInventoryPoList);
+			}
+			if(BeanUtils.isNotEmpty(reagentConsumablesItemPo) && BeanUtils.isNotEmpty(reagentConsumablesItemPo.getBianMa())){
+				List<ReagentConsumablesTransactionPo> reagentConsumablesTransactionPoList = reagentConsumablesTransactionRepository.findByMainId(reagentConsumablesItemPo.getBianMa());
+				reagentConsumablesItemPo.setReagentConsumablesTransactionPoList(reagentConsumablesTransactionPoList);
+			}
+		}
+		return reagentConsumablesItemPo;
+	}
+	
+}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/reagent/repository/impl/ReagentConsumablesTransactionRepositoryImpl.java

@@ -1,5 +1,6 @@
 package com.lc.ibps.components.reagent.repository.impl;
 
+import java.util.List;
 
 import javax.annotation.Resource;
 
@@ -14,12 +15,12 @@ import com.lc.ibps.components.reagent.persistence.dao.ReagentConsumablesTransact
 import com.lc.ibps.components.reagent.persistence.entity.ReagentConsumablesTransactionPo;
 
 /**
- * 试剂耗材交易表 仓库的实现类
+ * 试剂耗材库存台账表 仓库的实现类
  *
  *<pre> 
  * 开发公司：深圳市金源信通科技有限公司
  * 开发人员：codegen
- * 创建时间：2024-11-13 15:50:16
+ * 创建时间：2024-11-14 16:40:18
  *</pre>
  */
 @Repository
@@ -51,6 +52,12 @@ public class ReagentConsumablesTransactionRepositoryImpl extends AbstractReposit
 		return "reagentConsumablesTransaction";
 	}
 	
+	@Override
+	public List<ReagentConsumablesTransactionPo> findByMainId(String mainId) {
+		List<ReagentConsumablesTransactionPo> list = findByKey("findByMainId", "findIdsByMainId",
+				b().a("mainId", mainId).p());
+		return list;
+	}
 
 	
 }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/reagent/service/BaoFeiService.java

@@ -0,0 +1,7 @@
+package com.lc.ibps.components.reagent.service;
+
+import org.springframework.stereotype.Service;
+
+@Service
+public class BaoFeiService {
+}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/reagent/service/InventoryService.java

@@ -0,0 +1,95 @@
+package com.lc.ibps.components.reagent.service;
+
+import com.lc.ibps.api.base.query.QueryFilter;
+import com.lc.ibps.base.core.util.string.StringUtil;
+import com.lc.ibps.base.db.model.DefaultQueryFilter;
+import com.lc.ibps.base.framework.table.ICommonDao;
+import com.lc.ibps.cloud.entity.APIResult;
+import com.lc.ibps.components.reagent.domain.ReagentConsumablesInventory;
+import com.lc.ibps.components.reagent.domain.ReagentConsumablesTransaction;
+import com.lc.ibps.components.reagent.dto.InventoryDTO;
+import com.lc.ibps.components.reagent.persistence.entity.ReagentConsumablesInventoryPo;
+import com.lc.ibps.components.reagent.repository.ReagentConsumablesInventoryRepository;
+import com.lc.ibps.components.reagent.repository.ReagentConsumablesItemRepository;
+import com.lc.ibps.components.reagent.repository.ReagentConsumablesTransactionRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class InventoryService {
+
+    @Resource
+    private ReagentConsumablesItemRepository reagentConsumablesItemRepository;
+
+    @Resource
+    private ReagentConsumablesInventoryRepository reagentConsumablesInventoryRepository;
+    @Resource
+    private ReagentConsumablesTransactionRepository reagentConsumablesTransactionRepository;
+    @Resource
+    private ICommonDao commonDao;
+
+    @Autowired
+    private StoreService storeService;
+
+    @Autowired
+    private LinYongService linYongService;
+
+    public boolean sync(String id, String action) {
+        OperationService service = getService(action);
+        if(service == null) throw new IllegalArgumentException();
+        for (InventoryDTO item : service.getItems(id)) {
+            ReagentConsumablesInventoryPo inventory = item.getInventory();
+            if(StringUtil.isNotBlank(inventory.getId())){
+                //出库操作，根据库存id计算数量
+                ReagentConsumablesInventoryPo inventoryPo = reagentConsumablesInventoryRepository.get(inventory.getId());
+                inventory.setReagentCode(inventoryPo.getReagentCode());
+                inventory.setExpDate(inventoryPo.getExpDate());
+                item.getTransaction().setReagentCode(inventoryPo.getReagentCode());
+                item.getTransaction().setExpDate(inventoryPo.getExpDate());
+                calcQuantity(inventory, inventoryPo.getQuantity(),service.getPolicy());
+            }else{
+                //入库，根据试剂id+过期时间判断是否在库
+                List<ReagentConsumablesInventoryPo> query = reagentConsumablesInventoryRepository.findByMainId(inventory.getReagentCode());
+                for (ReagentConsumablesInventoryPo inventoryPo: query) {
+                    if(inventoryPo.getExpDate().equalsIgnoreCase(inventory.getExpDate())){
+                        inventory.setId(inventoryPo.getId());
+                        calcQuantity(inventory, inventoryPo.getQuantity(),service.getPolicy());
+                        break;
+                    }
+                }
+            }
+            ReagentConsumablesInventory domain = reagentConsumablesInventoryRepository.newInstance(inventory);
+            domain.save();
+
+            ReagentConsumablesTransaction transaction = reagentConsumablesTransactionRepository.newInstance();
+            transaction.setData(item.getTransaction());
+            transaction.save();
+
+        }
+        service.updateStatus(id);
+        return true;
+    }
+
+    private static void calcQuantity( ReagentConsumablesInventoryPo inventory, Long inventoryQuantity,OperationService.Policy policy) {
+        switch (policy) {
+            case plus:
+                inventory.setQuantity(inventory.getQuantity() + inventoryQuantity);
+                break;
+            case minus:
+                inventory.setQuantity(inventoryQuantity - inventory.getQuantity());
+                break;
+        }
+    }
+
+    private OperationService getService(String action){
+        if("in".equalsIgnoreCase(action)){
+            return storeService;
+        }else if("out".equalsIgnoreCase(action)){
+            return linYongService;
+        }
+        return null;
+    }
+}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/reagent/service/LinYongService.java

@@ -0,0 +1,32 @@
+package com.lc.ibps.components.reagent.service;
+
+import com.lc.ibps.base.framework.table.ICommonDao;
+import com.lc.ibps.components.reagent.dto.InventoryDTO;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class LinYongService implements OperationService{
+    @Resource
+    private ICommonDao commonDao;
+    @Override
+    public List<InventoryDTO> getItems(String id) {
+        List<Map<String,Object>> query = (List<Map<String,Object>>)commonDao.query(
+                "SELECT c.shi_ling_shu_lian quantity,c.id_ boId,-1 AS type_ ,p.bian_zhi_ren_ createBy,p.bian_zhi_shi_jian createTime,p.bian_zhi_bu_men_ ,c.inventory_id inventoryId " +
+                        " FROM t_sjhcly p, t_sjhclyzb c WHERE p.id_=c.parent_id_ AND p.shi_fou_guo_shen_='已完成' and p.id_=#{p0}", new String[]{id});
+        return InventoryDTO.build(query);
+    }
+
+    @Override
+    public void updateStatus(String id) {
+        commonDao.execute("update t_sjhcly set shi_fou_guo_shen_='已结束' where id_=#{p0}",new String[]{id});
+    }
+
+    @Override
+    public Policy getPolicy() {
+        return Policy.minus;
+    }
+}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/reagent/service/OperationService.java

@@ -0,0 +1,19 @@
+package com.lc.ibps.components.reagent.service;
+
+import com.lc.ibps.components.reagent.dto.InventoryDTO;
+
+import java.util.List;
+
+public interface OperationService {
+
+    enum Policy{
+        plus,minus
+    };
+
+    List<InventoryDTO> getItems(String id);
+
+    void updateStatus(String id);
+
+    Policy getPolicy();
+
+}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/reagent/service/ReturnService.java

@@ -0,0 +1,7 @@
+package com.lc.ibps.components.reagent.service;
+
+import org.springframework.stereotype.Service;
+
+@Service
+public class ReturnService {
+}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/reagent/service/StoreService.java

@@ -0,0 +1,39 @@
+package com.lc.ibps.components.reagent.service;
+
+import com.lc.ibps.base.framework.table.ICommonDao;
+import com.lc.ibps.components.reagent.dto.InventoryDTO;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class StoreService implements OperationService {
+
+    @Resource
+    private ICommonDao commonDao;
+
+    public List<InventoryDTO> getItems(String id){
+        List<Map<String,Object>> query = (List<Map<String,Object>>)commonDao.query(
+                "SELECT c.xiao_qi_ expDate,c.bian_ma_ reagentCode,c.shu_liang_ quantity,c.id_ boId,1 as type_," +
+                " p.bian_zhi_ren_ createBy,p.bian_zhi_shi_jian createTime,p.bian_zhi_bu_men_  " +
+                " FROM t_sjhxhclrkysdjb p, t_sjhxhclrkysdjbzb c " +
+                " WHERE p.id_=c.parent_id_ AND p.shi_fou_guo_shen_='已完成' AND c.yan_shou_jie_guo_='合格' and p.id_=#{p0}", new String[]{id});
+        return InventoryDTO.build(query);
+    }
+    public void updateStatus(String id){
+        commonDao.execute("update t_sjhxhclrkysdjb set shi_fou_guo_shen_='已结束' where id_=#{p0}",new String[]{id});
+    }
+
+    @Override
+    public Policy getPolicy() {
+        return Policy.plus;
+    }
+
+
+    public List<String> findRecordByStatus(String status){
+        return null;
+
+    }
+}

ibps-provider-root/modules/provider-business/src/main/resources/com/lc/ibps/reagent/persistence/mapping/ReagentConsumablesInventory.map.xml

@@ -4,49 +4,41 @@
 	<!--<cache type="net.oschina.j2cache.mybatis.J2CacheAdapter"/>-->
 	<resultMap id="ReagentConsumablesInventoryPo" type="com.lc.ibps.components.reagent.persistence.entity.ReagentConsumablesInventoryPo">
 		<id property="id" column="ID_" jdbcType="VARCHAR"/>
-		<result property="tenantId" column="TENANT_ID_" jdbcType="VARCHAR"/>
-		<result property="ip" column="IP_" jdbcType="VARCHAR"/>
+		<result property="reagentCode" column="REAGENT_CODE" jdbcType="VARCHAR"/>
 		<result property="createBy" column="CREATE_BY_" jdbcType="VARCHAR"/>
 		<result property="createTime" column="CREATE_TIME_" jdbcType="TIMESTAMP"/>
 		<result property="updateBy" column="UPDATE_BY_" jdbcType="VARCHAR"/>
 		<result property="updateTime" column="UPDATE_TIME_" jdbcType="TIMESTAMP"/>
-		<result property="shiFouGuoShen" column="SHI_FOU_GUO_SHEN_" jdbcType="VARCHAR"/>
-		<result property="diDian" column="DI_DIAN_" jdbcType="VARCHAR"/>
-		<result property="bianZhiRen" column="BIAN_ZHI_REN_" jdbcType="VARCHAR"/>
-		<result property="bianZhiBuMen" column="BIAN_ZHI_BU_MEN_" jdbcType="VARCHAR"/>
-		<result property="bianZhiShiJian" column="BIAN_ZHI_SHI_JIAN" jdbcType="VARCHAR"/>
-		<result property="kuaiZhao" column="KUAI_ZHAO_" jdbcType="VARCHAR"/>
-		<result property="mingCheng" column="MING_CHENG_" jdbcType="VARCHAR"/>
-		<result property="cunLiang" column="CUN_LIANG_" jdbcType="VARCHAR"/>
-		<result property="bianMa" column="BIAN_MA_" jdbcType="VARCHAR"/>
-		<result property="danWei" column="DAN_WEI_" jdbcType="VARCHAR"/>
-		<result property="guiGe" column="GUI_GE_" jdbcType="VARCHAR"/>
-		<result property="sCChangJia" column="S_C_CHANG_JIA_" jdbcType="VARCHAR"/>
-		<result property="bianHao" column="BIAN_HAO_" jdbcType="VARCHAR"/>
-		<result property="piHao" column="PI_HAO_" jdbcType="VARCHAR"/>
-		<result property="youXiaoQi" column="YOU_XIAO_QI_" jdbcType="VARCHAR"/>
+		<result property="freeze" column="FREEZE" jdbcType="VARCHAR"/>
+		<result property="quantity" column="QUANTITY" jdbcType="NUMERIC"/>
+		<result property="expDate" column="EXP_DATE" jdbcType="VARCHAR"/>
+		<result property="comments" column="COMMENTS" jdbcType="BLOB"/>
+		<result property="checker" column="CHECKER" jdbcType="VARCHAR"/>
+		<result property="checkedDate" column="CHECKED_DATE" jdbcType="VARCHAR"/>
+		<result property="status" column="STATUS_" jdbcType="VARCHAR"/>
+		<result property="position" column="POSITION" jdbcType="VARCHAR"/>
 	</resultMap>
 	
 	<sql id="columns">
-		ID_,TENANT_ID_,IP_,CREATE_BY_,CREATE_TIME_,UPDATE_BY_,UPDATE_TIME_,SHI_FOU_GUO_SHEN_,DI_DIAN_,BIAN_ZHI_REN_,BIAN_ZHI_BU_MEN_,BIAN_ZHI_SHI_JIAN,KUAI_ZHAO_,MING_CHENG_,CUN_LIANG_,BIAN_MA_,DAN_WEI_,GUI_GE_,S_C_CHANG_JIA_,BIAN_HAO_,PI_HAO_,YOU_XIAO_QI_
+		ID_,REAGENT_CODE,CREATE_BY_,CREATE_TIME_,UPDATE_BY_,UPDATE_TIME_,FREEZE,QUANTITY,EXP_DATE,COMMENTS,CHECKER,CHECKED_DATE,STATUS_,POSITION
 	</sql>
 	
 	<insert id="create" parameterType="com.lc.ibps.components.reagent.persistence.entity.ReagentConsumablesInventoryPo">
-		INSERT INTO T_SJHCKCB
+		INSERT INTO T_REAGENT_INVENTORY
 		(<include refid="columns"/>)
 		VALUES 
-		(#{id,jdbcType=VARCHAR}, #{tenantId,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{shiFouGuoShen,jdbcType=VARCHAR}, #{diDian,jdbcType=VARCHAR}, #{bianZhiRen,jdbcType=VARCHAR}, #{bianZhiBuMen,jdbcType=VARCHAR}, #{bianZhiShiJian,jdbcType=VARCHAR}, #{kuaiZhao,jdbcType=VARCHAR}, #{mingCheng,jdbcType=VARCHAR}, #{cunLiang,jdbcType=VARCHAR}, #{bianMa,jdbcType=VARCHAR}, #{danWei,jdbcType=VARCHAR}, #{guiGe,jdbcType=VARCHAR}, #{sCChangJia,jdbcType=VARCHAR}, #{bianHao,jdbcType=VARCHAR}, #{piHao,jdbcType=VARCHAR}, #{youXiaoQi,jdbcType=VARCHAR})
+		(#{id,jdbcType=VARCHAR}, #{reagentCode,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{freeze,jdbcType=VARCHAR}, #{quantity,jdbcType=NUMERIC}, #{expDate,jdbcType=VARCHAR}, #{comments,jdbcType=BLOB}, #{checker,jdbcType=VARCHAR}, #{checkedDate,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{position,jdbcType=VARCHAR})
 	</insert>
 	
 	<select id="get" parameterType="java.lang.String" resultMap="ReagentConsumablesInventoryPo">
-		SELECT <include refid="columns"/> FROM T_SJHCKCB 
+		SELECT <include refid="columns"/> FROM T_REAGENT_INVENTORY 
 		WHERE 
 		ID_=#{id}
 	</select>
 	
 	
 	<sql id="querySql" >
-		SELECT <include refid="columns"/> FROM T_SJHCKCB
+		SELECT <include refid="columns"/> FROM T_REAGENT_INVENTORY
 		<where>
 			<if test="@o.Ognl@isNotEmpty(whereSql)">
 				${whereSql}
@@ -69,7 +61,7 @@
 	</select>
 	
 	<select id="findByIds" resultMap="ReagentConsumablesInventoryPo">
-		SELECT <include refid="columns"/> FROM T_SJHCKCB
+		SELECT <include refid="columns"/> FROM T_REAGENT_INVENTORY
 			WHERE ID_ in 
 			<foreach item="id" index="index" collection="ids" open="(" separator="," close=")">  
 				#{id}  
@@ -78,35 +70,44 @@
 	</select>	
 	
 	<update id="update" parameterType="com.lc.ibps.components.reagent.persistence.entity.ReagentConsumablesInventoryPo">
-		UPDATE T_SJHCKCB SET
-		TENANT_ID_=#{tenantId,jdbcType=VARCHAR},
-		IP_=#{ip,jdbcType=VARCHAR},
+		UPDATE T_REAGENT_INVENTORY SET
+		REAGENT_CODE=#{reagentCode,jdbcType=VARCHAR},
 		UPDATE_BY_=#{updateBy,jdbcType=VARCHAR},
 		UPDATE_TIME_=#{updateTime,jdbcType=TIMESTAMP},
-		SHI_FOU_GUO_SHEN_=#{shiFouGuoShen,jdbcType=VARCHAR},
-		DI_DIAN_=#{diDian,jdbcType=VARCHAR},
-		BIAN_ZHI_REN_=#{bianZhiRen,jdbcType=VARCHAR},
-		BIAN_ZHI_BU_MEN_=#{bianZhiBuMen,jdbcType=VARCHAR},
-		BIAN_ZHI_SHI_JIAN=#{bianZhiShiJian,jdbcType=VARCHAR},
-		KUAI_ZHAO_=#{kuaiZhao,jdbcType=VARCHAR},
-		MING_CHENG_=#{mingCheng,jdbcType=VARCHAR},
-		CUN_LIANG_=#{cunLiang,jdbcType=VARCHAR},
-		BIAN_MA_=#{bianMa,jdbcType=VARCHAR},
-		DAN_WEI_=#{danWei,jdbcType=VARCHAR},
-		GUI_GE_=#{guiGe,jdbcType=VARCHAR},
-		S_C_CHANG_JIA_=#{sCChangJia,jdbcType=VARCHAR},
-		BIAN_HAO_=#{bianHao,jdbcType=VARCHAR},
-		PI_HAO_=#{piHao,jdbcType=VARCHAR},
-		YOU_XIAO_QI_=#{youXiaoQi,jdbcType=VARCHAR}
+		FREEZE=#{freeze,jdbcType=VARCHAR},
+		QUANTITY=#{quantity,jdbcType=NUMERIC},
+		EXP_DATE=#{expDate,jdbcType=VARCHAR},
+		COMMENTS=#{comments,jdbcType=BLOB},
+		CHECKER=#{checker,jdbcType=VARCHAR},
+		CHECKED_DATE=#{checkedDate,jdbcType=VARCHAR},
+		STATUS_=#{status,jdbcType=VARCHAR},
+		POSITION=#{position,jdbcType=VARCHAR}
 		WHERE
 		ID_=#{id}
 	</update>
 	
 	<delete id="remove" parameterType="java.lang.String">
-		DELETE FROM T_SJHCKCB 
+		DELETE FROM T_REAGENT_INVENTORY 
 		WHERE
 		ID_=#{id}
 	</delete>
 	
+	<delete id="deleteByMainId">
+	    DELETE FROM T_REAGENT_INVENTORY
+	    WHERE
+	    REAGENT_CODE=#{mainId}
+	</delete>    
+	
+	<select id="findByMainId" resultMap="ReagentConsumablesInventoryPo">
+	    SELECT <include refid="columns"/>
+	    FROM T_REAGENT_INVENTORY 
+	    WHERE REAGENT_CODE=#{mainId}
+	</select>
+	
+	<select id="findIdsByMainId" parameterType="java.util.Map" resultMap="ReagentConsumablesInventoryPo">
+		SELECT ID_ FROM T_REAGENT_INVENTORY
+	    WHERE
+	    REAGENT_CODE=#{mainId}
+	</select>
 	
 </mapper>

ibps-provider-root/modules/provider-business/src/main/resources/com/lc/ibps/reagent/persistence/mapping/ReagentConsumablesItem.map.xml

@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lc.ibps.components.reagent.persistence.entity.ReagentConsumablesItemPo">
+	<!--<cache type="net.oschina.j2cache.mybatis.J2CacheAdapter"/>-->
+	<resultMap id="ReagentConsumablesItemPo" type="com.lc.ibps.components.reagent.persistence.entity.ReagentConsumablesItemPo">
+		<id property="id" column="ID_" jdbcType="VARCHAR"/>
+		<result property="tenantId" column="TENANT_ID_" jdbcType="VARCHAR"/>
+		<result property="ip" column="IP_" jdbcType="VARCHAR"/>
+		<result property="createBy" column="CREATE_BY_" jdbcType="VARCHAR"/>
+		<result property="createTime" column="CREATE_TIME_" jdbcType="TIMESTAMP"/>
+		<result property="updateBy" column="UPDATE_BY_" jdbcType="VARCHAR"/>
+		<result property="updateTime" column="UPDATE_TIME_" jdbcType="TIMESTAMP"/>
+		<result property="shiFouGuoShen" column="SHI_FOU_GUO_SHEN_" jdbcType="VARCHAR"/>
+		<result property="diDian" column="DI_DIAN_" jdbcType="VARCHAR"/>
+		<result property="bianZhiRen" column="BIAN_ZHI_REN_" jdbcType="VARCHAR"/>
+		<result property="bianZhiBuMen" column="BIAN_ZHI_BU_MEN_" jdbcType="VARCHAR"/>
+		<result property="bianZhiShiJian" column="BIAN_ZHI_SHI_JIAN" jdbcType="VARCHAR"/>
+		<result property="kuaiZhao" column="KUAI_ZHAO_" jdbcType="VARCHAR"/>
+		<result property="mingCheng" column="MING_CHENG_" jdbcType="VARCHAR"/>
+		<result property="piCiHao" column="PI_CI_HAO_" jdbcType="VARCHAR"/>
+		<result property="baoZhuangGuiGe" column="BAO_ZHUANG_GUI_GE" jdbcType="VARCHAR"/>
+		<result property="zuiXiaoGuiGe" column="ZUI_XIAO_GUI_GE_" jdbcType="VARCHAR"/>
+		<result property="danWei" column="DAN_WEI_" jdbcType="VARCHAR"/>
+		<result property="changJia" column="CHANG_JIA_" jdbcType="VARCHAR"/>
+		<result property="youXiaoQi" column="YOU_XIAO_QI_" jdbcType="VARCHAR"/>
+		<result property="cunChuTiaoJian" column="CUN_CHU_TIAO_JIAN" jdbcType="BLOB"/>
+		<result property="beiZhu" column="BEI_ZHU_" jdbcType="BLOB"/>
+		<result property="leiBie" column="LEI_BIE_" jdbcType="VARCHAR"/>
+		<result property="kaiPingXiaoQi" column="KAI_PING_XIAO_QI_" jdbcType="VARCHAR"/>
+		<result property="danJia" column="DAN_JIA_" jdbcType="VARCHAR"/>
+		<result property="bianMa" column="BIAN_MA_" jdbcType="VARCHAR"/>
+		<result property="chanPinPiHao" column="CHAN_PIN_PI_HAO_" jdbcType="VARCHAR"/>
+	</resultMap>
+	
+	<sql id="columns">
+		ID_,TENANT_ID_,IP_,CREATE_BY_,CREATE_TIME_,UPDATE_BY_,UPDATE_TIME_,SHI_FOU_GUO_SHEN_,DI_DIAN_,BIAN_ZHI_REN_,BIAN_ZHI_BU_MEN_,BIAN_ZHI_SHI_JIAN,KUAI_ZHAO_,MING_CHENG_,PI_CI_HAO_,BAO_ZHUANG_GUI_GE,ZUI_XIAO_GUI_GE_,DAN_WEI_,CHANG_JIA_,YOU_XIAO_QI_,CUN_CHU_TIAO_JIAN,BEI_ZHU_,LEI_BIE_,KAI_PING_XIAO_QI_,DAN_JIA_,BIAN_MA_,CHAN_PIN_PI_HAO_
+	</sql>
+	
+	<insert id="create" parameterType="com.lc.ibps.components.reagent.persistence.entity.ReagentConsumablesItemPo">
+		INSERT INTO T_SJHCJCSJPZ
+		(<include refid="columns"/>)
+		VALUES 
+		(#{id,jdbcType=VARCHAR}, #{tenantId,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{shiFouGuoShen,jdbcType=VARCHAR}, #{diDian,jdbcType=VARCHAR}, #{bianZhiRen,jdbcType=VARCHAR}, #{bianZhiBuMen,jdbcType=VARCHAR}, #{bianZhiShiJian,jdbcType=VARCHAR}, #{kuaiZhao,jdbcType=VARCHAR}, #{mingCheng,jdbcType=VARCHAR}, #{piCiHao,jdbcType=VARCHAR}, #{baoZhuangGuiGe,jdbcType=VARCHAR}, #{zuiXiaoGuiGe,jdbcType=VARCHAR}, #{danWei,jdbcType=VARCHAR}, #{changJia,jdbcType=VARCHAR}, #{youXiaoQi,jdbcType=VARCHAR}, #{cunChuTiaoJian,jdbcType=BLOB}, #{beiZhu,jdbcType=BLOB}, #{leiBie,jdbcType=VARCHAR}, #{kaiPingXiaoQi,jdbcType=VARCHAR}, #{danJia,jdbcType=VARCHAR}, #{bianMa,jdbcType=VARCHAR}, #{chanPinPiHao,jdbcType=VARCHAR})
+	</insert>
+	
+	<select id="get" parameterType="java.lang.String" resultMap="ReagentConsumablesItemPo">
+		SELECT <include refid="columns"/> FROM T_SJHCJCSJPZ 
+		WHERE 
+		ID_=#{id}
+	</select>
+	
+	
+	<sql id="querySql" >
+		SELECT <include refid="columns"/> FROM T_SJHCJCSJPZ
+		<where>
+			<if test="@o.Ognl@isNotEmpty(whereSql)">
+				${whereSql}
+			</if>
+		</where>
+		<if test="@o.Ognl@isNotEmpty(orderBySql)">
+			ORDER BY ${orderBySql}
+		</if>
+		<if test="@o.Ognl@isEmpty(orderBySql)">
+			ORDER BY ID_ DESC
+		</if>
+	</sql>
+	
+	<select id="query" parameterType="java.util.Map" resultMap="ReagentConsumablesItemPo">
+		<include refid="querySql"/>
+	</select>
+	
+	<select id="queryIds" parameterType="java.util.Map" resultMap="ReagentConsumablesItemPo">
+		SELECT ID_ FROM (<include refid="querySql"/>) T
+	</select>
+	
+	<select id="findByIds" resultMap="ReagentConsumablesItemPo">
+		SELECT <include refid="columns"/> FROM T_SJHCJCSJPZ
+			WHERE ID_ in 
+			<foreach item="id" index="index" collection="ids" open="(" separator="," close=")">  
+				#{id}  
+			</foreach>  		
+			ORDER BY ID_ DESC			
+	</select>	
+	
+	<update id="update" parameterType="com.lc.ibps.components.reagent.persistence.entity.ReagentConsumablesItemPo">
+		UPDATE T_SJHCJCSJPZ SET
+		TENANT_ID_=#{tenantId,jdbcType=VARCHAR},
+		IP_=#{ip,jdbcType=VARCHAR},
+		UPDATE_BY_=#{updateBy,jdbcType=VARCHAR},
+		UPDATE_TIME_=#{updateTime,jdbcType=TIMESTAMP},
+		SHI_FOU_GUO_SHEN_=#{shiFouGuoShen,jdbcType=VARCHAR},
+		DI_DIAN_=#{diDian,jdbcType=VARCHAR},
+		BIAN_ZHI_REN_=#{bianZhiRen,jdbcType=VARCHAR},
+		BIAN_ZHI_BU_MEN_=#{bianZhiBuMen,jdbcType=VARCHAR},
+		BIAN_ZHI_SHI_JIAN=#{bianZhiShiJian,jdbcType=VARCHAR},
+		KUAI_ZHAO_=#{kuaiZhao,jdbcType=VARCHAR},
+		MING_CHENG_=#{mingCheng,jdbcType=VARCHAR},
+		PI_CI_HAO_=#{piCiHao,jdbcType=VARCHAR},
+		BAO_ZHUANG_GUI_GE=#{baoZhuangGuiGe,jdbcType=VARCHAR},
+		ZUI_XIAO_GUI_GE_=#{zuiXiaoGuiGe,jdbcType=VARCHAR},
+		DAN_WEI_=#{danWei,jdbcType=VARCHAR},
+		CHANG_JIA_=#{changJia,jdbcType=VARCHAR},
+		YOU_XIAO_QI_=#{youXiaoQi,jdbcType=VARCHAR},
+		CUN_CHU_TIAO_JIAN=#{cunChuTiaoJian,jdbcType=BLOB},
+		BEI_ZHU_=#{beiZhu,jdbcType=BLOB},
+		LEI_BIE_=#{leiBie,jdbcType=VARCHAR},
+		KAI_PING_XIAO_QI_=#{kaiPingXiaoQi,jdbcType=VARCHAR},
+		DAN_JIA_=#{danJia,jdbcType=VARCHAR},
+		BIAN_MA_=#{bianMa,jdbcType=VARCHAR},
+		CHAN_PIN_PI_HAO_=#{chanPinPiHao,jdbcType=VARCHAR}
+		WHERE
+		ID_=#{id}
+	</update>
+	
+	<delete id="remove" parameterType="java.lang.String">
+		DELETE FROM T_SJHCJCSJPZ 
+		WHERE
+		ID_=#{id}
+	</delete>
+	
+	
+</mapper>

ibps-provider-root/modules/provider-business/src/main/resources/com/lc/ibps/reagent/persistence/mapping/ReagentConsumablesTransaction.map.xml

@@ -4,48 +4,41 @@
 	<!--<cache type="net.oschina.j2cache.mybatis.J2CacheAdapter"/>-->
 	<resultMap id="ReagentConsumablesTransactionPo" type="com.lc.ibps.components.reagent.persistence.entity.ReagentConsumablesTransactionPo">
 		<id property="id" column="ID_" jdbcType="VARCHAR"/>
-		<result property="tenantId" column="TENANT_ID_" jdbcType="VARCHAR"/>
-		<result property="ip" column="IP_" jdbcType="VARCHAR"/>
+		<result property="parentId" column="PARENT_ID_" jdbcType="VARCHAR"/>
 		<result property="createBy" column="CREATE_BY_" jdbcType="VARCHAR"/>
 		<result property="createTime" column="CREATE_TIME_" jdbcType="TIMESTAMP"/>
 		<result property="updateBy" column="UPDATE_BY_" jdbcType="VARCHAR"/>
 		<result property="updateTime" column="UPDATE_TIME_" jdbcType="TIMESTAMP"/>
-		<result property="shiFouGuoShen" column="SHI_FOU_GUO_SHEN_" jdbcType="VARCHAR"/>
-		<result property="diDian" column="DI_DIAN_" jdbcType="VARCHAR"/>
-		<result property="bianZhiRen" column="BIAN_ZHI_REN_" jdbcType="VARCHAR"/>
-		<result property="bianZhiBuMen" column="BIAN_ZHI_BU_MEN_" jdbcType="VARCHAR"/>
-		<result property="bianZhiShiJian" column="BIAN_ZHI_SHI_JIAN" jdbcType="VARCHAR"/>
-		<result property="kuaiZhao" column="KUAI_ZHAO_" jdbcType="VARCHAR"/>
-		<result property="mingCheng" column="MING_CHENG_" jdbcType="VARCHAR"/>
-		<result property="bianMa" column="BIAN_MA_" jdbcType="VARCHAR"/>
-		<result property="jiaoYiLeiXing" column="JIAO_YI_LEI_XING_" jdbcType="VARCHAR"/>
-		<result property="shuLiang" column="SHU_LIANG_" jdbcType="VARCHAR"/>
-		<result property="piHao" column="PI_HAO_" jdbcType="VARCHAR"/>
-		<result property="danWei" column="DAN_WEI_" jdbcType="VARCHAR"/>
-		<result property="sCChangJia" column="S_C_CHANG_JIA_" jdbcType="VARCHAR"/>
-		<result property="chanPinPiHao" column="CHAN_PIN_PI_HAO_" jdbcType="VARCHAR"/>
+		<result property="reagentCode" column="REAGENT_CODE" jdbcType="VARCHAR"/>
+		<result property="quantity" column="QUANTITY" jdbcType="NUMERIC"/>
+		<result property="expDate" column="EXP_DATE" jdbcType="VARCHAR"/>
+		<result property="position" column="POSITION" jdbcType="VARCHAR"/>
+		<result property="comments" column="COMMENTS" jdbcType="BLOB"/>
+		<result property="status" column="STATUS_" jdbcType="VARCHAR"/>
+		<result property="type" column="TYPE_" jdbcType="NUMERIC"/>
+		<result property="boId" column="BO_ID" jdbcType="VARCHAR"/>
 	</resultMap>
 	
 	<sql id="columns">
-		ID_,TENANT_ID_,IP_,CREATE_BY_,CREATE_TIME_,UPDATE_BY_,UPDATE_TIME_,SHI_FOU_GUO_SHEN_,DI_DIAN_,BIAN_ZHI_REN_,BIAN_ZHI_BU_MEN_,BIAN_ZHI_SHI_JIAN,KUAI_ZHAO_,MING_CHENG_,BIAN_MA_,JIAO_YI_LEI_XING_,SHU_LIANG_,PI_HAO_,DAN_WEI_,S_C_CHANG_JIA_,CHAN_PIN_PI_HAO_
+		ID_,PARENT_ID_,CREATE_BY_,CREATE_TIME_,UPDATE_BY_,UPDATE_TIME_,REAGENT_CODE,QUANTITY,EXP_DATE,POSITION,COMMENTS,STATUS_,TYPE_,BO_ID
 	</sql>
 	
 	<insert id="create" parameterType="com.lc.ibps.components.reagent.persistence.entity.ReagentConsumablesTransactionPo">
-		INSERT INTO T_SJHCJYB
+		INSERT INTO T_REAGENT_TRANS
 		(<include refid="columns"/>)
 		VALUES 
-		(#{id,jdbcType=VARCHAR}, #{tenantId,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{shiFouGuoShen,jdbcType=VARCHAR}, #{diDian,jdbcType=VARCHAR}, #{bianZhiRen,jdbcType=VARCHAR}, #{bianZhiBuMen,jdbcType=VARCHAR}, #{bianZhiShiJian,jdbcType=VARCHAR}, #{kuaiZhao,jdbcType=VARCHAR}, #{mingCheng,jdbcType=VARCHAR}, #{bianMa,jdbcType=VARCHAR}, #{jiaoYiLeiXing,jdbcType=VARCHAR}, #{shuLiang,jdbcType=VARCHAR}, #{piHao,jdbcType=VARCHAR}, #{danWei,jdbcType=VARCHAR}, #{sCChangJia,jdbcType=VARCHAR}, #{chanPinPiHao,jdbcType=VARCHAR})
+		(#{id,jdbcType=VARCHAR}, #{parentId,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{reagentCode,jdbcType=VARCHAR}, #{quantity,jdbcType=NUMERIC}, #{expDate,jdbcType=VARCHAR}, #{position,jdbcType=VARCHAR}, #{comments,jdbcType=BLOB}, #{status,jdbcType=VARCHAR}, #{type,jdbcType=NUMERIC}, #{boId,jdbcType=VARCHAR})
 	</insert>
 	
 	<select id="get" parameterType="java.lang.String" resultMap="ReagentConsumablesTransactionPo">
-		SELECT <include refid="columns"/> FROM T_SJHCJYB 
+		SELECT <include refid="columns"/> FROM T_REAGENT_TRANS 
 		WHERE 
 		ID_=#{id}
 	</select>
 	
 	
 	<sql id="querySql" >
-		SELECT <include refid="columns"/> FROM T_SJHCJYB
+		SELECT <include refid="columns"/> FROM T_REAGENT_TRANS
 		<where>
 			<if test="@o.Ognl@isNotEmpty(whereSql)">
 				${whereSql}
@@ -68,7 +61,7 @@
 	</select>
 	
 	<select id="findByIds" resultMap="ReagentConsumablesTransactionPo">
-		SELECT <include refid="columns"/> FROM T_SJHCJYB
+		SELECT <include refid="columns"/> FROM T_REAGENT_TRANS
 			WHERE ID_ in 
 			<foreach item="id" index="index" collection="ids" open="(" separator="," close=")">  
 				#{id}  
@@ -77,34 +70,44 @@
 	</select>	
 	
 	<update id="update" parameterType="com.lc.ibps.components.reagent.persistence.entity.ReagentConsumablesTransactionPo">
-		UPDATE T_SJHCJYB SET
-		TENANT_ID_=#{tenantId,jdbcType=VARCHAR},
-		IP_=#{ip,jdbcType=VARCHAR},
+		UPDATE T_REAGENT_TRANS SET
+		PARENT_ID_=#{parentId,jdbcType=VARCHAR},
 		UPDATE_BY_=#{updateBy,jdbcType=VARCHAR},
 		UPDATE_TIME_=#{updateTime,jdbcType=TIMESTAMP},
-		SHI_FOU_GUO_SHEN_=#{shiFouGuoShen,jdbcType=VARCHAR},
-		DI_DIAN_=#{diDian,jdbcType=VARCHAR},
-		BIAN_ZHI_REN_=#{bianZhiRen,jdbcType=VARCHAR},
-		BIAN_ZHI_BU_MEN_=#{bianZhiBuMen,jdbcType=VARCHAR},
-		BIAN_ZHI_SHI_JIAN=#{bianZhiShiJian,jdbcType=VARCHAR},
-		KUAI_ZHAO_=#{kuaiZhao,jdbcType=VARCHAR},
-		MING_CHENG_=#{mingCheng,jdbcType=VARCHAR},
-		BIAN_MA_=#{bianMa,jdbcType=VARCHAR},
-		JIAO_YI_LEI_XING_=#{jiaoYiLeiXing,jdbcType=VARCHAR},
-		SHU_LIANG_=#{shuLiang,jdbcType=VARCHAR},
-		PI_HAO_=#{piHao,jdbcType=VARCHAR},
-		DAN_WEI_=#{danWei,jdbcType=VARCHAR},
-		S_C_CHANG_JIA_=#{sCChangJia,jdbcType=VARCHAR},
-		CHAN_PIN_PI_HAO_=#{chanPinPiHao,jdbcType=VARCHAR}
+		REAGENT_CODE=#{reagentCode,jdbcType=VARCHAR},
+		QUANTITY=#{quantity,jdbcType=NUMERIC},
+		EXP_DATE=#{expDate,jdbcType=VARCHAR},
+		POSITION=#{position,jdbcType=VARCHAR},
+		COMMENTS=#{comments,jdbcType=BLOB},
+		STATUS_=#{status,jdbcType=VARCHAR},
+		TYPE_=#{type,jdbcType=NUMERIC},
+		BO_ID=#{boId,jdbcType=VARCHAR}
 		WHERE
 		ID_=#{id}
 	</update>
 	
 	<delete id="remove" parameterType="java.lang.String">
-		DELETE FROM T_SJHCJYB 
+		DELETE FROM T_REAGENT_TRANS 
 		WHERE
 		ID_=#{id}
 	</delete>
 	
+	<delete id="deleteByMainId">
+	    DELETE FROM T_REAGENT_TRANS
+	    WHERE
+	    REAGENT_CODE=#{mainId}
+	</delete>    
+	
+	<select id="findByMainId" resultMap="ReagentConsumablesTransactionPo">
+	    SELECT <include refid="columns"/>
+	    FROM T_REAGENT_TRANS 
+	    WHERE REAGENT_CODE=#{mainId}
+	</select>
+	
+	<select id="findIdsByMainId" parameterType="java.util.Map" resultMap="ReagentConsumablesTransactionPo">
+		SELECT ID_ FROM T_REAGENT_TRANS
+	    WHERE
+	    REAGENT_CODE=#{mainId}
+	</select>
 	
 </mapper>

ibps-provider-root/modules/provider-business/src/test/java/com/lc/ibps/components/ReagentBaseTest.java

@@ -14,7 +14,7 @@ import com.lc.ibps.api.base.id.IdGenerator;
  *<pre> 
  * 开发公司：深圳市金源信通科技有限公司
  * 开发人员：codegen
- * 创建时间：2024-11-13 15:50:16
+ * 创建时间：2024-11-14 16:40:18
  *</pre>
  */
 @ContextConfiguration({"classpath:conf/components-test.xml"})

ibps-provider-root/modules/provider-business/src/test/java/com/lc/ibps/components/reagent/domain/ReagentConsumablesInventoryTest.java

@@ -20,7 +20,7 @@ import com.lc.ibps.components.ReagentBaseTest;
  *<pre> 
  * 开发公司：深圳市金源信通科技有限公司
  * 开发人员：codegen
- * 创建时间：2024-11-13 15:42:48
+ * 创建时间：2024-11-14 16:40:12
  *</pre>
  */
 public class ReagentConsumablesInventoryTest extends ReagentBaseTest{

ibps-provider-root/modules/provider-business/src/test/java/com/lc/ibps/components/reagent/domain/ReagentConsumablesItemTest.java

@@ -0,0 +1,60 @@
+package com.lc.ibps.components.reagent.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.springframework.test.annotation.Rollback;
+
+import com.lc.ibps.components.reagent.domain.ReagentConsumablesItem;
+import com.lc.ibps.components.reagent.repository.ReagentConsumablesItemRepository;
+import com.lc.ibps.components.reagent.persistence.entity.ReagentConsumablesItemPo;
+import com.lc.ibps.components.ReagentBaseTest;
+
+/**
+ * 试剂耗材基础数据配置 领域对象实体单元测试类
+ *
+ *<pre> 
+ * 开发公司：深圳市金源信通科技有限公司
+ * 开发人员：codegen
+ * 创建时间：2024-11-14 16:40:06
+ *</pre>
+ */
+public class ReagentConsumablesItemTest extends ReagentBaseTest{
+	 
+	@Resource
+	private ReagentConsumablesItemRepository reagentConsumablesItemRepository;
+	
+	@Test
+	@Rollback(true)
+	public void create(){				
+		ReagentConsumablesItem reagentConsumablesItem = reagentConsumablesItemRepository.newInstance();
+		
+		ReagentConsumablesItemPo reagentConsumablesItemPo=new ReagentConsumablesItemPo();
+		reagentConsumablesItemPo.setId(idGenerator.getId());
+		
+		reagentConsumablesItem.setData(reagentConsumablesItemPo);
+		
+		List<String> ids = new ArrayList<String>();
+		
+		reagentConsumablesItem.create();	
+		ids.add(reagentConsumablesItem.getId());
+						
+		ReagentConsumablesItem reagentConsumablesItem2 = reagentConsumablesItemRepository.newInstance();
+		reagentConsumablesItemPo.setId(idGenerator.getId());
+		reagentConsumablesItem2.setData(reagentConsumablesItemPo);
+		
+		reagentConsumablesItem2.create();
+		ids.add(reagentConsumablesItem2.getId());
+		
+		List<ReagentConsumablesItemPo> reagentConsumablesItemPoList = reagentConsumablesItemRepository.findByIds(ids);
+		Assert.assertTrue(reagentConsumablesItemPoList.size()>=2);
+		
+		List<ReagentConsumablesItemPo>reagentConsumablesItem1 = reagentConsumablesItemRepository.findAll();
+		Assert.assertTrue(reagentConsumablesItem1.size()>=2);
+
+	}
+}

ibps-provider-root/modules/provider-business/src/test/java/com/lc/ibps/components/reagent/domain/ReagentConsumablesTransactionTest.java

@@ -15,12 +15,12 @@ import com.lc.ibps.components.reagent.persistence.entity.ReagentConsumablesTrans
 import com.lc.ibps.components.ReagentBaseTest;
 
 /**
- * 试剂耗材交易表 领域对象实体单元测试类
+ * 试剂耗材库存台账表 领域对象实体单元测试类
  *
  *<pre> 
  * 开发公司：深圳市金源信通科技有限公司
  * 开发人员：codegen
- * 创建时间：2024-11-13 15:50:17
+ * 创建时间：2024-11-14 16:40:19
  *</pre>
  */
 public class ReagentConsumablesTransactionTest extends ReagentBaseTest{

ibps-provider-root/modules/provider-business/src/test/java/com/lc/ibps/components/reagent/persistence/dao/ReagentConsumablesInventoryDaoTest.java

@@ -17,7 +17,7 @@ import com.lc.ibps.components.ReagentBaseTest;
  *<pre> 
  * 开发公司：深圳市金源信通科技有限公司
  * 开发人员：codegen
- * 创建时间：2024-11-13 15:42:46
+ * 创建时间：2024-11-14 16:40:10
  *</pre>
  */
 public class ReagentConsumablesInventoryDaoTest extends ReagentBaseTest{

ibps-provider-root/modules/provider-business/src/test/java/com/lc/ibps/components/reagent/persistence/dao/ReagentConsumablesItemDaoTest.java

@@ -0,0 +1,55 @@
+package com.lc.ibps.components.reagent.persistence.dao;
+
+import javax.annotation.Resource;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.springframework.test.annotation.Rollback;
+
+import com.lc.ibps.components.reagent.persistence.dao.ReagentConsumablesItemDao;
+import com.lc.ibps.components.reagent.persistence.dao.ReagentConsumablesItemQueryDao;
+import com.lc.ibps.components.reagent.persistence.entity.ReagentConsumablesItemPo;
+import com.lc.ibps.components.ReagentBaseTest;
+
+/**
+ * 试剂耗材基础数据配置 dao单元测试类
+ *
+ *<pre> 
+ * 开发公司：深圳市金源信通科技有限公司
+ * 开发人员：codegen
+ * 创建时间：2024-11-14 16:40:03
+ *</pre>
+ */
+public class ReagentConsumablesItemDaoTest extends ReagentBaseTest{
+
+	@Resource
+	private ReagentConsumablesItemDao reagentConsumablesItemDao;
+	
+	@Resource
+	private ReagentConsumablesItemQueryDao reagentConsumablesItemQueryDao;
+		
+	@Test
+	@Rollback(true)
+	public void testCrud(){
+		ReagentConsumablesItemPo reagentConsumablesItemPo=new ReagentConsumablesItemPo();
+		reagentConsumablesItemPo.setId(idGenerator.getId());
+		
+		//创建一实体
+		reagentConsumablesItemDao.create(reagentConsumablesItemPo);
+        Assert.assertNotNull(reagentConsumablesItemPo.getId());
+        logger.debug("reagentConsumablesItemPo1:"+ reagentConsumablesItemPo.getId());
+		//获取一实体
+		ReagentConsumablesItemPo reagentConsumablesItemPo2=reagentConsumablesItemQueryDao.get(reagentConsumablesItemPo.getId());
+		Assert.assertNotNull(reagentConsumablesItemPo2);
+		logger.debug("reagentConsumablesItemPo2:" + reagentConsumablesItemPo2.toString());
+		//更新一实体
+		reagentConsumablesItemDao.update(reagentConsumablesItemPo2);
+		
+		ReagentConsumablesItemPo reagentConsumablesItemPo3=reagentConsumablesItemQueryDao.get(reagentConsumablesItemPo.getId());
+		Assert.assertNotNull(reagentConsumablesItemPo3);
+		logger.debug("reagentConsumablesItemPo3:"+reagentConsumablesItemPo3.toString());
+		//删除一实体
+		//reagentConsumablesItemDao.remove(reagentConsumablesItemPo.getId());
+	}
+	
+}

ibps-provider-root/modules/provider-business/src/test/java/com/lc/ibps/components/reagent/persistence/dao/ReagentConsumablesTransactionDaoTest.java

@@ -12,12 +12,12 @@ import com.lc.ibps.components.reagent.persistence.entity.ReagentConsumablesTrans
 import com.lc.ibps.components.ReagentBaseTest;
 
 /**
- * 试剂耗材交易表 dao单元测试类
+ * 试剂耗材库存台账表 dao单元测试类
  *
  *<pre> 
  * 开发公司：深圳市金源信通科技有限公司
  * 开发人员：codegen
- * 创建时间：2024-11-13 15:50:15
+ * 创建时间：2024-11-14 16:40:17
  *</pre>
  */
 public class ReagentConsumablesTransactionDaoTest extends ReagentBaseTest{