diff --git a/lc123/cloud/app/api/plugin/FWOtheroutApplySavePlugin.java b/lc123/cloud/app/api/plugin/FWOtheroutApplySavePlugin.java index 7894652..5f8480f 100644 --- a/lc123/cloud/app/api/plugin/FWOtheroutApplySavePlugin.java +++ b/lc123/cloud/app/api/plugin/FWOtheroutApplySavePlugin.java @@ -101,7 +101,10 @@ public class FWOtheroutApplySavePlugin implements ApiSavePlugin { reqDatum.put("tqq9_lshxx", tqq9_lshxx_tag); } } + + //处理仓库编码 String ckNumber = null; + //明细 List> entries = (List>) reqDatum.get("entryentity"); for (Map entry : entries) { @@ -115,8 +118,17 @@ public class FWOtheroutApplySavePlugin implements ApiSavePlugin { entry.put("tqq9_outowner", org);//出库货主 entry.put("tqq9_outkeepertype", "bos_org");//出库保管者类型 entry.put("tqq9_outkeeper", org);//出库保管者 + //处理仓库信息,接收泛微仓库编码后,去掉 "<>"和后面的部分 Map tqq9_dcck = (Map) entry.get("tqq9_dcck"); - ckNumber = (String) tqq9_dcck.get("number"); + if(tqq9_dcck != null){ + ckNumber = (String) tqq9_dcck.get("number"); + if(StringUtils.isNotBlank(ckNumber) && ckNumber.contains("<>")){ + String[] split = ckNumber.split("<>"); + ckNumber = split[0]; + } + } + tqq9_dcck.put("number", ckNumber); + entry.put("tqq9_dcck", tqq9_dcck); } Map tqq9_ckck_number = new HashMap<>(); diff --git a/lc123/cloud/app/plugin/operate/im/OtherOutPushExprnoOp.java b/lc123/cloud/app/plugin/operate/im/OtherOutPushExprnoOp.java index 70f4983..2253333 100644 --- a/lc123/cloud/app/plugin/operate/im/OtherOutPushExprnoOp.java +++ b/lc123/cloud/app/plugin/operate/im/OtherOutPushExprnoOp.java @@ -23,7 +23,9 @@ public class OtherOutPushExprnoOp extends AbstractOperationServicePlugIn { super.beforeExecuteOperationTransaction(e); DynamicObject[] dataEntities = e.getDataEntities(); for (DynamicObject dataEntity : dataEntities) { - dataEntity = BusinessDataServiceHelper.loadSingle(dataEntity.getPkValue(), dataEntity.getDynamicObjectType().getName(),"creator,tqq9_entrywl.tqq9_kddh,tqq9_fwrequestid,billno"); + dataEntity = BusinessDataServiceHelper.loadSingle(dataEntity.getPkValue(), + dataEntity.getDynamicObjectType().getName(), + "creator,tqq9_entrywl.tqq9_kddh,tqq9_fwrequestid,billno,tqq9_dept,tqq9_ispushfw"); String resultStr = FWImpl.returnExprNo(dataEntity); if(StringUtils.isNotBlank(resultStr)){ JSONObject resultJson = JSONObject.parseObject(resultStr); diff --git a/lc123/cloud/app/plugin/utils/FWUtils.java b/lc123/cloud/app/plugin/utils/FWUtils.java index 8c4040e..5f6ba2b 100644 --- a/lc123/cloud/app/plugin/utils/FWUtils.java +++ b/lc123/cloud/app/plugin/utils/FWUtils.java @@ -65,7 +65,7 @@ public class FWUtils { * @return */ public static DynamicObject getKdUserByFwUserID(String fwUserID){ - QFilter f = new QFilter("tqq9_fwuserid", "=", fwUserID); + QFilter f = new QFilter("entryentity.tqq9_fwuserid", "=", fwUserID); DynamicObject[] bos_users = BusinessDataServiceHelper.load("bos_user", "id,name,number", new QFilter[]{f}); if(bos_users != null && bos_users.length > 0){ return bos_users[0];