材料出库优化

mmpac/mmpac/src/client/u8c/ui/mmpac/action/ToMaterialOutDialog.java

@@ -634,10 +634,12 @@ public class ToMaterialOutDialog extends UIDialog implements ActionListener,Bill
 			UFDouble  num=new UFDouble(this.jlcardPanel.getBodyValueAt(arg0.getRow(), "nastnum").toString())
 					.multiply(new UFDouble(objbdef6.toString())).setScale(2, UFDouble.ROUND_HALF_UP);
 			 this.jlcardPanel.setBodyValueAt(num, arg0.getRow(), "num");//主数量
+			 this.jlcardPanel.setBodyValueAt(ufbdef8, arg0.getRow(), "bdef5");//本次执行主数量
+			 this.jlcardPanel.setBodyValueAt(objbdef6, arg0.getRow(), "bdef6");//换算率
 		   }
 			
-			this.jlcardPanel.setBodyValueAt(ufbdef8, arg0.getRow(), "bdef5");//本次执行主数量
-			this.jlcardPanel.setBodyValueAt(objbdef6, arg0.getRow(), "bdef6");//换算率
+//			this.jlcardPanel.setBodyValueAt(ufbdef8, arg0.getRow(), "bdef5");//本次执行主数量
+//			this.jlcardPanel.setBodyValueAt(objbdef6, arg0.getRow(), "bdef6");//换算率
 			
 			
 		}
@@ -872,16 +874,15 @@ public class ToMaterialOutDialog extends UIDialog implements ActionListener,Bill
 						itemvo.setAttributeValue("vuserdef17",vector.get(18)==null?null:vector.get(18).toString());//窗号
 						itemvo.setAttributeValue("vuserdef18",vector.get(16)==null?null:vector.get(16).toString());//米重
 						itemvo.setAttributeValue("vuserdef19",vector.get(17)==null?null:vector.get(17).toString());//装饰面周长
-			//			itemvo.setAttributeValue("vuserdef20",vector.get(5)==null?null:vector.get(5).toString());//专用区
-						
-						
+						itemvo.setAttributeValue("vuserdef20",vector.get(5)==null?null:vector.get(5).toString());//专用区
+						itemvo.setAttributeValue("pk_defdoc20",getzyqpk("专用区",vector.get(5)==null?null:vector.get(5).toString()));//专用区
 						
 						//回写数量
 						UFDouble updatenum =  new UFDouble(vector.get(30)==null?"0":vector.get(30).toString())
 								.add(new UFDouble(vector.get(1)==null?"0":vector.get(1).toString()));//已执行主数量+本次执行主数量
 						
 						UFDouble updatexenum= new UFDouble(vector.get(31)==null?"0":vector.get(31).toString())
-								.add(new UFDouble(vector.get(2)==null?"0":vector.get(1).toString()));//已执行辅数量+本次执行辅数量
+								.add(new UFDouble(vector.get(2)==null?"0":vector.get(2).toString()));//已执行辅数量+本次执行辅数量
 						
 						updatemap.put(vector.get(51).toString(), updatenum);
 						updatfzemap.put(vector.get(51).toString(), updatexenum);
@@ -1057,6 +1058,26 @@ public class ToMaterialOutDialog extends UIDialog implements ActionListener,Bill
    		}
    		return  iuap.executeQuery(sql.toString(), new ColumnProcessor());
    	}
+   	
+   	
+    private String getzyqpk(String doclistname,String docname) throws BusinessException {
+    	
+    	if(null==docname || "".equals(docname)) {
+    		return "";
+    	}
+    	
+    	//取到自定义档案列表主键
+    	String sql = "select pk_defdoclist from bd_defdoclist where doclistname = '"+doclistname+"'";
+    	Object pk_defdoclist = iuap.executeQuery(sql, new ColumnProcessor());
+    	if(pk_defdoclist == null) {
+    		throw new BusinessException("以下档案在U8cloud系统中根据公司或者账簿信息找不到，请检查！详细信息：1、档案类型：自定义档案列表，档案名称："+doclistname);
+    	}
+        String sql1 = "select pk_defdoc  from bd_defdoc where pk_defdoclist = '"+pk_defdoclist.toString()+"' and docname ='"+docname+"'";
+        String pk_defdoc = (String) iuap.executeQuery(sql1, new ColumnProcessor());
+        
+		return pk_defdoc;
+    	
+    }
 	
 
 }