Compare commits

..

No commits in common. "1f1535a6a9f55c50d4b77bf41eeede0e4a0ca072" and "068d66138b9d6446286b7af6ce7b5971718d44ce" have entirely different histories.

4 changed files with 31 additions and 30 deletions

View File

@ -1,7 +1,6 @@
package com.yem.wm.im.delivernotice.form; package com.yem.wm.im.delivernotice.form;
import com.yem.wm.es.contractamtlist.util.FunUtil; import com.yem.wm.es.contractamtlist.util.FunUtil;
import com.yem.wm.im.delivernotice.op.DeliverNoticeSubmitOp;
import com.yem.wm.utils.FunctionalCommon; import com.yem.wm.utils.FunctionalCommon;
import com.yem.wm.utils.OrgFilterUtils; import com.yem.wm.utils.OrgFilterUtils;
import com.yem.wm.utils.YEM; import com.yem.wm.utils.YEM;
@ -103,12 +102,6 @@ public class Delivernotice extends AbstractBillPlugIn implements BeforeF7SelectL
case "inventoryquery": case "inventoryquery":
inventoryQuery(); inventoryQuery();
break; break;
case "test_dosubmit":
// IDataModel model = this.getModel();
// DynamicObject dataEntity = model.getDataEntity(true);
// DeliverNoticeSubmitOp op = new DeliverNoticeSubmitOp();
// op.setValueToStorage(dataEntity);
break;
} }
} }

View File

@ -175,9 +175,7 @@ public class DeliverNoticeSubmitOp extends AbstractOperationServicePlugIn {
DynamicObjectCollection entryDeliver = dataEntitie.getDynamicObjectCollection("yem_es_materialinfo"); DynamicObjectCollection entryDeliver = dataEntitie.getDynamicObjectCollection("yem_es_materialinfo");
for (DynamicObject entry : entryDeliver) { for (DynamicObject entry : entryDeliver) {
map.put(entry.getLong("yem_sourceentryid"), entry.getBigDecimal("yem_qty")); map.put(entry.getLong("yem_sourceentryid"), entry.getBigDecimal("yem_qty"));
BigDecimal amountandtax = entry.getBigDecimal("yem_amountandtax"); mapAmount.put(entry.getLong("yem_sourceentryid"), entry.getBigDecimal("yem_amountandtax"));
amountandtax = amountandtax.setScale(2, RoundingMode.HALF_UP);
mapAmount.put(entry.getLong("yem_sourceentryid"), amountandtax);
} }
Set<Long> longs = map.keySet(); Set<Long> longs = map.keySet();
String selectfields = DynamicObjectUtil.getSelectfields("yem_es_storagetrans"); String selectfields = DynamicObjectUtil.getSelectfields("yem_es_storagetrans");
@ -191,11 +189,6 @@ public class DeliverNoticeSubmitOp extends AbstractOperationServicePlugIn {
for (DynamicObject entry : materialinfo) { for (DynamicObject entry : materialinfo) {
long sourceentryid = entry.getLong("yem_sourceentryid"); long sourceentryid = entry.getLong("yem_sourceentryid");
if (map.containsKey(sourceentryid)) { if (map.containsKey(sourceentryid)) {
// entry.set("yem_adstqty", BigDecimal.ZERO);
// entry.set("yem_adstamount", BigDecimal.ZERO);
// entry.set("yem_sgnenumber", "");
BigDecimal yemAdstqty = entry.getBigDecimal("yem_adstqty"); BigDecimal yemAdstqty = entry.getBigDecimal("yem_adstqty");
BigDecimal yemAdstamount = entry.getBigDecimal("yem_adstamount"); BigDecimal yemAdstamount = entry.getBigDecimal("yem_adstamount");
BigDecimal decimal = map.get(sourceentryid); BigDecimal decimal = map.get(sourceentryid);

View File

@ -11,7 +11,6 @@ import kd.bos.servicehelper.BusinessDataServiceHelper;
import kd.bos.servicehelper.operation.SaveServiceHelper; import kd.bos.servicehelper.operation.SaveServiceHelper;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*; import java.util.*;
/** /**
@ -86,9 +85,7 @@ public class DeliverNoticeUnAuditOp extends AbstractOperationServicePlugIn {
DynamicObjectCollection entryDeliver = dataEntitie.getDynamicObjectCollection("yem_es_materialinfo"); DynamicObjectCollection entryDeliver = dataEntitie.getDynamicObjectCollection("yem_es_materialinfo");
for (DynamicObject entry : entryDeliver) { for (DynamicObject entry : entryDeliver) {
BigDecimal amountandtax = entry.getBigDecimal("yem_amountandtax"); map.put(entry.getLong("yem_sourceentryid"), Arrays.asList(entry.getBigDecimal("yem_qty"), entry.getBigDecimal("yem_amt")));
amountandtax = amountandtax.setScale(2, RoundingMode.HALF_UP);
map.put(entry.getLong("yem_sourceentryid"), Arrays.asList(entry.getBigDecimal("yem_qty"), amountandtax));
} }
Set<Long> longs = map.keySet(); Set<Long> longs = map.keySet();

View File

@ -3,38 +3,56 @@ package kd.cosmic;
import kd.bos.orm.query.QFilter; import kd.bos.orm.query.QFilter;
import kd.bos.servicehelper.BusinessDataServiceHelper; import kd.bos.servicehelper.BusinessDataServiceHelper;
import kd.cosmic.server.Launcher; import kd.cosmic.server.Launcher;
import kd.cosmic.server.Launcher;
/** /**
* 启动本地应用程序(微服务节点) * 启动本地应用程序(微服务节点)
*/ */
public class Application { public class Application {
public static void main(String[] args) { public static void main(String[] args) {
Launcher cosmic = new Launcher(); Launcher cosmic = new Launcher();
//
// cosmic.setClusterNumber("cosmic");
// cosmic.setTenantNumber("sample");
// cosmic.setServerIP("10.64.112.152");
//// cosmic.set("fileserver", "http://10.64.112.152:30003/fileserver/");
//// cosmic.set("imageServer.url", "http://10.64.112.152:30003/fileserver/");
//// cosmic.set("attachmentServer.url", "http://10.64.112.152:30003/fileserver/");
//
//
cosmic.setAppName("cosmic-25655-N0OqzfBY");
cosmic.setWebPath("D:/Cosine/Comics_Debug/Comics_YXZG/YXZG-server/webapp");
// cosmic.setConfigUrl("10.64.112.152:2181","zookeeper","Cosmic@5092");
//
// cosmic.setStartWithQing(false);
//
// cosmic.start();
// cosmic.setClusterNumber("cosmic"); // cosmic.setClusterNumber("cosmic");
// cosmic.setTenantNumber("sample"); // cosmic.setTenantNumber("sample");
// cosmic.setServerIP("10.64.112.152"); // cosmic.setServerIP("10.64.112.152");
//
// cosmic.setAppName("cosmic-ZZSLL-6a9PvQR2");
// cosmic.setWebPath("D:/Code/ensign-server/webapp");
//
// cosmic.setConfigUrl("10.64.112.152:2181","zookeeper","Cosmic@5092");
cosmic.setAppName("cosmic-violet-GNfGyyH1"); ////152
cosmic.setWebPath("E:/Code/ensign_back/ensign-server/webapp");
//152
cosmic.setClusterNumber("yxzg-topview-dev"); cosmic.setClusterNumber("yxzg-topview-dev");
cosmic.setTenantNumber("yxzg-topview-dev"); cosmic.setTenantNumber("yxzg-topview-dev");
cosmic.setServerIP("10.64.112.152"); cosmic.setServerIP("10.64.112.152");
cosmic.setFileServerPathIPAndPort("",""); cosmic.setFileServerPathIPAndPort("", "");
cosmic.setConfigUrl("10.64.112.152:2181","zookeeper","Cosmic@5092"); cosmic.setConfigUrl("10.64.112.152:2181", "zookeeper", "Cosmic@5092");
cosmic.set("login.type","STANDALONE"); System.setProperty("mq.debug.queue.tag", "wrxtest");
////134
// 134
// cosmic.setClusterNumber("yxzg-prod"); // cosmic.setClusterNumber("yxzg-prod");
// cosmic.setTenantNumber("yxzg-prod"); // cosmic.setTenantNumber("yxzg-prod");
// cosmic.setServerIP("10.64.111.134"); // cosmic.setServerIP("10.64.111.134");
// cosmic.setConfigUrl("10.64.111.134:2181","zookeeper","d@f*g:SGVsbG8==U4HRwjlqTOp0p9b60T+T8D2fQ8ThQgJLu/qgfLyLgknPa2RwYXNzd29yZA=="); // cosmic.setConfigUrl("10.64.111.134:2181","zookeeper","d@f*g:SGVsbG8==U4HRwjlqTOp0p9b60T+T8D2fQ8ThQgJLu/qgfLyLgknPa2RwYXNzd29yZA==");
cosmic.setStartWithQing(false); cosmic.setStartWithQing(false);
cosmic.start(); cosmic.start();
} }
} }