[task-6381] 试剂耗材领用，新增‘领用房间’

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

@@ -82,6 +82,10 @@ public class LingYongDetailTbl extends AbstractPo<String>{
 	protected String  cangKuId; 		/*仓库id*/
 	@ApiModelProperty(value = "台账id")
 	protected String  taiZhangId; 		/*台账id*/
+	@ApiModelProperty(value = "预扣量")
+	protected String  withhold; 		/*预扣量*/
+	@ApiModelProperty(value = "领用房间")
+	protected String  fangJian; 		/*领用房间*/
 
 	public String getTaiZhangId() {
 		return taiZhangId;
@@ -463,5 +467,20 @@ public class LingYongDetailTbl extends AbstractPo<String>{
 	{
 		return this.cangKuId;
 	}
-	
+
+	public String getWithhold() {
+		return withhold;
+	}
+
+	public void setWithhold(String withhold) {
+		this.withhold = withhold;
+	}
+
+	public String getFangJian() {
+		return fangJian;
+	}
+
+	public void setFangJian(String fangJian) {
+		this.fangJian = fangJian;
+	}
 }

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

@@ -54,6 +54,10 @@ public class LingYongTbl extends AbstractPo<String>{
 	protected String  weiZhiLingYong; 		/*位置领用*/
 	@ApiModelProperty(value = "经手人2")
 	protected String  jingShouRen2; 		/*经手人2*/
+	@ApiModelProperty(value = "选择房间")
+	protected String  xuanZeFangJian; 		/*选择房间*/
+	@ApiModelProperty(value = "房间名")
+	protected String  fangJianMing; 		/*房间名*/
 
 	public void setId(String id) 
 	{
@@ -271,5 +275,21 @@ public class LingYongTbl extends AbstractPo<String>{
 	{
 		return this.jingShouRen2;
 	}
-	
+
+
+	public String getXuanZeFangJian() {
+		return xuanZeFangJian;
+	}
+
+	public void setXuanZeFangJian(String xuanZeFangJian) {
+		this.xuanZeFangJian = xuanZeFangJian;
+	}
+
+	public String getFangJianMing() {
+		return fangJianMing;
+	}
+
+	public void setFangJianMing(String fangJianMing) {
+		this.fangJianMing = fangJianMing;
+	}
 }

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

@@ -25,17 +25,20 @@
 		<result property="lingYongFangSh" column="LING_YONG_FANG_SH" jdbcType="VARCHAR"/>
 		<result property="weiZhiLingYong" column="WEI_ZHI_LING_YONG" jdbcType="VARCHAR"/>
 		<result property="jingShouRen2" column="JING_SHOU_REN_2_" jdbcType="VARCHAR"/>
+		<result property="xuanZeFangJian" column="XUAN_ZE_FANG_JIAN" jdbcType="VARCHAR"/>
+		<result property="fangJianMing" column="FANG_JIAN_MING_" 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_,BIAN_HAO_,L_Y_SHI_JI_HAO_CA,S_J_H_C_M_C_,LING_YONG_RI_QI_,JING_SHOU_REN_,BEI_ZHU_,LING_YONG_FANG_SH,WEI_ZHI_LING_YONG,JING_SHOU_REN_2_
+		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_,BIAN_HAO_,L_Y_SHI_JI_HAO_CA,S_J_H_C_M_C_,LING_YONG_RI_QI_,JING_SHOU_REN_,BEI_ZHU_,LING_YONG_FANG_SH,WEI_ZHI_LING_YONG,JING_SHOU_REN_2_,XUAN_ZE_FANG_JIAN,FANG_JIAN_MING_
 	</sql>
 	
 	<insert id="create" parameterType="com.lc.ibps.components.reagent.persistence.entity.LingYongPo">
 		INSERT INTO T_SJHCLY
 		(<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}, #{bianHao,jdbcType=VARCHAR}, #{lYShiJiHaoCa,jdbcType=BLOB}, #{sJHCMC,jdbcType=BLOB}, #{lingYongRiQi,jdbcType=VARCHAR}, #{jingShouRen,jdbcType=BLOB}, #{beiZhu,jdbcType=BLOB}, #{lingYongFangSh,jdbcType=VARCHAR}, #{weiZhiLingYong,jdbcType=VARCHAR}, #{jingShouRen2,jdbcType=VARCHAR})
+		(#{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}, #{bianHao,jdbcType=VARCHAR}, #{lYShiJiHaoCa,jdbcType=BLOB}, #{sJHCMC,jdbcType=BLOB}, #{lingYongRiQi,jdbcType=VARCHAR}, #{jingShouRen,jdbcType=BLOB}, #{beiZhu,jdbcType=BLOB}, #{lingYongFangSh,jdbcType=VARCHAR}, #{weiZhiLingYong,jdbcType=VARCHAR}, #{jingShouRen2,jdbcType=VARCHAR}, #{xuanZeFangJian,jdbcType=VARCHAR}, #{fangJianMing,jdbcType=VARCHAR})
 	</insert>
 	
 	<select id="get" parameterType="java.lang.String" resultMap="LingYongPo">
@@ -97,7 +100,9 @@
 		BEI_ZHU_=#{beiZhu,jdbcType=BLOB},
 		LING_YONG_FANG_SH=#{lingYongFangSh,jdbcType=VARCHAR},
 		WEI_ZHI_LING_YONG=#{weiZhiLingYong,jdbcType=VARCHAR},
-		JING_SHOU_REN_2_=#{jingShouRen2,jdbcType=VARCHAR}
+		JING_SHOU_REN_2_=#{jingShouRen2,jdbcType=VARCHAR},
+		XUAN_ZE_FANG_JIAN=#{xuanZeFangJian,jdbcType=VARCHAR},
+		FANG_JIAN_MING_=#{fangJianMing,jdbcType=VARCHAR}
 		WHERE
 		ID_=#{id}
 	</update>

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

@@ -39,13 +39,15 @@
 		<result property="jingShouRen2" column="JING_SHOU_REN_2_" jdbcType="VARCHAR"/>
 		<result property="cangKuId" column="CANG_KU_ID_" jdbcType="VARCHAR"/>
 		<result property="taiZhangId" column="TAI_ZHANG_ID_" jdbcType="VARCHAR"/>
+		<result property="withhold" column="WITHHOLD_" jdbcType="VARCHAR"/>
+		<result property="fangJian" column="FANG_JIAN_" jdbcType="VARCHAR"/>
 	</resultMap>
 	
 	<sql id="columns">
 		ID_,PARENT_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_,SHI_JI_MING_CHENG,GUI_GE_,DAN_WEI_,S_C_CHANG_JIA_,FA_HUO_SHI_JIAN_,
 		RU_KU_BIAN_HAO_,BIAN_MA_,PI_HAO_,YOU_XIAO_QI_,INVENTORY_ID,CUN_CHU_WEI_ZHI_,CUN_CHU_TIAO_JIAN,ZHUANG_TAI_,JING_SHOU_REN_,
-		BEI_ZHU_,LING_YONG_RI_QI_,SHU_LIANG_,LEI_BIE_,KU_CUN_LIANG_,JING_SHOU_REN_2_,CANG_KU_ID_,TAI_ZHANG_ID_
+		BEI_ZHU_,LING_YONG_RI_QI_,SHU_LIANG_,LEI_BIE_,KU_CUN_LIANG_,JING_SHOU_REN_2_,CANG_KU_ID_,TAI_ZHANG_ID_,WITHHOLD_,FANG_JIAN_
 	</sql>
 	
 	<insert id="create" parameterType="com.lc.ibps.components.reagent.persistence.entity.LingYongDetailPo">
@@ -60,7 +62,7 @@
 		#{piHao,jdbcType=VARCHAR}, #{youXiaoQi,jdbcType=VARCHAR}, #{inventoryId,jdbcType=VARCHAR}, #{cunChuWeiZhi,jdbcType=VARCHAR},
 		#{cunChuTiaoJian,jdbcType=VARCHAR}, #{zhuangTai,jdbcType=VARCHAR}, #{jingShouRen,jdbcType=VARCHAR}, #{beiZhu,jdbcType=BLOB},
 		#{lingYongRiQi,jdbcType=VARCHAR}, #{shuLiang,jdbcType=VARCHAR}, #{leiBie,jdbcType=VARCHAR}, #{kuCunLiang,jdbcType=VARCHAR},
-		#{jingShouRen2,jdbcType=VARCHAR}, #{cangKuId,jdbcType=VARCHAR}, #{taiZhangId,jdbcType=VARCHAR})
+		#{jingShouRen2,jdbcType=VARCHAR}, #{cangKuId,jdbcType=VARCHAR}, #{taiZhangId,jdbcType=VARCHAR}, #{withhold,jdbcType=VARCHAR}, #{fangJian,jdbcType=VARCHAR})
 	</insert>
 	
 	<select id="get" parameterType="java.lang.String" resultMap="LingYongDetailPo">
@@ -136,7 +138,9 @@
 		KU_CUN_LIANG_=#{kuCunLiang,jdbcType=VARCHAR},
 		JING_SHOU_REN_2_=#{jingShouRen2,jdbcType=VARCHAR},
 		CANG_KU_ID_=#{cangKuId,jdbcType=VARCHAR},
-		TAI_ZHANG_ID_=#{taiZhangId,jdbcType=VARCHAR}
+		TAI_ZHANG_ID_=#{taiZhangId,jdbcType=VARCHAR},
+		WITHHOLD_=#{withhold,jdbcType=VARCHAR},
+		FANG_JIAN_=#{fangJian,jdbcType=VARCHAR}
 		WHERE
 		ID_=#{id}
 	</update>