Merge pull request 'dev-ljw' (#4) from dev-ljw into test

Reviewed-on: #4
This commit is contained in:
ljw 2024-08-28 17:42:18 +08:00
commit c6f606c769
4 changed files with 108 additions and 15 deletions

12
YXZG.iml Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="newWizard_KINGDEE_COSMIC_MODULE_TYPE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="cosmic-lib" level="project" />
</component>
</module>

View File

@ -5,6 +5,7 @@ import com.yem.wm.utils.DynamicObjectUtil;
import com.yem.wm.utils.YEM;
import kd.bos.dataentity.entity.DynamicObject;
import kd.bos.dataentity.entity.DynamicObjectCollection;
import kd.bos.entity.BillEntityType;
import kd.bos.entity.ExtendedDataEntity;
import kd.bos.entity.botp.plugin.AbstractConvertPlugIn;
import kd.bos.entity.botp.plugin.args.AfterConvertEventArgs;
@ -28,9 +29,9 @@ public class DeclareDocxToExportinvoiceConvert extends AbstractConvertPlugIn {
public void afterConvert(AfterConvertEventArgs e) {
super.afterConvert(e);
String targetName = this.getTgtMainType().getName();
//上游
String name = this.getSrcMainType().getName();
ExtendedDataEntity[] findByEntityKeys = e.getTargetExtDataEntitySet().FindByEntityKey(targetName);
for (ExtendedDataEntity findByEntityKey : findByEntityKeys) {
//携带合同中的佣金率
setRate(findByEntityKey);
@ -90,9 +91,67 @@ public class DeclareDocxToExportinvoiceConvert extends AbstractConvertPlugIn {
// }
calculatePremium(dataEntity);
}
ExtendedDataEntity[] findByname = e.getTargetExtDataEntitySet().FindByEntityKey(targetName);
yemCushscode(findByname);
}
private void yemCushscode(ExtendedDataEntity[] findByname) {
for (ExtendedDataEntity extendedDataEntity : findByname) {
DynamicObject dataEntity = extendedDataEntity.getDataEntity();
long aLong2 = dataEntity.getLong("yem_sourcebillid");
String yem_es_declare = DynamicObjectUtil.getSelectfields("yem_es_declaredocx", false);
String yem_es_declare_ec = DynamicObjectUtil.getEntrySelectfields(yem_es_declare, "yem_es_declaredocx", "yem_es_declare_ec", false);
DynamicObject dynamicObject2 = BusinessDataServiceHelper.loadSingle("yem_es_declaredocx", yem_es_declare_ec, new QFilter[]{new QFilter("id", QCP.equals, aLong2)});
DynamicObjectCollection dynamicObjectCollection = dynamicObject2.getDynamicObjectCollection("yem_es_declare_ec");
//出口发票
for (DynamicObject dynamicObject : dynamicObjectCollection) {
DynamicObject yemCushscode = dynamicObject.getDynamicObject("yem_cushscode");
long aLong1 = dynamicObject.getLong("id");
if (yemCushscode != null) {
String yemCushscodeString = yemCushscode.getString("number");
String yemDecmatericalname = dynamicObject.getString("yem_decmatericalname");
BigDecimal yemCusconsalesprice = dynamicObject.getBigDecimal("yem_cusconsalesprice");
QFilter qFilter = new QFilter("yem_ca_cddetailedentry.yem_codets.number", QCP.equals, yemCushscodeString);
qFilter.and(new QFilter("yem_ca_cddetailedentry.yem_codetsname", QCP.equals, yemDecmatericalname));
qFilter.and(new QFilter("yem_ca_cddetailedentry.yem_declprice", QCP.equals, yemCusconsalesprice));
String selectfield = DynamicObjectUtil.getSelectfields("yem_ca_cusdec", false);
String selectfields = DynamicObjectUtil.getEntrySelectfields(selectfield, "yem_ca_cusdec", "yem_ca_cddetailedentry", false);
//单一窗口报关单
DynamicObject load = BusinessDataServiceHelper.loadSingle("yem_ca_cusdec", selectfields, new QFilter[]{qFilter});
if (load != null) {
DynamicObjectCollection dynamicObjectCollection1 = load.getDynamicObjectCollection("yem_ca_cddetailedentry");
for (DynamicObject object : dynamicObjectCollection1) {
DynamicObject yemCodets = object.getDynamicObject("yem_codets");
BigDecimal bigDecimal = object.getBigDecimal("yem_declprice");
String string = object.getString("yem_codetsname");
DynamicObject yemGunit = object.getDynamicObject("yem_gunit");
DynamicObject yemunit = object.getDynamicObject("yem_unit1");
DynamicObject yemUnit = object.getDynamicObject("yem_unit2");
if (yemCodets != null) {
String yemCodetsString = yemCodets.getString("number");
if (yemCodetsString.equals(yemCushscodeString) && bigDecimal.compareTo(yemCusconsalesprice) == 0 && yemDecmatericalname.equals(string)) {
DynamicObjectCollection dynamicObjectCollection2 = dataEntity.getDynamicObjectCollection("yem_exportinvoice_c");
for (DynamicObject dynamicObject1 : dynamicObjectCollection2) {
long aLong = dynamicObject1.getLong("yem_sourcebillentryid");
if (aLong1 == aLong) {
dynamicObject1.set("yem_customsdeclaration", yemGunit);
dynamicObject1.set("yem_unitmeasurement", yemunit);
dynamicObject1.set("yem_measurement", yemUnit);
}
}
}
}
}
}
}
}
}
}
/**
* 获取出口日期的海运费汇率 保费汇率
*
@ -163,9 +222,9 @@ public class DeclareDocxToExportinvoiceConvert extends AbstractConvertPlugIn {
//汇率
BigDecimal yem_seatransfeerate = dataEntity.getBigDecimal("yem_seatransfeerate");
//海运费原币
BigDecimal multiply1 = yem_count.multiply(yem_localamountsum).setScale(2,BigDecimal.ROUND_HALF_UP);
BigDecimal multiply1 = yem_count.multiply(yem_localamountsum).setScale(2, BigDecimal.ROUND_HALF_UP);
//海运费本位币
BigDecimal yem_seatransfeebase = yem_seatransfeerate.multiply(multiply1).setScale(2,BigDecimal.ROUND_HALF_UP);
BigDecimal yem_seatransfeebase = yem_seatransfeerate.multiply(multiply1).setScale(2, BigDecimal.ROUND_HALF_UP);
//佣金
BigDecimal yem_commissionba = dataEntity.getBigDecimal("yem_commissionba");
BigDecimal ybz = yem_seatransfeebase.add(yem_insurefeebase).add(yem_commissionba);

View File

@ -375,8 +375,12 @@ public class SalesOrderPJEdit extends AbstractBillPlugIn implements Plugin, Befo
// calculateCostSharing(model);
ClientUtils.addSaAmountTk(model, rowIndex);//销售金额价格条款结算币别
break;
case "yem_sharethecost":
case "yem_sumedamount":
calculateCostSharing(model);
String dataNewValue =(String) this.getModel().getValue("yem_sharethecost");
if ("A".equals(dataNewValue)){
calculateCostSharing(model);
}
break;
}
}

View File

@ -3,38 +3,56 @@ package kd.cosmic;
import kd.bos.orm.query.QFilter;
import kd.bos.servicehelper.BusinessDataServiceHelper;
import kd.cosmic.server.Launcher;
import kd.cosmic.server.Launcher;
/**
* 启动本地应用程序(微服务节点)
*/
public class Application {
public static void main(String[] args) {
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.setTenantNumber("sample");
// 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");
cosmic.setWebPath("E:/Code/ensign_back/ensign-server/webapp");
//152
////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.set("login.type","STANDALONE");
// 134
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.setStartWithQing(false);
cosmic.start();
}
}