Compare commits

...

14 Commits

Author SHA1 Message Date
zzs01@yunemao.com
d7458c3f8d chore: Application 2024-08-28 17:50:45 +08:00
zzs01@yunemao.com
ea0885805d Merge branch 'test' into dev-zzs 2024-08-28 17:49:55 +08:00
ljw
c6f606c769 Merge pull request 'dev-ljw' (#4) from dev-ljw into test
Reviewed-on: #4
2024-08-28 17:42:18 +08:00
ljw
12ba81e92a l 2024-08-28 17:38:58 +08:00
zzs01@yunemao.com
728a223675 Merge branch 'feat-order-api' into test 2024-08-28 16:51:52 +08:00
25b7dd7643 Merge pull request 'fix-st-audit' (#3) from fix-st-audit into test
Reviewed-on: #3
2024-08-28 16:20:20 +08:00
zzs01@yunemao.com
4c8ff75bf1 Merge branch 'dev-zzs' into test 2024-08-28 15:47:36 +08:00
ljw
fab8a9cd9f l 2024-08-27 20:04:06 +08:00
zzs01@yunemao.com
e861a3c62f Merge remote-tracking branch 'origin/dev-zzs' into test 2024-08-27 14:52:33 +08:00
zzs01@yunemao.com
c3f14bdc9f Merge remote-tracking branch 'origin/dev-zzs' into test 2024-08-27 14:51:05 +08:00
ljw
8966670dec l 2024-08-27 14:40:40 +08:00
ljw
12c316893e Merge remote-tracking branch 'orinin/test' into dev-ljw 2024-08-27 14:40:23 +08:00
zzs01@yunemao.com
95195bb712 Merge branch 'main' into dev-ljw
# Conflicts:
#	.gitignore
#	cosmic.build.xml
#	cosmic.properties
#	src/main/java/com/yem/wm/es/declaredocx/convert/DeclareDocxToExportinvoiceConvert.java
#	src/main/java/com/yem/wm/task/ServiceRepairTask.java
#	src/main/java/kd/cosmic/Application.java
#	src/main/java/kd/cosmic/server/Launcher.java
2024-08-27 14:32:53 +08:00
ljw
6c55309096 l 2024-08-27 14:23:51 +08:00
3 changed files with 79 additions and 4 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;
}
}