diff --git a/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderEdit.java b/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderEdit.java index 65a5f670..4ff96ac3 100644 --- a/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderEdit.java +++ b/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderEdit.java @@ -1990,8 +1990,9 @@ public class SalesOrderEdit extends AbstractBillPlugIn implements Plugin, Before BigDecimal yemSingleamt = dynamicObject.getBigDecimal("yem_singleamt"); if (map.get(aLong)!=null){ if (map.get(aLong).compareTo(yemSingleamt)!=0){ - ConfirmCallBackListener confirmCallBackListener = new ConfirmCallBackListener("checkGiftsGivenNumber", this); - this.getView().showConfirm("赠送配件分录同一机型存在多个单台配件金额,请检查后在进行提交!!!", MessageBoxOptions.OKCancel, confirmCallBackListener); +// ConfirmCallBackListener confirmCallBackListener = new ConfirmCallBackListener("checkGiftsGivenNumber", this); +// this.getView().showConfirm("赠送配件分录同一机型存在多个单台配件金额,请检查后在进行提交!!!", MessageBoxOptions.OKCancel, confirmCallBackListener); + this.getView().showMessage("赠送配件分录同一机型存在多个单台配件金额,请检查后在进行提交!!!"); e.setCancel(true); } }else { diff --git a/src/main/java/kd/cosmic/Application.java b/src/main/java/kd/cosmic/Application.java index da9708ed..b30a4f27 100644 --- a/src/main/java/kd/cosmic/Application.java +++ b/src/main/java/kd/cosmic/Application.java @@ -17,17 +17,17 @@ public class Application { cosmic.setWebPath("E:/Cosmic/Comics_YXZG/YXZG-server/webapp"); ////152 -// cosmic.setClusterNumber("yxzg-topview-dev"); -// cosmic.setTenantNumber("yxzg-topview-dev"); -// cosmic.setServerIP("10.64.112.152"); -// cosmic.setFileServerPathIPAndPort("", ""); -// cosmic.setConfigUrl("10.64.112.152:2181", "zookeeper", "Cosmic@5092"); + cosmic.setClusterNumber("yxzg-topview-dev"); + cosmic.setTenantNumber("yxzg-topview-dev"); + cosmic.setServerIP("10.64.112.152"); + cosmic.setFileServerPathIPAndPort("", ""); + cosmic.setConfigUrl("10.64.112.152:2181", "zookeeper", "Cosmic@5092"); System.setProperty("mq.debug.queue.tag", "wrxtest"); ////134 - cosmic.setClusterNumber("yxzg-prod"); - cosmic.setTenantNumber("yxzg-prod"); - cosmic.setServerIP("10.64.111.134"); - cosmic.setConfigUrl("10.64.111.134:2181","zookeeper","d@f*g:SGVsbG8==U4HRwjlqTOp0p9b60T+T8D2fQ8ThQgJLu/qgfLyLgknPa2RwYXNzd29yZA=="); +// cosmic.setClusterNumber("yxzg-prod"); +// cosmic.setTenantNumber("yxzg-prod"); +// cosmic.setServerIP("10.64.111.134"); +// cosmic.setConfigUrl("10.64.111.134:2181","zookeeper","d@f*g:SGVsbG8==U4HRwjlqTOp0p9b60T+T8D2fQ8ThQgJLu/qgfLyLgknPa2RwYXNzd29yZA=="); cosmic.setStartWithQing(false); cosmic.start();