violet/ensign
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'orinin/dev-ljw' into dev-ljw

Browse Source
This commit is contained in:
ljw 2024-08-28 22:01:01 +08:00
commit 6bdc942369
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/yem/wm/es/declaredocx/convert/DeclareDocxToExportinvoiceConvert.java
View File

@ -93,7 +93,6 @@ public class DeclareDocxToExportinvoiceConvert extends AbstractConvertPlugIn {
calculatePremium(dataEntity); calculatePremium(dataEntity);
} }
ExtendedDataEntity[] findByname = e.getTargetExtDataEntitySet().FindByEntityKey(targetName); ExtendedDataEntity[] findByname = e.getTargetExtDataEntitySet().FindByEntityKey(targetName);
yemCushscode(findByname); yemCushscode(findByname);
} }

6
src/main/java/com/yem/wm/es/salesorder/from/SalesOrderPJEdit.java
View File

@ -377,10 +377,10 @@ public class SalesOrderPJEdit extends AbstractBillPlugIn implements Plugin, Befo
break; break;
case "yem_sharethecost": case "yem_sharethecost":
case "yem_sumedamount": case "yem_sumedamount":
String dataNewValue =(String) this.getModel().getValue("yem_sharethecost"); // String dataNewValue =(String) this.getModel().getValue("yem_sharethecost");
if ("A".equals(dataNewValue)){ // if ("A".equals(dataNewValue)){
// }
calculateCostSharing(model); calculateCostSharing(model);
}
break; break;
} }
} }