12.13

.classpath

@@ -92,7 +92,7 @@
 	</classpathentry>
 	<classpathentry kind="lib" path="lib/org.eclipse.osgi.services.nl_12000.2.0.jar"/>
 	<classpathentry kind="lib" path="lib/org.eclipse.osgi.services_3.7.100.v20180827-1536.jar"/>
-	<classpathentry kind="lib" path="lib/cn.com.origin.autocode_1.0.0.jar"/>
 	<classpathentry kind="lib" path="lib/cn.com.origin.autocodemanager_1.0.0.jar"/>
+	<classpathentry kind="lib" path="lib/cn.com.origin.autocode_1.0.0.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

src/com/connor/dfl/plm/dfl003/Dfl003AIFDialog.java

@@ -458,12 +458,10 @@ public class Dfl003AIFDialog extends AbstractAIFDialog {
 					} else {	
 						MessageBox.post("名称、来源码、分群码不能为空!", "提示", MessageBox.INFORMATION);
 					}
-
-
-
-
-
-
+					if(itemName.contains("\\")) {
+						MessageBox.post("名称中不能含有反斜杠!", "提示", MessageBox.INFORMATION);
+						return;
+					}
 				} else {
 					MessageBox.post("请选择创建类型!", "提示", MessageBox.INFORMATION);
 				}
@@ -569,6 +567,21 @@ public class Dfl003AIFDialog extends AbstractAIFDialog {
 						System.out.println("输入的旧品号-----"+oldId2);
 						rev.setStringProperty("t2_OldId", oldId2);
 					}
+					if(material.contains("\\")) {
+						MessageBox.post("材质中不能含有反斜杠!" ,"提示",
+								MessageBox.INFORMATION);
+						return ;
+					}
+					if(weight.contains("\\")) {
+						MessageBox.post("重量中不能含有反斜杠!" ,"提示",
+								MessageBox.INFORMATION);
+						return ;
+					}
+					if(Specifications.contains("\\")) {
+						MessageBox.post("规格中不能含有反斜杠!" ,"提示",
+								MessageBox.INFORMATION);
+						return ;
+					}
 					if(material != null && material != "" && material != " " ) {
 						rev.setStringProperty("t2_material", material);
 					}

src/com/connor/dfl/plm/dfl006/CreateChangeOrderDialog.java

@@ -45,7 +45,8 @@ public class CreateChangeOrderDialog  extends AbstractAIFDialog{
 		//判断是否为变更申请单	
 		final TCComponent itemR = (TCComponent)targetComponents[0];
 		if(!itemR.getTypeComponent().toString().equals("T2_ECRRevision")) {
-			System.out.println(itemR.getTypeComponent());
+			//System.out.println(itemR.getTypeComponent());
+			
 			MessageBox.post("创建失败，请选择变更申请单版本进行创建！", "提示信息",MessageBox.INFORMATION);
 		}else {
 		

src/com/connor/dfl/plm/dfl010/CreateProblemSpotDialog.java

@@ -460,7 +460,7 @@ public class CreateProblemSpotDialog extends AbstractAIFDialog {
 			String type = selCodeBean.getType();
 			TCComponentItemType tctype = (TCComponentItemType) session.getTypeComponent(type);
 			String newsid=id_field.getText();
-			System.out.println(tctype);
+			//System.out.println(tctype);
 			TCComponentItem find = tctype.find(newsid);
 			if (find != null) {
 				MessageBox.post("当前流水ID:" + newsid + "已存在对象,无法创建!", "错误",

src/com/connor/dfl/plm/dfl028/Dfl028AIFDialog.java

@@ -69,6 +69,7 @@ public class Dfl028AIFDialog extends AbstractAIFDialog {
 	private JPanel btnPanel1;
 	private JPanel btnPanel2;
 	private JPanel btnPanel3;
+	private JPanel btnPanel4;
 	private String hzm;
 	private int iDataset = 0;
 	private String datasetDir;
@@ -80,13 +81,17 @@ public class Dfl028AIFDialog extends AbstractAIFDialog {
 	private List<String> datasetList = new ArrayList<String>();
 	private Map<String, String> pathMap = new HashMap<String, String>();
 	private String pathString;
+	private Boolean isCarryRev = true;
+	private List<String> carryRevList;
 	ExecutorService pool = Executors.newCachedThreadPool();
+
 	public Dfl028AIFDialog(AbstractAIFApplication arg0) {
 		this.app = arg0;
 		this.session = (TCSession) app.getSession();
 		this.targets = app.getTargetComponents();
 
 	}
+
 	@Override
 	public void run() {
 		// 显示窗口
@@ -94,8 +99,10 @@ public class Dfl028AIFDialog extends AbstractAIFDialog {
 		// 启用查询按钮
 //		qryBtn.setEnabled(true);	
 	}
+
 	// 获取下载文件列表
 	private void getload(TCComponentDataset dataset, String path, List<String> list, String itemid) {
+		
 		try {
 			TCComponentTcFile[] file = dataset.getTcFiles();
 			if (file == null || file.length == 0) {
@@ -108,7 +115,8 @@ public class Dfl028AIFDialog extends AbstractAIFDialog {
 					for (AIFComponentContext context : itemRev) {
 						if (context.getComponent() instanceof TCComponentItemRevision) {
 							TCComponentItemRevision revision = (TCComponentItemRevision) context.getComponent();
-							items=revision.getStringProperty("item_id")+"_"+revision.getStringProperty("current_revision_id");
+							items = revision.getStringProperty("item_id") + "_"
+									+ revision.getStringProperty("current_revision_id");
 						}
 					}
 					String noFileString = items + "_" + dataset.getStringProperty("object_name");
@@ -125,13 +133,33 @@ public class Dfl028AIFDialog extends AbstractAIFDialog {
 					// 获取文件名（带后缀）
 					if (list.contains(hzm)) {
 						String name = file[i].getTCProperty("original_file_name").getStringValue();
+						AIFComponentContext[] itemRev = dataset.whereReferenced();
+						for (AIFComponentContext context : itemRev) {
+							if (context.getComponent() instanceof TCComponentItemRevision) {
+								TCComponentItemRevision revision = (TCComponentItemRevision) context.getComponent();
+								if ("T2_OutBuyPartRevision".equals(revision.getType())
+										|| "T2_outsourceRevision".equals(revision.getType()) || "T2_VirtualRevision".equals(revision.getType())) {
+									if(isCarryRev) {
+										name = revision.getStringProperty("item_id")
+												+ revision.getStringProperty("current_revision_id") + " "
+												+ revision.getStringProperty("object_name");
+									}else {
+										
+									}
+								} else {
+									name = revision.getStringProperty("item_id") + " "
+											+ revision.getStringProperty("object_name");
+								}
+
+							}
+						}
+
 						if (name.contains(".")) {
 							// 获取文件名（不带后缀）
 							name = name.substring(0, name.lastIndexOf("."));
 						}
-							String replace = name.replace("/", "-").replace("<", "-").
-					                replace(">", "-").replace(":", "-").replace("|","-").
-					                replace("\\","-").replace("*","-").replace("?","-");
+						String replace = name.replace("/", "-").replace("<", "-").replace(">", "-").replace(":", "-")
+								.replace("|", "-").replace("\\", "-").replace("*", "-").replace("?", "-");
 						// 获取文件用户下载
 						File fmsFile = file[i].getFmsFile();
 						hzmlist.add(hzm);
@@ -207,8 +235,10 @@ public class Dfl028AIFDialog extends AbstractAIFDialog {
 					bar.setForeground(Color.blue);
 
 				}
-				if(fos!=null) fos.close();
-				if(fis!=null) fis.close();
+				if (fos != null)
+					fos.close();
+				if (fis != null)
+					fis.close();
 			}
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -285,7 +315,13 @@ public class Dfl028AIFDialog extends AbstractAIFDialog {
 		btnPanel3.add("1.1.left.top", additional);
 		btnPanel3.add("1.2.left.top", checkBox21);
 		btnPanel3.add("1.3.left.top", checkBox22);
-		//第四行下载选项
+		// 第四行行选项
+		btnPanel4 = new JPanel();
+		JCheckBox bt4op1 = new JCheckBox("设计");
+		JCheckBox bt4op2 = new JCheckBox("其他");
+		btnPanel4.add("1.1.left.top",bt4op1);
+		btnPanel4.add("1.2.left.top",bt4op2);
+		// 第五行下载选项
 		jLabel = new JLabel("下载路径:");
 		jtf.setText(deskPath);
 		jButton = new JButton("浏览");
@@ -303,7 +339,8 @@ public class Dfl028AIFDialog extends AbstractAIFDialog {
 		this.add("2.1.left.top", btnPanel2);
 //		this.add("3.1.left.top",additional);
 		this.add("3.1.left.top", btnPanel3);
-		this.add("4.1.left.top",panel); 
+		this.add("4.1.left.top", btnPanel4);
+		this.add("5.1.left.top", panel);
 //		this.add("5.1.left.top",paneljdt);
 		this.setResizable(false);
 		this.setBounds(5, 5, 5, 5);
@@ -319,6 +356,16 @@ public class Dfl028AIFDialog extends AbstractAIFDialog {
 		okBut.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
+				carryRevList = getIscarryRev();
+				if(null == carryRevList || carryRevList.size() ==0) {
+					isCarryRev = true;
+				}else if(carryRevList.size()==2){
+					isCarryRev = true;
+				}else if(carryRevList.contains("其他")) {
+					isCarryRev = true;
+				}else {
+					isCarryRev = false;
+				}
 				datasetList.add("DWG");
 				datasetList.add("Tofflon_DWG");
 				datasetList.add("T2_DWG");
@@ -400,7 +447,8 @@ public class Dfl028AIFDialog extends AbstractAIFDialog {
 					if (noFileList.size() != 0) {
 						OutputStreamWriter outputStreamWriter;
 						try {
-							outputStreamWriter = new OutputStreamWriter(new FileOutputStream(pathString+File.separator+"部分数据集没有命名的引用.txt"));
+							outputStreamWriter = new OutputStreamWriter(
+									new FileOutputStream(pathString + File.separator + "部分数据集没有命名的引用.txt"));
 							BufferedWriter bWriter = new BufferedWriter(outputStreamWriter);
 							for (String liString : noFileList) {
 								bWriter.write(liString);
@@ -419,6 +467,7 @@ public class Dfl028AIFDialog extends AbstractAIFDialog {
 						}
 					}
 				}
+				
 			}
 		});
 		celBut.addActionListener(new ActionListener() {
@@ -433,6 +482,7 @@ public class Dfl028AIFDialog extends AbstractAIFDialog {
 		this.centerToScreen();
 		this.showDialog();
 	}
+
 	// 获取图纸类型
 	public void getTypes() {
 		List<String> list = new ArrayList<String>();
@@ -473,16 +523,15 @@ public class Dfl028AIFDialog extends AbstractAIFDialog {
 					TCComponentBOMLine line = (TCComponentBOMLine) targets[i];
 					TCComponentItemRevision rev = line.getItemRevision();
 					String objName = rev.getStringProperty("object_name");
-					String replace = objName.replace("/", "-").replace("<", "-").
-	                replace(">", "-").replace(":", "-").replace("|","-").
-	                replace("\\","-").replace("*","-").replace("?","-");
+					String replace = objName.replace("/", "-").replace("<", "-").replace(">", "-").replace(":", "-")
+							.replace("|", "-").replace("\\", "-").replace("*", "-").replace("?", "-");
 					String revtype = rev.getType();
-					String dataDir2 =jtf.getText()+File.separator+rev.getStringProperty("item_id")+"_"+
-							rev.getStringProperty("current_revision_id")+"_"+replace;//创建版本文件夹
+					String dataDir2 = jtf.getText() + File.separator + rev.getStringProperty("item_id") + "_"
+							+ rev.getStringProperty("current_revision_id") + "_" + replace;// 创建版本文件夹
 					File csFile = new File(dataDir2);
 					// 数据版本创建自己的文件夹
-					String dataName = rev.getStringProperty("item_id")+"_"+ rev.getStringProperty("current_revision_id")+
-							"_"+replace;//文件名 
+					String dataName = rev.getStringProperty("item_id") + "_"
+							+ rev.getStringProperty("current_revision_id") + "_" + replace;// 文件名
 					pathString = dataDir2;
 					if (!csFile.exists()) {
 						csFile.mkdir();
@@ -491,15 +540,16 @@ public class Dfl028AIFDialog extends AbstractAIFDialog {
 					String dataName2 = "";
 					// 遍历视图 去找符合条件的 文件夹已经创建
 					getOutPart(rev, dataName, list);
-					String dataDir3 =jtf.getText()+File.separator+rev.getStringProperty("item_id")+"_"+
-							rev.getStringProperty("current_revision_id")+"_"+replace+File.separator+rev.getStringProperty("item_id")+"_"+
-									rev.getStringProperty("current_revision_id")+"_"+replace;//创建版本文件夹总成
+					String dataDir3 = jtf.getText() + File.separator + rev.getStringProperty("item_id") + "_"
+							+ rev.getStringProperty("current_revision_id") + "_" + replace + File.separator
+							+ rev.getStringProperty("item_id") + "_" + rev.getStringProperty("current_revision_id")
+							+ "_" + replace;// 创建版本文件夹总成
 					File csFile2 = new File(dataDir3);
 					if (!csFile2.exists()) {
 						csFile2.mkdir();
 					}
-					dataName2=dataName+File.separator+rev.getStringProperty("item_id")+"_"+ rev.getStringProperty("current_revision_id")+
-							"_"+replace;
+					dataName2 = dataName + File.separator + rev.getStringProperty("item_id") + "_"
+							+ rev.getStringProperty("current_revision_id") + "_" + replace;
 					TCComponent[] datasets = rev.getReferenceListProperty("IMAN_specification");
 					TCComponent[] datasets2 = rev.getReferenceListProperty("IMAN_Rendering");
 					for (int j = 0; j < datasets.length; j++) {
@@ -545,24 +595,22 @@ public class Dfl028AIFDialog extends AbstractAIFDialog {
 							}
 						}
 					}
-				 }
-				else if(targets[i] instanceof TCComponentItemRevision){
+				} else if (targets[i] instanceof TCComponentItemRevision) {
 					List<String> itemlist = new ArrayList<String>();
 					// 执行获取零件类型的方法
 					itemlist = getitemType();
 					TCComponentItemRevision rev = (TCComponentItemRevision) targets[i];
 					String revtype = rev.getType();
 					String objName = rev.getStringProperty("object_name");
-					String replace = objName.replace("/", "-").replace("<", "-").
-	                replace(">", "-").replace(":", "-").replace("|","-").
-	                replace("\\","-").replace("*","-").replace("?","-");
-					String dataDir =jtf.getText()+File.separator+rev.getStringProperty("item_id")+"_"+
-							rev.getStringProperty("current_revision_id")+"_"+replace;//创建版本文件夹
+					String replace = objName.replace("/", "-").replace("<", "-").replace(">", "-").replace(":", "-")
+							.replace("|", "-").replace("\\", "-").replace("*", "-").replace("?", "-");
+					String dataDir = jtf.getText() + File.separator + rev.getStringProperty("item_id") + "_"
+							+ rev.getStringProperty("current_revision_id") + "_" + replace;// 创建版本文件夹
 
 					File csFile = new File(dataDir);
 					// 数据版本创建自己的文件夹
-					String dataName =rev.getStringProperty("item_id")+"_"+
-							rev.getStringProperty("current_revision_id")+"_"+replace;//文件名
+					String dataName = rev.getStringProperty("item_id") + "_"
+							+ rev.getStringProperty("current_revision_id") + "_" + replace;// 文件名
 					String dataName2 = "";
 					pathString = dataDir;
 					if (!csFile.exists()) {
@@ -570,15 +618,16 @@ public class Dfl028AIFDialog extends AbstractAIFDialog {
 					}
 					// 遍历视图 去找符合条件的 文件夹已经创建
 					getOutPart(rev, dataName, list);
-					String dataDir3 =jtf.getText()+File.separator+rev.getStringProperty("item_id")+"_"+
-							rev.getStringProperty("current_revision_id")+"_"+replace+File.separator+rev.getStringProperty("item_id")+"_"+
-									rev.getStringProperty("current_revision_id")+"_"+replace;//创建版本文件夹总成
+					String dataDir3 = jtf.getText() + File.separator + rev.getStringProperty("item_id") + "_"
+							+ rev.getStringProperty("current_revision_id") + "_" + replace + File.separator
+							+ rev.getStringProperty("item_id") + "_" + rev.getStringProperty("current_revision_id")
+							+ "_" + replace;// 创建版本文件夹总成
 					File csFile2 = new File(dataDir3);
 					if (!csFile2.exists()) {
 						csFile2.mkdir();
 					}
-					dataName2 =dataName+File.separator+rev.getStringProperty("item_id")+"_"+
-							rev.getStringProperty("current_revision_id")+"_"+replace;//文件名
+					dataName2 = dataName + File.separator + rev.getStringProperty("item_id") + "_"
+							+ rev.getStringProperty("current_revision_id") + "_" + replace;// 文件名
 					TCComponent[] datasets = rev.getReferenceListProperty("IMAN_specification");
 					TCComponent[] datasets2 = rev.getReferenceListProperty("IMAN_Rendering");
 					for (int j = 0; j < datasets.length; j++) {
@@ -627,9 +676,8 @@ public class Dfl028AIFDialog extends AbstractAIFDialog {
 					TCComponentDataset dataset = (TCComponentDataset) targets[i];
 					String dataName = "";
 					String objName = dataset.getStringProperty("object_name");
-					String replaceName = objName.replace("/", "-").replace("<", "-").
-			                replace(">", "-").replace(":", "-").replace("|","-").
-			                replace("\\","-").replace("*","-").replace("?","-");
+					String replaceName = objName.replace("/", "-").replace("<", "-").replace(">", "-").replace(":", "-")
+							.replace("|", "-").replace("\\", "-").replace("*", "-").replace("?", "-");
 					if (iDataset == 0) {
 						dataName = jtf.getText() + File.separator + replaceName;
 						datasetDir = replaceName;
@@ -654,15 +702,14 @@ public class Dfl028AIFDialog extends AbstractAIFDialog {
 					TCComponentItemRevision rev = item.getLatestItemRevision();
 					String revtype = rev.getType();
 					String objName = rev.getStringProperty("object_name");
-					String replace = objName.replace("/", "-").replace("<", "-").
-	                replace(">", "-").replace(":", "-").replace("|","-").
-	                replace("\\","-").replace("*","-").replace("?","-");
-					String dataDir2 =jtf.getText()+File.separator+rev.getStringProperty("item_id")+"_"+
-							rev.getStringProperty("current_revision_id")+"_"+replace;//创建版本文件夹
+					String replace = objName.replace("/", "-").replace("<", "-").replace(">", "-").replace(":", "-")
+							.replace("|", "-").replace("\\", "-").replace("*", "-").replace("?", "-");
+					String dataDir2 = jtf.getText() + File.separator + rev.getStringProperty("item_id") + "_"
+							+ rev.getStringProperty("current_revision_id") + "_" + replace;// 创建版本文件夹
 					File csFile = new File(dataDir2);
 					// 数据版本创建自己的文件夹
-					String dataName = rev.getStringProperty("item_id")+"_"+
-							rev.getStringProperty("current_revision_id")+"_"+replace;//文件名 
+					String dataName = rev.getStringProperty("item_id") + "_"
+							+ rev.getStringProperty("current_revision_id") + "_" + replace;// 文件名
 					pathString = dataDir2;
 					if (!csFile.exists()) {
 						csFile.mkdir();
@@ -671,15 +718,16 @@ public class Dfl028AIFDialog extends AbstractAIFDialog {
 					String dataName2 = "";
 					// 遍历视图 去找符合条件的 文件夹已经创建
 					getOutPart(rev, dataName, list);
-					String dataDir3 =jtf.getText()+File.separator+rev.getStringProperty("item_id")+"_"+
-							rev.getStringProperty("current_revision_id")+"_"+replace+File.separator+rev.getStringProperty("item_id")+"_"+
-									rev.getStringProperty("current_revision_id")+"_"+replace;//创建版本文件夹总成
+					String dataDir3 = jtf.getText() + File.separator + rev.getStringProperty("item_id") + "_"
+							+ rev.getStringProperty("current_revision_id") + "_" + replace + File.separator
+							+ rev.getStringProperty("item_id") + "_" + rev.getStringProperty("current_revision_id")
+							+ "_" + replace;// 创建版本文件夹总成
 					File csFile2 = new File(dataDir3);
 					if (!csFile2.exists()) {
 						csFile2.mkdir();
 					}
-					dataName2 =dataName+File.separator+rev.getStringProperty("item_id")+"_"+
-							rev.getStringProperty("current_revision_id")+"_"+replace;//文件名
+					dataName2 = dataName + File.separator + rev.getStringProperty("item_id") + "_"
+							+ rev.getStringProperty("current_revision_id") + "_" + replace;// 文件名
 					TCComponent[] datasets = rev.getReferenceListProperty("IMAN_specification");
 					TCComponent[] datasets2 = rev.getReferenceListProperty("IMAN_Rendering");
 					for (int j = 0; j < datasets.length; j++) {
@@ -730,6 +778,7 @@ public class Dfl028AIFDialog extends AbstractAIFDialog {
 			e.printStackTrace();
 		}
 	}
+
 	// 获取零件类型
 	public List<String> getitemType() {
 		List<String> itemlist = new ArrayList<String>();
@@ -761,6 +810,7 @@ public class Dfl028AIFDialog extends AbstractAIFDialog {
 		}
 		return itemlist;
 	}
+
 	public void getOutPart(TCComponentItemRevision rev, String dir, List<String> list) throws TCException {
 		// 设备获取完成了 获取子键 全部 全获取 外购 判断当前 外购子键不判断
 		TCComponentItem item = rev.getItem();
@@ -780,8 +830,7 @@ public class Dfl028AIFDialog extends AbstractAIFDialog {
 			}
 		}
 		window.lock();
-		TCComponentBOMLine topLine = window.setWindowTopLine(
-				item, rev, null, null);
+		TCComponentBOMLine topLine = window.setWindowTopLine(item, rev, null, null);
 		AIFComponentContext[] children2 = new AIFComponentContext[4096];
 		children2 = topLine.getChildren();
 //		AIFComponentContext[] children = topLine.getChildren();
@@ -801,6 +850,7 @@ public class Dfl028AIFDialog extends AbstractAIFDialog {
 		window.unlock();
 		window.close();
 	}
+
 //	public TCComponentItemRevision findLatesStatus(TCComponentItemRevision rev) {
 //		TCComponentItemRevision latestRev=rev;
 //		try {
@@ -836,8 +886,8 @@ public class Dfl028AIFDialog extends AbstractAIFDialog {
 //		return latestRev;
 //	}
 	// 遍历bom视图，找出所有外协件 外购件 i判断是不是第一层外协外购
-	public void getOutPartInBom(TCComponentBOMLine bomLine,Boolean sxtj,int i,List<String> itemList,
-			String dir,List<String> list,int bomNum,String dirFs) throws TCException { 
+	public void getOutPartInBom(TCComponentBOMLine bomLine, Boolean sxtj, int i, List<String> itemList, String dir,
+			List<String> list, int bomNum, String dirFs) throws TCException {
 		TCComponentItemRevision rev = bomLine.getItemRevision();
 //		if(sxtj) { 
 //			rev=findLatesStatus(rev);
@@ -846,22 +896,24 @@ public class Dfl028AIFDialog extends AbstractAIFDialog {
 //			String revtype = rev.getStringProperty("object_type");
 		String revtype = rev.getType();// 真实值
 		if ((itemList.contains(revtype) && bomNum == 0) || allCheck || bomNum == 1) {
-				Boolean l=revtype.equals("T2_OutBuyPartRevision")||revtype.equals("T2_outsourceRevision")||revtype.equals("ItemRevision");
+			Boolean l = revtype.equals("T2_OutBuyPartRevision") || revtype.equals("T2_outsourceRevision")
+					|| revtype.equals("ItemRevision");
 			if (outPartBool && l) {
-					String dirString=jtf.getText()+File.separator+dir+File.separator+rev.getStringProperty("item_id")+"_"+
-							rev.getStringProperty("current_revision_id")+"_"+rev.getStringProperty("object_name");
-					dir=dir+File.separator+rev.getStringProperty("item_id")+"_"+
-							rev.getStringProperty("current_revision_id")+"_"+rev.getStringProperty("object_name");
+				String dirString = jtf.getText() + File.separator + dir + File.separator
+						+ rev.getStringProperty("item_id") + "_" + rev.getStringProperty("current_revision_id") + "_"
+						+ rev.getStringProperty("object_name");
+				dir = dir + File.separator + rev.getStringProperty("item_id") + "_"
+						+ rev.getStringProperty("current_revision_id") + "_" + rev.getStringProperty("object_name");
 				dirTop = dir;
 				File csFile = new File(dirString);
 				if (!csFile.exists()) {
 					csFile.mkdir();
 				}
 				if (bomLine.getChildren().length != 0) {
-						dirString=dirString+File.separator+rev.getStringProperty("item_id")+"_"+
-								rev.getStringProperty("current_revision_id")+"_"+rev.getStringProperty("object_name");
-						dir=dir+File.separator+rev.getStringProperty("item_id")+"_"+
-								rev.getStringProperty("current_revision_id")+"_"+rev.getStringProperty("object_name");
+					dirString = dirString + File.separator + rev.getStringProperty("item_id") + "_"
+							+ rev.getStringProperty("current_revision_id") + "_" + rev.getStringProperty("object_name");
+					dir = dir + File.separator + rev.getStringProperty("item_id") + "_"
+							+ rev.getStringProperty("current_revision_id") + "_" + rev.getStringProperty("object_name");
 
 					File csFile2 = new File(dirString);
 					if (!csFile2.exists()) {
@@ -872,17 +924,20 @@ public class Dfl028AIFDialog extends AbstractAIFDialog {
 				if (i == 0) {
 					pathMap.put("1", dir);
 					if (bomLine.getChildren().length != 0) {
-							dirString=dirString+File.separator+rev.getStringProperty("item_id")+"_"+
-									rev.getStringProperty("current_revision_id")+"_"+rev.getStringProperty("object_name");
+						dirString = dirString + File.separator + rev.getStringProperty("item_id") + "_"
+								+ rev.getStringProperty("current_revision_id") + "_"
+								+ rev.getStringProperty("object_name");
 						File csFile3 = new File(dirString);
 						if (!csFile3.exists()) {
 							csFile3.mkdir();
 						}
 
-							dir=dir+File.separator+rev.getStringProperty("item_id")+"_"+
-									rev.getStringProperty("current_revision_id")+"_"+rev.getStringProperty("object_name");
+						dir = dir + File.separator + rev.getStringProperty("item_id") + "_"
+								+ rev.getStringProperty("current_revision_id") + "_"
+								+ rev.getStringProperty("object_name");
+					}
 				}
-					}i++;
+				i++;
 			}
 			TCComponent[] datasets = rev.getReferenceListProperty("IMAN_specification");
 			TCComponent[] datasets2 = rev.getReferenceListProperty("IMAN_Rendering");
@@ -891,8 +946,7 @@ public class Dfl028AIFDialog extends AbstractAIFDialog {
 				TCComponentDataset dataset01 = null;
 				if (datasets[j] instanceof TCComponentDataset) {
 					dataset01 = (TCComponentDataset) datasets[j];
-					}
-					else {
+				} else {
 					continue;
 				}
 //					TCComponentDataset dataset01 = (TCComponentDataset) datasets[j];
@@ -958,10 +1012,12 @@ public class Dfl028AIFDialog extends AbstractAIFDialog {
 			}
 		}
 	}
+
 	private static void updateProgress(JProgressBar copyProgressBar, int progressSize) {
 		copyProgressBar.setString(progressSize + "%");
 		copyProgressBar.setValue(progressSize);
 	}
+
 	public Boolean getSxTj() {
 		List<String> tjlist = new ArrayList<String>();
 		Boolean statusBool = false;
@@ -984,4 +1040,21 @@ public class Dfl028AIFDialog extends AbstractAIFDialog {
 		}
 		return statusBool;
 	}
+	
+	public List<String> getIscarryRev() {
+		List<String> tjlist = new ArrayList<String>();
+		Boolean statusBool = false;
+		Component[] jcbs = btnPanel4.getComponents();
+		for (Component component : jcbs) {
+			if (component instanceof JCheckBox) {
+				JCheckBox jcb = (JCheckBox) component;
+				if (jcb.isSelected()) {
+					tjlist.add(jcb.getText());
+				}
+			}
+		}
+
+		return tjlist;
+	}
+	
 }

src/com/connor/dfl/plm/dfl042/Dfl042Dialog.java

@@ -134,7 +134,7 @@ public class Dfl042Dialog extends AbstractAIFDialog {
 //			public void mouseClicked(MouseEvent e){
 //				if(e.getButton() == MouseEvent.BUTTON3){
 //					//					tableRow = qryTable.rowAtPoint(e.getPoint());
-//					tableRow = qryTable.getSelectedRow();
+//					tableRow = .getSelectedRow();
 //					qryTable.setRowSelectionInterval(tableRow, tableRow);
 //					int indexRow = qryTable.convertRowIndexToModel(tableRow);
 //					System.out.println("indexRow=============="+indexRow);

src/com/connor/dfl/plm/dfl044/Dfl044Dialog.java

@@ -221,7 +221,6 @@ public class Dfl044Dialog extends AbstractAIFDialog {
 				}
 			}
 		    
-		    
 			sql2 = sb.toString();
 			System.out.println("sql===================="+sql2);
 			Stock = getRecords(sql2);
@@ -238,9 +237,9 @@ public class Dfl044Dialog extends AbstractAIFDialog {
 			System.out.println("11.05选择的下拉值单价======="+Select);
 		    if(!("".equals(userid.trim()))) {
 		    	if("".equals(Select) || " ".equals(Select) || "null".equals(Select)) {
-		    		numsSb.append(zhangtao + ".ccc_file inner join "+zhangtao+".ccz_file on ccz01=ccc02 and ccz02=ccc03 where ccc01='"+userid+"'");
+		    		numsSb.append(zhangtao + ".ccc_file inner join "+zhangtao+".ccz_file on ccz01=ccc02 and ccz02-1=ccc03 where ccc01='"+userid+"'");
 		    	}else {
-		    		numsSb.append(zhangtao1 + ".ccc_file inner join "+zhangtao1+".ccz_file on ccz01=ccc02 and ccz02=ccc03 where ccc01='"+userid+"'");
+		    		numsSb.append(zhangtao1 + ".ccc_file inner join "+zhangtao1+".ccz_file on ccz01=ccc02 and ccz02-1=ccc03 where ccc01='"+userid+"'");
 				}
 			}
 			String numsSql = numsSb.toString();

src/com/connor/dfl/plm/dfl045/Dfl045Operation.java

@@ -18,6 +18,7 @@ import java.util.stream.Collectors;
 
 import javax.swing.JComboBox;
 
+import org.apache.commons.lang.ObjectUtils.Null;
 import org.apache.poi.xssf.usermodel.XSSFCell;
 import org.apache.poi.xssf.usermodel.XSSFCellStyle;
 import org.apache.poi.xssf.usermodel.XSSFRow;
@@ -93,14 +94,18 @@ public class Dfl045Operation extends AbstractAIFOperation{
 		}
 		TCComponentDataset excel = (TCComponentDataset) session.stringToComponent(puid);
 		File file = ((TCComponentDataset)excel).getTcFiles()[0].getFmsFile();
-		SimpleDateFormat df = new SimpleDateFormat("yyyyMMddHHmmss");// 设置日期格式
+		SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");// 设置日期格式
+		SimpleDateFormat mmdf = new SimpleDateFormat("yyyyMMddHHmm");// 设置命名日期格式
 		Date startDate = df.parse(Starttime);
 		Date endDate = df.parse(Endtime);
 		String starttime = df.format(startDate);
+		String mmstart = mmdf.format(mmdf.parse(Starttime)) ;
 		String endtime = df.format(endDate);
+		String mmend = mmdf.format(mmdf.parse(Endtime)) ;
 		System.out.println("11.12start====="+Starttime+"======end======"+Endtime);
-		String[] keys = new String[] {"创建日期晚于","创建日期早于"};
-		String[] values = new String[] {Starttime,Endtime};
+		System.out.println("11.12start====="+starttime+"======end======"+endtime);
+		String[] keys = new String[] {"创建日期晚于","创建日期早于","任务状态不等于"};
+		String[] values = new String[] {Starttime,Endtime,"32"};
 		List<TCComponent> compList = queryObject("东富龙-查找已发起的流程", keys, values);
 		
 		pathRoute = pathRoute + File.separator + "流程报表【"+starttime+"】-【"+endtime+"】.xlsx";
@@ -320,16 +325,18 @@ public class Dfl045Operation extends AbstractAIFOperation{
 						//String task_type = comp.getStringProperty("task_type");
 						taskList.add(task_name);
 						//责任人
-						String resp_party = comp.getProperty("fnd0Performer");
-					//	System.out.println("11.12resp_party======"+resp_party);
-						taskList.add(resp_party);
-						//责任部门
+						String resp_party = null;
+						//责任部门valid_signoffs
 						String group = comp.getProperty("awp0Reviewers");
+						//System.out.println("11.19处理前========="+group);
 						if("".equals(group)) {
+							taskList.add(resp_party);
 							taskList.add(group);
 						}else {
 							String[] ss = group.split("/");
 							group = ss[0];
+							resp_party = ss[2];
+							taskList.add(resp_party);
 							taskList.add(group);
 						}
 						//开始时间
@@ -400,17 +407,18 @@ public class Dfl045Operation extends AbstractAIFOperation{
 						taskList.add(task_name);
 						
 						//责任人
-						String resp_party = comp.getProperty("fnd0Performer");
-					//	System.out.println("11.12resp_party======"+resp_party);
-						taskList.add(resp_party);
+						String resp_party = null;
 						//责任部门valid_signoffs
 						String group = comp.getProperty("awp0Reviewers");
 						//System.out.println("11.19处理前========="+group);
 						if("".equals(group)) {
+							taskList.add(resp_party);
 							taskList.add(group);
 						}else {
 							String[] ss = group.split("/");
 							group = ss[0];
+							resp_party = ss[2];
+							taskList.add(resp_party);
 							taskList.add(group);
 						}
 						//开始时间
@@ -499,7 +507,7 @@ public class Dfl045Operation extends AbstractAIFOperation{
 						//将单个的string集合给到beanlist1
 						List<String> beanList1 = makeList.get(k);
 						//System.out.println("11.16--beanList1.size====="+beanList1.size());
-						for(int l = 5 , m = 0 ; l<beanList1.size()+5 ; l++ , m++ ) {
+						for(int l = 4 , m = 0 ; l<beanList1.size()+4 ; l++ , m++ ) {
 							//System.out.println("int-l-11.17========"+l);
 							XSSFRow row2 = sheet.getRow(o);
 							XSSFCell excelCell2 = null;
@@ -523,7 +531,7 @@ public class Dfl045Operation extends AbstractAIFOperation{
 						//将单个的string集合给到beanlist1
 						List<String> beanList1 = examineList.get(k);
 						//System.out.println("11.16--beanList1.size====="+beanList1.size());
-						for(int l = 5 , m = 0 ; l<beanList1.size()+5 ; l++ , m++ ) {
+						for(int l = 4 , m = 0 ; l<beanList1.size()+4 ; l++ , m++ ) {
 							//System.out.println("int-l-11.17========"+l);
 							XSSFRow row2 = sheet.getRow(o);
 							XSSFCell excelCell2 = null;
@@ -547,7 +555,7 @@ public class Dfl045Operation extends AbstractAIFOperation{
 						//将单个的string集合给到beanlist1
 						List<String> beanList1 = approvalList.get(k);
 						//System.out.println("11.16--beanList1.size====="+beanList1.size());
-						for(int l = 5 , m = 0 ; l<beanList1.size()+5 ; l++ , m++ ) {
+						for(int l = 4 , m = 0 ; l<beanList1.size()+4 ; l++ , m++ ) {
 							//System.out.println("int-l-11.17========"+l);
 							XSSFRow row2 = sheet.getRow(o);
 							XSSFCell excelCell2 = null;
@@ -682,16 +690,18 @@ public class Dfl045Operation extends AbstractAIFOperation{
 						//String task_type = comp.getStringProperty("task_type");
 						taskList.add(task_name);
 						//责任人
-						String resp_party = comp.getProperty("fnd0Performer");
-					//	System.out.println("11.12resp_party======"+resp_party);
-						taskList.add(resp_party);
-						//责任部门
+						String resp_party = null;
+						//责任部门valid_signoffs
 						String group = comp.getProperty("awp0Reviewers");
+						//System.out.println("11.19处理前========="+group);
 						if("".equals(group)) {
+							taskList.add(resp_party);
 							taskList.add(group);
 						}else {
 							String[] ss = group.split("/");
 							group = ss[0];
+							resp_party = ss[2];
+							taskList.add(resp_party);
 							taskList.add(group);
 						}
 						//开始时间
@@ -761,16 +771,18 @@ public class Dfl045Operation extends AbstractAIFOperation{
 						//String task_type = comp.getStringProperty("task_type");
 						taskList.add(task_name);
 						//责任人
-						String resp_party = comp.getProperty("fnd0Performer");
-					//	System.out.println("11.12resp_party======"+resp_party);
-						taskList.add(resp_party);
-						//责任部门
+						String resp_party = null;
+						//责任部门valid_signoffs
 						String group = comp.getProperty("awp0Reviewers");
+						//System.out.println("11.19处理前========="+group);
 						if("".equals(group)) {
+							taskList.add(resp_party);
 							taskList.add(group);
 						}else {
 							String[] ss = group.split("/");
 							group = ss[0];
+							resp_party = ss[2];
+							taskList.add(resp_party);
 							taskList.add(group);
 						}
 						//开始时间
@@ -850,7 +862,7 @@ public class Dfl045Operation extends AbstractAIFOperation{
 
 					for (int k=0 ;k<makeList.size();k++) {
 						List<String> beanList1 = makeList.get(k);
-						for(int l = 5 , m = 0 ; l<beanList1.size()+5 ; l++ , m++ ) {
+						for(int l = 4 , m = 0 ; l<beanList1.size()+4 ; l++ , m++ ) {
 							XSSFRow row2 = sheet.getRow(o);
 							XSSFCell excelCell2 = null;
 							if(row2 == null){
@@ -868,7 +880,7 @@ public class Dfl045Operation extends AbstractAIFOperation{
 					for (int k=0 ;k<examineList.size();k++) {
 
 						List<String> beanList1 = examineList.get(k);
-						for(int l = 5 , m = 0 ; l<beanList1.size()+5 ; l++ , m++ ) {
+						for(int l = 4 , m = 0 ; l<beanList1.size()+4 ; l++ , m++ ) {
 
 							XSSFRow row2 = sheet.getRow(o);
 							XSSFCell excelCell2 = null;
@@ -892,7 +904,7 @@ public class Dfl045Operation extends AbstractAIFOperation{
 						//将单个的string集合给到beanlist1
 						List<String> beanList1 = approvalList.get(k);
 						//System.out.println("11.16--beanList1.size====="+beanList1.size());
-						for(int l = 5 , m = 0 ; l<beanList1.size()+5 ; l++ , m++ ) {
+						for(int l = 4 , m = 0 ; l<beanList1.size()+4 ; l++ , m++ ) {
 							//System.out.println("int-l-11.17========"+l);
 							XSSFRow row2 = sheet.getRow(o);
 							XSSFCell excelCell2 = null;
@@ -1024,16 +1036,18 @@ public class Dfl045Operation extends AbstractAIFOperation{
 						//String task_type = comp.getStringProperty("task_type");
 						taskList.add(task_name);
 						//责任人
-						String resp_party = comp.getProperty("fnd0Performer");
-					//	System.out.println("11.12resp_party======"+resp_party);
-						taskList.add(resp_party);
-						//责任部门
+						String resp_party = null;
+						//责任部门valid_signoffs
 						String group = comp.getProperty("awp0Reviewers");
+						//System.out.println("11.19处理前========="+group);
 						if("".equals(group)) {
+							taskList.add(resp_party);
 							taskList.add(group);
 						}else {
 							String[] ss = group.split("/");
 							group = ss[0];
+							resp_party = ss[2];
+							taskList.add(resp_party);
 							taskList.add(group);
 						}
 						//开始时间
@@ -1103,19 +1117,20 @@ public class Dfl045Operation extends AbstractAIFOperation{
 						//String task_type = comp.getStringProperty("task_type");
 						taskList.add(task_name);
 						//责任人
-						String resp_party = comp.getProperty("fnd0Performer");
-					//	System.out.println("11.12resp_party======"+resp_party);
-						taskList.add(resp_party);
-						//责任部门
+						String resp_party = null;
+						//责任部门valid_signoffs
 						String group = comp.getProperty("awp0Reviewers");
+						//System.out.println("11.19处理前========="+group);
 						if("".equals(group)) {
+							taskList.add(resp_party);
 							taskList.add(group);
 						}else {
 							String[] ss = group.split("/");
 							group = ss[0];
+							resp_party = ss[2];
+							taskList.add(resp_party);
 							taskList.add(group);
 						}
-						
 						//开始时间
 						String fnd0StartDate = comp.getProperty("fnd0StartDate");
 						taskList.add(fnd0StartDate);
@@ -1183,16 +1198,18 @@ public class Dfl045Operation extends AbstractAIFOperation{
 						//String task_type = comp.getStringProperty("task_type");
 						taskList.add(task_name);
 						//责任人
-						String resp_party = comp.getProperty("fnd0Performer");
-					//	System.out.println("11.12resp_party======"+resp_party);
-						taskList.add(resp_party);
-						//责任部门
+						String resp_party = null;
+						//责任部门valid_signoffs
 						String group = comp.getProperty("awp0Reviewers");
+						//System.out.println("11.19处理前========="+group);
 						if("".equals(group)) {
+							taskList.add(resp_party);
 							taskList.add(group);
 						}else {
 							String[] ss = group.split("/");
 							group = ss[0];
+							resp_party = ss[2];
+							taskList.add(resp_party);
 							taskList.add(group);
 						}
 						//开始时间
@@ -1280,7 +1297,7 @@ public class Dfl045Operation extends AbstractAIFOperation{
 						//将单个的string集合给到beanlist1
 						List<String> beanList1 = makeList.get(k);
 						//System.out.println("11.16--beanList1.size====="+beanList1.size());
-						for(int l = 5 , m = 0 ; l<beanList1.size()+5 ; l++ , m++ ) {
+						for(int l = 4 , m = 0 ; l<beanList1.size()+4 ; l++ , m++ ) {
 							//System.out.println("int-l-11.17========"+l);
 							XSSFRow row2 = sheet.getRow(o);
 							XSSFCell excelCell2 = null;
@@ -1304,7 +1321,7 @@ public class Dfl045Operation extends AbstractAIFOperation{
 						//将单个的string集合给到beanlist1
 						List<String> beanList1 = examineList.get(k);
 						//System.out.println("11.16--beanList1.size====="+beanList1.size());
-						for(int l = 5 , m = 0 ; l<beanList1.size()+5 ; l++ , m++ ) {
+						for(int l = 4 , m = 0 ; l<beanList1.size()+4 ; l++ , m++ ) {
 							//System.out.println("int-l-11.17========"+l);
 							XSSFRow row2 = sheet.getRow(o);
 							XSSFCell excelCell2 = null;
@@ -1328,7 +1345,7 @@ public class Dfl045Operation extends AbstractAIFOperation{
 						//将单个的string集合给到beanlist1
 						List<String> beanList1 = approvalList.get(k);
 						//System.out.println("11.16--beanList1.size====="+beanList1.size());
-						for(int l = 5 , m = 0 ; l<beanList1.size()+5 ; l++ , m++ ) {
+						for(int l = 4 , m = 0 ; l<beanList1.size()+4 ; l++ , m++ ) {
 							//System.out.println("int-l-11.17========"+l);
 							XSSFRow row2 = sheet.getRow(o);
 							XSSFCell excelCell2 = null;
@@ -1352,7 +1369,7 @@ public class Dfl045Operation extends AbstractAIFOperation{
 						//将单个的string集合给到beanlist1
 						List<String> beanList1 = wukonglList.get(k);
 						//System.out.println("11.16--beanList1.size====="+beanList1.size());
-						for(int l = 5 , m = 0 ; l<beanList1.size()+5 ; l++ , m++ ) {
+						for(int l = 4 , m = 0 ; l<beanList1.size()+4 ; l++ , m++ ) {
 							//System.out.println("int-l-11.17========"+l);
 							XSSFRow row2 = sheet.getRow(o);
 							XSSFCell excelCell2 = null;
@@ -1389,18 +1406,19 @@ public class Dfl045Operation extends AbstractAIFOperation{
 		
 		List<String> userList = new  ArrayList<String>();
 		List<List> newList = new ArrayList<List>();
+		
+
+		for(int i=0;i<oneList.size();i++) {
 			double zongshu = 1;
 			double yuqishu = 0;
 			double yuqilv = 0;
 			
-		for(int i=0;i<oneList.size();i++) {
-			
 			List<String> array = new ArrayList<String>();
 			List<String> Overdue = new  ArrayList<String>();
 			array = oneList.get(i);
 			String user = array.get(0);
 			
-			System.out.println("11.22user==========="+user);
+			System.out.println("11.24======array==========="+array);
 			//定义和赋值集合中的元素
 			String group = array.get(1);
 			String rate = array.get(2);
@@ -1419,7 +1437,7 @@ public class Dfl045Operation extends AbstractAIFOperation{
 			Overdue.add(zongString);
 			Overdue.add(yuqiString);
 			Overdue.add(yuqilvString+"%");
-			
+			//判断是否有重复的用户
 			boolean a = userList.contains(user); 
 			//System.out.println("11.22===a========="+a);
 			if(a==true) {
@@ -1442,12 +1460,14 @@ public class Dfl045Operation extends AbstractAIFOperation{
 							yuanyuqishu++;
 							yuqiString = String.valueOf(yuanyuqishu);
 							System.out.println("11.22=====yuqiString======"+yuqiString);
-							beanList2.set(3, zongString);
+							beanList2.set(3, yuqiString);
 							list.set(j, beanList2);
 						}
 						//计算逾期率
+						System.out.println("11.24=====yuqishu"+beanList2.get(3));
 						zongshu = Double.valueOf(beanList2.get(2));
 						yuqishu = Double.valueOf(beanList2.get(3));
+						
 						yuqilv = yuqishu/zongshu*100;
 						yuqilvString = String.valueOf(yuqilv)+"%";
 						beanList2.set(4, yuqilvString);
@@ -1459,13 +1479,13 @@ public class Dfl045Operation extends AbstractAIFOperation{
 			}else //如果不是就正常添加
 			{
 				userList.add(user);
-				//System.out.println("11.22====list======="+list);
+				//System.out.println("11.24====Overdue======="+Overdue);
 				list.add(Overdue);
 			}
 			
 		}
-		System.out.println("11.22userlist==========="+userList);
-		System.out.println("11.22====list====="+list);
+//		System.out.println("11.22userlist==========="+userList);
+//		System.out.println("11.22====list====="+list);
 		for(int k=0;k<list.size();k++) {
 			List<String> Overdue1 = new  ArrayList<String>();
 			Overdue1 = list.get(k);

src/com/connor/dfl/plm/dfl046/test.java

@@ -97,7 +97,6 @@ public class test extends AbstractAIFOperation {
 							if(names[names.length-2].equals(zts[0])) {
 								this.zhangtao = zts[1];
 								System.out.println("11.04ÕËÌ×======"+zhangtao);
-								
 								break;
 							}
 						}
@@ -867,7 +866,7 @@ public class test extends AbstractAIFOperation {
 	private String getPrice () {
 		String price = null;
 		String sql = null;
-		sql  = "select ccc23a from " +zhangtao + ".ccc_file inner join "+zhangtao+".ccz_file on ccz01=ccc02 and ccz02=ccc03 where ccc01='"+item_id1+"'";
+		sql  = "select ccc23a from " +zhangtao + ".ccc_file inner join "+zhangtao+".ccz_file on ccz01=ccc02 and ccz02-1=ccc03 where ccc01='"+item_id1+"'";
 		System.out.println("sql======"+sql);
 		try {
 			price = data.getRecord(sql);

src/com/connor/dfl/plm/exportBOM/test.java

@@ -765,8 +765,8 @@ public class test extends AbstractAIFOperation {
 			item_id1 = rev.getStringProperty("item_id");
 			rev_id1 = rev.getStringProperty("item_revision_id");
 			name1 = rev.getStringProperty("object_name");
-			price1 = getPrice();
-			total1 = getTotal(design_num1,price1);
+//			price1 = getPrice();
+//			total1 = getTotal(design_num1,price1);
 			if("T2_outsourceRevision".equals(type)) {
 				xuhao1 = num ;
 				String classID = item_id1.substring(0, 2);
@@ -864,38 +864,38 @@ public class test extends AbstractAIFOperation {
 		     	}
 		}
 	
-	private String getPrice () {
-		String price = null;
-		String sql = null;
-		sql  = "select ccc23a from " +zhangtao + ".ccc_file inner join "+zhangtao+".ccz_file on ccz01=ccc02 and ccz02=ccc03 where ccc01='"+item_id1+"'";
-		System.out.println("sql======"+sql);
-		try {
-			price = data.getRecord(sql);
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		System.out.println("11.08==price=="+price);
-		if(price == null  ) {
-			price  ="";
-	  }
-		return price;
-	}
-	
-	private String getTotal(String quantity,String price) {
-		// TODO Auto-generated method stub
-		if("".equals(price)||" ".equals(price)||"null".equals(price)) {
-			price = "0";
-		}
-		String total;
-		double amount =  Double.valueOf(quantity).doubleValue();
-		double tariff = Double.valueOf(price).doubleValue();
-		double product = amount * tariff ;
-		
-		total = ""+product;
-		System.out.println("11.08==×ܼÛ====="+total);
-		return total;
-	}
+//	private String getPrice () {
+//		String price = null;
+//		String sql = null;
+//		sql  = "select ccc23a from " +zhangtao + ".ccc_file inner join "+zhangtao+".ccz_file on ccz01=ccc02 and ccz02=ccc03 where ccc01='"+item_id1+"'";
+//		System.out.println("sql======"+sql);
+//		try {
+//			price = data.getRecord(sql);
+//		} catch (Exception e) {
+//			// TODO Auto-generated catch block
+//			e.printStackTrace();
+//		}
+//		System.out.println("11.08==price=="+price);
+//		if(price == null  ) {
+//			price  ="";
+//	  }
+//		return price;
+//	}
+//	
+//	private String getTotal(String quantity,String price) {
+//		// TODO Auto-generated method stub
+//		if("".equals(price)||" ".equals(price)||"null".equals(price)) {
+//			price = "0";
+//		}
+//		String total;
+//		double amount =  Double.valueOf(quantity).doubleValue();
+//		double tariff = Double.valueOf(price).doubleValue();
+//		double product = amount * tariff ;
+//		
+//		total = ""+product;
+//		System.out.println("11.08==×ܼÛ====="+total);
+//		return total;
+//	}
  //Æ¥Åä·ÖȺÂë
 	private void getgroup() {
 		if("F10".equals(group1)) {