Selaa lähdekoodia

git-svn-id: https://192.168.57.71/svn/jsgkj@670 931142cf-59ea-a443-aa0e-51397b428577

ld_guxl 8 vuotta sitten
vanhempi
commit
646cc67d51

+ 18 - 24
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/sssb/sssbadd.jsp

@@ -122,50 +122,44 @@
 	                        <td >
 		                        <input type="text" class="form-control" name="ggxh"  maxlength="40">
 	                        </td>
-						 	<th>数量:&nbsp;</th>
+	                        <th>检验报告(或证书)编号:&nbsp;</th>
+	                     	<td>
+	                     		<input type="text" class="form-control"  name="bh" maxlength="100" 
+	                     		onkeyup="value=value.replace(/[^\d]/g,'') "
+								onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\d]/g,''))">
+	                     	</td>
+	                    </tr>
+	                    <tr>
+	                    	<th>数量:&nbsp;</th>
 	                        <td >
 		                        <!-- <input type="text" class="form-control"  name="sl"  > -->
 		                        <input type="text" class="form-control" name="sl"
 								onkeyup="value=value.replace(/[^\d]/g,'') "
 								onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\d]/g,''))">
 	                        </td>
-	                        
-						 	
-	                    </tr>
-	                    <tr>
 						 	<th>数量单位:&nbsp;</th>
 	                        <td >
-		                        <input type="text" class="form-control"  name="sldw" maxlength="20">
+		                        <!-- <input type="text" class="form-control"  name="sldw" maxlength="20"> -->
+		                        <div id="sldwsel"></div>
 	                        </td>
-	                        <th>检验报告(或证书)编号:&nbsp;</th>
-	                     	<td>
-	                     		<input type="text" class="form-control"  name="bh" maxlength="100" 
-	                     		onkeyup="value=value.replace(/[^\d]/g,'') "
-								onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\d]/g,''))">
-	                     	</td>
-						 	
 	                    </tr>
 	                    <tr>
-	                    	<th>有效期:&nbsp;</th>
-	                        <td >
-		                        <input type="text"  class="Wdate"  name="yxq"  onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd'})">
-	                        </td>
 	                    	<th>一级分类:&nbsp;</th>	
 	                        <td >
 		                       <!--  <input type="text" class="form-control" name="yjfl"  onkeypress="limitTextArea(this, 40)"> -->
 		                       <div id="yjflsel"></div>
 	                        </td>
-	                       
-	                        
-						 	
-	                     </tr>
-	                     <tr>
-	                     	 <th>二级分类:&nbsp;</th>
+							<th>二级分类:&nbsp;</th>
 	                        <td >
 		                       <!--  <input type="text" class="form-control"  name="ejfl"  onkeypress="limitTextArea(this, 40)"> -->
 		                       <div id="ejflsel"></div>
 	                        </td>
-						 	
+	                     </tr>
+	                     <tr>
+						 	<th>有效期:&nbsp;</th>
+	                        <td >
+		                        <input type="text"  class="Wdate"  name="yxq"  onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd'})">
+	                        </td>
 						 	<th>填表人:&nbsp;</th>
 	                        <td>
 		                        <input type="text" class="form-control" name="tbr"  maxlength="40" value="${tbr }">

+ 21 - 25
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/sssb/sssbedit.jsp

@@ -19,6 +19,7 @@
 			sssb.detail.szzyqData = '${record.szzyq}'
 			sssb.detail.yjflData='${record.yjfl}';
 			sssb.detail.ejflData='${record.ejfl}';
+			sssb.detail.sldwData='${record.sldw}';
 			sssb.detail.jyrData = '${jyr}';
 			sssb.detail.init();
 			jyrSel('','${jyr}');
@@ -131,51 +132,46 @@
 	                        <td >
 		                        <input type="text" class="form-control" name="ggxh"  value="${record.ggxh }" maxlength="40">
 	                        </td>
-						 	<th>数量:&nbsp;</th>
+	                        <th>检验报告(或证书)编号:&nbsp;</th>
+	                     	<td>
+	                     		<input type="text" class="form-control"  name="bh" value="${record.bh }" maxlength="100"
+	                     		onkeyup="value=value.replace(/[^\d]/g,'') "
+								onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\d]/g,''))">
+	                     	</td>
+	                    </tr>
+	                    <tr>
+							<th>数量:&nbsp;</th>
 	                        <td >
 		                        <%-- <input type="text" class="form-control"  name="sl" value="${record.sl }"> --%>
 		                        <input type="text" class="form-control" name="sl" value="${record.sl }"
 								onkeyup="value=value.replace(/[^\d]/g,'') "
 								onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\d]/g,''))">
 	                        </td>
-						 	
-	                    </tr>
-	                     <tr>
 						 	<th>数量单位:&nbsp;</th>
 	                        <td >
-		                        <input type="text" class="form-control"  name="sldw" value="${record.sldw }" maxlength="20">
+		                        <%-- <input type="text" class="form-control"  name="sldw" value="${record.sldw }" maxlength="20"> --%>
+		                        <div id="sldwsel"></div>
 	                        </td>
-	                        <th>检验报告(或证书)编号:&nbsp;</th>
-	                     	<td>
-	                     		<input type="text" class="form-control"  name="bh" value="${record.bh }" maxlength="100"
-	                     		onkeyup="value=value.replace(/[^\d]/g,'') "
-								onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\d]/g,''))">
-	                     	</td>
-						 	
-	                        
 	                    </tr>
 	                    <tr>
-	                    	<th>有效期:&nbsp;</th>
-	                        <td >
-		                        <input type="text"  name="yxq"  class="Wdate" 
-		                               value="${fn:substring(record.yxq,0,10)}" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd'})">
-	                        </td>
+	                    	
 	                    	<th>一级分类:&nbsp;</th>	
 	                        <td >
 		                        <%-- <input type="text" class="form-control" name="yjfl"  value="${record.yjfl }"> --%>
 		                        <div id="yjflsel"></div>
 	                        </td>
-	                        
-	                    	
-						 	
-	                        
-	                    </tr>
-	                    <tr>
-	                    	<th>二级分类:&nbsp;</th>
+	                        <th>二级分类:&nbsp;</th>
 	                        <td >
 		                       <%--  <input type="text" class="form-control"  name="ejfl"  value="${record.ejfl }"> --%>
 		                       <div id="ejflsel"></div>
 	                        </td>
+	                    </tr>
+	                    <tr>
+	                    	<th>有效期:&nbsp;</th>
+	                        <td >
+		                        <input type="text"  name="yxq"  class="Wdate" 
+		                               value="${fn:substring(record.yxq,0,10)}" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd'})">
+	                        </td>
 						 	<th>填表人:&nbsp;</th>
 	                        <td>
 		                        <input type="text" class="form-control" name="tbr"  value="${record.tbr }" maxlength="40">

+ 13 - 16
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/sssb/sssbview.jsp

@@ -65,40 +65,37 @@
 	                        <td >
 		                        ${record.ggxh }
 	                        </td>
+	                        <th>检验报告(或证书)编号:&nbsp;</th>
+	                     	<td>
+	                     		${record.bh }
+	                     	</td>
+	                    </tr>
+	                     <tr>
 						 	<th>数量: &nbsp;</th>
 	                        <td >
 		                      ${record.sl }
 	                        </td>
 						 	
-	                    </tr>
-	                     <tr>
 						 	<th>数量单位: &nbsp;</th>
 	                        <td >
-		                        ${record.sldw }
+		                        ${record.sldwzw }
 	                        </td>
-	                        <th>检验报告(或证书)编号:&nbsp;</th>
-	                     	<td>
-	                     		${record.bh }
-	                     	</td>
-						 	
 	                    </tr>
 	                    <tr>
-	                    	
-						 	<th>有效期:&nbsp;</th>
-	                        <td >
-		                       ${record.yxqfmt }
-	                        </td>
 	                        <th>一级分类:&nbsp;</th>	
 	                        <td >
 		                        ${record.yjflzw }
 	                        </td>
-	                       
+							<th>二级分类: &nbsp;</th>
+	                        <td >
+		                       ${record.ejflzw }
+	                        </td>
 	                        
 	                    </tr>
 	                    <tr>
-	                    	 <th>二级分类: &nbsp;</th>
+	                    	<th>有效期:&nbsp;</th>
 	                        <td >
-		                       ${record.ejflzw }
+		                       ${record.yxqfmt }
 	                        </td>
 						 	<th>填表人:&nbsp;</th>
 	                        <td>

+ 33 - 0
gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gkjyr/sssb/sssbdetail.js

@@ -13,6 +13,7 @@ sssb.detail.init=function(){
 	initYjflSelect('yjflsel',sssb.detail.yjflData,'showejfl','80%');
 	initEjflSelect('ejflsel',sssb.detail.ejflData,sssb.detail.yjflData,null,'80%');
 	initzyqSelect('szzyqsel',sssb.detail.szzyqData,sssb.detail.szdData,sssb.detail.szgkData,sssb.detail.szgqData,null,'80%',sssb.detail.jyrData);
+	initSldwSelect('sldwsel',sssb.detail.sldwData,null,'80%');
 };
 
 sssb.detail.back=function(){
@@ -149,6 +150,38 @@ function initEjflSelect(divid,existVal,yjfl,changefunc,width){
 }, "json");
 }
 
+//构建数量单位的下拉
+//参数说明依次,1(必须)存放下拉的div的id,2(非必须)下拉初始选中的值,没有传没有传空字符串,3(非必须)下拉change事件,根据需要添加4(必须)下拉框的长度
+function initSldwSelect(divid,existVal,changefunc,width){
+	$.post($.app + "/sssb/selectSldw", {
+}, function(data) {
+	var str = "";
+	if(changefunc!=null&&changefunc!=""){
+		str+="<select   class='sldwselectpicker' name='sldwid' onchange='"+changefunc+"()' id='sldwid'>";
+	}else{
+		str+="<select   class='sldwselectpicker' name='sldwid' id='sldwid'>";
+	}
+	str+="<option></option>";
+	if(data){
+		for(var i=0;i<data.length;i++){
+			var sldw = data[i];
+			if(sldw.id==existVal){
+				str+=" <option selected='selected' value='"+sldw.id+"' >"+sldw.text+"</option>";
+			}else{
+				str+=" <option value='"+sldw.id+"' >"+sldw.text+"</option>";
+			}
+		}
+	}
+	str+="</select>";
+	$("#"+divid).empty();
+	$("#"+divid).append(str);
+	$('.sldwselectpicker').selectpicker({
+		width:width
+	});
+	
+}, "json");
+}
+
 //换行
 $(function(){
     newLine();

+ 148 - 2
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/sssb/ctl/SssbCtl.java

@@ -269,7 +269,7 @@ public class SssbCtl extends BaseWebCtl {
 	@RequestMapping(value = "/save")
 	@RequiresPermissions("sssbxx:add")
 	@ResponseBody
-	public WebJsonResult save(Model model, String path, SssbEntity code, String szdid, String szgkid, String szgqid, String ssjyrid, String yjflid, String ejflid,String sbszzyqid) {
+	public WebJsonResult save(Model model, String path, SssbEntity code, String szdid, String szgkid, String szgqid, String ssjyrid, String sldwid, String yjflid, String ejflid, String sbszzyqid) {
 		// how:如果是新增直接保存,如果更新,先取出数据库中记录,然后更新页面传过来的字段
 		// why:这样的话一些在前台无需显示的字段保证不会丢失,同时一个个字段设置有助于bug排查
 		WebJsonResult wr = success();
@@ -279,7 +279,7 @@ public class SssbCtl extends BaseWebCtl {
 				entity.setSsmc(code.getSsmc());
 				entity.setGgxh(code.getGgxh());
 				entity.setSl(code.getSl());
-				entity.setSldw(code.getSldw());
+//				entity.setSldw(code.getSldw());
 				/*
 				 * entity.setYjfl(code.getYjfl());
 				 * entity.setEjfl(code.getEjfl());
@@ -291,6 +291,10 @@ public class SssbCtl extends BaseWebCtl {
 				entity.setBz(code.getBz());
 				entity.setBh(code.getBh());
 
+				if (!StringUtils.isEmpty(sldwid)) {
+					CodeEntity sldw = new CodeEntity(sldwid);
+					entity.setSldw(sldw);
+				}
 				if (!StringUtils.isEmpty(yjflid)) {
 					CodeEntity yjfl = new CodeEntity(yjflid);
 					entity.setYjfl(yjfl);
@@ -349,6 +353,10 @@ public class SssbCtl extends BaseWebCtl {
 				GqEntity gq = gqService.findOne(szgqid);
 				code.setSsgkglbm(gq != null ? gq.getSsgkglbm() : null);
 
+				if (!StringUtils.isEmpty(sldwid)) {
+					CodeEntity sldw = new CodeEntity(sldwid);
+					code.setSldw(sldw);
+				}
 				if (!StringUtils.isEmpty(yjflid)) {
 					CodeEntity yjfl = new CodeEntity(yjflid);
 					code.setYjfl(yjfl);
@@ -392,6 +400,132 @@ public class SssbCtl extends BaseWebCtl {
 		}
 		return wr;
 	}
+//	@RequestMapping(value = "/save")
+//	@RequiresPermissions("sssbxx:add")
+//	@ResponseBody
+//	public WebJsonResult save(Model model, String path, SssbEntity code, String szdid, String szgkid, String szgqid, String ssjyrid, String yjflid, String ejflid,String sbszzyqid) {
+//		// how:如果是新增直接保存,如果更新,先取出数据库中记录,然后更新页面传过来的字段
+//		// why:这样的话一些在前台无需显示的字段保证不会丢失,同时一个个字段设置有助于bug排查
+//		WebJsonResult wr = success();
+//		try {
+//			if (!StringUtils.isEmpty(code.getId())) {
+//				SssbEntity entity = sssbService.findOne(code.getId());
+//				entity.setSsmc(code.getSsmc());
+//				entity.setGgxh(code.getGgxh());
+//				entity.setSl(code.getSl());
+//				entity.setSldw(code.getSldw());
+//				/*
+//				 * entity.setYjfl(code.getYjfl());
+//				 * entity.setEjfl(code.getEjfl());
+//				 */
+//				entity.setCfcs(code.getCfcs());
+//				entity.setYxq(code.getYxq());
+//				entity.setTbr(code.getTbr());
+//				entity.setLxdh(code.getLxdh());
+//				entity.setBz(code.getBz());
+//				entity.setBh(code.getBh());
+//				
+//				if (!StringUtils.isEmpty(yjflid)) {
+//					CodeEntity yjfl = new CodeEntity(yjflid);
+//					entity.setYjfl(yjfl);
+//				}
+//				if (!StringUtils.isEmpty(ejflid)) {
+//					CodeEntity ejfl = new CodeEntity(ejflid);
+//					entity.setEjfl(ejfl);
+//				}
+//				if (!StringUtils.isEmpty(sbszzyqid)) {
+//					ZyqEntity zyq = new ZyqEntity();
+//					zyq.setId(sbszzyqid);
+//					entity.setSzzyq(zyq);
+//				}
+//				
+//				CodeEntity szd = new CodeEntity(szdid);
+//				entity.setSzd(szd);
+//				
+//				GkEntity szgk = new GkEntity();
+//				szgk.setId(szgkid);
+//				entity.setSzgk(szgk);
+//				
+//				GqEntity szgq = new GqEntity();
+//				szgq.setId(szgqid);
+//				entity.setSzgq(szgq);
+//				
+//				GkjyrEntity ssjyr = new GkjyrEntity();
+//				ssjyr.setId(ssjyrid);
+//				entity.setSsjyr(ssjyr);
+//				
+//				GqEntity gq = gqService.findOne(szgqid);
+//				entity.setSsgkglbm(gq != null ? gq.getSsgkglbm() : null);
+//				if (!StringUtils.isEmpty(path) && path.indexOf("bg") > 0) {
+//					if (path.indexOf("add") > 0) {
+//						entity.setRecordStatus(BaseEntity.RECORE_STATE_COPY);
+//					} else {
+//						entity.setRecordStatus(BaseEntity.RECORE_STATE_BGFLAG);
+//					}
+//				}
+//				sssbService.save(entity);
+//			} else {
+//				CodeEntity szd = new CodeEntity(szdid);
+//				code.setSzd(szd);
+//				
+//				GkEntity szgk = new GkEntity();
+//				szgk.setId(szgkid);
+//				code.setSzgk(szgk);
+//				
+//				GqEntity szgq = new GqEntity();
+//				szgq.setId(szgqid);
+//				code.setSzgq(szgq);
+//				
+//				GkjyrEntity ssjyr = new GkjyrEntity();
+//				ssjyr.setId(ssjyrid);
+//				code.setSsjyr(ssjyr);
+//				
+//				GqEntity gq = gqService.findOne(szgqid);
+//				code.setSsgkglbm(gq != null ? gq.getSsgkglbm() : null);
+//				
+//				if (!StringUtils.isEmpty(yjflid)) {
+//					CodeEntity yjfl = new CodeEntity(yjflid);
+//					code.setYjfl(yjfl);
+//				}
+//				if (!StringUtils.isEmpty(ejflid)) {
+//					CodeEntity ejfl = new CodeEntity(ejflid);
+//					code.setEjfl(ejfl);
+//				}
+//				
+//				if (!StringUtils.isEmpty(sbszzyqid)) {
+//					ZyqEntity zyq = new ZyqEntity();
+//					zyq.setId(sbszzyqid);
+//					code.setSzzyq(zyq);
+//				}
+//				
+//				if (!StringUtils.isEmpty(path) && path.indexOf("bg") > 0) {
+//					if (path.indexOf("add") > 0) {
+//						code.setRecordStatus(BaseEntity.RECORE_STATE_COPY);
+//					} else {
+//						code.setRecordStatus(BaseEntity.RECORE_STATE_BGFLAG);
+//					}
+//				}
+//				sssbService.save(code);
+//			}
+//			// 如果是市级新增或者修改,保存后同步到省级
+//			try {
+//				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && needWS()) {
+//					SssbWebService webService = sssbService.getWebService(null);
+//					webService.save(code);
+//					code.setTbzt(Constants.YES);
+//					sssbService.save(code);
+//				}
+//			} catch (Exception e) {
+//				code.setTbzt(Constants.NO);
+//				sssbService.save(code);
+//			}
+//		} catch (Exception e) {
+//			wr.setSuccess(false);
+//			wr.setMessage("操作失败!");
+//			e.printStackTrace();
+//		}
+//		return wr;
+//	}
 
 	@RequestMapping(value = "/edit")
 	@RequiresPermissions("sssbxx:edit")
@@ -431,12 +565,14 @@ public class SssbCtl extends BaseWebCtl {
 		vo.setSsjyrzw(entity.getSsjyr() != null ? entity.getSsjyr().getGkjyr() : "");
 		vo.setYjflzw(entity.getYjfl() != null ? entity.getYjfl().getText() : "");
 		vo.setEjflzw(entity.getEjfl() != null ? entity.getEjfl().getText() : "");
+		vo.setSldwzw(entity.getSldw() != null ? entity.getSldw().getText() : "");
 		vo.setSzd(entity.getSzd() != null ? entity.getSzd().getId() : "");
 		vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
 		vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
 		vo.setSsjyr(entity.getSsjyr() != null ? entity.getSsjyr().getId() : "");
 		vo.setYjfl(entity.getYjfl() != null ? entity.getYjfl().getId() : "");
 		vo.setEjfl(entity.getEjfl() != null ? entity.getEjfl().getId() : "");
+		vo.setSldw(entity.getSldw() != null ? entity.getSldw().getId() : "");
 		vo.setSzzyq(entity.getSzzyq() !=null ? entity.getSzzyq().getId() : "");
 		vo.setSzzyqzw(entity.getSzzyq() !=null ? entity.getSzzyq().getZyqmc() : "");
 		model.addAttribute("record", vo);
@@ -460,12 +596,14 @@ public class SssbCtl extends BaseWebCtl {
 		vo.setSsjyrzw(entity.getSsjyr() != null ? entity.getSsjyr().getGkjyr() : "");
 		vo.setYjflzw(entity.getYjfl() != null ? entity.getYjfl().getText() : "");
 		vo.setEjflzw(entity.getEjfl() != null ? entity.getEjfl().getText() : "");
+		vo.setSldwzw(entity.getSldw() != null ? entity.getSldw().getText() : "");
 		vo.setSzd(entity.getSzd() != null ? entity.getSzd().getId() : "");
 		vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
 		vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
 		vo.setSsjyr(entity.getSsjyr() != null ? entity.getSsjyr().getId() : "");
 		vo.setYjfl(entity.getYjfl() != null ? entity.getYjfl().getId() : "");
 		vo.setEjfl(entity.getEjfl() != null ? entity.getEjfl().getId() : "");
+		vo.setSldw(entity.getSldw() != null ? entity.getSldw().getId() : "");
 		vo.setSzzyq(entity.getSzzyq() !=null ? entity.getSzzyq().getId() : "");
 		vo.setSzzyqzw(entity.getSzzyq() !=null ? entity.getSzzyq().getZyqmc() : "");
 		if (null != entity.getYxq()) {
@@ -571,6 +709,13 @@ public class SssbCtl extends BaseWebCtl {
 
 	}
 	
+	@RequestMapping(value = "/selectSldw")
+	@ResponseBody
+	public List<CodeEntity> selectSldw(Model model) {
+		List<CodeEntity> sldwlist = securityMgr.codeService().findValidCodesByGroupCode("SLDW");
+		return sldwlist;
+	}
+	
 	@RequestMapping(value = "/exportExcelAll")
 	public String exportExcelAll(HttpServletResponse response, final String ssmc, final String szgkid, final String jyr, final String szgqid, final String szdid) {
 		// 查询条件
@@ -644,6 +789,7 @@ public class SssbCtl extends BaseWebCtl {
 				vo.setSsjyrzw(entity.getSsjyr() != null ? entity.getSsjyr().getGkjyr() : "");
 				vo.setYjflzw(entity.getYjfl() != null ? entity.getYjfl().getText() : "");
 				vo.setEjflzw(entity.getEjfl() != null ? entity.getEjfl().getText() : "");
+				vo.setSldwzw(entity.getSldw() != null ? entity.getSldw().getText() :"");
 				vo.setSzd(entity.getSzd() != null ? entity.getSzd().getId() : "");
 				vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
 				vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");

+ 5 - 3
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/sssb/entity/SssbEntity.java

@@ -57,7 +57,7 @@ public class SssbEntity extends BaseEntity<String> implements Cloneable {
 	/** 备注 */
 	private String bz;
 	/** 数量单位 **/
-	private String sldw;
+	private CodeEntity sldw;
 	/** 所属管理部门 */
 	private XzglbmxxEntity ssgkglbm;
 	/** 所在港口 */
@@ -216,11 +216,13 @@ public class SssbEntity extends BaseEntity<String> implements Cloneable {
 		this.ssgkglbm = ssgkglbm;
 	}
 
-	public String getSldw() {
+	@ManyToOne(fetch = FetchType.EAGER, targetEntity = CodeEntity.class)
+	@JoinColumn(name = "sldw")
+	public CodeEntity getSldw() {
 		return sldw;
 	}
 
-	public void setSldw(String sldw) {
+	public void setSldw(CodeEntity sldw) {
 		this.sldw = sldw;
 	}
 

+ 9 - 0
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/sssb/vo/SssbVo.java

@@ -43,6 +43,7 @@ public class SssbVo extends BaseVo {
 	private String bz;
 	/** 数量单位 **/
 	private String sldw;
+	private String sldwzw;
 	/** 所属管理部门 */
 	private XzglbmxxEntity ssgkglbm;
 	/** 所在港口 */
@@ -276,4 +277,12 @@ public class SssbVo extends BaseVo {
 		this.bh = bh;
 	}
 
+	public String getSldwzw() {
+		return sldwzw;
+	}
+
+	public void setSldwzw(String sldwzw) {
+		this.sldwzw = sldwzw;
+	}
+
 }