diff --git a/bin/com/connor/ld/importsj/handlers/HistoryFolderDialog$1.class b/bin/com/connor/ld/importsj/handlers/HistoryFolderDialog$1.class deleted file mode 100644 index 56c25ea..0000000 Binary files a/bin/com/connor/ld/importsj/handlers/HistoryFolderDialog$1.class and /dev/null differ diff --git a/bin/com/connor/ld/importsj/handlers/HistoryFolderDialog$2.class b/bin/com/connor/ld/importsj/handlers/HistoryFolderDialog$2.class deleted file mode 100644 index ebf8924..0000000 Binary files a/bin/com/connor/ld/importsj/handlers/HistoryFolderDialog$2.class and /dev/null differ diff --git a/bin/com/connor/ld/importsj/handlers/HistoryFolderDialog$3.class b/bin/com/connor/ld/importsj/handlers/HistoryFolderDialog$3.class deleted file mode 100644 index a3db696..0000000 Binary files a/bin/com/connor/ld/importsj/handlers/HistoryFolderDialog$3.class and /dev/null differ diff --git a/bin/com/connor/ld/importsj/handlers/HistoryFolderDialog$ExcelFileFilter.class b/bin/com/connor/ld/importsj/handlers/HistoryFolderDialog$ExcelFileFilter.class index 46d6bab..0c9130c 100644 Binary files a/bin/com/connor/ld/importsj/handlers/HistoryFolderDialog$ExcelFileFilter.class and b/bin/com/connor/ld/importsj/handlers/HistoryFolderDialog$ExcelFileFilter.class differ diff --git a/bin/com/connor/ld/importsj/handlers/HistoryFolderDialog.class b/bin/com/connor/ld/importsj/handlers/HistoryFolderDialog.class index ccc32f2..06c1a04 100644 Binary files a/bin/com/connor/ld/importsj/handlers/HistoryFolderDialog.class and b/bin/com/connor/ld/importsj/handlers/HistoryFolderDialog.class differ diff --git a/bin/com/connor/ld/importsj/handlers/ImportGYLXMatnrHandler.class b/bin/com/connor/ld/importsj/handlers/ImportGYLXMatnrHandler.class index 89db6c2..7eb4445 100644 Binary files a/bin/com/connor/ld/importsj/handlers/ImportGYLXMatnrHandler.class and b/bin/com/connor/ld/importsj/handlers/ImportGYLXMatnrHandler.class differ diff --git a/bin/com/connor/ld/importsj/handlers/ImportMatnrHandler.class b/bin/com/connor/ld/importsj/handlers/ImportMatnrHandler.class index 3d4fe46..a28391b 100644 Binary files a/bin/com/connor/ld/importsj/handlers/ImportMatnrHandler.class and b/bin/com/connor/ld/importsj/handlers/ImportMatnrHandler.class differ diff --git a/bin/com/connor/ld/importsj/handlers/SoaUtils.class b/bin/com/connor/ld/importsj/handlers/SoaUtils.class index 0a496b7..ecf4c23 100644 Binary files a/bin/com/connor/ld/importsj/handlers/SoaUtils.class and b/bin/com/connor/ld/importsj/handlers/SoaUtils.class differ diff --git a/bin/com/connor/ld/sendBOMMesJc/FbomAndCbom.class b/bin/com/connor/ld/sendBOMMesJc/FbomAndCbom.class index 2f5f538..f1980b1 100644 Binary files a/bin/com/connor/ld/sendBOMMesJc/FbomAndCbom.class and b/bin/com/connor/ld/sendBOMMesJc/FbomAndCbom.class differ diff --git a/bin/com/connor/ld/sendBOMMesJc/SendBOMHandler$1.class b/bin/com/connor/ld/sendBOMMesJc/SendBOMHandler$1.class deleted file mode 100644 index 93cbbc3..0000000 Binary files a/bin/com/connor/ld/sendBOMMesJc/SendBOMHandler$1.class and /dev/null differ diff --git a/bin/com/connor/ld/sendBOMMesJc/SendBOMHandler.class b/bin/com/connor/ld/sendBOMMesJc/SendBOMHandler.class index 42a755b..cf721d1 100644 Binary files a/bin/com/connor/ld/sendBOMMesJc/SendBOMHandler.class and b/bin/com/connor/ld/sendBOMMesJc/SendBOMHandler.class differ diff --git a/bin/com/connor/ld/sendBOMMesJc/SendBOMOpertion$1.class b/bin/com/connor/ld/sendBOMMesJc/SendBOMOpertion$1.class deleted file mode 100644 index c5b5b92..0000000 Binary files a/bin/com/connor/ld/sendBOMMesJc/SendBOMOpertion$1.class and /dev/null differ diff --git a/bin/com/connor/ld/sendBOMMesJc/SendBOMOpertion$2.class b/bin/com/connor/ld/sendBOMMesJc/SendBOMOpertion$2.class deleted file mode 100644 index 6337fcc..0000000 Binary files a/bin/com/connor/ld/sendBOMMesJc/SendBOMOpertion$2.class and /dev/null differ diff --git a/bin/com/connor/ld/sendBOMMesJc/SendBOMOpertion.class b/bin/com/connor/ld/sendBOMMesJc/SendBOMOpertion.class index d641d1b..ae68146 100644 Binary files a/bin/com/connor/ld/sendBOMMesJc/SendBOMOpertion.class and b/bin/com/connor/ld/sendBOMMesJc/SendBOMOpertion.class differ diff --git a/bin/com/connor/ld/sendBOMMesJc/SendObj.class b/bin/com/connor/ld/sendBOMMesJc/SendObj.class index 9d01033..0df0829 100644 Binary files a/bin/com/connor/ld/sendBOMMesJc/SendObj.class and b/bin/com/connor/ld/sendBOMMesJc/SendObj.class differ diff --git a/bin/com/connor/ld/sendBOMMesJc/sendPojo/VirtuallyBom.class b/bin/com/connor/ld/sendBOMMesJc/sendPojo/VirtuallyBom.class index 5d525a5..5c1fcd4 100644 Binary files a/bin/com/connor/ld/sendBOMMesJc/sendPojo/VirtuallyBom.class and b/bin/com/connor/ld/sendBOMMesJc/sendPojo/VirtuallyBom.class differ diff --git a/bin/com/connor/ld/sendMesJc/KUtil.class b/bin/com/connor/ld/sendMesJc/KUtil.class new file mode 100644 index 0000000..f289e3d Binary files /dev/null and b/bin/com/connor/ld/sendMesJc/KUtil.class differ diff --git a/bin/com/connor/ld/sendMesJc/SendGylxFram$1.class b/bin/com/connor/ld/sendMesJc/SendGylxFram$1.class deleted file mode 100644 index c513ce5..0000000 Binary files a/bin/com/connor/ld/sendMesJc/SendGylxFram$1.class and /dev/null differ diff --git a/bin/com/connor/ld/sendMesJc/SendGylxFram.class b/bin/com/connor/ld/sendMesJc/SendGylxFram.class index 8dbcf34..d0dcea9 100644 Binary files a/bin/com/connor/ld/sendMesJc/SendGylxFram.class and b/bin/com/connor/ld/sendMesJc/SendGylxFram.class differ diff --git a/bin/com/connor/ld/sendMesJc/SendGylxHandler$1.class b/bin/com/connor/ld/sendMesJc/SendGylxHandler$1.class deleted file mode 100644 index 20a1b04..0000000 Binary files a/bin/com/connor/ld/sendMesJc/SendGylxHandler$1.class and /dev/null differ diff --git a/bin/com/connor/ld/sendMesJc/SendGylxHandler.class b/bin/com/connor/ld/sendMesJc/SendGylxHandler.class index e74ffe2..82b053d 100644 Binary files a/bin/com/connor/ld/sendMesJc/SendGylxHandler.class and b/bin/com/connor/ld/sendMesJc/SendGylxHandler.class differ diff --git a/bin/com/connor/ld/sendMesJc/SendMesFram$1.class b/bin/com/connor/ld/sendMesJc/SendMesFram$1.class deleted file mode 100644 index 5e13b46..0000000 Binary files a/bin/com/connor/ld/sendMesJc/SendMesFram$1.class and /dev/null differ diff --git a/bin/com/connor/ld/sendMesJc/SendMesFram.class b/bin/com/connor/ld/sendMesJc/SendMesFram.class index c6d63ed..c98c054 100644 Binary files a/bin/com/connor/ld/sendMesJc/SendMesFram.class and b/bin/com/connor/ld/sendMesJc/SendMesFram.class differ diff --git a/bin/com/connor/ld/sendMesJc/SendMesHandler$1.class b/bin/com/connor/ld/sendMesJc/SendMesHandler$1.class deleted file mode 100644 index 014cffa..0000000 Binary files a/bin/com/connor/ld/sendMesJc/SendMesHandler$1.class and /dev/null differ diff --git a/bin/com/connor/ld/sendMesJc/SendMesHandler.class b/bin/com/connor/ld/sendMesJc/SendMesHandler.class index 168c27c..7416341 100644 Binary files a/bin/com/connor/ld/sendMesJc/SendMesHandler.class and b/bin/com/connor/ld/sendMesJc/SendMesHandler.class differ diff --git a/src/com/connor/ld/sendBOMMesJc/SendBOMOpertion.java b/src/com/connor/ld/sendBOMMesJc/SendBOMOpertion.java index 187db97..c07dbaa 100644 --- a/src/com/connor/ld/sendBOMMesJc/SendBOMOpertion.java +++ b/src/com/connor/ld/sendBOMMesJc/SendBOMOpertion.java @@ -34,6 +34,7 @@ import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.connor.ld.sendBOMMesJc.sendPojo.*; import com.connor.ld.sendMesJc.DbPool; +import com.connor.ld.sendMesJc.KUtil; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.JsonNode; @@ -298,6 +299,7 @@ public class SendBOMOpertion extends AbstractAIFOperation{ for(SendBean sendBean : sendBeans){ System.out.println("LD_SendBOM_Config:"+sendBean.toString()); } + KUtil.setByPass(session, true); if(flag1List.get(i)){ //传递SAP Result result = sendSAP(sendBeans, bean); @@ -309,13 +311,14 @@ public class SendBOMOpertion extends AbstractAIFOperation{ //传递MES table.setValueAt(sendMES(sendBeans,bean), i, 3); - + //还原合并数据 for(TCComponentBOMLine key : changDateByLineMap.keySet()){ for(String name : changDateByLineMap.get(key).keySet()){ key.setStringProperty(name,changDateByLineMap.get(key).get(name)); } } + KUtil.setByPass(session, false); } catch (JsonProcessingException e1) { // TODO Auto-generated catch block diff --git a/src/com/connor/ld/sendMesJc/KUtil.java b/src/com/connor/ld/sendMesJc/KUtil.java new file mode 100644 index 0000000..bfeeb22 --- /dev/null +++ b/src/com/connor/ld/sendMesJc/KUtil.java @@ -0,0 +1,39 @@ +/** * @Title: KUtil.java + * @Package com.connor.ld.sendMesJc + * @Description: TODO(用一句话描述该文件做什么) + * @author admin * @date 2023年12月19日 + * @version V1.0 + */ +package com.connor.ld.sendMesJc; + +import com.teamcenter.rac.kernel.TCSession; +import com.teamcenter.rac.kernel.TCUserService; + +/** + * @ClassName: KUtil + * @Description: TODO 工具类 + * @author hcj + * @date 2023年12月19日 + * + */ +public class KUtil { + /** + * + * @Title: setByPass + * @Description: 开旁路 + * @param @param session + * @param @param val 参数 + * @return void 返回类型 + * @throws + */ + public static void setByPass(TCSession session, boolean val) { + try { + TCUserService userservice = session.getUserService(); + userservice.call(val ? "CONNOR_open_bypass" : "CONNOR_close_bypass", new Object[] { "" }); + System.out.println(val ? "Open Bypass" : "Close Bypass"); + } catch (Exception e) { + e.printStackTrace(); + } + } + +} diff --git a/src/com/connor/ld/sendMesJc/SendGylxFram.java b/src/com/connor/ld/sendMesJc/SendGylxFram.java index 5b961bf..b8f6871 100644 --- a/src/com/connor/ld/sendMesJc/SendGylxFram.java +++ b/src/com/connor/ld/sendMesJc/SendGylxFram.java @@ -761,10 +761,12 @@ public class SendGylxFram extends JFrame implements ActionListener{ } System.out.println(revision+"====>"+jsonByType); JSONArray parseObject = JSON.parseArray(jsonByType); + KUtil.setByPass(session, true); //MES传递 sendMes(jsonByType,revision,ind,parseObject); //SAP传递 sendSap(revision,parseObject,ind); + KUtil.setByPass(session, false); ind = ind + 1; } } catch (Exception e1) { diff --git a/src/com/connor/ld/sendMesJc/SendMesFram.java b/src/com/connor/ld/sendMesJc/SendMesFram.java index a0a3482..3ad4232 100644 --- a/src/com/connor/ld/sendMesJc/SendMesFram.java +++ b/src/com/connor/ld/sendMesJc/SendMesFram.java @@ -363,6 +363,7 @@ public class SendMesFram extends JFrame implements ActionListener{ } DbPool.getConnection(value2[0],value2[1]); int ind = 0; + KUtil.setByPass(session, true); for(TCComponentItemRevision revision : mantrRev) { String[] strings = beanMap.get(revision.getType()); String jsonByType = getJsonByType(strings,revision); @@ -387,14 +388,17 @@ public class SendMesFram extends JFrame implements ActionListener{ } DbPool.write(sql, new String[] {jsonByType,send.toJSONString(),revision.getStringProperty("item_id")}); //传递SAP + sendSap(revision,parseObject,ind); ind = ind + 1; } + KUtil.setByPass(session, false); } catch (Exception e1) { // TODO Auto-generated catch block e1.printStackTrace(); }finally { + KUtil.setByPass(session, false); DbPool.freeAll(); } }