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

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

@@ -49,12 +49,17 @@ public class InventoryDTO {
                 Object boId = data.get("boId");
                 Object createBy = data.get("createBy");
                 Object inventoryId = data.get("inventoryId");
+                Object diDian = data.get("diDian");
 
 //                Object createTime = data.get("createTime");
                 if(expDate !=null){
                     iv.getInventory().setExpDate(expDate.toString());
                     iv.getTransaction().setExpDate(expDate.toString());
                 }
+                if(diDian !=null){
+                    iv.getInventory().setDiDian(diDian.toString());
+                    iv.getTransaction().setDiDian(diDian.toString());
+                }
                 if(reagentCode !=null){
                     iv.getInventory().setReagentCode(reagentCode.toString());
                     iv.getTransaction().setReagentCode(reagentCode.toString());

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

@@ -38,7 +38,8 @@ public class ReagentConsumablesInventoryTbl extends AbstractPo<String>{
 	protected String  status; 		/*状态*/
 	@ApiModelProperty(value = "存放位置")
 	protected String  position; 		/*存放位置*/
-
+	@ApiModelProperty(value = "地点")
+	protected String  diDian; 		/*地点*/
 	public void setId(String id) 
 	{
 		this.id = id;
@@ -159,5 +160,12 @@ public class ReagentConsumablesInventoryTbl extends AbstractPo<String>{
 	{
 		return this.position;
 	}
-	
+
+	public String getDiDian() {
+		return diDian;
+	}
+
+	public void setDiDian(String diDian) {
+		this.diDian = diDian;
+	}
 }

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

@@ -38,7 +38,8 @@ public class ReagentConsumablesTransactionTbl extends AbstractPo<String>{
 	protected Long  type; 		/*操作类型*/
 	@ApiModelProperty(value = "流程BO主表ID")
 	protected String  boId; 		/*流程BO主表ID*/
-
+	@ApiModelProperty(value = "地点")
+	protected String  diDian; 		/*地点*/
 	public void setId(String id) 
 	{
 		this.id = id;
@@ -159,5 +160,12 @@ public class ReagentConsumablesTransactionTbl extends AbstractPo<String>{
 	{
 		return this.boId;
 	}
-	
+
+	public String getDiDian() {
+		return diDian;
+	}
+
+	public void setDiDian(String diDian) {
+		this.diDian = diDian;
+	}
 }

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

@@ -15,7 +15,7 @@ public class LinYongService implements OperationService{
     @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 " +
+                "SELECT c.shi_ling_shu_lian quantity,c.id_ boId,-1 AS type_ ,p.di_dian_ diDian,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);
     }

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

@@ -17,7 +17,7 @@ public class StoreService implements OperationService {
     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_  " +
+                " p.bian_zhi_ren_ createBy,p.bian_zhi_shi_jian createTime,p.di_dian_ diDian,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);

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

@@ -17,17 +17,18 @@
 		<result property="checkedDate" column="CHECKED_DATE" jdbcType="VARCHAR"/>
 		<result property="status" column="STATUS_" jdbcType="VARCHAR"/>
 		<result property="position" column="POSITION" jdbcType="VARCHAR"/>
+		<result property="diDian" column="DI_DIAN_" jdbcType="VARCHAR"/>
 	</resultMap>
 	
 	<sql id="columns">
-		ID_,REAGENT_CODE,CREATE_BY_,CREATE_TIME_,UPDATE_BY_,UPDATE_TIME_,FREEZE,QUANTITY,EXP_DATE,COMMENTS,CHECKER,CHECKED_DATE,STATUS_,POSITION
+		ID_,REAGENT_CODE,CREATE_BY_,CREATE_TIME_,UPDATE_BY_,UPDATE_TIME_,FREEZE,QUANTITY,EXP_DATE,DI_DIAN_,COMMENTS,CHECKER,CHECKED_DATE,STATUS_,POSITION
 	</sql>
 	
 	<insert id="create" parameterType="com.lc.ibps.components.reagent.persistence.entity.ReagentConsumablesInventoryPo">
 		INSERT INTO T_REAGENT_INVENTORY
 		(<include refid="columns"/>)
 		VALUES 
-		(#{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})
+		(#{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}, #{diDian,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">
@@ -79,6 +80,7 @@
 		EXP_DATE=#{expDate,jdbcType=VARCHAR},
 		COMMENTS=#{comments,jdbcType=BLOB},
 		CHECKER=#{checker,jdbcType=VARCHAR},
+		DI_DIAN_=#{diDian,jdbcType=VARCHAR},
 		CHECKED_DATE=#{checkedDate,jdbcType=VARCHAR},
 		STATUS_=#{status,jdbcType=VARCHAR},
 		POSITION=#{position,jdbcType=VARCHAR}

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

@@ -17,17 +17,18 @@
 		<result property="status" column="STATUS_" jdbcType="VARCHAR"/>
 		<result property="type" column="TYPE_" jdbcType="NUMERIC"/>
 		<result property="boId" column="BO_ID" jdbcType="VARCHAR"/>
+		<result property="diDian" column="DI_DIAN_" jdbcType="VARCHAR"/>
 	</resultMap>
 	
 	<sql id="columns">
-		ID_,PARENT_ID_,CREATE_BY_,CREATE_TIME_,UPDATE_BY_,UPDATE_TIME_,REAGENT_CODE,QUANTITY,EXP_DATE,POSITION,COMMENTS,STATUS_,TYPE_,BO_ID
+		ID_,PARENT_ID_,CREATE_BY_,CREATE_TIME_,UPDATE_BY_,UPDATE_TIME_,REAGENT_CODE,QUANTITY,EXP_DATE,DI_DIAN_,POSITION,COMMENTS,STATUS_,TYPE_,BO_ID
 	</sql>
 	
 	<insert id="create" parameterType="com.lc.ibps.components.reagent.persistence.entity.ReagentConsumablesTransactionPo">
 		INSERT INTO T_REAGENT_TRANS
 		(<include refid="columns"/>)
 		VALUES 
-		(#{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})
+		(#{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}, #{diDian,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">
@@ -79,6 +80,7 @@
 		EXP_DATE=#{expDate,jdbcType=VARCHAR},
 		POSITION=#{position,jdbcType=VARCHAR},
 		COMMENTS=#{comments,jdbcType=BLOB},
+		DI_DIAN_=#{diDian,jdbcType=VARCHAR},
 		STATUS_=#{status,jdbcType=VARCHAR},
 		TYPE_=#{type,jdbcType=NUMERIC},
 		BO_ID=#{boId,jdbcType=VARCHAR}