diff --git a/main/java/shjh/jhzj7/fi/fi/plugin/operate/CustomerInitOperation.java b/main/java/shjh/jhzj7/fi/fi/plugin/operate/CustomerInitOperation.java index 98d6435..fbc3265 100644 --- a/main/java/shjh/jhzj7/fi/fi/plugin/operate/CustomerInitOperation.java +++ b/main/java/shjh/jhzj7/fi/fi/plugin/operate/CustomerInitOperation.java @@ -93,6 +93,7 @@ public class CustomerInitOperation extends AbstractOperationServicePlugIn implem itemsJson.add(itemInfo); continue; } + cusname = cusname.trim();//名称去除前后空格 currentCus = BusinessDataServiceHelper.loadSingle(entityName,new QFilter[]{new QFilter("number","=",cusnumber)}); if(currentCus == null){ //判断客户分类 @@ -256,6 +257,10 @@ public class CustomerInitOperation extends AbstractOperationServicePlugIn implem if(bebankinfo == null){ continue; } + if(EsbUtils.isEmpty(json_body.getString("banknumber"))){ + //银行账号为空,不处理 + continue; + } bankinfo = doc_bank.addNew(); bankinfo.set("bankaccount",json_body.getString("banknumber"));//银行账号 if(EsbUtils.isEmpty(json_body.getString("acctname"))){ diff --git a/main/java/shjh/jhzj7/fi/fi/plugin/operate/SupplierInitOperation.java b/main/java/shjh/jhzj7/fi/fi/plugin/operate/SupplierInitOperation.java index 94363cb..b2ff5d5 100644 --- a/main/java/shjh/jhzj7/fi/fi/plugin/operate/SupplierInitOperation.java +++ b/main/java/shjh/jhzj7/fi/fi/plugin/operate/SupplierInitOperation.java @@ -104,6 +104,7 @@ public class SupplierInitOperation extends AbstractOperationServicePlugIn implem itemsJson.add(itemInfo); continue; } + supname = supname.trim(); isNew = false; currentSup = BusinessDataServiceHelper.loadSingle(entityName,new QFilter[]{new QFilter("number","=",supnumber)}); if(currentSup == null){ @@ -160,6 +161,10 @@ public class SupplierInitOperation extends AbstractOperationServicePlugIn implem //如果本次入参银行账户未在系统生成,且sap是删除的,我方不接收 continue; } + if(EsbUtils.isEmpty(json_bank.getString("banknumber"))){ + //银行账号为空,不处理 + continue; + } bankinfo = doc_bank.addNew(); bankinfo.set("bankaccount",json_bank.getString("banknumber"));//银行账号 if(EsbUtils.isEmpty(json_bank.getString("acctname"))){ diff --git a/main/java/shjh/jhzj7/fi/fi/webapi/CustomerControler.java b/main/java/shjh/jhzj7/fi/fi/webapi/CustomerControler.java index ef6a00c..cc3af36 100644 --- a/main/java/shjh/jhzj7/fi/fi/webapi/CustomerControler.java +++ b/main/java/shjh/jhzj7/fi/fi/webapi/CustomerControler.java @@ -95,6 +95,7 @@ public class CustomerControler { itemsJson.add(itemInfo); continue; } + cusname = cusname.trim();//名称去除前后空格 currentCus = BusinessDataServiceHelper.loadSingle(entityName,new QFilter[]{new QFilter("number","=",cusnumber)}); if(currentCus == null){ //判断客户分类 @@ -275,6 +276,10 @@ public class CustomerControler { if(bebankinfo == null){ continue; } + if(EsbUtils.isEmpty(json_body.getString("banknumber"))){ + //银行账号为空,不处理 + continue; + } bankinfo = getBankInfo(doc_bank,json_body.getString("banknumber")); if(bankinfo == null){ bankinfo = doc_bank.addNew(); diff --git a/main/java/shjh/jhzj7/fi/fi/webapi/SupplierControler.java b/main/java/shjh/jhzj7/fi/fi/webapi/SupplierControler.java index 7b14ab8..bcd348c 100644 --- a/main/java/shjh/jhzj7/fi/fi/webapi/SupplierControler.java +++ b/main/java/shjh/jhzj7/fi/fi/webapi/SupplierControler.java @@ -112,6 +112,7 @@ public class SupplierControler { itemsJson.add(itemInfo); continue; } + supname = supname.trim(); isNew = false; currentSup = BusinessDataServiceHelper.loadSingle(entityName,new QFilter[]{new QFilter("number","=",supnumber)}); if(currentSup == null){ @@ -167,6 +168,10 @@ public class SupplierControler { //如果本次入参银行账户未在系统生成,且sap是删除的,我方不接收 continue; } + if(EsbUtils.isEmpty(json_bank.getString("banknumber"))){ + //银行账号为空,不处理 + continue; + } if(bankinfo == null){ bankinfo = doc_bank.addNew(); }