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

fix:

Browse Source 
1.订舱通知单提交同步EAS、逻辑增加
This commit is contained in:
ljw 2024-12-13 17:15:18 +08:00
parent f2bd115a93
commit e3a3aae56f
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/yem/wm/syn/eas/YemDelivernoticeService.java
View File

@ -50,7 +50,7 @@ public class YemDelivernoticeService extends AbstractOperationServicePlugIn {
dataEntity = BusinessDataServiceHelper.loadSingle(dataEntity.getPkValue(), dataEntity.getDynamicObjectType().getName()); dataEntity = BusinessDataServiceHelper.loadSingle(dataEntity.getPkValue(), dataEntity.getDynamicObjectType().getName());
DynamicObject yem_billtype = dataEntity.getDynamicObject("yem_billtype"); DynamicObject yem_billtype = dataEntity.getDynamicObject("yem_billtype");
String yemSynchronizeeas = dataEntity.getString("yem_synchronizeeas"); String yemSynchronizeeas = dataEntity.getString("yem_synchronizeeas");
if ("B".equals(yemSynchronizeeas)){ if ("B".equals(yemSynchronizeeas)) {
list.add(selectedRow); list.add(selectedRow);
continue; continue;
} }
@ -130,12 +130,20 @@ public class YemDelivernoticeService extends AbstractOperationServicePlugIn {
json.put("number", dataEntitie.getString("billno")); json.put("number", dataEntitie.getString("billno"));
//送货客户 //送货客户
if (dataEntitie.getString("yem_sale_type").equals("B")) { if (dataEntitie.getString("yem_sale_type").equals("B")) {
DynamicObject yemCustomer = dataEntitie.getDynamicObject("yem_actualcustomer");
if (yemCustomer != null) {
json.put("FCUSTOMERID", setJson("number", yemCustomer.getString("number")));
json.put("CFRECEIVEINFO", setJson("number", dataEntitie.getString("yem_customername")));
json.put("FPAYMENTCUSTOMERID", setJson("number", yemCustomer.getString("number")));
json.put("FORDERCUSTOMERID", setJson("number", yemCustomer.getString("number")));
json.put("FBALANCECUSTOMERID", setJson("number", yemCustomer.getString("number")));
} }
} else {
DynamicObject yemCustomer = dataEntitie.getDynamicObject("yem_customer1"); DynamicObject yemCustomer = dataEntitie.getDynamicObject("yem_customer1");
if (yemCustomer != null) { if (yemCustomer != null) {
json.put("customer", setJson("number", yemCustomer.getString("number"))); json.put("customer", setJson("number", yemCustomer.getString("number")));
} }
}
//币别 //币别
DynamicObject yemCurrency = dataEntitie.getDynamicObject("yem_currency"); DynamicObject yemCurrency = dataEntitie.getDynamicObject("yem_currency");
if (yemCurrency != null) { if (yemCurrency != null) {
@ -276,6 +284,11 @@ public class YemDelivernoticeService extends AbstractOperationServicePlugIn {
if (yemWarehouse != null) { if (yemWarehouse != null) {
json.put("warehouse", setJson("number", yemWarehouse.getString("number"))); json.put("warehouse", setJson("number", yemWarehouse.getString("number")));
} }
//送货客户
if (dataEntitie.getString("yem_sale_type").equals("B")) {
json.put("CFTERMINALAMOUNT", setJson("number", materialentry.getString("yem_endprice")));
json.put("CFTERMINALPRICE", setJson("number", materialentry.getString("yem_endamount")));
}
//库位 //库位
DynamicObject yemLocation = materialentry.getDynamicObject("yem_location"); DynamicObject yemLocation = materialentry.getDynamicObject("yem_location");
if (yemLocation != null) { if (yemLocation != null) {