diff --git a/plugin.xml b/plugin.xml index af942d6..44e00a4 100644 --- a/plugin.xml +++ b/plugin.xml @@ -227,7 +227,7 @@ - + @@ -508,6 +508,7 @@ + @@ -763,19 +764,7 @@ - - - - - - - - - - - - - + diff --git a/src/com/connor/dfl/plm/dfl020/Dfl020Operation.java b/src/com/connor/dfl/plm/dfl020/Dfl020Operation.java index 0f3264b..c5b2bf9 100644 --- a/src/com/connor/dfl/plm/dfl020/Dfl020Operation.java +++ b/src/com/connor/dfl/plm/dfl020/Dfl020Operation.java @@ -372,6 +372,18 @@ public class Dfl020Operation extends AbstractAIFOperation{ beizhu = ""; } else { beizhu = bean.getBeizhu(); + if(beizhu.contains("&")) { + beizhu = beizhu.replace("&", "&"); + } + if(beizhu.contains("<")) { + beizhu = beizhu.replace("<", "<"); + } + if(beizhu.contains(">")) { + beizhu = beizhu.replace(">", ">"); + } + if(beizhu.contains("\"")) { + beizhu = beizhu.replace("\"", """); + } } String xh = ""; String yj = ""; @@ -481,9 +493,7 @@ public class Dfl020Operation extends AbstractAIFOperation{ if(num==null||"".equals(num.trim())) { num = childLine.getStringProperty( "bl_quantity");// if(num==null||"".equals(num.trim())) { - MessageBox.post("BOMΪգд", - "ʾ", MessageBox.ERROR); - break; + num = "1"; } } } @@ -554,15 +564,23 @@ public class Dfl020Operation extends AbstractAIFOperation{ return; } String childID = childLine.getItem().getStringProperty("item_id"); - String Quantity = childLine.getStringProperty( "T2_ActualConsumption");//ʵ + String childtypeString = childLine.getItem().getStringProperty("object_type"); + String childRevstring = childLine.getItemRevision().getStringProperty("item_revision_id"); + if("T2_outsource".equals(childtypeString)) { + StringBuilder sb = new StringBuilder(childID); + sb.append(childRevstring); + childID = sb.toString(); + } + System.out.println("childID2============"+childID); + String Quantity = childLine.getStringProperty( "T2_ActualConsumption");//ʵ if(Quantity==null||"".equals(Quantity.trim())) { Quantity = childLine.getStringProperty( "T2_DesignQuantity");// if(Quantity==null||"".equals(Quantity.trim())) { Quantity = childLine.getStringProperty( "bl_quantity");// if(Quantity==null||"".equals(Quantity.trim())) { - return; + Quantity =1+"";//ĬΪ1 } - } + } } System.out.println("Quantity=============="+Quantity); if(idList.contains(childID)) { @@ -600,12 +618,12 @@ public class Dfl020Operation extends AbstractAIFOperation{ System.out.println("childID============"+childID); System.out.println("childRev============"+childRev); System.out.println("childType============"+childType); - if("T2_outsource".equals(childType)) { - StringBuilder sb = new StringBuilder(childID); - sb.append(childRev); - childID = sb.toString(); - } - System.out.println("childID2============"+childID); +// if("T2_outsource".equals(childType)) { +// StringBuilder sb = new StringBuilder(childID); +// sb.append(childRev); +// childID = sb.toString(); +// } + childBean.setPinhao(childID);//ԪҲƷ //ȡdateתΪString java.text.SimpleDateFormat formatter = new SimpleDateFormat( "yyyy/MM/dd"); diff --git a/src/com/connor/dfl/plm/dfl041/CreateNoemBOMDialogs.java b/src/com/connor/dfl/plm/dfl041/CreateNoemBOMDialogs.java index 29a8603..1289e4f 100644 --- a/src/com/connor/dfl/plm/dfl041/CreateNoemBOMDialogs.java +++ b/src/com/connor/dfl/plm/dfl041/CreateNoemBOMDialogs.java @@ -427,11 +427,12 @@ public class CreateNoemBOMDialogs extends AbstractAIFDialog { //bomline TCComponentBOMLine childBomline = line.add(newItem, newItem.getLatestItemRevision(), null, false, ""); - childBomline.setStringProperty("bl_quantity", "1"); + childBomline.setStringProperty("bl_quantity", "1");//bomlineΪ1 //ҵ if (sysandjob.contains("$")) { job_num = sysandjobsz[1];//ҵ childBomline.setStringProperty("T2_JobNumber", job_num);//bomlineҵ + } } diff --git a/src/com/connor/dfl/plm/dfl042/DataBaseControl2.java b/src/com/connor/dfl/plm/dfl042/DataBaseControl2.java index 44b567b..b8e2c1e 100644 --- a/src/com/connor/dfl/plm/dfl042/DataBaseControl2.java +++ b/src/com/connor/dfl/plm/dfl042/DataBaseControl2.java @@ -636,10 +636,11 @@ public class DataBaseControl2 { ResultSet rs = dbQuery(sql); while (rs.next()) { ERPTransferStatusbean bean = new ERPTransferStatusbean(); - bean.setfun(rs.getString(1)); - bean.setitem_id(rs.getString(2)); - bean.setzhangtao(rs.getString(3)); - bean.setUser_id(rs.getString(4)); + bean.setID(rs.getInt(1)); + bean.setfun(rs.getString(2)); + bean.setitem_id(rs.getString(3)); + bean.setzhangtao(rs.getString(4)); + bean.setUser_id(rs.getString(5)); list.add(bean); } closeDataBase(); diff --git a/src/com/connor/dfl/plm/dfl042/Dfl042Dialog.java b/src/com/connor/dfl/plm/dfl042/Dfl042Dialog.java index a450577..66605b9 100644 --- a/src/com/connor/dfl/plm/dfl042/Dfl042Dialog.java +++ b/src/com/connor/dfl/plm/dfl042/Dfl042Dialog.java @@ -9,7 +9,10 @@ import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.lang.reflect.InvocationTargetException; +import java.time.Year; import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; import java.util.List; import java.util.MissingResourceException; @@ -25,6 +28,8 @@ import javax.swing.table.DefaultTableModel; import javax.swing.table.TableCellRenderer; import javax.swing.table.TableRowSorter; +import org.jacorb.idl.runtime.int_token; + import com.connor.dfl.plm.dfl042.ERPTransferStatusbean; import com.connor.dfl.plm.util.DataBaseControl; import com.teamcenter.rac.aif.AbstractAIFDialog; @@ -38,6 +43,8 @@ import com.teamcenter.rac.util.MessageBox; import com.teamcenter.rac.util.PropertyLayout; import com.teamcenter.rac.util.Registry; +import sun.awt.www.content.audio.x_aiff; + public class Dfl042Dialog extends AbstractAIFDialog { private static final long serialVersionUID = 6130114042631785757L; @@ -56,7 +63,7 @@ public class Dfl042Dialog extends AbstractAIFDialog { private JTextField useridField; private JTextField specField; private JTextField cangKField; - private StringBuilder sb = new StringBuilder("select FUN,TXT_PINHAO,ZHANGTAO,USERID from DFL_SEND_TXT_TO_ERP where STATUS = 0 "); + private StringBuilder sb = new StringBuilder("select ID,FUN,TXT_PINHAO,ZHANGTAO,USERID from DFL_SEND_TXT_TO_ERP where STATUS = 0 "); private StringBuilder numsSb = new StringBuilder("select count(*) from DFL_SEND_TXT_TO_ERP where STATUS = 0 "); private String sql2 = ""; private JComboBox zhangTBox; @@ -350,23 +357,32 @@ public class Dfl042Dialog extends AbstractAIFDialog { try { list = data.getRecord(sql); list.toString(); + //System.out.println("list9.27====="+list); } catch (Exception e) { // TODO Auto-generated catch block e.printStackTrace(); } + System.out.println("ǰ:-----"+list.toString()); if(list == null || list.size() <= 0 ) { MessageBox.post("ݿδҵӦݣ ȫݣ", "", MessageBox.ERROR); return null; + }else { + Collections.sort(list, new Comparator() { + @Override + public int compare(ERPTransferStatusbean o1, ERPTransferStatusbean o2) { + // + return o1.getID().compareTo(o2.getID()); + } + }); } - + System.out.println(":-----"+list.toString()); //װ Object res[][] = new Object[list.size()][this.columnNames.length]; int i=0; for (ERPTransferStatusbean record : list) { - + //͵Ĵ String transtype = null; - if("CreateItemMasterDataRequest".equals(record.getfun())) { transtype = ""; }else if("CreatePLMBOMDataRequest".equals(record.getfun())){ diff --git a/src/com/connor/dfl/plm/dfl042/ERPTransferStatusbean.java b/src/com/connor/dfl/plm/dfl042/ERPTransferStatusbean.java index 259e681..cec45cf 100644 --- a/src/com/connor/dfl/plm/dfl042/ERPTransferStatusbean.java +++ b/src/com/connor/dfl/plm/dfl042/ERPTransferStatusbean.java @@ -3,12 +3,18 @@ package com.connor.dfl.plm.dfl042; import javax.swing.JTextField; public class ERPTransferStatusbean { - + private Integer ID; //ID private String fun; // private String item_id;//Ʒ private String zhangtao;// private String User_id;//ûid + public Integer getID() { + return ID; + } + public void setID(Integer ID) { + this.ID = ID; + } public String getfun() { return fun; } diff --git a/src/com/connor/dfl/plm/exportBOM/BOMExportHandler.java b/src/com/connor/dfl/plm/exportBOM/BOMExportHandler.java index 28a63b4..8b457d3 100644 --- a/src/com/connor/dfl/plm/exportBOM/BOMExportHandler.java +++ b/src/com/connor/dfl/plm/exportBOM/BOMExportHandler.java @@ -42,7 +42,7 @@ public class BOMExportHandler extends AbstractHandler { //DL2_VehicleRevision DL2_EBOM if(app.getTargetComponent() instanceof TCComponentBOMLine){ TCSession session=(TCSession) app.getSession(); - BOMExportOperation operation=new BOMExportOperation(app, session); + test operation=new test(app, session); session.queueOperation(operation); }else{ MessageBox.post("ѡBOMLine","",2); diff --git a/src/com/connor/dfl/plm/exportBOM/BOMExportOperation.java b/src/com/connor/dfl/plm/exportBOM/BOMExportOperation.java index dbe5913..461f5e6 100644 --- a/src/com/connor/dfl/plm/exportBOM/BOMExportOperation.java +++ b/src/com/connor/dfl/plm/exportBOM/BOMExportOperation.java @@ -53,10 +53,11 @@ public class BOMExportOperation extends AbstractAIFOperation { private List idlist = new ArrayList(); private List errList = new ArrayList(); - private String xuninum = "0"; + private String xuninum = "1"; private String xuanzhongid = null; private String item_id1 = "";//Ʒ item_id + private String rev_id1 = ""; //汾 item_revision_id private String name1 = "";// object_name private String spec1 = "";// private String unit1 = "";//λ t2_unit @@ -86,7 +87,7 @@ public class BOMExportOperation extends AbstractAIFOperation { } try { System.out.println("ʼȡBOMģ"); - String puid = session.getPreferenceService().getStringValue("DFL_BOM_UID2"); + String puid = session.getPreferenceService().getStringValue("DFL_BOM_UID"); System.out.println("puid======================"+puid); if (puid == null||"".equals(puid)) { MessageBox.post("ѡDFL_BOM_UIDδ,ϵԱ!!", @@ -180,26 +181,27 @@ public class BOMExportOperation extends AbstractAIFOperation { } //жǷbomline if(comp instanceof TCComponentBOMLine) { - //汾⹺汾Э汾ȡ + //жǷΪ贫ݵ if (!"Reference".equals(occType)) { + //汾⹺汾Э汾ȡ if("T2_outsourceRevision".equals(type) || "T2_OutBuyPartRevision".equals(type)) { //+1 num++; - //жǷΪ贫ݵ - - List beanList1 = new ArrayList(); //ĶǿתΪbomline TCComponentBOMLine ziLine = (TCComponentBOMLine) comp; + getItemValue1(ziLine,level,num); + List beanList1 = new ArrayList(); + double a = Double.valueOf(xuninum).doubleValue(); System.out.println("a--915======"+a); double b = Double.valueOf(design_num1).doubleValue(); System.out.println("b--915======"+b); - double c = Double.valueOf(firstnum).doubleValue(); - System.out.println("c--915======"+c); +// double c = Double.valueOf(firstnum).doubleValue(); +// System.out.println("c--915======"+c); double d = a*b; design_num1 = ""+d; System.out.println("design_num9.15======"+design_num1); @@ -207,6 +209,7 @@ public class BOMExportOperation extends AbstractAIFOperation { //Եַ beanList1.add(xuhao2); beanList1.add(item_id1); + beanList1.add(rev_id1); beanList1.add(name1); //beanList1.add(lev1); //Ҫ㼶 beanList1.add(spec1); @@ -240,7 +243,7 @@ public class BOMExportOperation extends AbstractAIFOperation { if(include1 == panduan) { String numString = null; for(int k = 0 ; k<=beanList2.size() ; k++) { - numString = beanList2.get(5); + numString = beanList2.get(6); System.out.println("9.18====="+numString); } double before = Double.valueOf(numString).doubleValue(); @@ -248,7 +251,7 @@ public class BOMExportOperation extends AbstractAIFOperation { double sum = before+add; //String sum = ""+before+add; System.out.println("9.18sum====="+sum); - beanList2.set(5, ""+sum); + beanList2.set(6, ""+sum); list.set(j, beanList2); } } @@ -690,7 +693,7 @@ public class BOMExportOperation extends AbstractAIFOperation { else if(design_num1 == null || "".equals(design_num1) || " ".equals(design_num1)) { design_num1 = comp.getStringProperty("bl_quantity"); if(design_num1 == null || "".equals(design_num1) || " ".equals(design_num1)) { - design_num1 = "0"; + design_num1 = "1"; } } } @@ -703,10 +706,12 @@ public class BOMExportOperation extends AbstractAIFOperation { weihao1 = comp.getStringProperty("T2_weihao"); importance1 = comp.getStringProperty("t2_BOMImportance"); item_id1 = rev.getStringProperty("item_id"); + rev_id1 = rev.getStringProperty("item_revision_id"); name1 = rev.getStringProperty("object_name"); if("T2_outsourceRevision".equals(type)) { xuhao1 = num ; String classID = item_id1.substring(0, 2); + item_id1 = item_id1+rev_id1; System.out.println("classID==============="+classID); if("51".equals(classID) || "72".equals(classID) || "76".equals(classID)) {